From a374babc45ad0d21c242571c4f9f93e7d18319fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Tue, 1 Dec 2020 17:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E8=AE=AE=E9=9A=90?=
 =?UTF-8?q?=E7=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/logininput/logininput.vue |  2 +-
 components/remaining/remaining.vue   |  2 +-
 manifest.json                        |  2 +-
 pageA/bindinges/bindinges.vue        |  2 +-
 pageA/login/login.vue                | 10 ++++++----
 pageA/register/register.vue          |  9 +++++----
 pageE/setting/Index.vue              |  6 +++++-
 pages/information/information.vue    |  3 ++-
 8 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/components/logininput/logininput.vue b/components/logininput/logininput.vue
index ac05081..df1a18e 100644
--- a/components/logininput/logininput.vue
+++ b/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>
diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue
index 03b101c..57040be 100644
--- a/components/remaining/remaining.vue
+++ b/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>
diff --git a/manifest.json b/manifest.json
index 206c921..c125c69 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__EBFF00A",
     "description" : "",
     "versionName" : "1.0.1",
-    "versionCode" : 103,
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pageA/bindinges/bindinges.vue b/pageA/bindinges/bindinges.vue
index ef3f584..aabcf4d 100644
--- a/pageA/bindinges/bindinges.vue
+++ b/pageA/bindinges/bindinges.vue
@@ -41,7 +41,7 @@
                 timer: null,
 				is_sendcode: false, // 60s
                 time_count: 60,
-                pactList: [ "《用户协议》", "《隐私协议》", "《使用协议》" ],
+                pactList: [ "《用户协议》", "《隐私协议》" ],
 			};
 		},
 		methods: {
diff --git a/pageA/login/login.vue b/pageA/login/login.vue
index 64c0241..f43bb61 100644
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -93,10 +93,12 @@
 				}, {
 					"id": '2',
 					"text": "《隐私协议》"
-				}, {
-					"id": '3',
-					"text": "《使用协议》"
-				}, ],
+				},
+				// {
+				// 	"id": '3',
+				// 	"text": "《使用协议》"
+				// }, 
+				],
 				temp_url: "", // 上个页面路径
 				pagesArr: ["pages/mine/index"], // 特殊路径
 				platform: '', // 手机平台
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
index d77a45b..ca547e4 100644
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -82,10 +82,11 @@
 					}, {
 						"id": '2',
 						"text": "《隐私协议》"
-					}, {
-						"id": '3',
-						"text": "《使用协议》"
-					},
+					}, 
+					// {
+					// 	"id": '3',
+					// 	"text": "《使用协议》"
+					// },
 				
 				]
 			};
diff --git a/pageE/setting/Index.vue b/pageE/setting/Index.vue
index f2d6132..c3b0488 100644
--- a/pageE/setting/Index.vue
+++ b/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,
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 5e1ae06..747bc9f 100644
--- a/pages/information/information.vue
+++ b/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:{
-- 
2.45.2