Merge pull request '添加用户隐私协议' (#114) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/114

pages.json

@@ -16,7 +16,7 @@
 		{
 			"path": "pages/login/agreements",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "用户协议与隐私政策",
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",

pages/login/login.vue

@@ -52,14 +52,14 @@
                 </view>
 			</view>
 			<!-- 服务协议 -->
-			<!-- <view class="pact">
+			<view class="pact">
 				<view class="pact-container">
 					<u-checkbox v-model="consentPact" shape="circle" size="30" label-size="26" icon-size="12" active-color="#ff780f">
 						<text>我已详细阅读并同意</text>
 					</u-checkbox>
 					<text class="pact-items" v-for="(item,index) in pactList" :key="index" @click="viewAgreement(index)"> {{ item.text }}</text>
 				</view>
-			</view> -->
+			</view>
 			<!-- denglu QQ weixin -->
 			<button @click="logins">{{ login }}</button>
 			<!-- <u-button :custom-style="customStyle" ></u-button> -->
@@ -93,13 +93,9 @@ export default {
 			timer: null,
 			is_sendcode: false, // 60s
 			time_count: 60,
-			consentPact: false,
+			consentPact: true,
 			pactList: [{
-				"id": '3',
+				"text": "《用户协议与隐私政策》"
-				"text": "《隐私协议》"
-			},{
-				"id": '4',
-				"text": "《使用协议》"
 			}]
 		};
 	},
@@ -160,7 +156,9 @@ 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: "用户协议与隐私政策"
 						}
 					});
 				}

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.phone);
+			// console.log(this.text);
-      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);
 				}
 			})

pages/user/index.vue

@@ -27,6 +27,10 @@
 			<text>用户反馈</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
+        <view class="nav" @click="viewAgreement()">
+			<text>用户协议与隐私政策</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
 		<view class="nav" @click="clearCache">
 			<text>清除缓存</text>
             <text>{{ fileSizeString }}</text>
@@ -142,6 +146,14 @@ export default {
 			uni.navigateTo({
 				url: '/pages/user/' + url
 			});
+        },
+        viewAgreement() {
+            this.$u.route({
+                url: '/pages/login/agreements',
+                params: {
+                    title: "用户协议与隐私政策"
+                }
+            });
         }
 	},
 }