12

BagStation/pages/stationDetail/stationDetail.vue

@@ -17,7 +17,7 @@
 							{{siteInfo.address}}
 						</view>
 						<view class="font-12 color-999 site-label text-cut">
-							营业时间 00:00 至 23:59
+							营业时间 00:00 至 23:59 
 						</view>
 					</view>
 					<view class="action " @tap="openMap">
@@ -88,12 +88,12 @@
 					<text class=" text-black ">加 {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
 							￥{{itm.discountAmount}}</text></text>
 				</view>
-				<view class="cu-item no-border" v-if="!siteInfo.oilSiteOrderInfoVos.length">
+				<view class="cu-item no-border" >
 					暂无
 				</view>
-
 			</view>
 			<!-- 底部去支付 -->
+			
 			<view class="" v-if="activePay||qrcodePay">
 				<view class="btn bg-white placeholder-hidden">
 					<view class="flex bg-white padding flex-direction">
@@ -194,9 +194,9 @@
 			}else{
 				var oilItem = JSON.parse(decodeURIComponent(option.item))
 			}  
-			uni.setStorageSync('oilItem',oilItem)  
-			this.getSiteInfo(oilItem.siteId) 
-			this.siteId = oilItem.siteId
+			uni.setStorageSync('oilItem',oilItem); 
+			this.getSiteInfo(oilItem.id) 
+			this.siteId = oilItem.id
 			if(oilItem.listTag == '万金油'){
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
 			}else if(oilItem.listTag == '星油'){
@@ -252,13 +252,15 @@
 				console.log('进入获取油站信息')
 				let data2 = {
 					...uni.getStorageSync('location'),
-					siteId: id,
-					clientBelong: "ZHONGPIN"
+					id: id,
+					clientBelong: "ZHONGPIN",
+					"targetApp": "SAAS", // 小程序来源
 				}
 				oilSiteApi.getSiteDetails(data2).then(res => {
 					console.log('进入获取油站信息getSiteDetails',res)
 					if (res.code == 20000) {
-						this.siteInfo = res.data
+						this.siteInfo = res.data;
+						console.log(this.siteInfo,'*****')
 					}
 				})
 			},