update: 客户订单

src/components/allCustomers/order-list/order-table.vue

@@ -91,6 +91,13 @@
         <el-table-column label="订单金额(元)" class-name="order-amount" min-width="210px">
           <div class="order-descript">
             <!-- 购买单、退换单、销售单显示应收金额 -->
+            <!-- 退款单不显示商品合计 -->
+            <div v-if="el.orderType != 2" class="order-descript-item gray">
+              <div class="order-descript-label">
+                <div class="order-descript-label-text">商品合计</div>：
+              </div>
+              <div class="order-descript-content">{{ el.paidAmount - el.deliveryPaymentAmount | fomatFloat }}</div>
+            </div>
             <!-- 退款单显示应退金额 -->
             <div class="order-descript-item gray">
               <div class="order-descript-label">
@@ -298,7 +305,10 @@ export default {
         if (Object.prototype.toString.call(page) != '[object Object]') {
           page = {};
         }
-        this.tableData = page.result;
+        this.tableData = page.result.map(el => {
+          el.payInfo = typeof el.payInfo == 'string' ? JSON.parse(el.payInfo) : null;
+          return el;
+        });
         this.params.total = page.totalCount;
       });
     },