From 944454077e48618f9810d32e4c257f3f16b8eba6 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 14 Jun 2023 23:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
androidPrivacy.json | 63 ++++++++++++++++++++----------------------
manifest.json | 10 +++++--
pages/login.vue | 18 ++++++++++++
user/pages/setting.vue | 36 ++++++++++++++++++++----
4 files changed, 86 insertions(+), 41 deletions(-)
diff --git a/androidPrivacy.json b/androidPrivacy.json
index 9dfb474..a6220d6 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,38 +1,35 @@
{
- "version": "1.0.8",
- "prompt": "template",
- "title": "服务协议和隐私政策",
- "message": " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
- "buttonAccept": "同意并接受",
- "buttonRefuse": "暂不同意",
- "hrefLoader": "system|default",
- "backToExit":"false",
- "second": {
- "title": "确认提示",
- "message": " 进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
- "buttonAccept": "同意并继续",
- "buttonRefuse": "退出应用"
- },
- "disagreeMode":{
- "support": false,
- "loadNativePlugins": false,
- "visitorEntry": true,
- "showAlways": false
- },
- "styles": {
- "backgroundColor": "#ffffff",
- "borderRadius":"5px",
- "title": {
- "color": "#333"
+ "version" : "2.0.0",
+ "prompt" : "template",
+ "title" : "服务协议和隐私政策",
+ "message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的位置信息、设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "buttonAccept" : "同意",
+ "buttonRefuse" : "拒绝",
+ "hrefLoader" : "system|default",
+ "backToExit" : "false",
+ "second" : {
+ "title" : "确认提示",
+ "message" : " 进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
+ "buttonAccept" : "同意并继续",
+ "buttonRefuse" : "退出应用"
},
- "buttonAccept": {
- "color": "#08BF77"
+ "disagreeMode" : {
+ "support" : false,
+ "loadNativePlugins" : false,
+ "visitorEntry" : false,
+ "showAlways" : false
},
- "buttonRefuse": {
- "color": "#333333"
+ "styles" : {
+ "backgroundColor" : "#ffffff",
+ "borderRadius" : "5px",
+ "title" : {
+ "color" : "#333"
+ },
+ "buttonAccept" : {
+ "color" : "#08BF77"
+ },
+ "buttonRefuse" : {
+ "color" : "#333333"
+ }
}
- // "buttonVisitor": {
- // "color": "#00ffff"
- // }
- }
}
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b2a1434..7eb2415 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,4 +1,4 @@
-{
+ {
"name" : "希希到家",
"appid" : "__UNI__3303922",
// "appid" : "__UNI__AE4A250",
@@ -210,7 +210,13 @@
}
},
"dSYMs" : false,
- "idfa" : false
+ "idfa" : false,
+ "privacyDescription" : {
+ "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为您编辑头像信息",
+ "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为您编辑头像信息",
+ "NSCameraUsageDescription" : "该应用需要你的相机，以便您拍摄上传头像信息",
+ "NSLocationWhenInUseUsageDescription" : ""
+ }
},
"splashscreen" : {
"useOriginalMsgbox" : true
diff --git a/pages/login.vue b/pages/login.vue
index b046cc5..777fe7e 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -45,6 +45,18 @@
+
+
+
+
+
+ 登录即表示您已详细阅读并同意
+ 《用户隐私协议》
+ 与
+ 《个人信息保护指引》
+
+
+
@@ -99,6 +111,8 @@
tips: '',
code:'',
phone:'',
+ checked:[],
+
}
},
@@ -200,6 +214,10 @@
},
async smsLogin(item){
+ if(this.checked.length==0){
+ uni.$u.toast('请阅读并同意《用户隐私协议》');
+ return false;
+ }
let userInfo;
if(!item){
userInfo = await this.$api.base.smsLogin({
diff --git a/user/pages/setting.vue b/user/pages/setting.vue
index 0da9674..5b0b991 100644
--- a/user/pages/setting.vue
+++ b/user/pages/setting.vue
@@ -54,10 +54,16 @@
-
- 退出登录
+
+
+
+ 注销账号
+
+
+ 退出登录
+
-
+
@@ -87,7 +93,8 @@
text: '个人信息保护指引',
url: 2
}],
- user_info: {}
+ user_info: {},
+ show:false,
}
},
computed: mapState({
@@ -101,6 +108,17 @@
methods: {
...mapActions(['getUserInfo']),
...mapMutations(['updateUserItem']),
+ zhuxiao(){
+ let that = this;
+ uni.showModal({
+ title: "注销账户",
+ confirmColor: "#FF4D4F",
+ content: `注销此账号后您的数据将不再保留,是否继续注销?`,
+ success: (res) => {
+ this.show = true
+ }
+ });
+ },
async initIndex() {
this.$util.setNavigationBarColor({
bg: this.primaryColor
@@ -197,8 +215,9 @@
margin-top:20rpx;
}
.logoutBtn{
- width:66%;
- margin: 0 auto;
+ // width:66%;
+ flex:1;
+ margin: 0 30rpx;
text-align: center;
background: rgba(8,191,119,0);
border: 1px solid #08BF77;
@@ -209,4 +228,9 @@
font-weight: 500;
color: #08BF77;
}
+ .logoutBtnTwo{
+ border: 1px solid gray;
+ color: gray;
+
+ }