Update index.vue

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",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -110,13 +110,13 @@
             "splashscreen" : {
                 "iosStyle" : "storyboard",
                 "ios" : {
-                    "storyboard" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/CustomStoryboard.zip"
+                    "storyboard" : "../deming-uniapp/static/CustomStoryboard.zip"
                 },
-                "androidStyle" : "default",
+                "androidStyle" : "common",
                 "android" : {
-                    "hdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/480x762.png",
-                    "xhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/720x1242.png",
-                    "xxhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/1080x1882.png"
+                    "hdpi" : "../deming-uniapp/static/app/start/480x762.png",
+                    "xhdpi" : "../deming-uniapp/static/app/start/720x1242.png",
+                    "xxhdpi" : "../deming-uniapp/static/app/start/1080x1882.png"
                 }
             }
         }

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

@@ -93,14 +93,17 @@ export default {
 			timer: null,
 			is_sendcode: false, // 60s
 			time_count: 60,
-			consentPact: true,
-			pactList: [{
-				id: 1,
-				text: "《用户协议》"
-			},{
-				id: 2,
-				text: "《隐私政策》"
-			}]
+			consentPact: false,
+			pactList: [
+				{
+					"id" : 1,
+					"text": "《用户协议》"
+				},
+				{
+					"id":2,
+					"text":"《隐私政策》"
+				},
+			]
 		};
 	},
 	methods: {
@@ -273,15 +276,30 @@ export default {
         },
         moveHandle(){
             return;
-				},
-				viewAgreement(id) {
-					this.$u.route({
-						url: '/pages/login/agreements',
-						params: {
-							id: id
-						}
-					});
-				}
+		},
+		viewAgreement(id) {
+			console.log(id);
+			if (id == 1) {
+				this.$u.route({
+					url: '/pages/login/agreements',
+					params: {
+						id:1,
+						title: "用户协议"
+					}
+				});
+			}
+			
+			if (id == 2) {
+				this.$u.route({
+					url: '/pages/login/privacy_policy',
+					params: {
+						id:2,
+						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,25 @@ export default {
 				url: '/pages/user/' + url
 			});
         },
-        viewAgreement(id) {
-            this.$u.route({
-                url: '/pages/login/agreements',
-                params: {
-                    id: id
-                }
-            });
+
+        viewAgreement(index) {
+			if (index == 0) {
+				this.$u.route({
+					url: '/pages/login/agreements',
+					params: {
+						id: 1,
+						title: "用户协议"
+					}
+				});
+			}
+			if (index == 1) {
+				this.$u.route({
+					url: '/pages/login/privacy_policy',
+					params: {
+						title: "隐私政策"
+					}
+				});
+			}
         }
 	},
 }