From f654d570332e2c16379e08ad1e3bb8a24d92656e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 31 七月 2025 16:18:35 +0800
Subject: [PATCH] 注册登录 用户nickName问题

---
 config/api.js                          |   15 +++-
 api/members.js                         |    7 ++
 pages/passport/wechatMPLogin.vue       |   88 ++++++++++++++++++++++++----
 pages/mine/activity/reportActivity.vue |   16 +++++
 4 files changed, 107 insertions(+), 19 deletions(-)

diff --git a/api/members.js b/api/members.js
index bfff6e4..9fde8be 100644
--- a/api/members.js
+++ b/api/members.js
@@ -474,3 +474,10 @@
   });
 }
 
+export function updateMemberNickName(params){
+	return http.request({
+		url: '/lmk/member/updateNickName',
+		method: Method.PUT,
+		data:params
+	});
+}
diff --git a/config/api.js b/config/api.js
index 1e2545a..43a7138 100644
--- a/config/api.js
+++ b/config/api.js
@@ -8,18 +8,23 @@
   // common: "http://192.168.0.15:8890",
   // buyer: "http://192.168.0.15:8888",
   // store: "http://192.168.0.15:8889",
+
+  im: "http://127.0.0.1:8885",
+  common: "http://127.0.0.1:8890",
+  buyer: "http://127.0.0.1:8888",
+  store: "http://127.0.0.1:8889",
+
   // common: "http://192.168.0.113:8890",
   // buyer: "http://192.168.0.113:8888",
   // im: "http://192.168.0.113:8885",
-  im: "https://myk.9village.cn",
-  common: "https://myk.9village.cn",
-  buyer: "https://myk.9village.cn",
-  store: "https://myk.9village.cn",
+  // im: "https://myk.9village.cn",
+  // common: "https://myk.9village.cn",
+  // buyer: "https://myk.9village.cn",
+  // store: "https://myk.9village.cn",
   // im: "https://www.meiyikuang.com/mykapi",
   // common: "https://www.meiyikuang.com/mykapi",
   // buyer: "https://www.meiyikuang.com/mykapi",
   // store: "https://www.meiyikuang.com/mykapi",
-  
 };
 // 鐢熶骇鐜
 const prod = {
diff --git a/pages/mine/activity/reportActivity.vue b/pages/mine/activity/reportActivity.vue
index 78ff7c2..86b0a86 100644
--- a/pages/mine/activity/reportActivity.vue
+++ b/pages/mine/activity/reportActivity.vue
@@ -26,6 +26,9 @@
 					</view>
 				</view>
 			</view>
+			<view class="empty-state" v-if="mockData.length === 0 && !loading">
+			        <text>鏆傛棤鍐呭锛屼笅鎷夊埛鏂拌瘯璇�</text>
+			    </view>
 			<!-- 	<view style="height: 150rpx;"></view> -->
 			<!-- 鏀硅繘鐨勫姞杞芥洿澶氭彁绀� -->
 			<view class="load-more">
@@ -215,6 +218,19 @@
 </script>
 
 <style lang="scss">
+	/* 绌虹姸鎬佹牱寮� */
+	.empty-state {
+	    display: flex;
+	    flex-direction: column;
+	    align-items: center;
+	    justify-content: center;
+	    height: 50vh;
+	    text-align: center;
+	    color: #999;
+	    text {
+	        font-size: 28rpx;
+	    }
+	}
 	/* 鏂板鍔犺浇鏇村鏍峰紡 */
 	.load-more {
 		padding: 20rpx 0;
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index 26c6167..a703f3e 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -5,12 +5,24 @@
 			: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">
@@ -37,6 +49,7 @@
             </u-checkbox>
         </div>
 			</div>
+			
 		</view>
 	</view>
 </template>
@@ -51,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,
@@ -97,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 涓彁鍑�
@@ -132,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);
               /**
                * 鏍规嵁鍏湁鐨勯厤缃缃櫥褰曟柟寮�
                */
@@ -189,11 +213,12 @@
           this.logingFlag = false;
         }
 			},
-
 			//鑾峰彇鎵嬫満鍙锋巿鏉�
 			getPhoneNumber(e) {
+				
 			  let iv = e.detail.iv;
 			  let encryptedData = e.detail.encryptedData;
+			  
 			  if (!e.detail.encryptedData) {
 			    uni.showToast({
 			      title: "璇锋巿浜堟墜鏈哄彿鐮佹潈闄愶紝鎵嬫満鍙风爜浼氬拰浼氬憳绯荤粺鐢ㄦ埛缁戝畾锛�",
@@ -205,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,
@@ -213,6 +246,7 @@
 			    nickName,
 			  }).then((res) => {
 				  console.log(res)
+				//鐧诲綍鎴愬姛淇敼鐢ㄦ埛鐨勬樀绉�
 			    storage.setAccessToken(res.data.result.accessToken);
 			    storage.setRefreshToken(res.data.result.refreshToken);
 			    // 鐧诲綍鎴愬姛
@@ -223,13 +257,22 @@
 			    //鑾峰彇鐢ㄦ埛淇℃伅
 			    getUserInfo().then((user) => {
 					console.log(user)
-			      storage.setUserInfo(user.data.result);
-			      storage.setHasLogin(true);
+					const form ={
+						memberId:user.data.result.id,
+						nickName:this.nickName
+					}
+					updateMemberNickName(form).then(res =>{
+					})
+					 user.data.result.nickName = this.nickName
+					 storage.setUserInfo(user.data.result);
+					 storage.setHasLogin(true);
 				 
 			      uni.navigateBack({
 			        delta: 1,
 			      });
 			    });
+				
+				
 			  });
 			},
 
@@ -240,6 +283,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;
@@ -320,7 +376,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