中秋更新

BagStation/pages/makeOrder/makeOrder.vue

@@ -56,7 +56,7 @@
 
 		</view> 
 		<!-- 价格 -->
-		<price-select-tab @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur" :site-name="siteInfo.siteName"
+		<price-select-tab v-if="siteInfo" :siteId='siteInfo.siteId' @onChangePayQr="onChangePayQr" @onChangePay="onChangePay" :active-cur="activeCur" :site-name="siteInfo.siteName"
 		 :channel-list="siteInfo.oilSiteChannelDetailsVos" :channelJuli="siteInfo.juli"></price-select-tab>
 		
 	</view>
@@ -77,9 +77,7 @@
 				imgURL: this.global.imgURL,
 				active: 0,
 				ColorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-				siteInfo: {
-
-				},
+				siteInfo: null,
 				activeCur:0,
 				activePay: null,
 				qrcodePay: null,
@@ -115,7 +113,8 @@
 				oilSiteApi.getSiteDetails(data2).then(res => {
 					console.log('这里是获取油站siteinfo 处',res)
 					if (res.code == 20000) {
-						this.siteInfo = res.data
+						this.siteInfo = res.data;
+						this.siteInfo = Object.assign(this.siteInfo,{siteId:id})
 					}else if(res.code == 40000){
 						this.errMsg = res.msg
 					}