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

1.8

See merge request !7

src/views/order/activityOrder/index.vue

@@ -324,8 +324,19 @@ export default {
       this.getTotalMount();
     },
     getTotalMount() {
-      this.listQuery.status = 6;
-      activeAmountTotal(this.listQuery).then((res) => {
+      let data = {
+        page: 1,
+        limit: 10,
+        activityId: this.listQuery.activityId,
+        orderNo: this.listQuery.orderNo,
+        phone: this.listQuery.phone,
+        status: 6,
+        startPayTime: this.listQuery.startPayTime,
+        endPayTime: this.listQuery.endPayTime,
+        name: this.listQuery.name,
+        leaderPhone: this.listQuery.leaderPhone,
+      };
+      activeAmountTotal(data).then((res) => {
         if (res.status == 200) {
           this.totalobj = res.data;
         }