Merge branch 'lx-online' of gitee.com:cabbage_qd/web-base-h5 into bd-dev

pages/mine/index.vue

@@ -59,7 +59,7 @@
    
               
     <view class="ju_grade" v-if="!ifSpecial">
-      <view v-if="awards.tarAwardsName" class="awards-progress-summary"  style="text-align: center;">
+      <!-- <view v-if="awards.tarAwardsName" class="awards-progress-summary"  style="text-align: center;">
         <span class="descriptive-text">当前距离</span>
         <span class="highlight-name">
           {{ awards.tarAwardsName }}
@@ -70,10 +70,26 @@
             
             sprintProgress.achieved
           }}</span>
-      </view>
+      </view> -->
       
       <view class="jugrade_flex">
         <view class="ju_left">
+          <view v-if="awards.tarAwardsName" class="yestDay">
+            <view class="yes_t">奖衔晋升</view>
+            <view class="ju_left_bottom sprint-progress-container">
+              <view 
+                class="sprint-current-progress" 
+                :style="{ width: sprintProgress.percentageString }"
+              ></view>
+              <view class="cha sprint-progress-text">
+                晋升
+                <span class="award-name">{{ awards.tarAwardsName }}</span>
+                小区仅需
+                <span class="award-amount">{{ sprintProgress.achieved }}</span>
+                <!-- 已完成 {{ awards.sumRealPv }} / 目标 {{ sprintProgress.target }} -->
+              </view>
+            </view>
+          </view>
           <view class="yestDay">
             <view class="yes_t">昨日业绩</view>
             <view :class="awards.aNewPv!=0&&awards.bNewPv!=0?'ju_left_bottom1':'ju_left_bottom'">
@@ -117,18 +133,7 @@
               >
             </view>
           </view>
-          <view v-if="awards.tarAwardsName" class="yestDay">
+          
-            <view class="yes_t">奖衔冲刺</view>
-            <view class="ju_left_bottom sprint-progress-container">
-              <view 
-                class="sprint-current-progress" 
-                :style="{ width: sprintProgress.percentageString }"
-              ></view>
-              <view class="cha sprint-progress-text">
-                已完成 {{ awards.sumRealPv }} / 目标 {{ sprintProgress.target }}
-              </view>
-            </view>
-          </view>
         </view>
       </view>
     </view>
@@ -1325,12 +1330,33 @@ export default {
 .sprint-progress-text {
   width: 100%;
   position: absolute;
-  top: 60%;
+  top: 50%;
   left: 0;
-  transform: translate(0%, -55%);
+  transform: translateY(-50%);
   white-space: nowrap;
   text-align: center;
-  font-size: 24rpx;
+  font-size: 22rpx;
   color: #333333;
+  display: flex;
+  align-items: baseline;
+  justify-content: center;
+}
+
+.sprint-progress-text span {
+  margin: 0 3rpx;
+}
+
+.sprint-progress-text .award-name {
+  font-weight: bold;
+  color: #005BAC;
+  font-size: 26rpx;
+  padding: 0 4rpx;
+}
+
+.sprint-progress-text .award-amount {
+  font-weight: bold;
+  color: #D9534F;
+  font-size: 24rpx;
+  padding: 0 4rpx;
 }
 </style>