星油云站更新

packageQr/components/OrderOil.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="content text-left padding">
 			<view class="strong padding-bottom-xs color-333 ">
-				{{oilSite.oilSiteName}}
+				{{oilSite.siteName}}
 			</view>
 			<view class="font-12 color-999">
 				<text class=" text-cut">{{oilSite.address}}</text>
@@ -14,16 +14,16 @@
 			</view>
 			<view class="grid col-5 justify-start">
 				<view class="padding-xs" v-for="(item,index) in oilList" :key="index">
-					<button class="cu-btn" @tap="oilNameSel(item)" :class="[selected.oilName===item.oilName?'bg-main-oil':'line-gray']">{{item.oilName}}</button>
+					<button class="cu-btn" @tap="oilNameSel(item)" :class="[selected.otherOilsName===item.otherOilsName?'bg-main-oil':'line-gray']">{{item.otherOilsName}}</button>
 				</view>
 			</view>
 		</view>
 		<view class="padding-top-xs padding-left padding-right">
 			<text class="strong padding-right font-16">
-				{{selected.oilName}}
+				{{selected.otherOilsName}}
 			</text>
-			<text class="padding-right">星油价格:<text class="oil-main-color text-bold">￥{{selected.xkPrice?selected.xkPrice:selected.lvPrice|numberFilter}}/L</text></text>
-			<text class="s-rich">市场价:￥{{selected.standardPrice|numberFilter}}/L</text>
+			<text class="padding-right">星油价格:<text class="oil-main-color text-bold">￥{{selected.sitePrice|numberFilter}}/L</text></text>
+			<text class="s-rich">市场价:￥{{selected.marketPrice|numberFilter}}/L</text>
 		</view>
 		<view class="padding-left padding-right">
 			<view class="padding-bottom-sm">
@@ -56,6 +56,7 @@
 </template>
 
 <script>
+	import OliSiteApi from '@/api/oli-site.js'
 	export default {
 		props: {
 			oilList: {
@@ -67,6 +68,7 @@
 			return {
 				active: 0,
 				vol: '',
+				userInfo:uni.getStorageSync('loginUser'),
 				oliNameList: [1, 2, 9, 10],
 				ColorList: [1, 2, 9, 10],
 				gunId: 0,
@@ -112,7 +114,7 @@
 			},
 			oilNameSel(item) {
 				this.selected = item
-
+				console.log(item)
 			},
 			initForm() {
 				if (this.oilList[0]) {
@@ -120,20 +122,36 @@
 				}
 			},
 			onConfirm() {
-				const data5 = {
-					...this.selected,
-					vol: this.vol,
-					oilPrice: this.selected.xkPrice ? this.selected.xkPrice : this.selected.lvPrice,
-					gunId: this.gunId + 1,
-					realPay: this.money.realPay
+				// const data5 = {
+				// 	...this.selected,
+				// 	volume: this.vol,
+				// 	oilPrice: this.selected.sitePrice,
+				// 	gunId: this.gunId + 1,
+				// 	price: this.money.realPay
+				// }
+				console.log(this.oilSite)
+				const datas = {
+					 channelId: this.oilSite.siteCode,    
+					 siteName:this.oilSite.siteName,    
+					 staffId: this.userInfo.id,    
+					 refuelDetail: {        
+						oilsBarNum: this.gunId + 1,       
+						oilProductCode:this.selected.oilProductCode,       
+						otherOilsName: this.selected.otherOilsName,       
+						price:this.money.realPay,        
+						volume:this.vol
+					}
 				}
-				this.$emit('confirmVol', data5)
+				console.log(datas)
+				this.$emit('confirmVol', datas)
 			},
 			calcMoney(e) {
-				this.price = this.selected.xkPrice ? this.selected.xkPrice : this.selected.lvPrice
-				this.money.total = this.vol * this.selected.standardPrice
-				this.money.discount = this.vol * (this.selected.standardPrice - this.price)
-				this.money.realPay = (this.money.total - this.money.discount).toFixed(2)
+				this.price = this.selected.sitePrice  
+				console.log(this.price)
+				this.money.total = this.vol * this.selected.marketPrice
+				console.log(this.money.total)
+				this.money.discount = this.vol * (this.selected.marketPrice - this.price)
+				this.money.realPay = this.vol * this.selected.sitePrice  
 			}
 		},
 		filters: {