From 1f04fa9733171ee33a7e5e618b9ec240aa7956c3 Mon Sep 17 00:00:00 2001 From: caolc <572275724@qq.com> Date: Fri, 22 Apr 2022 14:53:23 +0800 Subject: [PATCH] 11111 --- packageOrders/components/order-item.vue | 2 +- .../orderList/OrderDetail/OrderDetail.vue | 11 +-- .../TransactionStatistics.vue | 2 +- pages/stationDetail/ZYSite.vue | 72 +++++++++++++------ utils/request.js | 2 +- 5 files changed, 60 insertions(+), 29 deletions(-) diff --git a/packageOrders/components/order-item.vue b/packageOrders/components/order-item.vue index 63e33b3..2f2acab 100644 --- a/packageOrders/components/order-item.vue +++ b/packageOrders/components/order-item.vue @@ -30,7 +30,7 @@ {{item.oilsCode}} - {{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}} + {{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}} diff --git a/packageOrders/pages/orderList/OrderDetail/OrderDetail.vue b/packageOrders/pages/orderList/OrderDetail/OrderDetail.vue index eced91e..81a1929 100644 --- a/packageOrders/pages/orderList/OrderDetail/OrderDetail.vue +++ b/packageOrders/pages/orderList/OrderDetail/OrderDetail.vue @@ -55,11 +55,11 @@ --> 油机单价 - ￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'KG':'L'}} + ￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'L':'L'}} - {{ orderItem.oilProductType=='GAS'?'加气重量':'加油升数' }} - {{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'KG':'L'}} + {{ orderItem.oilProductType=='GAS'?'加气升数':'加油升数' }} + {{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'L':'L'}} 油机总价 @@ -183,7 +183,7 @@ }, filters:{ company(e){ - if(e) return e=='GAS'?'KG':'L'; + if(e) return e=='GAS'?'L':'L'; }, }, computed: { @@ -454,7 +454,8 @@ // if( _that.zeyiType == 1){ // return value // } - let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/)) + // let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/)) + let number = Number(value).toFixed(2) return number } else { return '0.00' diff --git a/pages/TransactionStatistics/TransactionStatistics.vue b/pages/TransactionStatistics/TransactionStatistics.vue index f479fc7..1eeb91e 100644 --- a/pages/TransactionStatistics/TransactionStatistics.vue +++ b/pages/TransactionStatistics/TransactionStatistics.vue @@ -92,7 +92,7 @@ - {{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}} + {{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}} diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue index 26c529c..e13d8df 100644 --- a/pages/stationDetail/ZYSite.vue +++ b/pages/stationDetail/ZYSite.vue @@ -168,7 +168,10 @@ v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}} 无价格 - 油站价格:￥{{insertResult.oilSitePrice }}/{{siteData.siteType|company }} + 油站价格:￥ + {{insertResult.oilSitePrice}}/{{siteData.siteType|company }} + 无价格 + @@ -210,7 +213,7 @@ {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}} - {{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney:'') + (siteData.siteType=='2'?'元':'L'):''}} + {{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}} @@ -228,7 +231,7 @@ - + @@ -503,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) @@ -630,6 +633,7 @@ this.changTypes = 0 }, charge() { + //防抖 clearTimeout(this.shake) this.shake = setTimeout(()=>{ this.tsetPlate() @@ -661,12 +665,14 @@ title: '车牌号校验不通过', icon: 'none' }); + this.shake=null } } else { uni.showToast({ title: '您选择的油品没有油价，不能加油', icon: 'none' }); + this.shake=null } },500) @@ -690,6 +696,7 @@ title: 'qrCode为空', icon: 'none' }); + this.shake=null return false } if (!data6.siteId) { @@ -697,6 +704,7 @@ title: '请选择油站id', icon: 'none' }); + this.shake=null return false } if (!data6.companyId) { @@ -704,6 +712,7 @@ title: '请选择企业id', icon: 'none' }); + this.shake=null return false } if (!data6.customerId) { @@ -711,6 +720,7 @@ title: '请选择司机id', icon: 'none' }); + this.shake=null return false } if (!data6.volume) { @@ -718,6 +728,7 @@ title: '请输入加油体积', icon: 'none' }); + this.shake=null return false } oliSiteApi.FYPay(data6).then(res => { @@ -744,7 +755,7 @@ this.getPayStatus(this.orderId) }, 400) } - + this.shake=null } }) }, @@ -767,6 +778,7 @@ title: 'qrCode为空', icon: 'none' }); + this.shake=null return false } if (!data6.siteId) { @@ -774,6 +786,7 @@ title: '请选择油站id', icon: 'none' }); + this.shake=null return false } if (!data6.companyId) { @@ -781,6 +794,7 @@ title: '请选择企业id', icon: 'none' }); + this.shake=null return false } if (!data6.customerId) { @@ -788,6 +802,7 @@ title: '请选择司机id', icon: 'none' }); + this.shake=null return false } if (!data6.volume) { @@ -795,6 +810,7 @@ title: '请输入加油体积', icon: 'none' }); + this.shake=null return false } oliSiteApi.sfPay(data6).then(res => { @@ -821,7 +837,7 @@ // this.getPayStatus(this.orderId) // }, 400) // } - + this.shake=null } }) }, @@ -860,6 +876,7 @@ title: '请选择油品', icon: 'none' }); + this.shake=null return false } if (!data6.volume) { @@ -867,6 +884,7 @@ title: '请输入加油体积', icon: 'none' }); + this.shake=null return false } oliSiteApi.RrsPay(data6).then(res => { @@ -906,7 +924,7 @@ this.getPayStatus(this.orderId) }, 400) } - + this.shake=null } }) }, @@ -916,6 +934,7 @@ let PlateNumberImages = this.PlateNumberImages, refuellerImages = this.refuellerImages if (PlateNumberImages == '') { + this.shake=null uni.showToast({ icon: 'none', title: '请上传车辆照片' @@ -927,6 +946,7 @@ icon: 'none', title: '请上传油机照片' }) + this.shake=null return } var data6 = { @@ -953,7 +973,7 @@ oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 siteUserName: "1", //类型：String 必有字段 备注：加油员名称 - version: this.siteData.siteType=='2'?'XOIL':'', //类型：Number 必有字段 备注：版本号 + version: this.siteData.siteType=='2'?null:'1', //类型：Number 必有字段 备注：版本号 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 } } else { @@ -978,7 +998,7 @@ oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请 accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号 siteUserName: "1", //类型：String 必有字段 备注：加油员名称 - version: this.siteData.siteType=='2'?'XOIL':'', //类型：Number 必有字段 备注：版本号 + version: this.siteData.siteType=='2'?null:"1", //类型：Number 必有字段 备注：版本号 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 } } @@ -988,13 +1008,22 @@ title: '请选择油品', icon: 'none' }); + this.shake=null return false } - if (!data6.volume) { - uni.showToast({ - title: '请输入加油体积', - icon: 'none' - }); + if (!Number(data6.volume)) { + if(this.siteData.siteType=='2'){ + uni.showToast({ + title: '请输入加油升数', + icon: 'none' + }); + }else{ + uni.showToast({ + title: '请输入加油金额', + icon: 'none' + }); + } + this.shake=null return false } console.log(data6, 'data6+++++') @@ -1020,7 +1049,6 @@ // createDatetime: res.data.orderTime, // realamount: res.data.payRealAmount, // istate: res.data.orderStatus - // } // uni.setStorageSync('tempOrderInfo', data8) uni.setStorageSync('orderSource', 'mpxoil') @@ -1036,8 +1064,8 @@ this.getPayStatus(this.orderId) }, 400) } - } + this.shake=null }) }, // 收费则yi @@ -1064,6 +1092,7 @@ title: '请选择油品', icon: 'none' }); + this.shake=null return false } if (!data6.volume) { @@ -1071,6 +1100,7 @@ title: '请输入加油体积', icon: 'none' }); + this.shake=null return false } oliSiteApi.zeyiPay(data6).then(res => { @@ -1111,7 +1141,7 @@ this.getPayStatus(this.orderId) }, 400) } - + this.shake=null } }) }, @@ -1319,7 +1349,7 @@ if(e){ return e=='2' ?'KG':'L'; } else { - return 'L' + return '' } }, moneyVolm(value) { diff --git a/utils/request.js b/utils/request.js index 4f4095f..aab16f1 100644 --- a/utils/request.js +++ b/utils/request.js @@ -9,7 +9,7 @@ import utils from '@/utils/encode' const testUrl = 'http://192.168.0.31:38080' // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old -const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new +// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new // const productionUrl = 'http://121.196.213.68/adminapi' //预生产 // const env = process.env.NODE_ENV // 环境 const service = axios.create({