From 0d364cb5de6f5a4c8baab208d6943f5c5f850073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 27 Sep 2022 11:00:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=99=BB=E5=BD=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96/=E9=80=80=E5=8D=A1=E6=8C=89=E9=92=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                       | 17 +++++++++++++++++
 manifest.json                 |  4 ++--
 pages/workSpace/workSpace.vue |  2 +-
 store/index.js                | 12 ++++++------
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/App.vue b/App.vue
index 3d76c26..ff4d0fe 100644
--- a/App.vue
+++ b/App.vue
@@ -68,8 +68,10 @@
 				}
 			});
 			// #endif
+			// #ifdef APP-PLUS
 			uni.getSystemInfo({
 				success(res) {
+					console.log(res)
 					that.$u.vuex('vuex_version', res.appVersion)
 					if (res.platform == 'android') {
 						that.$u.api.apkCheck().then(res1 => {
@@ -95,6 +97,7 @@
 					}
 				}
 			})
+			// #endif
 			// #ifdef APP-PLUS
 			uni.showLoading({
 				title: '自动登录中...',
@@ -110,6 +113,7 @@
 							icon: "none"
 						})
 						that.$u.api.loginSecret(JSON.parse(secret)).then(res => {
+							that.$u.vuex('vuex_token', res.access)
 							that.$u.api.getUserInfo().then(res => {
 								if(res.avatar){
 									res.avatar = this.vuex_host + res.avatar
@@ -126,10 +130,23 @@
 							uni.reLaunch({
 								url: '/pages/home/home_'
 							})
+						}).catch(e=>{
+							uni.reLaunch({
+								url: '/pages/login/login_'
+							})
+						})
+					}else{
+						uni.reLaunch({
+							url: '/pages/login/login_'
 						})
 					}
 
 				},
+				fail() {
+					uni.reLaunch({
+						url: '/pages/login/login_'
+					})
+				},
 				complete() {
 					uni.hideLoading()
 				}
diff --git a/manifest.json b/manifest.json
index 605978c..9352b5e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "曲阳金隅EHS",
     "appid" : "__UNI__B00D419",
     "description" : "曲阳金隅EHS",
-    "versionName" : "1.00.11",
-    "versionCode" : 10011,
+    "versionName" : "1.00.13",
+    "versionCode" : 10013,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue
index ee4c8e1..28c7ff8 100644
--- a/pages/workSpace/workSpace.vue
+++ b/pages/workSpace/workSpace.vue
@@ -478,7 +478,7 @@
 		-webkit-line-clamp: 1;
 	}
 	.backCard {
-		width: 200rpx;
+		width: auto;
 		height: 96rpx;
 		border-radius: 25px;
 		line-height: 48px;
diff --git a/store/index.js b/store/index.js
index cbd11d9..5c1aeda 100644
--- a/store/index.js
+++ b/store/index.js
@@ -37,13 +37,13 @@ const store = new Vuex.Store({
 		vuex_appid: 'wxf7d6140f507466be',
 		vuex_login: 'http://qyjy.ctc-zc.com/h5/',
 		vuex_version: '1.00.08',
-		// vuex_host: 'http://222.222.144.147:6013',
-		// vuex_api: 'http://222.222.144.147:6013/api',
-		// vuex_apifile: 'http://222.222.144.147:6013/api/file/',
+		vuex_host: 'http://222.222.144.147:6013',
+		vuex_api: 'http://222.222.144.147:6013/api',
+		vuex_apifile: 'http://222.222.144.147:6013/api/file/',
 		// vuex_api: 'http://127.0.0.1:8000/api',
-		vuex_host: 'http://10.99.5.79:20309',
-		vuex_api: 'http://10.99.5.79:20309/api',
-		vuex_apifile: 'http://10.99.5.79:20309/api/file/',
+		// vuex_host: 'http://10.99.5.79:20309',
+		// vuex_api: 'http://10.99.5.79:20309/api',
+		// vuex_apifile: 'http://10.99.5.79:20309/api/file/',
 	},
 	mutations: {
 		$uStore(state, payload) {