Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/router/index.js

@@ -827,7 +827,7 @@ const routes = [
     {
         path: '/superLinkType',
         name: 'superLinkType',
-        component: () => import('../views/domain/SuperLinkType.vue'),
+        component: () => import('../views/domain/SuperLink.vue'),
         meta: {
             menuPage: true
         }

src/views/Discover.vue

@@ -36,7 +36,7 @@
         </swiper> -->
 
         <div class="menu">
-            <div class="menu-con menu-cons">
+            <div class="menu-con">
                 <div
                     class="menu-item_con menu-item_con_one"
                     @click="$router.push('/hopeMarket')"
@@ -67,9 +67,11 @@
                 </div>
                 <div class="text2"> 环球捕猎顶级艺术展览，尽在绿洲宇宙！ </div>
                 <img src="../assets/discover/yishuzhanlan-diwen.png" alt="" class="menu-bg" /> -->
-            </div>
-            <div class="menu-con">
-                <div class="menu-item_con menu-item_con_three" @click="$router.push('/auction')">
+                <div
+                    class="menu-item_con menu-item_con_three"
+                    v-if="!$store.state.review"
+                    @click="$router.push('/auction')"
+                >
                     <img :src="require(`@assets/info_icon_paimaixilie@3x.png`)" alt="" class="menu-item_con_img" />
                     <div>
                         <div class="menu-item_con_title">绿洲易拍</div>
@@ -264,20 +266,6 @@ export default {
             empty: false,
             scrollTop: 0,
             sort: 'collection',
-            selectOptions: [
-                {
-                    label: '数字商品',
-                    value: 'collection'
-                },
-                {
-                    label: '元域名',
-                    value: 'domain'
-                },
-                {
-                    label: '个人作品',
-                    value: 'collection_MY'
-                }
-            ],
             icons: [
                 require('../assets/info_icon_lvzhoutoutiao.png'),
                 require('../assets/info_icon_lvzhougongyi.png'),
@@ -308,6 +296,35 @@ export default {
             } else {
                 return this.list;
             }
+        },
+        selectOptions() {
+            if (!this.$store.state.review) {
+                return [
+                    {
+                        label: '数字商品',
+                        value: 'collection'
+                    },
+                    {
+                        label: '元域名',
+                        value: 'domain'
+                    },
+                    {
+                        label: '个人作品',
+                        value: 'collection_MY'
+                    }
+                ];
+            } else {
+                return [
+                    {
+                        label: '数字商品',
+                        value: 'collection'
+                    },
+                    {
+                        label: '个人作品',
+                        value: 'collection_MY'
+                    }
+                ];
+            }
         }
     },
     mounted() {
@@ -658,6 +675,7 @@ export default {
     .menu-con {
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
 
         .menu-item_con {
             width: calc(50vw - 22.5px);
@@ -669,6 +687,10 @@ export default {
             align-items: center;
             border-radius: 8px;
 
+            &:nth-child(n + 3) {
+                margin-top: 12px;
+            }
+
             .menu-item_con_img {
                 width: 32px;
                 height: 32px;

src/views/DomainName.vue

@@ -15,6 +15,7 @@
                     />
                     <div class="meta_domain_name_top_one_con">
                         <div
+                            v-if="!$store.state.review"
                             class="meta_domain_name_top_one_con_tip meta_domain_name_top_one_con_tips"
                             @click="$router.push('/metaDomain')"
                         >

src/views/Home.vue

@@ -68,7 +68,7 @@
             </news-record>
         </div>
 
-        <div class="card card-hot" @click="$router.push('/auction')">
+        <div class="card card-hot" @click="$router.push('/auction')" v-if="!$store.state.review">
             <van-image :src="require('../assets/paimaiBg.png')" fit="cover" width="100%" height="110vw" />
         </div>
 
@@ -80,7 +80,7 @@
                     <div class="text2 van-ellipsis">属于你的元宇宙物资铸造中心</div>
                 </div>
             </div>
-            <div class="short-info" @click="$router.push('/auction')">
+            <div class="short-info" v-if="!$store.state.review" @click="$router.push('/auction')">
                 <img src="@assets/2.png" alt="" class="short-img" />
                 <div class="short-content">
                     <div class="text1">绿洲易拍</div>
@@ -94,7 +94,7 @@
                     <div class="text2 van-ellipsis">属于你的元宇宙标识</div>
                 </div>
             </div>
-            <div class="short-info" @click="$router.push('/hopeMarket')">
+            <div class="short-info" v-if="!$store.state.review" @click="$router.push('/hopeMarket')">
                 <img src="@assets/4.png" alt="" class="short-img" />
                 <div class="short-content">
                     <div class="text1">元宇宙物资</div>
@@ -121,26 +121,28 @@
         </div>
 
         <div class="card-list">
-            <div
-                class="card card-hot"
-                :style="{
-                    order: index < 1 ? index + 1 : index + 2,
-                    display: item.name === '新手引导' ? 'none' : 'block'
-                }"
-                v-for="(item, index) in hots"
-                :key="index"
-                @click="goNext(item)"
-            >
-                <van-image :src="item.pic" fit="cover" width="100%" height="110vw" />
-                <div class="hot-top" v-if="index < 2">
-                    <div class="text1">{{ item.name }}</div>
-                    <div class="text2">{{ item.remark }}</div>
-                </div>
-                <div class="hot-bottom" v-else>
-                    <div class="text1">{{ item.name }}</div>
-                    <div class="text2">{{ item.remark }}</div>
+            <template v-for="(item, index) in hots" :key="index">
+                <div
+                    class="card card-hot"
+                    :style="{
+                        order: index < 1 ? index + 1 : index + 2,
+                        display: item.name === '新手引导' ? 'none' : 'block'
+                    }"
+                    v-if="!$store.state.review || item.name !== '版权保护市场'"
+                    @click="goNext(item)"
+                >
+                    <van-image :src="item.pic" fit="cover" width="100%" height="110vw" />
+                    <div class="hot-top" v-if="index < 2">
+                        <div class="text1">{{ item.name }}</div>
+                        <div class="text2">{{ item.remark }}</div>
+                    </div>
+                    <div class="hot-bottom" v-else>
+                        <div class="text1">{{ item.name }}</div>
+                        <div class="text2">{{ item.remark }}</div>
+                    </div>
                 </div>
-            </div>
+            </template>
+
             <div class="card news" v-if="HotCollects.length > 0 && !$store.state.reviewPay">
                 <div class="news-title">
                     <div class="news-left">
@@ -167,7 +169,7 @@
                     </swiper> -->
                 </div>
             </div>
-            <div class="application_market">
+            <div class="application_market" v-if="!$store.state.review">
                 <div class="application_market_con">
                     <div class="application_market_con_text">应用市场</div>
                     <div class="application_market_con_list">

src/views/Index.vue

@@ -31,38 +31,68 @@ export default {
     computed: {
         ...mapState(['darkTheme']),
         menus() {
-            let menus = [
-                {
-                    name: 'home',
-                    title: '首页',
-                    icon: require('@assets/tabbar_icon_01.png'),
-                    preIcon: require('@assets/tabbar_icon_01_pre.png')
-                },
-                {
-                    name: 'discover',
-                    title: '发现',
-                    icon: require('@assets/tabbar_icon_02.png'),
-                    preIcon: require('@assets/tabbar_icon_02_pre.png')
-                },
-                {
-                    name: 'chatList',
-                    title: '群组',
-                    icon: require('@assets/tabbar_icon_06.png'),
-                    preIcon: require('@assets/tabbar_icon_06_pre.png')
-                },
-                {
-                    name: 'store',
-                    title: '藏品室',
-                    icon: require('@assets/tabbar_icon_03.png'),
-                    preIcon: require('@assets/tabbar_icon_03_pre.png')
-                },
-                {
-                    name: 'mine',
-                    title: '我的',
-                    icon: require('@assets/tabbar_icon_04.png'),
-                    preIcon: require('@assets/tabbar_icon_04_pre.png')
-                }
-            ];
+            let menus = [];
+            if (!this.$store.state.review) {
+                menus = [
+                    {
+                        name: 'home',
+                        title: '首页',
+                        icon: require('@assets/tabbar_icon_01.png'),
+                        preIcon: require('@assets/tabbar_icon_01_pre.png')
+                    },
+                    {
+                        name: 'discover',
+                        title: '发现',
+                        icon: require('@assets/tabbar_icon_02.png'),
+                        preIcon: require('@assets/tabbar_icon_02_pre.png')
+                    },
+                    {
+                        name: 'chatList',
+                        title: '群组',
+                        icon: require('@assets/tabbar_icon_06.png'),
+                        preIcon: require('@assets/tabbar_icon_06_pre.png')
+                    },
+                    {
+                        name: 'store',
+                        title: '藏品室',
+                        icon: require('@assets/tabbar_icon_03.png'),
+                        preIcon: require('@assets/tabbar_icon_03_pre.png')
+                    },
+                    {
+                        name: 'mine',
+                        title: '我的',
+                        icon: require('@assets/tabbar_icon_04.png'),
+                        preIcon: require('@assets/tabbar_icon_04_pre.png')
+                    }
+                ];
+            } else {
+                menus = [
+                    {
+                        name: 'home',
+                        title: '首页',
+                        icon: require('@assets/tabbar_icon_01.png'),
+                        preIcon: require('@assets/tabbar_icon_01_pre.png')
+                    },
+                    {
+                        name: 'discover',
+                        title: '发现',
+                        icon: require('@assets/tabbar_icon_02.png'),
+                        preIcon: require('@assets/tabbar_icon_02_pre.png')
+                    },
+                    {
+                        name: 'store',
+                        title: '藏品室',
+                        icon: require('@assets/tabbar_icon_03.png'),
+                        preIcon: require('@assets/tabbar_icon_03_pre.png')
+                    },
+                    {
+                        name: 'mine',
+                        title: '我的',
+                        icon: require('@assets/tabbar_icon_04.png'),
+                        preIcon: require('@assets/tabbar_icon_04_pre.png')
+                    }
+                ];
+            }
             if (this.$store.state.hopeMarket || this.$store.state.starPage) {
                 menus = [
                     {

src/views/Store.vue

@@ -360,7 +360,7 @@ export default {
     computed: {
         typeOptions() {
             if (this.active === 'explore') {
-                if (!this.$store.state.reviewPay) {
+                if (!this.$store.state.reviewPay && !this.$store.state.review) {
                     return [
                         {
                             label: '全部',

src/views/asset/Detail.vue

@@ -498,7 +498,7 @@
                 </div>
 
                 <div class="more-btns-content" v-else>
-                    <van-button v-if="!isOlder" @click="Consignment" type="primary" block round>
+                    <van-button v-if="!isOlder && !$store.state.review" @click="Consignment" type="primary" block round>
                         {{ info.consignment ? '取消一口价' : '一口价拍卖' }}
                     </van-button>
                     <!-- <van-button v-if="!isOlder" @click="publish" color="#FF7F1F" block round> 竞价拍卖 </van-button> -->

src/views/user/Rice.vue

@@ -137,7 +137,8 @@ export default {
 
 .page {
     min-height: var(--app-height) !important;
-    background: linear-gradient(181deg, #7dbdff 0%, #7ebdff 54%, #61c65e 61%, #61c65d 100%);
+    background-color: #272B2E;
+    // background: linear-gradient(181deg, #7dbdff 0%, #7ebdff 54%, #61c65e 61%, #61c65d 100%);
     // .flex-col();
     // justify-content: center;
     // align-items: center;