panhui 3 лет назад
Родитель
Сommit
25671e804c

+ 27 - 30
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;
 }

+ 1 - 1
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">

+ 1 - 1
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>

+ 6 - 1
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

+ 1 - 1
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>

+ 2 - 2
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> -->

+ 3 - 0
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">

+ 1 - 1
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="{

+ 1 - 1
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="{

+ 1 - 1
src/views/asset/GiveSearch.vue

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

+ 1 - 1
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"
         >

+ 1 - 1
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">

+ 1 - 1
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>

+ 1 - 1
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"
         >

+ 1 - 1
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=" 你还没有藏品哦~"

+ 1 - 1
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"

+ 1 - 1
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

+ 2 - 2
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>

+ 18 - 9
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;

+ 2 - 2
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">

+ 1 - 1
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"
         >

+ 2 - 2
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>

+ 2 - 2
src/views/user/Follows.vue

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