From 9075ba7a3270167c488125c8e0599122dc210692 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 15:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/passport/wechatMPLogin.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index 41199bc..c8d0de2 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -3,6 +3,7 @@
<u-navbar :custom-back="back" title="灏忕▼搴忕櫥褰�"></u-navbar>
<u-modal v-model="phoneAuthPopup" :mask-close-able="true" :title="projectName+'鍟嗗煄'"
:show-confirm-button="false">
+
<div class="tips">
涓轰簡鏇村ソ鍦扮敤鎴蜂綋楠岋紝闇�瑕佹偍鎺堟潈鎵嬫満鍙�
</div>
@@ -15,6 +16,8 @@
<view class="logo-info">
<text class="title">娆㈣繋杩涘叆{{ projectName }}</text>
</view>
+ <!-- <input ref="nicknameInput" type="nickname"/>
+ <button聽type="default" open-type="chooseAvatar"聽@chooseavatar="onChooseAvatar">閫夋嫨</button> -->
<view class="small-tips">
<view>涓烘偍鎻愪緵浼樿川鏈嶅姟,{{ projectName }}闇�瑕佽幏鍙栦互涓嬩俊鎭�</view>
<view>鎮ㄧ殑鍏紑淇℃伅锛堟樀绉般�佸ご鍍忥級</view>
@@ -38,9 +41,7 @@
</template>
<script>
- import UCheckBox from '@/uview-components/uview-ui/components/u-checkbox/u-checkbox.vue';
- import UNavbar from '@/uview-components/uview-ui/components/u-navbar/u-navbar.vue';
- import UModel from '@/uview-components/uview-ui/components/u-modal/u-modal.vue';
+ import '@/components/uview-components/uview-ui';
import {
mpAutoLogin
} from "@/api/connect.js";
@@ -54,7 +55,6 @@
import storage from "@/utils/storage.js";
import config from '@/config/config'
export default {
- components: {UCheckBox, UModel,UNavbar},
data() {
return {
lightColor:this.$lightColor,
@@ -114,10 +114,9 @@
url: `/pages/tabbar/home/index`,
});
},
-
-
-
-
+ onChooseAvatar(e){
+ console.log(e.detail.avatarUrl)
+ },
//鑾峰彇鐢ㄦ埛淇℃伅
getUserProfile(e) {
if(!this.checked){
@@ -135,9 +134,13 @@
desc: "鐢ㄤ簬瀹屽杽浼氬憳璧勬枡", // 澹版槑鑾峰彇鐢ㄦ埛涓汉淇℃伅鍚庣殑鐢ㄩ�旓紝鍚庣画浼氬睍绀哄湪寮圭獥涓紝璇疯皑鎱庡～鍐�
success: (res) => {
console.log("success", res)
+ // this.$refs.nicknameInput.focus();
+
+
this.nickName = res.userInfo.nickName;
this.image = res.userInfo.avatarUrl;
-
+ // 鎵撳嵃寰俊鍚嶇О
+ console.log("寰俊鏄电О:", this.nickName);
/**
* 鏍规嵁鍏湁鐨勯厤缃缃櫥褰曟柟寮�
*/
@@ -158,6 +161,7 @@
image,
nickName,
}).then((apiRes) => {
+ console.log(apiRes)
storage.setAccessToken(apiRes.data.result.accessToken);
storage.setRefreshToken(apiRes.data.result.refreshToken);
// 鐧诲綍鎴愬姛
@@ -165,6 +169,7 @@
title: "鐧诲綍鎴愬姛!",
icon: "none",
});
+
//鑾峰彇鐢ㄦ埛淇℃伅
getUserInfo().then((user) => {
storage.setUserInfo(user.data.result);
@@ -197,7 +202,7 @@
});
return;
}
-
+
let code = this.code;
let image = this.image;
let nickName = this.nickName;
@@ -208,6 +213,7 @@
image,
nickName,
}).then((res) => {
+ console.log(res)
storage.setAccessToken(res.data.result.accessToken);
storage.setRefreshToken(res.data.result.refreshToken);
// 鐧诲綍鎴愬姛
@@ -217,6 +223,7 @@
});
//鑾峰彇鐢ㄦ埛淇℃伅
getUserInfo().then((user) => {
+ console.log(user)
storage.setUserInfo(user.data.result);
storage.setHasLogin(true);
--
Gitblit v1.8.0