Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/CollectionList.vue

@@ -131,7 +131,7 @@ export default {
         right: 0;
     }
     .current_recommendation_title {
-        margin-top: 10px;
+        margin-top: 8px;
         padding: 0 10px;
         width: 100%;
         white-space: nowrap;

src/components/Post.vue

@@ -243,24 +243,24 @@ export default {
         },
         save() {
             if (window.cordova) {
-            let _this = this;
-            imageSaver.saveBase64Image(
-                { data: this.img },
-                function (filePath) {
-                    _this.$toast('图片已保存至文件夹');
-                    _this.show = false;
-                    console.log('File saved on ' + filePath);
-                },
-                function (msg) {
-                    _this.$dialog.alert({
-                        title: '提示',
-                        message: msg + ',请尝试截图保存分享'
-                    });
-                    (1).then(() => {
-                        _this.preview(0, [_this.img]);
-                    });
-                }
-            );
+                let _this = this;
+                imageSaver.saveBase64Image(
+                    { data: this.img },
+                    function (filePath) {
+                        _this.$toast('图片已保存至文件夹');
+                        _this.show = false;
+                        console.log('File saved on ' + filePath);
+                    },
+                    function (msg) {
+                        _this.$dialog.alert({
+                            title: '提示',
+                            message: msg + ',请尝试截图保存分享'
+                        });
+                        (1).then(() => {
+                            _this.preview(0, [_this.img]);
+                        });
+                    }
+                );
             }
         }
     }
@@ -352,12 +352,14 @@ export default {
         width: 100%;
         display: flex;
         justify-content: space-between;
+        align-items: center;
         background: #1e222c;
         border-radius: 8px;
         .minter_con_one {
             display: flex;
-            padding: 12px 0px 6px 15px;
+            padding: 0 0px 6px 15px;
             box-sizing: border-box;
+            align-items: center;
             .minter_con_one_text1 {
                 width: 60px;
                 height: 32px;
@@ -368,22 +370,17 @@ export default {
                 // color: #eacc9b;
             }
             .minter_con_one_text2 {
-                height: 20px;
-                padding: 0px 4px;
-                margin-top: 5px;
+                padding: 2px 4px;
                 border: 1px solid #f9ddb3;
-                box-sizing: border-box;
-                border-radius: 2px;
+                border-radius: 4px;
                 font-size: 14px;
-                font-family: PingFangSC-Light, PingFang SC;
-                font-weight: 300;
                 color: #f9ddb3;
+                margin-left: 1px;
                 line-height: 14px;
-                // line-height: 16px;
             }
         }
         .minter_con_two {
-            padding: 0px 0px 10px 15px;
+            padding: 0px 0px 0px 15px;
             box-sizing: border-box;
             font-size: 10px;
             font-family: PingFangSC-Regular, PingFang SC;
@@ -413,8 +410,8 @@ export default {
 }
 
 .tips {
-    font-size: 13px;
-    color: @text3;
+    font-size: 17px;
+    color: rgba(255, 255, 255, 1);
     line-height: 22px;
     margin-top: 30px;
 }

src/components/creator/CreatorInfo.vue

@@ -222,7 +222,7 @@ export default {
     border-radius: 4px;
     font-size: 14px;
     font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
+    font-weight: bold;
     color: #503a1e;
     line-height: 20px;
     text-align: center;

src/components/product/ProductBanner.vue

@@ -37,14 +37,14 @@
                     />
                 </swiper-slide>
             </swiper>
-            <div class="share-content">
+            <div :class="!!info.model3d?'share-content':'share-content-one'">
                 <!-- <div class="setAvatar" @click="setAvatar" v-if="pageType == 'asset' && onlyImg">
                     <img src="../../assets/icon-sheweitouxiang.png" alt="" />
                     <span>设为头像</span>
                 </div> -->
 
                 <like-button v-if="pageType == 'product'" :isLike="info.liked" @click="likeProduct">
-                    {{ info.likes }}
+                    {{ info.likes||'收藏' }}
                 </like-button>
 
                 <div class="share-icon shareLeft" @click="share" v-if="isShare && !startTime && !assignment">
@@ -190,7 +190,7 @@ export default {
 @radius: 30px;
 .detail-top {
     position: relative;
-    height: calc(100vw - 50px);
+    height: 80vw;
     .detail-info {
         position: absolute;
         top: 50%;
@@ -240,6 +240,13 @@ export default {
 
 .share-content {
     display: flex;
+    transform: translateY(-10px);
+    // position: absolute;
+    // bottom: 0;
+}
+.share-content-one{
+    display: flex;
+    margin-top: 40px;
 }
 .share-icon {
     img {

src/components/product/recentSale.vue

@@ -1,13 +1,5 @@
 <template>
-    <router-link
-        v-for="(item, index) in arr" :key="index"
-        :to="{
-            path: '/productDetail',
-            query: {
-                collectionId: item.id
-            }
-        }"
-    >
+    <div v-for="(item, index) in arr" :key="index">
         <div class="recent_sale_list">
             <img :src="getImg(item.pic[0].url)" alt="" class="recent_sale_list_three_img" />
             <div class="recent_sale_list_three_con">
@@ -23,7 +15,7 @@
             </div>
             <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture">
         </div>
-    </router-link>
+    </div>
 </template>
 
 <script>

src/main.js

@@ -143,6 +143,7 @@ if (navigator.userAgent.includes('#cordova#')) {
         function () {
             StatusBar.overlaysWebView(true);
             window.$vm = app.mount('#app');
+
             loadSplash(
                 () => {
                     setTimeout(() => {
@@ -154,8 +155,8 @@ if (navigator.userAgent.includes('#cordova#')) {
                 }
             ).then(res => {
                 StatusBar.overlaysWebView(false);
-                StatusBar.backgroundColorByHexString('#F5F7FA');
-                StatusBar.styleDefault();
+                StatusBar.backgroundColorByHexString('#191d27');
+                StatusBar.styleLightContent();
             });
 
             if (/iphone|ipad|ipod/i.test(navigator.userAgent)) {
@@ -272,7 +273,8 @@ if (navigator.userAgent.includes('#cordova#')) {
         false
     );
 } else {
-    loadSplash().then(res => {
-        window.$vm = app.mount('#app');
-    });
+    window.$vm = app.mount('#app');
+    // loadSplash().then(res => {
+
+    // });
 }

src/router/index.js

@@ -144,7 +144,7 @@ const routes = [
             pageType: Page.Every,
             title: '拉索宇宙',
             isHall: true,
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -155,7 +155,7 @@ const routes = [
             pageType: Page.Every,
             title: '拉索宇宙',
             isHall: true,
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -165,7 +165,7 @@ const routes = [
         meta: {
             pageType: Page.Login,
             title: ' ',
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -184,7 +184,7 @@ const routes = [
         meta: {
             pageType: Page.Login,
             title: '注册',
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -298,7 +298,7 @@ const routes = [
         component: () => import('../views/product/Detail.vue'),
         meta: {
             pageType: Page.Every,
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -336,7 +336,7 @@ const routes = [
             pageType: Page.Every,
             menuPage: true,
             title: '拉索宇宙',
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -400,7 +400,7 @@ const routes = [
         meta: {
             pageType: Page.Every,
             title: '拉索宇宙',
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -517,7 +517,7 @@ const routes = [
         meta: {
             pageType: Page.Every,
             title: '拉索宇宙',
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {
@@ -527,7 +527,7 @@ const routes = [
         meta: {
             pageType: Page.Every,
             title: '拉索宇宙',
-            tabColor: '#181818'
+            tabColor: '#191d27'
         }
     },
     {

src/views/Creator.vue

@@ -25,7 +25,7 @@
                 <van-tab title="人气" name="followers,desc"></van-tab>
             </van-tabs>
         </van-sticky>
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getList">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getList">
             <template v-for="(item, index) in miners" :key="index">
                 <creator-info v-model:info="miners[index]"></creator-info>
             </template>

src/views/Discover.vue

@@ -19,11 +19,18 @@
     </van-sticky>
     <!-- 商品展示 -->
     <div class="commodity_display">
-        <swiper v-if="commodityDisplayList.length > 0" slides-per-view="auto">
+        <swiper
+            v-if="commodityDisplayList.length > 0"
+            :slides-offset-after="0"
+            slides-per-view="auto"
+            centeredSlidesBounds
+            @touchEnd="touchEndEvent"
+            @slideChange="slideChangeEvent"
+        >
             <swiper-slide class="setting" v-for="item in commodityDisplayList" :key="item.id" style="width: 64px">
                 <van-image
-                    width="64px"
-                    height="64px"
+                    width="66px"
+                    height="66px"
                     radius="33"
                     :src="getImg(item.avatar)"
                     fit="cover"
@@ -31,6 +38,19 @@
                 />
                 <div class="setting_title">{{ item.nickname }}</div>
             </swiper-slide>
+
+            <swiper-slide
+                class="slide-sek"
+                :style="{ width: `calc(100vw - ${commodityDisplayList.length * 84}px)` }"
+            ></swiper-slide>
+
+            <swiper-slide class="slide-more">
+                <img src="@assets/slide-left.png" alt="" />
+                <span>左</span>
+                <span>滑</span>
+                <span>更</span>
+                <span>多</span>
+            </swiper-slide>
         </swiper>
         <!-- <div class="commodity_display_tip">
             <img :src="require('@assets/gengduo-con@3x.png')" alt="" class="commodity_display_tip_img"/>
@@ -102,7 +122,7 @@
                     :to="{ path: '/productList', query: { type: 'DEFAULT', title: '本期推荐' } }"
                 >
                 </page-title> -->
-            <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+            <van-list v-model:loading="loading" :finished="finished" @load="getData" finished-text="没有更多">
                 <div class="current_recommendation">
                     <template v-for="(item, index) in list" :key="item.id">
                         <CollectionList v-model:info="list[index]"></CollectionList
@@ -214,7 +234,8 @@ export default {
             url: '/collection/all',
             sortDes: 'asc',
             sortPre: '',
-            scrollTop: 0
+            scrollTop: 0,
+            isEnd: false
         };
     },
     mounted() {
@@ -222,6 +243,18 @@ export default {
         this.getInit();
     },
     methods: {
+        touchEndEvent(swiper, e) {
+            console.log(this.isEnd);
+            if (this.isEnd) {
+                this.$router.push('/creatorList');
+            }
+        },
+        slideChangeEvent(swiper) {
+            this.isEnd = swiper.isEnd;
+        },
+        slideChangeTransitionStartEvent(e) {
+            console.log(e);
+        },
         getInit() {
             this.$toast.loading({
                 message: '加载中...',
@@ -536,16 +569,20 @@ export default {
         }
     }
 }
+.commodity_display {
+    padding-bottom: 20px;
+}
 .setting {
     height: 94px;
-    margin-right: 24px;
-    margin-bottom: 20px;
+    padding-right: 24px;
+    // padding-bottom: 20px;
+    // background-color: #191d27;
     .setting_title {
         width: 64px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
-        margin-top: 10px;
+        margin-top: 8px;
         height: 20px;
         font-size: 14px;
         font-family: PingFangSC-Regular, PingFang SC;
@@ -557,7 +594,30 @@ export default {
     }
 }
 .setting:last-child {
-    margin-right: 0px;
+    padding-right: 0px;
+}
+.slide-sek {
+}
+.slide-more {
+    width: 30px;
+    height: 94px;
+    background: #1e222c;
+    border-radius: 8px 0px 0px 8px;
+    font-size: 11px;
+    color: #ffffff44;
+    line-height: 14px;
+    .flex-col();
+    align-items: center;
+    justify-content: center;
+    // position: absolute;
+    // right: 0;
+    // top: 50%;
+    // transform: translateY(-50%);
+    img {
+        width: 12px;
+        height: 12px;
+        margin-bottom: 3px;
+    }
 }
 .current_recommendation {
     width: 100%;

src/views/DiscoverPre.vue

@@ -59,7 +59,7 @@
 
         <div class="title">本期推荐</div>
 
-        <van-list class="box-list" v-model:loading="loading" :finished="finished" finished-text="" @load="getList">
+        <van-list class="box-list" v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getList">
             <template v-for="(item, index) in list" :key="item.id">
                 <product-info v-model:info="list[index]"></product-info>
             </template>

src/views/Givesubmit.vue

@@ -29,7 +29,7 @@
                 </div>
             </div>
         </div>
-        <!-- <div class="transaction_password">
+        <div class="transaction_password">
             <div class="transaction_password_one">
                 <div class="transaction_password_one_title">请输入交易密码</div>
                 <div class="transaction_password_forget" @click="$router.push('/tradingPassword')">
@@ -37,16 +37,15 @@
                     <van-divider />
                 </div>
             </div>
-            <van-divider />
             <div>
-                密码输入框
+                <!-- 密码输入框 -->
                 <van-password-input
                     :value="password"
                     :gutter="10"
                     :focused="showKeyboard"
                     @focus="showKeyboard = true"
                 />
-                数字键盘
+                <!-- 数字键盘 -->
                 <van-number-keyboard
                     v-model="password"
                     :show="showKeyboard"
@@ -54,11 +53,10 @@
                     maxlength="6"
                     theme="custom"
                     close-button-text="完成"
-                    random-key-order
                 />
             </div>
-            <div v-else class="text3" @click="$router.push('/tradingPassword')">您当前没有交易密码，点击去设置</div>
-        </div> -->
+            <!-- <div class="text3" @click="$router.push('/tradingPassword')">您当前没有交易密码，点击去设置</div> -->
+        </div>
         <!-- <div class="additional_costs">
             <div class="additional_costs_left">GAS费用</div>
             <div class="additional_costs_right">¥{{ gas }}</div>
@@ -265,153 +263,161 @@ export default {
                 forbidClick: true
             });
             this.$http
-                .post('/asset/gift', {
-                    assetId: this.$route.query.id,
-                    toUserId: this.$route.query.toUserId
+                .post('/user/verifyTradeCode', {
+                    tradeCode: this.password
                 })
-                .then(res => {
-                    this.orderId = res.id;
-                    this.$nextTick(() => {
-                        if (this.payType === 'ALIPAY') {
-                            // document.location.replace(
-                            //     resolveUrl(this.$baseUrl, 'payOrder/gift/alipay?id=' + res.id)
-                            // );
-                            if (this.inWeixin) {
-                                if (this.gas === '0') {
-                                    this.$http
-                                        .get('/payOrder/gift/alipay_wx?id=' + res.id)
-                                        .then(res => {
-                                            this.$toast.success('转赠成功');
-                                            this.getOrder(true);
-                                            // setTimeout(() => {
-                                            // this.$router.push({
-                                            //     path: '/orderDetail',
-                                            //     query: {
-                                            //         id: res.id,
-                                            //     }
-                                            // });
-                                            // this.$router.replace('/orders');
-                                            // document.location.replace("https://www.adcs.vip/9th/giftOrder/223639");
-                                            // this.$router.replace('/giftOrder/' + order.getId());
-                                            // }, 1000);
-                                        })
-                                        .catch(e => {
-                                            if (e.error) {
-                                                this.$toast(e.error);
-                                            }
-                                        });
-                                } else {
-                                    document.location.replace(
-                                        resolveUrl(this.$baseUrl, '/payOrder/gift/alipay_wx?id=' + res.id)
-                                    );
-                                }
-                            } else {
-                                if (this.gas === '0') {
-                                    console.log("131313")
-                                    this.$http
-                                        .get(`/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${res.id}`)
-                                        .then(res => {
-                                            this.$toast.success('转赠成功');
-                                            this.getOrder(true);
-                                            // setTimeout(() => {
-                                            // this.$router.push({
-                                            //     path: '/orderDetail',
-                                            //     query: {
-                                            //         id: res.id,
-                                            //     }
-                                            // });
-                                            // this.$router.replace('/giftOrder/' + order.getId());
-                                            // this.$router.replace('/orders');
-                                            // document.location.replace("https://www.adcs.vip/9th/giftOrder/223639");
-                                            // }, 1000);
-                                        })
-                                        .catch(e => {
-                                            if (e.error) {
-                                                this.$toast(e.error);
-                                            }
-                                        });
-                                } else {
-                                    this.$http
-                                        .get(`/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${res.id}`)
-                                        .then(res => {
-                                            this.hrefUrl = 'alipays://platformapi/startapp?saId=10000007&qrcode=' + res;
-                                            // window.open(
-                                            //     'alipays://platformapi/startapp?saId=10000007&qrcode=' + res,
-                                            //     '_blank'
-                                            // );
-                                            this.$nextTick(() => {
-                                                document.getElementById('pay').click();
-                                            });
+                .then(() => {
+                    this.$http
+                        .post('/asset/gift', {
+                            assetId: this.$route.query.id,
+                            toUserId: this.$route.query.toUserId
+                        })
+                        .then(res => {
+                            this.orderId = res.id;
+                            this.$nextTick(() => {
+                                if (this.payType === 'ALIPAY') {
+                                    // document.location.replace(
+                                    //     resolveUrl(this.$baseUrl, 'payOrder/gift/alipay?id=' + res.id)
+                                    // );
+                                    if (this.inWeixin) {
+                                        if (this.gas === '0') {
+                                            this.$http
+                                                .get('/payOrder/gift/alipay_wx?id=' + res.id)
+                                                .then(res => {
+                                                    this.$toast.success('转赠成功');
+                                                    this.getOrder(true);
+                                                    // setTimeout(() => {
+                                                    // this.$router.push({
+                                                    //     path: '/orderDetail',
+                                                    //     query: {
+                                                    //         id: res.id,
+                                                    //     }
+                                                    // });
+                                                    // this.$router.replace('/orders');
+                                                    // document.location.replace("https://www.adcs.vip/9th/giftOrder/223639");
+                                                    // this.$router.replace('/giftOrder/' + order.getId());
+                                                    // }, 1000);
+                                                })
+                                                .catch(e => {
+                                                    if (e.error) {
+                                                        this.$toast(e.error);
+                                                    }
+                                                });
+                                        } else {
+                                            document.location.replace(
+                                                resolveUrl(this.$baseUrl, '/payOrder/gift/alipay_wx?id=' + res.id)
+                                            );
+                                        }
+                                    } else {
+                                        if (this.gas === '0') {
+                                            console.log('131313');
+                                            this.$http
+                                                .get(
+                                                    `/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${
+                                                        res.id
+                                                    }`
+                                                )
+                                                .then(res => {
+                                                    this.$toast.success('转赠成功');
+                                                    this.getOrder(true);
+                                                    // setTimeout(() => {
+                                                    // this.$router.push({
+                                                    //     path: '/orderDetail',
+                                                    //     query: {
+                                                    //         id: res.id,
+                                                    //     }
+                                                    // });
+                                                    // this.$router.replace('/giftOrder/' + order.getId());
+                                                    // this.$router.replace('/orders');
+                                                    // document.location.replace("https://www.adcs.vip/9th/giftOrder/223639");
+                                                    // }, 1000);
+                                                })
+                                                .catch(e => {
+                                                    if (e.error) {
+                                                        this.$toast(e.error);
+                                                    }
+                                                });
+                                        } else {
+                                            this.$http
+                                                .get(
+                                                    `/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${
+                                                        res.id
+                                                    }`
+                                                )
+                                                .then(res => {
+                                                    this.hrefUrl =
+                                                        'alipays://platformapi/startapp?saId=10000007&qrcode=' + res;
+                                                    // window.open(
+                                                    //     'alipays://platformapi/startapp?saId=10000007&qrcode=' + res,
+                                                    //     '_blank'
+                                                    // );
+                                                    this.$nextTick(() => {
+                                                        document.getElementById('pay').click();
+                                                    });
 
-                                            this.$toast.loading({
-                                                message: '加载中...',
-                                                forbidClick: true
+                                                    this.$toast.loading({
+                                                        message: '加载中...',
+                                                        forbidClick: true
+                                                    });
+                                                    this.getOrder(true);
+                                                })
+                                                .catch(e => {
+                                                    if (e.error) {
+                                                        this.$toast(e.error);
+                                                    }
+                                                });
+                                        }
+                                    }
+                                } else if (this.payType === 'WEIXIN') {
+                                    if (this.inWeixin) {
+                                        this.$toast.loading('加载中');
+                                        this.$http
+                                            .post('/payOrder/gift/weixin', {
+                                                id: res.id,
+                                                openId: localStorage.getItem('openId')
+                                            })
+                                            .then(res => {
+                                                console.log({
+                                                    ...res,
+                                                    package: res.package || res.packageValue,
+                                                    timestamp: res.timestamp || res.timeStamp
+                                                });
+                                                let _this = this;
+                                                wx.chooseWXPay({
+                                                    ...res,
+                                                    package: res.package || res.packageValue,
+                                                    timestamp: res.timeStamp,
+                                                    success(res) {
+                                                        _this.$toast.success('支付成功');
+                                                        setTimeout(() => {
+                                                            _this.$router.replace('/orders');
+                                                        }, 1000);
+                                                    },
+                                                    fail(e) {
+                                                        console.log(e);
+                                                        _this.$toast('支付失败，请稍后再试');
+                                                    }
+                                                });
                                             });
-                                            this.getOrder(true);
-                                        })
-                                        .catch(e => {
-                                            if (e.error) {
-                                                this.$toast(e.error);
-                                            }
-                                        });
+                                    } else {
+                                        document.location.replace(
+                                            resolveUrl(this.$baseUrl, 'payOrder/gift/weixin_h5?id=' + res.id)
+                                        );
+                                    }
                                 }
+                            });
+                        })
+                        .catch(e => {
+                            if (e) {
+                                this.$toast(e.error);
                             }
-                        } else if (this.payType === 'WEIXIN') {
-                            if (this.inWeixin) {
-                                this.$toast.loading('加载中');
-                                this.$http
-                                    .post('/payOrder/gift/weixin', {
-                                        id: res.id,
-                                        openId: localStorage.getItem('openId')
-                                    })
-                                    .then(res => {
-                                        console.log({
-                                            ...res,
-                                            package: res.package || res.packageValue,
-                                            timestamp: res.timestamp || res.timeStamp
-                                        });
-                                        let _this = this;
-                                        wx.chooseWXPay({
-                                            ...res,
-                                            package: res.package || res.packageValue,
-                                            timestamp: res.timeStamp,
-                                            success(res) {
-                                                _this.$toast.success('支付成功');
-                                                setTimeout(() => {
-                                                    _this.$router.replace('/orders');
-                                                }, 1000);
-                                            },
-                                            fail(e) {
-                                                console.log(e);
-                                                _this.$toast('支付失败，请稍后再试');
-                                            }
-                                        });
-                                    });
-                            } else {
-                                document.location.replace(
-                                    resolveUrl(this.$baseUrl, 'payOrder/gift/weixin_h5?id=' + res.id)
-                                );
-                            }
-                        }
-                    });
+                        });
                 })
                 .catch(e => {
                     if (e) {
-                        this.$toast(e.error);
+                        this.$toast('失败点击忘记密码进行修改');
                     }
                 });
-            // this.$http
-            //     .post('/user/verifyTradeCode', {
-            //         tradeCode: this.password
-            //     })
-            //     .then(() => {
-
-            //     })
-            //     .catch(e => {
-            //         if (e) {
-            //             this.$toast('失败点击忘记密码进行修改');
-            //         }
-            //     });
         }
     },
     beforeUnmount() {
@@ -549,18 +555,20 @@ export default {
     }
     .transaction_password {
         width: 100%;
-        height: 103px;
-        background: #29293f;
-        border-radius: 8px;
-        padding: 10px;
+        // height: 103px;
+        background: #1e222c;
+        border-radius: 4px;
+        padding: 15px;
         box-sizing: border-box;
         margin-top: 10px;
         .transaction_password_one {
             display: flex;
             justify-content: space-between;
-            margin-bottom: 4px;
+            padding-bottom: 4px;
+            border-bottom: 1px solid rgba(151, 151, 151, 0.1);
+            opacity: 0.6;
             .transaction_password_one_title {
-                font-size: 14px;
+                font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
                 color: #ffffff;
@@ -570,7 +578,7 @@ export default {
                 font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
-                color: #939599;
+                color: #ffffff;
             }
         }
         /deep/ .van-password-input {
@@ -579,7 +587,7 @@ export default {
             .van-password-input__item {
                 width: 44px;
                 height: 44px;
-                background: rgba(10, 10, 27, 0.3);
+                background: #29293f;
                 border-radius: 8px;
             }
         }
@@ -686,6 +694,9 @@ export default {
         margin: 10px 0;
     }
 }
+/deep/ .van-key {
+    color: #333333;
+}
 .gift_button {
     position: fixed;
     bottom: 64px;

src/views/Home.vue

@@ -14,7 +14,7 @@
                         <!-- <img :src="item.pic" alt="" class="swipe_banner_img" /> -->
                         <van-image
                             width="100%"
-                            height="calc(100vw/2 - 55px)"
+                            height="calc(41vw - 13px)"
                             :src="getImg(item.pic)"
                             fit="cover"
                             @click="goNext(item)"
@@ -40,15 +40,16 @@
             </swiper> -->
                 <!-- 商品列表 -->
                 <div class="collection_list" v-if="active === 0">
-                    <!-- <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getList"> -->
+                    <!-- <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getList"> -->
                     <!-- @load="getList" -->
-                    <product-large
-                        v-for="(item, index) in shopList"
-                        :key="index"
-                        v-model:info="shopList[index].obj"
-                        :type="item.type"
-                    ></product-large>
-                    <!-- </van-list> -->
+                    <van-list finished-text="没有更多">
+                        <product-large
+                            v-for="(item, index) in shopList"
+                            :key="index"
+                            v-model:info="shopList[index].obj"
+                            :type="item.type"
+                        ></product-large>
+                    </van-list>
                 </div>
                 <div class="collection_list" v-else>
                     <div class="advance_notice_sale">
@@ -138,7 +139,7 @@
             ></product-large>
         </div>
         <template v-else>
-            <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getNews">
+            <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getNews">
                 <news-info v-for="item in news" :key="item.id" :info="item"></news-info>
             </van-list>
         </template> -->
@@ -170,7 +171,7 @@ export default {
             reserve: false,
             saleList: [],
             scheduledStatus: [],
-            scrollTop: 0,
+            scrollTop: 0
         };
     },
     mixins: [product, banner, common],
@@ -200,14 +201,16 @@ export default {
     },
     methods: {
         // 获取藏品列表
-        getList() {
+        getList(loading = true) {
             if (this.page === 0) {
                 this.shopList = [];
             }
-            this.$toast.loading({
-                message: '加载中...',
-                forbidClick: true
-            });
+            if (loading) {
+                this.$toast.loading({
+                    message: '加载中...',
+                    forbidClick: true
+                });
+            }
             this.loading = true;
             this.$http.get('/collection/recommend').then(res => {
                 this.shopList = res.filter(item => {
@@ -256,7 +259,7 @@ export default {
             this.$http.post('user/my').then(res => {});
         },
         onRefresh() {
-            Promise.all([this.getBanner(), this.getList()]).then(res => {
+            Promise.all([this.getBanner(false), this.getList(false)]).then(res => {
                 this.isLoading = false;
             });
         },

src/views/Index.vue

@@ -83,4 +83,11 @@ export default {
     /deep/ [class*=van-hairline]:after{
         border: none;
     }
+    /deep/ .van-tabbar-item__icon img{
+        width: 25px;
+        height: 24px;
+    }
+    /deep/ .van-tabbar-item__text{
+        font-size: 12px;
+    }
 </style>

src/views/Mine.vue

@@ -253,7 +253,7 @@ export default {
             // });
         }
         if (window.cordova && StatusBar && StatusBar.isVisible) {
-            StatusBar.backgroundColorByHexString('#222426');
+            StatusBar.backgroundColorByHexString('#191d27');
             StatusBar.styleLightContent();
         }
         // let topHeight = this.$refs.top.offsetHeight // 获取高度

src/views/Store.vue

@@ -80,14 +80,14 @@
             </van-sticky>
             <div class="data_display" v-if="active === 0">
                 <!-- 藏品展示 -->
-                <van-list v-model:loading="loading" :finished="finished" @load="getAllCollections">
+                <van-list v-model:loading="loading" :loading-text="' '" :finished="finished" @load="getAllCollections">
                     <div class="data_display_fanter">
                         <template v-for="(item, index) in collections" :key="index">
                             <asset-info :info="item"></asset-info>
                         </template>
                     </div>
                     <van-empty
-                        v-if="collections.length === 0 && !loading"
+                        v-if="empty && !loading"
                         :image="require(`@assets/empty-collection.png`)"
                         :image-size="`172`"
                     >
@@ -182,16 +182,18 @@ export default {
             this.active = 1;
             this.init();
         },
-        init() {
+        init(loading = true) {
             if (!this.isLogin) {
                 this.empty = true;
                 this.loading = false;
                 return Promise.resolve();
             }
-            this.$toast.loading({
-                message: '加载中...',
-                forbidClick: true
-            });
+            if (loading) {
+                this.$toast.loading({
+                    message: '加载中...',
+                    forbidClick: true
+                });
+            }
             this.empty = false;
             this.$http.get('/collection/myLikes').then(res => {
                 this.list = res;
@@ -203,7 +205,7 @@ export default {
             this.$root.$el.scrollTop = 0;
         },
         // 获取全部库存藏品
-        getAllCollections() {
+        getAllCollections(loading = true) {
             if (!this.isLogin) {
                 this.empty = true;
                 this.loading = false;
@@ -212,6 +214,7 @@ export default {
             if (this.page === 0) {
                 this.collections = [];
             }
+            this.loading = true;
             this.finished = false;
             this.empty = false;
             let form = {
@@ -223,10 +226,14 @@ export default {
                     ...this.beforeQuery()
                 }
             };
-            this.$toast.loading({
-                message: '加载中...',
-                forbidClick: true
-            });
+            console.log(loading);
+            if (loading) {
+                this.$toast.loading({
+                    message: '加载中...',
+                    forbidClick: true
+                });
+            }
+
             return this.$http.post('/asset/all', form, { body: 'json' }).then(res => {
                 if (res.first) {
                     this.collections = [];
@@ -276,13 +283,14 @@ export default {
             return form;
         },
         onRefresh() {
+            this.isLoading = true;
             if (this.active === 0) {
                 this.page = 0;
-                this.getAllCollections().then(() => {
+                this.getAllCollections(false).then(() => {
                     this.isLoading = false;
                 });
             } else {
-                Promise.all([this.init()]).then(res => {
+                Promise.all([this.init(false)]).then(res => {
                     this.isLoading = false;
                 });
             }
@@ -401,6 +409,7 @@ export default {
         padding: 0px 15px 16px;
         box-sizing: border-box;
         // background: #0F0F27;
+        min-height: calc(100vh - 100px);
         .data_display_fanter {
             width: 100%;
             display: flex;

src/views/account/About.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page">
         <div class="logo">
-            <van-image width="100" height="100" src="https://cdn.jsdelivr.net/npm/@vant/assets/cat.jpeg" radius="20" />
+            <van-image width="89" height="89" :src="require('@assets/ic_launcher.png')" radius="20" />
             <div class="text1">拉索宇宙</div>
             <div class="text2">v 1.0.0</div>
         </div>
@@ -101,7 +101,7 @@ export default {
     font-size: 16px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
-    color: #FFFFFF;
+    color: #ffffff;
     line-height: 22px;
 }
 .van-cell + .van-cell {
@@ -127,6 +127,10 @@ export default {
     .flex-col();
     align-items: center;
 
+    .van-image {
+        border: 1px solid rgba(234, 204, 155, 1);
+    }
+
     .text1 {
         font-size: 18px;
         font-weight: bold;

src/views/account/Connect.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="page">
         <van-cell :border="false" center title="拉索官方邮箱" value="内容" :label="email" @click="copy">
-            <div class="btn">
-                点击复制
-            </div>
+            <div class="btn">点击复制</div>
         </van-cell>
 
         <van-cell :border="false" center title="微信二维码">
@@ -20,7 +18,7 @@ export default {
     data() {
         return {
             codeImg: 'https://lasuo.oss-cn-hangzhou.aliyuncs.com/nft/2022-06-27-11-28-08tQEbaWcx.jpg',
-            email: '724392536@qq.com'
+            email: 'lhaaso@126.com'
         };
     },
     mounted() {
@@ -63,10 +61,19 @@ export default {
 }
 .van-cell {
     padding: 23px 16px;
-    background-color: @bg2;
+    background-color: fade(@bg2, 50%);
     margin: 16px 16px 0;
     box-sizing: border-box;
     width: auto;
+    border-radius: 12px;
+    font-size: 16px;
+    /deep/.van-cell__label {
+        font-size: 14px;
+    }
+
+    /deep/.van-cell__value {
+        font-size: 15px;
+    }
 }
 .logout {
     padding: 50px 30px 50px;

src/views/account/Login.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="login loginHeight">
         <div class="title">
-            <div class="text1">欢迎来到拉索</div>
+            <div class="text1">欢迎来到拉索宇宙</div>
             <div class="text2">发现更多数字藏品</div>
         </div>
         <van-form @submit="submit" ref="code">
@@ -13,10 +13,9 @@
                     clearable="true"
                     v-model="form.phone"
                     :rules="[
-                        { required: true, message: '请输入手机号码' },
                         {
                             pattern: phonePattern,
-                            message: '手机号码格式错误'
+                            message: ''
                         }
                     ]"
                 >
@@ -27,7 +26,7 @@
                     placeholder="请输入验证码"
                     v-model="form.code"
                     maxlength="4"
-                    :rules="[{ required: true, message: '请输入验证码' }]"
+                    :rules="[{ required: true, message: '' }]"
                 >
                     <template #button>
                         <van-button
@@ -51,6 +50,10 @@
                         <span class="xieyi_con">已阅读并同意</span>
                         <span @click.stop="$router.push('/agreement?page=service')"> 《服务协议》 </span>
                         <span @click.stop="$router.push('/agreement')"> 《用户隐私协议》 </span>
+
+                        <template #icon="props">
+                            <img class="img-icon" :src="props.checked ? activeIcon : inactiveIcon" />
+                        </template>
                     </van-checkbox>
                 </div>
                 <!-- <van-button plain class="forget" @click="$router.replace('/forget')">
@@ -84,6 +87,7 @@
 </template>
 
 <script>
+import { re } from 'mathjs';
 import phone from '../../mixins/phone';
 let fromRoute = null;
 export default {
@@ -98,7 +102,9 @@ export default {
                 code: ''
             },
             checked: localStorage.getItem('agreeTerm') === 'true',
-            protocol: false
+            protocol: false,
+            activeIcon: require('@assets/checked.png'),
+            inactiveIcon: require('@assets/checked1.png')
         };
     },
     computed: {
@@ -423,8 +429,8 @@ export default {
     // height: 14px;
 }
 /deep/ .van-checkbox__icon--round {
-    padding-top: 3px;
-    box-sizing: border-box;
+    // padding-top: 3px;
+    // box-sizing: border-box;
 }
 /deep/ .van-icon-success {
     // width: 14px;
@@ -438,4 +444,9 @@ export default {
 //     width: 14px;
 //     height: 14px;
 // }
+
+.img-icon{
+    width: 14px;
+    height: 14px;
+}
 </style>

src/views/account/Setting.vue

@@ -26,7 +26,7 @@
                 is-link
                 :value="userInfo.intro || 'TA还什么都没有留下'"
             />
-            <van-cell title="背景图片" is-link>
+            <van-cell title="背景图片" is-link v-if="userInfo.minter">
                 <template #value>
                     <van-image
                         round

src/views/account/TradingPassword.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="login">
-        <div class="tabs">修改交易密码</div>
+        <div class="tabs">设置交易密码</div>
         <van-form v-if="step === 0" @submit="next">
             <div class="transaction_tips">
                 <div class="transaction_tips_phone">{{ phone }}</div>
-                <div class="transaction_tips_con">修改交易密码需先验证当前手机号</div>
+                <div class="transaction_tips_con">设置交易密码需先验证当前手机号</div>
             </div>
             <div class="login_information">
                 <!-- <img
@@ -36,11 +36,11 @@
             </div>
             <van-divider class="login_divider" />
             <div>
-                <van-button native-type="submit" class="sure" type="primary">确认修改</van-button>
+                <van-button native-type="submit" class="sure" type="primary">确认</van-button>
             </div>
         </van-form>
         <van-form v-else ref="form" @submit="submit">
-            <div class="modification_tips">修改支付密码后立即生效，下次交易请使用新密码</div>
+            <div class="modification_tips">设置支付密码后立即生效，下次交易请使用新密码</div>
             <div class="input">
                 <div class="text1">请输入交易密码</div>
                 <van-password-input :value="password" :focused="showKeyboard" @focus="showKeyboard = true" />

src/views/account/Waiting.vue

@@ -15,6 +15,9 @@
             <img :src="require('@assets/shenqing_shenhezhong.png')" alt="" class="under_review_img" />
             <div class="under_review_title">提交成功，请等待审核</div>
             <div class="under_review_tip">平台将于5分钟内完成资料审核，请耐心等待</div>
+            <div class="under_review_return">
+                <div class="under_review_return_con" @click="$router.replace('/home')">回到首页</div>
+            </div>
         </div>
     </div>
     <!-- <div class="page">

src/views/activity/List.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="search">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <router-link
                     :to="{

src/views/activity/List1.vue

@@ -2,7 +2,7 @@
     <div class="search">
         <div class="filter-bg" :style="{ backgroundImage: `url(${filterBg})` }"></div>
         <div class="header">铸造活动</div>
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <router-link
                     :to="{

src/views/asset/Detail.vue

@@ -57,19 +57,27 @@
         <product-banner :info="info" pageType="asset" class="detail_content_banner"></product-banner>
         <div class="list_of_details">
             <div class="list_of_details_one">
-                <img :src="require('@assets/dizuo.png')" alt="" class="list_of_details_one_img" />
+                <img :src="require('@assets/dizuo@3x.png')" alt="" class="list_of_details_one_img" />
                 <div class="list_of_details_one_title">
-                    <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" />
-                    <div class="list_of_details_one_title_con">{{ info.name }}</div>
-                    <div class="list_of_details_one_text" v-if="!info.consignment">
-                        <img :src="require('@assets/blockchain@3x.png')" alt="" class="list_of_details_one_text_img" />
-                        <div class="list_of_details_one_text_con">{{ info.tokenId }}</div>
-                    </div>
-                    <div class="list_of_details_one_title_one" v-else>
-                        <div class="list_of_details_one_title_one_text1">{{ info.collectionCategory }}</div>
-                        <div class="list_of_details_one_title_one_text2">{{ info.category }}</div>
-                    </div>
+                        <img :src="require('@assets/zuo@3x.png')" alt="" class="list_of_details_one_title_img" />
+                        <div>
+                            <div class="list_of_details_one_title_con">{{ info.name }}</div>
+                            <div class="list_of_details_one_text" v-if="!info.consignment">
+                                <img
+                                    :src="require('@assets/blockchain@3x.png')"
+                                    alt=""
+                                    class="list_of_details_one_text_img"
+                                />
+                                <div class="list_of_details_one_text_con">{{ info.tokenId }}</div>
+                            </div>
+                            <div class="list_of_details_one_title_one" v-else>
+                                <div class="list_of_details_one_title_one_text1">{{ info.collectionCategory }}</div>
+                                <div class="list_of_details_one_title_one_text2">{{ info.category }}</div>
+                            </div>
+                        </div>
+                        <img :src="require('@assets/you@3x.png')" alt="" class="list_of_details_one_title_img" />
                 </div>
+                <!-- <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" /> -->
             </div>
             <div class="collection_holder">
                 <div class="collection_holder_con" v-if="!info.consignment">
@@ -113,11 +121,11 @@
                     <div class="work_story_title">作品故事</div>
                     <div class="work_story_text" v-html="info.detail"></div>
                     <div class="work_story_creator">
-                        <div class="work_story_creator_left">创作者</div>
+                        <div class="work_story_creator_left">铸造者</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                     </div>
                     <div class="work_story_creator">
-                        <div class="work_story_creator_left">发行方</div>
+                        <div class="work_story_creator_left">创作者</div>
                         <div class="work_story_creator_right">{{ info.issuer }}</div>
                     </div>
                 </div>
@@ -128,7 +136,7 @@
                     <div class="hold_privileges_title">
                         持有特权<span class="hold_privileges_tip" v-if="privileges.length != 0">灰色表示已使用</span>
                     </div>
-                    <div class="hold_privileges_name" v-if="privileges.length == 0">创作者暂时未设置</div>
+                    <div class="hold_privileges_name" v-if="privileges.length == 0">铸造者暂时未设置</div>
                     <div class="hold_privileged_information" v-else>
                         <div
                             class="hold_privileged_information_con"
@@ -430,14 +438,21 @@
         <product-banner :info="info" pageType="asset" class="detail_content_banner"></product-banner>
         <div class="list_of_details">
             <div class="list_of_details_one">
-                <img :src="require('@assets/dizuo.png')" alt="" class="list_of_details_one_img" />
+                <img :src="require('@assets/dizuo@3x.png')" alt="" class="list_of_details_one_img" />
                 <div class="list_of_details_one_title">
-                    <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" />
-                    <div class="list_of_details_one_title_con">{{ info.name }}</div>
-                    <div class="list_of_details_one_text">
-                        <img :src="require('@assets/blockchain@3x.png')" alt="" class="list_of_details_one_text_img" />
-                        <div class="list_of_details_one_text_con">{{ info.numericCode }}</div>
-                    </div>
+                        <img :src="require('@assets/zuo@3x.png')" alt="" class="list_of_details_one_title_img" />
+                        <div>
+                            <div class="list_of_details_one_title_con">{{ info.name }}</div>
+                            <div class="list_of_details_one_text">
+                                <img
+                                    :src="require('@assets/blockchain@3x.png')"
+                                    alt=""
+                                    class="list_of_details_one_text_img"
+                                />
+                                <div class="list_of_details_one_text_con">{{ info.tokenId }}</div>
+                            </div>
+                        </div>
+                        <img :src="require('@assets/you@3x.png')" alt="" class="list_of_details_one_title_img" />
                 </div>
             </div>
             <!-- 赠送 -->
@@ -848,7 +863,19 @@ export default {
     },
     methods: {
         share() {
-            this.$refs.post.init();
+            if (!this.info.publicShow) {
+                Dialog.confirm({
+                    message: '藏品公开展示后才可以分享'
+                })
+                    .then(() => {
+                        this.moreDisplayOne = false;
+                    })
+                    .catch(() => {
+                        this.moreDisplayOne = false;
+                    });
+            } else {
+                this.$refs.post.init();
+            }
         },
         moreDisplay() {
             this.moreDisplayOne = !this.moreDisplayOne;
@@ -1209,6 +1236,7 @@ export default {
     width: 100%;
     background: #191d27;
     position: relative;
+    padding-top: 40px;
     .detail_content_con {
         width: 100%;
         height: 192px;
@@ -1236,10 +1264,12 @@ export default {
                 height: 52px;
                 padding: 0px 6px;
                 box-sizing: border-box;
-                transform: translateY(-255px);
+                transform: translateY(-270px);
+                display: flex;
+                justify-content: center;
                 .list_of_details_one_title_img {
-                    width: 100%;
-                    height: 52px;
+                    width: 56px;
+                    height: 56px;
                 }
                 .list_of_details_one_title_con {
                     width: 100%;
@@ -1247,9 +1277,7 @@ export default {
                     overflow: hidden;
                     text-overflow: ellipsis;
                     text-align: center;
-                    padding: 0px 27px;
-                    box-sizing: border-box;
-                    transform: translateY(-58px);
+                    margin-bottom: 4px;
                     height: 28px;
                     font-size: 20px;
                     font-family: PingFangSC-Semibold, PingFang SC;
@@ -1260,7 +1288,6 @@ export default {
                 .list_of_details_one_text {
                     display: flex;
                     justify-content: center;
-                    transform: translateY(-50px);
                     .list_of_details_one_text_img {
                         width: 26px;
                         height: 26px;
@@ -1268,6 +1295,7 @@ export default {
                         z-index: 1;
                     }
                     .list_of_details_one_text_con {
+                        width: calc(100vw - 160px);
                         height: 18px;
                         background: linear-gradient(141deg, #fcdc99 0%, #fce7c8 100%);
                         border-radius: 4px;
@@ -1280,6 +1308,10 @@ export default {
                         font-weight: 400;
                         color: #725837;
                         line-height: 14px;
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        text-align: center;
                     }
                 }
                 .list_of_details_one_title_one {
@@ -1390,21 +1422,21 @@ export default {
                     .collection_holder_one_title {
                         opacity: 0.5;
                     }
-                    .collection_holder_one_con{
+                    .collection_holder_one_con {
                         display: flex;
-                        .collection_holder_one_time_con{
+                        .collection_holder_one_time_con {
                             width: 180px;
                             font-size: 12px;
                             font-family: PingFangSC-Regular, PingFang SC;
                             font-weight: 400;
-                            color: #FFFFFF;
+                            color: #ffffff;
                             line-height: 18px;
                             margin: 2px 10px 0px 0px;
                             overflow: hidden;
                             white-space: nowrap;
                             text-overflow: ellipsis;
                         }
-                        .collection_holder_one_time_con_img{
+                        .collection_holder_one_time_con_img {
                             width: 24px;
                             height: 24px;
                         }

src/views/asset/GiveSearch.vue

@@ -4,22 +4,21 @@
         <van-sticky ref="top" :offset-top="bar.value && bar.value.show ? 46 : 0">
             <div class="content_title">赠送</div>
             <div class="content_tip">通过手机号码检索用户信息，确认赠送后该加密作品将会转移</div>
-            <van-search v-model="phone" placeholder="请输入用户手机号" @search="getSearch" />
-            <!-- <van-search
+            <!-- <van-search v-model="phone" placeholder="请输入用户手机号" @search="getSearch" /> -->
+            <van-search
                 ref="top"
                 v-model="phone"
                 placeholder="请输入用户手机号"
                 show-action
                 autofocus
-                :left-icon="require('@assets/svgs/icon-sosuo.svg')"
                 @search="getSearch"
-            > -->
-            <!-- <template #action>
+            >
+            <template #action>
                     <div @click="getSearch">搜索</div>
-                </template> -->
-            <!-- </van-search> -->
+                </template>
+            </van-search>
         </van-sticky>
-        <van-list class="list" :immediate-check="false" :finished="finished" finished-text="" @load="getData">
+        <van-list class="list" :immediate-check="false" :finished="finished" finished-text="没有更多" @load="getData">
             <div
                 class="search_message"
                 v-if="info.length != 0"
@@ -120,7 +119,7 @@ export default {
 }
 /deep/ .van-search {
     padding: 0;
-    background: #1e222c;
+    // background: #1e222c;
     border-radius: 4px;
     width: 100%;
     height: 38px;
@@ -141,9 +140,9 @@ export default {
     }
     .van-search__action {
         width: 60px;
-        height: 32px;
+        // height: 32px;
         border-radius: 4px;
-        border: 1px solid #28b6ff;
+        border: 1px solid #f2d5b2;;
         box-sizing: border-box;
         margin-left: 16px;
         padding: 0;
@@ -151,7 +150,7 @@ export default {
         font-size: 12px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-        color: #28b6ff;
+        color: #f2d5b2;;
         text-align: center;
         line-height: 32px;
     }

src/views/asset/Search.vue

@@ -23,7 +23,7 @@
             v-model:loading="loading"
             :immediate-check="false"
             :finished="finished"
-            finished-text=""
+            finished-text="没有更多"
             @load="getData"
             v-if="isSearch"
         >

src/views/creator/Detail.vue

@@ -3,9 +3,9 @@
         <div class="userInfo">
             <van-image
                 width="100%"
-                height="35vw"
+                height="46vw"
                 loading-icon=""
-                :src="info.bg || require('@assets/bg.png')"
+                :src="info.bg || require('@assets/8@3x.png')"
                 fit="cover"
                 class="top-img"
             />
@@ -120,7 +120,7 @@
             v-model:loading="loading"
             :finished="finished"
             :immediate-check="false"
-            finished-text=""
+            finished-text="没有更多"
             @load="getData"
         >
             <template v-for="(item, index) in list" :key="item.id">
@@ -331,7 +331,7 @@ export default {
     padding: 0 16px;
     z-index: 2;
     position: relative;
-    transform: translateY(-20px);
+    transform: translateY(25px);
     .sub {
         font-size: 12px;
         color: @text3;
@@ -364,13 +364,13 @@ export default {
             align-items: center;
             justify-content: flex-end;
             .text1 {
-                font-size: @font2;
+                font-size: 15px;
                 color: @text0;
                 line-height: 24px;
                 margin-left: 6px;
             }
             .text2 {
-                font-size: @font2;
+                font-size: 15px;
                 color: @text3;
                 line-height: 24px;
             }
@@ -485,6 +485,7 @@ export default {
     height: 36px;
     align-items: center;
     padding: 0 16px;
+    margin-top: 45px;
     // border-bottom: 1px solid #202122;
     background-color: @bg;
     .menu-item {

src/views/creator/List.vue

@@ -27,7 +27,7 @@
                 </van-tab>
             </van-tabs>
         </van-sticky>
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
@@ -170,6 +170,10 @@ export default {
 }
 /deep/ .van-tab{
     flex: 0 !important;
+    font-size: 16px;
+}
+/deep/ .van-tabs__wrap{
+    height: 36px;
 }
 /deep/ .van-tab--grow{
     padding: 0px !important;

src/views/creator/Search.vue

@@ -22,7 +22,7 @@
             v-model:loading="loading"
             :immediate-check="false"
             :finished="finished"
-            finished-text=""
+            finished-text="没有更多"
             @load="getData"
             v-if="isSearch"
         >

src/views/hall/ProductAdd.vue

@@ -12,7 +12,7 @@
             </div>
         </div>
 
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <van-empty
                 v-if="empty"
                 description=" 你还没有藏品哦～"

src/views/order/ActivityOrders.vue

@@ -17,7 +17,7 @@
             </van-tabs>
         </van-sticky>
 
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <order-info-act
                 @delFn="delFn"
                 v-for="(item, index) in list"

src/views/order/CouponList.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="page">
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <template v-for="(item, index) in useList" :key="index">
                 <coupon-info
                     needChoose

src/views/order/Orders.vue

@@ -50,7 +50,7 @@
                 </van-tabs> -->
                     <!-- </div> -->
                 </van-sticky>
-                <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+                <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
                     <div class="list_display">
                         <order-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item"></order-info>
                     </div>
@@ -60,7 +60,7 @@
                         :image="require('@assets/dingdankong@3x.png')"
                     >
                         <!-- <van-button class="h44" size="small" color="#28B6FF" :round="true" to="/">去逛逛</van-button> -->
-                        <div class="h44">这里将展示你在拉索购买的数字藏品订单</div>
+                        <div class="h44">这里将展示你在拉索宇宙购买的数字藏品订单</div>
                     </van-empty>
                 </van-list>
             </div>

src/views/product/Detail.vue

@@ -305,18 +305,24 @@
         ></product-banner>
         <div class="list_of_details">
             <div class="list_of_details_one">
-                <img :src="require('@assets/dizuo.png')" alt="" class="list_of_details_one_img" />
+                <img :src="require('@assets/dizuo@3x.png')" alt="" class="list_of_details_one_img" />
                 <div class="list_of_details_one_title">
-                    <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" />
-                    <div class="list_of_details_one_title_con">{{ info.name }}</div>
-                    <div class="limited_label">
-                        <div class="limited_label_title" v-if="info.collectionCategory">
-                            {{ info.collectionCategory }}
+                    <div class="list_of_details_one_title_one">
+                        <img :src="require('@assets/zuo@3x.png')" alt="" class="list_of_details_one_title_img" />
+                        <div>
+                            <div class="list_of_details_one_title_con">{{ info.name }}</div>
+                            <div class="limited_label">
+                                <div class="limited_label_title" v-if="info.collectionCategory">
+                                    {{ info.collectionCategory }}
+                                </div>
+                                <div class="limited_label_number">限量</div>
+                                <div class="limited_label_total">{{ info.total }}份</div>
+                                <div class="limited_label_category">{{ info.category }}</div>
+                            </div>
                         </div>
-                        <div class="limited_label_number">限量</div>
-                        <div class="limited_label_total">{{ info.total }}份</div>
-                        <div class="limited_label_category">{{ info.category }}</div>
+                        <img :src="require('@assets/you@3x.png')" alt="" class="list_of_details_one_title_img" />
                     </div>
+                    <!-- <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" /> -->
                     <van-divider class="fengge_con"
                         ><img
                             :src="require('@assets/locking.png')"
@@ -339,7 +345,7 @@
                         />
                         <div class="author_details">
                             <div class="author_details_one">{{ info.minter }}</div>
-                            <div class="author_details_two">{{ info.collectionWorks || '暂无信息'}}</div>
+                            <div class="author_details_two">{{ info.collectionWorks || '暂无信息' }}</div>
                         </div>
                     </div>
                     <div :class="info.follow ? 'followedtwo' : 'collection_author_right'" @click="follow">
@@ -379,17 +385,17 @@
                     </div>
                 </div>
             </div>
-            <div class="work_story" :class="info.hasSubscribe?'':'work_story_two'">
+            <div class="work_story" :class="info.hasSubscribe ? '' : 'work_story_two'">
                 <div class="work_story_con">
                     <div class="work_story_title">作品故事</div>
                     <div class="work_story_text" v-html="info.detail"></div>
                     <div class="work_story_creator">
-                        <div class="work_story_creator_left">创作者</div>
+                        <div class="work_story_creator_left">铸造者</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                     </div>
                     <div class="work_story_creator">
-                        <div class="work_story_creator_left">发行方</div>
-                        <div class="work_story_creator_right">{{ info.issuer || '暂无信息'}}</div>
+                        <div class="work_story_creator_left">创作者</div>
+                        <div class="work_story_creator_right">{{ info.issuer || '暂无信息' }}</div>
                     </div>
                 </div>
             </div>
@@ -406,6 +412,7 @@
                     </div>
                 </div>
             </div>
+            <div class="technology_tip">蚂蚁链提供技术支持</div>
         </div>
         <!-- <img src="" alt="" class="detail_content_img" />
         <div class="detail_content_one">
@@ -532,7 +539,7 @@
         <div class="transaction_button" v-if="info.onShelf && info.scheduleSale && !info.salable">
             <div class="transaction_button_left">
                 <div class="transaction_price"><span class="amount_symbol">￥</span>{{ info.price }}</div>
-                <div class="transaction_tax">
+                <div class="transaction_tax" v-if="info.royalties">
                     (含&nbsp;<span class="transaction_tax_con">{{ info.royalties }}%</span>&nbsp;版税)
                 </div>
             </div>
@@ -543,7 +550,10 @@
                 <!-- <van-count-down :time="time" format="DD天 HH:mm:ss" class="coming_on_sale_time" /> -->
                 <!-- </div> -->
                 <!-- 预约 -->
-                <div class="buy_now" v-if="info.subscribeStatus == 'NOT_STARTED' && info.hasSubscribe && !isSolded && !isSold">
+                <div
+                    class="buy_now"
+                    v-if="info.subscribeStatus == 'NOT_STARTED' && info.hasSubscribe && !isSolded && !isSold"
+                >
                     <!-- v-if="isAppointment" block round -->
                     <div class="buy_now_con">敬请期待</div>
                     <div class="buy_now_time">{{ comingSoonTime }} 开放预约</div>
@@ -553,7 +563,7 @@
         <div class="transaction_button" v-else-if="info.onShelf && info.salable">
             <div class="transaction_button_left">
                 <div class="transaction_price"><span class="amount_symbol">￥</span>{{ info.price }}</div>
-                <div class="transaction_tax">
+                <div class="transaction_tax" v-if="info.royalties">
                     (含&nbsp;<span class="transaction_tax_con">{{ info.royalties }}%</span>&nbsp;版税)
                 </div>
             </div>
@@ -568,7 +578,10 @@
                     限购{{ limit.limit }}件
                 </div>
                 <!-- 预约 -->
-                <div class="buy_now" v-else-if="info.subscribeStatus == 'NOT_STARTED' && info.hasSubscribe && !isSolded && !isSold">
+                <div
+                    class="buy_now"
+                    v-else-if="info.subscribeStatus == 'NOT_STARTED' && info.hasSubscribe && !isSolded && !isSold"
+                >
                     <!-- v-if="isAppointment" block round -->
                     <div class="buy_now_con">敬请期待</div>
                     <div class="buy_now_time">{{ comingSoonTime }} 开放预约</div>
@@ -579,7 +592,10 @@
                     </div>
                     <div class="sold_out" v-else>已预约</div>
                 </div>
-                <div class="sold_out" v-else-if="info.subscribeStatus == 'SUBSCRIBE_ENDING' && info.hasSubscribe && !isSolded && !isSold">
+                <div
+                    class="sold_out"
+                    v-else-if="info.subscribeStatus == 'SUBSCRIBE_ENDING' && info.hasSubscribe && !isSolded && !isSold"
+                >
                     <!-- v-if="!isAppointment && info.state == 'CLOSESUBSCRIBE'" -->
                     预约结束
                 </div>
@@ -1225,6 +1241,7 @@ export default {
     width: 100%;
     background: #191d27;
     position: relative;
+    padding-top: 50px;
     // .detail_content_top {
     //     height: 380px;
     // }
@@ -1249,10 +1266,14 @@ export default {
                 height: 52px;
                 padding: 0px 6px;
                 box-sizing: border-box;
-                transform: translateY(-255px);
+                transform: translateY(-270px);
+                .list_of_details_one_title_one {
+                    display: flex;
+                    justify-content: center;
+                }
                 .list_of_details_one_title_img {
-                    width: 100%;
-                    height: 52px;
+                    width: 56px;
+                    height: 56px;
                 }
                 .list_of_details_one_title_con {
                     width: 100%;
@@ -1260,20 +1281,17 @@ export default {
                     overflow: hidden;
                     text-overflow: ellipsis;
                     text-align: center;
-                    padding: 0px 27px;
-                    box-sizing: border-box;
-                    transform: translateY(-58px);
                     height: 28px;
                     font-size: 20px;
                     font-family: PingFangSC-Semibold, PingFang SC;
                     font-weight: 600;
                     color: #ffffff;
                     line-height: 28px;
+                    margin-bottom: 9px;
                 }
                 .limited_label {
                     display: flex;
                     justify-content: center;
-                    transform: translateY(-45px);
                     align-items: center;
                     .limited_label_title {
                         padding: 0px 6px;
@@ -1329,12 +1347,12 @@ export default {
                     }
                 }
                 .fengge_con {
-                    transform: translateY(-15px);
                     font-size: 12px;
                     font-family: PingFangSC-Regular, PingFang SC;
                     font-weight: 400;
                     color: #747575;
                     line-height: 16px;
+                    margin-top: 30px;
                     .suoding_img {
                         width: 16px;
                         height: 16px;
@@ -1400,7 +1418,7 @@ export default {
                     border-radius: 4px;
                     font-size: 14px;
                     font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
+                    font-weight: bold;
                     color: #725837;
                     line-height: 30px;
                     text-align: center;
@@ -1451,6 +1469,15 @@ export default {
                     /deep/ .van-step__circle-container {
                         background: #1e222c !important;
                     }
+                    /deep/.van-step--horizontal .van-step__icon {
+                        width: var(--van-step-circle-size);
+                        height: var(--van-step-circle-size);
+                        background: rgb(243, 224, 188);
+                        border-radius: 50%;
+                        &::before {
+                            content: none;
+                        }
+                    }
                 }
                 .appointment_process_time {
                     display: flex;
@@ -1474,7 +1501,7 @@ export default {
             .hold_privileges_con {
                 background: #1e222c;
                 border-radius: 8px;
-                padding: 10px;
+                padding: 16px 15px;
                 box-sizing: border-box;
             }
         }
@@ -1520,7 +1547,7 @@ export default {
                 }
             }
         }
-        .work_story_two{
+        .work_story_two {
             margin-top: -125px;
             position: relative;
             // z-index: 1;
@@ -1553,12 +1580,23 @@ export default {
                 }
             }
         }
+        .technology_tip {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 20px;
+            opacity: 0.5;
+            text-align: center;
+            margin-top: 20px;
+        }
     }
     .detail_content_con {
         width: 100%;
         height: 192px;
         position: absolute;
         top: 0px;
+        z-index: 3;
     }
     .detail_content_img {
         margin-top: 30px;
@@ -2188,4 +2226,18 @@ export default {
         }
     }
 }
+
+// /deep/.step-buy {
+//     &.van-step--horizontal .van-step__icon {
+//         &.van-step__icon--active {
+//             background: rgb(243, 224, 188);
+//             width: var(--van-step-circle-size);
+//             height: var(--van-step-circle-size);
+//             border-radius: 50%;
+//             &::before {
+//                 content: none;
+//             }
+//         }
+//     }
+// }
 </style>

src/views/product/List.vue

@@ -66,7 +66,7 @@
             close-on-click-action
         />
 
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <template v-for="(item, index) in showList" :key="index">
                 <product-info v-model:info="list[index]" @update:info="init"></product-info>
             </template>
@@ -153,7 +153,7 @@
             style="padding-bottom: 1px"
             v-model:loading="loading"
             :finished="finished"
-            finished-text=""
+            finished-text="没有更多"
             @load="getData"
         >
             <div class="selected_recommendations_list">

src/views/product/Search.vue

@@ -128,7 +128,7 @@
             v-model:loading="loading"
             :immediate-check="false"
             :finished="finished"
-            finished-text=""
+            finished-text="没有更多"
             @load="getData"
             v-if="isSearch"
         >

src/views/user/Banks.vue

@@ -14,7 +14,7 @@
                 <img src="@assets/bankicon.png" alt="" />
             </div>
             <van-swipe-cell :name="index" v-for="(item, index) in list" :key="index" :before-close="beforeClose">
-                <div class="bank_info" :style="{ background: getColor(item.bankNo) }">
+                <div class="bank_info">
                     <div class="bank_info_left">
                         <div class="text1">{{ item.bankName }}</div>
                         <div class="text2">{{ item.cardTypeDesc }}</div>
@@ -168,7 +168,7 @@ export default {
         background-color: @bg2;
         border-radius: 12px;
         .flex-col();
-        padding: 60px 0;
+        padding: 20px 0;
         align-items: center;
         img {
             width: 54px;
@@ -209,6 +209,7 @@ export default {
             display: flex;
             justify-content: space-between;
             border-radius: 12px;
+            background-color: #00A371;
             .bank_info_left {
                 margin-left: 16px;
                 color: #ffffff;

src/views/user/BanksAdd.vue

@@ -4,14 +4,14 @@
         <van-form @submit="onSubmit" class="form">
             <van-field
                 type="digit"
-                name="银行卡号"
-                label="银行卡号"
+                name="银行卡"
+                label="银行卡"
                 :maxlength="23"
-                placeholder="点击输入*某某 银行卡号"
+                placeholder="点击输出本人银行卡号"
                 :formatter="bankFormatter"
                 v-model="form.bankNo"
                 clearable
-                :rules="[{ required: true, message: '请填写银行卡号' }]"
+                :rules="[{ required: true, message: '' }]"
             />
             <van-field
                 type="tel"
@@ -20,16 +20,21 @@
                 placeholder="请输入银行预留手机号"
                 v-model="form.phone"
                 :rules="[
-                    { required: true, message: '请输入银行预留手机号' },
+                    { required: true, message: '' },
                     {
                         pattern: phonePattern,
-                        message: '手机号码格式错误'
+                        message: ''
                     }
                 ]"
             />
             <div class="tips">
-                <span>同意</span>
-                <span>《拉索宇宙支付用户协议》</span>
+                <van-checkbox v-model="checked">
+                    <span class="xieyi_con">同意</span>
+                    <span @click.stop="$router.push('/agreement?page=service')">《拉索宇宙支付用户协议》</span>
+                    <template #icon="props">
+                        <img class="img-icon" :src="props.checked ? activeIcon : inactiveIcon" />
+                    </template>
+                </van-checkbox>
             </div>
             <div class="next_step">
                 <van-button type="primary" :disabled="!canNext" block native-type="submit">同意协议并继续</van-button>
@@ -57,6 +62,22 @@
         <div class="prompt_information">银行预留手机号</div>
         <input type="text" v-model="phoneNumber" placeholder="请输入银行预留手机号" class="input_information"/> -->
     </div>
+    <!-- 协议弹出框 -->
+    <van-overlay :show="protocol" @click="protocol = false">
+        <div class="wrapper" @click.stop>
+            <div class="protocol_tips" v-if="protocol === true">
+                <div class="protocol_tips_top">
+                    请您已阅读<span class="protocol_tips_top_con" @click.stop="$router.push('/agreement')"
+                        >《拉索宇宙支付用户协议》</span
+                    >的全部条款，接受后可开始使用我们的服务
+                </div>
+                <div class="protocol_tips_bottom">
+                    <div class="protocol_tips_bottom_one" @click="agreement(false)">不同意</div>
+                    <div class="protocol_tips_bottom_two" @click="agreement(true)">同意</div>
+                </div>
+            </div>
+        </div>
+    </van-overlay>
     <!-- <page-bar>
             添加银行卡
             <template #sub>成功绑定银行卡后</template>
@@ -109,7 +130,11 @@ export default {
             form: {
                 code: ''
             },
-            show: false
+            show: false,
+            checked: localStorage.getItem('agreeTerm') === 'true',
+            activeIcon: require('@assets/checked.png'),
+            inactiveIcon: require('@assets/checked1.png'),
+            protocol: false,
         };
     },
     computed: {
@@ -128,10 +153,20 @@ export default {
     },
     methods: {
         onSubmit() {
+            if (!this.checked) {
+                this.protocol = true;
+                return;
+            }
             this.sendMsg(this.form.phone);
             this.form.code = '';
             this.show = true;
         },
+        agreement(value) {
+            if (value) {
+                this.checked = true;
+            }
+            this.protocol = false;
+        },
         bind() {
             if (!this.form.code || this.form.code.length < 4) {
                 this.$toast('请输入验证码');
@@ -229,12 +264,71 @@ export default {
         line-height: 44px;
     }
 }
+.img-icon{
+    margin-top: 4px;
+    width: 14px;
+    height: 14px;
+}
 .next_step {
     padding: 30px 16px;
 }
 /deep/ .van-cell:after {
     border-bottom: none;
 }
+.wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    padding: 90px 35px 0px;
+}
+.protocol_tips {
+    transform: translateY(-150px);
+    width: 100%;
+    background: #ffffff;
+    border-radius: 12px;
+    padding: 22px 25px 26px;
+    box-sizing: border-box;
+    .protocol_tips_top {
+        font-size: 15px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #666666;
+        line-height: 26px;
+        text-align: center;
+        .protocol_tips_top_con {
+            color: #816232;
+        }
+    }
+    .protocol_tips_bottom {
+        margin-top: 20px;
+        display: flex;
+        justify-content: center;
+        font-size: 16px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #202020;
+        .protocol_tips_bottom_one {
+            flex: 1;
+            height: 42px;
+            border-radius: 4px;
+            border: 1px solid #dedede;
+            box-sizing: border-box;
+            text-align: center;
+            line-height: 40px;
+            margin-right: 15px;
+        }
+        .protocol_tips_bottom_two {
+            flex: 1;
+            height: 42px;
+            background: #f9ddb3;
+            color: #503a1e;
+            border-radius: 4px;
+            text-align: center;
+            line-height: 42px;
+        }
+    }
+}
 /deep/.form {
     .van-cell {
         padding: 0px;
@@ -272,8 +366,7 @@ export default {
     border-left: none;
 }
 
-
-/deep/.van-password-input__security i{
+/deep/.van-password-input__security i {
     background: #000;
 }
 

src/views/user/Exchange.vue

@@ -34,7 +34,7 @@
                 close-on-click-action
             /> -->
         </van-sticky>
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <div class="exchange">
                     <div class="exchange_top">
@@ -81,7 +81,7 @@
                 :image="require('@assets/collection-record@3x.png')"
                 class="empty_one"
             >
-                <div class="empty_two">这里将展示你在拉索的数字藏品流转记录</div>
+                <div class="empty_two">这里将展示你在拉索宇宙的数字藏品流转记录</div>
             </van-empty>
         </van-list>
     </div>

src/views/user/Follows.vue

@@ -31,11 +31,11 @@ export default {
             emptyInfo: {
                 follow: {
                     name: '你还没有关注别人哦～',
-                    sub: '这里将展示你在拉索的关注的用户'
+                    sub: '这里将展示你在拉索宇宙的关注的用户'
                 },
                 follower: {
                     name: '你还没有粉丝哦~',
-                    sub: '这里将展示你在拉索的粉丝用户'
+                    sub: '这里将展示你在拉索宇宙的粉丝用户'
                 }
             }
         };