Merge remote-tracking branch 'origin/feature/20240911_1640_091101' into release_pre_20240918144032

src/views/sale/groupList.vue

@@ -120,7 +120,7 @@ export default {
       listQuery: {
         page: 1,
         limit: 20,
-        type: 6
+        typeList: [6]
       },
       list: [],
       total: 0,
@@ -149,7 +149,7 @@ export default {
       this.listQuery = {
         page: 1,
         limit: 20,
-        type: 6
+        typeList: [6]
       }
       this.getList()
     },

src/views/sale/itemList.vue

@@ -52,7 +52,7 @@
       <el-table-column align="center" min-width="100px" prop="id" label="拍品ID" fixed="left"/>
       <el-table-column align="center" label="封面图" prop="itemImg" min-width="100px">
         <template slot-scope="scope">
-            <!-- <img v-if="scope.row.images" :src="scope.row.images.split(';')[0]" width="60px" height="60px" @click="handleShowPreview(scope.row.images)"> -->
+          <!-- <img v-if="scope.row.images" :src="scope.row.images.split(';')[0]" width="60px" height="60px" @click="handleShowPreview(scope.row.images)"> -->
           <div class="image_preview">
             <el-image
               :preview-src-list="scope.row.images.split(';')"
@@ -197,7 +197,7 @@ export default {
       listQuery: {
         page: 1,
         limit: 20,
-        type: 3
+        typeList: [3, 7]
       },
       list: [],
       total: 0,
@@ -319,7 +319,7 @@ export default {
       this.listQuery = {
         page: 1,
         limit: 20,
-        type: 3
+        typeList: [3, 7]
       }
       this.getList()
     },

src/views/user/userDetail.vue

@@ -293,7 +293,7 @@ export default {
     getItemList() {
       this.listLoading = true
       this.listQuery.creatorId = this.userId
-      this.listQuery.type = 3
+      this.listQuery.listType = [3, 7]
       this.listQuery.id = ''
       getSaleList(this.listQuery).then(response => {
         this.list = response.data.data.dataList