From 902b5e25cb9b08bb0bb853f84396d2aa44dfb753 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Sat, 23 Dec 2023 18:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=9E=B6=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/host.js | 4 +- manifest.json | 367 ++++++++++----------- pagesHome/pages/ScanUp/ScanUp.vue | 3 +- unpackage/dist/dev/app-plus/app-service.js | 4 +- unpackage/dist/dev/app-plus/manifest.json | 4 +- 5 files changed, 190 insertions(+), 192 deletions(-) diff --git a/config/host.js b/config/host.js index 1af91b3..b4aefd1 100644 --- a/config/host.js +++ b/config/host.js @@ -4,7 +4,7 @@ * 测试域名 * */ //测试域名 -const devhost = 'http://test.api.huitongys.com/' +// const devhost = 'http://test.api.huitongys.com/' // lmy // const devhost = 'http://192.168.10.123:8889/' // zhy @@ -17,7 +17,7 @@ const devhost = 'http://test.api.huitongys.com/' // cg // const devhost = 'http://192.168.10.57:13000/' // 正式 -// const devhost = 'https://h5uapi.huitongys.com/' +const devhost = 'https://h5uapi.huitongys.com/' // cg // const devhost = 'http://192.168.10.200:13000/' /** diff --git a/manifest.json b/manifest.json index fc69282..6a8518a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,187 +1,186 @@ { - "name" : "货无忧", - "appid" : "__UNI__EB22F37", - "description" : "", - "versionName" : "1.1.01", - "versionCode" : 1101, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - // "custom":false, - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "Bluetooth" : {}, - "Barcode" : {}, - "Camera" : {}, - "Geolocation" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : { - "dSYMs" : false, - "idfa" : false - }, - /* SDK配置 */ - "sdkConfigs" : { - "geolocation" : { - "amap" : { - "__platform__" : [ "android" ], - "appkey_ios" : "f5577fdddf4f68f92bbde932e9e35bd6", - "appkey_android" : "f5577fdddf4f68f92bbde932e9e35bd6" - } - }, - "ad" : {} - }, - "splashscreen" : { - "androidStyle" : "common", - "useOriginalMsgbox" : false, - "iosStyle" : "common" - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - } - }, - "nativePlugins" : { - "MT-TTS" : { - "__plugin_info__" : { - "name" : "MT-TTS语音合成", - "description" : "安卓tts语音合成", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - }, - "Sunmi-Print-Inner" : { - "__plugin_info__" : { - "name" : "Sunmi-Print-Inner", - "description" : "商米打印服务uniapp插件", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - }, - "LcPrinter" : { - "__plugin_info__" : { - "name" : "LcPrinter", - "description" : "打印插件", - "platforms" : "Android", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", - "parameters" : {} - } - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxedb0d10ea46a0113", - "setting" : { - "urlCheck" : false, - "es6" : false, - "ignoreDevUnusedFiles" : false, - "lazyCodeLoading" : "requiredComponents", - "minified" : true - }, - "usingComponents" : true, - "permission" : { - "scope.userFuzzyLocation" : { - "desc" : "你的位置信息将用于小程序位置接口的效果展示" - }, - "scope.userLocation" : { - "desc" : "你的位置信息将用于小程序位置接口的效果展示" - } - }, - "requiredPrivateInfos" : [ "getLocation" ] - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "3" + "name": "货无忧", + "appid": "__UNI__EB22F37", + "description": "", + "versionName": "1.1.02", + "versionCode": 1102, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + // "custom":false, + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "Bluetooth": {}, + "Barcode": {}, + "Camera": {}, + "Geolocation": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": { + "dSYMs": false, + "idfa": false + }, + /* SDK配置 */ + "sdkConfigs": { + "geolocation": { + "amap": { + "__platform__": ["android"], + "appkey_ios": "f5577fdddf4f68f92bbde932e9e35bd6", + "appkey_android": "f5577fdddf4f68f92bbde932e9e35bd6" + } + }, + "ad": {} + }, + "splashscreen": { + "androidStyle": "common", + "useOriginalMsgbox": false, + "iosStyle": "common" + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + } + }, + "nativePlugins": { + "MT-TTS": { + "__plugin_info__": { + "name": "MT-TTS语音合成", + "description": "安卓tts语音合成", + "platforms": "Android", + "url": "", + "android_package_name": "", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": {} + } + }, + "Sunmi-Print-Inner": { + "__plugin_info__": { + "name": "Sunmi-Print-Inner", + "description": "商米打印服务uniapp插件", + "platforms": "Android", + "url": "", + "android_package_name": "", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": {} + } + }, + "LcPrinter": { + "__plugin_info__": { + "name": "LcPrinter", + "description": "打印插件", + "platforms": "Android", + "url": "", + "android_package_name": "", + "ios_bundle_id": "", + "isCloud": false, + "bought": -1, + "pid": "", + "parameters": {} + } + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxedb0d10ea46a0113", + "setting": { + "urlCheck": false, + "es6": false, + "ignoreDevUnusedFiles": false, + "lazyCodeLoading": "requiredComponents", + "minified": true + }, + "usingComponents": true, + "permission": { + "scope.userFuzzyLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + }, + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation"] + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3" } // "custom":false, -/* 模块配置 */ - +/* 模块配置 */ \ No newline at end of file diff --git a/pagesHome/pages/ScanUp/ScanUp.vue b/pagesHome/pages/ScanUp/ScanUp.vue index 927ef0e..530a76f 100644 --- a/pagesHome/pages/ScanUp/ScanUp.vue +++ b/pagesHome/pages/ScanUp/ScanUp.vue @@ -294,7 +294,7 @@ details.datalist = (res.data?.list) || [] if (details.checkstate === 2) return details.renderList = details.datalist - if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0) { + if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0 && details.uplistarr.length !== 0) { return utils.handleToast('该库位已有数据, 无法上架') } // if (details.upshelfScanType === '4') return utils.ttsspke('请扫描托盘码') @@ -398,7 +398,6 @@ if (isStorageCode) return scanStorage(code) else scanOther(code) - } function goorderdetail(item, type) { // 当type 不是 diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 97232d6..5fb8f7b 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -1747,7 +1747,7 @@ if (uni.restoreGlobal) { }; }; const Base64$1 = new Base64(); - const devhost = "http://test.api.huitongys.com/"; + const devhost = "https://h5uapi.huitongys.com/"; const imghost = ""; const host = devhost; const APPKEY = "h5u:h5u_secret"; @@ -33271,7 +33271,7 @@ This will fail in production if not fixed.`); details.datalist = ((_a = res.data) == null ? void 0 : _a.list) || []; if (details.checkstate === 2) return details.renderList = details.datalist; - if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0) { + if (Number(details.upshelfScanType) === 4 && details.datalist.length !== 0 && details.uplistarr.length !== 0) { return utils2.handleToast("该库位已有数据, 无法上架"); } } diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index d1ca7c1..215ce1f 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -7,8 +7,8 @@ "id": "__UNI__EB22F37", "name": "货无忧", "version": { - "name": "1.1.01", - "code": 1101 + "name": "1.1.02", + "code": 1102 }, "description": "", "developer": {