From d47a2b77404b55cc764ef54f860b708130b95f6f Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Fri, 27 Nov 2020 14:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E9=9A=90?= =?UTF-8?q?=E7=A7=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 2 +- pages/login/agreements.vue | 33 ++++++++++++++++++++++++--------- pages/login/login.vue | 18 ++++++++---------- pages/user/feedback.vue | 14 +++++--------- pages/user/index.vue | 14 +++++++++++++- 5 files changed, 51 insertions(+), 30 deletions(-) diff --git a/pages.json b/pages.json index 0dc3023..9838d02 100644 --- a/pages.json +++ b/pages.json @@ -16,7 +16,7 @@ { "path": "pages/login/agreements", "style": { - "navigationBarTitleText": "", + "navigationBarTitleText": "用户协议与隐私政策", "app-plus": { "titleNView": { "backgroundColor": "#FFFFFF", diff --git a/pages/login/agreements.vue b/pages/login/agreements.vue index 5767029..6a1b44b 100644 --- a/pages/login/agreements.vue +++ b/pages/login/agreements.vue @@ -1,6 +1,18 @@ \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index 9cb31f0..89b04e8 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -52,14 +52,14 @@ - + @@ -93,13 +93,9 @@ export default { timer: null, is_sendcode: false, // 60s time_count: 60, - consentPact: false, + consentPact: true, pactList: [{ - "id": '3', - "text": "《隐私协议》" - },{ - "id": '4', - "text": "《使用协议》" + "text": "《用户协议与隐私政策》" }] }; }, @@ -159,8 +155,10 @@ export default { } }, }); + + // 不同意协议不让登录 + if(!this.consentPact) return false; - // if(!this.consentPact) return false; // 判断是否可以点击 // console.log(this.zhanghao); // if(this.clickstate==false){ @@ -276,7 +274,7 @@ export default { this.$u.route({ url: '/pages/login/agreements', params: { - title: "隐私协议" + title: "用户协议与隐私政策" } }); } diff --git a/pages/user/feedback.vue b/pages/user/feedback.vue index af2cadd..616c551 100644 --- a/pages/user/feedback.vue +++ b/pages/user/feedback.vue @@ -17,19 +17,16 @@ export default { return { phone: '', text: '', - debounce: true, } }, - onShow() { - this.debounce = true; - }, methods: { submit() { - if(!this.debounce) return; if(!this.verifyContent()) return false; - this.debounce = false; - console.log(this.phone); - console.log(this.text); + // console.log(this.phone); + // console.log(this.text); + this.$u.toast('提交成功'); + this.phone = ""; + this.text = ""; }, verifyContent() { if(this.$u.test.isEmpty(this.text)) { @@ -62,7 +59,6 @@ export default { } }) } else { - this.debounce = true; this.$u.toast(res.message); } }) diff --git a/pages/user/index.vue b/pages/user/index.vue index f85c19c..44c9375 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -27,6 +27,10 @@ 用户反馈 + + 用户协议与隐私政策 + + 清除缓存 {{ fileSizeString }} @@ -142,7 +146,15 @@ export default { uni.navigateTo({ url: '/pages/user/' + url }); - } + }, + viewAgreement() { + this.$u.route({ + url: '/pages/login/agreements', + params: { + title: "用户协议与隐私政策" + } + }); + } }, }