diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue
index 40a8b9f..d1dc838 100644
--- a/pages/stationDetail/ZYSite.vue
+++ b/pages/stationDetail/ZYSite.vue
@@ -12,15 +12,16 @@
-
+
{{siteData.siteName}}
{{siteData.siteAddress}}
-
-
-
+
-
+
-
- 星
+
+
+ 星
- {{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}
- {{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}
+
+ {{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}
+
+ {{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}
-
+
￥{{siteData.userBalance || 0}}
@@ -93,30 +98,30 @@
需包含加油升数和价格
-
+
-
+
车牌号
-
+
-
-
-
+
+
+
{{String(carNumber).charAt(0)||''}}
-
- {{String(carNumber).substr(1,6)||'请输入车牌号'}}
-
+ {{String(carNumber).substr(1,6)||'请输入车牌号'}}
+
+
-
+
-
+
车牌识别
@@ -131,40 +136,38 @@
-
-
+
+
-
- {{item.oilProductCode}}
+
+ {{item.oilProductCode}}
-
+
-
+
-
+
星油价格:
￥{{(insertResult.sitePrice -1+1)|numberFilter}}/{{siteData.siteType|company}}
无价格
- 市场价￥{{insertResult.oilSitePrice|numberFilter}}/{{siteData.siteType|company}}
-
-
+ 市场价￥{{insertResult.oilSitePrice|numberFilter}}/{{siteData.siteType|company}}
+
+
-
+
-
+
-
+
星油价格:
￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}
- 无价格
+ 无价格
- 油站价格:￥
- {{insertResult.oilSitePrice}}/{{siteData.siteType|company }}
- 无价格
+ 油站价格:￥
+ {{insertResult.oilSitePrice}}/{{siteData.siteType|company }}
+ 无价格
-
-
-
-
-
+
枪号选择：
-
-
-
+
加油升数
{{siteData.siteType=='2'?'加气升数':'加油金额'}}
-
+
- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}
- {{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}
+ {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}
+ {{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}
-
+
星卡优惠金额
@@ -244,7 +254,8 @@
-
+
@@ -312,9 +323,9 @@
-
+
-
+
@@ -322,14 +333,14 @@
-
+
识别失败!
-
+
@@ -362,7 +373,7 @@
},
data() {
return {
- shake:null,
+ shake: null,
vlom: '',
companyId: '',
activeSitePrice: '',
@@ -429,7 +440,7 @@
}
},
onLoad(option) {
- console.log(option) //接收option.type
+ console.log(option) //接收option.type
if (option.user == 'kl') {
let code = uni.getStorageSync('qrCode'),
orderId = code.slice(0, -3)
@@ -439,22 +450,22 @@
console.log(this.qrCode)
}
// if(option.type =='RIRISHUN'){
- // console.log('这里是日日顺')
+ // console.log('这里是日日顺')
this.type = option.type //根据option.type 进行本地赋值
// }if(option.type =='zeyi'){
- // console.log('这里是日日顺')
+ // console.log('这里是日日顺')
// this.type = 'zeyi' //根据option.type 进行本地赋值
// }
// if(option.type =='shunfeng'){
- // console.log('这里是顺丰')
+ // console.log('这里是顺丰')
// this.type = 'shunfeng' //根据option.type 进行本地赋值
// }
// if(option.type =='fykc'){
- // console.log('这里是福佑')
+ // console.log('这里是福佑')
// this.type = 'fykc' //根据option.type 进行本地赋值
// }
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
console.log('G7加油站')
}
@@ -535,7 +546,7 @@
icon: 'none'
})
}
-
+
},
getCompanyConfig(companyId){
if(companyId){
@@ -546,7 +557,7 @@
}else{
this.plateNumberOcrShow = false
}
-
+
})
}
},
@@ -562,7 +573,7 @@
title: '识别中',
mask: true
});
-
+
const JSESSIONID = utils.uuid()
uni.uploadFile({
url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/carNoIdentify',
@@ -593,8 +604,8 @@
_that.showPlicePhoto = 'show'
}
})
-
-
+
+
}
})
},
@@ -675,7 +686,7 @@
xoilAmountGun: e.detail.value,
priceId: this.activeSitePrice,
companyId: this.siteData.companyId,
- createSource:this.siteData.siteType=='2'?'XOIL':''
+ createSource: this.siteData.siteType == '2' ? 'XOIL' : ''
}
}
this.xoilAmountGun = e.detail.value
@@ -767,7 +778,7 @@
charge() {
//防抖
clearTimeout(this.shake)
- this.shake = setTimeout(()=>{
+ this.shake = setTimeout(() => {
this.tsetPlate()
console.log(this.plateText)
console.log(this.plateNo)
@@ -782,10 +793,10 @@
this.SfOrder()
return
}
- if (this.type === 'G7') {
- this.G7Order()
- return
- }
+ if (this.type === 'G7') {
+ this.G7Order()
+ return
+ }
if (this.type == 'fykc') {
this.FyOrder()
return
@@ -801,17 +812,17 @@
title: '车牌号校验不通过',
icon: 'none'
});
- this.shake=null
+ this.shake = null
}
} else {
uni.showToast({
title: '您选择的油品没有油价，不能加油',
icon: 'none'
});
- this.shake=null
+ this.shake = null
}
- },500)
-
+ }, 500)
+
},
//福佑
FyOrder() {
@@ -832,7 +843,7 @@
title: 'qrCode为空',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.siteId) {
@@ -840,7 +851,7 @@
title: '请选择油站id',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.companyId) {
@@ -848,7 +859,7 @@
title: '请选择企业id',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.customerId) {
@@ -856,7 +867,7 @@
title: '请选择司机id',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.volume) {
@@ -864,7 +875,7 @@
title: '请输入加油体积',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
oliSiteApi.FYPay(data6).then(res => {
@@ -916,7 +927,7 @@
title: 'qrCode为空',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.siteId) {
@@ -924,7 +935,7 @@
title: '请选择油站id',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.companyId) {
@@ -932,7 +943,7 @@
title: '请选择企业id',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.customerId) {
@@ -940,7 +951,7 @@
title: '请选择司机id',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.volume) {
@@ -948,7 +959,7 @@
title: '请输入加油体积',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
oliSiteApi.sfPay(data6).then(res => {
@@ -987,87 +998,87 @@
url: '/pages/stationDetail/OrderStatus?item=' + item
})
},
- // g7
- G7Order() {
- const g7OrderInfo = {
- qr_code: uni.getStorageSync('qrCode'), //类型：String 必有字段 二维码 qrcode
- station_id: this.siteData.siteId, //类型：String 必有字段 油站id siteId
- oilPriceId: this.insertResult.priceId, //类型：String 必有字段 油价id priceId
- driver_phone: this.siteData.customerPhone, //类型：String 必有字段 油价id priceId
- companyId: this.siteData.companyId, //类型：String 必有字段 企业id companyId
- customerId: this.siteData.customerId, //类型：String 必有字段 司机id customerId
- truck_no: this.carNumber,
- gun_money: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
- gun_number: this.insertResult.bar, //类型：String 必有字段 备注：加油升数
- deduction_mode: 1,
- }
- console.log("加油信息===================",this.insertResult)
- console.log(g7OrderInfo)
- if (!g7OrderInfo.qr_code) {
- uni.showToast({
- title: 'qr_code为空',
- icon: 'none'
- });
- this.shake=null
- return false
- }
- if (!g7OrderInfo.station_id) {
- uni.showToast({
- title: '请选择油站id',
- icon: 'none'
- });
- this.shake=null
- return false
- }
- if (!g7OrderInfo.companyId) {
- uni.showToast({
- title: '请选择企业id',
- icon: 'none'
- });
- this.shake=null
- return false
- }
- if (!g7OrderInfo.customerId) {
- uni.showToast({
- title: '请选择司机id',
- icon: 'none'
- });
- this.shake=null
- return false
- }
- if (!g7OrderInfo.gun_money) {
- uni.showToast({
- title: '请输入加油金额',
- icon: 'none'
- });
- this.shake=null
- return false
- }
- oliSiteApi.G7Pay(g7OrderInfo).then(res => {
- if (res.code === 20000) {
- uni.showToast({
- title: '下单成功！'
- });
- uni.setStorageSync('orderSource', 'mpxoil')
- console.log("是否是g7================",this.isG7)
- if (!this.isG7) {
- setTimeout(() => {
- this.toDetails(res.data.orderId)
- }, 400)
- } else {
- this.beforePay = false
- setTimeout(() => {
- this.orderId = res.data.orderId
- console.log("queryTimer",this.orderId)
- this.queryTimer()
- console.log("getPayStatus",this.orderId)
- this.getPayStatus(this.orderId)
- }, 400)
- }
- this.shake=null
- }
- })
- },
+ // g7
+ G7Order() {
+ const g7OrderInfo = {
+ qr_code: uni.getStorageSync('qrCode'), //类型：String 必有字段 二维码 qrcode
+ station_id: this.siteData.siteId, //类型：String 必有字段 油站id siteId
+ oilPriceId: this.insertResult.priceId, //类型：String 必有字段 油价id priceId
+ driver_phone: this.siteData.customerPhone, //类型：String 必有字段 油价id priceId
+ companyId: this.siteData.companyId, //类型：String 必有字段 企业id companyId
+ customerId: this.siteData.customerId, //类型：String 必有字段 司机id customerId
+ truck_no: this.carNumber,
+ gun_money: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
+ gun_number: this.insertResult.bar, //类型：String 必有字段 备注：加油升数
+ deduction_mode: 1,
+ }
+ console.log("加油信息===================", this.insertResult)
+ console.log(g7OrderInfo)
+ if (!g7OrderInfo.qr_code) {
+ uni.showToast({
+ title: 'qr_code为空',
+ icon: 'none'
+ });
+ this.shake = null
+ return false
+ }
+ if (!g7OrderInfo.station_id) {
+ uni.showToast({
+ title: '请选择油站id',
+ icon: 'none'
+ });
+ this.shake = null
+ return false
+ }
+ if (!g7OrderInfo.companyId) {
+ uni.showToast({
+ title: '请选择企业id',
+ icon: 'none'
+ });
+ this.shake = null
+ return false
+ }
+ if (!g7OrderInfo.customerId) {
+ uni.showToast({
+ title: '请选择司机id',
+ icon: 'none'
+ });
+ this.shake = null
+ return false
+ }
+ if (!g7OrderInfo.gun_money) {
+ uni.showToast({
+ title: '请输入加油金额',
+ icon: 'none'
+ });
+ this.shake = null
+ return false
+ }
+ oliSiteApi.G7Pay(g7OrderInfo).then(res => {
+ if (res.code === 20000) {
+ uni.showToast({
+ title: '下单成功！'
+ });
+ uni.setStorageSync('orderSource', 'mpxoil')
+ console.log("是否是g7================", this.isG7)
+ if (!this.isG7) {
+ setTimeout(() => {
+ this.toDetails(res.data.orderId)
+ }, 400)
+ } else {
+ this.beforePay = false
+ setTimeout(() => {
+ this.orderId = res.data.orderId
+ console.log("queryTimer", this.orderId)
+ this.queryTimer()
+ console.log("getPayStatus", this.orderId)
+ this.getPayStatus(this.orderId)
+ }, 400)
+ }
+ this.shake = null
+ }
+ })
+ },
//日日顺
RrsOrder() {
const data6 = {
@@ -1097,7 +1108,7 @@
title: '请选择油品',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.volume) {
@@ -1105,7 +1116,7 @@
title: '请输入加油体积',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
oliSiteApi.RrsPay(data6).then(res => {
@@ -1157,7 +1168,7 @@
let PlateNumberImages = this.PlateNumberImages,
refuellerImages = this.refuellerImages
if (PlateNumberImages == '') {
- this.shake=null
+ this.shake = null
uni.showToast({
icon: 'none',
title: '请上传车辆照片'
@@ -1169,7 +1180,7 @@
icon: 'none',
title: '请上传油机照片'
})
- this.shake=null
+ this.shake = null
return
}
var data6 = {
@@ -1194,7 +1205,7 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：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 必有字段 备注：加油升数
}
} else {
@@ -1253,11 +1264,11 @@
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
accountCardCode: this.siteData.accountCardCode, //类型：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 必有字段 备注：加油升数
}
}
-
+
}
if (!data6.oilsCode) {
@@ -1265,25 +1276,28 @@
title: '请选择油品',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!Number(data6.volume)) {
- if(this.siteData.siteType=='2'){
+ if (this.siteData.siteType == '2') {
uni.showToast({
title: '请输入加油升数',
icon: 'none'
});
- }else{
+ } else {
uni.showToast({
title: '请输入加油金额',
icon: 'none'
});
}
- this.shake=null
+ this.shake = null
return false
}
- let location = uni.getStorageSync('location')||{longitude:'',latitude:''};
+ let location = uni.getStorageSync('location') || {
+ longitude: '',
+ latitude: ''
+ };
// if(!location){
// let locationChenk = true
// let that = this
@@ -1304,7 +1318,7 @@
// title:'请授权位置',
// icon:'error'
// })
- // }
+ // }
// console.log(location,'**************************************************')
// return
// }
@@ -1336,9 +1350,12 @@
// },
// });
// return
- //
+ //
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)
if (res.code === 20000) {
uni.showToast({
@@ -1376,9 +1393,9 @@
}, 400)
}
}
- setTimeout(()=>{
- this.shake=null
- },1000)
+ setTimeout(() => {
+ this.shake = null
+ }, 1000)
})
},
// 收费则yi
@@ -1405,7 +1422,7 @@
title: '请选择油品',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
if (!data6.volume) {
@@ -1413,7 +1430,7 @@
title: '请输入加油体积',
icon: 'none'
});
- this.shake=null
+ this.shake = null
return false
}
oliSiteApi.zeyiPay(data6).then(res => {
@@ -1454,9 +1471,9 @@
this.getPayStatus(this.orderId)
}, 400)
}
- setTimeout(()=>{
- this.shake=null
- },1000)
+ setTimeout(() => {
+ this.shake = null
+ }, 1000)
}
})
},
@@ -1521,7 +1538,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
@@ -1560,12 +1577,12 @@
// this.insertResult.discountMoney = this.insertResult.vol * (this.selected.oilSitePrice - this.insertResult
// .sitePrice)
// this.insertResult.vDoMoney = this.insertResult.vol * this.selected.sitePrice
- console.log('%c look me ↓','font-size:50px;color:green')
- console.log(this.insertResult.vMoney,this.insertResult,this.selected)
- if(this.insertResult.vol!==''){
+ console.log('%c look me ↓', 'font-size:50px;color:green')
+ console.log(this.insertResult.vMoney, this.insertResult, this.selected)
+ if (this.insertResult.vol !== '') {
this.getMoney({
- detail:{
- value:this.insertResult.vol
+ detail: {
+ value: this.insertResult.vol
}
})
}
@@ -1661,9 +1678,9 @@
}
},
filters: {
- company(e){
- if(e){
- return e=='2' ?'KG':'L';
+ company(e) {
+ if (e) {
+ return e == '2' ? 'KG' : 'L';
} else {
return ''
}