From db5cc9e9869ba5235fbdcacb480f398eff87003c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 24 Jun 2024 19:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F=E5=8F=AB?=
 =?UTF-8?q?=E6=96=99=E5=85=89=E6=A0=87=E5=92=8C=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                            |  4 ++--
 src/mycomponents/common/comMessage.vue       | 22 ++++++++++++++++++--
 src/pages/issue/request/issueScanRequest.vue |  6 ++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 4622e0a5..5fb13084 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
     "name" : "wms",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.5",
-    "versionCode" : 5,
+    "versionName" : "1.0.11",
+    "versionCode" : 11,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index 62f2c9b4..f90e2f78 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -2,6 +2,12 @@
 	<view>
 		<u-modal v-model="show" :title-style="{color: 'red'}" :title="title" :showTitle="false"
 			:showConfirmButton="false" ref="modal">
+			<view class="" style="width: 100%;display: flex; align-items: center; justify-content: center;margin-top: 10rpx; " >
+				<view class="" style="">
+					版本号 : {{version}}
+				</view>
+			</view>
+			
 			<view class="slot-content">
 				<slot name="icon">
 					<image class="icon" :src="icon" />
@@ -9,7 +15,6 @@
 				<slot name="content">
 					<rich-text class="content" :nodes="content">
 					</rich-text>
-
 				</slot>
 			<view class='split_line'></view>
 				<slot name="button">
@@ -56,9 +61,22 @@
 				cancel: false, //为 true 时，表示用户点击了取消
 				isDisabled: true, //为 true 时，表示用户可以点击，反之则不可以
 				seconds: 0,
-				success: () => {} // 回调方法
+				success: () => {} ,// 回调方法
+				version:""
 			}
 		},
+		
+		mounted() {
+			const systemInfo = uni.getSystemInfoSync();
+			// #ifdef H5
+			this.version = systemInfo.appVersion;
+			console.log(systemInfo.appVersion, '版本号');
+			// #endif
+			
+			// #ifdef APP
+			this.version = systemInfo.appWgtVersion;
+			// #endif
+		},
 
 
 		methods: {
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index 69f04a56..46aee81a 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -83,6 +83,12 @@
 		methods: {
 			goScan() {
 				this.$refs.scanPopup.openScanPopup();
+				setTimeout(res => {
+					if (this.$refs.scanPopup != undefined) {
+						this.$refs.scanPopup.getfocus();
+					}
+				}, 400)
+				
 			},
 			getScanResult(data){
 				this.detailSource = {