From b18b7d3ef78a7afecd12cddb9e7977dce0214e53 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 5 Aug 2024 22:51:32 +0800
Subject: [PATCH] uu

---
 components/tpx-physics-scan/tpx-physics-scan.vue | 11 +++++------
 manifest.json                                    |  2 +-
 pages/tabBar/mine/mine.vue                       |  4 ++--
 session/index.js                                 |  3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/tpx-physics-scan/tpx-physics-scan.vue b/components/tpx-physics-scan/tpx-physics-scan.vue
index 38bc339..ffcb5e6 100644
--- a/components/tpx-physics-scan/tpx-physics-scan.vue
+++ b/components/tpx-physics-scan/tpx-physics-scan.vue
@@ -84,12 +84,11 @@
 				// #endif
 			},
 			queryCode: function(code) {
-				let { hongWaiSwitch } = getSessionSystemInfo()
-				// 红外开启，才可使用该功能
-				if(!hongWaiSwitch) {
-					return false;
-				}
-				
+				// let { hongWaiSwitch } = getSessionSystemInfo()
+				// // 红外开启，才可使用该功能
+				// if(!hongWaiSwitch) {
+				// 	return false;
+				// }
 				let that = this;
 				//  #ifdef APP
 				console.log('queryCode');
diff --git a/manifest.json b/manifest.json
index 80897ce..8488309 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__BCB0FB5",
     "description" : "探路国际速运",
     "versionName" : "1.0.1",
-    "versionCode" : "1029",
+    "versionCode" : "1030",
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index 9d7cfe8..b793d31 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -101,7 +101,7 @@
 							</u-row>
 						</u-row>
 						<u-line></u-line>
-						<u-row custom-style="padding: 30rpx;" justify="between">
+						<!-- <u-row custom-style="padding: 30rpx;" justify="between">
 							<u-row>
 								<u-image :src="getCdnUrl(`mine/sao.png`)" height="34" width="34"></u-image>
 								<u-text margin="0 0 0 30rpx" text="红线扫描模式" size="28" color="#333"></u-text>
@@ -109,7 +109,7 @@
 							<u-row>
 								<u-switch v-model="hongWaiSwitch" @change="handleHongWaiChange" active-color="#B12D29" size="34"></u-switch>
 							</u-row>
-						</u-row>
+						</u-row> -->
 						<u-line></u-line>
 						<u-row @click="goto(`user/updatePassword`)" custom-style="padding: 30rpx;" justify="between">
 							<u-row>
diff --git a/session/index.js b/session/index.js
index 90fde71..6239e3e 100644
--- a/session/index.js
+++ b/session/index.js
@@ -36,11 +36,12 @@ export const getSessionLoginInfo = ()=> {
 }
 
 export const setSessionSystemInfo = (val = {})=> {
+	let oldVal = getSessionSystemInfo()
 	// {
 	// 	hongWaiSwitch: false, //  红外扫描
 	// 	lastActiveTime: 时间戳, //  上次活跃时间戳
 	// }
-	uni.setStorageSync(SYSTEM_INFO_KEY, val)
+	uni.setStorageSync(SYSTEM_INFO_KEY, { ...oldVal, ...val})
 }
 
 export const getSessionSystemInfo = ()=> {