Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/product/ProductBanner.vue

@@ -240,13 +240,13 @@ export default {
 
 .share-content {
     display: flex;
-    transform: translateY(-10px);
+    transform: translateY(-15px);
     // position: absolute;
     // bottom: 0;
 }
 .share-content-one{
     display: flex;
-    margin-top: 40px;
+    margin-top: 30px;
 }
 .share-icon {
     img {

src/components/product/recentSale.vue

@@ -3,17 +3,17 @@
         <div class="recent_sale_list">
             <img :src="getImg(item.pic[0].url)" alt="" class="recent_sale_list_three_img" />
             <div class="recent_sale_list_three_con">
-                <div class="title">{{item.name}}</div>
+                <div class="title">{{ item.name }}</div>
                 <div class="limit">
                     <div class="limit_tip">限量</div>
-                    <div class="limit_number">{{item.total}}份</div>
+                    <div class="limit_number">{{ item.total }}份</div>
                 </div>
                 <div class="price">
                     <div class="price_tip">¥</div>
-                    <div class="price_number">{{item.price}}</div>
+                    <div class="price_number">{{ item.price }}</div>
                 </div>
             </div>
-            <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture">
+            <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture" />
         </div>
     </div>
 </template>
@@ -52,6 +52,10 @@ export default {
         padding-top: 16px;
         box-sizing: border-box;
         .title {
+            width: calc(100vw - 165px);
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
             height: 22px;
             font-size: 16px;
             font-family: PingFangSC-Medium, PingFang SC;
@@ -105,7 +109,7 @@ export default {
             }
         }
     }
-    .bottom_texture{
+    .bottom_texture {
         width: 115px;
         height: 100px;
         position: absolute;

src/views/Discover.vue

@@ -577,7 +577,7 @@ export default {
     padding-bottom: 20px;
 }
 .setting {
-    height: 94px;
+    // height: 94px;
     // padding-right: 24px;
     // padding-bottom: 20px;
     // background-color: #191d27;

src/views/asset/Detail.vue

@@ -1268,7 +1268,7 @@ export default {
             .list_of_details_one_img {
                 width: 100%;
                 height: 317px;
-                transform: translateY(-45px);
+                transform: translateY(-50px);
                 position: relative;
             }
             .list_of_details_one_title {

src/views/product/Detail.vue

@@ -308,19 +308,21 @@
                 <img :src="require('@assets/dizuo@3x.png')" alt="" class="list_of_details_one_img" />
                 <div class="list_of_details_one_title">
                     <div class="list_of_details_one_title_one">
-                        <img :src="require('@assets/zuo@3x.png')" alt="" class="list_of_details_one_title_img" />
+                        <div class="list_of_details_one_title_one_con">
+                        <img :src="require('@assets/zuo@3x.png')" alt="" class="list_of_details_one_title_img list_of_details_one_title_img_left" />
                         <div>
-                            <div class="list_of_details_one_title_con">{{ info.name }}</div>
+                            <div class="list_of_details_one_title_con">{{ infoName }}</div>
                             <div class="limited_label">
                                 <div class="limited_label_title" v-if="info.collectionCategory">
-                                    {{ info.collectionCategory }}
+                                    {{ info.collectionCategory  }}
                                 </div>
                                 <div class="limited_label_number">限量</div>
                                 <div class="limited_label_total">{{ info.total }}份</div>
                                 <div class="limited_label_category">{{ info.category }}</div>
                             </div>
                         </div>
-                        <img :src="require('@assets/you@3x.png')" alt="" class="list_of_details_one_title_img" />
+                        <img :src="require('@assets/you@3x.png')" alt="" class="list_of_details_one_title_img list_of_details_one_title_img_right" />
+                        </div>
                     </div>
                     <!-- <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" /> -->
                     <van-divider class="fengge_con"
@@ -752,12 +754,24 @@ export default {
         isBuy() {
             return this.info.stock > 0 && this.info.onShelf && this.info.salable;
         },
+
         boxs() {
             let list = [...this.blindBoxItems];
             return list.map(item => {
                 return this.changeImgs(item.pic);
             });
         },
+        infoName() {
+            if (this.info.name) {
+                if(this.info.name.length > 10){
+                    return this.info.name.slice(0, 10) + '...';
+                }else{
+                    return this.info.name
+                }
+            } else {
+                return ''
+            }
+        },
         appointmentStartOne() {
             if (this.info.startTime) {
                 return this.info.startTime.slice(5, 10);
@@ -1262,7 +1276,7 @@ export default {
             .list_of_details_one_img {
                 width: 100%;
                 height: 317px;
-                transform: translateY(-45px);
+                transform: translateY(-50px);
                 position: relative;
             }
             .list_of_details_one_title {
@@ -1271,15 +1285,28 @@ export default {
                 box-sizing: border-box;
                 transform: translateY(-270px);
                 .list_of_details_one_title_one {
+                    width: calc(100vw - 60px);
                     display: flex;
                     justify-content: center;
                 }
+                .list_of_details_one_title_one_con{
+                    position: relative;
+                    display: flex;
+                }
                 .list_of_details_one_title_img {
                     width: 56px;
                     height: 56px;
                 }
+                .list_of_details_one_title_img_left{
+                    position: absolute;
+                    left: -60px;
+                }
+                .list_of_details_one_title_img_right{
+                    position: absolute;
+                    right: -60px;
+                }
                 .list_of_details_one_title_con {
-                    width: 100%;
+                    // width: calc(100vw - 30px);
                     white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
@@ -1308,6 +1335,7 @@ export default {
                         color: #282d3a;
                         line-height: 16px;
                         margin-right: 6px;
+                        white-space: nowrap;
                     }
                     .limited_label_number {
                         width: 34px;
@@ -1335,6 +1363,7 @@ export default {
                         color: #f9ddb3;
                         line-height: 16px;
                         margin-right: 6px;
+                        white-space: nowrap;
                     }
                     .limited_label_category {
                         border-radius: 3px;
@@ -1347,6 +1376,7 @@ export default {
                         color: #f9ddb3;
                         line-height: 16px;
                         background: #323743;
+                        white-space: nowrap;
                     }
                 }
                 .fengge_con {