From 9ad154f86b1f75e6cfcc10ed27974bb745f3abc8 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 6 Sep 2023 14:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AB=AF=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pages/index/index.js   | 22 ++++++++++++++++++++--
 Pages/index/index.wxml | 12 ++++++++++++
 Pages/login/index.js   | 27 +++++++++++++++++++++------
 Pages/login/index.wxml | 12 ++++++++++++
 4 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/Pages/index/index.js b/Pages/index/index.js
index fe00a7c..8524254 100644
--- a/Pages/index/index.js
+++ b/Pages/index/index.js
@@ -6,15 +6,33 @@ Page({
   data: {
     loading: true,
     showEntryTip:false,
+    showEntryTip_second:false,
     static_host: api.getStaticHost()
   },
   onConfirmEntry(){
     wx.setStorageSync('hasEntry', true);
   },
   onCloseEntry(){
-    wx.setStorageSync('hasEntry', true);
-    wx.exitMiniProgram({success: (res) => {}})
+    this.setData({
+      showEntryTip_second:true
+    }) 
   },
+  onConfirmEntry_second(){
+    this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+    wx.setStorageSync('hasEntry', true);
+    
+  },
+  onCloseEntry_second(){
+    
+     this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+     wx.exitMiniProgram({success: (res) => {}})
+   },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url);
diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml
index e3e0d46..3836330 100644
--- a/Pages/index/index.wxml
+++ b/Pages/index/index.wxml
@@ -45,4 +45,16 @@
 </view>
 
 </van-dialog>
+<van-dialog
+  title="温馨提示"
+  show="{{ showEntryTip_second }}"
+  message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
+  show-cancel-button
+  confirm-button-text="好的"
+  cancel-button-text="不同意"
+  confirm-button-color="#3CC7C0"
+  bind:confirm="onConfirmEntry_second"
+  bind:cancel="onCloseEntry_second"
+>
+</van-dialog>
 
diff --git a/Pages/login/index.js b/Pages/login/index.js
index 9008005..5a628a8 100644
--- a/Pages/login/index.js
+++ b/Pages/login/index.js
@@ -5,6 +5,7 @@ const app = getApp()
 Page({
   data: {
     showEntryTip:false,
+    showEntryTip_second:false,
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '登录', //导航栏 中间的标题
@@ -22,7 +23,7 @@ Page({
     let isEntry=wx.getStorageSync('hasEntry');
     if(!isEntry){
       this.setData({
-        showEntryTip:true
+        showEntryTip:true,
        });
      
      }
@@ -41,13 +42,27 @@ Page({
   _navback() {
     wx.navigateBack()
   },
-  onConfirmEntry(){
-    wx.setStorageSync('hasEntry', true);
-  },
   onCloseEntry(){
-    wx.setStorageSync('hasEntry', true);
-    wx.exitMiniProgram({success: (res) => {}})
+    this.setData({
+      showEntryTip_second:true
+    }) 
   },
+  onConfirmEntry_second(){
+    this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+    wx.setStorageSync('hasEntry', true);
+    
+  },
+  onCloseEntry_second(){
+    
+     this.setData({
+      showEntryTip_second:false,
+      showEntryTip:false,
+    });
+     wx.exitMiniProgram({success: (res) => {}})
+   },
   go(e){
     let url = e.currentTarget.dataset.url;
     app.go(url);
diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml
index e462411..7a90d19 100644
--- a/Pages/login/index.wxml
+++ b/Pages/login/index.wxml
@@ -56,4 +56,16 @@
 <view>如您同意《隐私协议》，请点击“同意”开始使用我们的产品和服务。</view>
 </view>
 
+</van-dialog>
+<van-dialog
+  title="温馨提示"
+  show="{{ showEntryTip_second }}"
+  message="很抱歉，如您不同意《隐私协议》，可能无法继续正常使用我们的服务，请您先同意哦~"
+  show-cancel-button
+  confirm-button-text="好的"
+  cancel-button-text="不同意"
+  confirm-button-color="#3CC7C0"
+  bind:confirm="onConfirmEntry_second"
+  bind:cancel="onCloseEntry_second"
+>
 </van-dialog>
\ No newline at end of file