Merge branch 'dev-td' into 'master-td'

Dev td

See merge request !6

src/views/order/activityOrder/index.vue

@@ -108,8 +108,8 @@
       >
     </div>
     <div style="width: 100%; text-align: right; margin-bottom: 10px">
+      <el-tag>支付总金额：{{ totalobj.totalAmount }}</el-tag>
       <el-tag>总数：{{ totalobj.number }}</el-tag>
-      <el-tag>总金额：{{ totalobj.totalAmount }}</el-tag>
       <el-tag>总佣金：{{ totalobj.totalComissonAmount }}</el-tag>
     </div>
 
@@ -305,6 +305,7 @@ export default {
     handleFilter() {
       this.listQuery.page = 1;
       this.getList();
+      this.getTotalMount();
     },
     clearSearch() {
       this.listQuery = {
@@ -320,9 +321,11 @@ export default {
         leaderPhone: undefined,
       };
       this.getList();
+      this.getTotalMount();
     },
     getTotalMount() {
-      activeAmountTotal().then((res) => {
+      this.listQuery.status = 6;
+      activeAmountTotal(this.listQuery).then((res) => {
         if (res.status == 200) {
           this.totalobj = res.data;
         }