From d0953d12ff1f8c09c7402921a12d30d1a840674a Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Thu, 20 Jul 2023 17:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/price-select-tab.vue     | 1069 +++++++++--------
 BagStation/pages/components/price-tab.vue     |   24 +-
 2 files changed, 590 insertions(+), 503 deletions(-)

diff --git a/BagStation/pages/components/price-select-tab.vue b/BagStation/pages/components/price-select-tab.vue
index 546e26b..44f8592 100644
--- a/BagStation/pages/components/price-select-tab.vue
+++ b/BagStation/pages/components/price-select-tab.vue
@@ -8,8 +8,9 @@
 			</view>
 		</view>
 		<scroll-view scroll-x class=" nav text-center">
-			<view class="cu-item" v-for="(item,index) in channelList" v-if="index==activeCur" :class="index==activeCur?'text-red cur':''" :key="item.channelId"
-			 @tap="tabSelect" :data-id="index" :data-channel-code="item.channelCode">
+			<view class="cu-item" v-for="(item,index) in channelList" v-if="index==activeCur"
+				:class="index==activeCur?'text-red cur':''" :key="item.channelId" @tap="tabSelect" :data-id="index"
+				:data-channel-code="item.channelCode">
 				<image class="site-icon margin-right-sm" :src="imgURL+'site-'+item.channelCode+'.png'" mode="widthFix">
 				</image>
 				{{item.channelCode|channelCodeFamt}}
@@ -19,9 +20,11 @@
 		</scroll-view>
 		<radio-group class="block" @change="changePrice">
 			<view class="cu-list menu text-left">
-				<view class="cu-item" v-for="(itemx,index) in oilSitePriceDetailsVo" :key="index" v-if="itemx.sitePrice>0">
+				<view class="cu-item" v-for="(itemx,index) in oilSitePriceDetailsVo" :key="index"
+					v-if="itemx.sitePrice>0">
 					<label class="flex justify-between align-center flex-sub">
-						<radio class="round red" :class="radio=='radio' + index?'checked':''" :checked="radio==index?true:false" :value="index"></radio>
+						<radio class="round red" :class="radio=='radio' + index?'checked':''"
+							:checked="radio==index?true:false" :value="index"></radio>
 						<text class="cu-tag my-tag line-red text-lg">
 							惠
 						</text>
@@ -29,7 +32,8 @@
 						<!-- !=0?itemx.sitePrice:'-.--' -->
 						<text class="text-bold text-red text-lg">￥{{moneyIntercept(itemx.sitePrice)}}/L</text>
 						<text class="text-delete">￥{{itemx.oilSitePrice}}/L</text>
-						<text class="text-sm">预计每100L节省{{(100*(itemx.oilSitePrice - itemx.sitePrice))|moneyForMath}}元</text>
+						<text
+							class="text-sm">预计每100L节省{{(100*(itemx.oilSitePrice - itemx.sitePrice))|moneyForMath}}元</text>
 					</label>
 				</view>
 			</view>
@@ -40,14 +44,17 @@
 				<text>油枪选择</text>
 				<view class="padding-top-sm">
 					<view class="grid col-5 ">
-						<view  v-for="(item,index) in checkBar" class="padding-xs" :key="index">
-							<button class="cu-btn red  block" :class="item.checked?'bg-red':'line-red'" @tap="ChooseBar(item)" :data-value="item.value">
+						<view v-for="(item,index) in checkBar" class="padding-xs" :key="index">
+							<button class="cu-btn red  block" :class="item.checked?'bg-red':'line-red'"
+								@tap="ChooseBar(item)" :data-value="item.value">
 								{{item.name}}
-								<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view>
+								<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'"
+									v-if="item.hot">HOT</view>
 							</button>
 						</view>
-						<view  class="padding-xs" style="width:40% ;" v-if="activeChannelCode!='TY'&&!typeChenk()">
-							<input  type="number" @input="onInputBar" v-model="inputBar" class="cu-btn red  block" placeholder="其他油枪" value="" />
+						<view class="padding-xs" style="width:40% ;" v-if="activeChannelCode!='TY'&&!typeChenk()">
+							<input type="number" @input="onInputBar" v-model="inputBar" class="cu-btn red  block"
+								placeholder="其他油枪" value="" />
 						</view>
 					</view>
 				</view>
@@ -56,26 +63,32 @@
 
 		<view class="UpFileBox" v-if="isOtherUser">
 			<view class="UpFileBoxMain">
-				<view class="plateNumber_box" >
+				<view class="plateNumber_box">
 					<view class="text-title">司机车牌</view>
 					<view class="text-img">
-						<image src="../../../static/img/upload.png" style="width:260upx;height: 160upx;" v-if='isPlateNumber' @tap='upPlateNumber'mode="aspectFill"></image>
-						<image :src="PlateNumberImages"  style="width:260upx;height:160upx;"  mode="aspectFill" v-else></image>
-						<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close_red.png"  v-if='!isPlateNumber'  @tap='cleraPlateNumber'  class="close_Img" mode="aspectFill"></image>
+						<image src="../../../static/img/upload.png" style="width:260upx;height: 160upx;"
+							v-if='isPlateNumber' @tap='upPlateNumber' mode="aspectFill"></image>
+						<image :src="PlateNumberImages" style="width:260upx;height:160upx;" mode="aspectFill" v-else>
+						</image>
+						<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close_red.png"
+							v-if='!isPlateNumber' @tap='cleraPlateNumber' class="close_Img" mode="aspectFill"></image>
 					</view>
 					<view class="text-p">需可识别车牌号</view>
 				</view>
 				<view class="refuellerImages">
-					<view class="text-title" >油机照片</view>
+					<view class="text-title">油机照片</view>
 					<view class="text-img">
-						<image src="../../../static/img/upload.png"   style="width:260upx;height:160upx;" v-if='isUefueller' @tap='upUefueller' mode="aspectFill"></image>
-						<image :src="refuellerImages"  style="width:260upx;height:160upx;" v-else mode="aspectFill"></image> 
-						<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close_red.png"  v-if='!isUefueller'  @tap='cleraUefueller'  class="close_Img"  mode="aspectFill"></image>
+						<image src="../../../static/img/upload.png" style="width:260upx;height:160upx;"
+							v-if='isUefueller' @tap='upUefueller' mode="aspectFill"></image>
+						<image :src="refuellerImages" style="width:260upx;height:160upx;" v-else mode="aspectFill">
+						</image>
+						<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close_red.png"
+							v-if='!isUefueller' @tap='cleraUefueller' class="close_Img" mode="aspectFill"></image>
 					</view>
-					<view class="text-p" >需包含加油升数和价格</view>
+					<view class="text-p">需包含加油升数和价格</view>
 				</view>
 			</view>
-		<!-- <uni-file-picker :value='plateNumberValue' @success='successplateNumber' auto-upload='true' @fail='failplateNumber' limit='1' file-mediatype='image' mode='grid' /> -->
+			<!-- <uni-file-picker :value='plateNumberValue' @success='successplateNumber' auto-upload='true' @fail='failplateNumber' limit='1' file-mediatype='image' mode='grid' /> -->
 		</view>
 		<view class="margin solid margin-top-0 radius">
 			<form>
@@ -121,20 +134,24 @@
 						油机金额
 					</view>
 					<view class="text-center" style="width: 60%;margin: 0 2%;">
-						<input v-model="vol" @input="checkeNumber"  @blur="getMoneyVol" type="digit" class="block" placeholder="请输入油机金额" value=""style="border-bottom: 1px solid #efefef;" />
+						<input v-model="vol" @input="checkeNumber" @blur="getMoneyVol" type="digit" class="block"
+							placeholder="请输入油机金额" value="" style="border-bottom: 1px solid #efefef;" />
 					</view>
 					<view class="">
 						<text class=" padding-right-sm">
-							 约{{vlom?vlom :'' | moneyVolm}}L 
-						</text> 
+							约{{vlom?vlom :'' | moneyVolm}}L
+						</text>
 					</view>
 				</view>
 				<view class="grid col-5 padding-sm">
 					<view v-for="(item,index) in checkMoney" class="padding-xs" :key="index">
-						<button class="cu-btn red  block" style="    padding: 0;" :class="item.checked?'bg-red':'line-red'" @tap="ChooseCheckMoney(item.value)" :data-value="item.value">
-							{{item.name}}&yen;  
-							<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view>
-						</button> 
+						<button class="cu-btn red  block" style="    padding: 0;"
+							:class="item.checked?'bg-red':'line-red'" @tap="ChooseCheckMoney(item.value)"
+							:data-value="item.value">
+							{{item.name}}&yen;
+							<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'"
+								v-if="item.hot">HOT</view>
+						</button>
 					</view>
 				</view>
 			</view>
@@ -148,7 +165,8 @@
 						加油金额
 					</view>
 					<view class="text-center">
-						<input v-model="ty.realMoney" @input="onInputTyMoney" type="digit" class="block" placeholder="加油金额" value="" />
+						<input v-model="ty.realMoney" @input="onInputTyMoney" type="digit" class="block"
+							placeholder="加油金额" value="" />
 					</view>
 					<view class="">
 						<text class="text-bold padding-right-sm">
@@ -159,9 +177,11 @@
 				</view>
 				<view class="grid col-5 padding-sm" v-if="activeChannelCode!='TY'">
 					<view v-for="(item,index) in checkVol" class="padding-xs" :key="index">
-						<button class="cu-btn red  block" :class="item.checked?'bg-red':'line-red'" @tap="ChooseCheckVol" :data-value="item.value">
+						<button class="cu-btn red  block" :class="item.checked?'bg-red':'line-red'"
+							@tap="ChooseCheckVol" :data-value="item.value">
 							{{item.name}}
-							<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'" v-if="item.hot">HOT</view>
+							<view class="cu-tag sm round" :class="item.checked?'bg-white text-red':'bg-red'"
+								v-if="item.hot">HOT</view>
 						</button>
 
 					</view>
@@ -204,8 +224,10 @@
 			<view class="margin cu-list  pay-bar menu radius solid-top solid-bottom solid-left">
 				<view class="cu-item ">
 					<view class="">
-						合计：<text class="text-red fr" v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text>
-						<text class="text-red fr" v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text>
+						合计：<text class="text-red fr"
+							v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text>
+						<text class="text-red fr"
+							v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text>
 					</view>
 					<view class="" @tap="showOrderMsg">
 						明细<text class="cuIcon-unfold padding-left-xs"></text>
@@ -233,12 +255,13 @@
 						</view>
 						<view class="padding-tb-xs text-left">
 							油品油枪：
-							<text class="fr">{{oilProductCode?oilProductCode:''}} {{oilBar?(checkBar.filter(item=>oilBar==item.value)[0].name||oilBar)+'号枪':'未选择油枪'}}</text>
+							<text class="fr">{{oilProductCode?oilProductCode:''}}
+								{{oilBar?(checkBar.filter(item=>oilBar==item.value)[0].name||oilBar)+'号枪':'未选择油枪'}}</text>
 						</view>
 						<view class="" v-if="activeChannelCode!='TY'">
 							<view class="padding-tb-xs margin-bottom text-left">
-								加油升数： 
-								<text class="fr">{{vlom?'约' :''}}{{vlom?vlom :'' | moneyVolm}}  L </text>
+								加油升数：
+								<text class="fr">{{vlom?'约' :''}}{{vlom?vlom :'' | moneyVolm}} L </text>
 							</view>
 							<view class=" dashed-top margin-top padding-top text-left">
 								加油金额：
@@ -254,11 +277,12 @@
 								加油金额： <text class="fr">{{ty.realMoney>0?ty.realMoney:'xxx.x'|moneyForMath}}</text>
 							</view>
 							<view class="padding-tb-xs margin-bottom text-left">
-								加油升数：  <text class="fr" >{{ tyRes.liter?tyRes.liter+'L':''}}</text>
+								加油升数： <text class="fr">{{ tyRes.liter?tyRes.liter+'L':''}}</text>
 							</view>
 							<view class="padding-tb-xs text-left">
 								直降金额：
-								<text class="text-red fr">{{tyRes.depreciateAmount>0?tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text>
+								<text
+									class="text-red fr">{{tyRes.depreciateAmount>0?tyRes.depreciateAmount:'xxx.x'|moneyForMath}}</text>
 							</view>
 						</view>
 						<view class="padding-tb-xs text-left">
@@ -267,15 +291,18 @@
 						</view>
 						<view class="padding-tb-xs text-left">
 							合计：
-							<text class="text-red fr" v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text>
+							<text class="text-red fr"
+								v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}</text>
 							<text class="text-red fr" v-else>{{ty.realMoney>0?ty.realMoney:'xxx.x' }}</text>
 						</view>
-					</view> 
+					</view>
 					<view class="cu-list margin pay-bar menu radius solid-top solid-bottom solid-left">
 						<view class="cu-item ">
 							<view class="">
-								合计：<text class="text-red" v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}元</text>
-								<text class="text-red" v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}元</text>
+								合计：<text class="text-red"
+									v-if="activeChannelCode!='TY'">{{realMoney>0?realMoney:'xxx.x'|moneyForMath}}元</text>
+								<text class="text-red"
+									v-else>{{ty.realMoney>0?ty.realMoney-tyRes.depreciateAmount:'xxx.x'|moneyForMath}}元</text>
 							</view>
 							<view class="" @tap="showOrder=''">
 								明细<text class="cuIcon-fold padding-left-xs"></text>
@@ -288,30 +315,32 @@
 				</view>
 			</view>
 		</view>
-	<view class=" cu-modal show" v-show="showtitle">
-		<view class="cu-dialog overflow-unset dialog-box box-paddings">
-			<view class="close-icon" @tap="hidendialog">
-				<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
-			</view>
-			<view class="">
-				<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
-			</view>
-			<view class="cu-bar box-panding text-centerS" >
-			<text class="headShow">	 支付提醒 </text>
-			</view>
-			<view class="cu-bar box-panding" >
-				<text class="showtext">当前油站距离您较远，请与加油员确认您选择的油站是否正确。</text>
-			</view>
-			<view class="checklocation_box_button">
-				<view class="cu-tn btn-box red_btn" @tap="backTohome">
-					返回油站列表
+		<view class=" cu-modal show" v-show="showtitle">
+			<view class="cu-dialog overflow-unset dialog-box box-paddings">
+				<view class="close-icon" @tap="hidendialog">
+					<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode=""
+						style="width:50rpx;height: 50rpx;"></image>
 				</view>
-				<view class="cu-tn btn-box" @tap="gotoPay">
-					确认下单
+				<view class="">
+					<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode=""
+						style="width:100rpx;height: 100rpx;"></image>
+				</view>
+				<view class="cu-bar box-panding text-centerS">
+					<text class="headShow"> 支付提醒 </text>
+				</view>
+				<view class="cu-bar box-panding">
+					<text class="showtext">当前油站距离您较远，请与加油员确认您选择的油站是否正确。</text>
+				</view>
+				<view class="checklocation_box_button">
+					<view class="cu-tn btn-box red_btn" @tap="backTohome">
+						返回油站列表
+					</view>
+					<view class="cu-tn btn-box" @tap="gotoPay">
+						确认下单
+					</view>
 				</view>
 			</view>
 		</view>
-	</view> 
 		<view class="cu-modal bottom-modal " :class="showPlate">
 			<view class="cu-dialog bg-white">
 				<view class="cu-bar bg-white justify-end">
@@ -329,16 +358,16 @@
 						<input style="flex: 1;" type="text" value="" placeholder="请选择或输入车牌号" v-model="plateNumber" />
 						<uni-icons v-if="plateNumber" @tap=" plateNumber=''; " type="clear" size="20"></uni-icons>
 					</view>
-					<picker-view :indicator-style="indicatorStyle" v-if="plateNumbers.length" :value="plateIndex" @change="pickPlate"
-					 class="picker-view">
+					<picker-view :indicator-style="indicatorStyle" v-if="plateNumbers.length" :value="plateIndex"
+						@change="pickPlate" class="picker-view">
 						<picker-view-column>
 							<view class="item" v-for="(item,index) in plateNumbers" :key="index">{{item}}</view>
 						</picker-view-column>
 					</picker-view>
 				</view>
 			</view>
-		</view> 
-	</view> 
+		</view>
+	</view>
 </template>
 
 <script>
@@ -354,7 +383,7 @@
 				type: Array,
 				default () {}
 			},
-			channelJuli:{
+			channelJuli: {
 				type: Number,
 				default: ''
 			},
@@ -366,29 +395,29 @@
 				type: Number,
 				default: 0
 			},
-			isOther:{
-				type:Boolean,
-				default:false
+			isOther: {
+				type: Boolean,
+				default: false
 			},
-			siteId:{
-				type:String,
-				default:''
-				
+			siteId: {
+				type: String,
+				default: ''
+
 			}
 		},
 		data() {
 			return {
-				thirdPartyDynamicData:['LAIYOU'],
-				vlom:'',
-				discount:'',
-				activeSitePrice:'',
-				PlateNumberImages:'',
-				isOtherUser:false, // 判断是否为卡力用户
-				isPlateNumber:true,
-				isUefueller:true,
-				refuellerImages:'',
-				showtitles:"",
-				showtitle:false,
+				thirdPartyDynamicData: ['LAIYOU'],
+				vlom: '',
+				discount: '',
+				activeSitePrice: '',
+				PlateNumberImages: '',
+				isOtherUser: false, // 判断是否为卡力用户
+				isPlateNumber: true,
+				isUefueller: true,
+				refuellerImages: '',
+				showtitles: "",
+				showtitle: false,
 				oilBarTy: '',
 				ty: {
 					realMoney: ""
@@ -397,7 +426,7 @@
 					liter: '',
 					depreciateAmount: ''
 				},
-				OtherUser:uni.getStorageSync('otherUserInfo'),
+				OtherUser: uni.getStorageSync('otherUserInfo'),
 				value: '',
 				visible: true,
 				indicatorStyle: `height: 50px;`,
@@ -411,14 +440,14 @@
 				vol: '',
 				oilSitePriceDetailsVo: [],
 				siteUserNames: [],
-				setplateNumbers:'',
+				setplateNumbers: '',
 				plateNumbers: [],
 				showPlate: "",
 				showOrder: '',
 				radio: 0,
 				imgURL: this.global.imgURL,
 				scrollLeft: 0,
-				checkMoney:[{
+				checkMoney: [{
 					value: 100,
 					name: '100 ',
 					checked: false,
@@ -445,7 +474,7 @@
 					hot: false,
 				}],
 				checkVol: [{
-						value: 100,
+					value: 100,
 					name: '100L',
 					checked: false,
 					hot: false,
@@ -474,21 +503,21 @@
 				checkbox: [],
 				activeChannelCode: '',
 				checkBar: [],
-				realMoney:'',
-				xoilAmountGun:''
+				realMoney: '',
+				xoilAmountGun: ''
 			}
 		},
 		created() {
 			let oilItem = uni.getStorageSync('oilItem'),
 				oilSite = uni.getStorageSync(''),
-				 otherUser = uni.getStorageSync('otherUserInfo')
-				 if(otherUser){
-					 // console.log('这里是卡里')
-					 this.isOtherUser = true
-				 }else{
-					 // console.log('这里是非卡力')
-				 } 
-				 console.log('oilItem',oilItem)
+				otherUser = uni.getStorageSync('otherUserInfo')
+			if (otherUser) {
+				// console.log('这里是卡里')
+				this.isOtherUser = true
+			} else {
+				// console.log('这里是非卡力')
+			}
+			console.log('oilItem', oilItem)
 			this.showtitles = oilItem.listTag;
 			this.init()
 		},
@@ -497,25 +526,26 @@
 				handler(newval) {
 					// console.log('activeChannelCode')
 					this.oilBar = ''
-					setTimeout(async() => {
-						this.checkBar = (this.typeChenk())? await this.dynamic() : this.calcBar()
+					setTimeout(async () => {
+						this.checkBar = (this.typeChenk()) ? await this.dynamic() : this.calcBar()
 					}, 2)
 				}
 			},
-			priceId: {   
+			priceId: {
 				handler(newval) {
 					// console.log('priceId')
 					this.oilBar = ''
-					setTimeout(async() => {
-						this.checkBar = (this.typeChenk())? await this.dynamic() : this.calcBar()
+					setTimeout(async () => {
+						this.checkBar = (this.typeChenk()) ? await this.dynamic() : this.calcBar()
 					}, 2)
 				}
 			},
 		},
 		computed: {
-			
+
 			priceId() {
-				if (this.channelList.length && this.channelList[this.activeCur] && this.oilSitePriceDetailsVo[this.radio]) {
+				if (this.channelList.length && this.channelList[this.activeCur] && this.oilSitePriceDetailsVo[this
+						.radio]) {
 					return this.oilSitePriceDetailsVo[this.radio].priceId
 				}
 			},
@@ -529,8 +559,8 @@
 			},
 			plateNumberSel() {
 				if (this.plateNumbers.length) {
-					this.plateNumber  = this.plateNumbers[this.plateIndex]
-					return this.plateNumbers[this.plateIndex]?this.plateNumbers[this.plateIndex]:'为必填'
+					this.plateNumber = this.plateNumbers[this.plateIndex]
+					return this.plateNumbers[this.plateIndex] ? this.plateNumbers[this.plateIndex] : '为必填'
 				}
 			},
 			jober() {
@@ -540,7 +570,7 @@
 			},
 			totalMoney() {
 				// // console.log('this.oilSitePriceDetailsVo[this.radio]', this.oilSitePriceDetailsVo[this.radio])
-				if (this.vol > 0 && this.oilSitePriceDetailsVo[this.radio]) { 
+				if (this.vol > 0 && this.oilSitePriceDetailsVo[this.radio]) {
 					// console.log('+++++++++++')
 					// console.log(this.vol)
 					// console.log(this.oilSitePriceDetailsVo[this.radio])
@@ -568,248 +598,263 @@
 			}
 		},
 		methods: {
-			typeChenk(){
-				 return  this.channelList[this.activeCur]?.secondChannelCode&&this.thirdPartyDynamicData.includes(this.channelList[this.activeCur].secondChannelCode)
+			typeChenk() {
+				return this.channelList[this.activeCur]?.secondChannelCode && this.thirdPartyDynamicData.includes(this
+					.channelList[this.activeCur].secondChannelCode)
 			},
-			init(){
+			init() {
 				//生成油枪数据 原来在data里写死的1-8号油枪数据；新加 clc 2022-3-18
-				for(let i=0;i<30;i++){
+				for (let i = 0; i < 30; i++) {
 					this.checkbox.push({
-							value: i+1,
-							name: i+1,
-							checked: false,
-							hot: false,
-						})
+						value: i + 1,
+						name: i + 1,
+						checked: false,
+						hot: false,
+					})
 				};
-				
+
 			},
-			ifFn(e){
+			ifFn(e) {
 				// if(this.oilSitePriceDetailsVo[this.radio].oilsBar==null){
 				// 	return true 
 				// }else if(this.oilSitePriceDetailsVo[this.radio].oilsBar.split(',').indexOf(e.name)!==-1){
 				// 	return true
 				// }
 			},
-			checkeNumber(e){
+			checkeNumber(e) {
 				e.detail.value = e.detail.value.match(/^\d*(\.?\d{0,2})/g)[0] || null;
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.vol = e.detail.value
 				})
 			},
-			checkMoneyVol(e){
+			checkMoneyVol(e) {
 				console.log(e)
-				if(e  == ''){
+				if (e == '') {
 					uni.showToast({
-						title:'请输入金额',
-						icon:'none'
+						title: '请输入金额',
+						icon: 'none'
 					})
 					return
 				}
 				let isNumber = this.isNumber(e)
-				if(!isNumber){
-						uni.showToast({
-							title:'请输入正确金额',
-							icon:'none'
-						})
-					 return
+				if (!isNumber) {
+					uni.showToast({
+						title: '请输入正确金额',
+						icon: 'none'
+					})
+					return
 				}
 				let number = {
-					payType:'CUSTOMER_ACTIVE',
-					userType:'1',
-					xoilAmountGun:e,
-					priceId:this.activeSitePrice
-				} 
-				this.xoilAmountGun = e 
-				oilSiteApi.getOrderDiscountInfo(number).then( res=>{
+					payType: 'CUSTOMER_ACTIVE',
+					userType: '1',
+					xoilAmountGun: e,
+					priceId: this.activeSitePrice
+				}
+				this.xoilAmountGun = e
+				oilSiteApi.getOrderDiscountInfo(number).then(res => {
 					console.log(res)
 					this.realMoney = res.data.payRealAmount
-					this.discount = res.data.oilDiscountAmount 
-					this.vlom =  res.data.volume 
+					this.discount = res.data.oilDiscountAmount
+					this.vlom = res.data.volume
 				})
 			},
-			ChooseCheckMoney(e){
+			ChooseCheckMoney(e) {
 				console.log(e)
-				this.vol = e+''
-				this.checkMoneyVol(this.vol )
+				this.vol = e + ''
+				this.checkMoneyVol(this.vol)
 			},
-			isNumber(value){ //判断是否为正常数字
+			isNumber(value) { //判断是否为正常数字
 				const regPos = /^\d+(\.\d+)?$/; //非负浮点数
 				const regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //负浮点数
-				if(value.indexOf('-') != -1){
+				if (value.indexOf('-') != -1) {
 					return false
 				}
-				if( regPos.test(value) || regNeg.test(value)){ 
+				if (regPos.test(value) || regNeg.test(value)) {
 					return true
-				}else{
+				} else {
 					return false
 				}
 			},
-			getMoneyVol(e){
-				if(e.detail.value == ''){
+			getMoneyVol(e) {
+				if (e.detail.value == '') {
 					uni.showToast({
-						title:'请输入金额',
-						icon:'none'
+						title: '请输入金额',
+						icon: 'none'
 					})
 					return
 				}
 				let isNumber = this.isNumber(e.detail.value)
-				if(!isNumber){
-						uni.showToast({
-							title:'请输入正确金额',
-							icon:'none'
-						})
-					 return
+				if (!isNumber) {
+					uni.showToast({
+						title: '请输入正确金额',
+						icon: 'none'
+					})
+					return
 				}
-				
+
 				let number = {
-					payType : 'CUSTOMER_ACTIVE',
-					userType:'1',
-					xoilAmountGun:e.detail.value,
-					priceId:this.activeSitePrice,
-					
-				} 
+					payType: 'CUSTOMER_ACTIVE',
+					userType: '1',
+					xoilAmountGun: e.detail.value,
+					priceId: this.activeSitePrice,
+
+				}
 				this.xoilAmountGun = e.detail.value
-				oilSiteApi.getOrderDiscountInfo(number).then( res=>{
+				oilSiteApi.getOrderDiscountInfo(number).then(res => {
 					console.log(res)
 					this.realMoney = res.data.payRealAmount
-					this.discount = res.data.oilDiscountAmount 
-					this.vlom =  res.data.volume 
+					this.discount = res.data.oilDiscountAmount
+					this.vlom = res.data.volume
 				})
 			},
-			cleraPlateNumber(){
+			cleraPlateNumber() {
 				this.PlateNumberImages = ''
 				this.isPlateNumber = true
-				this.plateNumber =''
+				this.plateNumber = ''
 			},
-			cleraUefueller(){
+			cleraUefueller() {
 				this.refuellerImages = ''
 				this.isUefueller = true
 			},
-			upPlateNumber(){
-				this.upImages( 'car' )
+			upPlateNumber() {
+				this.upImages('car')
 			},
-			upUefueller(){
-				this.upImages( 'Uefueller' )
+			upUefueller() {
+				this.upImages('Uefueller')
 			},
-			upImages(type){
-				let _that=this
+			upImages(type) {
+				let _that = this
 				uni.chooseImage({
 					count: 1, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					// sourceType: ['album'], //从相册选择
-					success: function (res) {
+					success: function(res) {
 						console.log(res)
 						console.log('进入1')
 						const JSESSIONID = utils.uuid()
 						uni.uploadFile({
 							// https://www.xingoil.com/adminapi
 							// http://q423f36269.zicp.vip:27289
-							url:'http://192.168.0.47:38080/oil-oss/obejct/uploadFile',
-							filePath:res.tempFilePaths[0],
-							formData:{ 
-								ossKey:'xingyou',
-								pathKey:'certificate',
-								encrypt:'PUBLIC',
-							 },
-							name:'file',
-							header:{
+							url: 'http://192.168.0.47:38080/oil-oss/obejct/uploadFile',
+							filePath: res.tempFilePaths[0],
+							formData: {
+								ossKey: 'xingyou',
+								pathKey: 'certificate',
+								encrypt: 'PUBLIC',
+							},
+							name: 'file',
+							header: {
 								"Content-Type": "multipart/form-data",
 								"Authorization": uni.getStorageSync('Authorization'),
-								'dataSources' : 'MP',
-								"imei" : uni.getStorageSync('unionid'),
-								"openId" : uni.getStorageSync('openid'),
+								'dataSources': 'MP',
+								"imei": uni.getStorageSync('unionid'),
+								"openId": uni.getStorageSync('openid'),
 								'JSESSIONID': JSESSIONID,
-								'token':utils.md5Salt(JSESSIONID)
+								'token': utils.md5Salt(JSESSIONID)
 							},
 							success(e) {
 								console.log('进入2')
-							  	console.log(e)
-								let obj = JSON.parse(e.data) ,
-									url =obj.data.publicUrl  
-									if(type == 'car'){
-										let data = {
-											plateNumberImage : obj.data.publicUrl  
-										}
-										_that.PlateNumberImages = url
-										console.log('这里是司机车牌',url) 
-										_that.isPlateNumber = false
-										oilSiteApi.plateNumberRecognition(data).then((res)=>{
-											let obj = JSON.parse(res.data) 
-											console.log(obj)
-											_that.plateNumber = obj.NUMBER
-										})
-									}else{
-										_that.refuellerImages = url
-										_that.isUefueller= false
-										console.log('这里是油站图片',_that.refuellerImages,url)
+								console.log(e)
+								let obj = JSON.parse(e.data),
+									url = obj.data.publicUrl
+								if (type == 'car') {
+									let data = {
+										plateNumberImage: obj.data.publicUrl
 									}
-							
-							  }
-						}) 
+									_that.PlateNumberImages = url
+									console.log('这里是司机车牌', url)
+									_that.isPlateNumber = false
+									oilSiteApi.plateNumberRecognition(data).then((res) => {
+										let obj = JSON.parse(res.data)
+										console.log(obj)
+										_that.plateNumber = obj.NUMBER
+									})
+								} else {
+									_that.refuellerImages = url
+									_that.isUefueller = false
+									console.log('这里是油站图片', _that.refuellerImages, url)
+								}
+
+							}
+						})
 					}
 				})
 			},
-			successplateNumber(e){
+			successplateNumber(e) {
 				console.log(e)
 			},
-			hidendialog(){
-				this.showtitle =false
+			hidendialog() {
+				this.showtitle = false
 			},
-			backTohome(){
+			backTohome() {
 				uni.switchTab({
-					url:'../../../pages/tabbar/home/home'
+					url: '../../../pages/tabbar/home/home'
 				})
 			},
-			gotoPay(){
-				
+			gotoPay() {
+
 				this.checkInfo()
-			},  
+			},
 			//动态油枪方法 this.checkbox数据格式在我改之前就是这样, clc 2022-3-18 
-			dynamic(){
-				return new Promise((re,rj)=>{
-					oilSiteApi.gunList({siteId:this.siteId}).then(res=>{
-						if(res.data.length!==0){
-							let array = res.data.map((item,index)=>{return {value:item.otherGunId,name:item.gunNum,checked: false,hot: false,oilsType:item.oilsType,oilsId:item.oilsId}})||[]
-							let filterArray = array.filter(item=>item.oilsId==this.oilSitePriceDetailsVo[this.radio]?.priceId);
-						  	re(filterArray)
+			dynamic() {
+				return new Promise((re, rj) => {
+					oilSiteApi.gunList({
+						siteId: this.siteId
+					}).then(res => {
+						if (res.data.length !== 0) {
+							let array = res.data.map((item, index) => {
+								return {
+									value: item.otherGunId,
+									name: item.gunNum,
+									checked: false,
+									hot: false,
+									oilsType: item.oilsType,
+									oilsId: item.oilsId
+								}
+							}) || []
+							let filterArray = array.filter(item => item.oilsId == this
+								.oilSitePriceDetailsVo[this.radio]?.priceId);
+							re(filterArray)
 						}
 					})
 				})
 			},
 			calcBar() {
-					//复制一份源数组
-					let arry = JSON.parse(JSON.stringify(this.checkbox));
-					//字段等于null或没有字段 默认显示1-8号油枪
-					if(!this.oilSitePriceDetailsVo[this.radio]?.oilsBar){
-						arry.length = 8
-						 return arry
-					}else{
-						//声明空数组 保存满足条件的数据 
-						let newArry = []
-						// 如果有字段并且字段有值 去重 分割数组 
-						 new Set(this.oilSitePriceDetailsVo[this.radio].oilsBar.split(',')).forEach((item,i)=>{
-							 //数值不能等于零 数值最大30 不能有小数点 必须是数字 才能添加到数组
-							if(Number(item)>0&&Number(item)&&Number(item)<=30&&item.indexOf('.')==-1){
-								newArry.push({
-									value: Number(item),
-									name: Number(item),
-									checked: false,
-									hot: false,
-								})
-							}else{
-								//不满足条件 跳过
-								return
-							}
-						})
-						// 如果字段 有值且没有一个满足 条件 默认返回 1-8号油枪 
-						if(newArry.length==0){
-							arry.length = 8
-							return arry
+				//复制一份源数组
+				let arry = JSON.parse(JSON.stringify(this.checkbox));
+				//字段等于null或没有字段 默认显示1-8号油枪
+				if (!this.oilSitePriceDetailsVo[this.radio]?.oilsBar) {
+					arry.length = 8
+					return arry
+				} else {
+					//声明空数组 保存满足条件的数据 
+					let newArry = []
+					// 如果有字段并且字段有值 去重 分割数组 
+					new Set(this.oilSitePriceDetailsVo[this.radio].oilsBar.split(',')).forEach((item, i) => {
+						//数值不能等于零 数值最大30 不能有小数点 必须是数字 才能添加到数组
+						if (Number(item) > 0 && Number(item) && Number(item) <= 30 && item.indexOf('.') == -1) {
+							newArry.push({
+								value: Number(item),
+								name: Number(item),
+								checked: false,
+								hot: false,
+							})
+						} else {
+							//不满足条件 跳过
+							return
 						}
-						//返回排序数组
-						return newArry.sort((a,b)=>{a-b});
+					})
+					// 如果字段 有值且没有一个满足 条件 默认返回 1-8号油枪 
+					if (newArry.length == 0) {
+						arry.length = 8
+						return arry
 					}
-				
+					//返回排序数组
+					return newArry.sort((a, b) => {
+						a - b
+					});
+				}
+
 				// clc 2022-3-18 注
 				// if (this.activeChannelCode == 'TY') {
 				// 	uni.showLoading({
@@ -893,18 +938,18 @@
 					}
 				}
 			},
-			checkInfo(){
+			checkInfo() {
 				this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
 				console.log(this.plateNumber)
 				if (!this.testPlateResult) {
-					this.plateNumber=''
+					this.plateNumber = ''
 					uni.showToast({
 						title: '车牌号校验不通过，自动将其置空，不影响加油',
 						icon: 'none'
 					})
 					// return false
 				}
-				
+
 				if (!this.oilSitePriceDetailsVo[this.radio].priceId) {
 					uni.showToast({
 						icon: 'none',
@@ -912,12 +957,12 @@
 					})
 					return false
 				}
-				if (!this.plateNumber ) {
+				if (!this.plateNumber) {
 					uni.showToast({
 						icon: 'none',
 						title: '未选择加油车牌'
 					})
-					this.showPlate='show'
+					this.showPlate = 'show'
 					return false
 				}
 				if (!this.oilBar) {
@@ -941,7 +986,7 @@
 					})
 					return false
 				}
-				if (this.vol < 0.01&& !this.tyRes.liter) {
+				if (this.vol < 0.01 && !this.tyRes.liter) {
 					uni.showToast({
 						icon: 'none',
 						title: '加油金额不能为空'
@@ -955,32 +1000,32 @@
 					})
 					return false
 				}
-				
+
 				this.makerOrder()
 			},
 			beforeMake() {
 				console.log('这里是beforeMake')
-				if(this.activeChannelCode != 'TY'){
-					if(this.vol <=0){
+				if (this.activeChannelCode != 'TY') {
+					if (this.vol <= 0) {
 						uni.showToast({
 							title: '加油不可为0',
 							icon: 'none'
 						})
 						return false
 					}
-				} 
-				if(this.activeChannelCode == 'TY'){
-					if(this.ty.realMoney < 5 ){
+				}
+				if (this.activeChannelCode == 'TY') {
+					if (this.ty.realMoney < 5) {
 						uni.showToast({
 							title: '加油金额不得低于5元',
 							icon: 'none'
 						})
 						return false
 					}
-				} 
-				this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel) 
+				}
+				this.tsetPlate(this.plateNumber ? this.plateNumber : this.plateNumberSel)
 				if (!this.testPlateResult) {
-					this.plateNumber=''
+					this.plateNumber = ''
 					uni.showToast({
 						title: '车牌号校验不通过，自动将其置空，不影响加油',
 						icon: 'none'
@@ -999,7 +1044,7 @@
 						icon: 'none',
 						title: '未选择加油车牌'
 					})
-					this.showPlate='show'
+					this.showPlate = 'show'
 					return false
 				}
 				if (!this.oilBar) {
@@ -1023,7 +1068,7 @@
 					})
 					return false
 				}
-				if (this.vol < 0.01&& !this.tyRes.liter) {
+				if (this.vol < 0.01 && !this.tyRes.liter) {
 					uni.showToast({
 						icon: 'none',
 						title: '加油金额不能为空'
@@ -1037,30 +1082,30 @@
 					})
 					return false
 				}
-				if(this.channelJuli>1000){
+				if (this.channelJuli > 1000) {
 					this.showtitle = true
 					return
-				}  
-				console.log('这里是beforeMake end')
+				}
+				// console.log('这里是beforeMake end')
 				this.makerOrder()
 			},
 			// 下单
-			makerOrder() { 
-				console.log('这里是beforeMake')
+			makerOrder() {
+				// console.log('这里是beforeMake')
 				let otherUser = uni.getStorageSync('otherUserInfo')
-				console.log(otherUser,'+++++++++++++++')
-				if( otherUser ){
-					console.log('这里是卡力+++++++++++')
+				// console.log(otherUser, '+++++++++++++++')
+				if (otherUser) {
+					// console.log('这里是卡力+++++++++++')
 					let PlateNumberImages = this.PlateNumberImages,
-					refuellerImages = this.refuellerImages
-					if(PlateNumberImages == ''){
+						refuellerImages = this.refuellerImages
+					if (PlateNumberImages == '') {
 						uni.showToast({
 							icon: 'none',
 							title: '请上传车辆照片'
 						})
 						return
 					}
-					if(refuellerImages == ''){
+					if (refuellerImages == '') {
 						uni.showToast({
 							icon: 'none',
 							title: '请上传油机照片'
@@ -1069,63 +1114,78 @@
 					}
 					var orderData = {
 						amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
-						plateNumberImages:this.PlateNumberImages,
-						refuellerImages:this.refuellerImages,
+						plateNumberImages: this.PlateNumberImages,
+						refuellerImages: this.refuellerImages,
 						shareCompanyQuota: 0, // 共享标识
 						priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String  必有字段  备注：油价主键
 						orderType: "REAL_ORDER", //类型：String  必有字段  备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
 						orderSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：订单来源（WECHAT_MINIAPPS）
-						plateNumber: this.plateNumber ? this.plateNumber : this.plateNumberSel, //类型：String  必有字段  备注：车牌号
+						plateNumber: this.plateNumber ? this.plateNumber : this
+							.plateNumberSel, //类型：String  必有字段  备注：车牌号
 						siteUserName: this.jober, //类型：String  必有字段  备注：加油员
 						oilsBar: this.oilBar, //类型：Number  必有字段  备注：油枪
-						volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this.vol, //类型：Number  必有字段  备注：加油升数
+						volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
+							.vol, //类型：Number  必有字段  备注：加油升数
 						realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number  必有字段  备注：实际加油价格
 						suppleMark: 0, //类型：Number  必有字段  备注：补录标识（0：实时订单 1：补录订单）
 						createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String  必有字段  备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
 						// "deviceImei": "mock", //类型：String  可有字段  备注：设备唯一码
 						// "networkIp": "mock" //类型：String  可有字段  备注：ip地址
-						kaliState:1,
-						'version':1,
-						'xoilAmountGun':this.vol
+						kaliState: 1,
+						'version': 1,
+						'xoilAmountGun': this.vol
 					}
-				}else{
+				} else {
 					var orderData = {
-					amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
-					shareCompanyQuota: 0, // 共享标识
-					priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String  必有字段  备注：油价主键
-					orderType: "REAL_ORDER", //类型：String  必有字段  备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
-					orderSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：订单来源（WECHAT_MINIAPPS）
-					plateNumber: this.plateNumber ? this.plateNumber : this.plateNumberSel, //类型：String  必有字段  备注：车牌号
-					siteUserName: this.jober, //类型：String  必有字段  备注：加油员
-					oilsBar: this.oilBar, //类型：Number  必有字段  备注：油枪
-					volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this.vol, //类型：Number  必有字段  备注：加油升数
-					realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number  必有字段  备注：实际加油价格
-					suppleMark: 0, //类型：Number  必有字段  备注：补录标识（0：实时订单 1：补录订单）
-					createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String  必有字段  备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
-					// "deviceImei": "mock", //类型：String  可有字段  备注：设备唯一码
-					// "networkIp": "mock" //类型：String  可有字段  备注：ip地址
-					'version':1,
-					'xoilAmountGun':this.vol
+						amountGun: this.activeChannelCode == 'TY' ? this.ty.realMoney : '',
+						shareCompanyQuota: 0, // 共享标识
+						priceId: this.oilSitePriceDetailsVo[this.radio].priceId, //类型：String  必有字段  备注：油价主键
+						orderType: "REAL_ORDER", //类型：String  必有字段  备注：订单类型（REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单）
+						orderSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：订单来源（WECHAT_MINIAPPS）
+						plateNumber: this.plateNumber ? this.plateNumber : this
+							.plateNumberSel, //类型：String  必有字段  备注：车牌号
+						siteUserName: this.jober, //类型：String  必有字段  备注：加油员
+						oilsBar: this.oilBar, //类型：Number  必有字段  备注：油枪
+						volume: this.activeChannelCode == 'TY' ? this.tyRes.liter : this
+							.vol, //类型：Number  必有字段  备注：加油升数
+						realPrice: this.oilSitePriceDetailsVo[this.radio].sitePrice, //类型：Number  必有字段  备注：实际加油价格
+						suppleMark: 0, //类型：Number  必有字段  备注：补录标识（0：实时订单 1：补录订单）
+						createSource: "XOIL_DRIVER_COMPANY_WECHAT_APPLET", //类型：String  必有字段  备注：创建来源（ XOIL_DRIVER_COMPANY_WECHAT_APPLET）
+						// "deviceImei": "mock", //类型：String  可有字段  备注：设备唯一码
+						// "networkIp": "mock" //类型：String  可有字段  备注：ip地址
+						'version': 1,
+						'xoilAmountGun': this.vol
 					}
 				}
-				console.log(orderData) 
-				let location =  uni.getStorageSync('location')||{longitude:'',latitude:''};
-				oilOrderApi.createOrder(Object.assign(orderData,{longitude:location.longitude,latitude:location.latitude})).then(res => {
+				// console.log(orderData)
+				let location = uni.getStorageSync('location') || {
+					longitude: '',
+					latitude: ''
+				};
+				oilOrderApi.createOrder(Object.assign(orderData, {
+					longitude: location.longitude,
+					latitude: location.latitude
+				})).then(res => {
 					if (res.code == 20000) {
-						let data = (this.typeChenk()&&(Object.assign(res.data,{gunName:this.checkBar.filter(item=>this.oilBar==item.value)[0].name})))||res.data
-						if(otherUser){
-							console.log('这里是卡力订单创建')
-							console.log(data)
+						let data = (this.typeChenk() && (Object.assign(res.data, {
+							gunName: this.checkBar.filter(item => this.oilBar == item.value)[0]
+								.name
+						}))) || res.data
+						if (otherUser) {
+							// console.log('这里是卡力订单创建')
+							// console.log(data)
 							uni.setStorageSync('orderMade', data)
 							uni.redirectTo({
-								url: '/BagStation/pages/SeparateProcess/orderPaying?payMethod='+res.data.payMethod +'&&type=oil'
+								url: '/BagStation/pages/SeparateProcess/orderPaying?payMethod=' + res.data
+									.payMethod + '&&type=oil'
 							})
 							return
 						}
-						console.log(data,'这里是非卡力')
+						// console.log(data, '这里是非卡力')
 						uni.setStorageSync('orderMade', data)
 						uni.redirectTo({
-							url: '/BagStation/pages/makeOrder/orderPaying?payMethod='+res.data.payMethod+'&&type=oil'
+							url: '/BagStation/pages/makeOrder/orderPaying?payMethod=' + res.data
+								.payMethod + '&&type=oil'
 						})
 					}
 				})
@@ -1139,7 +1199,7 @@
 			getNewSitePrice(channelId) {
 				this.oilSitePriceDetailsVo = []
 				oilSiteApi.getNewSitePrice(channelId).then(res => {
-					console.log('getNewSitePrice ++++= ',res)  
+					console.log('getNewSitePrice ++++= ', res)
 					if (res.code == 20000) {
 						this.radio = 0
 						this.plateNumbers = res.data.plateNumbers
@@ -1173,7 +1233,7 @@
 				}
 			},
 			ChooseBar(e) {
-				console.log( e)
+				console.log(e)
 				let items = this.checkBar;
 				let values = e.value;
 				this.oilBar = values
@@ -1188,11 +1248,11 @@
 			changePrice(e) {
 				console.log(e)
 				this.radio = e.detail.value
-				this.ty.realMoney  = null
+				this.ty.realMoney = null
 				this.tyRes.liter = 0
-				this.vol =''
+				this.vol = ''
 				this.activeSitePrice = this.oilSitePriceDetailsVo[this.radio].priceId
-				this.realMoney ='--'
+				this.realMoney = '--'
 				this.xoilAmountGun = ''
 				// // console.log(this.radio)
 				// // console.log(this.oilSitePriceDetailsVo[this.radio])
@@ -1205,33 +1265,34 @@
 			}
 		},
 		filters: {
-			moneyIntercept(value){
+			moneyIntercept(value) {
 				if (value != 'xxx.x') {
 					console.log(value)
 					let valus = (parseInt(value * 100) / 100).toFixed(2)
 					console.log(valus)
-					return  valus
+					return valus
 				} else {
 					return value
 				}
 			},
 			moneyVolm(value) {
-						if (value != 'xxx.x') {
-							return Math.round(value * 100) / 100;
-						} else {
-							return value
-						}
+				if (value != 'xxx.x') {
+					return Math.round(value * 100) / 100;
+				} else {
+					return value
+				}
 			},
 			channelCodeFamt(value) {
 				if (value) {
 					// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
 					switch (value) {
 						case 'XOIL':
+						case 'ZDC':
 							return '星油'
 						case 'WJY':
 							return '万金油'
 						case 'LV':
-							 return '其他'
+							return '其他'
 						case 'TY':
 							return '团油'
 						case 'YDJY':
@@ -1239,11 +1300,11 @@
 					}
 				}
 			},
-			moneyForMath(value){
-				if (value != 'xxx.x') {  
-					let realAmount = (Math.round(value * 100) / 100).toFixed(2) 
-					return realAmount 
-				} else { 
+			moneyForMath(value) {
+				if (value != 'xxx.x') {
+					let realAmount = (Math.round(value * 100) / 100).toFixed(2)
+					return realAmount
+				} else {
 					return value
 				}
 			},
@@ -1260,7 +1321,7 @@
 				// 	// console.log('new:',realAmount)
 				// 	return realAmount
 				// }
-				if (value != 'xxx.x') { 
+				if (value != 'xxx.x') {
 					let realAmount = (parseInt(value * 100) / 100).toFixed(2)
 					return realAmount
 				} else {
@@ -1272,26 +1333,29 @@
 </script>
 
 <style scoped>
-	.UpFileBox{
-		width:100%;
-		padding:18px;
+	.UpFileBox {
+		width: 100%;
+		padding: 18px;
 		padding-top: 0;
 	}
-	 
-	.UpFileBoxMain{ 
-		width:100%; 
+
+	.UpFileBoxMain {
+		width: 100%;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 	}
-	.close-icon{
+
+	.close-icon {
 		position: absolute;
 		right: 2%;
 		top: 2%;
 	}
-	.dialog-box{
+
+	.dialog-box {
 		position: relative;
 	}
+
 	.site-icon {
 		width: 2rem;
 		vertical-align: middle;
@@ -1320,7 +1384,9 @@
 
 	.picker-view {
 		min-height: 300upx;
-	}.content {
+	}
+
+	.content {
 		min-height: 100%;
 		position: relative;
 	}
@@ -1413,24 +1479,29 @@
 	.yu-card-xuan .action {
 		white-space: nowrap;
 	}
-	.text-centerS{
+
+	.text-centerS {
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		text-align: center;
 	}
-	.red_btn{
+
+	.red_btn {
 		color: #FFFFFF;
-		background-color:#FF6700;
+		background-color: #FF6700;
 	}
-	.box-paddings{
-		padding:40rpx 0;
+
+	.box-paddings {
+		padding: 40rpx 0;
 	}
-	.headShow{
+
+	.headShow {
 		font-size: 36rpx;
 		font-weight: 600;
 	}
-	.showtext{
+
+	.showtext {
 		line-height: 2;
 		font-size: 30rpx;
 		margin-bottom: 30rpx;
@@ -1439,13 +1510,15 @@
 		letter-spacing: 3px;
 		text-align: left;
 	}
-	.checklocation_box_button{
+
+	.checklocation_box_button {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		padding: 0 5%;
 	}
-	.btn-box{
+
+	.btn-box {
 		width: 45%;
 		flex: 0 0 auto;
 		text-align: center;
@@ -1455,141 +1528,151 @@
 		box-sizing: border-box;
 		border: 2rpx solid #bfbfbf;
 	}
-	.box-panding{
-		padding:10 0;
+
+	.box-panding {
+		padding: 10 0;
+	}
+
+	.checklocation {
+		position: fixed;
+		top: 50%;
+		left: 20%;
+		right: 20%;
+		z-index: 999;
+	}
+
+	.checklocation_box {
+		background-color: #FFFFFF;
+	}
+
+	.content {
+		min-height: 100%;
+		position: relative;
+	}
+
+	.navigation {
+		position: absolute;
+		right: 16px;
+		top: 10px;
+	}
+
+	.icon-self {
+		width: 1rem;
+		height: 1rem;
+	}
+
+	.oil-price {
+		position: relative;
+	}
+
+	.oil-price radio {
+		position: absolute;
+		left: 0rem;
+		top: 10px;
+	}
+
+	.qr-icon {
+		font-size: 2rem;
+	}
+
+	.pay-desc {
+		line-height: 2rem;
+	}
+
+	.bottom-pay {
+		min-height: 100rpx;
+		width: 750upx;
+	}
+
+	.pay-bar {
+		width: 750upx;
+		position: absolute;
+		bottom: 0;
+	}
+
+	.text-img {
+		position: relative;
+	}
+
+
+	.placeholder {
+		min-height: 10upx;
+	}
+
+	.yu-card-xuan {
+		position: relative;
+		top: 110rpx
+	}
+
+	.site-label {
+		max-width: 450upx;
+		min-width: 450upx;
+	}
+
+	.cu-btn.sm {
+		width: 80%;
+	}
+
+	.site-back {
+		width: 2rem;
+		top: 2.8rem;
+		left: 1rem;
+	}
+
+	.site-icon {
+		width: 1.5rem;
+		vertical-align: middle;
+	}
+
+	.my-tag {
+		padding: 0 12rpx;
+	}
+
+	.fixed {
+		position: fixed;
+		bottom: 0;
+		width: 750upx;
+	}
+
+	.placeholder-hidden {
+		opacity: 0;
+	}
+
+	.yu-card-xuan .action {
+		white-space: nowrap;
+	}
+
+	.text-title {
+		text-align: left;
+		margin: 10rpx 0;
+		font-size: 28rpx;
+		font-weight: 700;
+	}
+
+	.text-p {
+		text-align: center;
+		margin: 4rpx 0;
+		font-size: 22rpx;
+		color: #6f6f6fe8;
+	}
+
+	.refuellerImages {
+		position: relative;
+	}
+
+	.plateNumber_box {
+		position: relative;
+	}
+
+	.close_Img {
+		position: absolute;
+		right: -10px;
+		top: -10px;
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.padding-bottom-40 {
+		padding-bottom: 20%;
 	}
-		.checklocation{
-			position: fixed;
-			top: 50%;
-			left: 20%;
-			right: 20%;
-			z-index: 999;
-		}
-		.checklocation_box{
-			background-color: #FFFFFF;
-		}
-		.content {
-			min-height: 100%;
-			position: relative;
-		}
-	
-		.navigation {
-			position: absolute;
-			right: 16px;
-			top: 10px;
-		}
-	
-		.icon-self {
-			width: 1rem;
-			height: 1rem;
-		}
-	
-		.oil-price {
-			position: relative;
-		}
-	
-		.oil-price radio {
-			position: absolute;
-			left: 0rem;
-			top: 10px;
-		}
-	
-		.qr-icon {
-			font-size: 2rem;
-		}
-	
-		.pay-desc {
-			line-height: 2rem;
-		}
-	
-		.bottom-pay {
-			min-height: 100rpx;
-			width: 750upx;
-		}
-	
-		.pay-bar {
-			width: 750upx;
-			position: absolute;
-			bottom: 0;
-		}
-		.text-img{
-			position: relative;
-		}
-	
-	
-		.placeholder {
-			min-height: 10upx;
-		}
-	
-		.yu-card-xuan {
-			position: relative;
-			top: 110rpx
-		}
-	
-		.site-label {
-			max-width: 450upx;
-			min-width: 450upx;
-		}
-	
-		.cu-btn.sm {
-			width: 80%;
-		}
-	
-		.site-back {
-			width: 2rem;
-			top: 2.8rem;
-			left: 1rem;
-		}
-	
-		.site-icon {
-			width: 1.5rem;
-			vertical-align: middle;
-		}
-	
-		.my-tag {
-			padding: 0 12rpx;
-		}
-	
-		.fixed {
-			position: fixed;
-			bottom: 0;
-			width: 750upx;
-		}
-	
-		.placeholder-hidden {
-			opacity: 0;
-		}
-	
-		.yu-card-xuan .action {
-			white-space: nowrap;
-		}
-		
-		.text-title{
-			text-align:left;
-			margin: 10rpx 0; 
-			font-size: 28rpx;
-			font-weight: 700;
-		} 
-		.text-p{
-			text-align: center;
-			margin: 4rpx 0;
-			font-size: 22rpx;
-			color: #6f6f6fe8;
-		}
-		.refuellerImages{
-			position: relative;
-		}
-		.plateNumber_box{
-			position: relative;
-		}
-		.close_Img{
-			position: absolute;
-			right: -10px;
-			top: -10px;
-			width: 40rpx;
-			height: 40rpx;
-		}
-		.padding-bottom-40{
-			padding-bottom: 20%;
-		}
 </style>
diff --git a/BagStation/pages/components/price-tab.vue b/BagStation/pages/components/price-tab.vue
index 76e148c..38566d6 100644
--- a/BagStation/pages/components/price-tab.vue
+++ b/BagStation/pages/components/price-tab.vue
@@ -73,7 +73,7 @@
 			};
 		},
 		computed: {
-			
+
 			activeChannelCode() {
 				if (this.channelList.length && this.channelList[this.TabCur]) {
 					let channelCode = this.channelList[this.TabCur].channelCode
@@ -111,21 +111,23 @@
 			}
 		},
 		methods: {
-			goFinancial(){
+			goFinancial() {
 				const user = uni.getStorageSync('user');
-				if(user){
-					Financial.findHomePageReport({customerId:user.id}).then(res=>{
-						if(res.data){
+				if (user) {
+					Financial.findHomePageReport({
+						customerId: user.id
+					}).then(res => {
+						if (res.data) {
 							uni.navigateTo({
-								url:`../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
+								url: `../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
 							})
-						}else{
+						} else {
 							uni.navigateTo({
-								url:'../../../Financial/pages/index?guide=1'
+								url: '../../../Financial/pages/index?guide=1'
 							})
 						}
 					});
-				}else{
+				} else {
 					uni.showToast({
 						title: '请先登录！',
 						icon: 'none'
@@ -149,7 +151,7 @@
 					// return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}`)+0.01 :Number(value).toFixed(2);
 					return String(value).split('.')[1] && String(value).split('.')[1].length > 2 ? Number(
 						`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,2)}${Number(String(value).split('.')[1].substr(2))==0?'':9}`
-						).toFixed(2) : Number(value).toFixed(2);
+					).toFixed(2) : Number(value).toFixed(2);
 				} else {
 					return Number(value).toFixed(2)
 				}
@@ -179,6 +181,7 @@
 					// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
 					switch (value) {
 						case 'XOIL':
+						case 'ZDC':
 							return '星油'
 						case 'WJY':
 							return '万金油'
@@ -188,6 +191,7 @@
 							return '团油'
 						case 'YDJY':
 							return '一点加油（壳牌）'
+
 					}
 				}
 			}