Commit ed4394d1 by zhangzhen

细节优化

parent 11974f4c
......@@ -1280,6 +1280,7 @@
padding: 30upx 24upx;
width: 100%;
border-radius: 0 0 0 0;
background-color: transparent;
min-height: 180upx;
}
......
......@@ -444,7 +444,6 @@
type: "routine",
}).then(res => {
uni.hideLoading();
console.log(JSON.stringify(res), "注册后的数据结构")
if (res.data.code == 200) {
uni.setStorageSync('loginStatus', res.data.data.type || 'login')
uni.setStorageSync('tokenHeaders', "Authori-zation")
......@@ -480,17 +479,14 @@
this.rechargeIndex = k;
},
onRuleTipChange(e) {
console.log(e, 99999)
this.checked = e.detail.value.includes("checked")
},
onLoading() {
equityMembersList().then(res => {
console.log(res, 999999)
if (res.data.code == 200 && res.data.rows) {
this.list = res.data.rows
this.equityAmountList = Number(this.list[0].requiredAmount).toFixed(2).toString().split(
'.');
console.log(this.equityAmountList, 9999)
this.equityAmountList = Number(this.list[0].requiredAmount).toFixed(2).toString().split('.');
}
this.onGetUserInfo();
})
......@@ -504,7 +500,6 @@
giveType: item.giveType ? item.giveType.split(",") : []
}
})
console.log(this.rechargeConfList, 9999)
}
})
},
......
......@@ -27,7 +27,7 @@
</view>
</view>
<view class="member-config">
<text v-if="item.membershipLevel === userInfo.memberConfig.membershipLevel && index < 2" class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - userInfo.consumerWallet.remainingIntegral}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<text v-if=" userInfo.memberConfig && userInfo.consumerMember && item.membershipLevel === userInfo.memberConfig.membershipLevel && ( (userInfo.consumerMember.isRights && index ==1) || (userInfo.consumerMember.isRecharge && index === 0)) " class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - userInfo.consumerWallet.remainingIntegral}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
</view>
<view class="flex-row">
......@@ -35,47 +35,6 @@
<text class="text-4">{{item.limitRequirements}}</text>
</view>
</view>
<!-- <view v-else-if="item.membershipLevel ===3" class="level level-3">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<text class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - Number(userInfo.consumerWallet.remainingIntegral)}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row">
<text class="text-3">当前积分</text>
<text class="text-4">{{userInfo.consumerWallet.remainingIntegral}}</text>
</view>
</view> -->
<!-- <view v-else-if="item.membershipLevel ===2" class="level level-2">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<text class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - Number(userInfo.consumerWallet.remainingIntegral)}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row">
<text class="text-3">当前积分</text>
<text class="text-4">{{userInfo.consumerWallet.remainingIntegral}}</text>
</view>
</view> -->
<!--
<view v-else-if="item.membershipLevel ===1" class="level level-1">
<text class="text-1">LV {{userInfo.memberConfig.levelName}}</text>
<text class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - Number(userInfo.consumerWallet.remainingIntegral)}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row">
<text class="text-3">当前积分</text>
<text class="text-4">{{userInfo.consumerWallet.remainingIntegral}}</text>
</view>
</view> -->
<!-- <view v-else-if="item.membershipLevel === 0" class="level level-0">
<text class="text-1">LV 0</text>
<text class="text-2">您还没有会员等级!</text>
<text class="text-2">还差 {{userInfo.memberConfig.nextLimitRequirements - Number(userInfo.consumerWallet.remainingIntegral)}} 积分可升级为{{userInfo.memberConfig.nextMembershipName}}</text>
<view class="flex-row">
<text class="text-3">当前积分</text>
<text class="text-4">{{userInfo.consumerWallet.remainingIntegral}}</text>
</view>
</view> -->
<!-- <view v-else class="level level-0">
<text class="text-1">LV 0</text>
<text class="text-2">您还不是会员哦,快来加入吧!</text>
</view> -->
</view>
<view class="part-right">
<image v-if="item.membershipLevel ===4" class="tag-icon" :src="assetsPath+'/user/tag_icon_4.png'" mode="widthFix"></image>
......@@ -165,6 +124,9 @@
getUserInfo().then(res => {
if (res.data.code == 200) {
this.userInfo = res.data.data;
if(this.userInfo.consumerMember && this.userInfo.consumerMember.isRights){
this.index = 1
}
this.onLoading();
}
})
......@@ -190,7 +152,7 @@
padding: 36upx 0 24upx;
margin: 0 auto;
.relative{
margin-right: 4upx;
margin-right: 12upx;
.img-icon{
display: block;
width: 148upx;
......@@ -199,7 +161,7 @@
}
.active{
transform: scale(1.2);
transform: scale(1.1);
}
.absolute{
display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment