licailing 4 vuotta sitten
vanhempi
commit
4bbe4fc10c

+ 2 - 2
src/main/vue/src/views/GiftOrderList.vue

@@ -55,8 +55,8 @@
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
             <el-table-column prop="userId" label="赠送用户ID" width="100px"> </el-table-column>
             <el-table-column prop="nickname" label="赠送用户"> </el-table-column>
-            <el-table-column prop="assetId" label="藏品ID"> </el-table-column>
-            <el-table-column prop="assetId" label="名称"> </el-table-column>
+            <el-table-column prop="collectionId" label="藏品ID"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
             <el-table-column prop="toUserId" label="收到用户ID" width="100px"> </el-table-column>
             <el-table-column prop="toNickname" label="收到用户"> </el-table-column>
             <el-table-column prop="payMethod" label="支付方式"> </el-table-column>

+ 1 - 1
src/main/vue/src/views/OrderList.vue

@@ -155,7 +155,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false, status: this.status, createdAt: this.createdAt } };
+            return { search: this.search, query: { del: false, status: this.status, createdAt: this.createdAt, source: 'OFFICIAL' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

+ 1 - 1
src/main/vue/src/views/OrderUsedList.vue

@@ -155,7 +155,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false, status: this.status, createdAt: this.createdAt } };
+            return { search: this.search, query: { del: false, status: this.status, createdAt: this.createdAt, source: 'TRANSFER' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;