panhui 4 years ago
parent
commit
f9d366ae4b

+ 18 - 2
src/components/product/ProductTitle.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="product-title">
+    <div class="product-title" :class="{ isSmall }">
         <span><slot></slot></span>
         <img class="img1" src="@assets/png-biaokuag-01.png" alt="" />
         <img class="img2" src="@assets/png-biaokuag-02.png" alt="" />
@@ -7,7 +7,14 @@
 </template>
 
 <script>
-export default {};
+export default {
+    props: {
+        isSmall: {
+            type: Boolean,
+            default: false
+        }
+    }
+};
 </script>
 
 <style lang="less" scoped>
@@ -17,6 +24,7 @@ export default {};
     line-height: 44px;
     padding: 0 20px;
     position: relative;
+    min-height: 44px;
     img {
         width: 20px;
         height: 44px;
@@ -29,5 +37,13 @@ export default {};
             right: 0;
         }
     }
+
+    &.isSmall {
+        font-size: 18px;
+        color: #ffffff;
+        line-height: 24px;
+        text-align: center;
+        .flex();
+    }
 }
 </style>

+ 46 - 15
src/views/Mine.vue

@@ -29,6 +29,18 @@
                                 src="@assets/renzheng_icon_pre.png"
                                 alt=""
                             />
+
+                            <van-button
+                                color="#F5F7FA"
+                                size="mini"
+                                :icon="require('@assets/renzheng_icon.png')"
+                                round
+                                class="auth"
+                                v-else
+                                @click="goAuth"
+                            >
+                                {{ authStatus === '未认证' ? '去认证' : authStatus }}
+                            </van-button>
                         </div>
                         <div class="text2">
                             <span> 用户ID:{{ userInfo.id }} </span>
@@ -37,9 +49,12 @@
                     </div>
                 </div>
 
-                <div class="sub van-multi-ellipsis--l2">
+                <div class="sub" :class="{ 'van-multi-ellipsis--l2': !showMore }">
                     {{ userInfo.intro }}
                 </div>
+                <div class="sub-right">
+                    <div @click="showMore = !showMore">{{ showMore ? '收起' : '展开' }}</div>
+                </div>
 
                 <div class="btns">
                     <div class="collect" @click="$router.push('/mineFollows')">
@@ -50,17 +65,7 @@
                         <div class="text2">粉丝</div>
                         <div class="text1">{{ userInfo.followers }}</div>
                     </div>
-                    <van-button
-                        plain
-                        color="#939599"
-                        size="mini"
-                        :icon="require('@assets/renzheng_icon.png')"
-                        round
-                        v-if="authStatus !== '已认证'"
-                        @click="goAuth"
-                    >
-                        {{ authStatus }}
-                    </van-button>
+
                     <van-button plain @click="$router.push('/setting')" color="#939599" size="mini" round
                         >编辑资料</van-button
                     >
@@ -161,7 +166,8 @@ import { mapState } from 'vuex';
 export default {
     data() {
         return {
-            org: false
+            org: false,
+            showMore: false
         };
     },
     computed: {
@@ -387,16 +393,29 @@ export default {
     position: relative;
     transform: translateY(-16px);
     .sub {
-        font-size: 14px;
+        font-size: 12px;
         color: @text3;
         line-height: 22px;
-        padding: 9px 0 20px;
+        padding: 9px 0 0;
+    }
+
+    .sub-right {
+        .flex();
+        justify-content: flex-end;
+    }
+
+    .sub-right > div {
+        font-size: 12px;
+        color: @text0;
+        line-height: 17px;
+        text-decoration: underline;
     }
 
     .btns {
         display: flex;
         // padding-bottom: 16px;
         align-items: center;
+        margin-top: 10px;
         .collect {
             .flex();
             .text1 {
@@ -492,4 +511,16 @@ export default {
     border-radius: 8px;
     overflow: hidden;
 }
+
+/deep/.auth {
+    color: @text3!important;
+    padding: 0 10px;
+    margin-left: 6px;
+    .van-button__content {
+        .flex();
+        .van-icon__image {
+            display: block;
+        }
+    }
+}
 </style>

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

@@ -12,7 +12,7 @@
                     <img src="@assets/svgs/png-biaotikuang-03.svg" alt="" />
                     <img src="@assets/svgs/png-biaotikuang-04.svg" alt="" />
                 </div> -->
-                <product-title>{{ info.name }}</product-title>
+                <product-title :isSmall="info.name && info.name.length > 16">{{ info.name }}</product-title>
             </div>
             <div class="price-line">
                 <template v-if="info.consignment">

+ 21 - 5
src/views/creator/Detail.vue

@@ -41,9 +41,12 @@
                     </div>
                 </div>
 
-                <div class="sub">
+                <div class="sub" :class="{ 'van-multi-ellipsis--l2': !showMore }">
                     {{ info.intro || '他还没有介绍哦~' }}
                 </div>
+                <div class="sub-right">
+                    <div @click="showMore = !showMore">{{ showMore ? '收起' : '展开' }}</div>
+                </div>
 
                 <div class="btns">
                     <div class="collect">
@@ -177,7 +180,8 @@ export default {
             empty: false,
             hots: [],
             url: '/collection/all',
-            isMinter: true
+            isMinter: true,
+            showMore: false
         };
     },
     mounted() {
@@ -318,10 +322,22 @@ export default {
     position: relative;
     transform: translateY(-14px);
     .sub {
-        font-size: 14px;
+        font-size: 12px;
         color: @text3;
         line-height: 22px;
-        padding: 6px 0;
+        padding: 6px 0 0;
+    }
+
+    .sub-right {
+        .flex();
+        justify-content: flex-end;
+    }
+
+    .sub-right > div {
+        font-size: 12px;
+        color: @text0;
+        line-height: 17px;
+        text-decoration: underline;
     }
 
     .btns {
@@ -329,7 +345,7 @@ export default {
         // padding-bottom: 16px;
         align-items: center;
         transform: translateY(14px);
-        padding-bottom: 6px;
+        padding: 6px 0;
         .collect {
             width: 20%;
             display: flex;

+ 4 - 4
src/views/order/Detail.vue

@@ -83,7 +83,7 @@
 import OrderOpen from '../../components/order/OrderOpen.vue';
 import order from '../../mixins/order';
 import product from '../../mixins/product';
-// import dayjs from 'dayjs';
+import dayjs from 'dayjs';
 export default {
     components: { OrderOpen },
     name: 'detail',
@@ -101,9 +101,9 @@ export default {
         this.$http.get('/order/get/' + this.$route.query.id).then(res => {
             this.info = res;
             this.$toast.clear();
-            // if (dayjs().isBefore(dayjs(res.payTime).add(3, 'minute')) && res.type === 'BLIND_BOX') {
-            //     this.$refs.box.show = true;
-            // }
+            if (dayjs().isBefore(dayjs(res.payTime).add(3, 'minute')) && res.type === 'BLIND_BOX') {
+                this.$refs.box.show = true;
+            }
         });
     },
     methods: {

+ 1 - 1
src/views/product/Detail.vue

@@ -4,7 +4,7 @@
 
         <div class="info">
             <div class="info-title">
-                <product-title>{{ info.name }}</product-title>
+                <product-title :isSmall="info.name && info.name.length > 16">{{ info.name }}</product-title>
             </div>
             <!-- <div class="name" v-if="info.salable && startTime">
                 <div class="name1">首发抢购倒计时</div>