From b4e2761b1fa78813322431af347fa3add1bb2b0a Mon Sep 17 00:00:00 2001
From: yeliang-king <2244255345@qq.com>
Date: Sun, 24 Apr 2022 22:41:00 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E5=BC=B9=E6=A1=86=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                            | 13 +++-
 androidPrivacy.json                | 17 ++++++
 manifest.json                      |  2 +-
 pages.json                         | 13 +++-
 pages/tabbar/screen/fullScreen.vue | 95 ++++++++++++++++++++++++++++++
 utils/storage.js                   | 11 +++-
 6 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 androidPrivacy.json
 create mode 100644 pages/tabbar/screen/fullScreen.vue

diff --git a/App.vue b/App.vue
index f514d50..c7e2217 100644
--- a/App.vue
+++ b/App.vue
@@ -64,9 +64,18 @@ export default {
     // #endif
   },
 
-  onShow() {
+   onShow() {
     // #ifndef H5
-    this.getClipboard();
+    // this.getClipboard();
+    // #endif
+    // #ifdef APP-PLUS
+    console.log(storage.getShow());
+    if (storage.getShow()) {
+      if(uni.getSystemInfoSync().platform == 'ios'){
+      this.$u.route("/pages/tabbar/screen/fullScreen");
+      // uni.reLaunch({ url: "/pages/tabbar/screen/fullScreen" });
+      }
+    }
     // #endif
   },
   methods: {
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..5a57f2b
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,17 @@
+{
+    "version" : "1",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920\">《服务协议》</a>和<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920\">《服务协议》</a>和<a href=\"https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "styles" : {
+        "borderRadius" : "5px"
+    }
+}
diff --git a/manifest.json b/manifest.json
index 8bc9ebd..919295f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "lili商城",
-    "appid" : "__UNI__C100675",
+    "appid" : "__UNI__83F0C3D",
     "description" : "",
     "versionName" : "4.2.4.1",
     "versionCode" : 4000241,
diff --git a/pages.json b/pages.json
index 9b10a21..4d1a33f 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,18 @@
 				"enablePullDownRefresh":true  
 			}
 		}, 
-		
+		{
+			"path":"pages/tabbar/screen/fullScreen",
+			"style": {
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"app-plus":{
+					"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
+					"background": "transparent", // 背景透明
+					"backgroundColor": "rgba(0,0,0,0)", // 背景透明
+					"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+				}
+			}
+		},
 		{
 			"path": "pages/tabbar/cart/cartList",
 			"style": {
diff --git a/pages/tabbar/screen/fullScreen.vue b/pages/tabbar/screen/fullScreen.vue
new file mode 100644
index 0000000..f089fa2
--- /dev/null
+++ b/pages/tabbar/screen/fullScreen.vue
@@ -0,0 +1,95 @@
+<template>
+   <u-modal v-model="show" cancelText="不同意" confirmText="同意" showCancelButton="btnShow" title="服务协议和隐私政策" @confirm="confirm" @cancel="cancel">
+    <view class="u-update-content">
+      请您务必审慎阅读,充分理解“服务协议”和“隐私政策”各条款，
+      包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识,
+      操作日志等信息用于分析，优化应用性能。 您可阅读你可阅读
+      <a @click="gotoLink">《服务协议》</a>
+      和
+      <a @click="gotoB"> 《隐私政策》</a>了解详细信息。
+      如果您同意，请点击下面按钮开始接受我们的服务。
+    </view>
+  </u-modal>
+</template>
+
+<script>
+import storage from "@/utils/storage";
+export default {
+  created() {
+    //先进入 created
+    // if (storage.getShow()) {
+    //   //展示的话进入  true
+    //   console.log(this.show); //如果上面没读缓存  此时 this.show 为true
+    //   if (!this.show) {
+    //     //如果等于 false 了 就跳到主页
+    //     this.show = storage.getShow(); //这里就为false
+    //     setTimeout(() => {
+    //       //然后这里就跳转到  首页
+    //       uni.reLaunch({
+    //         //跳转到 首页
+    //         url: "/pages/tabbar/home/index",
+    //       });
+    //     }, 500);
+    //   }
+    // }
+  },
+  data() {
+    return {
+      show: true, //展示
+      btnShow:true,
+      a: "",
+    };
+  },
+  //   onReady() {
+  //     this.show = true;
+  //   },
+  methods: {
+    gotoLink() {
+      uni.navigateTo({
+        //点击跳转到浏览器
+        url:
+          "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920",
+      });
+    },
+    gotoB() {
+      uni.navigateTo({
+        url:
+          "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000",
+      });
+    },
+     //取消
+    cancel(){
+      // #ifdef APP-PLUS
+		 	 const threadClass = plus.ios.importClass("NSThread");
+		 	 const mainThread = plus.ios.invoke(threadClass, "mainThread");
+		 	 plus.ios.invoke(mainThread, "exit")
+		 // #endif
+    },
+    confirm() {
+      //点击
+      this.show = false; // 让这个框为false
+      storage.setShow(this.show); //存入缓存
+      if (!this.show) {
+        // 他如果 不展示  就跳转到主页
+        setTimeout(() => {
+          uni.reLaunch({
+            //跳转到 首页
+            url: "/pages/tabbar/home/index",
+          });
+        }, 500);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.u-update-content {
+  font-size: 26rpx;
+  padding: 30rpx;
+}
+a {
+  text-decoration: blue;
+  color: blue;
+}
+</style>
diff --git a/utils/storage.js b/utils/storage.js
index 9fefeb3..f7befdd 100644
--- a/utils/storage.js
+++ b/utils/storage.js
@@ -18,7 +18,16 @@ export default {
   getHotWords() {
     return uni.getStorageSync(`hotWords`);
   },
-
+  //写入 展示还是不展示
+  setShow(val) {
+    uni.setStorageSync("show", val);
+  },
+  getShow() {
+    if (uni.getStorageSync(`show`) === "" || uni.getStorageSync(`show`) === undefined) {
+      return true;
+    }
+    return uni.getStorageSync(`show`);
+  },
   // 获取face id登录
   getFaceLogin() {
     return uni.getStorageSync(FACE_LOGIN);