Merge pull request '修改协议隐私' (#399) from qxf into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/399

components/logininput/logininput.vue

@@ -17,7 +17,7 @@
 				<text>我已详细阅读并同意</text>
 				<text class="pact_text">《用户协议》</text>
 				<text class="pact_text">《隐私协议》</text>
-				<text class="pact_text">《使用协议》</text>
+				<!-- <text class="pact_text">《使用协议》</text> -->
 				<u-checkbox-group @change="checkboxGroupChange" size="27">
 					<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
 					 shape="circle" size="14" active-color="#19BE6B"></u-checkbox>

components/remaining/remaining.vue

@@ -34,7 +34,7 @@
 		<view class="welcome_backes" v-if="protocol">
 			<view class="content">
 				<!-- <view class="title">{{ agreement.document_title }}</view> -->
-				<view class="title">用户协议与隐私</view>
+				<view class="title">用户协议</view>
 				<!-- <text class="protocol_content"></text> -->
 				<scroll-view scroll-y class="scroll">
 					<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__EBFF00A",
     "description" : "",
     "versionName" : "1.0.1",
-    "versionCode" : 103,
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pageA/bindinges/bindinges.vue

@@ -41,7 +41,7 @@
                 timer: null,
 				is_sendcode: false, // 60s
                 time_count: 60,
-                pactList: [ "《用户协议》", "《隐私协议》", "《使用协议》" ],
+                pactList: [ "《用户协议》", "《隐私协议》" ],
 			};
 		},
 		methods: {

pageA/login/login.vue

@@ -93,10 +93,12 @@
 				}, {
 					"id": '2',
 					"text": "《隐私协议》"
-				}, {
+				},
-					"id": '3',
+				// {
-					"text": "《使用协议》"
+				// 	"id": '3',
-				}, ],
+				// 	"text": "《使用协议》"
+				// }, 
+				],
 				temp_url: "", // 上个页面路径
 				pagesArr: ["pages/mine/index"], // 特殊路径
 				platform: '', // 手机平台

pageA/register/register.vue

@@ -82,10 +82,11 @@
 					}, {
 						"id": '2',
 						"text": "《隐私协议》"
-					}, {
+					}, 
-						"id": '3',
+					// {
-						"text": "《使用协议》"
+					// 	"id": '3',
-					},
+					// 	"text": "《使用协议》"
+					// },
 				
 				]
 			};

pageE/setting/Index.vue

@@ -79,9 +79,13 @@
 						link: './feedback'
 					},
 					{
-						title: '用户协议与政策',
+						title: '用户协议',
 						link: '/pageA/pactList/pactList?index=0'
 					},
+					{
+						title: '隐私政策',
+						link: '/pageA/pactList/pactList?index=1'
+					},
 				],
 				content: "是否退出登录！",
 				show: false,

pages/information/information.vue

@@ -127,7 +127,8 @@
 					uni.request({
 						url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
 						data:{
-							userId: 1
+							userId: 1,
+							markup: 1
 						},
 						method:"POST",
 						header:{