Merge branch 'dev-majunjie' into dev

assets/css/dynamic/info.scss

@@ -104,26 +104,19 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  flex-wrap: wrap;
 }
 
 .dynamic-info-img-item {
   width: 27.8vw;
-  // height:0;
   height:27.8vw;
-  // padding-bottom: 100%;
   position: relative;
   overflow: hidden;
   border-radius: 6px;
   background-position: 50% top;
   background-repeat: no-repeat;
-  background-size:100% auto
-  // img {
-  //   position: absolute;
-  //   left: 0;
-  //   top: 0;
-  //   width: 100%;
-  //   border-radius: 6px;
-  // }
+  background-size:auto 100%;
+  margin-bottom: 10px;
 }
 
 .dynamic-info-resources-link {
@@ -295,7 +288,7 @@
 }
 
 .dynamic-info-resources-area {
-  margin-top: 10px;
+  // margin-top: 10px;
   background: rgba(244, 245, 249, 0.8);
   border-radius: 10px;
   padding: 18px 10px 20px;
@@ -333,6 +326,7 @@
   padding: 10px 5px;
   background-color: rgba(255, 255, 255, 0.8);
   border-radius: 3px;
+  margin-right: 5px;
 
   opacity: 0.8;
 font-size: 11px;

components/level-tag.vue

@@ -11,7 +11,7 @@ export default {
 <style lang="scss" scoped>
 @for $i from 0 through 12 {
     .level-#{$i} {
-        background-image: url("~@/assets/img/level/level_0.png");
+        background-image: url("~@/assets/img/level/level_#{$i}.png");
     }
 }
 

pages/frontend/dynamic/info.vue

@@ -19,7 +19,7 @@
               }}</span>
             </div>
           </div>
-          <div class="dynamic-info-user-menu"></div>
+          <!-- <div class="dynamic-info-user-menu"></div> -->
         </div>
         <div class="dynamic-info-content">
           {{ dynamicDetail.title }}
@@ -76,17 +76,17 @@
           </div>
           <div class="resource-company">
             <div class="resource-company-img">
-              <img src="https://iph.href.lu/100x100?fg=666666&bg=cccccc" />
+              <img :src="user_info.icon_url || ''" />
             </div>
             <div class="resource-company-name">{{resources.resources_form}}</div>
           </div>
         </div>
 
         <div class="dynamic-info-like">
-          <div class="dynamic-info-like-item dynamic-info-like-count">
+          <div class="dynamic-info-like-item dynamic-info-like-count" @click="gotoDownload">
             {{ dynamicDetail.z_num }}
           </div>
-          <div class="dynamic-info-like-item dynamic-info-comment-count">
+          <div class="dynamic-info-like-item dynamic-info-comment-count" @click="gotoDownload">
             {{ dynamicDetail.c_num }}
           </div>
         </div>