From 25905c7c7fa8072dc6bea528cbb31e2f5bc7683e Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 11 Nov 2022 15:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/myMedal.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/my/myMedal.vue b/pages/my/myMedal.vue
index 7ff9f1d..5ba3b4f 100644
--- a/pages/my/myMedal.vue
+++ b/pages/my/myMedal.vue
@@ -44,16 +44,17 @@
 				  </view>
 		       </view>
 			   <view class="medal-info-flex">
-			   	 <view class="medal-info-index" v-for="(ru,index) in rules">
+			   	 <view class="medal-info-index" v-for="(ru,index) in rulesData.rules">
 					 <view class="" style="height: 50upx;">
 					 	<image v-if="medalData.medalLevel == index+1" style="width:32upx;height:16upx" src="../../static/images/triangle.png" mode=""></image>
 					 </view>
 					 <view  class="medal-img-index">
-					 	<image style="width:104upx;height:120upx" :src="fileBaseUrl+medalData.medalIcon" mode=""></image>
+					 	<image v-if="index+1 < medalData.medalLevel || index+1 == medalData.medalLevel" style="width:104upx;height:120upx" :src="fileBaseUrl+rulesData.icon" mode=""></image>
+						<image v-else style="width:104upx;height:120upx" :src="fileBaseUrl+rulesData.iconGrey" mode=""></image>
 						<text class="img-name">{{medalData.medalName}} </text>
 						<text class="img-level">LV.{{index+1}}</text>
 					 </view>
-					 <text v-if="medalData.medalLevel == index+1" style="color: #387DF7;font-size: 24upx;">LV.{{index+1}}</text>
+					 <text v-if="index+1 < medalData.medalLevel || index+1 == medalData.medalLevel" style="color: #387DF7;font-size: 24upx;">LV.{{index+1}}</text>
 					<text v-else style="color: color: #666666;font-size: 24upx;">LV.{{index+1}}</text>
 			   	 </view>
 			   </view>
@@ -73,7 +74,9 @@
 				medalList:[],
 				medalData:{},
 				medalConfig:[],
-				rules:[],
+				rulesData:{
+					rules:[],
+				},
 			}
 			},
 		computed: {
@@ -95,7 +98,8 @@
 				this.medalData = me;
 				this.show = true;
 				let data = this.medalConfig.find(it=>it.id ==me.medalId);
-				this.rules = JSON.parse(data.rules);
+				this.rulesData = data;
+				this.rulesData.rules = JSON.parse(data.rules);
 			},
 			getMedal() {
 			    apiStat.userMedal(this.userInfo.aid).then(res=>{