Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/App.vue

@@ -13,7 +13,7 @@
 import AppBar from './components/AppBar.vue';
 import { computed } from 'vue';
 export default {
-    components: { AppBar },
+    // components: { AppBar },
     name: 'App',
     provide() {
         return {

src/components/Post.vue

@@ -2,7 +2,8 @@
     <div ref="share">
         <van-overlay :show="show" @click="show = false" z-index="99">
             <div class="wrapper">
-                <div class="img" ref="wrap" v-if="img" @click.stop="preview(0, [img])">
+                <div class="img" ref="wrap" v-if="img">
+                    <!-- @click.stop="preview(0, [img])" -->
                     <img :src="img" />
                 </div>
                 <template v-if="!img">
@@ -60,7 +61,7 @@
                                         <!-- <div class="minter_con_one_text1">拉索</div> -->
                                         <div class="minter_con_one_text2" v-if="info.category">{{ info.category }}</div>
                                     </div>
-                                    <div class="minter_con_two">扫码打开拉索app，发现有趣数字藏品</div>
+                                    <div class="minter_con_two">扫码打开拉索APP，发现有趣数字藏品</div>
                                 </div>
                                 <div>
                                     <vue-qrcode :value="url" :options="{ width: 70, margin: 3 }" class="code"></vue-qrcode>
@@ -79,10 +80,11 @@
                     </div>
                 </template>
 
-                <div class="btn" @click.stop="" v-if="cordova">
-                    <van-button type="primary" round @click="save">点击保存到本地</van-button>
+                <div class="btn" @click.stop="">
+                    <!-- v-if="cordova" -->
+                    <van-button type="primary" @click="save">保存图片</van-button>
                 </div>
-                <div class="tips" v-else>长按图片保存</div>
+                <!-- <div class="tips" v-else>长按图片保存</div> -->
             </div>
         </van-overlay>
         <div class="share" v-if="!noButton" @click="init">
@@ -354,6 +356,8 @@ export default {
             .minter_con_one_text1 {
                 width: 60px;
                 height: 32px;
+                position: relative;
+                z-index: 1;
                 // margin-right: 7px;
                 // font-size: 20px;
                 // color: #eacc9b;
@@ -492,7 +496,13 @@ export default {
 }
 
 .btn {
-    padding: 30px;
+    padding: 40px;
+    // width: 150px;
+    font-size: 18px;
+    align-self: center;
+    /deep/ .van-button{
+        height: 46px;
+    }
 }
 
 .assignmentPost {

src/components/product/ProductBanner.vue

@@ -30,7 +30,6 @@
                     </video>
                     <van-image
                         v-else
-                        @click="preview(index, changeImgs(banners))"
                         :src="getImg(item.url, '', 1200)"
                         width="calc(100vw - 150px)"
                         height="calc(100vw - 150px)"

src/components/product/productLarge.vue

@@ -21,7 +21,7 @@
             <!-- 即将售罄 -->
             <div class="shop_sold_out_two" v-else-if="isSold">即将售罄</div>
             <!-- <img :src="getImg(changeImgs(info.pic, 600))" alt="" class="commodity_map" /> -->
-            <van-image width="100%" height="calc(100vw - 30px)" :radius="30" :src="getImg(changeImgs(info.pic))" fit="cover" />
+            <van-image width="100%" height="calc(100vw - 30px)" :radius="30" :src="getImg(changeImgs(info.pic))" fit="cover"/>
             <div class="shop_title">
                 <div>{{ info.name }}</div>
                 <img v-if="!!info.model3d" :src="require('@assets/3d@3x.png')" alt="" class="shop_title_img" />
@@ -130,6 +130,10 @@ export default {
         right: 0;
         bottom: 0;
     }
+    /deep/ .van-image__img{
+        position: relative;
+        z-index: 11;
+    }
     .not_sold_out {
         // width: 144px;
         height: 25px;

src/views/Discover.vue

@@ -148,7 +148,7 @@ import banner from '../mixins/banner';
 import list from '../mixins/list';
 // import TopNavigation from "../components/TopNavigation.vue"
 export default {
-    // name: 'discover',
+    name: 'discover',
     // inject: ['bar', 'setKeeps', 'scrollWrapper', 'changeScroll'],
     mixins: [product, banner, list],
     components: {
@@ -156,6 +156,7 @@ export default {
         Swiper,
         SwiperSlide
     },
+    inject: ['setKeeps', 'scrollWrapper', 'changeScroll', 'bodyScroll'],
     // components: {
     //     Swiper,
     //     SwiperSlide,
@@ -211,7 +212,8 @@ export default {
             hotCollectionList: [],
             url: '/collection/all',
             sortDes: 'asc',
-            sortPre: ''
+            sortPre: '',
+            scrollTop: 0,
         };
     },
     mounted() {
@@ -355,19 +357,20 @@ export default {
     },
     activated() {
         this.$nextTick(() => {
+            console.log("31231212",this.scrollTop)
             this.changeScroll(this.scrollTop);
         });
+    },
+    beforeRouteLeave(to, from, next) {
+        if (to.path === '/productDetail') {
+            this.scrollTop = this.scrollWrapper.value.scrollTop;
+            this.setKeeps(['index', 'discover']);
+        } else {
+            this.scrollTop = 0;
+            this.setKeeps(['index', 'discover'], false);
+        }
+        next();
     }
-    // beforeRouteLeave(to, from, next) {
-    //     if (!to.meta.menuPage) {
-    //         this.scrollTop = this.scrollWrapper.value.scrollTop;
-    //         this.setKeeps(['index', 'discover']);
-    //     } else {
-    //         this.scrollTop = 0;
-    //         this.setKeeps(['index', 'discover'], false);
-    //     }
-    //     next();
-    // }
 };
 // mounted() {
 //     this.$store.dispatch('getUsedBuy');

src/views/Givesubmit.vue

@@ -75,15 +75,15 @@
                     </van-radio-group> -->
                     <img class="choose-icon" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
                 </div>
-                <van-divider />
+                <!-- <van-divider /> -->
             </div>
-            <div class="add_bank_card">
+            <!-- <div class="add_bank_card">
                 <div class="add_bank_card_con">
                     <img :src="require('@assets/tianjia@3x.png')" alt="" class="add_bank_card_img_one" />
                     <div class="add_bank_card_con_title">添加银行卡付款</div>
                 </div>
                 <img :src="require('@assets/gengduo@3x.png')" alt="" class="add_bank_card_img_two" />
-            </div>
+            </div> -->
         </div>
     </div>
     <div class="gift_button">

src/views/Home.vue

@@ -155,6 +155,8 @@ import { Toast } from 'vant';
 import { mapState } from 'vuex';
 // import ProductSmall from '../components/product/productSmall.vue';
 export default {
+    name: 'home',
+    inject: ['setKeeps', 'scrollWrapper', 'changeScroll', 'bodyScroll'],
     data() {
         return {
             collectionId: '',
@@ -167,7 +169,8 @@ export default {
             active: 0,
             reserve: false,
             saleList: [],
-            scheduledStatus: []
+            scheduledStatus: [],
+            scrollTop: 0,
         };
     },
     mixins: [product, banner, common],
@@ -290,6 +293,21 @@ export default {
         that.getList();
         that.getBanner();
         // that.getUser();
+    },
+    activated() {
+        this.$nextTick(() => {
+            this.changeScroll(this.scrollTop);
+        });
+    },
+    beforeRouteLeave(to, from, next) {
+        if (to.path === '/productDetail') {
+            this.scrollTop = this.scrollWrapper.value.scrollTop;
+            this.setKeeps(['index', 'home']);
+        } else {
+            this.scrollTop = 0;
+            this.setKeeps(['index', 'home'], false);
+        }
+        next();
     }
 };
 // import product from '../mixins/product';

src/views/Store.vue

@@ -103,14 +103,16 @@
                         <CollectionList v-model:info="list[item.index]" @update:info="init"></CollectionList>
                     </template>
                 </div>
-                <van-empty
-                    v-if="showList.length === 0"
-                    :image="require(`@assets/empty-collection.png`)"
-                    :image-size="`172`"
-                >
-                    <div class="h44_tip_one">你还没有收藏的藏品</div>
-                    <div class="h44_tip">这里将展示你在拉索持有的数字藏品</div>
-                </van-empty>
+                <div class="van_empty_con">
+                    <van-empty
+                        v-if="showList.length === 0"
+                        :image="require(`@assets/empty-collection.png`)"
+                        :image-size="`172`"
+                    >
+                        <div class="h44_tip_one">你还没有收藏的藏品</div>
+                        <div class="h44_tip">这里将展示你在拉索持有的数字藏品</div>
+                    </van-empty>
+                </div>
             </div>
         </van-pull-refresh>
     </div>
@@ -360,8 +362,9 @@ export default {
                 font-weight: 500;
                 color: #ffffff !important;
             }
-            .van-tab--line{
+            .van-tab--line {
                 font-size: 16px;
+                color: rgba(255, 255, 255, 0.5);
             }
         }
     }
@@ -419,6 +422,12 @@ export default {
         }
     }
 }
+/deep/ .van-empty {
+    padding-top: 33px;
+}
+.van_empty_con {
+    padding-top: 18px;
+}
 .shop_list_one {
     height: 100%;
     position: absolute;

src/views/Submit.vue

@@ -13,6 +13,15 @@
                 <img :src="require('@assets/more@3x.png')" alt="" class="gift_confirmation_top_three_img" />
             </div>
         </div>
+        <!-- <div class="payment_method">
+            <div class="payment_method_con" @click="payType = item.type" v-for="(item, index) in payInfos" :key="index">
+                <div class="payment_method_con_left">
+                    <van-image :src="item.icon" width="24px" height="24px" fit="cover" class="payment_method_img" />
+                    <div class="payment_method_title">{{ item.name }}</div>
+                </div>
+                <img class="choose-icon" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
+            </div>
+        </div> -->
         <div class="payment_method">
             <div class="payment_method_all">
                 <div
@@ -26,20 +35,17 @@
                             <img :src="item.icon" alt="" class="payment_method_img" />
                             <div class="payment_method_title">{{ item.name }}</div>
                         </div>
-                        <!-- <van-radio-group v-model="payType">
-                        <van-radio :name="item.type" icon-size="24px" checked-color="#28B6FF"></van-radio>
-                    </van-radio-group> -->
                         <img class="choose-icon" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
                     </div>
-                    <van-divider />
+                    <van-divider v-if="item.type == 'ALIPAY'"/>
                 </div>
-                <div class="add_bank_card">
+                <!-- <div class="add_bank_card">
                     <div class="add_bank_card_con">
                         <img :src="require('@assets/tianjia@3x.png')" alt="" class="add_bank_card_img_one" />
                         <div class="add_bank_card_con_title">添加银行卡付款</div>
                     </div>
                     <img :src="require('@assets/gengduo@3x.png')" alt="" class="add_bank_card_img_two" />
-                </div>
+                </div> -->
             </div>
         </div>
         <!-- <div class="confirm_order">
@@ -126,24 +132,36 @@ export default {
         return {
             info: {},
             message: '',
-            payType: inWeixin ? 'WEIXIN' : 'ALIPAY',
+            payType: 'ALIPAY',
             payChannel: null,
             payInfos: [
                 {
-                    icon: require('@assets/zhifubao@3x.png'),
+                    icon: require('@assets/svgs/zhifubao.svg'),
                     name: '支付宝',
                     type: 'ALIPAY'
                 },
                 {
-                    icon: require('@assets/weixin@3x.png'),
-                    name: '微信',
-                    type: 'WEIXIN'
+                    icon: require('@assets/icon_yinlian.png'),
+                    name: '银联快捷付',
+                    type: 'H5PAY'
                 }
-                // {
-                //   icon: require("@assets/svgs/png-decp.svg"),
-                //   name: "DCEP",
-                // },
             ],
+            // payInfos: [
+            //     {
+            //         icon: require('@assets/zhifubao@3x.png'),
+            //         name: '支付宝',
+            //         type: 'ALIPAY'
+            //     },
+            //     {
+            //         icon: require('@assets/weixin@3x.png'),
+            //         name: '微信',
+            //         type: 'WEIXIN'
+            //     }
+            // {
+            //   icon: require("@assets/svgs/png-decp.svg"),
+            //   name: "DCEP",
+            // },
+            // ],
             icons: [require('@assets/weixuanzhong@3.png'), require('@assets/xuanzhong@3x.png')],
             bottom: null,
             orderId: 0,
@@ -212,14 +230,14 @@ export default {
                 return Promise.resolve();
             })
         ]).then(() => {
-            if (!(this.enable_wx_lite || this.enable_wx_pub)) {
-                this.payInfos.splice(1, 1);
-                this.payType = 'ALIPAY';
-            } else if (this.enable_wx_pub) {
-                this.payChannel = 'wx_pub';
-            } else {
-                this.payChannel = 'wx_lite';
-            }
+            // if (!(this.enable_wx_lite || this.enable_wx_pub)) {
+            //     this.payInfos.splice(1, 1);
+            //     this.payType = 'ALIPAY';
+            // } else if (this.enable_wx_pub) {
+            //     this.payChannel = 'wx_pub';
+            // } else {
+            //     this.payChannel = 'wx_lite';
+            // }
         });
         this.$toast.loading({
             message: '加载中...',
@@ -459,11 +477,11 @@ export default {
                                 });
                                 this.getOrder(true);
                             }
-                        }else if (this.payType === 'H5PAY'){
-                             document.location.href = resolveUrl(
+                        } else if (this.payType === 'H5PAY') {
+                            document.location.href = resolveUrl(
                                 this.$baseUrl,
                                 '/payOrder/sandQuick?id=' + this.orderId
-                            )
+                            );
                         }
                     });
                 } else {
@@ -558,7 +576,7 @@ export default {
                                         });
                                     reject();
                                 });
-                        }else if (this.payType === 'H5PAY') {
+                        } else if (this.payType === 'H5PAY') {
                             this.$router.replace({
                                 path: '/submit',
                                 query: {
@@ -671,9 +689,9 @@ export default {
     padding: 0px 15px;
     box-sizing: border-box;
     // margin-top: 10px;
-    .payment_method_all{
+    .payment_method_all {
         padding: 20px 0px;
-        background: #1E222C;
+        background: #1e222c;
         border-radius: 12px;
     }
     .add_bank_card {
@@ -1076,7 +1094,7 @@ export default {
             font-weight: 500;
             color: #ffffff;
             border-bottom: 1px solid rgba(94, 99, 110, 0.2);
-            padding-bottom: 10px;
+            padding-bottom: 19px;
             margin-bottom: 10px;
             box-sizing: border-box;
             .payment_method_con_left {

src/views/account/Login.vue

@@ -2,7 +2,7 @@
     <div class="login loginHeight">
         <div class="title">
             <div class="text1">欢迎来到拉索</div>
-            <div class="text2">看发现更多数字藏品</div>
+            <div class="text2">发现更多数字藏品</div>
         </div>
         <van-form @submit="submit" ref="code">
             <div class="field-box">

src/views/account/Waiting.vue

@@ -14,7 +14,7 @@
         <div class="under_review" v-else>
             <img :src="require('@assets/shenqing_shenhezhong.png')" alt="" class="under_review_img" />
             <div class="under_review_title">提交成功，请等待审核</div>
-            <div class="under_review_tip">平台将于3日内完成资料审核，请耐心等待</div>
+            <div class="under_review_tip">平台将于5分钟内完成资料审核，请耐心等待</div>
         </div>
     </div>
     <!-- <div class="page">

src/views/creator/Detail.vue

@@ -78,7 +78,7 @@
                 </div>
             </div>
         </div>
-        <van-sticky ref="top" :offset-top="46">
+        <van-sticky ref="top" :offset-top="0">
             <div class="menu">
                 <div class="menu-item" @click="changeMenu('DEFAULT')" :class="{ active: type === 'DEFAULT' }">
                     藏品类目

src/views/creator/List.vue

@@ -1,11 +1,11 @@
 <template>
-    <div class="follow">
+    <!-- <div class="follow">
         <img
             :src="require('@assets/sousuo@3x.png')"
             alt=""
             class="follow_search"
             @click="$router.push('/productSearch')"
-        />
+        /> -->
         <van-sticky ref="top" :offset-top="bar.value && bar.value.show ? 46 : 0">
             <van-tabs v-model:active="sort" :ellipsis="false" line-width="16" line-height="2" @change="getData(true)">
                 <van-tab
@@ -37,7 +37,7 @@
                 description="没有任何藏品哦~"
             />
         </van-list>
-    </div>
+    <!-- </div> -->
 </template>
 
 <script>
@@ -123,7 +123,9 @@ export default {
     justify-content: space-between;
 }
 /deep/ .van-tabs__line{
-    z-index: -1;
+    width: 0px !important;
+    height: 0px !important;
+    // z-index: -1;
 }
 .top {
     background-color: @bg;

src/views/order/Orders.vue

@@ -202,7 +202,7 @@ export default {
 }
 /deep/ .van-tabs__wrap {
     height: 36px;
-    padding: 12px 0px 15px;
+    // padding: 12px 0px 15px;
     .van-tabs__nav--line {
         padding: 0  25px !important;
         border-top: none;
@@ -219,12 +219,13 @@ export default {
         background: #d8d8d8;
     }
     .van-tab--active {
-        font-size: 16px;
+        font-size: 17px;
         font-weight: 500;
         color: #ffffff !important;
     }
     .van-tab--line {
-        font-size: 16px;
+        color: rgba(255, 255, 255, 0.5);
+        font-size: 17px;
     }
 }
 .my_list {
@@ -270,9 +271,12 @@ export default {
     width: 100%;
     height: 100%;
     background: @bg;
-    padding: 10px 16px 0px 16px;
+    padding: 15px;
     box-sizing: border-box;
 }
+/deep/ .van-empty{
+    padding-top: 68px;
+}
 /deep/ .van-tabs__nav--line {
     padding: 0;
     border: none;

src/views/product/Detail.vue

@@ -341,7 +341,9 @@
                             <div class="author_details_two">{{ info.collectionWorks }}</div>
                         </div>
                     </div>
-                    <div :class="info.follow ?'followedtwo':'collection_author_right'" @click="follow">{{ info.follow ? '已关注' : '关注' }}</div>
+                    <div :class="info.follow ? 'followedtwo' : 'collection_author_right'" @click="follow">
+                        {{ info.follow ? '已关注' : '关注' }}
+                    </div>
                 </div>
             </div>
             <div class="appointment_process" v-if="info.hasSubscribe">
@@ -540,7 +542,7 @@
                 <!-- <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">
+                <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>
@@ -565,46 +567,48 @@
                     限购{{ limit.limit }}件
                 </div>
                 <!-- 预约 -->
-                <div class="buy_now" v-if="info.subscribeStatus == 'NOT_STARTED' && info.hasSubscribe">
+                <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>
                 </div>
-                <div v-else-if="info.subscribeStatus == 'ONGOING' && info.hasSubscribe">
+                <div v-else-if="info.subscribeStatus == 'ONGOING' && info.hasSubscribe && !isSolded && !isSold">
                     <div class="buy_now" @click="appointment" v-if="!info.subscribed">
                         <div class="buy_now_con_two">立即预约</div>
                     </div>
                     <div class="sold_out" v-else>已预约</div>
                 </div>
-                <div class="sold_out" v-else-if="info.subscribeStatus == 'SUBSCRIBE_ENDING' && info.hasSubscribe">
+                <div class="sold_out" v-else-if="info.subscribeStatus == 'SUBSCRIBE_ENDING' && info.hasSubscribe && !isSolded && !isSold">
                     <!-- v-if="!isAppointment && info.state == 'CLOSESUBSCRIBE'" -->
                     预约结束
                 </div>
-                <div v-else-if="info.subscribeStatus == 'ANNOUNCING' && info.hasSubscribe">
+                <div v-else-if="info.subscribeStatus == 'ANNOUNCING' && info.hasSubscribe && !isSolded && !isSold">
                     <!-- v-if="!isAppointment && info.state == 'PUBLISH'" class="button_three" -->
                     <div class="buy_now" v-if="info.purchaseQualifications">
                         <div class="buy_now_con_two">已获取购买资格</div>
                     </div>
                     <div class="sold_out" v-else>未获取购买资格</div>
                 </div>
-                <div v-else-if="info.subscribeStatus == 'ON_SALE' && info.hasSubscribe">
+                <div v-else-if="info.subscribeStatus == 'ON_SALE' && info.hasSubscribe && !isSolded && !isSold">
                     <!-- v-if="!isAppointment && info.state == 'PURCHASE'" -->
-                    <div class="buy_now" @click="buyNow" v-if="info.purchaseQualifications">
-                        <div class="buy_now_con">立即购买</div>
-                        <div>
+                    <div class="buy_now_collection" @click="buyNow" v-if="info.purchaseQualifications">
+                        立即购买
+                        <!-- <div class="buy_now_con">立即购买</div> -->
+                        <!-- <div>
                             <span class="purchase_sold">已售&nbsp;{{ info.sale }}</span>
                             <span class="Purchase_surplus">剩余{{ info.stock }}</span>
-                        </div>
+                        </div> -->
                     </div>
                     <div v-else class="sold_out">已售罄</div>
                 </div>
-                <div v-else-if="!info.hasSubscribe">
-                    <div class="buy_now" @click="buyNow">
-                        <div class="buy_now_con">立即购买</div>
-                        <div>
+                <div v-else-if="!info.hasSubscribe && !isSolded && !isSold">
+                    <div class="buy_now_collection" @click="buyNow">
+                        立即购买
+                        <!-- <div class="buy_now_con">立即购买</div> -->
+                        <!-- <div>
                             <span class="purchase_sold">已售&nbsp;{{ info.sale }}</span>
                             <span class="Purchase_surplus">剩余{{ info.stock }}</span>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <!-- 预约 -->
@@ -978,7 +982,7 @@ export default {
                             this.dayjs(),
                             'Millisecond'
                         );
-                        if(res.hasSubscribe){
+                        if (res.hasSubscribe) {
                             this.timer();
                         }
                     } else if (res.subscribeStatus == 'ONGOING') {
@@ -2057,6 +2061,18 @@ export default {
                     color: #725837;
                 }
             }
+            .buy_now_collection {
+                width: 160px;
+                height: 46px;
+                background: #f9ddb3;
+                border-radius: 8px;
+                text-align: center;
+                font-size: 16px;
+                font-family: PingFangSC-Medium, PingFang SC;
+                font-weight: 500;
+                color: #725837;
+                line-height: 46px;
+            }
             .cancel_reservation {
                 width: 160px;
                 height: 46px;

src/views/product/Search.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="search" :style="{ backgroundColor: isSearch ? '#191D27' : '#191D27' }">
-        <van-sticky v-if="isSearch" ref="top" :offset-top="46">
+        <van-sticky v-if="isSearch" ref="top" :offset-top="0">
             <van-search
                 v-model="search"
                 placeholder="搜索你想要的"
@@ -58,7 +58,7 @@
                 >仅看在售</van-checkbox
             > -->
         </van-sticky>
-        <van-sticky v-else ref="top" :offset-top="46">
+        <van-sticky v-else ref="top" :offset-top="0">
             <van-search
                 v-model="search"
                 placeholder="搜索你想要的"
@@ -447,4 +447,7 @@ export default {
     color: #939599 !important;
     // background: #29293F !important;
 }
+/deep/ .van-empty{
+    padding-top: 74px;
+}
 </style>

src/views/user/Exchange.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="home">
-        <van-sticky :offset-top="46">
+        <van-sticky :offset-top="0">
             <van-tabs v-model:active="sort" line-width="32" line-height="2" @click-tab="changeTab">
                 <van-tab :title="item.label" :name="item.value" :key="index" v-for="(item, index) in selectOptions">
                 </van-tab>
@@ -402,16 +402,17 @@ export default {
         background: #d8d8d8;
     }
     .van-tab--active {
-        font-size: 16px;
+        font-size: 17px;
         font-weight: 500;
         color: #ffffff !important;
     }
     .van-tab--line {
-        font-size: 16px;
+        font-size: 17px;
+        color: rgba(255, 255, 255, 0.5);
     }
 }
 /deep/ .van-empty {
-    margin-top: 60px;
+    padding-top: 83px;
 }
 .empty_two {
     font-size: 14px;

src/views/user/Follows.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="follow">
-        <van-sticky :offset-top="46">
+        <van-sticky :offset-top="0">
             <van-tabs @change="init" v-model:active="pageType" line-width="34" line-height="2" color="#ffffff">
                 <van-tab :title="'关注 ' + (userInfo.follows ? userInfo.follows : '')" name="follow"></van-tab>
                 <van-tab :title="'粉丝 ' + (userInfo.followers ? userInfo.followers : '')" name="follower"></van-tab>
@@ -10,7 +10,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]" @update:info="init"></creator-info>
             </template>
-            <van-empty v-if="empty" :description="emptyText.name" :image="require('@assets/kong_png_gaunzhu.png')">
+            <van-empty v-if="empty" :description="emptyText.name" :image="require('@assets/kong_png_gaunzhu.png')" class="empty_con">
                 <div class="empty-tips">{{ emptyText.sub }}</div>
             </van-empty>
         </div>
@@ -97,6 +97,9 @@ export default {
 .follow {
     background-color: @bg;
 }
+.empty_con{
+    padding-top: 126px;
+}
 .top {
     background-color: @bg;
     padding: 0 16px;