From b504c9633aa4a15a86977f8bd79f738aa9b672be Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 18 Dec 2023 15:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 1 + mycomponents/balance/balance.vue | 18 +++++++++++++----- mycomponents/recommend/recommend.vue | 5 ++++- mycomponents/recommend/recommendCount.vue | 5 ++++- pages/inventoryMove/coms/comMovebalance.vue | 5 ++++- .../job/productReceiptDetail.vue | 2 +- static/config.json | 10 ++++++++-- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/main.js b/main.js index 19300141..ffbacd21 100644 --- a/main.js +++ b/main.js @@ -72,6 +72,7 @@ export function startApp(app) { app.config.globalProperties.$recepit_configList = res.data.recepit_configList; getApp().globalData.recepit_configList = res.data.recepit_configList; getApp().globalData.feed_configList = res.data.feed_configList; + getApp().globalData.isDevelopment = res.data.baseInfo.isDevelopment.value } }, fail: (error) => { diff --git a/mycomponents/balance/balance.vue b/mycomponents/balance/balance.vue index 5c1c33cb..d285e4de 100644 --- a/mycomponents/balance/balance.vue +++ b/mycomponents/balance/balance.vue @@ -14,12 +14,16 @@ - - 复制箱码 - - - 复制制品 + + + 复制箱码 + + + 复制制品 + + + @@ -102,6 +106,10 @@ }) } ) + }, + isDevlement(){ + + return getApp().globalData.isDevelopment; } } } diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue index 0a0ff98b..35a4b780 100644 --- a/mycomponents/recommend/recommend.vue +++ b/mycomponents/recommend/recommend.vue @@ -17,7 +17,7 @@ - + 复制采购 |制品 @@ -105,6 +105,9 @@ }) } ) + }, + isDevlement(){ + return getApp().globalData.isDevelopment; } } } diff --git a/mycomponents/recommend/recommendCount.vue b/mycomponents/recommend/recommendCount.vue index 14a1559d..a3c2b519 100644 --- a/mycomponents/recommend/recommendCount.vue +++ b/mycomponents/recommend/recommendCount.vue @@ -16,7 +16,7 @@ - + 复制采购 |制品 @@ -108,6 +108,9 @@ }) } ) + }, + isDevlement(){ + return getApp().globalData.isDevelopment; } } } diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue index e4943e21..908f2525 100644 --- a/pages/inventoryMove/coms/comMovebalance.vue +++ b/pages/inventoryMove/coms/comMovebalance.vue @@ -19,7 +19,7 @@ :fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus"> - + 复制箱码 @@ -127,6 +127,9 @@ }) } ) + }, + isDevlement(){ + return getApp().globalData.isDevelopment; } } } diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue index 1425e40d..77de3139 100644 --- a/pages/productReceipt/job/productReceiptDetail.vue +++ b/pages/productReceipt/job/productReceiptDetail.vue @@ -14,7 +14,7 @@ diff --git a/static/config.json b/static/config.json index 259a68f5..ca9215a5 100644 --- a/static/config.json +++ b/static/config.json @@ -18,9 +18,9 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.230:12080/admin-api", + "value": "http://192.168.0.180:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", - "chefang": "http://192.168.0.178:12080/admin-api", + "chefang": "http://192.168.0.180:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", "dev": "http://dev.ccwin-in.com:25100/api/admin-api", "local": "http://localhost:12080", @@ -31,7 +31,13 @@ "name": "tenantId", "value": "1", "desc": "租户id" + }, + "isDevelopment": { + "name": "isDevelopment", + "value": true, + "desc": "是否是开发模式,true是开模式,false不是开发模式" } + }, "recepit_configList": [