Merge pull request 'qxf' (#116) from qxf into master

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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "德铭阳光商家",
     "appid" : "__UNI__EA895BE",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
-    "versionCode" : "100",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -16,7 +16,7 @@
 		{
 			"path": "pages/login/agreements",
 			"style": {
-				"navigationBarTitleText": "用户协议与隐私政策",
+				"navigationBarTitleText": "用户协议",
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",
@@ -24,6 +24,18 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/login/privacy_policy",
+			"style": {
+				"navigationBarTitleText": "隐私政策",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/release/tosign",
@@ -61,7 +73,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "德铭阳光在线",
+				"navigationBarTitleText": "德铭阳光商家",
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",

pages/login/login.vue

@@ -95,11 +95,9 @@ export default {
 			time_count: 60,
 			consentPact: true,
 			pactList: [{
-				id: 1,
+				"text": "《用户协议》"
-				text: "《用户协议》"
 			},{
-				id: 2,
+				"text":"《隐私政策》"
-				text: "《隐私政策》"
 			}]
 		};
 	},
@@ -273,15 +271,28 @@ export default {
         },
         moveHandle(){
             return;
-				},
+		},
-				viewAgreement(id) {
+		viewAgreement(index) {
-					this.$u.route({
+			console.log(index);
-						url: '/pages/login/agreements',
+			if (index == 0) {
-						params: {
+				this.$u.route({
-							id: id
+					url: '/pages/login/agreements',
-						}
+					params: {
-					});
+						title: "用户协议"
-				}
+					}
+				});
+			}
+			
+			if (index == 1) {
+				this.$u.route({
+					url: '/pages/login/privacy_policy',
+					params: {
+						title: "隐私政策"
+					}
+				});
+			}
+		}
+
 	},
 	onLoad() {
 		let token = uni.getStorageSync('token');

pages/user/index.vue

@@ -27,11 +27,13 @@
 			<text>用户反馈</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-        <view class="nav" @click="viewAgreement(1)">
+
+        <view class="nav" @click="viewAgreement(0)">
 			<text>用户协议</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-        <view class="nav" @click="viewAgreement(2)">
+		<view class="nav" @click="viewAgreement(1)">
+
 			<text>隐私政策</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
@@ -151,13 +153,24 @@ export default {
 				url: '/pages/user/' + url
 			});
         },
-        viewAgreement(id) {
+
-            this.$u.route({
+        viewAgreement(index) {
-                url: '/pages/login/agreements',
+			if (index == 0) {
-                params: {
+				this.$u.route({
-                    id: id
+					url: '/pages/login/agreements',
-                }
+					params: {
-            });
+						title: "用户协议"
+					}
+				});
+			}
+			if (index == 1) {
+				this.$u.route({
+					url: '/pages/login/privacy_policy',
+					params: {
+						title: "隐私政策"
+					}
+				});
+			}
         }
 	},
 }