chore: 新增 .gitignore 排除开发文档，同步代码与构建产物

Made-with: Cursor

miniprogram/pages/settings/settings.js

@@ -245,85 +245,66 @@ Page({
     }
   },
   
-  // 获取微信头像（新版授权）
-  async getWechatAvatar() {
+  // 微信原生 chooseAvatar 回调
+  async onChooseAvatar(e) {
+    const tempAvatarUrl = e.detail?.avatarUrl
+    if (!tempAvatarUrl) return
+    wx.showLoading({ title: '上传中...', mask: true })
     try {
-      const res = await wx.getUserProfile({
-        desc: '用于完善会员资料'
-      })
-      
-      if (res.userInfo) {
-        const { nickName, avatarUrl: tempAvatarUrl } = res.userInfo
-        
-        wx.showLoading({ title: '上传中...', mask: true })
-        
-        // 1. 先上传图片到服务器
-        console.log('[Settings] 开始上传头像:', tempAvatarUrl)
-        
-        const uploadRes = await new Promise((resolve, reject) => {
-          wx.uploadFile({
-            url: app.globalData.baseUrl + '/api/miniprogram/upload',
-            filePath: tempAvatarUrl,
-            name: 'file',
-            formData: {
-              folder: 'avatars'
-            },
-            success: (uploadResult) => {
-              try {
-                const data = JSON.parse(uploadResult.data)
-                if (data.success) {
-                  resolve(data)
-                } else {
-                  reject(new Error(data.error || '上传失败'))
-                }
-              } catch (err) {
-                reject(new Error('解析响应失败'))
-              }
-            },
-            fail: (err) => {
-              reject(err)
+      const uploadRes = await new Promise((resolve, reject) => {
+        wx.uploadFile({
+          url: app.globalData.baseUrl + '/api/miniprogram/upload',
+          filePath: tempAvatarUrl,
+          name: 'file',
+          formData: { folder: 'avatars' },
+          success: (uploadResult) => {
+            try {
+              const data = JSON.parse(uploadResult.data)
+              if (data.success) resolve(data)
+              else reject(new Error(data.error || '上传失败'))
+            } catch (err) {
+              reject(new Error('解析响应失败'))
             }
-          })
+          },
+          fail: reject
         })
-        
-        // 2. 获取上传后的完整URL
-        const avatarUrl = app.globalData.baseUrl + uploadRes.data.url
-        console.log('[Settings] 头像上传成功:', avatarUrl)
-        
-        // 3. 更新本地
-        this.setData({
-          userInfo: {
-            ...this.data.userInfo,
-            nickname: nickName,
-            avatar: avatarUrl
-          }
+      })
+
+      const rawUrl = uploadRes.data.url || ''
+      const avatarUrl = rawUrl.startsWith('http://') || rawUrl.startsWith('https://')
+        ? rawUrl
+        : app.globalData.baseUrl + rawUrl
+      const nickname = this.data.userInfo?.nickname || app.globalData.userInfo?.nickname || ''
+
+      this.setData({
+        userInfo: {
+          ...this.data.userInfo,
+          nickname,
+          avatar: avatarUrl
+        }
+      })
+
+      const userId = app.globalData.userInfo?.id
+      if (userId) {
+        await app.request('/api/miniprogram/user/profile', {
+          method: 'POST',
+          data: { userId, nickname, avatar: avatarUrl }
         })
-        
-        // 4. 同步到服务器数据库
-        const userId = app.globalData.userInfo?.id
-        if (userId) {
-          await app.request('/api/miniprogram/user/profile', {
-            method: 'POST',
-            data: { userId, nickname: nickName, avatar: avatarUrl }
-          })
-        }
-        
-        // 5. 更新全局
-        if (app.globalData.userInfo) {
-          app.globalData.userInfo.nickname = nickName
-          app.globalData.userInfo.avatar = avatarUrl
-          wx.setStorageSync('userInfo', app.globalData.userInfo)
-        }
-        
-        wx.hideLoading()
-        wx.showToast({ title: '头像更新成功', icon: 'success' })
       }
+
+      if (app.globalData.userInfo) {
+        app.globalData.userInfo.avatar = avatarUrl
+        wx.setStorageSync('userInfo', app.globalData.userInfo)
+      }
+
+      wx.hideLoading()
+      wx.showToast({ title: '头像更新成功', icon: 'success' })
     } catch (e) {
       wx.hideLoading()
-      console.error('[Settings] 获取头像失败:', e)
-      wx.showToast({ 
-        title: e.message || '获取头像失败', 
-        icon: 'none' 
+      console.error('[Settings] 更新头像失败:', e)
+      wx.showToast({
+        title: e.message || '上传失败，请重试',
+        icon: 'none'
       })
     }
   },