1028

src/main/nine-space/src/router/index.js

@@ -221,6 +221,14 @@ const routes = [
             title: '第九空间'
         }
     },
+    {
+        path: '/assetSearch',
+        name: 'assetSearch',
+        component: () => import('../views/asset/Search.vue'),
+        meta: {
+            title: '第九空间'
+        }
+    },
     {
         path: '/submit',
         name: 'submit',

src/main/nine-space/src/styles/app.less

@@ -30,7 +30,7 @@
     --van-uploader-upload-background-color: transparent;
     --van-uploader-file-background-color: transparent;
     --van-active-color: @bg3;
-    --van-image-placeholder-background-color: @bg2;
+    --van-image-placeholder-background-color: @bg3;
     --van-search-background-color: #181818;
     --van-search-content-background-color: #0f0f0f;
     // --van-picker-background-color: @bg;

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

@@ -1,7 +1,7 @@
 <template>
     <div class="mine">
         <div class="userInfo" v-if="isLogin">
-            <van-image width="100%" height="35vw" :src="userInfo.bg" fit="cover" class="top-img" />
+            <van-image width="100%" height="35vw" :src="userInfo.bg" loading-icon="" fit="cover" class="top-img" />
             <div class="userInfo-content">
                 <div class="userInfo-top">
                     <van-image

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

@@ -12,9 +12,9 @@
             我卖出的
           </div> -->
                 </div>
-                <!-- <div class="search">
-          <img src="../assets/svgs/search.svg" alt="" />
-        </div> -->
+                <div class="search" v-if="isLogin" @click="$router.push('/assetSearch')">
+                    <img src="../assets/svgs/search.svg" alt="" />
+                </div>
             </div>
 
             <van-tabs
@@ -68,7 +68,6 @@
 <script>
 import AssetInfo from '../components/asset/assetInfo.vue';
 import asset from '../mixins/asset';
-
 export default {
     name: 'discover',
     mixins: [asset],
@@ -80,17 +79,21 @@ export default {
         return {
             active: 'explore',
             stiky: null,
-            type: 'DEFAULT',
+            type: '',
             empty: false,
             list: [],
             typeOptions: [
                 {
-                    label: '藏品类目',
-                    type: 'DEFAULT'
+                    label: '全部',
+                    type: ''
                 },
                 {
-                    label: '盲盒类目',
-                    type: 'BLIND_BOX'
+                    label: '售卖',
+                    type: 'ON_SALE'
+                },
+                {
+                    label: '仅展示',
+                    type: 'NORMAL'
                 }
             ],
             showSelect: false,
@@ -120,29 +123,31 @@ export default {
             this.loading = true;
             this.finished = false;
             this.empty = false;
-            this.$http
-                .post(
-                    '/asset/all',
-                    {
-                        page: this.page,
-                        size: 20,
-                        query: {
-                            userId: this.$store.state.userInfo.id,
-                            type: this.type
-                        },
-                        sort: 'createdAt,desc'
-                    },
-                    { body: 'json' }
-                )
-                .then(res => {
-                    this.list = [...this.list, ...res.content];
-                    this.empty = res.empty;
-                    this.loading = false;
-                    this.finished = res.last;
-                    if (!this.finished) {
-                        this.page = this.page + 1;
-                    }
-                });
+            let form = {
+                page: this.page,
+                size: 20,
+                query: {
+                    userId: this.$store.state.userInfo.id,
+                    status: this.type
+                },
+                sort: 'createdAt,desc'
+            };
+            if (this.type === 'NORMAL') {
+                form.query = {
+                    ...form.query,
+                    publicShow: true
+                };
+            }
+
+            this.$http.post('/asset/all', form, { body: 'json' }).then(res => {
+                this.list = [...this.list, ...res.content];
+                this.empty = res.empty;
+                this.loading = false;
+                this.finished = res.last;
+                if (!this.finished) {
+                    this.page = this.page + 1;
+                }
+            });
         },
         changeActive(active) {
             this.active = active;

src/main/nine-space/src/views/account/Verified.vue

@@ -51,7 +51,6 @@
             </van-field>
 
             <van-field
-                type="digit"
                 label="身份证号"
                 name="身份证号"
                 placeholder="请输入身份证号"

src/main/nine-space/src/views/asset/Search.vue

@@ -0,0 +1,228 @@
+<template>
+    <div class="discover">
+        <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
+            <van-search
+                ref="top"
+                shape="round"
+                v-model="search"
+                placeholder="请输入"
+                show-action
+                autofocus
+                :left-icon="require('../../assets/svgs/icon-sosuo.svg')"
+                @search="getSearch"
+                @cancel="$router.go(-1)"
+            />
+        </van-sticky>
+
+        <van-list
+            class="box-list"
+            v-model:loading="loading"
+            :immediate-check="false"
+            :finished="finished"
+            finished-text=""
+            @load="getData"
+        >
+            <template v-for="(item, index) in list" :key="index">
+                <asset-info :info="item"></asset-info>
+            </template>
+
+            <van-empty v-if="empty" description="您还没有任何藏品哦~" />
+        </van-list>
+    </div>
+</template>
+
+<script>
+import AssetInfo from '../../components/asset/assetInfo.vue';
+import asset from '../../mixins/asset';
+import list from '../../mixins/list';
+export default {
+    name: 'discover',
+    mixins: [asset, list],
+    inject: ['bar'],
+    components: {
+        AssetInfo
+    },
+    data() {
+        return {
+            active: 'explore',
+            stiky: null,
+            type: '',
+            empty: false,
+            list: [],
+            typeOptions: [
+                {
+                    label: '全部',
+                    type: ''
+                },
+                {
+                    label: '售卖',
+                    type: 'ON_SALE'
+                },
+                {
+                    label: '仅展示',
+                    type: 'NORMAL'
+                }
+            ],
+            search: '',
+            url: '/asset/all'
+        };
+    },
+    methods: {
+        beforeData() {
+            return {
+                query: {
+                    userId: this.$store.state.userInfo.id
+                },
+                search: this.search
+            };
+        },
+        getSearch(search) {
+            this.search = search;
+            this.getData(true);
+        }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.top {
+    display: flex;
+    padding: 10px 16px;
+    background-color: @bg;
+    .top-btn {
+        flex-grow: 1;
+        .btn {
+            font-size: 16px;
+            font-family: ZhenyanGB;
+            font-weight: 400;
+            line-height: 26px;
+            display: inline-block;
+            vertical-align: text-bottom;
+
+            &.active {
+                color: @prim;
+                font-size: 20px;
+                font-weight: bold;
+                line-height: 30px;
+            }
+        }
+
+        .btn + .btn {
+            margin-left: 30px;
+        }
+    }
+}
+.select {
+    position: absolute;
+    right: 16px;
+    bottom: 9px;
+    color: #939599 !important;
+    min-width: 96px;
+}
+// /deep/.van-sticky {
+//     position: relative;
+// }
+
+.discover {
+    background-color: @bg3;
+    min-height: 100vh;
+    box-sizing: border-box;
+}
+
+/deep/ .mySwiper {
+    width: calc(100vw - 32px);
+    height: calc(41vw - 13px);
+
+    .swiper-pagination {
+        bottom: 12px;
+    }
+
+    .swiper-pagination-bullet {
+        width: 6px;
+        height: 2px;
+        border-radius: 1px;
+        background: #d7d7d7;
+    }
+
+    .swiper-pagination-bullet-active {
+        background: @prim;
+    }
+}
+
+.swiper-slide {
+    text-align: center;
+    font-size: 18px;
+
+    /* Center slide text vertically */
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    -webkit-justify-content: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    -webkit-align-items: center;
+    align-items: center;
+}
+
+.swiper-slide img {
+    display: block;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    border-radius: 4px;
+}
+.grid-img {
+    display: block;
+}
+.van-grid {
+    margin-top: 12px;
+}
+/deep/ .van-grid-item__content {
+    padding: 14px 20px 16px;
+}
+/deep/ .van-grid-item__text {
+    color: #fff;
+    font-size: 13px;
+    line-height: 18px;
+    margin-top: 4px;
+}
+
+.title {
+    padding: 16px 20px 8px;
+    color: @prim;
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.box-list {
+    // display: flex;
+    // flex-wrap: wrap;
+    padding: 8px 8px 100px;
+}
+
+/deep/.van-tab {
+    color: #fff;
+    flex-grow: 0;
+    padding: 0 0 0 0;
+    margin-right: 30px;
+
+    &.van-tab--active {
+        color: @prim;
+    }
+}
+/deep/.van-tabs__nav {
+    padding-left: 16px;
+}
+
+/deep/ .van-tabs__line {
+    bottom: 20px;
+}
+
+/deep/.van-action-sheet__description::after {
+    border-bottom: 1px solid #f2f2f2;
+}
+</style>

src/main/nine-space/src/views/creator/Search.vue

@@ -9,23 +9,32 @@
                 show-action
                 autofocus
                 :left-icon="require('../../assets/svgs/icon-sosuo.svg')"
-                @search="getList"
+                @search="getSearch"
                 @cancel="$router.go(-1)"
             />
         </van-sticky>
-        <div class="list">
+        <van-list
+            class="list"
+            v-model:loading="loading"
+            :immediate-check="false"
+            :finished="finished"
+            finished-text=""
+            @load="getData"
+        >
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
             <van-empty v-if="empty" description="没有任何收藏者哦~" />
-        </div>
+        </van-list>
     </div>
 </template>
 
 <script>
 import CreatorInfo from '../../components/creator/CreatorInfo.vue';
+import list from '../../mixins/list';
 export default {
     name: 'Search',
+    mixins: [list],
     components: { CreatorInfo },
     inject: ['bar'],
     data() {
@@ -34,50 +43,20 @@ export default {
             empty: false,
             search: '',
             stiky: null,
-            type: ''
+            type: '',
+            url: '/user/all'
         };
     },
-    beforeRouteLeave(to, from, next) {
-        if (to.name !== 'productDetail') {
-            this.setKeeps([]);
-        }
-        next();
-    },
-    computed: {
-        pageName() {
-            return this.getLabelName(this.type, this.typeOptions);
-        }
-    },
-    mounted() {
-        this.setKeeps(['Search']);
-        if (this.$route.query.type) {
-            this.type = this.$route.query.type;
-        }
-    },
     methods: {
-        getList(search) {
+        beforeData() {
+            return {
+                query: { hasRole: 'ROLE_MINTER' },
+                search: this.search
+            };
+        },
+        getSearch(search) {
             this.search = search;
-            this.$toast.loading({
-                message: '加载中...',
-                forbidClick: true
-            });
-            this.$http
-                .post(
-                    '/user/all',
-                    {
-                        page: 0,
-                        query: { hasRole: 'ROLE_MINTER' },
-                        size: 20,
-                        sort: 'createdAt,desc',
-                        search: this.search
-                    },
-                    { body: 'json' }
-                )
-                .then(res => {
-                    this.list = res.content;
-                    this.empty = res.empty;
-                    this.$toast.clear();
-                });
+            this.getData(true);
         }
     }
 };

src/main/nine-space/src/views/product/Search.vue

@@ -9,27 +9,35 @@
                 show-action
                 autofocus
                 :left-icon="require('../../assets/svgs/icon-sosuo.svg')"
-                @search="getList"
+                @search="getSearch"
                 @cancel="$router.go(-1)"
             />
         </van-sticky>
-        <div class="list">
+        <van-list
+            class="list"
+            v-model:loading="loading"
+            :immediate-check="false"
+            :finished="finished"
+            finished-text=""
+            @load="getData"
+        >
             <template v-for="(item, index) in list" :key="index">
                 <product-info v-model:info="list[index]" @update:info="init"></product-info>
             </template>
             <van-empty v-if="empty" description="没有任何藏品哦~" />
-        </div>
+        </van-list>
     </div>
 </template>
 
 <script>
 import ProductInfo from '../../components/product/productInfo.vue';
 import product from '../../mixins/product';
+import list from '../../mixins/list';
 export default {
     name: 'Search',
     components: { ProductInfo },
     inject: ['bar'],
-    mixins: [product],
+    mixins: [product, list],
     data() {
         return {
             list: [],
@@ -37,62 +45,38 @@ export default {
             search: '',
             stiky: null,
             type: '',
-            minterId: ''
+            minterId: '',
+            url: '/collection/all'
         };
     },
-    beforeRouteLeave(to, from, next) {
-        if (to.name !== 'productDetail') {
-            this.setKeeps([]);
-        }
-        next();
-        // ...
-    },
     computed: {
         pageName() {
             return this.getLabelName(this.type, this.typeOptions);
         }
     },
     mounted() {
-        this.setKeeps(['Search']);
         if (this.$route.query.type) {
             this.type = this.$route.query.type;
         }
         if (this.$route.query.minterId) {
             this.minterId = this.$route.query.minterId;
         }
-        this.$nextTick(() => {
-            this.stiky = this.$refs.top.$el.childNodes[0];
-        });
     },
     methods: {
-        getList(search) {
+        beforeData() {
+            return {
+                query: {
+                    onShelf: true,
+                    type: this.type,
+                    minterId: this.minterId,
+                    del: false
+                },
+                search: this.search
+            };
+        },
+        getSearch(search) {
             this.search = search;
-            this.$toast.loading({
-                message: '加载中...',
-                forbidClick: true
-            });
-            this.$http
-                .post(
-                    '/collection/all',
-                    {
-                        page: 0,
-                        size: 20,
-                        query: {
-                            onShelf: true,
-                            type: this.type,
-                            minterId: this.minterId,
-                            del: false
-                        },
-                        sort: 'createdAt,desc',
-                        search: this.search
-                    },
-                    { body: 'json' }
-                )
-                .then(res => {
-                    this.list = res.content;
-                    this.empty = res.empty;
-                    this.$toast.clear();
-                });
+            this.getData(true);
         }
     }
 };