caoliancun
/
LSM_OIL_SITE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into xiaozy_积分

Browse Source 
# Conflicts:
#	pages/stationDetail/ZYSite.vue
pull/8/head
zhangyouji 1 year ago
parent 914ccb83de cb258ddd51
commit 418314554b
1 changed files with 226 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 341
      pages/stationDetail/ZYSite.vue

341
pages/stationDetail/ZYSite.vue
Unescape View File

@ -12,7 +12,8 @@
<!-- 顶部填充区域 --> <!-- 顶部填充区域 -->
<view class="fill"></view> <view class="fill"></view>
<!-- 油站位置卡片 --> <!-- 油站位置卡片 -->
<view style="margin-top: 10rpx;" class=" serviceStation my-cell margin-left margin-right padding-top padding-bottom radius shadow "> <view style="margin-top: 10rpx;"
class=" serviceStation my-cell margin-left margin-right padding-top padding-bottom radius shadow ">
<view style="padding-bottom: 25rpx;" class="strong padding-bottom-xs">{{siteData.siteName}}</view> <view style="padding-bottom: 25rpx;" class="strong padding-bottom-xs">{{siteData.siteName}}</view>
<view class=" textEllipsis font-12 color-999"> <view class=" textEllipsis font-12 color-999">
<uni-icons color="#666666" type="location-filled" size="15"></uni-icons> <uni-icons color="#666666" type="location-filled" size="15"></uni-icons>
@ -53,12 +54,16 @@
<view class="newdirvercard"> <view class="newdirvercard">
<view class="newdirvercard_left"> <view class="newdirvercard_left">
<view style="flex-shrink: 1;"> <view style="flex-shrink: 1;">
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-if="siteData.headUrl" class="cu-avatar round lg" :style="'background-image:url('+siteData.headUrl+');'"></view> <view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-if="siteData.headUrl"
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-else class="cu-avatar round lg">星</view> class="cu-avatar round lg" :style="'background-image:url('+siteData.headUrl+');'"></view>
<view style="height: 119rpx; width: 119rpx;overflow: hidden;" v-else class="cu-avatar round lg">
星</view>
</view> </view>
<view class="newdirvercard_name "> <view class="newdirvercard_name ">
<view class="newdirvercard_name_text ">{{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}</view> <view class="newdirvercard_name_text ">
<view class="newdirvercard_name_phone ">{{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}</view> {{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}</view>
<view class="newdirvercard_name_phone ">
{{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}</view>
</view> </view>
</view> </view>
<view class="newdirvercard_right"> <view class="newdirvercard_right">
@ -104,13 +109,13 @@
<!-- clc 注 <input :maxlength="7" @tap="showModel='show'" v-model="carNumber" disabled placeholder="请输入车牌号" <!-- clc 注 <input :maxlength="7" @tap="showModel='show'" v-model="carNumber" disabled placeholder="请输入车牌号"
name="input" /> --> name="input" /> -->
<view style="flex-grow: 1; display: flex;" @tap="showModel='show'"> <view style="flex-grow: 1; display: flex;" @tap="showModel='show'">
<view v-if="hz( String(carNumber).charAt(0))" class="sign"> <view v-if="hz( String(carNumber).charAt(0))" class="sign">
<text v-if="carNumber">{{String(carNumber).charAt(0)||''}}</text> <text v-if="carNumber">{{String(carNumber).charAt(0)||''}}</text>
<uni-icons color="#ffffff" type="forward" size="15"></uni-icons> <uni-icons color="#ffffff" type="forward" size="15"></uni-icons>
</view>
<view class="flexcenter">{{String(carNumber).substr(1,6)||'请输入车牌号'}}</view>
</view> </view>
<view class="flexcenter">{{String(carNumber).substr(1,6)||'请输入车牌号'}}</view>
</view>
<!-- <text class="cuIcon-roundclosefill text-gray"></text> --> <!-- <text class="cuIcon-roundclosefill text-gray"></text> -->
@ -132,19 +137,16 @@
<!-- 油品卡片 --> <!-- 油品卡片 -->
<view class="padding-top-xs margin margin-top-xs margin-bottom-0 padding-bottom radius"> <view class="padding-top-xs margin margin-top-xs margin-bottom-0 padding-bottom radius">
<view style="border-radius: 6px; overflow: hidden; " > <view style="border-radius: 6px; overflow: hidden; ">
<!-- 油品类型 油品价格区域 --> <!-- 油品类型 油品价格区域 -->
<view class="bg-white padding padding-bottom-sm"> <view class="bg-white padding padding-bottom-sm">
<!-- 油品类型 v-for siteData.oilSitePriceDetailsVos --> <!-- 油品类型 v-for siteData.oilSitePriceDetailsVos -->
<view style="width: 100%;display: flex;flex-wrap: wrap; margin-bottom: 28rpx;"> <view style="width: 100%;display: flex;flex-wrap: wrap; margin-bottom: 28rpx;">
<view <view style="margin-right: 15rpx;" v-for="(item,index) in siteData.oilSitePriceDetailsVos"
style="margin-right: 15rpx;" :key="item.priceId" @tap="oilNameSel(item)"
v-for="(item,index) in siteData.oilSitePriceDetailsVos" :class="insertResult.oilProductCode===item.oilProductCode?'selecardoil':'cardoil'"
:key="item.priceId" class="strong padding-right-xs font-16 cardoil">
@tap="oilNameSel(item)" {{item.oilProductCode}}
:class="insertResult.oilProductCode===item.oilProductCode?'selecardoil':'cardoil'"
class="strong padding-right-xs font-16 cardoil">
{{item.oilProductCode}}
</view> </view>
</view> </view>
@ -160,7 +162,8 @@
v-if="(insertResult.sitePrice -1+1)>0">￥{{(insertResult.sitePrice -1+1)|numberFilter}}/{{siteData.siteType|company}}</text> v-if="(insertResult.sitePrice -1+1)>0">￥{{(insertResult.sitePrice -1+1)|numberFilter}}/{{siteData.siteType|company}}</text>
<text class="text-blod oil-main-color" v-else>无价格</text> <text class="text-blod oil-main-color" v-else>无价格</text>
</text> </text>
<text class="s-rich">市场价￥{{insertResult.oilSitePrice|numberFilter}}/{{siteData.siteType|company}}</text> <text
class="s-rich">市场价￥{{insertResult.oilSitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
</view> </view>
<view class="padding-top-xs" v-else> <view class="padding-top-xs" v-else>
@ -179,17 +182,18 @@
星油价格: 星油价格:
<text style="font-weight: bold;" class="text-blod oil-main-color" <text style="font-weight: bold;" class="text-blod oil-main-color"
v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}</text> v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
<text class="text-blod oil-main-color" v-else>无价格</text> <text class="text-blod oil-main-color" v-else>无价格</text>
</text> </text>
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥ <text style="margin-left: 75rpx; color: #222222;font-weight: bold;">油站价格:￥
<text v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text> <text
<text class="text-blod oil-main-color" v-else>无价格</text> v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text>
<text class="text-blod oil-main-color" v-else>无价格</text>
</text> </text>
</view> </view>
<!-- clc 注 <view class="grid col-5 padding-top justify-start" v-else> <!-- clc 注 <view class="grid col-5 padding-top justify-start" v-else>
<view class="padding-xs" v-for="(item,index) in siteData.oilSitePriceDetailsVos" <view class="padding-xs" v-for="(item,index) in siteData.oilSitePriceDetailsVos"
:key="item.priceId"> :key="item.priceId">
<button class="cu-btn" @tap="changeBar(item,index)" <button class="cu-btn" @tap="changeBar(item,index)"
@ -203,8 +207,11 @@
<view class="padding padding-bottom-0 padding-top-xs bg-white"> <view class="padding padding-bottom-0 padding-top-xs bg-white">
<view style="color: #333333;font-size: 30rpx;" class="padding-bottom-sm text-lg">枪号选择：</view> <view style="color: #333333;font-size: 30rpx;" class="padding-bottom-sm text-lg">枪号选择：</view>
<view class="grid col-5 justify-start"> <view class="grid col-5 justify-start">
<view style="width: calc(100% / 4);" class="padding-xs" v-for="(item,index) in ColorList" :key="index"> <view style="width: calc(100% / 4);" class="padding-xs" v-for="(item,index) in ColorList"
<button @tap="gunIdSel(index)" :style="{width: '100%',color:insertResult.bar===index+1?'':'#333333'}" class="cu-btn" :key="index">
<button @tap="gunIdSel(index)"
:style="{width: '100%',color:insertResult.bar===index+1?'':'#333333'}"
class="cu-btn"
:class="[insertResult.bar===index+1?'bg-main-oil':'line-gray']">{{index+1}}</button> :class="[insertResult.bar===index+1?'bg-main-oil':'line-gray']">{{index+1}}</button>
</view> </view>
</view> </view>
@ -220,13 +227,16 @@
</view> </view>
<view class="cu-form-group" v-else> <view class="cu-form-group" v-else>
<view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view> <view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view>
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney" <input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`"
v-model="insertResult.vol" name="input" /> @input="checkNumber" type="digit" @blur="getMoney" v-model="insertResult.vol"
name="input" />
<view style="width: 170rpx;text-align: end;" class="textEllipsis"> <view style="width: 170rpx;text-align: end;" class="textEllipsis">
<text class=""> <text class="">
<!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 --> <!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 -->
<text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text> <text
<text v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text> v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
<text
v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
<!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} --> <!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} -->
</text> </text>
</view> </view>
@ -244,7 +254,8 @@
</view> </view>
</view> </view>
</view> </view>
<button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge"> {{shake==null?'立即下单':'下单中'}}</button> <button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge">
{{shake==null?'立即下单':'下单中'}}</button>
</view> </view>
</view> </view>
<view class v-show="!beforePay&&isG7"> <view class v-show="!beforePay&&isG7">
@ -362,7 +373,7 @@
}, },
data() { data() {
return { return {
shake:null, shake: null,
vlom: '', vlom: '',
companyId: '', companyId: '',
activeSitePrice: '', activeSitePrice: '',
@ -454,7 +465,7 @@
// this.type = 'fykc' //根据option.type 进行本地赋值 // this.type = 'fykc' //根据option.type 进行本地赋值
// } // }
if (this.qrCode) { if (this.qrCode) {
if (this.qrCode.substr(0, 2) == 'HT' || this.qrCode.substr(0, 2) == 'G7'|| this.type === 'G7') { if (this.qrCode.substr(0, 2) == 'HT' || this.qrCode.substr(0, 2) == 'G7' || this.type === 'G7') {
this.isG7 = true this.isG7 = true
console.log('G7加油站') console.log('G7加油站')
} }
@ -675,7 +686,7 @@
xoilAmountGun: e.detail.value, xoilAmountGun: e.detail.value,
priceId: this.activeSitePrice, priceId: this.activeSitePrice,
companyId: this.siteData.companyId, companyId: this.siteData.companyId,
createSource:this.siteData.siteType=='2'?'XOIL':'' createSource: this.siteData.siteType == '2' ? 'XOIL' : ''
} }
} }
this.xoilAmountGun = e.detail.value this.xoilAmountGun = e.detail.value
@ -767,7 +778,7 @@
charge() { charge() {
//防抖 //防抖
clearTimeout(this.shake) clearTimeout(this.shake)
this.shake = setTimeout(()=>{ this.shake = setTimeout(() => {
this.tsetPlate() this.tsetPlate()
console.log(this.plateText) console.log(this.plateText)
console.log(this.plateNo) console.log(this.plateNo)
@ -782,10 +793,10 @@
this.SfOrder() this.SfOrder()
return return
} }
if (this.type === 'G7') { if (this.type === 'G7') {
this.G7Order() this.G7Order()
return return
} }
if (this.type == 'fykc') { if (this.type == 'fykc') {
this.FyOrder() this.FyOrder()
return return
@ -801,16 +812,16 @@
title: '车牌号校验不通过', title: '车牌号校验不通过',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
} }
} else { } else {
uni.showToast({ uni.showToast({
title: '您选择的油品没有油价，不能加油', title: '您选择的油品没有油价，不能加油',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
} }
},500) }, 500)
}, },
//福佑 //福佑
@ -832,7 +843,7 @@
title: 'qrCode为空', title: 'qrCode为空',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.siteId) { if (!data6.siteId) {
@ -840,7 +851,7 @@
title: '请选择油站id', title: '请选择油站id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.companyId) { if (!data6.companyId) {
@ -848,7 +859,7 @@
title: '请选择企业id', title: '请选择企业id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.customerId) { if (!data6.customerId) {
@ -856,7 +867,7 @@
title: '请选择司机id', title: '请选择司机id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@ -864,7 +875,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
oliSiteApi.FYPay(data6).then(res => { oliSiteApi.FYPay(data6).then(res => {
@ -916,7 +927,7 @@
title: 'qrCode为空', title: 'qrCode为空',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.siteId) { if (!data6.siteId) {
@ -924,7 +935,7 @@
title: '请选择油站id', title: '请选择油站id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.companyId) { if (!data6.companyId) {
@ -932,7 +943,7 @@
title: '请选择企业id', title: '请选择企业id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.customerId) { if (!data6.customerId) {
@ -940,7 +951,7 @@
title: '请选择司机id', title: '请选择司机id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@ -948,7 +959,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
oliSiteApi.sfPay(data6).then(res => { oliSiteApi.sfPay(data6).then(res => {
@ -987,87 +998,87 @@
url: '/pages/stationDetail/OrderStatus?item=' + item url: '/pages/stationDetail/OrderStatus?item=' + item
}) })
}, },
// g7 // g7
G7Order() { G7Order() {
const g7OrderInfo = { const g7OrderInfo = {
qr_code: uni.getStorageSync('qrCode'), //类型：String 必有字段 二维码 qrcode qr_code: uni.getStorageSync('qrCode'), //类型：String 必有字段 二维码 qrcode
station_id: this.siteData.siteId, //类型：String 必有字段 油站id siteId station_id: this.siteData.siteId, //类型：String 必有字段 油站id siteId
oilPriceId: this.insertResult.priceId, //类型：String 必有字段 油价id priceId oilPriceId: this.insertResult.priceId, //类型：String 必有字段 油价id priceId
driver_phone: this.siteData.customerPhone, //类型：String 必有字段 油价id priceId driver_phone: this.siteData.customerPhone, //类型：String 必有字段 油价id priceId
companyId: this.siteData.companyId, //类型：String 必有字段 企业id companyId companyId: this.siteData.companyId, //类型：String 必有字段 企业id companyId
customerId: this.siteData.customerId, //类型：String 必有字段 司机id customerId customerId: this.siteData.customerId, //类型：String 必有字段 司机id customerId
truck_no: this.carNumber, truck_no: this.carNumber,
gun_money: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 gun_money: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
gun_number: this.insertResult.bar, //类型：String 必有字段 备注：加油升数 gun_number: this.insertResult.bar, //类型：String 必有字段 备注：加油升数
deduction_mode: 1, deduction_mode: 1,
} }
console.log("加油信息===================",this.insertResult) console.log("加油信息===================", this.insertResult)
console.log(g7OrderInfo) console.log(g7OrderInfo)
if (!g7OrderInfo.qr_code) { if (!g7OrderInfo.qr_code) {
uni.showToast({ uni.showToast({
title: 'qr_code为空', title: 'qr_code为空',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!g7OrderInfo.station_id) { if (!g7OrderInfo.station_id) {
uni.showToast({ uni.showToast({
title: '请选择油站id', title: '请选择油站id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!g7OrderInfo.companyId) { if (!g7OrderInfo.companyId) {
uni.showToast({ uni.showToast({
title: '请选择企业id', title: '请选择企业id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!g7OrderInfo.customerId) { if (!g7OrderInfo.customerId) {
uni.showToast({ uni.showToast({
title: '请选择司机id', title: '请选择司机id',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!g7OrderInfo.gun_money) { if (!g7OrderInfo.gun_money) {
uni.showToast({ uni.showToast({
title: '请输入加油金额', title: '请输入加油金额',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
oliSiteApi.G7Pay(g7OrderInfo).then(res => { oliSiteApi.G7Pay(g7OrderInfo).then(res => {
if (res.code === 20000) { if (res.code === 20000) {
uni.showToast({ uni.showToast({
title: '下单成功！' title: '下单成功！'
}); });
uni.setStorageSync('orderSource', 'mpxoil') uni.setStorageSync('orderSource', 'mpxoil')
console.log("是否是g7================",this.isG7) console.log("是否是g7================", this.isG7)
if (!this.isG7) { if (!this.isG7) {
setTimeout(() => { setTimeout(() => {
this.toDetails(res.data.orderId) this.toDetails(res.data.orderId)
}, 400) }, 400)
} else { } else {
this.beforePay = false this.beforePay = false
setTimeout(() => { setTimeout(() => {
this.orderId = res.data.orderId this.orderId = res.data.orderId
console.log("queryTimer",this.orderId) console.log("queryTimer", this.orderId)
this.queryTimer() this.queryTimer()
console.log("getPayStatus",this.orderId) console.log("getPayStatus", this.orderId)
this.getPayStatus(this.orderId) this.getPayStatus(this.orderId)
}, 400) }, 400)
} }
this.shake=null this.shake = null
} }
}) })
}, },
//日日顺 //日日顺
RrsOrder() { RrsOrder() {
const data6 = { const data6 = {
@ -1097,7 +1108,7 @@
title: '请选择油品', title: '请选择油品',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@ -1105,7 +1116,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
oliSiteApi.RrsPay(data6).then(res => { oliSiteApi.RrsPay(data6).then(res => {
@ -1157,7 +1168,7 @@
let PlateNumberImages = this.PlateNumberImages, let PlateNumberImages = this.PlateNumberImages,
refuellerImages = this.refuellerImages refuellerImages = this.refuellerImages
if (PlateNumberImages == '') { if (PlateNumberImages == '') {
this.shake=null this.shake = null
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请上传车辆照片' title: '请上传车辆照片'
@ -1169,7 +1180,7 @@
icon: 'none', icon: 'none',
title: '请上传油机照片' title: '请上传油机照片'
}) })
this.shake=null this.shake = null
return return
} }
var data6 = { var data6 = {
@ -1194,7 +1205,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
siteUserName: "1", //类型：String 必有字段 备注：加油员名称 siteUserName: "1", //类型：String 必有字段 备注：加油员名称
version: this.siteData.siteType=='2'?null:'1', //类型：Number 必有字段 备注：版本号 version: this.siteData.siteType == '2' ? null : '1', //类型：Number 必有字段 备注：版本号
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
} }
} else { } else {
@ -1253,7 +1264,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
siteUserName: "1", //类型：String 必有字段 备注：加油员名称 siteUserName: "1", //类型：String 必有字段 备注：加油员名称
version: this.siteData.siteType=='2'?null:"1", //类型：Number 必有字段 备注：版本号 version: this.siteData.siteType == '2' ? null : "1", //类型：Number 必有字段 备注：版本号
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
} }
} }
@ -1265,25 +1276,28 @@
title: '请选择油品', title: '请选择油品',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!Number(data6.volume)) { if (!Number(data6.volume)) {
if(this.siteData.siteType=='2'){ if (this.siteData.siteType == '2') {
uni.showToast({ uni.showToast({
title: '请输入加油升数', title: '请输入加油升数',
icon: 'none' icon: 'none'
}); });
}else{ } else {
uni.showToast({ uni.showToast({
title: '请输入加油金额', title: '请输入加油金额',
icon: 'none' icon: 'none'
}); });
} }
this.shake=null this.shake = null
return false return false
} }
let location = uni.getStorageSync('location')||{longitude:'',latitude:''}; let location = uni.getStorageSync('location') || {
longitude: '',
latitude: ''
};
// if(!location){ // if(!location){
// let locationChenk = true // let locationChenk = true
// let that = this // let that = this
@ -1338,7 +1352,10 @@
// return // return
// //
console.log(data6, 'data6+++++') console.log(data6, 'data6+++++')
oliSiteApi.xoilPay(Object.assign(data6,{longitude:location.longitude,latitude:location.latitude})).then(res => { oliSiteApi.xoilPay(Object.assign(data6, {
longitude: location.longitude,
latitude: location.latitude
})).then(res => {
console.log(res) console.log(res)
if (res.code === 20000) { if (res.code === 20000) {
uni.showToast({ uni.showToast({
@ -1376,9 +1393,9 @@
}, 400) }, 400)
} }
} }
setTimeout(()=>{ setTimeout(() => {
this.shake=null this.shake = null
},1000) }, 1000)
}) })
}, },
// 收费则yi // 收费则yi
@ -1405,7 +1422,7 @@
title: '请选择油品', title: '请选择油品',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
if (!data6.volume) { if (!data6.volume) {
@ -1413,7 +1430,7 @@
title: '请输入加油体积', title: '请输入加油体积',
icon: 'none' icon: 'none'
}); });
this.shake=null this.shake = null
return false return false
} }
oliSiteApi.zeyiPay(data6).then(res => { oliSiteApi.zeyiPay(data6).then(res => {
@ -1454,9 +1471,9 @@
this.getPayStatus(this.orderId) this.getPayStatus(this.orderId)
}, 400) }, 400)
} }
setTimeout(()=>{ setTimeout(() => {
this.shake=null this.shake = null
},1000) }, 1000)
} }
}) })
}, },
@ -1521,7 +1538,7 @@
oilsStationId: uni.getStorageSync('oilSiteId') //类型：String 必有字段 备注：加油站id oilsStationId: uni.getStorageSync('oilSiteId') //类型：String 必有字段 备注：加油站id
} }
// } // }
console.log(obj,'**************'); console.log(obj, '**************');
oliSiteApi.verifyQrCode(obj).then(res => { oliSiteApi.verifyQrCode(obj).then(res => {
if (res.code === 20000) { if (res.code === 20000) {
this.siteData = res.data this.siteData = res.data
@ -1560,12 +1577,12 @@
// this.insertResult.discountMoney = this.insertResult.vol * (this.selected.oilSitePrice - this.insertResult // this.insertResult.discountMoney = this.insertResult.vol * (this.selected.oilSitePrice - this.insertResult
// .sitePrice) // .sitePrice)
// this.insertResult.vDoMoney = this.insertResult.vol * this.selected.sitePrice // this.insertResult.vDoMoney = this.insertResult.vol * this.selected.sitePrice
console.log('%c look me ↓','font-size:50px;color:green') console.log('%c look me ↓', 'font-size:50px;color:green')
console.log(this.insertResult.vMoney,this.insertResult,this.selected) console.log(this.insertResult.vMoney, this.insertResult, this.selected)
if(this.insertResult.vol!==''){ if (this.insertResult.vol !== '') {
this.getMoney({ this.getMoney({
detail:{ detail: {
value:this.insertResult.vol value: this.insertResult.vol
} }
}) })
} }
@ -1661,9 +1678,9 @@
} }
}, },
filters: { filters: {
company(e){ company(e) {
if(e){ if (e) {
return e=='2' ?'KG':'L'; return e == '2' ? 'KG' : 'L';
} else { } else {
return '' return ''
} }

Write Preview
Loading…
Cancel
Save