Explorar el Código

Merge branch 'dev' of mangpiao/mp-ui-pc into test

lsx hace 2 años
padre
commit
c5aada6440
Se han modificado 1 ficheros con 12 adiciones y 3 borrados
  1. 12 3
      src/views/index.vue

+ 12 - 3
src/views/index.vue

@@ -54,7 +54,8 @@
                      ¥ {{ accDiv((daily.realPayAmt && daily.realPayAmt.today || 0), 100)}}
                    </div>
                   <div class="brief-item__others">
-                    <div class="text">
+                    <div style="display: inline-block; height: 38px;"></div>
+                    <!-- <div class="text">
                       昨日同期
                     </div>
                     <div class="rate text-one-line">
@@ -62,18 +63,26 @@
                         <span v-if="(daily.realPayAmt && daily.realPayAmt.yesterday || 0) > 0 ">
                              <span v-if="((daily.realPayAmt && daily.realPayAmt.today || 0) - daily.realPayAmt.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
                              <span v-if="((daily.realPayAmt && daily.realPayAmt.today || 0) - daily.realPayAmt.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
-                             <span v-if="(daily.realPayAmt && daily.realPayAmt.today || 0) >0">
+                             <span v-if="(daily.realPayAmt && daily.realPayAmt.today || 0) > 0">
                                {{ getRate((daily.realPayAmt && daily.realPayAmt.today || 0) , daily.realPayAmt.yesterday) }}
                              </span>
                              <span v-else>100</span>
                         </span>
+                        <span v-if="(daily.realPayAmt && daily.realPayAmt.yesterday || 0) < 0 ">
+                             <span v-if="((daily.realPayAmt && daily.realPayAmt.today || 0) - daily.realPayAmt.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                             <span v-if="((daily.realPayAmt && daily.realPayAmt.today || 0) - daily.realPayAmt.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
+                             <span v-if="(daily.realPayAmt && daily.realPayAmt.today || 0) > 0">
+                               {{ getRate(((daily.realPayAmt && daily.realPayAmt.today || 0) + daily.realPayAmt.yesterday), Math.abs(daily.realPayAmt.yesterday) ) }}
+                             </span>
+                             <span v-else>100</span>
+                        </span>
                         <span v-if="(daily.realPayAmt && daily.realPayAmt.yesterday || 0) == 0">
                              <span v-if="(daily.realPayAmt && daily.realPayAmt.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
                              {{(daily.realPayAmt && daily.realPayAmt.today || 0) > 0 ? 100 : 0 }}
                         </span>
                         %
                       </span>
-                    </div>
+                    </div> -->
                   </div>
                  </div>
                 </div>