Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/product/productLarge.vue

@@ -38,7 +38,7 @@
                     <van-image width="16px" height="16px" :radius="16" :src="getImg(info.minterAvatar)" fit="cover" />
                     <div class="shop_bottom_left_name">{{ info.minter }}</div>
                 </div>
-                <div class="shop_bottom_right" v-if="info.price != '0'">
+                <div class="shop_bottom_right" v-if="info.salable">
                         <div class="shop_bottom_right_con">￥</div>
                         <div class="shop_bottom_right_price">{{ info.price }}</div>
                 </div>
@@ -163,12 +163,13 @@ export default {
     }
     .shop_sold_out {
         display: flex;
-        width: 75px;
+        // width: 75px;
         height: 25px;
         background: #929292;
         border-radius: 15px;
         font-size: 13px;
         padding: 4px 6px;
+        padding-right: 8px;
         box-sizing: border-box;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
@@ -185,12 +186,13 @@ export default {
         }
     }
     .shop_sold_out_two {
-        width: 75px;
+        // width: 75px;
         height: 25px;
         background: #929292;
         border-radius: 15px;
         font-size: 13px;
         padding: 4px 6px;
+        padding-right: 8px;
         box-sizing: border-box;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;

src/mixins/product.js

@@ -177,7 +177,7 @@ export default {
         },
         updateTime() {
             if (this.startTime) {
-                this.getTime(this.info.startTime);
+                this.getTime(this.info.purchaseTime);
             }
         }
     },

src/views/Discover.vue

@@ -27,15 +27,14 @@
             @touchEnd="touchEndEvent"
             @slideChange="slideChangeEvent"
         >
-            <swiper-slide class="setting" v-for="item in commodityDisplayList" :key="item.id" style="width: 64px">
-                <van-image
-                    width="66px"
-                    height="66px"
-                    radius="33"
-                    :src="getImg(item.avatar)"
-                    fit="cover"
-                    @click="$router.push('/creatorList')"
-                />
+            <swiper-slide
+                class="setting"
+                v-for="item in commodityDisplayList"
+                :key="item.id"
+                style="width: 64px"
+                @click="$router.push({ path: '/creatorDetail', query: { id: item.id } })"
+            >
+                <van-image width="66px" height="66px" radius="33" :src="getImg(item.avatar)" fit="cover" />
                 <div class="setting_title">{{ item.nickname }}</div>
             </swiper-slide>
 
@@ -44,10 +43,10 @@
                 :style="{ width: `calc(100vw - ${commodityDisplayList.length * 84}px)` }"
             ></swiper-slide>
 
-            <swiper-slide class="slide-more">
+            <swiper-slide class="slide-more" @click="$router.push('/creatorList')">
                 <img src="@assets/slide-left.png" alt="" />
-                <span>左</span>
-                <span>滑</span>
+                <span>查</span>
+                <span>看</span>
                 <span>更</span>
                 <span>多</span>
             </swiper-slide>
@@ -122,7 +121,12 @@
                     :to="{ path: '/productList', query: { type: 'DEFAULT', title: '本期推荐' } }"
                 >
                 </page-title> -->
-            <van-list v-model:loading="loading" :finished="finished" @load="getData" finished-text="没有更多">
+            <van-list
+                v-model:loading="loading"
+                :finished="finished"
+                @load="getData"
+                :finished-text="empty ? '' : '没有更多'"
+            >
                 <div class="current_recommendation">
                     <template v-for="(item, index) in list" :key="item.id">
                         <CollectionList v-model:info="list[index]"></CollectionList

src/views/Home.vue

@@ -42,7 +42,12 @@
                 <div class="collection_list" v-if="active === 0">
                     <!-- <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多" @load="getList"> -->
                     <!-- @load="getList" -->
-                    <van-list finished-text="没有更多">
+                    <van-list
+                        v-model:loading="loading"
+                        :finished="finished"
+                        :finished-text="empty ? '' : '没有更多'"
+                        @load="getList"
+                    >
                         <product-large
                             v-for="(item, index) in shopList"
                             :key="index"
@@ -68,15 +73,20 @@
                             </div>
                         </div> -->
                     </div>
-                    <!-- <van-list v-model:loading="loading" :finished="finished" @load="offeringNotice"> -->
-                    <div class="collection_list_con" v-for="(item, index) in saleList" :key="index">
-                        <div class="collection_list_con_month">
-                            {{ item.dateTime.slice(5, 7) }}月{{ item.dateTime.slice(8, 10) }}日
+                    <van-list
+                        v-model:loading="loading"
+                        :finished="finished"
+                        @load="offeringNotice"
+                        :finished-text="saleList.length == 0 ? '' : '没有更多'"
+                    >
+                        <div class="collection_list_con" v-for="(item, index) in saleList" :key="index">
+                            <div class="collection_list_con_month">
+                                {{ item.dateTime.slice(5, 7) }}月{{ item.dateTime.slice(8, 10) }}日
+                            </div>
+                            <div class="collection_list_con_time_con">{{ item.dateTime.slice(11, 16) }}开售</div>
+                            <RecentSale v-model:arr="item.collectionDTOS"></RecentSale>
                         </div>
-                        <div class="collection_list_con_time_con">{{ item.dateTime.slice(11, 16) }}开售</div>
-                        <RecentSale v-model:arr="item.collectionDTOS"></RecentSale>
-                    </div>
-                    <!-- </van-list> -->
+                    </van-list>
                     <div v-if="saleList.length == 0" class="empty_two">暂无近期发售计划</div>
                 </div>
             </div>
@@ -212,10 +222,13 @@ export default {
                 });
             }
             this.loading = true;
+            this.finished = false;
             this.$http.get('/collection/recommend').then(res => {
                 this.shopList = res.filter(item => {
                     return item.type === 'collection';
                 });
+                this.finished = true;
+                this.loading = false;
                 this.$toast.clear();
             });
         },
@@ -223,12 +236,16 @@ export default {
         offeringNotice() {
             this.active = 1;
             // this.finished = false;
+            this.loading = true;
+            this.finished = false;
             return this.$http.get('collection/subscribeList').then(res => {
                 // if (res.first) {
                 //     this.saleList = [];
                 // }
                 this.saleList = res.subList;
                 this.scheduledStatus = res.notSubscribedIds;
+                this.finished = true;
+                this.loading = false;
                 // this.loading = false;
                 // this.finished = res.last;
                 // if (!this.finished) {
@@ -293,7 +310,7 @@ export default {
     },
     mounted() {
         let that = this;
-        that.getList();
+        // that.getList();
         that.getBanner();
         // that.getUser();
     },

src/views/Store.vue

@@ -80,7 +80,13 @@
             </van-sticky>
             <div class="data_display" v-if="active === 0">
                 <!-- 藏品展示 -->
-                <van-list v-model:loading="loading" :loading-text="' '" :finished="finished" @load="getAllCollections">
+                <van-list
+                    v-model:loading="loading"
+                    :loading-text="' '"
+                    :finished="finished"
+                    @load="getAllCollections"
+                    :finished-text="empty ? '' : '没有更多'"
+                >
                     <div class="data_display_fanter">
                         <template v-for="(item, index) in collections" :key="index">
                             <asset-info :info="item"></asset-info>
@@ -98,11 +104,18 @@
                 </van-list>
             </div>
             <div class="data_display_one" v-else>
-                <div class="current_recommendation">
-                    <template v-for="(item, index) in showList" :key="index">
-                        <CollectionList v-model:info="list[item.index]" @update:info="init"></CollectionList>
-                    </template>
-                </div>
+                <van-list
+                    v-model:loading="loading"
+                    :finished="finished"
+                    :finished-text="showList.length === 0 ? '' : '没有更多'"
+                    @load="init"
+                >
+                    <div class="current_recommendation">
+                        <template v-for="(item, index) in showList" :key="index">
+                            <CollectionList v-model:info="list[item.index]" @update:info="init"></CollectionList>
+                        </template>
+                    </div>
+                </van-list>
                 <div class="van_empty_con">
                     <van-empty
                         v-if="showList.length === 0"
@@ -195,9 +208,13 @@ export default {
                 });
             }
             this.empty = false;
+            this.loading = true;
+            this.finished = false;
             this.$http.get('/collection/myLikes').then(res => {
                 this.list = res;
                 this.empty = res.length === 0;
+                this.finished = true;
+                this.loading = false;
                 this.$toast.clear();
             });
         },
@@ -410,17 +427,18 @@ export default {
         box-sizing: border-box;
         // background: #0F0F27;
         min-height: calc(100vh - 100px);
+        margin-bottom: 50px;
         .data_display_fanter {
             width: 100%;
             display: flex;
             justify-content: space-between;
             flex-wrap: wrap;
-            margin-bottom: 50px;
         }
     }
     .data_display_one {
         // padding: 0px 16px 16px;
         // box-sizing: border-box;
+        margin-bottom: 50px;
         .current_recommendation {
             width: 100%;
             display: flex;

src/views/asset/Detail.vue

@@ -1019,7 +1019,7 @@ export default {
                 });
         },
         againGive() {
-            if (this.collectionStatus === 'CANCELLED') {
+            if (this.collectionStatus != 'CANCELLED') {
                 this.$router.push('/store');
             } else {
                 this.$router.push('/giveSearch?id=' + this.info.id);

src/views/creator/Detail.vue

@@ -120,7 +120,7 @@
             v-model:loading="loading"
             :finished="finished"
             :immediate-check="false"
-            finished-text="没有更多"
+            :finished-text="empty ||  list.length === 0? '' : '没有更多'"
             @load="getData"
         >
             <template v-for="(item, index) in list" :key="item.id">
@@ -128,7 +128,7 @@
             </template>
         </van-list>
         <van-empty
-        v-if="empty"
+        v-if="empty && list.length === 0"
             class="empty"
             :image="require(`@assets/empty-collection.png`)"
             description="还没有相关藏品"
@@ -420,7 +420,10 @@ export default {
         }
     }
 }
-
+/deep/ .van-list__finished-text{
+    width: 100%;
+    text-align: center;
+}
 .userInfo-top {
     display: flex;
     align-items: flex-end;

src/views/order/Detail.vue

@@ -3,29 +3,29 @@
         <div class="confirm_order_top">
             <!-- <img :src="info.status == 'PROCESSING'?require(`@/assets/icon_jiaoyizhong.png`):require(`@/assets/icon_yiwancheng@3x.png`)" alt="" class="confirm_order_top_img">
             <div>{{ getLabelName(info.status, statusOptions) }}</div> -->
-            <img :src="require(`@/assets/jiaoyichenggong@3x.png`)" alt="" class="confirm_order_top_img">
+            <img :src="require(`@/assets/jiaoyichenggong@3x.png`)" alt="" class="confirm_order_top_img" />
             <div class="confirm_order_top_title">
                 <div class="confirm_order_top_title_one">交易成功</div>
                 <div class="confirm_order_top_title_two">感谢您的购买</div>
             </div>
         </div>
         <div class="order_information">
-            <img :src="getImg(changeImgs(info.pic))" alt="" class="order_information_img">
+            <img :src="getImg(changeImgs(info.pic))" alt="" class="order_information_img" />
             <div class="order_information_title">
-                <div class="order_information_title_one">{{info.name}}</div>
+                <div class="order_information_title_one">{{ info.name }}</div>
                 <div class="order_information_title_two">
-                    <img :src="require('@/assets/blockchain@3x.png')" alt="" class="order_information_title_two_img">
-                    <div class="order_information_title_two_title">{{info.tokenId}}</div>
+                    <img :src="require('@/assets/blockchain@3x.png')" alt="" class="order_information_title_two_img" />
+                    <div class="order_information_title_two_title">{{ info.tokenId }}</div>
                 </div>
                 <!-- <div class="order_information_title_two">{{info.category}}</div> -->
-                <div class="order_information_title_number">{{info.minter}}</div>
+                <div class="order_information_title_number">{{ info.minter }}</div>
             </div>
-            <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture">
+            <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture" />
         </div>
         <div class="fee_details">
             <div class="fee_details_con">
                 <div class="fee_details_actual_payment">订单金额</div>
-                <div>{{info.price}}元</div>
+                <div>{{ info.price }}元</div>
             </div>
             <div class="fee_details_con">
                 <div class="fee_details_actual_payment">交易数量</div>
@@ -49,7 +49,7 @@
             </div>
             <div class="fee_details_con" v-if="info.paySerialNumber">
                 <div class="fee_details_actual_payment">支付流水号</div>
-                <div>{{info.paySerialNumber}}</div>
+                <div>{{ info.paySerialNumber }}</div>
             </div>
         </div>
         <!-- <div class="fee_details">
@@ -235,198 +235,201 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-    .confirm_order{
+.confirm_order {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    background: #191d27;
+    // margin-top: 44px;
+    padding: 0px 15px;
+    box-sizing: border-box;
+    .confirm_order_top {
         width: 100%;
-        height: 100%;
-        position: absolute;
-        background: #191D27;
-        // margin-top: 44px;
-        padding: 0px 15px;
+        padding: 36px 0px 39px;
         box-sizing: border-box;
-        .confirm_order_top{
-            width: 100%;
-            padding: 36px 0px 39px;
+        display: flex;
+        justify-content: center;
+        .confirm_order_top_img {
+            width: 74px;
+            height: 60px;
+            margin-right: 5px;
+        }
+        .confirm_order_top_title_one {
+            font-size: 19px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #ffffff;
+            line-height: 26px;
+            margin-top: 8px;
+            margin-bottom: 1px;
+        }
+        .confirm_order_top_title_two {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 20px;
+            opacity: 0.5;
+        }
+    }
+    .order_information {
+        width: 100%;
+        background: #232731;
+        border-radius: 20px;
+        display: flex;
+        position: relative;
+        .bottom_texture {
+            width: 140px;
+            height: 140px;
+            position: absolute;
+            right: 0;
+            bottom: 0;
+        }
+        .order_information_img {
+            width: 140px;
+            height: 140px;
+            border-radius: 20px;
+            margin-right: 12px;
+        }
+        .order_information_title {
+            width: calc(100% - 180px);
+            padding: 28px 0px;
             box-sizing: border-box;
-            display: flex;
-            justify-content: center;
-            .confirm_order_top_img{
-                width: 74px;
-                height: 60px;
-                margin-right: 5px;
-            }
-            .confirm_order_top_title_one{
-                font-size: 19px;
+            .order_information_title_one {
+                width: 100%;
+                font-size: 16px;
                 font-family: PingFangSC-Medium, PingFang SC;
                 font-weight: 500;
-                color: #FFFFFF;
-                line-height: 26px;
-                margin-top: 8px;
-                margin-bottom: 1px;
+                color: #ffffff;
+                line-height: 22px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                margin-bottom: 9px;
             }
-            .confirm_order_top_title_two{
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #FFFFFF;
-                line-height: 20px;
-                opacity: 0.5;
+            .order_information_title_two {
+                display: flex;
+                margin-bottom: 9px;
+                .order_information_title_two_img {
+                    width: 26px;
+                    height: 26px;
+                    position: relative;
+                    z-index: 1;
+                }
+                .order_information_title_two_title {
+                    height: 18px;
+                    padding: 2px 8px;
+                    box-sizing: border-box;
+                    font-size: 9px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    font-weight: 400;
+                    color: #725837;
+                    line-height: 14px;
+                    background: linear-gradient(141deg, #fcdc99 0%, #fce7c8 100%);
+                    border-radius: 4px;
+                    margin-left: -6px;
+                    margin-top: 4px;
+                }
             }
         }
-        .order_information{
+        // .order_information_title_two{
+        //     width: 56px;
+        //     height: 22px;
+        //     background: rgba(255, 255, 255, 0.1);
+        //     border-radius: 4px;
+        //     font-size: 12px;
+        //     font-family: PingFangSC-Regular, PingFang SC;
+        //     font-weight: 400;
+        //     color: #28B6FF;
+        //     line-height: 22px;
+        //     text-align: center;
+        //     margin-bottom: 16px;
+        // }
+        .order_information_title_number {
             width: 100%;
-            background: #232731;
-            border-radius: 20px;
+            font-size: 12px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 18px;
+            opacity: 0.5;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+    }
+    .fee_details {
+        width: 100%;
+        background: linear-gradient(360deg, #232731 0%, #191d27 100%);
+        border-radius: 0px 0px 20px 20px;
+        padding: 24px 15px;
+        box-sizing: border-box;
+        .fee_details_con {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 20px;
             display: flex;
-            position: relative;
-            .bottom_texture{
-                width: 140px;
-                height: 140px;
-                position: absolute;
-                right: 0;
-                bottom: 0;
-            }
-            .order_information_img{
-                width: 140px;
-                height: 140px;
-                border-radius: 20px;
-                margin-right: 12px;
-            }
-            .order_information_title{
-                width: calc(100% - 180px);
-                padding: 28px 0px;
-                box-sizing: border-box;
-                .order_information_title_one{
-                    width: 100%;
-                    font-size: 16px;
-                    font-family: PingFangSC-Medium, PingFang SC;
-                    font-weight: 500;
-                    color: #FFFFFF;
-                    line-height: 22px;
-                    white-space:nowrap;
-                    overflow:hidden;
-                    text-overflow:ellipsis;
-                    margin-bottom: 9px;
-                }
-                .order_information_title_two{
-                    display: flex;
-                    margin-bottom: 9px;
-                    .order_information_title_two_img{
-                        width: 26px;
-                        height: 26px;
-                        position: relative;
-                        z-index: 1;
-                    }
-                    .order_information_title_two_title{
-                        height: 18px;
-                        padding: 2px 8px;
-                        box-sizing: border-box;
-                        font-size: 9px;
-                        font-family: PingFangSC-Regular, PingFang SC;
-                        font-weight: 400;
-                        color: #725837;
-                        line-height: 14px;
-                        background: linear-gradient(141deg, #FCDC99 0%, #FCE7C8 100%);
-                        border-radius: 4px;
-                        margin-left: -6px;
-                        margin-top: 4px;
-                    }
-                }
-            }
-            // .order_information_title_two{
-            //     width: 56px;
-            //     height: 22px;
-            //     background: rgba(255, 255, 255, 0.1);
-            //     border-radius: 4px;
-            //     font-size: 12px;
-            //     font-family: PingFangSC-Regular, PingFang SC;
-            //     font-weight: 400;
-            //     color: #28B6FF;
-            //     line-height: 22px;
-            //     text-align: center;
-            //     margin-bottom: 16px;
-            // }
-            .order_information_title_number{
-                width: 100%;
+            justify-content: space-between;
+            margin-bottom: 14px;
+            .order_details {
                 font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
-                color: #FFFFFF;
-                line-height: 18px;
-                opacity: 0.5;
-                white-space:nowrap;
-                overflow:hidden;
-                text-overflow:ellipsis;
+                color: #939599;
             }
-        }
-        .fee_details{
-            width: 100%;
-            background: linear-gradient(360deg, #232731 0%, #191D27 100%);
-            border-radius: 0px 0px 20px 20px;
-            padding: 24px 15px;
-            box-sizing: border-box;
-            .fee_details_con{
-                font-size: 14px;
+            .order_details_con {
+                font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
-                color: #FFFFFF;
-                line-height: 20px;
-                display: flex;
-                justify-content: space-between;
-                margin-bottom: 14px;
-                .order_details{
-                    font-size: 12px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #939599;
-                }
-                .order_details_con{
-                    font-size: 12px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #FFFFFF;
-                }
-            }
-            .fee_details_con:last-child{
-                margin-bottom: 0;
+                color: #ffffff;
             }
         }
-        .fee_details_divider{
-                margin: 10px 0;
-            }
-        .payment_method{
-            width: 100%;
-            background: #29293F;
-            border-radius: 8px;
-            padding: 12px 10px;
-            box-sizing: border-box;
-            .payment_method_con{
+        .fee_details_con:last-child {
+            margin-bottom: 0;
+        }
+    }
+    .fee_details_divider {
+        margin: 10px 0;
+    }
+    .payment_method {
+        width: 100%;
+        background: #29293f;
+        border-radius: 8px;
+        padding: 12px 10px;
+        box-sizing: border-box;
+        .payment_method_con {
+            display: flex;
+            justify-content: space-between;
+            font-size: 14px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #ffffff;
+            .payment_method_con_left {
                 display: flex;
-                justify-content: space-between;
-                font-size: 14px;
-                font-family: PingFangSC-Medium, PingFang SC;
-                font-weight: 500;
-                color: #FFFFFF;
-                .payment_method_con_left{
-                    display: flex;
-                    .payment_method_title{
-                        margin-top: 2px;
-                    }
-                }
-                .payment_method_img{
-                    width: 24px;
-                    height: 24px;
-                    margin-right: 6px;
+                .payment_method_title {
+                    margin-top: 2px;
                 }
             }
+            .payment_method_img {
+                width: 24px;
+                height: 24px;
+                margin-right: 6px;
+            }
         }
-        .fee_details_actual_payment{
-            color: #FFFFFF;
-            opacity: 0.3;
-        }
     }
-   /deep/  .van-divider::before{
-       height: 1px;
-        background: #5F646F;
-        opacity: 0.2;
-   }
+    .fee_details_actual_payment {
+        color: #ffffff;
+        opacity: 0.3;
+    }
+}
+/deep/ .van-divider::before {
+    height: 1px;
+    background: #5f646f;
+    opacity: 0.2;
+}
 </style>

src/views/order/Orders.vue

@@ -50,7 +50,13 @@
                 </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="empty ? '' : '没有更多'"
+                    @load="getData"
+                >
                     <div class="list_display">
                         <order-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item"></order-info>
                     </div>

src/views/product/Search.vue

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

src/views/user/BanksAdd.vue

@@ -18,6 +18,8 @@
                 name="银行预留手机号"
                 label="银行预留手机号"
                 placeholder="请输入银行预留手机号"
+                :maxlength="11"
+                clearable
                 v-model="form.phone"
                 :rules="[
                     { required: true, message: '' },
@@ -27,7 +29,7 @@
                     }
                 ]"
             />
-            <div class="tips">
+            <!-- <div class="tips">
                 <van-checkbox v-model="checked">
                     <span class="xieyi_con">同意</span>
                     <span @click.stop="$router.push('/agreement?page=service')">《拉索宇宙支付用户协议》</span>
@@ -35,7 +37,7 @@
                         <img class="img-icon" :src="props.checked ? activeIcon : inactiveIcon" />
                     </template>
                 </van-checkbox>
-            </div>
+            </div> -->
             <div class="next_step">
                 <van-button type="primary" :disabled="!canNext" block native-type="submit">同意协议并继续</van-button>
             </div>
@@ -153,10 +155,10 @@ export default {
     },
     methods: {
         onSubmit() {
-            if (!this.checked) {
-                this.protocol = true;
-                return;
-            }
+            // if (!this.checked) {
+            //     this.protocol = true;
+            //     return;
+            // }
             this.sendMsg(this.form.phone);
             this.form.code = '';
             this.show = true;

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="empty ? '' : '没有更多'" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <div class="exchange">
                     <div class="exchange_top">