From 593221f9d446e415c189d429f244b842a9e9ecaa Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 16 May 2024 18:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +----- .env.production | 1 + package.json | 1 + src/pages/issue/coms/comScanIssuePack.vue | 2 ++ src/pages/issue/job/issueDetail.vue | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 .env.production diff --git a/.env.development b/.env.development index 6216ebf9..8856dddb 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1 @@ -VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api -VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api - -# 租户配置 -VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file +VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file diff --git a/.env.production b/.env.production new file mode 100644 index 00000000..8856dddb --- /dev/null +++ b/.env.production @@ -0,0 +1 @@ +VITE_BASE_URL=http://172.21.32.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file diff --git a/package.json b/package.json index 21371702..0d932a24 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "hella8:app-ios": "uni build -p app-ios --mode hella8", "hella8:h5:ssr": "uni build --ssr --mode hella8", "hella8:mp-weixin": "uni build -p mp-weixin --mode hella8", + "prod": "uni build --mode production", "test": "uni build --mode test", "hella8": "uni build --mode hella8", "hella9": "uni build --mode hella9", diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index a6353a39..8d06bfb4 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -245,6 +245,8 @@ } }); return + }else { + this.onScanResult(result) } } }, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index c25a4f7e..130b0380 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -243,11 +243,11 @@ // }, submit() { - let params = this.setParams() - if(!params.subList||params.subList.length==0){ - this.showErrorMessage("请扫描您需要提交的发料任务") - return - } + // let params = this.setParams() + // if(!params.subList||params.subList.length==0){ + // this.showErrorMessage("请扫描您需要提交的发料任务") + // return + // } uni.showLoading({ title: "提交中....", mask: true