添加用户协议

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
 }

pages.json

@@ -65,7 +65,7 @@
 		"path": "pages/vip/agree",
 		"name": "vipAgree",
 		"style": {
-			"navigationBarTitleText": "服务条款"
+			"navigationBarTitleText": "用户协议"
 		}
 	}, {
 		"path": "pages/vip/examine",

pages/login/login.vue

@@ -26,8 +26,8 @@
 			</view>
 		</view>
 		<!-- 用户登录注册协议 -->
-		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="">用户隐私规格</navigator>和<navigator url="">用户服务协议
+		<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginPrivacy'}})">用户隐私协议</view>和<view @click="$Router.push({name: 'vipAgree', params: {type : 'loginService'}})">用户服务协议
-			</navigator>
+			</view>
 		</view>
 	</view>
 </template>
@@ -253,8 +253,7 @@
 			padding-top: $padding * 2;
 			font-size: $title-size-sm;
 			color: $text-gray;
-
+			view {
-			navigator {
 				color: $text-price;
 				display: inline-block;
 				padding: 0 10rpx;

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;

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({

pages/vip/vip.vue

@@ -82,7 +82,7 @@
         </view>
         
         <!-- 用户协议 -->
-        <view class="agree">
+        <view class="agree">
             <view class="agree-tips" @click="$Router.push({name: 'vipAgree', params: {type : 'vipAgree'}})">
                 请仔细阅读并确认服务协议
             </view>