Merge remote-tracking branch 'origin/master'

pages/tab/my.vue

@@ -18,6 +18,12 @@
 			<view class="noLogin-text"> 登录后才能查看我的哦 </view>
 <!--			<view class="noLogin-button" @click="login"> 点此登录 </view>-->
       <button class="noLogin-button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber($event)">点此登录</button>
+      <view class="div-popo">
+        <view class="tips-content">
+          请您仔细阅读并充分理解相关条款
+          <view class="agreement-btn" @click="gotoPage('0')">《用户协议》</view>、<view class="agreement-btn" @click="gotoPage('1')">《隐私政策》</view>
+        </view>
+      </view>
 		</view>
 
 
@@ -1147,4 +1153,38 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
       }
     }
   }
+
+  .div-popo {
+    position: absolute;
+    top: 80%;
+    left: 0;
+    width: 100%;
+    height: 100%;
+
+    .tips-content {
+      width: 448rpx;
+      margin: auto;
+      text-align: center;
+      margin-top: 50rpx;
+      line-height: 56rpx;
+      color: #666;
+      font-size: 28rpx;
+      font-family: 'PingFang SC-Regular, PingFang SC';
+
+      .agreement-btn {
+        display: inline-block;
+        color: #5b83e8;
+        font-family: 'PingFang SC-Bold, PingFang SC';
+        text-decoration: underline;
+      }
+    }
+
+    .btn-c {
+      display: flex;
+      margin: auto;
+      margin-top: 64rpx;
+      justify-content: space-between;
+      width: 428rpx;
+    }
+  }
 </style>

pagesme/message/info.vue

@@ -183,9 +183,7 @@ export default {
             this.isAgainConfirm = true;
             this.$refs.elmAgain.showDialog();
           } else {
-            this.tipMsg = "已拒绝对方请求";
-            this.isConfirm = true;
-            this.$refs.elm.showDialog();
+            this.wantWxC()
           }
         }
       }