From 13039715d50c99f945c5e610a94b3929450a80d3 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Apr 2024 19:00:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/label.js | 10 ++++++---- src/mycomponents/location/locationCompare.vue | 2 +- src/mycomponents/scan/winScanLocation.vue | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/common/label.js b/src/common/label.js index 03e65b84..83308d4c 100644 --- a/src/common/label.js +++ b/src/common/label.js @@ -42,10 +42,12 @@ export function getLabelInfo(scanMsg,headerType, callBack) { if (type == 'Q') //qrcode { getQRCodeInfo(header, version, scanMsg, callBack); - } else if (type == 'B') //barcode - { - getBarCodeInfo(header, version, items[2], callBack); - } else { //直接输入文本 + } + // else if (type == 'B') //barcode + // { + // getBarCodeInfo(header, version, items[2], callBack); + // } + else { //直接输入文本 getBarCodeInfo('text', 'V1.0', scanMsg, callBack); } }else { diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue index f0f1cad2..fe715ba7 100644 --- a/src/mycomponents/location/locationCompare.vue +++ b/src/mycomponents/location/locationCompare.vue @@ -83,7 +83,7 @@ }, copy() { // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100 - var content = "HLB;V1.0;" + this.recommendLocationCode; + var content = this.recommendLocationCode; // #ifdef H5 this.$copyText(content).then( res => { diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 3b4b460d..24f8dfc8 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -13,7 +13,7 @@ + :boxFocus="true" :isShowHistory="isShowHistory" headerType=""> From 29284fb8248dee00a84127436ae0651e13b48378 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 10 Apr 2024 19:00:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/appUpdate.js | 4 ++-- src/manifest.json | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js index 1febe1ed..6c39ee1a 100644 --- a/src/common/appUpdate.js +++ b/src/common/appUpdate.js @@ -18,7 +18,7 @@ export function appUpdate(isShowHint) { console.log("获取更新数据", json) if (res.data) { if (res.data.installPackageVersion > Number(curversion)) { - var downUrl = res.data.downUrl; + var downUrl = res.data.installPackageUrl; var content = res.data.updateContent; var version = res.data.installPackageVersion; var isForcedUpdate = res.data.isForcedUpdate @@ -77,7 +77,7 @@ export function showDialog(versionName, content, isForcedUpdate, downUrl) { console.log( 'cancel') //点击取消之后执行的代码 if (isForcedUpdate == "TRUE") { - showDialog(version, content, isForcedUpdate, downUrl) + showDialog(versionName, content, isForcedUpdate, downUrl) } } } diff --git a/src/manifest.json b/src/manifest.json index 949117c2..a67ee375 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -45,7 +45,9 @@ "", "", "" - ], + "", + "" + ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "minSdkVersion" : 23 }, From 77d44406e09099759457df75cfd7413310228dba Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 11 Apr 2024 16:01:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/appUpdate.js | 22 +++++++++++++--------- src/manifest.json | 6 +++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js index 6c39ee1a..549ad662 100644 --- a/src/common/appUpdate.js +++ b/src/common/appUpdate.js @@ -22,7 +22,7 @@ export function appUpdate(isShowHint) { var content = res.data.updateContent; var version = res.data.installPackageVersion; var isForcedUpdate = res.data.isForcedUpdate - var versionName =res.data.installPackageName + var versionName = res.data.installPackageName console.log("新版本提示") showDialog(versionName, content, isForcedUpdate, downUrl) @@ -45,12 +45,12 @@ export function appUpdate(isShowHint) { // } // }) } else { - if(isShowHint){ + if (isShowHint) { uni.showToast({ title: "当前是最新版本" }) } - + console.log("没有新版本") } } @@ -124,12 +124,16 @@ export function confirm(downUrl) { showLoading.setTitle("已连接到服务器"); break; case 3: - prg = parseInt( - (parseFloat(task.downloadedSize) / - parseFloat(task.totalSize)) * - 100 - ); - showLoading.setTitle(" 正在下载" + prg + "% "); + if (task.totalSize && > task.totalSize0) { + prg = parseInt( + (parseFloat(task.downloadedSize) / + parseFloat(task.totalSize)) * + 100 + ); + showLoading.setTitle("正在下载" + prg + "% "); + }else { + showLoading.setTitle("正在下载"); + } break; case 4: plus.nativeUI.closeWaiting(); diff --git a/src/manifest.json b/src/manifest.json index a67ee375..2d85d24e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -44,9 +44,9 @@ "", "", "", - "" - "", - "" + "", + "", + "" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "minSdkVersion" : 23