隐私保护设置更新

app.json

@@ -164,5 +164,6 @@
     "getLocation"
   ],
   "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "sitemapLocation": "sitemap.json",
+  "__usePrivacyCheck__": true
 }

components/local/privacyPopup/privacyPopup.js

@@ -0,0 +1,105 @@
+let privacyHandler
+let privacyResolves = new Set()
+let closeOtherPagePopUpHooks = new Set()
+
+if (wx.onNeedPrivacyAuthorization) {
+  wx.onNeedPrivacyAuthorization(resolve => {
+    if (typeof privacyHandler === 'function') {
+      privacyHandler(resolve)
+    }
+  })
+}
+
+const closeOtherPagePopUp = (closePopUp) => {
+  closeOtherPagePopUpHooks.forEach(hook => {
+    if (closePopUp !== hook) {
+      hook()
+    }
+  })
+}
+
+Component({
+  data: {
+    title: "用户隐私保护提示",
+    desc1: "感谢您使用本小程序，您使用本小程序前应当阅井同意",
+    urlTitle: "《用户隐私保护指引》",
+    desc2: "当您点击同意并开始时用产品服务时，即表示你已理解并同息该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法继续访问小程序。",
+    innerShow: false,
+    height: 0,
+  },
+  lifetimes: {
+    attached: function() {
+      const closePopUp = () => {
+        this.disPopUp()
+      }
+      privacyHandler = resolve => {
+        privacyResolves.add(resolve)
+        this.popUp()
+        // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+        closeOtherPagePopUp(closePopUp)
+      }
+      
+      this.closePopUp = closePopUp
+      closeOtherPagePopUpHooks.add(this.closePopUp)
+    },
+    detached: function() {
+      closeOtherPagePopUpHooks.delete(this.closePopUp)
+    }
+  },
+  methods: {
+    handleAgree(e) {
+      this.disPopUp()
+      // 这里演示了同时调用多个wx隐私接口时要如何处理：让隐私弹窗保持单例，点击一次同意按钮即可让所有pending中的wx隐私接口继续执行 （看page/index/index中的 wx.getClipboardData 和 wx.startCompass）
+      privacyResolves.forEach(resolve => {
+        resolve({
+          event: 'agree',
+          buttonId: 'agree-btn'
+        })
+      })
+      privacyResolves.clear()
+    },
+    handleDisagree(e) {
+      this.disPopUp()
+      privacyResolves.forEach(resolve => {
+        resolve({
+          event: 'disagree',
+        })
+      })
+      privacyResolves.clear()
+    },
+    popUp() {
+      if (this.data.innerShow === false) {
+        this.setData({
+          innerShow: true
+        })
+      }
+    },
+    disPopUp() {
+      if (this.data.innerShow === true) {
+        this.setData({
+          innerShow: false
+        })
+      }
+    },
+    openPrivacyContract() {
+      wx.openPrivacyContract({
+        success: res => {
+          console.log('openPrivacyContract success')
+        },
+        fail: res => {
+          console.error('openPrivacyContract fail', res)
+        }
+      })
+    },
+    tabBarPageShow() {
+      if (this.closePopUp) {
+        privacyHandler = resolve => {
+          privacyResolves.add(resolve)
+          this.popUp()
+          // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+          closeOtherPagePopUp(this.closePopUp)
+        }
+      }
+    }
+  }
+})

components/local/privacyPopup/privacyPopup.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

components/local/privacyPopup/privacyPopup.wxml

@@ -0,0 +1,25 @@
+<view wx:if="{{innerShow}}" class="weui-half-screen-dialog" style="border-color:rgb(64, 247, 94); border-style:solid; border-width:3px; position: fixed;  bottom:{{height}}px" >
+    <view class="weui-half-screen-dialog__hd">
+          <text class="weui-half-screen-dialog__title">{{title}}</text>
+    </view>
+    <view class="weui-half-screen-dialog__bd">
+        <view class="weui-half-screen-dialog__tips">{{desc1}}</view>
+        <view class="weui-half-screen-dialog__tips" style="color:blue" bindtap="openPrivacyContract">{{urlTitle}}</view>
+        <view class="weui-half-screen-dialog__tips">{{desc2}}</view>
+    </view>
+    <view class="weui-half-screen-dialog__ft">
+      <view class="weui-half-screen-dialog__btn-area">
+        <button id="disagree-btn"
+          type="default"
+          class="weui-btn"
+          bindtap="handleDisagree"
+        >不同意</button>
+        <button id="agree-btn"
+          type="default"
+          open-type="agreePrivacyAuthorization"
+          class="weui-btn"
+          bindagreeprivacyauthorization="handleAgree"
+        >同意并继续</button>
+      </view>
+    </view>
+  </view>

pages/home/home.json

@@ -7,6 +7,7 @@
     "home-skeleton": "../../components/local/home-skeleton/home-skeleton",
     "navigation": "../../components/local/navigation/navigation",
     "van-empty": "@vant/weapp/empty/index",
-    "van-popup": "@vant/weapp/popup/index"
+    "van-popup": "@vant/weapp/popup/index",
+    "privacy-popup": "../../components/local/privacyPopup/privacyPopup"
   }
 }

pages/home/home.wxml

@@ -16,7 +16,6 @@
     </swiper-item>
   </swiper>
 </view>
-
   <!-- 自定义导航 -->
   <!-- TODO 遇到 bindtap触发不了的问题，应该是层级问题，暂时整体可点击 -->
   <navigation bindtap="goToStore">
@@ -318,4 +317,5 @@
 <!-- 悬浮领券图标 -->
 <!-- <view class="suspend" bindtap="getCoupon" wx:if="{{false}}">
   <image src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/wxapp/20220822/%E7%BB%84%205%402x.png"></image>
-</view> -->
+</view> -->
+<privacy-popup></privacy-popup>

pages/login/login.js

@@ -89,6 +89,7 @@ Page({
     wx.getUserProfile({
       desc: 'desc',
       success: (res) => {
+        console.log(res);
         that.setData(
           {
             userInfo: JSON.parse(res.rawData)
@@ -105,6 +106,9 @@ Page({
           }
         )
         console.log(JSON.parse(res.rawData))
+      },
+      fail:(res)=>{
+          console.log(res,111111);
       }
     })
   },

pages/login/login.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "登录",
   "navigationBarBackgroundColor": "#fff",
-  "usingComponents": {}
+  "usingComponents": {
+    "privacy-popup": "../../components/local/privacyPopup/privacyPopup"
+  }
 }

pages/login/login.wxml

@@ -1,4 +1,5 @@
 <view class="content flex-column">
+  <privacy-popup></privacy-popup>
   <view class="box flex-column flex-center">
     <image class="logo" src="/images/logo.png"></image>
     <text class="tips">登录了解更多变美项目</text>

project.config.json

@@ -102,7 +102,5 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx53445e50df00f712",
-  "projectname": "we_spa",
-  "libVersion": "2.21.0"
+  "appid": "wx53445e50df00f712"
 }