Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/views/order/detail.vue

@@ -71,7 +71,9 @@
             <template v-if="order.discountFee<0">¥0.00</template>
             <template v-else>
               ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
-              <span style="color:red;">({{ '原:¥' + order.discountFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+              <span style="color:red;">(原:¥{{ order.discountFee | toThousandFloatFilter }}，
+                折扣取消:¥<template v-if="order.discountFee>returnedPurchaseFee">{{ returnedPurchaseFee | toThousandFloatFilter }}</template>
+                <template v-else>{{ order.discountFee | toThousandFloatFilter }}</template>)</span>
             </template>
           </el-col>
           <el-col :span="6"><b>运费:</b>
@@ -81,7 +83,9 @@
             <template v-else>¥{{ order.freight }}</template>
           </el-col>
           <el-col :span="12"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
-            <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+            <span style="color:red;">(原:¥{{ returnedPurchaseFee | toThousandFloatFilter }}，
+              折扣取消:¥<template v-if="order.discountFee>returnedPurchaseFee">{{ returnedPurchaseFee | toThousandFloatFilter }}</template>
+              <template v-else>{{ order.discountFee | toThousandFloatFilter }}</template>)</span>
           </el-col>
         </el-row>
       </div>

src/views/order/refund-record.vue

@@ -49,7 +49,9 @@
           <template v-if="order.discountFee<0">¥0.00</template>
           <template v-else>
             ¥{{ order.discountFee>returnedPurchaseFee ? (order.discountFee - returnedPurchaseFee) : '0' }}
-            <span style="color:red;">({{ '原:¥' + order.discountFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+            <span style="color:red;">(原:¥{{ order.discountFee | toThousandFloatFilter }}，
+              折扣取消:¥<template v-if="order.discountFee>returnedPurchaseFee">{{ returnedPurchaseFee | toThousandFloatFilter }}</template>
+              <template v-else>{{ order.discountFee | toThousandFloatFilter }}</template>)</span>
           </template>
         </el-col>
         <el-col :span="6"><b>运费:</b>