会员中心修改

pages/vipCenter/vipCenter.vue

@@ -46,11 +46,12 @@
 			</view>
 			<view class="top_title" v-if="titleFlag">当前等级权益</view>
 			<view class="now_benefit" v-for="(val, key) in member_list" v-if="key === index && val.grade_list !==null" :key="key" :style="[heightFlag ? {'height': height+'rpx'} : null]" :class="val.grade_list.length > 4 ? 'height1' : 'height2'">
-				<view class="benefit_item" v-for="(item, k) in val.grade_list" :key="k" :style="[key != 0 ? {color: 'rgba(255,255,255,0.4)'} : null]">
+				<view class="benefit_item" v-for="(item, k) in val.grade_list" :key="k" :style="[(key === 0 && item.is_next) ? {color: 'rgba(255,255,255,0.4)'} : null]">
 					{{item.short_title}}
-					<text class="dia" v-if="key === 0"></text>
+					<text class="dia" v-if="(key === 0 && !item.is_next) || (key === 1)"></text>
 					<text v-else class="unlock"><text class="eosfont">&#xe645;</text>{{val.grade_name.substr(0,2)}}解锁</text>
 				</view>
+				
 			</view>
 			<view class="collapse_btn" @click="moreBenefit()" v-if="moreFlag"><text v-if="!heightFlag">查看更多</text><text v-else>收起</text><text class="eosfont" v-if="!heightFlag">&#xe729;</text><text class="eosfont" v-else>&#xe728;</text></text></view>
 		</view>
@@ -101,6 +102,13 @@
 				success: (res) => {
 					if(res.data.code === 0) {
 						this.integral_list = res.data.data.integral_list;
+						if(res.data.data.member_list[1]) {
+							let arr = res.data.data.member_list[1].grade_list;
+							arr.map((item,index) => {
+								item.is_next = 1;
+							});
+							res.data.data.member_list[0].grade_list = res.data.data.member_list[0].grade_list.concat(arr);
+						}
 						this.member_list = res.data.data.member_list;
 						this.changeHeight(res.data.data.member_list[0].grade_list, 0);
 					} else if (res.data.code === -1) {