字体

src/main/nine-space/src/components/PageTitle.vue

@@ -14,7 +14,7 @@ export default {
         flex: 2;
         span {
             font-size: 20px;
-            font-family: ZhenyanGB-Regular, ZhenyanGB;
+            // font-family: ZhenyanGB-Regular, ZhenyanGB;
         }
     }
     padding: 30px 16px 12px 16px;

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

@@ -91,8 +91,6 @@ export default {
         flex-grow: 1;
         .btn {
             font-size: 16px;
-            font-family: ZhenyanGB;
-            font-weight: 400;
             line-height: 26px;
             display: inline-block;
             vertical-align: text-bottom;

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

@@ -175,8 +175,8 @@ export default {
         flex-grow: 1;
         .btn {
             font-size: 16px;
-            font-family: ZhenyanGB;
-            font-weight: 400;
+            // font-family: ZhenyanGB;
+            // font-weight: 400;
             line-height: 26px;
             display: inline-block;
             vertical-align: text-bottom;

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

@@ -169,8 +169,6 @@ export default {
         flex-grow: 1;
         .btn {
             font-size: 16px;
-            font-family: ZhenyanGB;
-            font-weight: 400;
             line-height: 26px;
             display: inline-block;
             vertical-align: text-bottom;

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

@@ -93,8 +93,6 @@ export default {
         flex-grow: 1;
         .btn {
             font-size: 16px;
-            font-family: ZhenyanGB;
-            font-weight: 400;
             line-height: 26px;
             display: inline-block;
             vertical-align: text-bottom;

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

@@ -19,7 +19,7 @@
                     </div>
                 </div>
                 <div class="btn-list" v-if="isLogin">
-                    <el-dropdown @command="onCommand" placement='' style="margin-left: 20px">
+                    <el-dropdown @command="onCommand" style="margin-left: 20px">
                         <span class="el-dropdown-link">
                             <img class="img" :src="avatarBox" />
                         </span>

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

@@ -211,3 +211,7 @@ body {
 .el-select-dropdown {
     border-color: #fff;
 }
+
+.el-popper {
+    border-width: 0;
+}

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

@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <div class="title" ref="anchor">欢迎来到 NFT 市场</div>
-        <el-radio-group class="menu" v-model="type" size="normal">
+        <el-radio-group class="menu" v-model="select" size="normal">
             <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">
                 <div class="radio-item">
                     <i class="font_family" :class="[item.icon]"></i>
@@ -58,22 +58,22 @@ export default {
                 {
                     label: '全部',
                     icon: 'icon-icon-quanbu',
-                    value: ''
+                    value: '0'
                 },
                 {
                     label: '新品',
                     icon: 'icon-icon-zuixin',
-                    value: 'DEFAULT'
+                    value: '1'
                 },
                 {
-                    label: '盲盒',
+                    label: '转让',
                     icon: 'icon-icon-zhuanrang',
-                    value: 'BLIND_BOX'
+                    value: '2'
                 },
                 {
                     label: '拍卖',
                     icon: 'icon-icon-paimai',
-                    value: 'AUCTION'
+                    value: '3'
                 }
             ],
             sortList: [
@@ -95,33 +95,66 @@ export default {
                 }
             ],
             search: '',
-            type: '',
+            select: '0',
             url: '/collection/all',
-            list: []
+            list: [],
+            type: 'DEFAULT,AUCTION'
         };
     },
     mixins: [pageableTable],
     watch: {
-        type() {
+        select() {
+            switch (this.select) {
+                case '0':
+                    this.type = 'DEFAULT,AUCTION';
+                    this.canResale = '';
+                    break;
+                case '1':
+                    this.type = 'DEFAULT';
+                    this.canResale = '';
+                    break;
+                case '2':
+                    this.type = 'DEFAULT,AUCTION';
+                    this.canResale = true;
+                    break;
+                case '3':
+                    this.type = 'AUCTION';
+                    this.canResale = '';
+                    break;
+            }
+
             this.$router
                 .replace({
                     query: {
                         ...this.$route.query,
-                        type: this.type
+                        type: this.type,
+                        canResale: this.canResale
                     }
                 })
                 .catch(() => {});
+
+            this.page = 1;
             this.getData();
         }
     },
     methods: {
         beforeGetData() {
-            return {
-                search: this.search,
-                query: {
-                    type: this.type
-                }
-            };
+            if (this.canResale) {
+                return {
+                    search: this.search,
+                    query: {
+                        type: this.type,
+                        canResale: this.canResale
+                    }
+                };
+            } else {
+                return {
+                    search: this.search,
+                    query: {
+                        type: this.type
+                    }
+                };
+            }
         },
         setList(list) {
             this.list = list;