星油云站更新

pages/station-info/scan-camera/scan-camera - 副本.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-content">
 		<cu-custom :isBack="true" class="main-topbar bg-main-oil" bgColor="bg-main-oil">
-			<block slot="content">扫描二维码</block>
+			<block slot="content">扫描二维码123</block>
 			<block slot="backText">返回</block>
 		</cu-custom>
 		<camera class='scan-camera' :flash="flashValue" mode="scanCode" @scancode="scancode" @initdone="initdone"

pages/station-info/scan-camera/scan-camera.vue

@@ -105,6 +105,8 @@
 				scanType: 'qrCode',
 				onlyFromCamera: false,
 				success: (resResult) => {
+					console.log('%c 扫码结果↓','color:red;font-size:30px') 
+					console.log(resResult)
 					// innerAudioContext.play()
 					console.log('play滴~')
 					let res = resResult.result
@@ -112,20 +114,34 @@
 					uni.setStorageSync('qrCode', res)
 					this.once = true
 					let url = ''
+					// console.log('这里是顺丰测试',res.substring(0,7))
 					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 {
+					// 老星油 XM  ， HT G7  ， 则一 ZEYI ，  新星油 XOIL  new则一 XINGYOU
+					if (res.indexOf('fykc') != -1 ){
+						url = '/pages/stationDetail/ZYSite?type=fykc' 
+						console.log('这里是测试福佑' ,res.substring(0,7))
+					}else if (tag == "XM" || tag == "HT" || tag == "G7") {
+						url = '/pages/stationDetail/stationDetail?type=G7'
+					} else   if (res.indexOf('ZEYI') != -1 ){
+						console.log('这里是测试则一sss' ,res.substring(0,7))
+						url = '/pages/stationDetail/ZYSite?type=ZEYI' 
+					} else   if (res.substring(0, 4) == 'XING' || res.substring(0, 4) == 'XOIL'   ) {
+						console.log('这里是测试XING' ,res.substring(0,7))
+						url = '/pages/stationDetail/ZYSite?type=xoli' 
+					} else if (res.substring(0,8) == 'SHUNFENG') {
+						console.log('这里是顺丰')
+						url = '/pages/stationDetail/ZYSite?type=shunfeng'
+					} else if (res.substring(0, 4) == 'RIRI'){
+							url = '/pages/stationDetail/ZYSite?type=RIRISHUN'
+					} else if (res.indexOf('OP') != -1 ){
+							url = '/pages/stationDetail/openStationDetail'  
+					}else{
 						uni.showToast({
 							title: '未知二维码',
 							icon: 'none'
 						})
 						setTimeout(() => {
 							uni.navigateBack({
-
 							})
 						}, 800)
 						return false;

pages/station-info/station-info.vue

@@ -12,7 +12,7 @@
 					<view class="cu-list bg-white position-re move-top">
 						<view class="cu-item bg-white padding-sm ">
 							<view class="text-bold color-333 text-xl">
-								{{site.oilSiteName}}
+								{{site.siteName}}
 							</view>
 							<view class="color-999">
 								{{site.address}}
@@ -49,6 +49,7 @@
 <script>
 	import cloudSiteApi from '@/api/cloud-site.js'
 	import OilMenuItem from '@/components/oil-menu-item.vue'
+	import oliSiteApi from '@/api/oli-site.js'
 	export default {
 		components: {
 			OilMenuItem
@@ -58,6 +59,7 @@
 				mainURL: this.global.mainURL,
 				title: 'Hello',
 				site: {},
+				channelId:uni.getStorageSync('channelId'),
 				cuIconList: [{
 						cuIcon: 'location',
 						color: 'red',
@@ -111,10 +113,11 @@
 				})
 			},
 			getSiteInfo() {
-				cloudSiteApi.getSiteDetail().then(res => {
+				oliSiteApi.getSiteDetail(this.channelId).then(res => {
 					if (res.code === 20000) {
 						this.site = res.data.site
 						this.oilList = res.data.oil
+						console.log(this.oilList,'油站信息列表')
 						uni.setStorage({
 							key: 'oilSiteName',
 							data: res.data.site.oilSiteName