guhongwei před 4 roky
rodič
revize
d63395b7d7
1 změnil soubory, kde provedl 6 přidání a 4 odebrání
  1. 6 4
      src/views/userCenter/eventInfo/part/allList.vue

+ 6 - 4
src/views/userCenter/eventInfo/part/allList.vue

@@ -72,13 +72,15 @@ export default {
     ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
     // 列表
     async searchInfo({ skip = 0, limit = 6, ...info } = {}) {
+      let userid = this.user.uid;
       let market_userid = this.user.uid;
       skip = this.skip;
-      const res = await this.transactionList({ skip, limit, market_userid, ...info });
+      const res = await this.transactionList({ skip, limit, userid, ...info });
+      const arr = await this.transactionList({ skip, limit, market_userid, ...info });
+      var newData = res.data.concat(arr.data);
       if (this.$checkRes(res)) {
-        console.log(res.data);
-        this.$set(this, `list`, res.data);
-        this.$set(this, `total`, res.total);
+        this.$set(this, `list`, newData);
+        this.$set(this, `total`, newData.length);
       }
     },
     // 分页