From 29851d845f4ab768c78724ab870ecec4ce28c32b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 24 十月 2025 11:42:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
pages/passport/wechatMPLogin.vue | 115 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index 8f36bf6..f42635d 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -5,18 +5,32 @@
:show-confirm-button="false">
<div class="tips">
- 涓轰簡鏇村ソ鍦扮敤鎴蜂綋楠岋紝闇�瑕佹偍鎺堟潈鎵嬫満鍙�
+ 涓轰簡鏇村ソ鍦扮敤鎴蜂綋楠岋紝闇�瑕佹偍鎺堟潈鎵嬫満鍙峰拰鏄电О
</div>
- <button class="register" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
- 鍘绘巿鏉�
+ <view class="auth-row">
+ <text class="label">鏄电О:</text>
+ <input
+ class="register"
+ type="nickname"
+ v-model="nickName"
+ placeholder="璇疯緭鍏ユ樀绉�"
+ >
+ </input>
+ </view>
+ <button :class="isDisabled ? 'noRegister' : 'register'" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" :disabled="isDisabled">
+ 涓嬩竴姝�
</button>
+
</u-modal>
+
<view class="wx-auth-container">
<div class="box">
<view class="logo-info">
<text class="title">娆㈣繋杩涘叆{{ projectName }}</text>
</view>
-
+ <view>
+ <text class="small-title">浣犲ソ,姝ゆ湇鍔′粎缁挎弧绛愪細鍛樹娇鐢�</text>
+ </view>
<view class="small-tips">
<view>涓烘偍鎻愪緵浼樿川鏈嶅姟,{{ projectName }}闇�瑕佽幏鍙栦互涓嬩俊鎭�</view>
<view>鎮ㄧ殑鍏紑淇℃伅锛堟樀绉般�佸ご鍍忥級</view>
@@ -35,6 +49,7 @@
</u-checkbox>
</div>
</div>
+
</view>
</view>
</template>
@@ -49,13 +64,14 @@
whetherNavigate
} from "@/utils/Foundation"; //鐧诲綍璺宠浆
import {
- getUserInfo
+ getUserInfo,updateMemberNickName
} from "@/api/members";
import storage from "@/utils/storage.js";
import config from '@/config/config'
export default {
data() {
return {
+ isDisabled:true,
lightColor:this.$lightColor,
checked:false,
configs:config,
@@ -95,6 +111,15 @@
});
},
+ watch:{
+ nickName(newVal){
+ if(this.nickName.trim().length === 0){
+ this.isDisabled = true;
+ }else{
+ this.isDisabled = false
+ }
+ }
+ },
methods: {
/**
* TODO 姝ゆ柟娉曚笉涓�瀹氭槸鏈�浼樿В锛屽鏋滄湁鏇村ソ鐨勫姙娉曡鍦� https://gitee.com/beijing_hongye_huicheng/lilishop/issues 涓彁鍑�
@@ -109,8 +134,8 @@
whetherNavigate("wx");
},
backToHome() {
- uni.switchTab({
- url: `/pages/tabbar/home/index`,
+ uni.redirectTo({
+ url: `/pages/tabbar/index/home`,
});
},
@@ -130,14 +155,15 @@
uni.getUserProfile({
desc: "鐢ㄤ簬瀹屽杽浼氬憳璧勬枡", // 澹版槑鑾峰彇鐢ㄦ埛涓汉淇℃伅鍚庣殑鐢ㄩ�旓紝鍚庣画浼氬睍绀哄湪寮圭獥涓紝璇疯皑鎱庡～鍐�
success: (res) => {
- console.log("success", res)
+ // console.log("success", res)
+ //閲嶇疆鎸夐挳鏄剧ず
+
+
// this.$refs.nicknameInput.focus();
-
-
- this.nickName = res.userInfo.nickName;
- this.image = res.userInfo.avatarUrl;
+ // this.nickName = res.userInfo.nickName;
+ // this.image = res.userInfo.avatarUrl;
// 鎵撳嵃寰俊鍚嶇О
- console.log("寰俊鏄电О:", this.nickName);
+ // console.log("寰俊鏄电О:", this.nickName);
/**
* 鏍规嵁鍏湁鐨勯厤缃缃櫥褰曟柟寮�
*/
@@ -187,11 +213,12 @@
this.logingFlag = false;
}
},
-
//鑾峰彇鎵嬫満鍙锋巿鏉�
- getPhoneNumber(e) {
+ getPhoneNumber(e) {
+
let iv = e.detail.iv;
let encryptedData = e.detail.encryptedData;
+
if (!e.detail.encryptedData) {
uni.showToast({
title: "璇锋巿浜堟墜鏈哄彿鐮佹潈闄愶紝鎵嬫満鍙风爜浼氬拰浼氬憳绯荤粺鐢ㄦ埛缁戝畾锛�",
@@ -203,6 +230,14 @@
let code = this.code;
let image = this.image;
let nickName = this.nickName;
+
+ console.log('getPhoneNumber:' + code)
+
+ console.log('getPhoneNumber:' + image)
+
+ console.log('getPhoneNumber:' + nickName)
+
+
mpAutoLogin({
encryptedData,
iv,
@@ -210,7 +245,7 @@
image,
nickName,
}).then((res) => {
- console.log(res)
+ //鐧诲綍鎴愬姛淇敼鐢ㄦ埛鐨勬樀绉�
storage.setAccessToken(res.data.result.accessToken);
storage.setRefreshToken(res.data.result.refreshToken);
// 鐧诲綍鎴愬姛
@@ -219,15 +254,29 @@
icon: "none",
});
//鑾峰彇鐢ㄦ埛淇℃伅
- getUserInfo().then((user) => {
+ getUserInfo().then(async (user) => {
console.log(user)
- storage.setUserInfo(user.data.result);
- storage.setHasLogin(true);
-
+ const form ={
+ memberId:user.data.result.id,
+ nickName:this.nickName
+ }
+ let name = '';
+ await updateMemberNickName(form).then(res =>{
+ if(res.statusCode === 200){
+ name = res.data.data;
+ }
+ })
+ user.data.result.nickName = name
+ storage.setUserInfo(user.data.result);
+ storage.setHasLogin(true);
+
+
uni.navigateBack({
delta: 1,
});
});
+
+
});
},
@@ -238,6 +287,19 @@
};
</script>
<style lang="scss" scoped>
+ .auth-row {
+ text-align: left;
+ margin: 6% 10%;
+ display: flex;
+ align-items: center;
+ margin-bottom: 30rpx;
+ }
+
+ .label {
+ width: 150rpx;
+ font-size: 32rpx;
+ color: #333;
+ }
/*寰俊鎺堟潈*/
page {
background-color: #ffffff;
@@ -291,7 +353,12 @@
.box {
margin: 0 32rpx;
}
-
+ .small-title {
+ width: 94%;
+ padding: 20rpx;
+ font-size: 34rpx;
+ margin: 0 0 20rpx;
+ }
/* 鏂囧瓧鎻愮ず*/
.small-tips {
width: 94%;
@@ -313,7 +380,11 @@
margin-top: 48rpx;
line-height: 1.75;
}
-
+ .noRegister{
+ color: #b8b8b8 !important;
+ border: none !important;
+ background: #fff !important;
+ }
.register {
color: $weChat-color !important;
border: none !important;
--
Gitblit v1.8.0