From a59bf23fd7851a6e999aabcfe04142ae603ff57e Mon Sep 17 00:00:00 2001 From: clc <572275724@qq.com> Date: Mon, 15 Aug 2022 17:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=80=81=E5=90=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BagStation/orderDetail/orderDetail.vue | 2 +- BagStation/orderDetail/orderDetailUrea.vue | 2 +- .../pages/SeparateProcess/payResult.vue | 2 +- .../pages/components/price-select-tab.vue | 2 +- BagStation/pages/components/price-tab.vue | 2 +- BagStation/pages/makeOrder/payResult.vue | 2 +- .../components/serviceStation.vue | 2 +- .../ureaOrderDetail/ureaOrderDetail.vue | 2 +- components/site-item/site-item.vue | 2 +- components/three-item.vue | 2 +- main.js | 2 +- package-lock.json | 51 ++++++++++++++++++- utils/request.js | 4 +- 13 files changed, 63 insertions(+), 14 deletions(-) diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue index 1a1f5ad..f74152e 100644 --- a/BagStation/orderDetail/orderDetail.vue +++ b/BagStation/orderDetail/orderDetail.vue @@ -376,7 +376,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/orderDetail/orderDetailUrea.vue b/BagStation/orderDetail/orderDetailUrea.vue index 6bb6412..1429448 100644 --- a/BagStation/orderDetail/orderDetailUrea.vue +++ b/BagStation/orderDetail/orderDetailUrea.vue @@ -399,7 +399,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/pages/SeparateProcess/payResult.vue b/BagStation/pages/SeparateProcess/payResult.vue index 8aad091..14bd625 100644 --- a/BagStation/pages/SeparateProcess/payResult.vue +++ b/BagStation/pages/SeparateProcess/payResult.vue @@ -370,7 +370,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/pages/components/price-select-tab.vue b/BagStation/pages/components/price-select-tab.vue index bb9d089..594578b 100644 --- a/BagStation/pages/components/price-select-tab.vue +++ b/BagStation/pages/components/price-select-tab.vue @@ -1202,7 +1202,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/pages/components/price-tab.vue b/BagStation/pages/components/price-tab.vue index 6f12ca4..89d1777 100644 --- a/BagStation/pages/components/price-tab.vue +++ b/BagStation/pages/components/price-tab.vue @@ -152,7 +152,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/pages/makeOrder/payResult.vue b/BagStation/pages/makeOrder/payResult.vue index 8aad091..14bd625 100644 --- a/BagStation/pages/makeOrder/payResult.vue +++ b/BagStation/pages/makeOrder/payResult.vue @@ -370,7 +370,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/pages/newRoutePlanning/components/serviceStation.vue b/BagStation/pages/newRoutePlanning/components/serviceStation.vue index ab139cf..e61d9a4 100644 --- a/BagStation/pages/newRoutePlanning/components/serviceStation.vue +++ b/BagStation/pages/newRoutePlanning/components/serviceStation.vue @@ -82,7 +82,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/BagStation/ureaOrderDetail/ureaOrderDetail.vue b/BagStation/ureaOrderDetail/ureaOrderDetail.vue index 596215b..45b6958 100644 --- a/BagStation/ureaOrderDetail/ureaOrderDetail.vue +++ b/BagStation/ureaOrderDetail/ureaOrderDetail.vue @@ -349,7 +349,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/components/site-item/site-item.vue b/components/site-item/site-item.vue index 3c83095..4ed87b9 100644 --- a/components/site-item/site-item.vue +++ b/components/site-item/site-item.vue @@ -137,7 +137,7 @@ // case 'WJY': // return '万金油' // case 'LV': - // return '老吕（找油网）' + // return '其他' // case 'TY': // return '团油' // case 'YDJY': diff --git a/components/three-item.vue b/components/three-item.vue index d49443c..1fa7897 100644 --- a/components/three-item.vue +++ b/components/three-item.vue @@ -57,7 +57,7 @@ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/main.js b/main.js index caaa578..a23dfb3 100644 --- a/main.js +++ b/main.js @@ -59,7 +59,7 @@ Vue.filter('olitype',(value)=>{ case 'WJY': return '万金油' case 'LV': - return '老吕（找油网）' + return '其他' case 'TY': return '团油' case 'YDJY': diff --git a/package-lock.json b/package-lock.json index 7d3af08..b252cce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,57 @@ { "name": "wechat-oil-company", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "wechat-oil-company", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "axios": "^0.21.1", + "crypto-js": "^4.0.0", + "js-md5": "^0.7.3" + } + }, + "node_modules/axios": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "dependencies": { + "follow-redirects": "^1.10.0" + } + }, + "node_modules/crypto-js": { + "version": "4.0.0", + "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.0.0.tgz", + "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=" + }, + "node_modules/follow-redirects": { + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz", + "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "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=" + } + }, "dependencies": { "axios": { "version": "0.21.1", diff --git a/utils/request.js b/utils/request.js index f15aa2a..11a7bd1 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,8 +1,8 @@ import axios from 'axios' import utils from '@/utils/encode' // const env = process.env.NODE_ENV -// const env = 'production'/* */ -const env = 'test' +const env = 'production'/* */ +// const env = 'test' // const env = 'production' // 45 const testUrl = 'http://192.168.0.46:38080'