From 2b72b9be8c13d77efd49605949bcf24ed772772c Mon Sep 17 00:00:00 2001 From: caolc <572275724@qq.com> Date: Thu, 24 Mar 2022 14:41:44 +0800 Subject: [PATCH 1/5] 111 --- package-lock.json | 251 +++++++++++++++++++++++---------- pages/stationDetail/ZYSite.vue | 17 ++- utils/request.js | 2 +- 3 files changed, 187 insertions(+), 83 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78000dc..ff38b26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,77 +1,178 @@ { - "name": "lsm_oil_site", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", - "requires": { - "follow-redirects": "1.5.10" - } - }, - "crypto-js": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz", - "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } - }, - "js-cookie": { - "version": "2.2.1", - "resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz", - "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=" - }, - "js-md5": { - "version": "0.7.3", - "resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz", - "integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=" - }, - "jsencrypt": { - "version": "3.0.0-rc.1", - "resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz", - "integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "tki-qrcode": { - "version": "0.1.6", - "resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz", - "integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8=" - }, - "tsc": { - "version": "2.0.3", - "resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz", - "integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8=" - }, - "typescript": { - "version": "4.3.5", - "resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz", - "integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ=" - }, - "uview-ui": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz", - "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA==" - } - } + "name": "lsm_oil_site", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "lsm_oil_site", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "axios": "^0.19.2", + "crypto-js": "4.0.0", + "js-cookie": "2.2.1", + "js-md5": "0.7.3", + "jsencrypt": "^3.0.0-rc.1", + "tki-qrcode": "^0.1.6", + "tsc": "^2.0.3", + "typescript": "^4.3.5", + "uview-ui": "^1.8.4" + } + }, + "node_modules/axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410", + "dependencies": { + "follow-redirects": "1.5.10" + } + }, + "node_modules/crypto-js": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz", + "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=" + }, + "node_modules/debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "dependencies": { + "debug": "=3.1.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz", + "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=" + }, + "node_modules/js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz", + "integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=" + }, + "node_modules/jsencrypt": { + "version": "3.0.0-rc.1", + "resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz", + "integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw=" + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/tki-qrcode": { + "version": "0.1.6", + "resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz", + "integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8=" + }, + "node_modules/tsc": { + "version": "2.0.3", + "resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz", + "integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8=", + "bin": { + "tsc": "bin/tsc" + } + }, + "node_modules/typescript": { + "version": "4.3.5", + "resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz", + "integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ=", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/uview-ui": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz", + "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA==" + } + }, + "dependencies": { + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + }, + "crypto-js": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz", + "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=" + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz", + "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=" + }, + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz", + "integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=" + }, + "jsencrypt": { + "version": "3.0.0-rc.1", + "resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz", + "integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "tki-qrcode": { + "version": "0.1.6", + "resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz", + "integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8=" + }, + "tsc": { + "version": "2.0.3", + "resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz", + "integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8=" + }, + "typescript": { + "version": "4.3.5", + "resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz", + "integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ=" + }, + "uview-ui": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz", + "integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA==" + } + } } diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue index 420dcfc..26c529c 100644 --- a/pages/stationDetail/ZYSite.vue +++ b/pages/stationDetail/ZYSite.vue @@ -106,7 +106,7 @@ - {{carNumber.charAt(0)||''}} + {{carNumber.charAt(0)||''}} {{carNumber.substr(1,6)||'请输入车牌号'}} @@ -203,13 +203,15 @@ 约￥{{insertResult.vMoney|numberFilter}} - {{siteData.siteType=='2'?'加气金额':'加油金额'}} - {{siteData.siteType=='2'?'加气升数':'加油金额'}} + - {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'KG':'L'):''}} + {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}} + {{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney:'') + (siteData.siteType=='2'?'元':'L'):''}} + @@ -537,7 +539,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 @@ -950,7 +953,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'?'XOIL':'', //类型：Number 必有字段 备注：版本号 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 } } else { @@ -975,7 +978,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'?'XOIL':'', //类型：Number 必有字段 备注：版本号 xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数 } } diff --git a/utils/request.js b/utils/request.js index f33ecd7..4f4095f 100644 --- a/utils/request.js +++ b/utils/request.js @@ -7,7 +7,7 @@ import utils from '@/utils/encode' //42 洛超 /29 孙志华 /40 阿浩 // 测试日日顺时需要连阿浩 -const testUrl = 'http://192.168.0.28:38080' +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 = 'http://121.196.213.68/adminapi' //预生产 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 2/5] 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({ From 88f47d08731aaa5cbaeae0ae2a9be55fb7f8833a Mon Sep 17 00:00:00 2001 From: caolc <572275724@qq.com> Date: Mon, 25 Apr 2022 17:08:33 +0800 Subject: [PATCH 3/5] 111 --- pages/index/index.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pages/index/index.vue b/pages/index/index.vue index e9c5e6d..f539c5d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -129,8 +129,21 @@ this.longiCheck() // //console.log('++++++++') //console.log('这里是传值处menus',this.menusList) + this.getPosition() }, methods: { + getPosition(){ + let that = this + uni.getLocation({ + type: 'gcj02', + success: function(res) { + uni.setStorage({ + key:'location', + data:res + }) + } + }); + }, changMenus(data){ //console.log('这里是获取子级数据的地方+++++',data) this.menusList =data From d97f8a59e9e9ea4f97d8fa45679a1bd5dc4cc63a Mon Sep 17 00:00:00 2001 From: caolc <572275724@qq.com> Date: Mon, 25 Apr 2022 17:08:43 +0800 Subject: [PATCH 4/5] 11 --- pages/stationDetail/ZYSite.vue | 64 +++++++++++++++++++++++++++++++--- utils/request.js | 6 ++-- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue index e13d8df..2e15e36 100644 --- a/pages/stationDetail/ZYSite.vue +++ b/pages/stationDetail/ZYSite.vue @@ -105,11 +105,11 @@ name="input" /> --> - - {{carNumber.charAt(0)||''}} + + {{String(carNumber).charAt(0)||''}} - {{carNumber.substr(1,6)||'请输入车牌号'}} + {{String(carNumber).substr(1,6)||'请输入车牌号'}} @@ -1026,8 +1026,62 @@ 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({ @@ -1205,7 +1259,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 diff --git a/utils/request.js b/utils/request.js index aab16f1..ce2846c 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,15 +1,15 @@ import axios from 'axios' import utils from '@/utils/encode' - // const env = 'production' /* */ - const env = 'test'// 仅用于测试、 + const env = 'production' /* */ + // const env = 'test'// 仅用于测试、 // const env = 'production' //42 洛超 /29 孙志华 /40 阿浩 // 测试日日顺时需要连阿浩 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({ From e684eab82ff7611e21bf971cc7e6ed18e9d14e49 Mon Sep 17 00:00:00 2001 From: caolc <572275724@qq.com> Date: Fri, 10 Jun 2022 10:06:02 +0800 Subject: [PATCH 5/5] 1111 --- pages/home/home.vue | 4 ++-- pages/stationDetail/ZYSite.vue | 18 ++++++++++++++---- utils/request.js | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 9170aa2..4de22c9 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -297,7 +297,7 @@ markerPhone(){ if (this.sitInfo.phone) { uni.makePhoneCall({ - phoneNumber:this.sitInfo.phone + phoneNumber:'4008-56-5355' }) } else { uni.showToast({ @@ -405,7 +405,7 @@ this.SiteOliInfo = res.data.oil if(res.data.oil.length <3){ this.showHeight = ' auto' - }else{ + }else{ this.showHeight = '340rpx' } uni.setStorageSync('oilSiteId',res.data.site.siteCode) diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue index 2e15e36..c0df495 100644 --- a/pages/stationDetail/ZYSite.vue +++ b/pages/stationDetail/ZYSite.vue @@ -755,7 +755,9 @@ this.getPayStatus(this.orderId) }, 400) } - this.shake=null + // setTimeout(()=>{ + // this.shake=null + // },1000) } }) }, @@ -837,7 +839,9 @@ // this.getPayStatus(this.orderId) // }, 400) // } - this.shake=null + // setTimeout(()=>{ + // this.shake=null + // },1000) } }) }, @@ -924,7 +928,9 @@ this.getPayStatus(this.orderId) }, 400) } - this.shake=null + // setTimeout(()=>{ + // this.shake=null + // },1000) } }) }, @@ -1119,7 +1125,9 @@ }, 400) } } - this.shake=null + setTimeout(()=>{ + this.shake=null + },1000) }) }, // 收费则yi @@ -1195,7 +1203,9 @@ this.getPayStatus(this.orderId) }, 400) } + setTimeout(()=>{ this.shake=null + },1000) } }) }, diff --git a/utils/request.js b/utils/request.js index ce2846c..4f4095f 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,8 +1,8 @@ import axios from 'axios' import utils from '@/utils/encode' - const env = 'production' /* */ - // const env = 'test'// 仅用于测试、 + // const env = 'production' /* */ + const env = 'test'// 仅用于测试、 // const env = 'production' //42 洛超 /29 孙志华 /40 阿浩 // 测试日日顺时需要连阿浩