更新服务器信息为新的 IP 地址，调整相关文档和代码中的默认配置，确保部署和连接的一致性。同时，优化订单管理界面，增强商品信息的格式化逻辑，提升用户体验。

2026-02-05 21:08:28 +08:00
parent 1a95aee112
commit 3ccf331e12
61 changed files with 11231 additions and 311 deletions
--- a/miniprogram/pages/my/my.js
+++ b/miniprogram/pages/my/my.js
@@ -46,7 +46,11 @@ Page({
    
    // 登录弹窗
    showLoginModal: false,
-    isLoggingIn: false
+    isLoggingIn: false,
+    
+    // 修改昵称弹窗
+    showNicknameModal: false,
+    editingNickname: ''
  },

  onLoad() {
@@ -142,30 +146,68 @@ Page({
  
  // 微信原生获取头像（button open-type="chooseAvatar" 回调）
  async onChooseAvatar(e) {
-    const avatarUrl = e.detail.avatarUrl
-    if (!avatarUrl) return
+    const tempAvatarUrl = e.detail.avatarUrl
+    if (!tempAvatarUrl) return
    
-    wx.showLoading({ title: '更新中...', mask: true })
+    wx.showLoading({ title: '上传中...', mask: true })
    
    try {
+      // 1. 先上传图片到服务器
+      console.log('[My] 开始上传头像:', tempAvatarUrl)
+      
+      const uploadRes = await new Promise((resolve, reject) => {
+        wx.uploadFile({
+          url: app.globalData.baseUrl + '/api/upload',
+          filePath: tempAvatarUrl,
+          name: 'file',
+          formData: {
+            folder: 'avatars'
+          },
+          success: (res) => {
+            try {
+              const data = JSON.parse(res.data)
+              if (data.success) {
+                resolve(data)
+              } else {
+                reject(new Error(data.error || '上传失败'))
+              }
+            } catch (err) {
+              reject(new Error('解析响应失败'))
+            }
+          },
+          fail: (err) => {
+            reject(err)
+          }
+        })
+      })
+      
+      // 2. 获取上传后的完整URL
+      const avatarUrl = app.globalData.baseUrl + uploadRes.data.url
+      console.log('[My] 头像上传成功:', avatarUrl)
+      
+      // 3. 更新本地头像
      const userInfo = this.data.userInfo
      userInfo.avatar = avatarUrl
      this.setData({ userInfo })
      app.globalData.userInfo = userInfo
      wx.setStorageSync('userInfo', userInfo)
      
-      // 同步到服务器
+      // 4. 同步到服务器数据库
      await app.request('/api/user/update', {
        method: 'POST',
        data: { userId: userInfo.id, avatar: avatarUrl }
      })
      
      wx.hideLoading()
-      wx.showToast({ title: '头像已获取', icon: 'success' })
+      wx.showToast({ title: '头像更新成功', icon: 'success' })
+      
    } catch (e) {
      wx.hideLoading()
-      console.log('同步头像失败', e)
-      wx.showToast({ title: '头像已更新', icon: 'success' })
+      console.error('[My] 上传头像失败:', e)
+      wx.showToast({ 
+        title: e.message || '上传失败，请重试', 
+        icon: 'none' 
+      })
    }
  },
  
@@ -193,38 +235,76 @@ Page({
    }
  },
  
-  // 点击昵称修改（备用）
+  // 打开昵称修改弹窗
  editNickname() {
-    wx.showModal({
-      title: '修改昵称',
-      editable: true,
-      placeholderText: '请输入昵称',
-      success: async (res) => {
-        if (res.confirm && res.content) {
-          const newNickname = res.content.trim()
-          if (newNickname.length < 1 || newNickname.length > 20) {
-            wx.showToast({ title: '昵称1-20个字符', icon: 'none' })
-            return
-          }
-          
-          // 更新本地
-          const userInfo = this.data.userInfo
-          userInfo.nickname = newNickname
-          this.setData({ userInfo })
-          app.globalData.userInfo = userInfo
-          wx.setStorageSync('userInfo', userInfo)
-          
-          // 同步到服务器
-          try {
-            await app.request('/api/user/update', {
-              method: 'POST',
-              data: { userId: userInfo.id, nickname: newNickname }
-            })
-          } catch (e) {
-            console.log('同步昵称到服务器失败', e)
-          }
-          
-          wx.showToast({ title: '昵称已更新', icon: 'success' })
+    this.setData({
+      showNicknameModal: true,
+      editingNickname: this.data.userInfo?.nickname || ''
+    })
+  },
+  
+  // 关闭昵称弹窗
+  closeNicknameModal() {
+    this.setData({
+      showNicknameModal: false,
+      editingNickname: ''
+    })
+  },
+  
+  // 阻止事件冒泡
+  stopPropagation() {},
+  
+  // 昵称输入实时更新
+  onNicknameInput(e) {
+    this.setData({
+      editingNickname: e.detail.value
+    })
+  },
+  
+  // 昵称变化（微信自动填充时触发）
+  onNicknameChange(e) {
+    console.log('[My] 昵称已自动填充:', e.detail.value)
+    this.setData({
+      editingNickname: e.detail.value
+    })
+  },
+  
+  // 确认修改昵称
+  async confirmNickname() {
+    const newNickname = this.data.editingNickname.trim()
+    
+    if (!newNickname) {
+      wx.showToast({ title: '昵称不能为空', icon: 'none' })
+      return
+    }
+    
+    if (newNickname.length < 1 || newNickname.length > 20) {
+      wx.showToast({ title: '昵称1-20个字符', icon: 'none' })
+      return
+    }
+    
+    // 关闭弹窗
+    this.closeNicknameModal()
+    
+    // 显示加载
+    wx.showLoading({ title: '更新中...' })
+    
+    try {
+      // 更新本地
+      const userInfo = this.data.userInfo
+      userInfo.nickname = newNickname
+      this.setData({ userInfo })
+      app.globalData.userInfo = userInfo
+      wx.setStorageSync('userInfo', userInfo)
+      
+      // 同步到服务器
+      await app.request('/api/user/update', {
+        method: 'POST',
+        data: { userId: userInfo.id, nickname: newNickname }
+      })
+      
+      wx.hideLoading()
+      wx.showToast({ title: '昵称已更新', icon: 'success' })
        }
      }
    })
--- a/miniprogram/pages/my/my.wxml
+++ b/miniprogram/pages/my/my.wxml
@@ -244,6 +244,36 @@
    </view>
  </view>

+  <!-- 修改昵称弹窗 -->
+  <view class="modal-overlay" wx:if="{{showNicknameModal}}" bindtap="closeNicknameModal">
+    <view class="modal-content nickname-modal" catchtap="stopPropagation">
+      <view class="modal-close" bindtap="closeNicknameModal">✕</view>
+      <view class="modal-header">
+        <text class="modal-icon">✏️</text>
+        <text class="modal-title">修改昵称</text>
+      </view>
+      
+      <view class="nickname-input-wrap">
+        <input 
+          class="nickname-input"
+          type="nickname"
+          value="{{editingNickname}}"
+          placeholder="点击输入昵称"
+          placeholder-class="nickname-placeholder"
+          bindchange="onNicknameChange"
+          bindinput="onNicknameInput"
+          maxlength="20"
+        />
+        <text class="input-tip">微信用户可点击自动填充昵称</text>
+      </view>
+      
+      <view class="modal-actions">
+        <view class="modal-btn modal-btn-cancel" bindtap="closeNicknameModal">取消</view>
+        <view class="modal-btn modal-btn-confirm" bindtap="confirmNickname">确定</view>
+      </view>
+    </view>
+  </view>
+
  <!-- 底部留白 -->
  <view class="bottom-space"></view>
 </view>
--- a/miniprogram/pages/my/my.wxss
+++ b/miniprogram/pages/my/my.wxss
@@ -1103,3 +1103,84 @@
  font-size: 28rpx;
  color: #FFD700;
 }
+
+/* ===== 修改昵称弹窗 ===== */
+.nickname-modal {
+  width: 600rpx;
+  max-width: 90%;
+}
+
+.modal-header {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 40rpx;
+}
+
+.modal-icon {
+  font-size: 60rpx;
+  margin-bottom: 16rpx;
+}
+
+.modal-title {
+  font-size: 32rpx;
+  color: #ffffff;
+  font-weight: 600;
+}
+
+.nickname-input-wrap {
+  margin-bottom: 40rpx;
+}
+
+.nickname-input {
+  width: 100%;
+  height: 88rpx;
+  padding: 0 24rpx;
+  background: rgba(255, 255, 255, 0.05);
+  border: 2rpx solid rgba(56, 189, 172, 0.3);
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  color: #ffffff;
+  box-sizing: border-box;
+}
+
+.nickname-placeholder {
+  color: rgba(255, 255, 255, 0.3);
+}
+
+.input-tip {
+  display: block;
+  margin-top: 12rpx;
+  font-size: 22rpx;
+  color: rgba(56, 189, 172, 0.6);
+  text-align: center;
+}
+
+.modal-actions {
+  display: flex;
+  gap: 20rpx;
+}
+
+.modal-btn {
+  flex: 1;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 12rpx;
+  font-size: 28rpx;
+  font-weight: 500;
+  transition: all 0.3s;
+}
+
+.modal-btn-cancel {
+  background: rgba(255, 255, 255, 0.05);
+  color: rgba(255, 255, 255, 0.5);
+  border: 2rpx solid rgba(255, 255, 255, 0.1);
+}
+
+.modal-btn-confirm {
+  background: linear-gradient(135deg, #38bdac 0%, #2da396 100%);
+  color: #ffffff;
+  box-shadow: 0 8rpx 24rpx rgba(56, 189, 172, 0.3);
+}