From c6a5891e51de0b46aa25d5122df0aa71d76584f7 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Mon, 17 Oct 2022 17:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ucurrency/Index.vue | 70 +++++++++++------------------------
 1 file changed, 21 insertions(+), 49 deletions(-)

diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index a51e488b..70723f3d 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -60,9 +60,9 @@
       <div class="exp-bar">
         <h6> {{currentUserRankingData.total || currentUserRankingData.months || currentUserRankingData.years || currentUserRankingData.weeks}}/{{current.endValue}}</h6>
         <div class="exp-barbox">
-          <el-progress :percentage="currentUserRankingData.total*100/current.endValue 
-          || currentUserRankingData.weeks*100/current.endValue 
-          || currentUserRankingData.years*100/current.endValue 
+          <el-progress :percentage="currentUserRankingData.total*100/current.endValue
+          || currentUserRankingData.weeks*100/current.endValue
+          || currentUserRankingData.years*100/current.endValue
           || currentUserRankingData.months*100/current.endValue" color="#387DF7"></el-progress>
           <!-- <div class="exp-bar-cont"></div> -->
         </div>
@@ -93,9 +93,14 @@
               </author-img> <span>{{ran.authorInfo.name}}</span>
             </div>
             <div class="bm tab-bm" style="margin-left:30px;">{{ran.authorInfo.orgInfo}}</div>
-            <div class="jy tab-jy">
-              <div style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.total}}</div>
-            </div>
+            <div class="jy tab-jy">
+              <div v-if="cycle == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.total}}</div>
+              <div v-if="cycle == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.months}}</div>
+              <div v-if="cycle == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.years}}</div>
+              <div v-if="cycle == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.weeks}}</div>
+            </div>
+
+
           </div>
         </div>
         <div v-if="currentUserRankingData.rankingNo>4" class="omit">
@@ -115,8 +120,10 @@
           <div class="bm tab-bm" style="margin-left:30px;color: #0059FF;">{{currentUserRankingData.authorInfo.orgInfo}}
           </div>
           <div class="jy tab-jy">
-            <div style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">
-              {{currentUserRankingData.total}}</div>
+            <div v-if="cycle == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.total}}</div>
+            <div v-if="cycle == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.months}}</div>
+            <div v-if="cycle == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.years}}</div>
+            <div v-if="cycle == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.weeks}}</div>
           </div>
         </div>
 
@@ -311,47 +318,12 @@
                 avatar: "",
                 sex: null
               }
-              this.getUserData([res.result.currentUserRankingData.aid], [res.result.currentUserRankingData])
-              if (res.result.currentUserRankingData.total == undefined) {
-                res.result.currentUserRankingData.total = 0;
-              }
-              if (res.result.currentUserRankingData.weeks == undefined) {
-                res.result.currentUserRankingData.weeks = 0;
-              }
-              if (res.result.currentUserRankingData.months == undefined) {
-                res.result.currentUserRankingData.months = 0;
-              }
-              if (res.result.currentUserRankingData.years == undefined) {
-                res.result.currentUserRankingData.years = 0;
-              }
-              this.currentUserRankingData = res.result.currentUserRankingData;
-              // if (res.result.currentUserRankingData.total >= 0) {
-              //   console.log("11");
-              //   this.current = this.experienceValue(res.result.currentUserRankingData.total);
-              // } else if (res.result.currentUserRankingData.weeks >= 0) {
-              //   console.log("22");
-              //   this.current = this.experienceValue(res.result.currentUserRankingData.weeks);
-              // } else if (res.result.currentUserRankingData.months >= 0) {
-              //   console.log("33");
-              //   this.current = this.experienceValue(res.result.currentUserRankingData.months);
-              // } else if (res.result.currentUserRankingData.years >= 0) {
-              //   console.log("44");
-              //   this.current = this.experienceValue(res.result.currentUserRankingData.years);
-              // }
-              if(this.cycle == 'total'){
-                this.current = this.experienceValue(res.result.currentUserRankingData.total);
-              }
-              if(this.cycle == 'weeks'){
-                this.current = this.experienceValue(res.result.currentUserRankingData.weeks);
-              }
-              if(this.cycle == 'months'){
-                this.current = this.experienceValue(res.result.currentUserRankingData.months);
-              }
-              if(this.cycle == 'years'){
-                this.current = this.experienceValue(res.result.currentUserRankingData.years);
-              }
-
-
+              this.getUserData([res.result.currentUserRankingData.aid], [res.result.currentUserRankingData])
+              this.currentUserRankingData = res.result.currentUserRankingData;
+              if(this.cycle == 'total'){this.current = this.experienceValue(res.result.currentUserRankingData.total);}
+              if(this.cycle == 'weeks'){this.current = this.experienceValue(res.result.currentUserRankingData.weeks);}
+              if(this.cycle == 'months'){this.current = this.experienceValue(res.result.currentUserRankingData.months);}
+              if(this.cycle == 'years'){this.current = this.experienceValue(res.result.currentUserRankingData.years);}
             }
 
             const ids = [];