From 1cb780b1762c62751c7f5f26132f3a7aa4ef3e2f Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 23 三月 2023 16:45:30 +0800
Subject: [PATCH] 微信登录修改,呼叫客服功能(完成)

---
 pages/login/login.vue |   39 +++++++++------------------------------
 1 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7a3b0b5..944adea 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,7 +2,7 @@
 	<view class="login">
 		<view class="logo">鏃犱汉鍊煎畧</view>
 		<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
-		<user-password :btnText='0'/>
+		<user-password :btnText="0" />
 		<!-- 寰俊openid鐧诲綍 -->
 		<view class="loginBtn">
 			<u-button class="button" @click.stop="beforeLoginEvent" :disabled="btnLoading" :loading="btnLoading" type="primary" text="寰俊涓�閿櫥褰�"></u-button>
@@ -39,7 +39,6 @@
 export default {
 	data() {
 		return {
-			wxcode: '', // 鍙告満1
 			btnLoading: false,
 			loginPopupShow: false,
 			// 缁戝畾寰俊妯℃�佹
@@ -62,8 +61,7 @@
 			uni.login({
 				success: res => {
 					if (res.code) {
-						this.wxcode = res.code;
-						this.apiLogin();
+						this.apiLogin(res.code);
 					} else {
 						uni.showToast({
 							title: '寰俊鐧诲綍澶辫触锛�',
@@ -74,37 +72,18 @@
 			});
 		},
 		// 鐧诲綍鎺ュ彛
-		apiLogin() {
-			// apiLoginWx({ code: this.wxcode })
-			// 	.then(res => {
-			// 		console.log('璇锋眰鐧诲綍', res);
-			// 		if (res.msg == '闇�缁戝畾') {
-			// 			uni.navigateTo({
-			// 				url: `/pages/register/register?code=${res.data}`
-			// 			});
-			// 		}
-			// 		if (res.msg == '鐧诲綍鎴愬姛') {
-			// 			uni.setStorageSync('userInfo', res.data);
-			// 			this.setUserTabbar(res.data.type);
-			// 			uni.switchTab({
-			// 				url: '/pages/tabbar-page/index-tabbar/index-tabbar'
-			// 			});
-			// 		}
-			// 	})
-			// 	.catch(err => {
-			// 		console.log('閿欒', err);
-			// 	});
-
+		apiLogin(code) {
 			/**
 			 * @openid
 			 * 鑾峰彇寰俊鐢ㄦ埛openid,寰俊涓�閿櫥褰曟殏鏃犵浉鍏虫帴鍙o紝鐢ㄤ簬娴嬭瘯鍛煎彨瀹㈡湇鍔熻兘
 			 */
-
+			uni.showLoading({
+				title: '鍔犺浇涓�...'
+			});
 			wx.request({
-				url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${this.wxcode}&grant_type=authorization_code`,
+				url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${code}&grant_type=authorization_code`,
 				success(res) {
-					let id = res.data.openid;
-					uni.setStorageSync('openid', id);
+					uni.setStorageSync('openid', res.data.openid);
 					uni.showToast({
 						title: '鎴愬姛鑾峰彇娴嬭瘯openid',
 						icon: 'none'
@@ -113,6 +92,7 @@
 			});
 			this.$nextTick(() => {
 				apiLoginWx({ code: uni.getStorageSync('openid') }).then(res => {
+					uni.hideLoading();
 					if (res.code != 1) {
 						this.$u.toast('鎭枩鎮紝鐧诲綍鎴愬姛锛�');
 						// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
@@ -135,7 +115,6 @@
 					}
 				});
 			});
-
 			this.loginPopupShow = false;
 		},
 		bindWxConfirm() {

--
Gitblit v1.9.1