修改

src/main/nine-space/src/views/Store.vue

@@ -82,6 +82,7 @@ export default {
             type: '',
             empty: false,
             list: [],
+            label: '全部',
             typeOptions: [
                 {
                     label: '全部',
@@ -101,7 +102,9 @@ export default {
             action: null,
             loading: false,
             finished: false,
-            page: 0
+            page: 0,
+            name1: '',
+            name: ''
         };
     },
     mounted() {
@@ -127,8 +130,7 @@ export default {
                 page: this.page,
                 size: 20,
                 query: {
-                    userId: this.$store.state.userInfo.id,
-                    status: this.type
+                    userId: this.$store.state.userInfo.id
                 },
                 sort: 'createdAt,desc'
             };
@@ -138,7 +140,12 @@ export default {
                     publicShow: true
                 };
             }
-
+            if (this.type === 'ON_SALE') {
+                form.query = {
+                    userId: this.$store.state.userInfo.id,
+                    consignment: true
+                };
+            }
             this.$http.post('/asset/all', form, { body: 'json' }).then(res => {
                 this.list = [...this.list, ...res.content];
                 this.empty = res.empty;

src/main/pc-space/src/components/ConsignmentInfo.vue

@@ -46,7 +46,7 @@
                 </div>
             </div>
             <span slot="footer" class="sub-btn">
-                <el-button :disabled="btn" type="primary" @click="submit">立即支付</el-button>
+                <el-button :disabled="btn" type="primary" @click="submit">立即寄售</el-button>
                 <div class="btn2" @click="isShow = false">返回</div>
             </span>
         </div>

src/main/pc-space/src/views/My.vue

@@ -26,7 +26,7 @@
             </el-select>
         </div>
         <div class="list" v-loading="fetchingData">
-            <template v-if="select === '0'">
+            <template v-if="select === '0' || select === '1'">
                 <asset-info v-for="(item, index) in list" :key="item.id" :info.sync="list[index]"></asset-info>
             </template>
             <template v-if="select === '2'">
@@ -108,37 +108,13 @@ export default {
         select() {
             switch (this.select) {
                 case '0':
-                    this.url = '/asset/all';
                     break;
                 case '1':
-                    // this.url = '/asset/all';
                     break;
                 case '2':
-                    // this.url = '/userCoupon/all';
-                    break;
-                case '3':
-                    this.type = 'AUCTION';
-                    this.canResale = '';
                     break;
             }
-
-            this.$router
-                .replace({
-                    query: {
-                        ...this.$route.query,
-                        type: this.type,
-                        canResale: this.canResale
-                    }
-                })
-                .catch(() => {});
-
-            this.page = 1;
             this.getData();
-        },
-        '$route.query.type'() {
-            if (!this.$route.query.type || this.$route.query.type === 'BLIND_BOX') {
-                this.init();
-            }
         }
     },
     methods: {
@@ -156,12 +132,22 @@ export default {
                 });
         },
         beforeGetData() {
-            return {
-                search: this.search,
-                query: {
-                    userId: this.$store.state.userInfo.id
-                }
-            };
+            if (this.select === '1') {
+                return {
+                    search: this.search,
+                    query: {
+                        userId: this.$store.state.userInfo.id,
+                        consignment: true
+                    }
+                };
+            } else {
+                return {
+                    search: this.search,
+                    query: {
+                        userId: this.$store.state.userInfo.id
+                    }
+                };
+            }
         },
         setList(list) {
             this.list = list;

src/main/pc-space/src/views/Submit.vue

@@ -214,12 +214,10 @@ export default {
                 .post(url)
                 .then(res => {
                     if (this.money) {
-                        // console.log(111);
                         this.status = res.status;
                         this.id = res.id;
                         // this.show = false;
                     } else {
-                        console.log(222);
                         this.$message.success('支付成功');
                         setTimeout(() => {
                             this.$router.replace('/collectionorder');