panhui 4 anni fa
parent
commit
da577623ea
2 ha cambiato i file con 12 aggiunte e 10 eliminazioni
  1. 9 8
      src/views/Store.vue
  2. 3 2
      src/views/order/AuctionOrders.vue

+ 9 - 8
src/views/Store.vue

@@ -224,8 +224,13 @@ export default {
             } else if (this.active === 'creator') {
                 return [
                     {
-                        label: '全部',
-                        value: 'createdAt,desc',
+                        label: '市场交易',
+                        value: 'TRANSFERRED',
+                        type: ''
+                    },
+                    {
+                        label: '拍卖',
+                        value: 'AUCTIONED',
                         type: ''
                     }
                     // {
@@ -263,11 +268,7 @@ export default {
             }
         },
         sort() {
-            if (this.active === 'creator') {
-                return this.type;
-            } else {
-                return 'createdAt,desc';
-            }
+            return 'createdAt,desc';
         },
         status() {
             if (this.active === 'explore') {
@@ -277,7 +278,7 @@ export default {
                     return 'NORMAL,TRADING,GIFTING,MINTING,AUCTIONING';
                 }
             } else if (this.active === 'creator') {
-                return 'TRANSFERRED';
+                return this.type || 'TRANSFERRED';
             } else {
                 return '';
             }

+ 3 - 2
src/views/order/AuctionOrders.vue

@@ -114,7 +114,8 @@ export default {
                 return {
                     query: {
                         userId: this.$store.state.userInfo.id,
-                        paymentType: this.paymentType
+                        paymentType: this.paymentType,
+                        source: this.type === 'ENTITY' ? 'OFFICIAL' : 'TRANSFER'
                         // hide: false,
                         // del: false
                     },
@@ -155,7 +156,7 @@ export default {
                     this.list = res;
                     this.empty = res.length === 0;
                     this.finished = true;
-                     this.loading = false;
+                    this.loading = false;
                 } else {
                     if (res.first) {
                         this.list = [];