From f2071bd46fc3d1a9723a4d018695b2c8c620c835 Mon Sep 17 00:00:00 2001
From: linju <8432241+linjuDcloud@user.noreply.gitee.com>
Date: Fri, 9 Apr 2021 22:00:42 +0800
Subject: [PATCH] 123

---
 .../uni-quick-login/uni-quick-login.vue       | 45 ++++++++++++++-----
 .../utils/check-update.js                     |  3 ++
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue b/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
index 4c20019..66035ca 100644
--- a/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
+++ b/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
@@ -7,8 +7,12 @@
 	</view>
 </template>
 
-<script>
-	export default {
+<script>
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex';
+	export default {
 		data() {
 			return {
 				config: {
@@ -83,11 +87,16 @@
 			})
 			*/
 		},
-		methods: {
+		methods: {
+			...mapMutations({
+				setUserInfo: 'user/login'
+			}),
 			login(type) {
 				let oauthService = this.oauthServices.find((service) => service.id == type)
 				// #ifdef APP-PLUS
 				uni.showLoading({mask: true});
+				
+				//请勿直接使用前端获取的unionid或openid直接用于登陆，前端的数据都是不可靠的
 				if(type=='weixin'){
 					oauthService.authorize(({code})=>{
 						console.log(code);
@@ -120,23 +129,35 @@
 				// #endif
 			},
 			quickLogin(params,type){
-				//请勿直接使用authResult中的unionid或openid直接用于登陆，前端的数据都是不可靠的
 				console.log({params,type});
-				
 				uniCloud.callFunction({//联网验证登陆
 					"name": "user-center",
 					"data": {
 						"action": "login_by_"+type,
 						params
 					},
-					success: (e) => {
+					success:async (e) => {
+						uni.hideLoading()
 						console.log(e.result);
-						uni.showModal({
-							content: JSON.stringify(e.result),
-							showCancel: false
-						});
-						if(type=='univerify'){
-							uni.closeAuthView()
+						// uni.showModal({
+						// 	content: JSON.stringify(e.result),
+						// 	showCancel: false
+						// });
+						if(e.result.code === 0){
+							uni.setStorageSync('uni_id_uid', e.result.uid)
+							uni.setStorageSync('uni_id_token', e.result.token)
+							uni.setStorageSync('uni_id_token_expired', e.result.tokenExpired)
+							console.log('66666=',e.result.uid,e.result.token,e.result.tokenExpired);
+							delete e.result.userInfo.token
+							this.setUserInfo(e.result.userInfo)
+							if(type=='univerify'){
+								uni.closeAuthView()
+							}
+							uni.showToast({
+								title: '登陆成功',
+								icon: 'none'
+							});
+							uni.navigateBack()
 						}
 					},
 					fail: (err) => {
diff --git a/uni_modules/uni-upgrade-center-app/utils/check-update.js b/uni_modules/uni-upgrade-center-app/utils/check-update.js
index 64872e2..32e7d5c 100644
--- a/uni_modules/uni-upgrade-center-app/utils/check-update.js
+++ b/uni_modules/uni-upgrade-center-app/utils/check-update.js
@@ -3,6 +3,9 @@ const PACKAGE_INFO_KEY = '__package_info__'
 
 export default function() {
 	// #ifdef APP-PLUS
+	
+	return '先关了'
+	
 	plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
 		uniCloud.callFunction({
 			name: 'check-version',
-- 
GitLab