'13455'

src/views/merchant/dashboard/index.vue

@@ -24,8 +24,8 @@
                 <el-col :span="6">
                     <div class="total-panel">
                         <div class="right">
-                            <div class="title">支付订单数</div>
-                            <div class="number">0</div>
+                            <div class="title">退款金额</div>
+                            <div class="number">0.00</div>
                         </div>
                     </div>
                 </el-col>
@@ -33,7 +33,7 @@
                     <div class="total-panel">
                         <div class="icon"><el-icon size="22" color="#4799ff"><el-icon-pie-chart /></el-icon></div>
                         <div class="right">
-                            <div class="title">新增用户数</div>
+                            <div class="title">商品总数量</div>
                             <div class="number">0.00</div>
                         </div>
                     </div>
@@ -41,14 +41,14 @@
                 <el-col :span="6">
                     <div class="total-panel">
                         <div class="right">
-                            <div class="title">付款用户数</div>
-                            <div class="number">0.00</div>
+                            <div class="title">付款订单总量</div>
+                            <div class="number">0</div>
                         </div>
                     </div>
                 </el-col>
             </el-row>
         </el-card>
-        <div class="total-panel-list">
+        <!-- <div class="total-panel-list">
             <el-row :gutter="20">
                 <el-col :span="6">
                     <div class="total-panel padding15">
@@ -87,7 +87,7 @@
                     </div>
                 </el-col>
             </el-row>
-        </div>
+        </div> -->
         <div class="total-order-status">
             <el-row :gutter="20">
                 <el-col :span="6">
@@ -190,6 +190,6 @@ export default {
 .total-panel .title{font-size: 13px;color: #666;}
 .total-panel .number{font-size: 24px;color: #000;line-height: 38px;}
 .total-panel-list{margin: 20px 0;}
-.total-order-status{background-color: #fff;padding: 20px;}
+.total-order-status{background-color: #fff;padding: 20px;margin-top: 20px;}
 .mt10{margin-top: 20px;}
 </style>

src/views/merchant/order/index/components/table.vue

@@ -111,7 +111,41 @@ export default {
         },
         table_del(data){
             
-        }
+        },
+        refresh(){
+            this.$refs.table.refresh()
+        },
+        upData(data){
+            this.$refs.table.upData(data)
+        },
+        handleSuccess(){
+            this.$refs.table.refresh()
+        },
+        sortChange(event){
+            if (event.order) {
+                var data = {
+                    "field":event.prop,
+                    "order":event.order
+                }
+                this.$refs.table.upData(data)
+            } else {
+                this.$refs.table.reload(this.searchKey)
+            }
+            return ;
+        },
+        selectionChange(event){
+            this.dataSelect = [];
+            var arr = [];
+            var arrCompany = [];
+            event.forEach(function(val,index){
+                arr[index] = val.id;
+                arrCompany[index] = val;
+            });
+            this.dataSelectFull = arrCompany;
+            this.dataSelect = arr;
+            this.$emit("success",this.dataSelect);
+            this.$emit("successFull",this.dataSelectFull);
+        },
     }
 }
 </script>

src/views/service/dashboard/index.vue

@@ -10,7 +10,7 @@
         </el-main>
     </div>
     <el-main v-else>
-        <el-card shadow="never" header="实时概况" class="no-boder">
+        <el-card shadow="never" header="实时概况（今日）" class="no-boder">
             <el-row :gutter="10">
                 <el-col :span="6">
                     <div class="total-panel">
@@ -24,8 +24,8 @@
                 <el-col :span="6">
                     <div class="total-panel">
                         <div class="right">
-                            <div class="title">支付订单数</div>
-                            <div class="number">0</div>
+                            <div class="title">退款金额</div>
+                            <div class="number">0.00</div>
                         </div>
                     </div>
                 </el-col>
@@ -33,16 +33,16 @@
                     <div class="total-panel">
                         <div class="icon"><el-icon size="22" color="#4799ff"><el-icon-pie-chart /></el-icon></div>
                         <div class="right">
-                            <div class="title">新增用户数</div>
-                            <div class="number">0.00</div>
+                            <div class="title">核销数</div>
+                            <div class="number">0</div>
                         </div>
                     </div>
                 </el-col>
                 <el-col :span="6">
                     <div class="total-panel">
                         <div class="right">
-                            <div class="title">付款用户数</div>
-                            <div class="number">0.00</div>
+                            <div class="title">付款订单数</div>
+                            <div class="number">0</div>
                         </div>
                     </div>
                 </el-col>
@@ -52,9 +52,9 @@
             <el-row :gutter="20">
                 <el-col :span="6">
                     <div class="total-panel padding15">
-                        <div class="icon"><el-icon size="22" color="#4799ff"><el-icon-coin /></el-icon></div>
+                        <div class="icon"><el-icon size="22" color="#4799ff"><el-icon-money /></el-icon></div>
                         <div class="right">
-                            <div class="title">商品总数量</div>
+                            <div class="title">累计营业额</div>
                             <div class="number">0.00</div>
                         </div>
                     </div>
@@ -63,7 +63,7 @@
                     <div class="total-panel padding15">
                         <div class="icon"><el-icon size="22" color="#4799ff"><el-icon-coin /></el-icon></div>
                         <div class="right">
-                            <div class="title">会员总人数</div>
+                            <div class="title">累计退款</div>
                             <div class="number">0.00</div>
                         </div>
                     </div>
@@ -72,8 +72,8 @@
                     <div class="total-panel padding15">
                         <div class="icon"><el-icon size="22" color="#4799ff"><el-icon-coin /></el-icon></div>
                         <div class="right">
-                            <div class="title">付款订单总量</div>
-                            <div class="number">0.00</div>
+                            <div class="title">累计付款总量</div>
+                            <div class="number">0</div>
                         </div>
                     </div>
                 </el-col>
@@ -190,6 +190,6 @@ export default {
 .total-panel .title{font-size: 13px;color: #666;}
 .total-panel .number{font-size: 24px;color: #000;line-height: 38px;}
 .total-panel-list{margin: 20px 0;}
-.total-order-status{background-color: #fff;padding: 20px;}
+.total-order-status{background-color: #fff;padding: 20px;margin-top: 20px;}
 .mt10{margin-top: 20px;}
 </style>

src/views/service/order/index/components/table.vue

@@ -111,7 +111,41 @@ export default {
         },
         table_del(data){
             
-        }
+        },
+        refresh(){
+            this.$refs.table.refresh()
+        },
+        upData(data){
+            this.$refs.table.upData(data)
+        },
+        handleSuccess(){
+            this.$refs.table.refresh()
+        },
+        sortChange(event){
+            if (event.order) {
+                var data = {
+                    "field":event.prop,
+                    "order":event.order
+                }
+                this.$refs.table.upData(data)
+            } else {
+                this.$refs.table.reload(this.searchKey)
+            }
+            return ;
+        },
+        selectionChange(event){
+            this.dataSelect = [];
+            var arr = [];
+            var arrCompany = [];
+            event.forEach(function(val,index){
+                arr[index] = val.id;
+                arrCompany[index] = val;
+            });
+            this.dataSelectFull = arrCompany;
+            this.dataSelect = arr;
+            this.$emit("success",this.dataSelect);
+            this.$emit("successFull",this.dataSelectFull);
+        },
     }
 }
 </script>