.

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

@@ -58,6 +58,7 @@
                         @click.prevent="like(item)"
                     >
                         {{ item.follow ? '已关注' : '关注' }}
+                        <!-- {{ item.follow ? (isFollow ? '互相关注' : '已关注') : '关注' }} -->
                     </el-button>
                 </div>
             </router-link>

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

@@ -31,6 +31,7 @@
                         @click="like(info)"
                     >
                         {{ info.follow ? '已关注' : '关注' }}
+                        <!-- {{ info.follow ? (isFollow ? '互相关注' : '已关注') : '关注' }} -->
                     </el-button>
                     <el-popover popper-class="share-popver" placement="bottom" trigger="hover">
                         <el-button style="margin-left: 20px; color: #939599" slot="reference" plain round size="mini"
@@ -47,7 +48,7 @@
 
             <div class="anchor" style="height: 50px" ref="anchor"></div>
 
-            <el-radio-group class="menu" v-model="isOwner" size="normal">
+            <el-radio-group @change="change" class="menu" v-model="isOwner" size="normal">
                 <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">
                     <div class="radio-item">
                         <span>{{ item.label }}</span>
@@ -66,14 +67,32 @@
                     @change="onSearch"
                 >
                 </el-input>
-                <!-- <el-select class="select" v-model="value" @change="getList" placeholder="请选择">
-                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select> -->
-                <el-select class="select" style="margin-top: 30px" v-model="sortStr" placeholder="请选择">
-                    <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
+                <div style="display: flex">
+                    <el-select
+                        style="margin: 30px 20px 0 0; width: 120px"
+                        class="select"
+                        v-model="value"
+                        @change="getList"
+                        placeholder="请选择"
+                    >
+                        <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
+                    </el-select>
+                    <el-select
+                        class="select"
+                        style="margin-top: 30px; width: 120px"
+                        v-model="sortStr"
+                        placeholder="请选择"
+                    >
+                        <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
             </div>
 
             <div class="list" v-loading="fetchingData">
@@ -184,32 +203,53 @@ export default {
         setList(list) {
             this.list = list;
         },
+        change(e) {
+            let status = e ? '' : true;
+            let form = {
+                page: 0,
+                size: 20,
+                query: {
+                    minterId: this.info.id,
+                    del: false,
+                    type: 'DEFAULT',
+                    salable: status
+                }
+            };
+            this.$http.post('/collection/all', form, { body: 'json' }).then(res => {
+                this.list = res.content;
+            });
+        },
         getList() {
             let form = {
-                page: this.page,
+                page: 0,
                 size: 20,
                 query: {
-                    userId: this.info.id
-                    // status: 'NORMAL,TRADING,GIFTING'
-                },
-                sort: 'createdAt,desc'
+                    minterId: this.info.id,
+                    del: false,
+                    type: 'DEFAULT'
+                }
             };
-            if (this.value === 'NORMAL') {
+            if (this.value === '') {
                 form.query = {
                     ...form.query,
-                    salable: false
-                    // consignment: false
+                    del: false,
+                    salable: ''
                 };
             }
             if (this.value === 'ON_SALE') {
                 form.query = {
                     ...form.query,
-                    consignment: true
+                    salable: true
+                };
+            }
+            if (this.value === 'NORMAL') {
+                form.query = {
+                    ...form.query,
+                    salable: false
                 };
             }
-            this.$http.post('/asset/all', form, { body: 'json' }).then(res => {
-                this.list = [...this.list, ...res.content];
-                console.log(this.list);
+            this.$http.post('/collection/all', form, { body: 'json' }).then(res => {
+                this.list = res.content;
             });
         }
     }

src/main/pc-space/src/views/user/AccountData.vue

@@ -67,6 +67,7 @@
                                             @click.prevent="like(item)"
                                         >
                                             {{ item.follow ? '已关注' : '关注' }}
+                                            <!-- {{ item.follow ? (isFollow ? '互相关注' : '已关注') : '关注' }} -->
                                         </el-button>
                                     </div>
                                 </div>
@@ -271,6 +272,7 @@ export default {
             if (e === '关注') {
                 this.$http.get('/user/myFollows').then(res => {
                     this.list = res;
+                    console.log(res);
                     this.$store.dispatch('getUserInfo');
                     if (this.list.length === 0) {
                         this.empty = true;