From 5cc0cf983c3a15696da87d0d3d227fd7f9f1f1bf Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 23 Oct 2023 17:10:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC,=20?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=89=87=E5=8C=BA?=
 =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json           | 4 ++--
 pages/oaHome/oaHome.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index db31491..012ab06 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
     // "appid" : "__UNI__3A527D1",
     "appid" : "__UNI__B5B1EDD",
     "description" : "",
-    "versionName" : "1.2.4",
-    "versionCode" : 124,
+    "versionName" : "1.2.5",
+    "versionCode" : 125,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 2053cfe..00cc75a 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -111,7 +111,7 @@
       </view>
     </view>
 	<!-- 片区经理聊天 -->
-	<view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 130rpx;">
+	<!-- <view class="chat" @click="navTo('/subpkg/chatMang/index')" style="margin-top: 130rpx;">
 		<view class="chat-l">
 			<u--image shape="circle" :showLoading="true" :src="managerInfo.manager_avatar" width="91rpx" height="91rpx"></u--image>
 			<view class="" style="margin-left: 40rpx;">
@@ -127,7 +127,7 @@
 			</view>
 		</view>
 	 
-	</view>
+	</view> -->
 	
     <view class="my_task">
       <view class="task_title flex_a_c_j_sb">

From f44c5e1268010876ddba58b3b58381390641f810 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 11 Nov 2023 09:44:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue       | 24 +++++++++++++++++-------
 manifest.json |  4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/App.vue b/App.vue
index 7c487f2..024e4d1 100644
--- a/App.vue
+++ b/App.vue
@@ -37,7 +37,7 @@
 						shop_token: info.referrerInfo?.extraData?.token
 					});
 					this.$store.commit('SET_USERINFO', {
-						user: data,
+						user: {},
 						token: res.data.token
 					})
 					this.$store.dispatch('initConfig');
@@ -45,17 +45,15 @@
 						data
 					} = await userInfo();
 					this.$store.commit('setUserInfo', data);
-					this.$isResolve()
+					// this.$isResolve()
 					// uni.$emit('home_initUserInfo', data);
-					return;
+					// return;
 				} catch (e) {
-					this.$isResolve()
+					// this.$isResolve()
 					console.log(e);
 				}
 			}
 			console.log('App Launch')
-			this.$store.dispatch('initConfig');
-			this.$isResolve()
 			try {
 				if (!this.$store.state.app.token) uni.reLaunch({
 					url: '/pages/oaLogin/oaLogin',
@@ -63,16 +61,28 @@
 						// #ifdef APP-PLUS
 						plus.navigator.closeSplashscreen(); // 关闭渲染启动图
 						// #endif
+            this.$isResolve()
 					}
 				})
 				else {
+          this.$store.dispatch('initConfig');
+          this.$isResolve()
 					// #ifdef APP-PLUS
 					plus.navigator.closeSplashscreen(); // 关闭渲染启动图
 					// #endif
 				}
 			} catch (e) {
+        this.$isResolve()
 				// #ifdef APP-PLUS
-				plus.navigator.closeSplashscreen(); // 关闭渲染启动图
+        uni.reLaunch({
+        	url: '/pages/oaLogin/oaLogin',
+        	success() {
+        		// #ifdef APP-PLUS
+            plus.navigator.closeSplashscreen(); // 关闭渲染启动图
+        		// #endif
+            this.$isResolve()
+        	}
+        })
 				// #endif
 			}
 		},
diff --git a/manifest.json b/manifest.json
index 012ab06..648e165 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
     // "appid" : "__UNI__3A527D1",
     "appid" : "__UNI__B5B1EDD",
     "description" : "",
-    "versionName" : "1.2.5",
-    "versionCode" : 125,
+    "versionName" : "1.2.7",
+    "versionCode" : 127,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {