合并ma分支解决冲突

seller/src/views/statistics/order.vue

@@ -52,7 +52,7 @@
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款笔数</div>
-                  <div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
+                  <div class="card-item-value">{{overViewList.paymentOrderNum || 0}}</div>
                 </div>
                 <div class="card-item">
                   <div class="card-item-label">付款金额</div>
@@ -150,7 +150,6 @@
         </div>
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
-
         </div>
         <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
 

seller/src/views/statistics/order/orderStatistics.vue

@@ -59,17 +59,14 @@
 
 
         <Card style="margin-top: 2px">
-          <Row>
-            <Table :loading="loading"
-                   border
-                   :columns="columns"
-                   :data="data" ref="table"
-                   sortable="custom"
-                   @on-sort-change="changeSort"
-                   @on-selection-change="changeSelect">
-
-            </Table>
-          </Row>
+          <Table :loading="loading"
+            border
+            :columns="columns"
+            :data="data" ref="table"
+            sortable="custom"
+            @on-sort-change="changeSort"
+            @on-selection-change="changeSelect">
+          </Table>
           <Row type="flex" justify="end" class="page">
             <Page :current="searchForm.pageNumber"
                   :total="total"