|
|
|
|
@ -105,11 +105,11 @@ |
|
|
|
|
name="input" /> --> |
|
|
|
|
|
|
|
|
|
<view style="flex-grow: 1; display: flex;" @tap="showModel='show'"> |
|
|
|
|
<view v-if="hz(carNumber.charAt(0))" class="sign"> |
|
|
|
|
{{carNumber.charAt(0)||''}} |
|
|
|
|
<view v-if="hz( String(carNumber).charAt(0))" class="sign"> |
|
|
|
|
<text v-if="carNumber">{{String(carNumber).charAt(0)||''}}</text> |
|
|
|
|
<uni-icons color="#ffffff" type="forward" size="15"></uni-icons> |
|
|
|
|
</view> |
|
|
|
|
<view class="flexcenter">{{carNumber.substr(1,6)||'请输入车牌号'}}</view> |
|
|
|
|
<view class="flexcenter">{{String(carNumber).substr(1,6)||'请输入车牌号'}}</view> |
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
<!-- <text class="cuIcon-roundclosefill text-gray"></text> --> |
|
|
|
|
@ -168,7 +168,10 @@ |
|
|
|
|
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> |
|
|
|
|
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥{{insertResult.oilSitePrice }}/{{siteData.siteType|company }}</text> |
|
|
|
|
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥ |
|
|
|
|
<text v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text> |
|
|
|
|
<text class="text-blod oil-main-color" v-else>无价格</text> |
|
|
|
|
</text> |
|
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -203,13 +206,15 @@ |
|
|
|
|
<text>约￥{{insertResult.vMoney|numberFilter}}</text> |
|
|
|
|
</view> |
|
|
|
|
<view class="cu-form-group" v-else> |
|
|
|
|
<view class="title newtitle"> {{siteData.siteType=='2'?'加气金额':'加油金额'}}</view> |
|
|
|
|
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气金额':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney" |
|
|
|
|
<view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view> |
|
|
|
|
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney" |
|
|
|
|
v-model="insertResult.vol" name="input" /> |
|
|
|
|
<view style="width: 170rpx;text-align: end;" class="textEllipsis"> |
|
|
|
|
<text class=""> |
|
|
|
|
<!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 --> |
|
|
|
|
{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'KG':'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':''}} --> |
|
|
|
|
</text> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
@ -226,7 +231,7 @@ |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<button class="margin round bg-main-oil" @tap="charge">立即下单</button> |
|
|
|
|
<button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge"> {{shake==null?'立即下单':'下单中'}}</button> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class v-show="!beforePay&&isG7"> |
|
|
|
|
@ -501,10 +506,10 @@ |
|
|
|
|
getMoney(e) { |
|
|
|
|
console.log(e) |
|
|
|
|
if (e.detail.value == '') { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '请输入金额', |
|
|
|
|
icon: 'none' |
|
|
|
|
}) |
|
|
|
|
// uni.showToast({ |
|
|
|
|
// title: '请输入金额', |
|
|
|
|
// icon: 'none' |
|
|
|
|
// }) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
let isNumber = this.isNumber(e.detail.value) |
|
|
|
|
@ -537,7 +542,8 @@ |
|
|
|
|
userType: uerTyps, |
|
|
|
|
xoilAmountGun: e.detail.value, |
|
|
|
|
priceId: this.activeSitePrice, |
|
|
|
|
companyId: this.siteData.companyId |
|
|
|
|
companyId: this.siteData.companyId, |
|
|
|
|
createSource:this.siteData.siteType=='2'?'XOIL':'' |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
this.xoilAmountGun = e.detail.value |
|
|
|
|
@ -627,6 +633,7 @@ |
|
|
|
|
this.changTypes = 0 |
|
|
|
|
}, |
|
|
|
|
charge() { |
|
|
|
|
//防抖 |
|
|
|
|
clearTimeout(this.shake) |
|
|
|
|
this.shake = setTimeout(()=>{ |
|
|
|
|
this.tsetPlate() |
|
|
|
|
@ -662,12 +669,14 @@ |
|
|
|
|
title: '车牌号校验不通过', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '您选择的油品没有油价，不能加油', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
} |
|
|
|
|
},500) |
|
|
|
|
|
|
|
|
|
@ -691,6 +700,7 @@ |
|
|
|
|
title: 'qrCode为空', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.siteId) { |
|
|
|
|
@ -698,6 +708,7 @@ |
|
|
|
|
title: '请选择油站id', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.companyId) { |
|
|
|
|
@ -705,6 +716,7 @@ |
|
|
|
|
title: '请选择企业id', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.customerId) { |
|
|
|
|
@ -712,6 +724,7 @@ |
|
|
|
|
title: '请选择司机id', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.volume) { |
|
|
|
|
@ -719,6 +732,7 @@ |
|
|
|
|
title: '请输入加油体积', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
oliSiteApi.FYPay(data6).then(res => { |
|
|
|
|
@ -745,7 +759,9 @@ |
|
|
|
|
this.getPayStatus(this.orderId) |
|
|
|
|
}, 400) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// setTimeout(()=>{ |
|
|
|
|
// this.shake=null |
|
|
|
|
// },1000) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
},//安能 |
|
|
|
|
@ -845,6 +861,7 @@ |
|
|
|
|
title: 'qrCode为空', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.siteId) { |
|
|
|
|
@ -852,6 +869,7 @@ |
|
|
|
|
title: '请选择油站id', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.companyId) { |
|
|
|
|
@ -859,6 +877,7 @@ |
|
|
|
|
title: '请选择企业id', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.customerId) { |
|
|
|
|
@ -866,6 +885,7 @@ |
|
|
|
|
title: '请选择司机id', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.volume) { |
|
|
|
|
@ -873,6 +893,7 @@ |
|
|
|
|
title: '请输入加油体积', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
oliSiteApi.sfPay(data6).then(res => { |
|
|
|
|
@ -899,7 +920,9 @@ |
|
|
|
|
// this.getPayStatus(this.orderId) |
|
|
|
|
// }, 400) |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
// setTimeout(()=>{ |
|
|
|
|
// this.shake=null |
|
|
|
|
// },1000) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
@ -938,6 +961,7 @@ |
|
|
|
|
title: '请选择油品', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.volume) { |
|
|
|
|
@ -945,6 +969,7 @@ |
|
|
|
|
title: '请输入加油体积', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
oliSiteApi.RrsPay(data6).then(res => { |
|
|
|
|
@ -984,7 +1009,9 @@ |
|
|
|
|
this.getPayStatus(this.orderId) |
|
|
|
|
}, 400) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// setTimeout(()=>{ |
|
|
|
|
// this.shake=null |
|
|
|
|
// },1000) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
@ -994,6 +1021,7 @@ |
|
|
|
|
let PlateNumberImages = this.PlateNumberImages, |
|
|
|
|
refuellerImages = this.refuellerImages |
|
|
|
|
if (PlateNumberImages == '') { |
|
|
|
|
this.shake=null |
|
|
|
|
uni.showToast({ |
|
|
|
|
icon: 'none', |
|
|
|
|
title: '请上传车辆照片' |
|
|
|
|
@ -1005,6 +1033,7 @@ |
|
|
|
|
icon: 'none', |
|
|
|
|
title: '请上传油机照片' |
|
|
|
|
}) |
|
|
|
|
this.shake=null |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
var data6 = { |
|
|
|
|
@ -1031,7 +1060,7 @@ |
|
|
|
|
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 |
|
|
|
|
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 |
|
|
|
|
siteUserName: "1", //类型：String 必有字段 备注：加油员名称 |
|
|
|
|
version: 1, //类型：Number 必有字段 备注：版本号 |
|
|
|
|
version: this.siteData.siteType=='2'?null:'1', //类型：Number 必有字段 备注：版本号 |
|
|
|
|
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
@ -1056,7 +1085,7 @@ |
|
|
|
|
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 |
|
|
|
|
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 |
|
|
|
|
siteUserName: "1", //类型：String 必有字段 备注：加油员名称 |
|
|
|
|
version: 1, //类型：Number 必有字段 备注：版本号 |
|
|
|
|
version: this.siteData.siteType=='2'?null:"1", //类型：Number 必有字段 备注：版本号 |
|
|
|
|
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -1066,17 +1095,80 @@ |
|
|
|
|
title: '请选择油品', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.volume) { |
|
|
|
|
if (!Number(data6.volume)) { |
|
|
|
|
if(this.siteData.siteType=='2'){ |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '请输入加油体积', |
|
|
|
|
title: '请输入加油升数', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
}else{ |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '请输入加油金额', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
let location = uni.getStorageSync('location')||{longitude:'',latitude:''}; |
|
|
|
|
// if(!location){ |
|
|
|
|
// let locationChenk = true |
|
|
|
|
// let that = this |
|
|
|
|
// uni.getLocation({ |
|
|
|
|
// type: 'gcj02', |
|
|
|
|
// success: function(res) { |
|
|
|
|
// uni.setStorage({ |
|
|
|
|
// key:'location', |
|
|
|
|
// data:res |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// fail(e) { |
|
|
|
|
// locationChenk = false |
|
|
|
|
// }, |
|
|
|
|
// }); |
|
|
|
|
// if(!locationChenk){ |
|
|
|
|
// uni.showToast({ |
|
|
|
|
// title:'请授权位置', |
|
|
|
|
// icon:'error' |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// console.log(location,'**************************************************') |
|
|
|
|
// return |
|
|
|
|
// } |
|
|
|
|
// uni.getLocation({ |
|
|
|
|
// type: 'gcj02', |
|
|
|
|
// success: function(res) { |
|
|
|
|
// uni.setStorage({ |
|
|
|
|
// key:'location', |
|
|
|
|
// data:res |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// fail(e) { |
|
|
|
|
// uni.showModal({ |
|
|
|
|
// title:'获取定位', |
|
|
|
|
// content:'是否重新获取定位?', |
|
|
|
|
// success:function(e){ |
|
|
|
|
// wx.openSetting({ |
|
|
|
|
// success:function(e){ |
|
|
|
|
// if (res.authSetting['scope.userLocation']){ |
|
|
|
|
// console.log('******') |
|
|
|
|
// } |
|
|
|
|
// }, |
|
|
|
|
// fail:function(e){ |
|
|
|
|
// console.log(e,'//////') |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// }); |
|
|
|
|
// return |
|
|
|
|
// |
|
|
|
|
console.log(data6, 'data6+++++') |
|
|
|
|
oliSiteApi.xoilPay(data6).then(res => { |
|
|
|
|
oliSiteApi.xoilPay(Object.assign(data6,{longitude:location.longitude,latitude:location.latitude})).then(res => { |
|
|
|
|
console.log(res) |
|
|
|
|
if (res.code === 20000) { |
|
|
|
|
uni.showToast({ |
|
|
|
|
@ -1098,7 +1190,6 @@ |
|
|
|
|
// createDatetime: res.data.orderTime, |
|
|
|
|
// realamount: res.data.payRealAmount, |
|
|
|
|
// istate: res.data.orderStatus |
|
|
|
|
|
|
|
|
|
// } |
|
|
|
|
// uni.setStorageSync('tempOrderInfo', data8) |
|
|
|
|
uni.setStorageSync('orderSource', 'mpxoil') |
|
|
|
|
@ -1114,8 +1205,10 @@ |
|
|
|
|
this.getPayStatus(this.orderId) |
|
|
|
|
}, 400) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
setTimeout(()=>{ |
|
|
|
|
this.shake=null |
|
|
|
|
},1000) |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 收费则yi |
|
|
|
|
@ -1142,6 +1235,7 @@ |
|
|
|
|
title: '请选择油品', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
if (!data6.volume) { |
|
|
|
|
@ -1149,6 +1243,7 @@ |
|
|
|
|
title: '请输入加油体积', |
|
|
|
|
icon: 'none' |
|
|
|
|
}); |
|
|
|
|
this.shake=null |
|
|
|
|
return false |
|
|
|
|
} |
|
|
|
|
oliSiteApi.zeyiPay(data6).then(res => { |
|
|
|
|
@ -1189,7 +1284,9 @@ |
|
|
|
|
this.getPayStatus(this.orderId) |
|
|
|
|
}, 400) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
setTimeout(()=>{ |
|
|
|
|
this.shake=null |
|
|
|
|
},1000) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
@ -1253,7 +1350,7 @@ |
|
|
|
|
oilsStationId: uni.getStorageSync('oilSiteId') //类型：String 必有字段 备注：加油站id |
|
|
|
|
} |
|
|
|
|
// } |
|
|
|
|
console.log(obj) |
|
|
|
|
console.log(obj,'**************'); |
|
|
|
|
oliSiteApi.verifyQrCode(obj).then(res => { |
|
|
|
|
if (res.code === 20000) { |
|
|
|
|
this.siteData = res.data |
|
|
|
|
@ -1397,7 +1494,7 @@ |
|
|
|
|
if(e){ |
|
|
|
|
return e=='2' ?'KG':'L'; |
|
|
|
|
} else { |
|
|
|
|
return 'L' |
|
|
|
|
return '' |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
moneyVolm(value) { |
|
|
|
|
|
lixuan
3 years ago