From d2b2352244c9a32d9d9b24225a3e6aac27e898f6 Mon Sep 17 00:00:00 2001
From: zhangmanman <994797151@qq.com>
Date: Tue, 28 Sep 2021 10:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/vip.js | 18 +++++++++---------
 pages.json             |  2 +-
 pages/login/login.vue  |  7 +++----
 pages/user/index.vue   |  2 +-
 pages/vip/agree.vue    |  6 +++++-
 pages/vip/vip.vue      |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/apis/interfaces/vip.js b/apis/interfaces/vip.js
index f2524f8..0784a70 100644
--- a/apis/interfaces/vip.js
+++ b/apis/interfaces/vip.js
@@ -39,13 +39,6 @@ const vipCont = (id, data) =>{
 	})
 }
 
-// 会员开通协议
-const userAgree = () =>{
-	return request({
-		url		: 'articles/agreement/openvip'
-	})
-}
-
 // 上传打款凭证
 const vipVoucher = (data) =>{
 	return request({
@@ -55,11 +48,18 @@ const vipVoucher = (data) =>{
 	})
 }
 
+// 用户协议
+const userAgree = (apiUrl) => {
+  return request({
+    url: apiUrl
+  })
+}
+
 export {
 	identities,
 	vipOrder,
 	vipWechatPay,
     vipCont,
-    userAgree,
-    vipVoucher
+    vipVoucher,
+    userAgree
 }
diff --git a/pages.json b/pages.json
index f0e7595..722320c 100644
--- a/pages.json
+++ b/pages.json
@@ -65,7 +65,7 @@
 		"path": "pages/vip/agree",
 		"name": "vipAgree",
 		"style": {
-			"navigationBarTitleText": "服务条款"
+			"navigationBarTitleText": "用户协议"
 		}
 	}, {
 		"path": "pages/vip/examine",
diff --git a/pages/login/login.vue b/pages/login/login.vue
index eedf1c9..4e0f0a3 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -26,8 +26,8 @@
 			</view>
 		</view>
 		<!-- 用户登录注册协议 -->
-		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="">用户隐私规格</navigator>和<navigator url="">用户服务协议
-			</navigator>
+		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginPrivacy'}})">用户隐私协议</view>和<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginService'}})">用户服务协议
+			</view>
 		</view>
 	</view>
 </template>
@@ -253,8 +253,7 @@
 			padding-top: $padding * 2;
 			font-size: $title-size-sm;
 			color: $text-gray;
-
-			navigator {
+			view {
 				color: $text-price;
 				display: inline-block;
 				padding: 0 10rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 7d80a05..1f4a539 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -967,7 +967,7 @@
         width: 100%;
         z-index: 99;
         left: 0;
-        top: 196px;
+        top: 200px;
         // padding-top: var(--status-bar-height);
         background-color: #F8F8F8;
         transition: .5s;
diff --git a/pages/vip/agree.vue b/pages/vip/agree.vue
index e583b13..b94ffa8 100644
--- a/pages/vip/agree.vue
+++ b/pages/vip/agree.vue
@@ -15,7 +15,11 @@
 			}
 		},
         created() {
-        	userAgree().then(res => {
+            let newUrl = ''
+            if(this.$Route.query.type == 'vipAgree') newUrl = 'articles/agreement/openvip'
+            if(this.$Route.query.type == 'loginPrivacy') newUrl = 'articles/agreement/secret'
+            if(this.$Route.query.type == 'loginService') newUrl = 'articles/agreement/service'
+        	userAgree(newUrl).then(res => {
                 this.content = res.content
         	}).catch(err =>{
         		uni.showToast({
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 6e22330..9e511f5 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -82,7 +82,7 @@
         
         <!-- 用户协议 -->
         <view class="agree">
-            <view class="agree-tips" @click="$Router.push({name: 'vipAgree'})">
+            <view class="agree-tips" @click="$Router.push({name: 'vipAgree', params: {type : 'vipAgree'}})">
                 请仔细阅读并确认服务协议
             </view>
         </view>