Merge branch 'refs/heads/lihuilin/feature-20251024095243-我的' into milestone-20251031-简版功能开发

# Conflicts:
#	pages/home/member.vue

pages/home/member.vue

@@ -1,22 +1,30 @@
 <template>
-	 <LoginPrompt ref="loginwPrompt"></LoginPrompt>
-  <view class="main">
-    <view class="top">
-      <!-- <view class="bell">
-        <image class="image-bell" src="/static/my/bell.png"></image>
-      </view> -->
-      <view class="msg">
-        <view class="msg-left">
-          <view class="avatar"></view>
-        </view>
-        <view class="msg-center">
-          <view style="display: flex;">
-            <view class="userInfo">{{ username }}</view>
-            <image class="image-editName" src="/static/my/editName.png"></image>
-          </view>
-          <view class="userId">ID:{{ dccode }}</view>
-        </view>
-<!--        <view class="msg-right">
+	<LoginPrompt ref="loginPrompt"></LoginPrompt>
+	<view class="main">
+		<view class="top">
+			<view class="bell">
+				<!-- <image class="image-bell" src="/static/my/bell.png" /> -->
+			</view>
+			<view class="msg">
+				<view class="msg-left">
+					<image class="avatar"
+						:src="avatarUrl || 'https://d31zlh4on95l9h.cloudfront.net/default/1961d9d2e31e78e47e885231e7514a35.png'"
+						mode="aspectFill" />
+				</view>
+				<view class=" msg-center">
+					<view style="display: flex;">
+						<template v-if="!isEditingName">
+							<view class="userInfo">{{ username }}</view>
+							<image class="image-editName" src="/static/my/editName.png" @click="startEditName" />
+						</template>
+						<template v-else>
+							<input v-model="editingName" class="edit-input" @blur="finishEditName"
+								@keyup.enter="finishEditName" autofocus placeholder="请输入用户名" />
+						</template>
+					</view>
+					<view class="userId">ID:{{ dccode }}</view>
+				</view>
+				<!--        <view class="msg-right">
           <image class="image-attendance" src="/static/my/Check-in.png"/>
           <span style="font-size:10px;">签到</span>
         </view> -->
@@ -165,19 +173,19 @@
 		})
 	}
 
-const goToShare = () => {
-  console.log('用户信息==========',userStore.userInfo.isVisitor)
-  if (userStore.userInfo.isVisitor) {
-    uni.showToast({
-      title: '请先登录',
-      icon: 'none'
+  const goToShare = () => {
+    console.log('用户信息==========',userStore.userInfo.isVisitor)
+    if (userStore.userInfo.isVisitor) {
+      uni.showToast({
+        title: '请先登录',
+        icon: 'none'
+      })
+      return
+    }
+    uni.navigateTo({
+      url: '../setting/share'
     })
-    return
   }
-  uni.navigateTo({
-    url: '../setting/share'
-  })
-}
 
 	onMounted(() => {
 		// 状态栏高度