增强用户隐私保护，新增昵称授权功能。更新头像选择逻辑，用户可直接通过按钮选择微信头像或相册图片。优化个人资料页面，强化手机号必填提示，提升用户体验。调整多个页面以支持新隐私授权机制，确保符合最新隐私规范。

2026-03-19 18:26:45 +08:00
parent 35aecdcd8c
commit 588dad2518
124 changed files with 4093 additions and 38827 deletions
--- a/miniprogram/pages/my/my.js
+++ b/miniprogram/pages/my/my.js
@@ -68,9 +68,6 @@ Page({
    showNicknameModal: false,
    editingNickname: '',

-    // 头像弹窗（含 chooseAvatar 按钮，必须用户点击才可获取微信头像）
-    showAvatarModal: false,
-
    // 手机/微信号弹窗（stitch_soul comprehensive_profile_editor_v1_2）
    showContactModal: false,
    contactPhone: '',
@@ -458,10 +455,9 @@ Page({
    wx.showToast({ title: '已刷新', icon: 'success' })
  },
  
-  // 微信原生获取头像（button open-type="chooseAvatar" 回调，真正获取微信头像）
+  // 微信原生获取头像（button open-type="chooseAvatar" 回调，点击头像直接唤起选择器）
  async onChooseAvatar(e) {
    const tempAvatarUrl = e.detail?.avatarUrl
-    this.setData({ showAvatarModal: false })
    if (!tempAvatarUrl) return
    wx.showLoading({ title: '上传中...', mask: true })
    
@@ -495,8 +491,11 @@ Page({
        })
      })
      
-      // 2. 获取上传后的完整URL
-      const avatarUrl = app.globalData.baseUrl + uploadRes.data.url
+      // 2. 获取上传后的完整URL（显示用）；保存时只传路径
+      let avatarUrl = uploadRes.data?.url || uploadRes.url
+      if (avatarUrl && !avatarUrl.startsWith('http')) {
+        avatarUrl = app.globalData.baseUrl + avatarUrl
+      }
      console.log('[My] 头像上传成功:', avatarUrl)
      
      // 3. 更新本地头像
@@ -506,7 +505,7 @@ Page({
      app.globalData.userInfo = userInfo
      wx.setStorageSync('userInfo', userInfo)
      
-      // 4. 同步到服务器数据库
+      // 4. 同步到服务器数据库（只保存路径，不含域名）
      await app.request('/api/miniprogram/user/update', {
        method: 'POST',
        data: { userId: userInfo.id, avatar: avatarUrl }
@@ -548,12 +547,9 @@ Page({
    }
  },
  
-  // 打开昵称修改弹窗
+  // 点击昵称：跳转资料编辑页（type="nickname" 在弹窗内无法触发微信昵称选择器，需在主页面）
  editNickname() {
-    this.setData({
-      showNicknameModal: true,
-      editingNickname: this.data.userInfo?.nickname || ''
-    })
+    wx.navigateTo({ url: '/pages/profile-edit/profile-edit' })
  },
  
  // 关闭昵称弹窗
@@ -875,62 +871,6 @@ Page({
    } catch (e) { console.log('[My] 余额查询失败', e) }
  },

-  // 头像点击：已登录弹出选项（微信头像 / 相册）
-  onAvatarTap() {
-    if (!this.data.isLoggedIn) { this.showLogin(); return }
-    wx.showActionSheet({
-      itemList: ['获取微信头像', '从相册选择'],
-      success: (res) => {
-        if (res.tapIndex === 0) this.setData({ showAvatarModal: true })
-        if (res.tapIndex === 1) this.chooseAvatarFromAlbum()
-      }
-    })
-  },
-
-  closeAvatarModal() {
-    this.setData({ showAvatarModal: false })
-  },
-
-  // 从相册/相机选择（自定义图片）
-  chooseAvatarFromAlbum() {
-    wx.chooseMedia({
-      count: 1, mediaType: ['image'], sourceType: ['album', 'camera'],
-      success: async (res) => {
-        const tempPath = res.tempFiles[0].tempFilePath
-        wx.showLoading({ title: '上传中...', mask: true })
-        try {
-          const uploadRes = await new Promise((resolve, reject) => {
-            wx.uploadFile({
-              url: app.globalData.baseUrl + '/api/miniprogram/upload',
-              filePath: tempPath,
-              name: 'file',
-              formData: { folder: 'avatars' },
-              success: (r) => {
-                try {
-                  const data = JSON.parse(r.data)
-                  data.success ? resolve(data) : reject(new Error(data.error || '上传失败'))
-                } catch (e) { reject(new Error('解析失败')) }
-              },
-              fail: (e) => reject(e)
-            })
-          })
-          const avatarUrl = app.globalData.baseUrl + uploadRes.data.url
-          const userInfo = this.data.userInfo
-          userInfo.avatar = avatarUrl
-          this.setData({ userInfo })
-          app.globalData.userInfo = userInfo
-          wx.setStorageSync('userInfo', userInfo)
-          await app.request('/api/miniprogram/user/update', { method: 'POST', data: { userId: userInfo.id, avatar: avatarUrl } })
-          wx.hideLoading()
-          wx.showToast({ title: '头像已更新', icon: 'success' })
-        } catch (e) {
-          wx.hideLoading()
-          wx.showToast({ title: e.message || '上传失败，请重试', icon: 'none' })
-        }
-      }
-    })
-  },
-
  goToVip() {
    trackClick('my', 'btn_click', '会员中心')
    if (!this.data.isLoggedIn) { this.showLogin(); return }
@@ -982,18 +922,19 @@ Page({
    })
  },

-  // 提现/找伙伴前检查手机或微信号，未填则弹窗（stitch_soul）
+  // 提现/找伙伴前检查联系方式：手机号必填（与 profile-edit 规则一致）
  async ensureContactInfo(callback) {
    const userId = app.globalData.userInfo?.id
    if (!userId) { callback(); return }
    try {
      const res = await app.request({ url: `/api/miniprogram/user/profile?userId=${userId}`, silent: true })
-      const phone = (res?.data?.phone || '').trim()
-      const wechat = (res?.data?.wechatId || '').trim()
-      if (phone || wechat) {
+      const phone = (res?.data?.phone || wx.getStorageSync('user_phone') || '').trim().replace(/\s/g, '')
+      const hasValidPhone = !!phone && /^1[3-9]\d{9}$/.test(phone)
+      if (hasValidPhone) {
        callback()
        return
      }
+      const wechat = (res?.data?.wechatId || res?.data?.wechat_id || wx.getStorageSync('user_wechat') || '').trim()
      this.setData({
        showContactModal: true,
        contactPhone: phone || '',
@@ -1015,10 +956,14 @@ Page({
  onContactWechatInput(e) { this.setData({ contactWechat: e.detail.value }) },

  async saveContactInfo() {
-    const phone = (this.data.contactPhone || '').trim()
+    const phone = (this.data.contactPhone || '').trim().replace(/\s/g, '')
    const wechat = (this.data.contactWechat || '').trim()
-    if (!phone && !wechat) {
-      wx.showToast({ title: '请至少填写手机号或微信号', icon: 'none' })
+    if (!phone) {
+      wx.showToast({ title: '请输入手机号（必填）', icon: 'none' })
+      return
+    }
+    if (!/^1[3-9]\d{9}$/.test(phone)) {
+      wx.showToast({ title: '请输入正确的11位手机号', icon: 'none' })
      return
    }
    this.setData({ contactSaving: true })
--- a/miniprogram/pages/my/my.wxml
+++ b/miniprogram/pages/my/my.wxml
@@ -23,14 +23,16 @@
  <view class="profile-card" wx:else>
    <view class="profile-card-inner">
      <view class="profile-top-row">
-        <view class="avatar-wrap" bindtap="onAvatarTap">
-          <view class="avatar-inner {{isVip ? 'avatar-vip' : ''}}">
-            <image wx:if="{{userInfo.avatar}}" class="avatar-img" src="{{userInfo.avatar}}" mode="aspectFill"/>
-            <text wx:else class="avatar-text">{{userInfo.nickname ? userInfo.nickname[0] : '?'}}</text>
+        <button class="avatar-wrap-btn" open-type="chooseAvatar" bindchooseavatar="onChooseAvatar">
+          <view class="avatar-wrap">
+            <view class="avatar-inner {{isVip ? 'avatar-vip' : ''}}">
+              <image wx:if="{{userInfo.avatar}}" class="avatar-img" src="{{userInfo.avatar}}" mode="aspectFill"/>
+              <text wx:else class="avatar-text">{{userInfo.nickname ? userInfo.nickname[0] : '?'}}</text>
+            </view>
+            <view class="vip-badge" wx:if="{{isVip}}">VIP</view>
+            <view class="vip-badge vip-badge-gray" wx:else>VIP</view>
          </view>
-          <view class="vip-badge" wx:if="{{isVip}}">VIP</view>
-          <view class="vip-badge vip-badge-gray" wx:else>VIP</view>
-        </view>
+        </button>
        <view class="profile-meta">
          <view class="profile-name-row">
            <text class="user-name" bindtap="editNickname">{{userInfo.nickname || '点击设置昵称'}}</text>
@@ -199,7 +201,7 @@
  <view class="modal-overlay contact-modal-overlay" wx:if="{{showContactModal}}" bindtap="closeContactModal">
    <view class="contact-modal" catchtap="stopPropagation">
      <text class="contact-modal-title">请完善联系方式</text>
-      <view class="contact-modal-hint">需完善手机号或微信号才能使用提现和找伙伴功能</view>
+      <view class="contact-modal-hint">手机号必填，微信号建议填写，以便使用提现和找伙伴功能</view>
      <view class="form-input-wrap">
        <text class="form-label">手机号</text>
        <view class="form-input-inner">
@@ -219,17 +221,6 @@
    </view>
  </view>

-  <!-- 头像弹窗：必须点击 button 才能获取微信头像（隐私规范） -->
-  <view class="modal-overlay" wx:if="{{showAvatarModal}}" bindtap="closeAvatarModal">
-    <view class="modal-content avatar-modal" catchtap="stopPropagation">
-      <view class="modal-close" bindtap="closeAvatarModal"><icon name="x" size="36" color="#8e8e93"></icon></view>
-      <text class="avatar-modal-title">获取微信头像</text>
-      <text class="avatar-modal-desc">点击下方按钮使用你的微信头像</text>
-      <button class="btn-choose-avatar" open-type="chooseAvatar" bindchooseavatar="onChooseAvatar">使用微信头像</button>
-      <view class="avatar-modal-cancel" bindtap="closeAvatarModal">取消</view>
-    </view>
-  </view>
-
  <!-- 修改昵称弹窗 -->
  <view class="modal-overlay" wx:if="{{showNicknameModal}}" bindtap="closeNicknameModal">
    <view class="modal-content nickname-modal" catchtap="stopPropagation">
--- a/miniprogram/pages/my/my.wxss
+++ b/miniprogram/pages/my/my.wxss
@@ -41,6 +41,14 @@
  border: 1rpx solid rgba(75,85,99,0.5);
 }
 .profile-top-row { display: flex; align-items: flex-start; gap: 32rpx; }
+/* 头像按钮：透明无边框，宽高与头像一致，点击直接唤起微信选择器（微信头像/相册/拍照） */
+.avatar-wrap-btn {
+  width: 40rpx; height: 130rpx;
+  padding: 0; margin: 0; background: transparent; border: none;
+  display: flex; align-items: center; justify-content: center;
+  flex-shrink: 0;
+}
+.avatar-wrap-btn::after { border: none; }
 .avatar-wrap { position: relative; flex-shrink: 0; }
 .avatar-inner {
  width: 130rpx; height: 130rpx; border-radius: 50%; overflow: hidden;