From 74b0922b21fa15c76217bae2e59f91662ee16414 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 5 Jun 2024 17:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E7=99=BB=E5=BD=95=EF=BC=88?=
 =?UTF-8?q?=E8=AF=95=E8=BF=90=E8=90=A5=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/user.js  |  2 +-
 pages/login/login.vue | 46 +++++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/apis/modules/user.js b/apis/modules/user.js
index 79d01af..cfea0c6 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -10,7 +10,7 @@ export const douYinLogin = (data) => {
 }
 
 export const douYinLoginByOpenid = (data) => {
-  return post('users/users/user/douYinLoginByOpenid?code=' + data)
+  return post('users/users/user/douYinLoginByOpenid?openid=' + data)
 }
 
 export const queryProvince = () => {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8e25e67..52d4cbf 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-	import { login, userBinding, getSessionKey, queryPartnerAccount, douYinLogin } from '@/apis/modules/user.js'
+	import { login, userBinding, getSessionKey, queryPartnerAccount, douYinLogin, douYinLoginByOpenid } from '@/apis/modules/user.js'
 	import WXBizDataCrypt from '@/libs/WXBizDataCrypt'
 	export default {
 		data() {
@@ -71,7 +71,7 @@
 						desc: '登录',
 						success: ({ userInfo }) => {
 							uni.login({
-								success: ({ code }) => {
+								success: async ({ code }) => {
 									if (code) {
 										this.submiting = true
 										
@@ -84,25 +84,29 @@
 										if (this.isDy) {
 											fn = douYinLogin
 											param = code
-											
-											fn(param).then(res => {
-												const { data, status } = res
-												this.submiting = false
-												this.sessionKey = data.sessionKey
-												this.openid = data.openid
-												this.unionid = data.unionid
-												uni.setStorageSync('sessionKey', data.sessionKey)
-												uni.setStorageSync('openid', data.openid)
-												// 如果没有绑定手机号，则显示绑定按钮，引导用户绑定，否则，直接跳到首页
-												if (data.state === 'login') {
-													this.toIndex()
-													uni.setStorageSync('token', data.token)
-												} else {
-													this.isLogin = true
-												}
-											}).catch(e => {
-												this.submiting = false
-											})
+											const res1 = await douYinLoginByOpenid('_000P6jr9bt8gW0ySNSzGsNBnCB0er4KtN3M')
+											uni.setStorageSync('token', res1.data.token)
+											this.toIndex()
+											// fn(param).then(async res => {
+											// 	const { data, status } = res
+											// 	this.submiting = false
+											// 	this.sessionKey = data.sessionKey
+											// 	this.openid = data.openid
+											// 	this.unionid = data.unionid
+											// 	uni.setStorageSync('sessionKey', data.sessionKey)
+											// 	uni.setStorageSync('openid', data.openid)
+												
+											// 	const res1 = await douYinLoginByOpenid('_000P6jr9bt8gW0ySNSzGsNBnCB0er4KtN3M')
+											// 	// 如果没有绑定手机号，则显示绑定按钮，引导用户绑定，否则，直接跳到首页
+											// 	// if (data.state === 'login') {
+											// 	// 	this.toIndex()
+											// 	// 	uni.setStorageSync('token', data.token)
+											// 	// } else {
+											// 	// 	this.isLogin = true
+											// 	// }
+											// }).catch(e => {
+											// 	this.submiting = false
+											// })
 										} else {
 											fn(param).then((res) => {
 												const { data, status } = res