Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/asset/assetInfo.vue

@@ -150,7 +150,7 @@ export default {
         font-size: 10px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-        color: #28b6ff;
+        color: #ffffff;
         text-align: center;
         line-height: 18px;
         position: absolute;

src/views/asset/Detail.vue

@@ -131,13 +131,13 @@
                 </div>
             </div>
             <!-- 持有特权 -->
-            <div class="hold_privileges">
+            <div class="hold_privileges" v-if="privileges.length != 0">
                 <div class="hold_privileges_con">
                     <div class="hold_privileges_title">
-                        持有特权<span class="hold_privileges_tip" v-if="privileges.length != 0">灰色表示已使用</span>
+                        持有特权<span class="hold_privileges_tip">灰色表示已使用</span>
                     </div>
-                    <div class="hold_privileges_name" v-if="privileges.length == 0">铸造者暂时未设置</div>
-                    <div class="hold_privileged_information" v-else>
+                    <!-- <div class="hold_privileges_name" v-if="privileges.length == 0">铸造者暂时未设置</div> -->
+                    <div class="hold_privileged_information">
                         <div
                             class="hold_privileged_information_con"
                             :class="{ hold_privileged_information_con_opened: item.opened }"

src/views/creator/Detail.vue

@@ -40,7 +40,7 @@
                     </div>
                 </div>
 
-                <div class="sub" :class="{ 'van-multi-ellipsis--l2': !showMore }">
+                <div class="sub" :class="{ '': !showMore }">
                     {{ introValue || '他还没有介绍哦～' }}
                 </div>
                 <!-- <div class="sub-right" v-if="info.intro && info.intro.length > 50">
@@ -182,8 +182,8 @@ export default {
         },
         introValue() {
             if (this.info.intro) {
-                if (this.info.intro.length > 50) {
-                    return this.info.intro.slice(0, 50) + '...';
+                if (this.info.intro.length > 200) {
+                    return this.info.intro.slice(0, 200) + '...';
                 } else {
                     return this.info.intro;
                 }
@@ -432,7 +432,7 @@ export default {
 }
 .userInfo-top {
     display: flex;
-    align-items: flex-end;
+    align-items: center;
     position: relative;
     transform: translateX(-5px);
     .van-image {
@@ -461,7 +461,9 @@ export default {
         font-weight: 600;
         color: #ffffff;
         overflow: hidden;
-        line-height: 75px;
+        padding-top: 15px;
+        // line-height: 75px;
+        mar
         .text1 {
             font-size: @font3;
             font-weight: bold;

src/views/creator/List.vue

@@ -29,7 +29,7 @@
         class="list"
         v-model:loading="loading"
         :finished="finished"
-        finished-text="- 更多藏品敬请期待 -"
+        finished-text="没有更多了"
         @load="getData"
     >
         <template v-for="(item, index) in list" :key="index">

src/views/product/Detail.vue

@@ -362,7 +362,7 @@
                             @click="$router.push({ path: '/creatorDetail', query: { id: info.minterId } })"
                         />
                         <div class="author_details">
-                            <div class="author_details_one">{{ info.minter }}</div>
+                            <div :class="minterName?'author_details_ones':'author_details_one'">{{ info.minter }}</div>
                             <div class="author_details_two">{{ info.collectionWorks || '暂无信息' }}</div>
                         </div>
                     </div>
@@ -768,7 +768,8 @@ export default {
             noLikes: require('@assets/icon-dianzan.png'),
             likes: require('@assets/icon-dianzan@2x.png'),
             startTime: null,
-            infoNameLength: false
+            infoNameLength: false,
+            minterName: false
         };
     },
     setup() {
@@ -1049,6 +1050,11 @@ export default {
                     } else {
                         this.infoNameLength = false;
                     }
+                    if (this.info.minter.length > 12) {
+                        this.minterName = true;
+                    } else {
+                        this.minterName = false;
+                    }
                     // this.appointmentStartTime = new Date(this.info.startTime).getTime();
                     // this.endTime = new Date(this.info.endTime).getTime();
                     // this.publishTime = new Date(this.info.publishTime).getTime();
@@ -1486,6 +1492,16 @@ export default {
                             line-height: 20px;
                             margin-bottom: 2px;
                         }
+                        .author_details_ones{
+                            padding-top: 1px;
+                            box-sizing: border-box;
+                            font-size: 12px;
+                            font-family: PingFangSC-Medium, PingFang SC;
+                            font-weight: 500;
+                            color: #ffffff;
+                            line-height: 20px;
+                            margin-bottom: 2px;
+                        }
                         .author_details_two {
                             font-size: 12px;
                             font-family: PingFangSC-Regular, PingFang SC;