密钥登录优化/退卡按钮优化

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()
 				}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "曲阳金隅EHS",
     "appid" : "__UNI__B00D419",
     "description" : "曲阳金隅EHS",
-    "versionName" : "1.00.11",
+    "versionName" : "1.00.13",
-    "versionCode" : 10011,
+    "versionCode" : 10013,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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;

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_host: 'http://222.222.144.147:6013',
-		// vuex_api: 'http://222.222.144.147:6013/api',
+		vuex_api: 'http://222.222.144.147:6013/api',
-		// vuex_apifile: 'http://222.222.144.147:6013/api/file/',
+		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_host: 'http://10.99.5.79:20309',
-		vuex_api: 'http://10.99.5.79:20309/api',
+		// vuex_api: 'http://10.99.5.79:20309/api',
-		vuex_apifile: 'http://10.99.5.79:20309/api/file/',
+		// vuex_apifile: 'http://10.99.5.79:20309/api/file/',
 	},
 	mutations: {
 		$uStore(state, payload) {