From 1d7add295e146e383396c4f5904e523d97f2afa4 Mon Sep 17 00:00:00 2001 From: xk_yangdeshi <1579106394@qq.com> Date: Wed, 7 Jul 2021 14:30:32 +0800 Subject: [PATCH] =?UTF-8?q?1.3.3.8=E6=89=AB=E6=9C=AC=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 27 +- pages.json | 3 + pages/index/index.vue | 4 + pages/setup/setup.vue | 2 +- .../scan-camera/scan-camera - 副本.vue | 267 ++++++++++++++++ .../station-info/scan-camera/scan-camera.vue | 301 +++++++++++++----- pages/stationDetail/ZYSite.vue | 10 +- pages/stationDetail/stationDetail.vue | 2 + utils/request.js | 75 +++-- 9 files changed, 565 insertions(+), 126 deletions(-) create mode 100644 pages/station-info/scan-camera/scan-camera - 副本.vue diff --git a/App.vue b/App.vue index d3ee885..3e60b7d 100644 --- a/App.vue +++ b/App.vue @@ -1,6 +1,6 @@ + + diff --git a/pages/station-info/scan-camera/scan-camera.vue b/pages/station-info/scan-camera/scan-camera.vue index 18b15d7..9b0d35c 100644 --- a/pages/station-info/scan-camera/scan-camera.vue +++ b/pages/station-info/scan-camera/scan-camera.vue @@ -1,44 +1,88 @@ @@ -52,49 +96,61 @@ once: false, lightOn: false, animationData2: {}, - flashValue: 'auto' + flashValue: 'auto', } }, - onShow() { - this.donghua() - setInterval(() => { - this.donghua() - }, 6000); - }, - // onShow() { - // this.donghua() - - // }, - methods: { - touchFlash() { - if (this.flashValue != 'on') { - this.flashValue = 'on' - } else if (this.flashValue == 'on') { - this.flashValue = 'off' - } - }, - donghua() { - var animation2 = uni.createAnimation({ - duration: 1000, - timingFunction: 'linear', - }) - this.animation2 = animation2 - - animation2.translateY(235).step({ - duration: 3000 - }) - - this.animationData2 = animation2.export() + onLoad() { + uni.scanCode({ + scanType: 'qrCode', + onlyFromCamera: false, + success: (resResult) => { + // innerAudioContext.play() + console.log('play滴~') + let res = resResult.result + console.log(res) + uni.setStorageSync('qrCode', res) + this.once = true + let url = '' + const tag = res.substring(0, 2) + // 老星油 XM ， HT G7 ， 则一 ZEYI ， 新星油 XOIL + if (tag == "XM" || tag == "HT" || tag == "G7") { + url = '/pages/stationDetail/stationDetail' + } else if (res.substring(0, 4) == 'ZEYI' || res.substring(0, 4) == 'XOIL') { + url = '/pages/stationDetail/ZYSite' + } else { + uni.showToast({ + title: '未知二维码', + icon: 'none' + }) + setTimeout(() => { + uni.navigateBack({ + + }) + }, 800) + return false; + } + console.log(tag) + uni.redirectTo({ + // url: `/pages/stationDetail/stationDetail`, + url: url, + fail: (err) => { + // console.log(err) + }, + success: (res) => { + // console.log('chengg', res) + } + }) + }, + fail: (err) => { + uni.navigateBack({ - setTimeout(() => { - animation2.translateY(0).step({ - duration: 3000 }) - this.animationData2 = animation2.export() + } + }) - }, 3000) - }, + }, + methods: { scancode(e) { if (!this.once) { var scanUrl = '' @@ -109,12 +165,25 @@ uni.setStorageSync('qrCode', res) this.once = true let url = '' - if (res.substring(0, 2) == "XM") { + const tag = res.substring(0, 2) + console.log(tag) + if (tag == "XM" || tag == "HT" || tag == "G7") { url = '/pages/stationDetail/stationDetail' - } else { + } else if (res.substring(0, 4) == 'ZEYI') { url = '/pages/stationDetail/ZYSite' + } else { + uni.showToast({ + title: '未知二维码', + icon: 'none' + }) + setTimeout(() => { + uni.navigateBack({ + + }) + }, 800) + return false; } - console.log(res.substring(0, 2) ) + console.log(tag) uni.redirectTo({ // url: `/pages/stationDetail/stationDetail`, url: url, @@ -134,6 +203,7 @@ diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue index 967231d..c214482 100644 --- a/pages/stationDetail/ZYSite.vue +++ b/pages/stationDetail/ZYSite.vue @@ -513,9 +513,17 @@ if (res.code === 20000) { this.siteData = res.data // this.carNumber = res.data.vehicleLicenseNum[0] - this.carNumber = res.data.vehicleLicenseNum[0] || res.data.plateNumbers[0] + if (res.data.vehicleLicenseNum) { + this.carNumber = res.data.vehicleLicenseNum[0] + } else if (res.data.plateNumbers) { + this.carNumber = res.data.plateNumbers[0] + } } else { + uni.showToast({ + title: res.msg ? res.msg : '请确认是否油站二维码', + icon: 'none' + }) setTimeout(() => { uni.navigateBack() }, 800) diff --git a/pages/stationDetail/stationDetail.vue b/pages/stationDetail/stationDetail.vue index 398b56f..1fed28e 100644 --- a/pages/stationDetail/stationDetail.vue +++ b/pages/stationDetail/stationDetail.vue @@ -156,6 +156,8 @@