Merge branch 'master' of http://121.196.213.68:3000/caoliancun/zhongPin into caolc

BagStation/pages/stationDetail/stationDetail.vue

@@ -88,7 +88,11 @@
 					<text class=" text-black ">加 {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
 							￥{{itm.discountAmount}}</text></text>
 				</view>
+<<<<<<< HEAD
 				<view class="cu-item no-border" >
+=======
+				<view class="cu-item no-border" v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
+>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
 					暂无
 				</view>
 			</view>
@@ -180,23 +184,50 @@
 			}
 		},
 		onHide() {
-			console.log('这里是hiden')
-			this.innerAudioContext.stop()
+			this.innerAudioContext && this.innerAudioContext.stop()
 		},
 		onUnload() {
-			console.log('这里是卸载页面')
-				this.innerAudioContext.stop()
+			this.innerAudioContext && this.innerAudioContext.stop()
 		},
+		
+
 		onLoad(option) { 
+			// console.log('option',option)
+			// let userInfo = uni.getStorageSync('user')
+			// if(!userInfo && option.q) {
+			// 	uni.redirectTo({
+			// 		url: `/BagAuth/pages/login/login?scanningParams=${option.q}`
+			// 	})
+			// 	return 
+			// }
+			
+			if(option.q) {
+				let originLink  = decodeURIComponent(option.q)
+				let target = this.obtainUrlPathParameterTarget(originLink)
+				console.log('target',target)
+				if(target.siteId) {
+					this.siteId = target.siteId
+					this.getSiteInfo(target.siteId) 
+				}
+				return 
+			}
+
 			if(!option.item){
 				let siteInfos = uni.getStorageSync('siteInfo') 
 				var oilItem = JSON.parse(decodeURIComponent(siteInfos)) 
 			}else{
 				var oilItem = JSON.parse(decodeURIComponent(option.item))
 			}  
+<<<<<<< HEAD
 			uni.setStorageSync('oilItem',oilItem); 
 			this.getSiteInfo(oilItem.id) 
 			this.siteId = oilItem.id
+=======
+
+			uni.setStorageSync('oilItem',oilItem)  
+			this.getSiteInfo(oilItem.siteId) 
+			this.siteId = oilItem.siteId
+>>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
 			if(oilItem.listTag == '万金油'){
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
 			}else if(oilItem.listTag == '星油'){
@@ -209,6 +240,17 @@
 			this.ContextAudio(this.audioUrl)
 		},
 		methods: {
+			obtainUrlPathParameterTarget(url) {
+				let target = {}
+				if(url.includes('?')) {
+					let paramsText = url.split("?")[1]
+					let paramsArr = paramsText.split("&")
+					paramsArr.forEach(item => {
+						target[item.split('=')[0]] = item.split('=')[1]
+					})
+				}
+				return target
+			},
 			// 生成音频文件
 			ContextAudio(url){
 				this.innerAudioContext = uni.createInnerAudioContext();
@@ -218,12 +260,11 @@
 				  console.log('开始播放');
 				});
 				this.innerAudioContext.onError((res) => {
-				  console.log(res.errMsg);
-				  console.log(res.errCode);
+				  console.log(res);
 				});
 			},
 			backTohome(){	
-				this.innerAudioContext.stop()
+				this.innerAudioContext && this.innerAudioContext.stop()
 				uni.switchTab({
 					url:'../../../pages/tabbar/home/home'
 				})
@@ -232,7 +273,7 @@
 				this.showtitle =false
 			},
 			gotoPay(){
-				this.innerAudioContext.stop()
+				this.innerAudioContext && this.innerAudioContext.stop()
 				uni.navigateTo({
 					url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
 				})
@@ -242,22 +283,19 @@
 				this.secondChannelCode = sec
 			},
 			siteQrPay() {
-					this.innerAudioContext.stop()
-				// let siteId = 
+				this.innerAudioContext && this.innerAudioContext.stop()
 				uni.navigateTo({
 					url: `/BagStation/pages/stationDetail/stieQr?siteId=${this.siteId}&activeChannelCode=${this.activeChannelCode}&secondChannelCode=${this.secondChannelCode}`
 				})
 			},
 			getSiteInfo(id) {
-				console.log('进入获取油站信息')
 				let data2 = {
 					...uni.getStorageSync('location'),
 					id: id,
 					clientBelong: "ZHONGPIN",
 					"targetApp": "SAAS", // 小程序来源
 				}
-				oilSiteApi.getSiteDetails(data2).then(res => {
-					console.log('进入获取油站信息getSiteDetails',res)
+				oilSiteApi.getSiteDetails(data2).then(res => {		
 					if (res.code == 20000) {
 						this.siteInfo = res.data;
 						console.log(this.siteInfo,'*****')
@@ -265,11 +303,10 @@
 				})
 			},
 			makePay() {
-				console.log(this.siteInfo.juli)
 				if(this.siteInfo.juli > 1000 ){
 					this.showtitle = true
 				}else{
-					this.innerAudioContext.stop()
+					this.innerAudioContext && this.innerAudioContext.stop()
 					uni.navigateTo({
 						url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
 					})
@@ -297,10 +334,11 @@
 
 			},
 			goBack() {
-					this.innerAudioContext.stop()
-				uni.navigateBack({
+					// this.innerAudioContext.stop()
 
-				})
+				uni.switchTab({
+					url: '/pages/tabbar/home/home'
+				});
 			},
 			selectRadio() {
 				this.radio === 'A' ? this.radio = '' : this.radio = 'A'