diff --git a/apis/interfaces/auth.js b/apis/interfaces/auth.js
index 48ee742..87e2023 100644
--- a/apis/interfaces/auth.js
+++ b/apis/interfaces/auth.js
@@ -26,7 +26,17 @@ const getSms = (data) =>{
})
}
+// 用户隐私协议 articles/agreement/secret 用户服务协议 articles/agreement/service
+
+const secretService = (name) =>{
+ return request({
+ url: "articles/agreement/"+name
+ })
+}
+
+
export {
smsAuth,
- getSms
+ getSms,
+ secretService
}
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/manifest.json b/manifest.json
index b0dfc34..fc88c68 100644
--- a/manifest.json
+++ b/manifest.json
@@ -74,5 +74,10 @@
"uniStatistics" : {
"enable" : false
},
- "vueVersion" : "2"
+ "vueVersion" : "2",
+ "h5" : {
+ "router" : {
+ "mode" : "history"
+ }
+ }
}
diff --git a/pages.json b/pages.json
index e6fa5c1..38ad395 100644
--- a/pages.json
+++ b/pages.json
@@ -74,7 +74,7 @@
"name": "vipAgree",
"aliasPath": "/vip/agree",
"style": {
- "navigationBarTitleText": "服务条款"
+ "navigationBarTitleText": "用户协议"
}
}, {
"path": "pages/vip/examine",
@@ -154,6 +154,20 @@
"style": {
"navigationBarTitleText": "登录"
}
+ }, {
+ "path": "pages/login/guide",
+ "name": "loginGuide",
+ "aliasPath": "/login/guide",
+ "style": {
+ "navigationBarTitleText": "引导页"
+ }
+ }, {
+ "path": "pages/login/agreement",
+ "name": "agreement",
+ "aliasPath": "/login/agreement",
+ "style": {
+ "navigationBarTitleText": "用户隐藏协议"
+ }
}, {
"path": "pages/certification/personal",
"name": "Personal",
diff --git a/pages/login/agreement.vue b/pages/login/agreement.vue
new file mode 100644
index 0000000..8d493c2
--- /dev/null
+++ b/pages/login/agreement.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/guide.vue b/pages/login/guide.vue
new file mode 100644
index 0000000..3617dd4
--- /dev/null
+++ b/pages/login/guide.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+ 链商星球(中国)
+
+
+
+
+
+ 企业链
+ 从星煌开始
+
+
+
+
+
+
+
+
diff --git a/pages/login/login.vue b/pages/login/login.vue
index eedf1c9..2780c9e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -26,8 +26,11 @@
- 未注册的手机号验证后将自动创建账号,登录即表示同意接收用户隐私规格和用户服务协议
-
+
+ 未注册的手机号验证后将自动创建账号,登录即表示同意接收
+ 用户隐私协议
+ 和
+ 用户服务协议
@@ -210,7 +213,7 @@
}
.btn {
- background: $mian-color;
+ background-image: linear-gradient(to bottom,#bf52eb,#8f32dd);
color: white;
border-radius: 0;
margin-top: $margin;
@@ -224,7 +227,7 @@
}
&[disabled] {
- background: rgba($color: $mian-color, $alpha: .6);
+ background: rgba($color: #8f32dd, $alpha: .6);
}
}
@@ -253,8 +256,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/setting/setting.vue b/pages/setting/setting.vue
index 8ec4f9a..e15d27e 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -278,9 +278,7 @@
},
loginOut() {
this.$store.commit('setToken', '')
- uni.reLaunch({
- url: '/pages/login/login'
- })
+ this.$Router.push({name: 'Login'})
},
// 上传头像
updImgs(type) {
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 1c06149..8f89a6d 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -87,7 +87,7 @@
-
+
请仔细阅读并确认服务协议