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

src/App.vue

@@ -346,6 +346,10 @@ export default {
     &.bindingImage {
         background-color: #0f1014;
     }
+
+    &.mineSuperLink {
+        background-color: #0f0f0f;
+    }
 }
 
 .scroll-wrappers {

src/components/ChatInfo.vue

@@ -42,48 +42,51 @@
                     :height="imgHeight"
                 ></van-image>
                 <div class="chat-message" v-else-if="type === 'text'">
-                    <div
-                        style="
-                            line-height: 40px;
-                            background: #06c04f;
-                            border-radius: 4px;
-                            padding: 0 20px;
-                            margin-bottom: 12px;
-                        "
-                    >
-                        RAEX绿洲：RID元域名称交易监控
-                    </div>
-                    <div style="display: flex">
-                        <img
-                            style="width: 18px; height: 18px; margin: 5px 10px 0 0"
-                            src="https://cdn.raex.vip/image/2023-04-06-14-32-07vINcTaZP.png"
-                            alt=""
-                        />
-                        <span>RID: 058.nft【已出售】</span>
-                    </div>
-                    <div style="display: flex">
-                        <img
-                            style="width: 18px; height: 18px; margin: 5px 10px 0 0"
-                            src="https://cdn.raex.vip/image/2023-04-06-14-28-32HcaKTDYb.png"
-                            alt=""
-                        />
-                        <span>分类: 【RID元域名】</span>
-                    </div>
-                    <div style="display: flex">
-                        <img
-                            style="width: 18px; height: 18px; margin: 5px 10px 0 0"
-                            src="https://cdn.raex.vip/image/2023-04-06-14-31-49lldhGaqC.png"
-                            alt=""
-                        />
-                        <span>销售价格: 【3899.99 】</span>
-                    </div>
-                    <div style="display: flex">
-                        <img
-                            style="width: 18px; height: 18px; margin: 5px 10px 0 0"
-                            src="https://cdn.raex.vip/image/2023-04-06-14-32-21ciilInpO.png"
-                            alt=""
-                        />
-                        <span>交易时间：<br />【2023-03-08 11:23:37】</span>
+                    <div style="padding: 4px 0">
+                        <div
+                            style="
+                                line-height: 40px;
+                                background: #06c04f;
+                                border-radius: 4px;
+                                padding: 0 12px;
+                                margin-bottom: 12px;
+                                font-weight: bold;
+                            "
+                        >
+                            RAEX绿洲：RID元域名称交易监控
+                        </div>
+                        <div style="display: flex; margin-bottom: 8px">
+                            <img
+                                style="width: 18px; height: 18px; margin: 5px 10px 0 0"
+                                src="https://cdn.raex.vip/image/2023-04-06-14-32-07vINcTaZP.png"
+                                alt=""
+                            />
+                            <span>RID: 058.nft【已出售】</span>
+                        </div>
+                        <div style="display: flex; margin-bottom: 8px">
+                            <img
+                                style="width: 18px; height: 18px; margin: 5px 10px 0 0"
+                                src="https://cdn.raex.vip/image/2023-04-06-14-28-32HcaKTDYb.png"
+                                alt=""
+                            />
+                            <span>分类: 【RID元域名】</span>
+                        </div>
+                        <div style="display: flex; margin-bottom: 8px">
+                            <img
+                                style="width: 18px; height: 18px; margin: 5px 10px 0 0"
+                                src="https://cdn.raex.vip/image/2023-04-06-14-31-49lldhGaqC.png"
+                                alt=""
+                            />
+                            <span>销售价格: 【3899.99 】</span>
+                        </div>
+                        <div style="display: flex">
+                            <img
+                                style="width: 18px; height: 18px; margin: 5px 10px 0 0"
+                                src="https://cdn.raex.vip/image/2023-04-06-14-32-21ciilInpO.png"
+                                alt=""
+                            />
+                            <span>交易时间：<br />【2023-03-08 11:23:37】</span>
+                        </div>
                     </div>
                 </div>
                 <van-image

src/components/TeamInfo.vue

@@ -51,6 +51,9 @@ const desc = computed(() => {
     if (props.info.inTeam && msg.value.time) {
         let _msg = JSON.parse(msg.value.body).msg;
         let isImage = _msg.startsWith('https://');
+        if (msg.value.fromId === '9859') {
+            return 'RID元域名称交易监控';
+        }
         return msg.value.fromNickName + ': ' + (isImage ? '【图片消息】' : _msg);
     }
 

src/components/rice/Share.vue

@@ -74,9 +74,13 @@ function share() {
 
 const inWeixin = /micromessenger/i.test(navigator.userAgent);
 function openWeixin() {
-    if (!inWeixin) {
-        window.location.href = 'weixin://';
-    }
+    gobal.$toast.success('复制成功');
+    setTimeout(() => {
+        if (!inWeixin) {
+            window.location.href = 'weixin://';
+        }
+        show.value = false;
+    }, 1000);
 }
 
 const showHelp = ref(false);

src/views/Discover.vue

@@ -18,7 +18,8 @@
                 <div class="top">
                     <img src="@assets/nav_logo.png" class="logo" alt="" />
 
-                    <div class="search" @click="$router.push('/searchAll')">
+                    <!-- <div class="search" @click="$router.push('/searchAll')"> -->
+                    <div class="search" @click="$router.push('/productSearch')">
                         <img src="@assets/icon-sosuo.png" alt="" />
                         <span> 搜索你要的精彩 </span>
                     </div>

src/views/DomainName.vue

@@ -37,14 +37,14 @@
                             />
                             <div>排行</div>
                         </div>
-                        <div class="meta_domain_name_top_one_con_tip" @click="$router.push('/statistics')">
+                        <!-- <div class="meta_domain_name_top_one_con_tip" @click="$router.push('/statistics')">
                             <img
                                 :src="require('@assets/icon_liutong.png')"
                                 alt=""
                                 class="meta_domain_name_top_img_right"
                             />
                             <div>流通</div>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="meta_domain_name_top_ones" v-if="action != 1">

src/views/Home.vue

@@ -14,23 +14,23 @@
                 <div class="text1">WELCOME</div>
                 <div class="text2" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
             </div>
-            <!-- <van-image
+            <van-image
                 width="38"
                 height="38"
                 :radius="32"
                 :class="{ activeAvatar: isLogin && userInfo.useCollectionPic }"
                 :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
             >
-            </van-image> -->
+            </van-image>
 
-            <img
+            <!-- <img
                 src="@/assets/icon_sosuo_dark.png"
                 @click="$router.push('/searchAll')"
                 v-if="darkTheme"
                 alt=""
                 class="search-all"
             />
-            <img src="@/assets/icon_sosuo.png" @click="$router.push('/searchAll')" v-else alt="" class="search-all" />
+            <img src="@/assets/icon_sosuo.png" @click="$router.push('/searchAll')" v-else alt="" class="search-all" /> -->
         </div>
 
         <div class="card swiper-card">

src/views/Mine.vue

@@ -192,13 +192,13 @@
                 <div class="menus_list_division">
                     <div class="menus_list_division_con"></div>
                 </div> -->
-                <div class="menus_list_con" @click="$router.push('/mineSuperLink')">
+                <!-- <div class="menus_list_con" @click="$router.push('/mineSuperLink')">
                     <div class="menus_list_con_left">
                         <img src="@assets/icon-chaolian.png" alt="" class="menus_list_con_left_img" />
                         <span>我的超链</span>
                     </div>
                     <img src="@assets/icon_inter@3x.png" alt="" class="menus_list_con_right_img" />
-                </div>
+                </div> -->
                 <div class="menus_list_division">
                     <div class="menus_list_division_con"></div>
                 </div>

src/views/asset/Detail.vue

@@ -499,15 +499,15 @@
 
                 <div class="more-btns-content" v-else>
                     <!-- <van-button v-if="!isOlder" @click="publish" color="#FF7F1F" block round> 竞价拍卖 </van-button> -->
-                    <!-- <van-button v-if="!isOlder && !$store.state.review" @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 @click="Add" color="#FFBF27" block round> 赠送 </van-button>
                     <van-button @click="showLock = true" v-if="info.category !== '元域名'" color="#515976" block round>
                         封存
                     </van-button>
-                    <van-button @click="starCreate" v-if="canStar" color="#5D7DFF" block round> 铸造星图 </van-button> -->
-                    <div class="btn-img-list">
+                    <van-button @click="starCreate" v-if="canStar" color="#5D7DFF" block round> 铸造星图 </van-button>
+                    <!-- <div class="btn-img-list">
                         <div class="btn-img" v-if="info.category === '元域名'" @click="superLink">
                             <img src="@/assets/icon_qiyongchaolian.png" alt="" />
                             <div>{{ info.openHyperLink ? '关闭超链' : '启用超链' }}</div>
@@ -528,7 +528,7 @@
                             <img src="@/assets/icon_fengcun.png" alt="" />
                             <div>封存</div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </van-action-sheet>
         </div>

src/views/domain/BindingWeb.vue

@@ -21,6 +21,29 @@
             <van-button type="default" @click="$router.back()" round>返回</van-button>
             <van-button type="primary" v-if="address" round @click="sure">确认</van-button>
         </div>
+
+        <van-overlay :show="show" @click="show = false" z-index="99">
+            <div class="notice" @click.stop="">
+                <div class="text1">抖音绑定说明</div>
+                <div class="text2">选择抖音视频 <span>复制链接</span> 来粘贴吧</div>
+                <div class="tips">
+                    <div class="tips-text">
+                        <span class="box">1</span>
+                        复制抖音链接
+                    </div>
+                    <img src="@/assets/douyin-shuoming1.png" alt="" />
+                    <img src="@/assets/douyin-shuoming2.png" alt="" />
+                    <div class="tips-text">
+                        <span class="box">2</span>
+                        粘贴链接
+                    </div>
+                    <img src="@/assets/douyin-shuoming3.png" alt="" />
+                </div>
+                <div class="btn">
+                    <van-button type="primary" block round @click="show = false">知道了</van-button>
+                </div>
+            </div>
+        </van-overlay>
     </div>
 </template>
 <script>
@@ -30,7 +53,8 @@ export default {
         return {
             address: '',
             assetId: 0,
-            type: 'EXTERNALLINK'
+            type: 'EXTERNALLINK',
+            show: false
         };
     },
     computed: {
@@ -49,6 +73,10 @@ export default {
         if (this.$route.query.type) {
             this.type = this.$route.query.type;
         }
+
+        if (this.type === 'VIBRATO_VIDEO') {
+            this.show = true;
+        }
     },
     methods: {
         sure() {
@@ -155,4 +183,75 @@ export default {
         }
     }
 }
+
+.notice {
+    width: 300px;
+    height: 495px;
+    background: #161414;
+    border-radius: 8px;
+    border: 1px solid #302b30;
+    backdrop-filter: blur(11px);
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    .flex-col();
+    align-items: center;
+    padding: 20px 0;
+    box-sizing: border-box;
+
+    .text1 {
+        font-size: 18px;
+        font-weight: bold;
+        color: #ffffff;
+        line-height: 25px;
+    }
+
+    .text2 {
+        font-size: 14px;
+        color: #939599;
+        line-height: 24px;
+        margin-top: 4px;
+        span {
+            color: #00fe1e;
+        }
+    }
+}
+
+.tips {
+    background: #1f1d1d;
+    border-radius: 8px;
+    padding: 16px;
+    margin-top: 12px;
+
+    .tips-text {
+        .box {
+            width: 14px;
+            height: 14px;
+            background: #00fe1e;
+            border-radius: 14px;
+            display: inline-block;
+            font-size: 12px;
+            font-weight: bold;
+            color: #000000;
+            line-height: 14px;
+            text-align: center;
+        }
+
+        font-size: 12px;
+        color: #00fe1e;
+        line-height: 17px;
+        margin-bottom: 12px;
+    }
+
+    img {
+        width: 228px;
+        display: block;
+        margin-bottom: 16px;
+    }
+}
+
+.btn {
+    width: 160px;
+}
 </style>