From 58ad9e8be3f9192d524c2f58360d7865c591bf0c Mon Sep 17 00:00:00 2001
From: tsui110 <tsui110@meiyou.email>
Date: Tue, 24 Mar 2026 12:10:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E9=99=86=E5=92=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PrivacyPopup.vue | 190 ++++++++++++++++++++++++++++++++++++
 pages.json                  |   3 +
 pages/cabinet/index.vue     |  16 +--
 pages/index/index.vue       |  15 +--
 pages/login/index.vue       |  59 +++++++++++
 pages/mine/index.vue        |  25 ++---
 pages/shop/index.vue        |  22 ++---
 7 files changed, 275 insertions(+), 55 deletions(-)
 create mode 100644 components/PrivacyPopup.vue

diff --git a/components/PrivacyPopup.vue b/components/PrivacyPopup.vue
new file mode 100644
index 0000000..8a3669c
--- /dev/null
+++ b/components/PrivacyPopup.vue
@@ -0,0 +1,190 @@
+<template>
+  <view v-if="showPrivacy" class="privacy-popup-mask">
+    <view class="privacy-popup-content">
+      <view class="privacy-title">用户隐私保护提示</view>
+      <view class="privacy-desc">
+        感谢您使用柯大鸭盲盒小程序。我们非常重视您的隐私保护和用户权益。
+        <br /><br />
+        在您使用我们的服务前，请您仔细阅读并充分理解
+        <text class="privacy-link" @tap="openPrivacyContract">《用户隐私保护指引》</text>。
+        <br /><br />
+        当您点击同意并开始使用我们的服务时，即表示您已理解并同意该指引内容，我们将按照指引内容处理您的个人信息。
+      </view>
+      <view class="privacy-buttons">
+        <button class="btn-reject" @tap="handleDisagree">拒绝</button>
+        <button 
+          class="btn-agree" 
+          id="agree-btn" 
+          open-type="agreePrivacyAuthorization" 
+          @agreeprivacyauthorization="handleAgree"
+        >
+          同意
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'PrivacyPopup',
+  data() {
+    return {
+      showPrivacy: false,
+      resolvePrivacyAuthorization: null
+    }
+  },
+  mounted() {
+    // #ifdef MP-WEIXIN
+    this.initPrivacy()
+    // #endif
+  },
+  methods: {
+    initPrivacy() {
+      // #ifdef MP-WEIXIN
+      wx.onNeedPrivacyAuthorization((resolve, eventInfo) => {
+        console.log('[隐私协议] 触发隐私授权', eventInfo)
+        this.resolvePrivacyAuthorization = resolve
+        this.showPrivacy = true
+      })
+      
+      wx.getPrivacySetting({
+        success: (res) => {
+          console.log('[隐私协议] 隐私设置', res)
+          if (res.needAuthorization) {
+            // 需要弹出隐私协议
+          } else {
+            // 用户已同意隐私协议
+            this.showPrivacy = false
+          }
+        },
+        fail: (err) => {
+          console.error('[隐私协议] 获取隐私设置失败', err)
+        }
+      })
+      // #endif
+    },
+    
+    openPrivacyContract() {
+      // #ifdef MP-WEIXIN
+      wx.openPrivacyContract({
+        success: () => {
+          console.log('[隐私协议] 打开隐私协议成功')
+        },
+        fail: (err) => {
+          console.error('[隐私协议] 打开隐私协议失败', err)
+        }
+      })
+      // #endif
+    },
+    
+    handleAgree() {
+      console.log('[隐私协议] 用户同意')
+      this.showPrivacy = false
+      if (this.resolvePrivacyAuthorization) {
+        this.resolvePrivacyAuthorization({
+          event: 'agree',
+          buttonId: 'agree-btn'
+        })
+        this.resolvePrivacyAuthorization = null
+      }
+      this.$emit('agree')
+    },
+    
+    handleDisagree() {
+      console.log('[隐私协议] 用户拒绝')
+      this.showPrivacy = false
+      if (this.resolvePrivacyAuthorization) {
+        this.resolvePrivacyAuthorization({
+          event: 'disagree'
+        })
+        this.resolvePrivacyAuthorization = null
+      }
+      this.$emit('disagree')
+      uni.showModal({
+        title: '提示',
+        content: '您拒绝了隐私协议，部分功能可能无法正常使用',
+        showCancel: false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.privacy-popup-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.privacy-popup-content {
+  width: 600rpx;
+  background: #fff;
+  border-radius: 24rpx;
+  padding: 48rpx 40rpx;
+  box-sizing: border-box;
+}
+
+.privacy-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #333;
+  text-align: center;
+  margin-bottom: 32rpx;
+}
+
+.privacy-desc {
+  font-size: 28rpx;
+  color: #666;
+  line-height: 1.8;
+  margin-bottom: 40rpx;
+}
+
+.privacy-link {
+  color: #FF6B00;
+  text-decoration: underline;
+}
+
+.privacy-buttons {
+  display: flex;
+  gap: 24rpx;
+}
+
+.btn-reject {
+  flex: 1;
+  height: 88rpx;
+  line-height: 88rpx;
+  font-size: 30rpx;
+  color: #666;
+  background: #f5f5f5;
+  border: none;
+  border-radius: 44rpx;
+  
+  &::after {
+    border: none;
+  }
+}
+
+.btn-agree {
+  flex: 1;
+  height: 88rpx;
+  line-height: 88rpx;
+  font-size: 30rpx;
+  color: #fff;
+  background: linear-gradient(135deg, #FF9500, #FF6B00);
+  border: none;
+  border-radius: 44rpx;
+  
+  &::after {
+    border: none;
+  }
+}
+</style>
diff --git a/pages.json b/pages.json
index 06a1c33..e156f7c 100755
--- a/pages.json
+++ b/pages.json
@@ -279,5 +279,8 @@
 			"^BlessingAnimation": "@/components/BlessingAnimation.vue"
 		}
 	},
+	"mp-weixin": {
+		"__usePrivacyCheck__": true
+	},
 	"uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/cabinet/index.vue b/pages/cabinet/index.vue
index c18de05..fa3bef8 100755
--- a/pages/cabinet/index.vue
+++ b/pages/cabinet/index.vue
@@ -3,10 +3,7 @@
     <!-- 顶部装饰背景 - 漂浮光球 -->
     <view class="bg-decoration"></view>
 
-    <!-- 自定义 tabBar -->
-    <!-- #ifdef MP-WEIXIN -->
-    <customTabBar />
-    <!-- #endif -->
+    <!-- 自定义 tabBar (仅抖音小程序) -->
     <!-- #ifdef MP-TOUTIAO -->
     <customTabBarToutiao />
     <!-- #endif -->
@@ -256,11 +253,7 @@ import { onShow, onReachBottom, onShareAppMessage, onPullDownRefresh } from '@dc
 import { getInventory, getProductDetail, redeemInventory, requestShipping, cancelShipping, listAddresses, getShipments, createAddressShare, createShippingFeeOrder } from '@/api/appUser'
 import { getSynthesisRecipes, doSynthesis } from '@/api/synthesis.js'
 import { vibrateShort } from '@/utils/vibrate.js'
-import { checkPhoneBound, checkPhoneBoundSync } from '@/utils/checkPhone.js'
 import { executePaymentFlow } from '@/utils/payment.js'
-// #ifdef MP-WEIXIN
-import customTabBar from '@/components/app-tab-bar.vue'
-// #endif
 // #ifdef MP-TOUTIAO
 import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
 // #endif
@@ -318,9 +311,6 @@ async function fetchProductMeta(productId) {
 }
 
 onShow(() => {
-  // 检查手机号绑定状态（快速检查本地缓存）
-  if (!checkPhoneBoundSync()) return
-
   // Check for external tab switch request
   try {
     const targetTab = uni.getStorageSync('cabinet_target_tab')
@@ -334,7 +324,9 @@ onShow(() => {
   if (!token) {
     uni.showModal({
       title: '提示',
-      content: '请先登录',
+      content: '请先登录后查看盒柜内容',
+      showCancel: true,
+      cancelText: '稍后再说',
       confirmText: '去登录',
       success: (res) => {
         if (res.confirm) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6501eb8..f8afb6f 100755
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,10 +6,7 @@
     <!-- 品牌级背景装饰系统 - 统一漂浮光球 -->
     <view class="bg-decoration"></view>
 
-    <!-- 自定义 tabBar -->
-    <!-- #ifdef MP-WEIXIN -->
-    <customTabBar />
-    <!-- #endif -->
+    <!-- 自定义 tabBar (仅抖音小程序) -->
     <!-- #ifdef MP-TOUTIAO -->
     <customTabBarToutiao />
     <!-- #endif -->
@@ -144,10 +141,6 @@
 <script>
 import { authRequest, request } from '../../utils/request.js'
 import SplashScreen from '@/components/SplashScreen.vue'
-import { checkPhoneBound, checkPhoneBoundSync } from '../../utils/checkPhone.js'
-// #ifdef MP-WEIXIN
-import customTabBar from '@/components/app-tab-bar.vue'
-// #endif
 // #ifdef MP-TOUTIAO
 import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
 // #endif
@@ -155,9 +148,6 @@ import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
 export default {
   components: {
     SplashScreen
-    // #ifdef MP-WEIXIN
-    , customTabBar
-    // #endif
     // #ifdef MP-TOUTIAO
     , customTabBarToutiao
     // #endif
@@ -214,9 +204,6 @@ export default {
     return
     // #endif
 
-    // 检查手机号绑定状态(快速检查本地缓存)
-    if (!checkPhoneBoundSync()) return
-
     // 延迟 200ms 首次加载，让 Token/Session 有机会就绪
     // 同时避免页面动画卡顿
     setTimeout(() => {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index b6c0ae9..b72e710 100755
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,5 +1,10 @@
 <template>
   <view class="page-login">
+    <!-- 隐私协议弹窗 (仅微信小程序) -->
+    <!-- #ifdef MP-WEIXIN -->
+    <PrivacyPopup ref="privacyPopup" @agree="onPrivacyAgree" @disagree="onPrivacyDisagree" />
+    <!-- #endif -->
+    
     <!-- 背景装饰 -->
     <view class="bg-decoration"></view>
     
@@ -66,6 +71,10 @@
             >
               {{ loading ? '获取中...' : '一键获取手机号' }}
             </button>
+            
+            <button class="btn-cancel" @tap="handleCancelLogin">
+              取消登录
+            </button>
           </view>
           <!-- #endif -->
 
@@ -89,6 +98,10 @@
             >
               {{ loading ? '登录中...' : '抖音用户授权登录' }}
             </button>
+            
+            <button class="btn-cancel" @tap="handleCancelLogin">
+              取消登录
+            </button>
           </view>
           <!-- #endif -->
 
@@ -144,6 +157,10 @@
               {{ loading ? '登录中...' : '登录 / 注册' }}
             </button>
             
+            <button class="btn-cancel" @tap="handleCancelLogin">
+              取消登录
+            </button>
+            
             <text class="hint-text">未注册的手机号将自动创建账号</text>
           </view>
         </view>
@@ -179,10 +196,38 @@ import { request } from '../../utils/request'
 import { wechatLogin, douyinLogin, bindPhone, bindDouyinPhone, getUserStats, getPointsBalance, sendSmsCode, smsLogin, getUserInfo } from '../../api/appUser'
 import { authRequest } from '../../utils/request'
 import { vibrateShort } from '@/utils/vibrate.js'
+// #ifdef MP-WEIXIN
+import PrivacyPopup from '@/components/PrivacyPopup.vue'
+// #endif
 
 const loading = ref(false)
 const agreementChecked = ref(false)
 
+// #ifdef MP-WEIXIN
+const privacyPopup = ref(null)
+
+function onPrivacyAgree() {
+  console.log('[隐私协议] 用户已同意隐私协议')
+}
+
+function onPrivacyDisagree() {
+  console.log('[隐私协议] 用户拒绝隐私协议')
+  uni.showToast({
+    title: '您拒绝了隐私协议，部分功能可能无法正常使用',
+    icon: 'none'
+  })
+}
+// #endif
+
+function handleCancelLogin() {
+  const pages = getCurrentPages()
+  if (pages.length > 1) {
+    uni.navigateBack()
+  } else {
+    uni.switchTab({ url: '/pages/index/index' })
+  }
+}
+
 // 登录模式：根据平台设置默认值
 // #ifdef MP-WEIXIN
 const loginMode = ref('wechat')
@@ -1017,6 +1062,20 @@ function fetchExtraData(userId) {
   }
 }
 
+/* 取消登录按钮 */
+.btn-cancel {
+  width: 100%;
+  height: 88rpx;
+  font-size: 28rpx;
+  color: $text-sub;
+  background: transparent;
+  border: 2rpx solid $border-color;
+  border-radius: $radius-round;
+  margin-top: 24rpx;
+  
+  &::after { border: none; }
+}
+
 .hint-text {
   display: block;
   text-align: center;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 0804f47..ccfa195 100755
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -3,10 +3,7 @@
     <!-- 顶部背景装饰 -->
     <view class="bg-decoration"></view>
 
-    <!-- 自定义 tabBar -->
-    <!-- #ifdef MP-WEIXIN -->
-    <customTabBar />
-    <!-- #endif -->
+    <!-- 自定义 tabBar (仅抖音小程序) -->
     <!-- #ifdef MP-TOUTIAO -->
     <customTabBarToutiao />
     <!-- #endif -->
@@ -499,19 +496,12 @@ import {
   getUserInfo, getUserStats, getPointsBalance, getUserPoints, getUserCoupons, getItemCards,
   getUserTasks, getTaskProgress, getInviteRecords, modifyUser, getUserProfile, bindDouyinID, getPublicConfig
 } from '../../api/appUser.js'
-import { checkPhoneBoundSync } from '../../utils/checkPhone.js'
-// #ifdef MP-WEIXIN
-import customTabBar from '@/components/app-tab-bar.vue'
-// #endif
 // #ifdef MP-TOUTIAO
 import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
 // #endif
 
 export default {
   components: {
-    // #ifdef MP-WEIXIN
-    customTabBar,
-    // #endif
     // #ifdef MP-TOUTIAO
     customTabBarToutiao,
     // #endif
@@ -595,9 +585,6 @@ export default {
     }).catch(console.error)
   },
   onShow() {
-    // 检查手机号绑定状态（快速检查本地缓存）
-    if (!checkPhoneBoundSync()) return
-
     this.loadUserInfo()
   },
   onShareAppMessage() {
@@ -617,16 +604,18 @@ export default {
     }
   },
   methods: {
-    // 检查是否已绑定手机号
     checkPhoneBound() {
       if (!this.mobile) {
         uni.showModal({
           title: '需要绑定手机号',
           content: '为了账号安全，请先绑定手机号',
-          showCancel: false,
+          showCancel: true,
+          cancelText: '取消',
           confirmText: '去绑定',
-          success: () => {
-            uni.navigateTo({ url: '/pages/login/index?mode=sms' })
+          success: (res) => {
+            if (res.confirm) {
+              uni.navigateTo({ url: '/pages/login/index?mode=sms' })
+            }
           }
         })
         return false
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 565f261..cb75748 100755
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -2,10 +2,7 @@
   <view class="page">
     <view class="bg-decoration"></view>
 
-    <!-- 自定义 tabBar -->
-    <!-- #ifdef MP-WEIXIN -->
-    <customTabBar />
-    <!-- #endif -->
+    <!-- 自定义 tabBar (仅抖音小程序) -->
     <!-- #ifdef MP-TOUTIAO -->
     <customTabBarToutiao />
     <!-- #endif -->
@@ -167,11 +164,7 @@
 import { onShow, onReachBottom } from '@dcloudio/uni-app'
 import { ref, watch, onUnmounted } from 'vue'
 import { getStoreItems, redeemProductByPoints, redeemCouponByPoints, redeemItemCardByPoints, getProductCategories } from '../../api/appUser'
-import { checkPhoneBound, checkPhoneBoundSync } from '../../utils/checkPhone.js'
 import { vibrateShort } from '@/utils/vibrate.js'
-// #ifdef MP-WEIXIN
-import customTabBar from '@/components/app-tab-bar.vue'
-// #endif
 // #ifdef MP-TOUTIAO
 import customTabBarToutiao from '@/components/app-tab-bar-toutiao.vue'
 // #endif
@@ -545,9 +538,6 @@ function onCategorySelect(id) {
 }
 
 onShow(() => {
-  // 检查手机号绑定状态（快速检查本地缓存）
-  if (!checkPhoneBoundSync()) return
-
   const token = uni.getStorageSync('token')
   if (token) {
     // 只在首次加载时初始化数据，避免从详情页返回时重复加载
@@ -559,6 +549,16 @@ onShow(() => {
       fetchCategories()
       hasInitialized = true
     }
+  } else {
+    // 未登录时也可以浏览商城
+    if (!hasInitialized) {
+      page.value = 1
+      hasMore.value = true
+      allItems.value = []
+      loadItems()
+      fetchCategories()
+      hasInitialized = true
+    }
   }
 })