manifest.json

@@ -2,8 +2,8 @@
     "name" : "德铭阳光商家",
     "appid" : "__UNI__EA895BE",
     "description" : "",
-    "versionName" : "1.0.1",
+    "versionName" : "1.0.0",
-    "versionCode" : 103,
+    "versionCode" : "100",
     "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,18 +24,6 @@
 					}
 				}
 			}
-		},
-		{
-			"path": "pages/login/privacy_policy",
-			"style": {
-				"navigationBarTitleText": "隐私政策",
-				"app-plus": {
-					"titleNView": {
-						"backgroundColor": "#FFFFFF",
-						"titleColor": "#333333"
-					}
-				}
-			}
 		},
 		{
 			"path": "pages/release/tosign",
@@ -73,7 +61,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "德铭阳光商家",
+				"navigationBarTitleText": "德铭阳光在线",
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",

pages/login/login.vue

@@ -95,9 +95,11 @@ export default {
 			time_count: 60,
 			consentPact: true,
 			pactList: [{
-				"text": "《用户协议》"
+				id: 1,
+				text: "《用户协议》"
 			},{
-				"text":"《隐私政策》"
+				id: 2,
+				text: "《隐私政策》"
 			}]
 		};
 	},
@@ -271,28 +273,15 @@ export default {
         },
         moveHandle(){
             return;
-		},
+				},
-		viewAgreement(index) {
+				viewAgreement(id) {
-			console.log(index);
+					this.$u.route({
-			if (index == 0) {
+						url: '/pages/login/agreements',
-				this.$u.route({
+						params: {
-					url: '/pages/login/agreements',
+							id: id
-					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,13 +27,11 @@
 			<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(1)">
+        <view class="nav" @click="viewAgreement(2)">
-
 			<text>隐私政策</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
@@ -153,24 +151,13 @@ export default {
 				url: '/pages/user/' + url
 			});
         },
-
+        viewAgreement(id) {
-        viewAgreement(index) {
+            this.$u.route({
-			if (index == 0) {
+                url: '/pages/login/agreements',
-				this.$u.route({
+                params: {
-					url: '/pages/login/agreements',
+                    id: id
-					params: {
+                }
-						title: "用户协议"
+            });
-					}
-				});
-			}
-			if (index == 1) {
-				this.$u.route({
-					url: '/pages/login/privacy_policy',
-					params: {
-						title: "隐私政策"
-					}
-				});
-			}
         }
 	},
 }