From 7f922eb1e96e21e72fccc651167348021af039d2 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 13 Nov 2023 08:53:22 +0800
Subject: [PATCH] fix:小程序详情修改

---
 App.vue |   68 +++++++++++++++++++++++++++++++--
 1 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/App.vue b/App.vue
index 1e09fad..442e41d 100644
--- a/App.vue
+++ b/App.vue
@@ -8,18 +8,26 @@
 		httpGet
 	} from '@/utils/http.js'
 	export default {
+		onShow: function(options) {
+			console.log('optionsonShow', options)
+			if (options.scene === 1007 || options.scene === 1014 || options.scene === 1008) {
+				// ������������������������������������
+				// this.getWXCode()
+			}
+		},
 		onLaunch() {
 			// ������������������
 			let token = uni.getStorageSync('token')
-			console.log('apptoken', token)
+			console.log('apptoken1', !token)
 			if (!token) {
 				uni.login({
 					provider: 'weixin',
 					success: loginRes => {
-						console.log('loginRes', loginRes)
+						console.log('loginRes1', loginRes)
 						httpGet('/AppUser/wx/login', {
 							'code': loginRes.code
 						}).then(result => {
+							console.log('AppUser1', result)
 							try {
 								if (result.data.code === 0) {
 									uni.clearStorageSync()
@@ -55,6 +63,7 @@
 								title: errors,
 								icon: 'none',
 							})
+							this.$isResolve()
 						})
 					}
 				})
@@ -69,11 +78,51 @@
 			 *
 			 */
 			getWXCode() {
-				let that = this
 				uni.login({
 					provider: 'weixin',
-					success(res) {
-						that.getLogin(res.code)
+					success: loginRes => {
+						console.log('loginRes2', loginRes)
+						httpGet('/AppUser/wx/login', {
+							'code': loginRes.code
+						}).then(result => {
+							console.log('AppUser2', result)
+							try {
+								if (result.data.code === 0) {
+									uni.clearStorageSync()
+									uni.setStorageSync('userInfor', JSON.stringify(result.data))
+									uni.setStorageSync('tonken', result.data.token)
+									uni.setStorageSync('openId', result.data.openId)
+									getDic()
+									this.$isResolve()
+								} else {
+									uni.clearStorageSync()
+									uni.setStorageSync('openId', result.data.openId)
+									uni.showModal({
+										title: '���������',
+										content: '������������������������������������������',
+										showCancel: false,
+										confirmText: '������',
+										success: res => {
+											if (res.confirm) {
+												uni.reLaunch({
+													url: '/pages/login/login',
+												})
+											}
+										},
+									})
+									this.$isResolve()
+								}
+							} catch (e) {
+								console.error(e)
+							}
+						}).catch(errors => {
+							console.log('appdddd2', errors)
+							uni.showToast({
+								title: errors,
+								icon: 'none',
+							})
+							this.$isResolve()
+						})
 					}
 				})
 			},
@@ -149,4 +198,13 @@
 			line-height: 30px !important;
 		}
 	}
+
+	.ridoaBox {
+		text-align: center;
+		padding: 10px 0px;
+
+		/deep/.u-radio {
+			padding-right: 10px;
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0