Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/pc-space/public/index.html

@@ -5,7 +5,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-        <title><%= htmlWebpackPlugin.options.title %></title>
+        <title>第九空间</title>
         <link rel="stylesheet" href="./client.css" />
         <link rel="stylesheet" href="https://at.alicdn.com/t/font_2852142_5nb94jewry2.css" />
         <link

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

@@ -1,13 +1,5 @@
 <template>
-    <router-link
-        :to="{
-            path: '/collectionDetail',
-            query: {
-                id: info.id
-            }
-        }"
-        class="collect"
-    >
+    <a :href="`/collectionDetail?id=${info.id}`" class="collect" :target="target">
         <el-image class="imgBox" :src="getImg(changeImgs(info.pic))" fit="cover"></el-image>
 
         <div class="introduce">{{ info.name }}</div>
@@ -44,7 +36,7 @@
                 </div> -->
             </div>
         </div>
-    </router-link>
+    </a>
 </template>
 
 <script>
@@ -58,6 +50,10 @@ export default {
             default: () => {
                 return {};
             }
+        },
+        target: {
+            type: String,
+            default: '_self'
         }
     },
     mixins: [product],

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

@@ -113,7 +113,7 @@ export default {
     },
     mounted() {
         this.$EventBus.$on('login', () => {
-            this.show = true;
+            this.Login()
         });
         this.getActive();
         setTimeout(() => {
@@ -292,6 +292,11 @@ export default {
             color: #fff;
             font-weight: bold;
         }
+        &:focus {
+            &.is-active.is-focus {
+                box-shadow: none;
+            }
+        }
     }
 
     .el-tabs__nav-wrap {

src/main/pc-space/src/mixins/list.js

@@ -51,8 +51,7 @@ export default {
                     search: this.search
                 }
             });
-            this.page = 1;
-            this.getData();
+            this.getData(true);
         },
         onSortChange(e) {
             this.sort = e;

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

@@ -32,8 +32,7 @@ const routes = [
                 name: 'casting',
                 component: () => import('../views/Casting.vue'),
                 meta: {
-                    title: '铸造',
-                    checkLogin: true
+                    title: '铸造'
                 }
             },
             {
@@ -41,8 +40,7 @@ const routes = [
                 name: 'castingDetail',
                 component: () => import('../views/CastingDetail.vue'),
                 meta: {
-                    title: '铸造',
-                    checkLogin: true
+                    title: '铸造'
                 }
             },
             {
@@ -50,8 +48,7 @@ const routes = [
                 name: 'collection',
                 component: () => import('../views/Collection.vue'),
                 meta: {
-                    title: '收藏探索',
-                    checkLogin: true
+                    title: '收藏探索'
                 }
             },
             {
@@ -59,8 +56,7 @@ const routes = [
                 name: 'blindbox',
                 component: () => import('../views/Blindsbox.vue'),
                 meta: {
-                    title: '数字盲盒',
-                    checkLogin: true
+                    title: '数字盲盒'
                 }
             },
             {
@@ -68,8 +64,7 @@ const routes = [
                 name: 'collectionDetail',
                 component: () => import('../views/CollectionDetail.vue'),
                 meta: {
-                    title: '数字盲盒详情',
-                    checkLogin: true
+                    title: '数字盲盒详情'
                 }
             },
             {
@@ -77,8 +72,7 @@ const routes = [
                 name: 'assetDetail',
                 component: () => import('../views/AssetDetail.vue'),
                 meta: {
-                    title: 'NFT详情',
-                    checkLogin: true
+                    title: 'NFT详情'
                 }
             },
             {

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

@@ -196,7 +196,12 @@
             </router-link>
         </div>
         <div class="list" v-loading="loading" v-if="relateds.length > 0">
-            <collection-info v-for="(item, index) in relateds" :key="item.id" :info.sync="relateds[index]">
+            <collection-info
+                target="_blank"
+                v-for="(item, index) in relateds"
+                :key="item.id"
+                :info.sync="relateds[index]"
+            >
             </collection-info>
         </div>
         <!-- 悄悄话 -->
@@ -308,6 +313,10 @@ export default {
     watch: {
         $route() {
             this.getDetail();
+            window.scrollTo({
+                top: 0,
+                behavior: 'smooth'
+            });
         }
     },
     methods: {

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

@@ -101,7 +101,6 @@ export default {
         };
     },
     mixins: [list],
-
     computed: {
         ...mapState(['userInfo']),
         status() {