Merge http://git.izouma.com/panhui/lasuo_nft_front into yuan

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/product/ProductBanner.vue

@@ -44,7 +44,7 @@
                 </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">

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

@@ -102,7 +102,12 @@
                     :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

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/Home.vue

@@ -40,7 +40,7 @@
             </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"
@@ -138,7 +138,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 +170,7 @@ export default {
             reserve: false,
             saleList: [],
             scheduledStatus: [],
-            scrollTop: 0,
+            scrollTop: 0
         };
     },
     mixins: [product, banner, common],
@@ -200,14 +200,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 +258,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/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="100" height="100" :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="微信二维码">
@@ -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

@@ -13,7 +13,10 @@
                     clearable="true"
                     v-model="form.phone"
                     :rules="[
+<<<<<<< HEAD
                         { required: true, message: '' },
+=======
+>>>>>>> 56bff0cdff8b085c862fd2f9c3cb3fd6b325fc8b
                         {
                             pattern: phonePattern,
                             message: ''
@@ -51,6 +54,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 +91,7 @@
 </template>
 
 <script>
+import { re } from 'mathjs';
 import phone from '../../mixins/phone';
 let fromRoute = null;
 export default {
@@ -98,7 +106,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 +433,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 +448,9 @@ export default {
 //     width: 14px;
 //     height: 14px;
 // }
+
+.img-icon{
+    width: 14px;
+    height: 14px;
+}
 </style>

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/GiveSearch.vue

@@ -18,7 +18,7 @@
                 </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"

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

@@ -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">

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>

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

@@ -339,7 +339,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,7 +379,7 @@
                     </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>
@@ -389,7 +389,7 @@
                     </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_right">{{ info.issuer || '暂无信息' }}</div>
                     </div>
                 </div>
             </div>
@@ -532,7 +532,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 +543,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 +556,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 +571,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 +585,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>
@@ -1520,7 +1529,7 @@ export default {
                 }
             }
         }
-        .work_story_two{
+        .work_story_two {
             margin-top: -125px;
             position: relative;
             // z-index: 1;

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/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: '这里将展示你在拉索宇宙的粉丝用户'
                 }
             }
         };