Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/common/appUpdate.js

@@ -18,11 +18,11 @@ 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
-					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("没有新版本")
 				}
 			}
@@ -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)
 				}
 			}
 		}
@@ -124,12 +124,16 @@ export function confirm(downUrl) {
 					showLoading.setTitle("已连接到服务器");
 					break;
 				case 3:
-					prg = parseInt(
+					if (task.totalSize && > task.totalSize0) {
-						(parseFloat(task.downloadedSize) /
+						prg = parseInt(
-							parseFloat(task.totalSize)) *
+							(parseFloat(task.downloadedSize) /
-						100
+								parseFloat(task.totalSize)) *
-					);
+							100
-					showLoading.setTitle("  正在下载" + prg + "%  ");
+						);
+						showLoading.setTitle("正在下载" + prg + "%  ");
+					}else {
+						showLoading.setTitle("正在下载");
+					}
 					break;
 				case 4:
 					plus.nativeUI.closeWaiting();

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
+		} 
-		{
+		// else if (type == 'B') //barcode
-			getBarCodeInfo(header, version, items[2], callBack);
+		// {
-		} else { //直接输入文本
+		// 	getBarCodeInfo(header, version, items[2], callBack);
+		// }
+		 else { //直接输入文本
 			getBarCodeInfo('text', 'V1.0', scanMsg, callBack);
 		}
 	}else {

src/manifest.json

@@ -44,8 +44,10 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                ],
+					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
+				],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "minSdkVersion" : 23
             },

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 => {

src/mycomponents/scan/winScanLocation.vue

@@ -13,7 +13,7 @@
 			<view class="">
 				<view class="">
 					<win-com-scan ref="scan"  @getResult="getScanResult" :placeholder='title' :clearResult="false"
-						:boxFocus="true" :isShowHistory="isShowHistory" headerType="HLB">
+						:boxFocus="true" :isShowHistory="isShowHistory" headerType="">
 					</win-com-scan>
 				</view>
 			</view>