diff --git a/pages/user/index.vue b/pages/user/index.vue
index 0c4da1f..c0f4bb4 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -15,8 +15,8 @@
- {{newList[newPopIndex].title}}
-
+ {{newList[newPopIndex].title}}
+
@@ -56,13 +56,13 @@
- 开通{{userIdentity.right.name}}。
+ {{ userData.identity.id == 1 ? '开通' + userIdentity.right.name : '到期时间：' + userIdentity.times.ended_at}}
-
- 去开通
+
+ {{ userData.identity.id == 1 ? '去开通' : '去升级'}}
- 终身有效
+ 已达成满级
@@ -275,6 +275,26 @@ export default {
this.animatedShow = false
},
methods: {
+ // 开通VIP
+ openVip(identityId){
+ if(!this.userData.certification){
+ uni.showModal({
+ title: '提示',
+ content: '为了保障您的用户权益，未个人认证无法开通节点',
+ cancelColor: '#555',
+ cancelText: '稍后开通',
+ confirmColor: '#8b64fd',
+ confirmText: '去认证',
+ success: res => {
+ if(res.confirm){
+ this.$Router.push({name: 'Personal'})
+ }
+ }
+ })
+ return
+ }
+ this.$Router.push({name: 'vipIndex', params:{identity_id: identityId}})
+ },
// 用户信息
userInfo() {
// 读取配置信息
@@ -382,10 +402,10 @@ export default {
this.moving = false
return
}else{
- if (moveDistance > 0 && moveDistance <= 120) {
+ if (moveDistance > 0 && moveDistance <= 130) {
this.coverTransform = `translateY(${moveDistance}px)`
}
- this.moving = moveDistance >= 120
+ this.moving = moveDistance >= 130
}
},
coverTouchend() {
@@ -398,7 +418,7 @@ export default {
},
runRefresh() {
this.coverTransition = 'transform .1s linear'
- this.coverTransform = 'translateY(120px)'
+ this.coverTransform = 'translateY(130px)'
this.playState = true
this.$emit('refresh')
}
@@ -618,21 +638,21 @@ export default {
// 会员信息
.header {
background-image: linear-gradient(to right, #7c52fc, #976dff);
- height: 628rpx;
+ height: 314px;
// user工具
.user-tool {
text-align: right;
- line-height: 80rpx;
+ line-height: 40px;
.user-tool-name {
flex: 1;
- line-height: 80rpx;
+ line-height: 40px;
text-align: left;
color: #fff;
font-size: 28rpx;
}
.user-tool-icon {
padding-right: $padding;
- margin-top: 20rpx;
+ margin-top: 10px;
width: $uni-img-size-sm;
height: $uni-img-size-sm;
vertical-align: top;
@@ -642,24 +662,24 @@ export default {
.user-info {
position: relative;
width: 100%;
- height: 140rpx;
+ height: 70px;
box-sizing: border-box;
padding-left: $padding;
padding-right: $padding;
color: $uni-text-color-inverse;
.user-portrait {
- width: 140rpx;
- height: 140rpx;
+ width: 70px;
+ height: 70px;
border-radius: $uni-border-radius-circle;
position: relative;
.user-portrait-head {
border-radius: $uni-border-radius-circle;
border: 4rpx solid #bfaaff;
position: absolute;
- left: 8rpx;
- top: 14rpx;
- width: calc(100% - 24rpx);
- height: calc(100% - 24rpx);
+ left: 4px;
+ top: 7px;
+ width: calc(100% - 12px);
+ height: calc(100% - 12px);
}
.user-portrait-tips {
position: absolute;
@@ -672,14 +692,14 @@ export default {
z-index: 2;
position: absolute;
left: 50%;
- bottom: -20rpx;
+ bottom: -10px;
transform: translate(-50%, -50%);
background:linear-gradient(to right, #211d1e,#4b403c);
color: $uni-text-color-inverse;
font-size: $uni-font-size-sm;
border-radius: $radius;
- height: 30rpx;
- line-height: 30rpx;
+ height: 15px;
+ line-height: 15px;
width: 64rpx;
text-align: center;
text {
@@ -698,29 +718,29 @@ export default {
top: 0;
width: 100%;
height: 100%;
- padding: 0 0 0 calc(#{$uni-img-size-lg + 20} + (#{$padding * 2} + 10rpx));
+ padding: 0 0 0 calc(#{$uni-img-size-lg + 20} + (#{$padding * 2} + 5px));
box-sizing: border-box;
.user-name {
display: flex;
- margin: 30rpx 0 5rpx;
+ margin: 15px 0 2.5px;
font-size: 36rpx;
.user-name-identity {
- width: 100rpx;
- height: 36rpx;
- margin: 4rpx 0 0 10rpx;
+ width: 90rpx;
+ height: 15px;
+ margin: 5px 0 0 5px;
}
}
.user-status {
opacity: .7;
font-size: $title-size-sm;
display: flex;
- line-height: 46rpx;
+ line-height: 23px;
.user-status-copy {
font-size: $title-size !important;
border: 1rpx solid #FFFFFF;
border-radius: $radius * 3;
- line-height: 44rpx;
- height: 46rpx;
+ line-height: 22px;
+ height: 23px;
transform:scale(.6);
padding: 0 $padding + 5;
}
@@ -729,19 +749,19 @@ export default {
}
// 会员卡
.card {
- height: 200rpx;
- margin: 0 30rpx;
+ height: 100px;
+ margin: 0 15px;
background: #555555;
}
}
// 按钮内容
.mian {
- margin-top: -260rpx;
- padding: 30rpx 30rpx 30rpx;
+ margin-top: -130px;
+ padding: 15px 30rpx 5px;
background: #F5F5F5;
// 我的资产模块
.userAssets {
- margin-bottom: 30rpx;
+ margin-bottom: 15px;
background-color: #FFFFFF;
overflow: hidden;
border-radius: 15rpx;
@@ -749,7 +769,7 @@ export default {
background-color: #fff3dc;
color: #654c2d;
font-size: 28rpx;
- padding: 20rpx;
+ padding: 10px;
box-sizing: border-box;
height: 94rpx;
position: relative;
@@ -765,13 +785,13 @@ export default {
}
.withdraw-btn {
position: absolute;
- right: 20rpx;
- top: 20rpx;
+ right: 10px;
+ top: 10px;
background-image:linear-gradient(to right, #f9c869, #eca824);
color: #f7eedc;
width: 140rpx;
text-align: center;
- line-height: 54rpx;
+ line-height: 27px;
border-radius: 80rpx;
font-size: 26rpx;
}
@@ -906,9 +926,9 @@ export default {
color: #5e5e5e;
}
.userNew-icon {
- width: 46rpx;
- height: 46rpx;
- margin: 22rpx 20rpx 0 0;
+ width: 40rpx;
+ height: 40rpx;
+ margin: 24rpx 20rpx 0 0;
}
}
}
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index 8edd33c..21ec9f0 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -9,7 +9,7 @@
提交
-
+
@@ -124,11 +124,12 @@ export default {
},
created() {
// 获取当前用户信息
- this.idenInfo();
+ this.idenInfo('cre');
+
},
methods: {
// 当前用户信息
- idenInfo() {
+ idenInfo(type) {
identities().then(res => {
res.identities.map(item => {
item.obj_condition = new Object();
@@ -141,6 +142,9 @@ export default {
return item;
});
this.identitie = res.identities;
+ if(type === 'cre'){
+ this.tabsIndex = res.identities.findIndex(val => val.identity_id == this.$Route.query.identity_id)
+ }
this.openCondition = res.identities[this.tabsIndex].obj_condition;
this.rights = res.identities[this.tabsIndex].rights;
this.total = res.identities[this.tabsIndex].price;