优化

src/views/order/detail.vue

@@ -62,34 +62,28 @@
           <el-col :span="6"><b>订单金额：</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
           <el-col :span="6"><b>应收金额：</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
           <el-col :span="6"><b>已收金额：</b>
-            <template v-if="order.receiptStatus*1===1">¥0</template>
-            <el-col :span="6"><b>订单金额:</b> ¥{{ order.payTotalFee | toThousandFloatFilter }}</el-col>
-            <el-col :span="6"><b>应收金额:</b> ¥{{ order.payableAmount | toThousandFloatFilter }}<span style="color:red;"> (账户余额抵扣:¥{{ order.balancePayFee | toThousandFloatFilter }})</span></el-col>
-            <el-col :span="6"><b>已收金额:</b>
-              <template v-if="order.receiptStatus*1===1">¥0.00</template>
-              <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
-            </el-col>
-            <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
-              <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
-            </el-col>
-          </el-col></el-row>
+            <template v-if="order.receiptStatus*1===1">¥0.00</template>
+            <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
+          </el-col>
+          <el-col :span="6"><b>退款金额(已完成):</b> ¥{{ returnValue | toThousandFloatFilter }}
+            <span style="color:red;">({{ '原:¥' + returnedPurchaseFee + '，折扣取消:¥' + (order.discountFee>returnedPurchaseFee ? returnedPurchaseFee : order.discountFee) }})</span>
+          </el-col>
+        </el-row>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>经理折扣：</b>
-            <template v-if="order.discountFee<0">¥0</template>
-            <el-col :span="6"><b>经理折扣:</b>
-              <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>
-              </template>
-            </el-col>
-            <el-col :span="6"><b>运费:</b>
-              <template v-if="order.freight*1===0">包邮</template>
-              <template v-else-if="order.freight*1===-1">到付</template>
-              <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
-              <template v-else>¥{{ order.freight }}</template>
-            </el-col>
-          </el-col></el-row>
+            <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>
+            </template>
+          </el-col>
+          <el-col :span="6"><b>运费:</b>
+            <template v-if="order.freight*1===0">包邮</template>
+            <template v-else-if="order.freight*1===-1">到付</template>
+            <template v-else-if="order.freight*1===-2">仪器到付-产品包邮</template>
+            <template v-else>¥{{ order.freight }}</template>
+          </el-col>
+        </el-row>
       </div>
       <div class="refund-item">
         <div v-for="shopOrder in order.newShopOrders" :key="shopOrder.shopOrderID" class="order-item">

src/views/order/refund.vue

@@ -70,15 +70,15 @@
         <template slot-scope="{row}">{{ row.orderNo + '(' + row.orderID + ')' }}</template>
       </el-table-column>
       <el-table-column label="退款金额" align="center" prop="refundFee">
-        <template slot-scope="{row}">{{ row.refundFee | toThousandFloatFilter }}</template>
+        <template slot-scope="{row}">¥{{ row.refundFee | toThousandFloatFilter }}</template>
       </el-table-column>
       <el-table-column label="退款方式" align="center" prop="returnedWay">
         <template slot-scope="{row}">
           <template v-if="row.returnedWay*1===4">未支付无退款</template>
           <template v-else-if="row.returnedWay*1===1">
-            <span v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}</span>
-            <span v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}</span>
-            <span v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}</span>
+            <p v-if="row.refundBalanceFee*1 !== 0">余额账户:¥{{ row.refundBalanceFee | toThousandFloatFilter }}</p>
+            <p v-if="row.refundOnlineFee*1 !== 0">线上退回:¥{{ row.refundOnlineFee | toThousandFloatFilter }}</p>
+            <p v-if="row.refundOfflineFee*1 !== 0">线下转账:¥{{ row.refundOfflineFee | toThousandFloatFilter }}</p>
           </template>
           <template v-else>----</template>
         </template>