Merge branch 'nhj-dev' into dev

assets/css/consult/user/_id.scss

@@ -46,11 +46,15 @@
                 display: flex;
                 align-items: center;
                 .nickname {
+                    max-width: 290px;
                     font-size: 24px;
                     font-family: PingFangSC, PingFangSC-Medium;
                     font-weight: 500;
                     color: #222222;
                     margin-right: 30px;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
                 }
                 .company-content {
                     // width: 100%;

assets/css/work_down/index.scss

@@ -200,32 +200,36 @@
                                 font-family: DINAlternate, DINAlternate-Bold;
                                 font-weight: 700;
                                 color: #ff6600;
+                                margin-right: 20px;
                             }
                             .download-count {
-                                margin-left: 20px;
-                                font-size: 14px;
-                                font-family: PingFangSC, PingFangSC-Regular;
-                                font-weight: 400;
-                                color: #999999;
-                            }
-                            .file-format,
-                            .file-size {
                                 position: relative;
-                                padding-left: 30px;
                                 font-size: 14px;
                                 font-family: PingFangSC, PingFangSC-Regular;
                                 font-weight: 400;
                                 color: #999999;
+                            }
+                            .download-count,
+                            .file-format {
+                                padding-right: 30px;
                                 &:after {
                                     position: absolute;
                                     content: " ";
                                     width: 1px;
                                     height: 12px;
-                                    left: 14.5px;
+                                    right: 14.5px;
                                     top: 1px;
                                     background: #999999;
                                 }
                             }
+                            .file-format,
+                            .file-size {
+                                position: relative;
+                                font-size: 14px;
+                                font-family: PingFangSC, PingFangSC-Regular;
+                                font-weight: 400;
+                                color: #999999;
+                            }
                         }
                         .more-info {
                             display: flex;

pages/work_down/index.vue

@@ -76,7 +76,7 @@
                             <div class="more-info-wrapper">
                                 <div class="price-info">
                                     <span class="works-price">{{ Number(works.price) > 0 ? '￥' + works.price : '免费' }}</span>
-                                    <span class="download-count">{{ works.down_num }}人已下载</span>
+                                    <span class="download-count" v-if="Number(works.down_num) > 0">{{ works.down_num }}人已下载</span>
                                     <span class="file-format">{{ works.file_type }}格式</span>
                                     <span class="file-size">{{ works.file_size }}</span>
                                 </div>