Merge branch 'dev' of xiongzhu/raex_front into master

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://www.raex.vip/
+VUE_APP_BASE_URL=https://test.raex.vip/
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

src/views/Home.vue

@@ -51,6 +51,22 @@
             <img src="@assets/topbg1.png" class="swiper-bg" alt="" />
         </div>
 
+        <div class="card news">
+            <div class="news-title" @click="$router.push('/newsList')">
+                <div class="news-left">
+                    <div class="text1">绿洲头条新闻</div>
+                    <div class="text2">快来了解绿洲宇宙新动态</div>
+                </div>
+                <img class="more" src="@assets/icon_inter.png" alt="" />
+            </div>
+            <news-record
+                v-for="(item, index) in news"
+                :key="index"
+                v-model:info="news[index].obj"
+                type="light"
+            ></news-record>
+        </div>
+
         <div class="short-list">
             <div class="short-info" @click="$router.push('/starMap')">
                 <img src="@assets/home1.png" alt="" class="short-img" />
@@ -91,22 +107,6 @@
             </div>
         </div>
 
-        <div class="card news">
-            <div class="news-title" @click="$router.push('/newsList')">
-                <div class="news-left">
-                    <div class="text1">绿洲头条新闻</div>
-                    <div class="text2">快来了解绿洲宇宙新动态</div>
-                </div>
-                <img class="more" src="@assets/icon_inter.png" alt="" />
-            </div>
-            <news-record
-                v-for="(item, index) in news"
-                :key="index"
-                v-model:info="news[index].obj"
-                type="light"
-            ></news-record>
-        </div>
-
         <div class="card news">
             <div class="news-title" @click="$router.push('/activityList')">
                 <div class="news-left">

src/views/StarMap.vue

@@ -100,7 +100,7 @@ export default {
     background-color: #030001;
     position: relative;
     min-height: var(--app-height);
-    padding-top: var(--safe-top);
+    // padding-top: var(--safe-top);
     & > div {
         position: relative;
         z-index: 1;
@@ -167,7 +167,7 @@ export default {
 
 .tips {
     margin: 0 16px 0;
-    padding: 0px 40px 20px;
+    padding: 0px 10px 20px;
     position: relative;
     z-index: 1;
     .text1 {

src/views/auction/Home.vue

@@ -30,7 +30,7 @@
                 />
             </swiper-slide>
         </swiper>
-        <van-tabs v-model:active="auctionType" shrink @change="getData(true)">
+        <van-tabs v-model:active="auctionType" shrink @change="changeTab">
             <van-tab title="官方拍卖" name="OFFICIAL"></van-tab>
             <van-tab title="藏家市场" name="NFT"></van-tab>
             <!-- <van-tab title="藏家市场" name="ENTITY"></van-tab> -->
@@ -91,6 +91,17 @@ export default {
         this.getBanner();
     },
     methods: {
+        changeTab(tab) {
+            console.log(tab);
+            if (tab === 'NFT') {
+                this.wait();
+                this.$nextTick(() => {
+                    this.auctionType = 'OFFICIAL';
+                });
+            } else {
+                this.getData(true);
+            }
+        },
         getBanner() {
             return this.$http
                 .post(
@@ -262,4 +273,4 @@ export default {
     padding: 8px;
     min-height: calc(100vh - 156px);
 }
-</style>
+</style>