From b65799a706a6282e36663acc2cca42bba78d5051 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Thu, 7 Sep 2023 18:39:36 +0800
Subject: [PATCH] update

---
 App.vue                      |  10 +-
 components/tabbar/tabbar.vue |   5 +
 manifest.json                |   1 +
 pages/index/index.vue        |  13 +-
 pages/register/register.vue  | 226 +++++++++++++++++++++++++++++------
 store/store.js               |   1 +
 6 files changed, 216 insertions(+), 40 deletions(-)

diff --git a/App.vue b/App.vue
index c7d12cb..e55f7fb 100644
--- a/App.vue
+++ b/App.vue
@@ -62,8 +62,16 @@
 				});
 
 			});
-			this.$util.addUserBehavior( {intoRoute: '/'+options.path, outtoRoute: ''}) // 记录用户行为
 
+
+
+
+
+
+
+
+
+			this.$util.addUserBehavior( {intoRoute: '/'+options.path, outtoRoute: ''}) // 记录用户行为
 		},
 		onShow: function() {
 
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 8c8fc1c..838b2f9 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -38,6 +38,8 @@
 </template>
 
 <script>
+import {mapGetters} from "vuex";
+
 export default {
   data(){
     return{
@@ -45,6 +47,9 @@ export default {
       selectIndex:'/pages/index/index'
     }
   },
+  computed:{
+    ...mapGetters({'user':'getUser'})
+  },
   props:{
     page:{
       type:String,
diff --git a/manifest.json b/manifest.json
index 613af99..3b4fc4e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -73,6 +73,7 @@
             }
         },
         "usingComponents" : true,
+        "__usePrivacyCheck__": true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "获取位置信息用于展示"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fc630b2..9507d87 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -712,6 +712,9 @@
           </div>
         </div>
     </uni-popup>
+
+
+
 <!--    底部导航栏-->
     <Tabbar ref="tabbar" :page="page"></Tabbar>
   </view>
@@ -895,6 +898,7 @@ export default {
   },
   computed: {
     ...mapState({
+      ...mapGetters({'user':'getUser'}),
       'PushAuthority': (state) => state.userData.PushAuthority,
       'ProvinceCode': (state) => state.userData.ProvinceCode,
       toDoMsg:(state)=>{return state.toDoMsg},
@@ -997,6 +1001,7 @@ export default {
          }
        },10000)
      }
+
    },
   onShow(){
     // 隐藏掉小程序本身自带的 tabbar 让自定义的tabbar出现
@@ -1018,6 +1023,7 @@ export default {
   },
   methods:{
     ...mapActions(['memberLogin','getLoginCode']),
+
     handleShowTrafficDetail(){
       this.showMonthDetail = !this.showMonthDetail
     },
@@ -1959,7 +1965,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
       top: 0;left:0;
       box-sizing: border-box;
       padding: 0 15px;
-      z-index:9999999;
+      z-index:999997;
       .selectTime {
         position: absolute;
         display: flex;
@@ -4275,9 +4281,6 @@ $iphoneHeight: env(safe-area-inset-bottom);
     }
   }
 
-
-
-
   .notice{
     position: fixed;
     bottom: 120px;
@@ -4372,6 +4375,8 @@ $iphoneHeight: env(safe-area-inset-bottom);
       }
     }
   }
+
+
 }
 
 </style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 1437623..5fb1565 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -2,20 +2,37 @@
   <view class="content">
     <view>
       <image src="https://eshangtech.com/ShopICO/yxcl-register-pht.png" mode="aspectFit"></image>
-      <view class="desc" v-if="!user.WeChat_UserId ">
-        <!-- <view class="desc">申请获取你的公开信息(昵称、头像)</view> -->
-        <button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>
+      <view v-if="showBtn">
+        <view class="desc" v-if="!user.WeChat_UserId">
+          <!-- <view class="desc">申请获取你的公开信息(昵称、头像)</view> -->
+          <button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>
+        </view>
+        <view class="desc" v-else>
+          <button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
+        </view>
       </view>
-      <view class="desc" v-else>
 
-        <button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
-      </view>
 
 
     </view>
     <view class="login-tip-text">
       该小程序仅供企业内部人员登录使用，<br/>您的手机号是核实身份的唯一凭证。
     </view>
+
+    <view class="privacyMeng" v-if="showPrivacy"></view>
+    <view class="privacy" v-if="showPrivacy">
+      <view class="privacyContent">
+        <p class="contentTitle">用户隐私保护提示</p>
+        <view class="contentWord">
+          感谢您使用本产品，您使用本产品前应当仔细阅读并同意<text class="tips" @click="handleOpenPrivacyContract">《小程序隐私保护指引》</text>
+          当您点击同意并开始使用产品服务时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束。如您拒绝，将无法更好的体验产品。
+        </view>
+      </view>
+      <view class="btnList">
+        <button class="btns noAgree" @click="handleRefuse">拒绝</button>
+        <button class="btns agree" id="agree-btn3" open-type="agreePrivacyAuthorization"  @agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -25,7 +42,8 @@ export default {
   data() {
     return {
       shouldNavback: false,
-
+      showPrivacy:false,// 隐私弹框的东西
+      showBtn:false,// 隐私权限有了之后 就会出来这俩按钮
     }
   },
   computed:{
@@ -34,6 +52,22 @@ export default {
     })
   },
   onLoad(option) {
+    let _this = this
+    wx.getPrivacySetting({
+      success: res=>{
+        console.log('res123123',res)
+        if (res.needAuthorization){
+          _this.showPrivacy = true
+        }else{
+          _this.showBtn = true
+          // if (this.user.WeChat_MiniProToken) {
+          //   this.memberLogin()
+          // } else {
+          //   this.getLoginCode()
+          // }
+        }
+      }
+    })
     if(option.source=='detail'){
       this.shouldNavback = true
     }
@@ -41,6 +75,68 @@ export default {
   methods: {
     ...mapActions(['updateUser']),
     ...mapMutations(['setUser']),
+    // 打开隐私协议页面
+    handleOpenPrivacyContract(){
+      wx.openPrivacyContract({
+        success: (success) => {
+          console.log('success',success)
+        }, // 打开成功
+        fail: () => {}, // 打开失败
+        complete: () => {}
+      })
+    },
+    // 点击了同意
+    handleAgreePrivacyAuthorization(e){
+      console.log('e1',e)
+      this.showPrivacy = false
+      this.showBtn = true
+    },
+    // 点击了拒绝
+    handleRefuse(){
+      this.showPrivacy = false
+    },
+    // // 拿到用户信息
+    // handleGetUserInfo(e){
+    //   console.log('e2',e)
+    //   let _this = this
+    //   let user = _this.user
+    //   if (e.mp.detail) {
+    //     uni.showLoading({
+    //       title:'正在加载...',
+    //       mask:true
+    //     })
+    //     const res = e.mp.detail
+    //     console.log('res',res)
+    //     let arr = {
+    //       encryptedData: encodeURIComponent(res.encryptedData),
+    //       iv: encodeURIComponent(res.iv),
+    //     }
+    //     // _this.$request.$webPost('WebAPI_Push/WeChat/BusinessLicensed',arr).then(function (rs) {
+    //     _this.$request.$get('WeChat_BusinessLicensed',arr).then(function (rs) {
+    //       console.log('rs',rs)
+    //       uni.hideLoading()
+    //       if(rs.Result_Code==100){
+    //         let newUser = rs.Result_Data
+    //         newUser.WeChat_MiniProToken = _this.user.WeChat_MiniProToken
+    //         _this.setUser(newUser)
+    //         if(newUser.Membership_Phone) {
+    //           _this.updateUser(newUser)
+    //           _this.$util.toNextRoute('switchTab', '/pages/index/index')
+    //           // uni.reLaunch({url: '/pages/index/index'})
+    //         }else{
+    //
+    //         }
+    //         _this.$forceUpdate()
+    //       }else{
+    //         uni.showToast({
+    //           title: rs.ResultDesc,
+    //           icon: 'none',
+    //           duration:2000
+    //         })
+    //       }
+    //     })
+    //   }
+    // },
     getPhoneNumber (e) {
       console.log(e)
       uni.showLoading({
@@ -56,6 +152,7 @@ export default {
       }
       // _this.$request.$webPost('WebAPI_Push/WeChat/BusinessPhone',arr).then(function (rs) {
       _this.$request.$get('WeChat_BusinessPhone',arr).then(function (rs) {
+        console.log('rs',rs)
         uni.hideLoading()
         if (rs.Result_Code === 100) {
           _this.setUser(rs.Result_Data)
@@ -72,6 +169,7 @@ export default {
       this.updateUser(data)
     },
     bindGetUserInfo (e) { // 申请权限
+      console.log('e',e)
       let _this = this
       let user = _this.user
       if (e.mp.detail) {
@@ -79,34 +177,31 @@ export default {
           title:'正在加载...',
           mask:true
         })
-        uni.getUserInfo({
-          success (res) {
-            let arr = {
-              encryptedData: encodeURIComponent(res.encryptedData),
-              iv: encodeURIComponent(res.iv),
-            }
-            // _this.$request.$webPost('WebAPI_Push/WeChat/BusinessLicensed',arr).then(function (rs) {
-            _this.$request.$get('WeChat_BusinessLicensed',arr).then(function (rs) {
-              uni.hideLoading()
-              if(rs.Result_Code==100){
-                let newUser = rs.Result_Data
-                newUser.WeChat_MiniProToken = _this.user.WeChat_MiniProToken
-                _this.setUser(newUser)
-                if(newUser.Membership_Phone) {
-                  _this.updateUser(newUser)
-                  _this.$util.toNextRoute('switchTab', '/pages/index/index')
-                  // uni.reLaunch({url: '/pages/index/index'})
-                }else{
+        const res = e.mp.detail
+        let arr = {
+          encryptedData: encodeURIComponent(res.encryptedData),
+          iv: encodeURIComponent(res.iv),
+        }
+        // _this.$request.$webPost('WebAPI_Push/WeChat/BusinessLicensed',arr).then(function (rs) {
+        _this.$request.$get('WeChat_BusinessLicensed',arr).then(function (rs) {
+          uni.hideLoading()
+          if(rs.Result_Code==100){
+            let newUser = rs.Result_Data
+            newUser.WeChat_MiniProToken = _this.user.WeChat_MiniProToken
+            _this.setUser(newUser)
+            if(newUser.Membership_Phone) {
+              _this.updateUser(newUser)
+              _this.$util.toNextRoute('switchTab', '/pages/index/index')
+              // uni.reLaunch({url: '/pages/index/index'})
+            }else{
 
-                }
-                _this.$forceUpdate()
-              }else{
-                uni.showToast({
-                  title: rs.ResultDesc,
-                  icon: 'none',
-                  duration:2000
-                })
-              }
+            }
+            _this.$forceUpdate()
+          }else{
+            uni.showToast({
+              title: rs.ResultDesc,
+              icon: 'none',
+              duration:2000
             })
           }
         })
@@ -119,7 +214,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .content {
   display: flex;
   flex-direction: column;
@@ -150,4 +245,65 @@ image {
   color: #888;
 
 }
+.privacyMeng{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0,0,0,0.3);
+  z-index: 999998;
+}
+.privacy{
+  position: fixed;
+  bottom: 0;
+  width: 100vw;
+  box-sizing: border-box;
+  padding: 40rpx 30rpx;
+  z-index: 999999;
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+  background: #fff;
+  .privacyContent{
+    .contentTitle{
+      font-size: 48rpx;
+      font-family: Source Han Sans CN-Bold, Source Han Sans CN;
+      font-weight: bold;
+      color: #000000;
+      line-height: 56rpx;
+    }
+    .contentWord{
+      margin-top: 32rpx;
+      text-indent: 2em;
+      .tips {
+        font-size: 28rpx;
+        font-family: Source Han Sans CN-Normal, Source Han Sans CN;
+        font-weight: 400;
+        color: #8BC21F;
+        line-height: 33rpx;
+      }
+    }
+  }
+  .btnList{
+    display: flex;
+    justify-content: space-evenly;
+    align-items: center;
+    margin-top: 48rpx;
+    .btns{
+      display: inline-block;
+      padding: 0 90rpx;
+      border-radius: 15rpx;
+    }
+    .noAgree{
+      background: rgb(242,242,242);
+      color: rgb(26,187,107);
+      font-weight: 600;
+    }
+    .agree{
+      background: rgb(26,187,107);
+      color: #fff;
+      font-weight: 600;
+    }
+  }
+}
 </style>
diff --git a/store/store.js b/store/store.js
index 7f44483..0397809 100644
--- a/store/store.js
+++ b/store/store.js
@@ -121,6 +121,7 @@ const actions = {
 		if(!_id) return
 		// console.log(_user)
 		await request.$get('WeChat_GetBusinessMemberInfo',{Membership_Id:_id}).then(res=>{
+			console.log('res222',res)
 		// request.$webGet('WebAPI_Push/Member/GetMemberInfo',{Membership_Id:_id,memberShipId:_id}).then(res=>{
 			if(res.Result_Code==100) {
 				let data = res.Result_Data