From 94e00907daf339ccb9a640c7bd8139847d39964f Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Tue, 25 Feb 2025 13:51:07 +0800 Subject: [PATCH] =?UTF-8?q?1.APP=E8=AF=B7=E6=B1=82=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.界面优化 --- PDA/PDA/manifest.json | 42 +++++++++-- PDA/PDA/pages/bindSelectMat/bindSelectMat.vue | 4 +- PDA/PDA/pages/index/index.vue | 4 +- .../productionLineCallIn.vue | 21 +++--- .../productionLineCallOut.vue | 12 ++-- PDA/PDA/pages/queryBindList/queryBindList.vue | 33 ++++----- .../shelfLocationBindUnbind.vue | 6 +- PDA/PDA/pages/stockTaking/stockTaking.vue | 6 +- .../dist/dev/app-plus/app-config-service.js | 2 +- .../dist/dev/app-plus/app-service.js | 69 ++++++++++--------- .../unpackage/dist/dev/app-plus/manifest.json | 37 +++++++++- .../Views/MatDetailCurrentInfoView.xaml | 13 ++-- 12 files changed, 159 insertions(+), 90 deletions(-) diff --git a/PDA/PDA/manifest.json b/PDA/PDA/manifest.json index cbfe9f0..4b120e7 100644 --- a/PDA/PDA/manifest.json +++ b/PDA/PDA/manifest.json @@ -1,7 +1,7 @@ { - "name" : "PDA", + "name" : "智慧物流", "appid" : "__UNI__721DB64", - "description" : "", + "description" : "赛特制冷智慧物料软件", "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, @@ -17,7 +17,9 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "Barcode" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ @@ -43,7 +45,39 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : {}, + "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" + } + } + } } }, /* 快应用特有相关 */ diff --git a/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue b/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue index a6e5851..476291f 100644 --- a/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue +++ b/PDA/PDA/pages/bindSelectMat/bindSelectMat.vue @@ -96,9 +96,9 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '查询物料失败:请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 1500 + duration: 3000 }); }, complete: (event) => { diff --git a/PDA/PDA/pages/index/index.vue b/PDA/PDA/pages/index/index.vue index f46374d..5825c01 100644 --- a/PDA/PDA/pages/index/index.vue +++ b/PDA/PDA/pages/index/index.vue @@ -134,9 +134,9 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 2000 + duration: 3000 }); }, complete: (event) => { diff --git a/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue b/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue index b5b29e7..2d80ce4 100644 --- a/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue +++ b/PDA/PDA/pages/productionLineCallIn/productionLineCallIn.vue @@ -155,10 +155,10 @@ //接口返回数据为200 表示获取成功！ if (res.data.code == 200) { hidePopup(); - - proxy.queryMatList(); - + + proxy.queryMatList(); + uni.showToast({ title: '呼叫成功!', icon: 'none', @@ -166,7 +166,7 @@ }); } else { uni.showToast({ - title: res.data.message, + title: res.data.message, icon: 'none', duration: 2500 }); @@ -183,11 +183,10 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '呼叫失败（请求失败）' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 2500 + duration: 3000 }); - this.clear(); }, complete: (event) => { @@ -279,7 +278,7 @@ this.locationCode = res.data.data.locationCode; this.matCodeCondition = ''; this.placeholderText = '可以输入查询'; - + // uni.showToast({ // title: '获取成功!', // icon: 'none', @@ -307,7 +306,7 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); @@ -397,7 +396,7 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); @@ -417,7 +416,7 @@ this.placeholderText = '请先扫描工位码'; this.locationId = 0; this.locationCode = ''; - + this.cardData = null; this.recordCount = 0; }, diff --git a/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue b/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue index 436b90e..795793c 100644 --- a/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue +++ b/PDA/PDA/pages/productionLineCallOut/productionLineCallOut.vue @@ -232,9 +232,9 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 2500 + duration: 3000 }); this.clear(); @@ -407,7 +407,7 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); @@ -487,11 +487,10 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); - this.clear(); }, complete: (event) => { @@ -571,11 +570,10 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); - this.clear(); }, complete: (event) => { diff --git a/PDA/PDA/pages/queryBindList/queryBindList.vue b/PDA/PDA/pages/queryBindList/queryBindList.vue index 8eed02d..32c4cb5 100644 --- a/PDA/PDA/pages/queryBindList/queryBindList.vue +++ b/PDA/PDA/pages/queryBindList/queryBindList.vue @@ -3,7 +3,8 @@ - + @@ -20,7 +21,7 @@ - + @@ -205,7 +206,7 @@ icon: 'none', duration: 2000 }); - + proxy.queryMatList(); } else { uni.showToast({ @@ -226,9 +227,9 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 2500 + duration: 3000 }); this.clear(); @@ -249,7 +250,7 @@ '/matDetailCurrenInfo/deleteMatDetailCurrentInfo', // 请求的接口地址 method: 'POST', // 设置请求方式为 POST data: { - "needDeleteIds":[fixedInfo.infoId], + "needDeleteIds": [fixedInfo.infoId], "userName": getConfig('userName', 'admin'), "deviceType": "PDA" }, @@ -267,7 +268,7 @@ icon: 'none', duration: 2000 }); - + proxy.queryMatList(); } else { uni.showToast({ @@ -276,7 +277,7 @@ duration: 2500 }); } - + } else { uni.showToast({ title: '服务器返回错误状态码' + res.statusCode, @@ -288,21 +289,21 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 2500 + duration: 3000 }); - + this.clear(); }, complete: (event) => { // 请求完成的回调函数（无论成功或失败都会调用） - + } }); }; - - + + return { fixedInfo, popup, @@ -424,7 +425,7 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); @@ -509,7 +510,7 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); diff --git a/PDA/PDA/pages/shelfLocationBindUnbind/shelfLocationBindUnbind.vue b/PDA/PDA/pages/shelfLocationBindUnbind/shelfLocationBindUnbind.vue index 7b61abd..b71dcf5 100644 --- a/PDA/PDA/pages/shelfLocationBindUnbind/shelfLocationBindUnbind.vue +++ b/PDA/PDA/pages/shelfLocationBindUnbind/shelfLocationBindUnbind.vue @@ -198,13 +198,13 @@ } }, fail: (err) => { - // 请求失败的回调函数 + console.log(err.errMsg); + // 请求失败的回调 uni.showToast({ - title: '请求失败' + err, + title: '请求失败' + err.errMsg, icon: 'none', duration: 3000 }); - this.clear(); }, complete: (event) => { diff --git a/PDA/PDA/pages/stockTaking/stockTaking.vue b/PDA/PDA/pages/stockTaking/stockTaking.vue index 16de872..d3b5521 100644 --- a/PDA/PDA/pages/stockTaking/stockTaking.vue +++ b/PDA/PDA/pages/stockTaking/stockTaking.vue @@ -233,9 +233,9 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', - duration: 2500 + duration: 3000 }); this.clear(); @@ -359,7 +359,7 @@ fail: (err) => { // 请求失败的回调函数 uni.showToast({ - title: '请求失败' + err, + title: '请求失败:' + err.errMsg, icon: 'none', duration: 3000 }); diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-config-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-config-service.js index 05e6540..f29e061 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-config-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-config-service.js @@ -1,7 +1,7 @@ ;(function(){ let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[]; - const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"智慧物流系统-移动端","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"PDA","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.45","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}}; + const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"智慧物流系统-移动端","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"智慧物流","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.45","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}}; const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"titleText":"智慧物流系统-登录","type":"default"},"isNVue":false}},{"path":"pages/config/config","meta":{"navigationBar":{"titleText":"智慧物流系统-用户配置","type":"default"},"isNVue":false}},{"path":"pages/main/main","meta":{"navigationBar":{"titleText":"智慧物流系统-主页","type":"default"},"isNVue":false}},{"path":"pages/bind/bind","meta":{"navigationBar":{"titleText":"智慧物流系统-物料绑定","type":"default"},"isNVue":false}},{"path":"pages/bindSelectMat/bindSelectMat","meta":{"navigationBar":{"titleText":"智慧物流系统-物料绑定选择物料","type":"default"},"isNVue":false}},{"path":"pages/queryBindList/queryBindList","meta":{"navigationBar":{"titleText":"智慧物流系统-绑定查询","type":"default"},"isNVue":false}},{"path":"pages/stockTaking/stockTaking","meta":{"navigationBar":{"titleText":"智慧物流系统-库存盘点","type":"default"},"isNVue":false}},{"path":"pages/shelfLocationBindUnbind/shelfLocationBindUnbind","meta":{"navigationBar":{"titleText":"智慧物流系统-货架位置绑定解绑","type":"default"},"isNVue":false}},{"path":"pages/productionLineCallIn/productionLineCallIn","meta":{"navigationBar":{"titleText":"智慧物流系统-产线呼叫","type":"default"},"isNVue":false}},{"path":"pages/productionLineCallOut/productionLineCallOut","meta":{"navigationBar":{"titleText":"智慧物流系统-货架送回","type":"default"},"isNVue":false}},{"path":"pages/agvTasks/agvTasks","meta":{"navigationBar":{"titleText":"智慧物流系统-任务管理","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute)); __uniConfig.styles=[];//styles __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js index 03e951a..b8294f8 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js +++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js @@ -223,9 +223,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 2e3 + duration: 3e3 }); }, complete: (event) => { @@ -641,9 +641,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "查询物料失败:请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 1500 + duration: 3e3 }); }, complete: (event) => { @@ -2583,9 +2583,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 2500 + duration: 3e3 }); this.clear(); }, @@ -2594,7 +2594,7 @@ if (uni.restoreGlobal) { }); }; const deleteData = () => { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:244", "123"); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:245", "123"); var serverIPAndPort = getServerIPAndPort(); uni.request({ url: "http://" + serverIPAndPort + "/matDetailCurrenInfo/deleteMatDetailCurrentInfo", @@ -2637,9 +2637,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 2500 + duration: 3e3 }); this.clear(); }, @@ -2681,10 +2681,10 @@ if (uni.restoreGlobal) { this.userName = getConfig("userName", "admin"); const self = this; recive(function(res) { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:341", "Success:" + res.data); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:342", "Success:" + res.data); self.analysisScanCode(res.data); }, function(err) { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:344", "Error:", JSON.stringify(err)); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:345", "Error:", JSON.stringify(err)); }); }, methods: { @@ -2746,14 +2746,14 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:436", "请求完成", event); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:437", "请求完成", event); } }); }, @@ -2821,14 +2821,14 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/queryBindList/queryBindList.vue:521", "请求完成", event); + formatAppLog("log", "at pages/queryBindList/queryBindList.vue:522", "请求完成", event); } }); }, @@ -3279,9 +3279,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 2500 + duration: 3e3 }); this.clear(); }, @@ -3392,7 +3392,7 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); @@ -3716,8 +3716,9 @@ if (uni.restoreGlobal) { } }, fail: (err) => { + formatAppLog("log", "at pages/shelfLocationBindUnbind/shelfLocationBindUnbind.vue:201", err.errMsg); uni.showToast({ - title: "请求失败" + err, + title: "请求失败" + err.errMsg, icon: "none", duration: 3e3 }); @@ -4091,9 +4092,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "呼叫失败（请求失败）" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 2500 + duration: 3e3 }); this.clear(); }, @@ -4137,10 +4138,10 @@ if (uni.restoreGlobal) { this.userName = getConfig("userName", "admin"); const self = this; recive(function(res) { - formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:236", "Success:" + res.data); + formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:235", "Success:" + res.data); self.analysisScanCode(res.data); }, function(err) { - formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:240", "Error:", JSON.stringify(err)); + formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:239", "Error:", JSON.stringify(err)); }); }, methods: { @@ -4197,14 +4198,14 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); this.clearLocation(); }, complete: (event) => { - formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:319", "请求完成", event); + formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:318", "请求完成", event); } }); }, @@ -4276,14 +4277,14 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:409", "请求完成", event); + formatAppLog("log", "at pages/productionLineCallIn/productionLineCallIn.vue:408", "请求完成", event); } }); }, @@ -4554,9 +4555,9 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", - duration: 2500 + duration: 3e3 }); this.clear(); }, @@ -4705,7 +4706,7 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); @@ -4771,14 +4772,14 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:499", "请求完成", event); + formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:498", "请求完成", event); } }); }, @@ -4846,14 +4847,14 @@ if (uni.restoreGlobal) { }, fail: (err) => { uni.showToast({ - title: "请求失败" + err, + title: "请求失败:" + err.errMsg, icon: "none", duration: 3e3 }); this.clear(); }, complete: (event) => { - formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:583", "请求完成", event); + formatAppLog("log", "at pages/productionLineCallOut/productionLineCallOut.vue:581", "请求完成", event); } }); }, diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/manifest.json b/PDA/PDA/unpackage/dist/dev/app-plus/manifest.json index ebb244c..09563ec 100644 --- a/PDA/PDA/unpackage/dist/dev/app-plus/manifest.json +++ b/PDA/PDA/unpackage/dist/dev/app-plus/manifest.json @@ -5,18 +5,19 @@ "iPad" ], "id": "__UNI__721DB64", - "name": "PDA", + "name": "智慧物流", "version": { "name": "1.0.0", "code": "100" }, - "description": "", + "description": "赛特制冷智慧物料软件", "developer": { "name": "", "email": "", "url": "" }, "permissions": { + "Barcode": {}, "UniNView": { "description": "UniNView原生渲染" } @@ -42,6 +43,38 @@ "nvueStyleCompiler": "uni-app", "compilerVersion": 3, "distribute": { + "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" + } + } + }, "google": { "permissions": [ "", diff --git a/货架标准上位机/Views/MatDetailCurrentInfoView.xaml b/货架标准上位机/Views/MatDetailCurrentInfoView.xaml index 5c43f54..5beb7ee 100644 --- a/货架标准上位机/Views/MatDetailCurrentInfoView.xaml +++ b/货架标准上位机/Views/MatDetailCurrentInfoView.xaml @@ -26,8 +26,8 @@ - - + + @@ -66,18 +66,21 @@ Height="30" FontSize="18" IsEditable="False" /> - - - +