Merge branch 'master' into ma

seller/src/views/order/order/orderList.vue

@@ -120,6 +120,20 @@
             title: "订单来源",
             key: "clientType",
             width: 120,
+            render: (h, params) => {
+              if (params.row.clientType == "H5") {
+                return h("div",{},"移动端");
+              }else if(params.row.clientType == "PC") {
+                return h("div",{},"PC端");
+              }else if(params.row.clientType == "WECHAT_MP") {
+                return h("div",{},"小程序端");
+              }else if(params.row.clientType == "APP") {
+                return h("div",{},"移动应用端");
+              }
+              else{
+                return h("div",{},params.row.clientType);
+              }
+            },
           },
           {
             title: "订单类型",

seller/src/views/shop/bill/accountStatementBill.vue

@@ -225,7 +225,7 @@
       },
       getDataList() {
         this.loading = true;
-        this.searchForm.billStatus = "OUT"
+        this.searchForm.billStatus = "CHECK"
         API_Shop.getBillPage(this.searchForm).then((res) => {
           this.loading = false;
           if (res.success) {

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>