Merge branch 'dev/v4.8.47_cyl' of qmx/jy into feature/v4.8.47

src/jfw/modules/app/src/web/staticres/jyapp/tags/css/tags-module-common.css

@@ -116,7 +116,7 @@ body.loading {
   align-items: center;
   justify-content: center;
   flex-shrink: 0;
-  padding: 0.1rem 0.2rem;
+  padding: 0.1rem 0.08rem;
   height: 0.64rem;
   color: #5F5E64;
   font-size: 0.24rem;
@@ -132,13 +132,8 @@ body.loading {
 /* nav button */
 
 /* tag-group */
-.tag-group {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-}
 .tag-group .tag-item {
+  margin: 0.06rem 0;
   margin-right: .16rem;
 }
 .tag-item {
@@ -236,10 +231,9 @@ body.loading {
   flex-wrap: wrap;
   padding: .24rem .32rem;
   padding-right: .16rem;
-  padding-right: .76rem;
 }
 .tag-card .nav-button {
-  margin-right: 0.16rem;
+  margin-right: 0.14rem;
   margin-bottom: 0.16rem;
 }
 .tag-card .text-button {
@@ -250,7 +244,8 @@ body.loading {
 
 
 .tag-city-item {
-  max-width: 1.9rem;
+  min-width: 1.6rem;
+  max-width: 1.8rem;
 }
 
 /* tag bidding card */
@@ -275,7 +270,7 @@ body.loading {
 /* bidding-info-list */
 .bidding-info-bd {
   margin-top: .16rem;
-  margin-bottom: .12rem;
+  /* margin-bottom: .12rem; */
 }
 .bidding-info-ft {
   display: flex;
@@ -301,6 +296,11 @@ body.loading {
   color: #9B9CA3;
   white-space: nowrap;
 }
+.tag-group .tag-item--time {
+  margin-right: 0;
+  padding-left: 0;
+  padding-right: 0;
+}
 /* bidding-info-list */
 
 /* buyer-info-list */
@@ -495,20 +495,21 @@ body.loading {
 }
 .tag-area-nav-list a {
   color: inherit;
+  line-height: inherit;
 }
 .tag-area-nav-list-title {
   margin-right: .46rem;
   color: #5F5E64;
   font-size: 0.24rem;
-  line-height: 0.36rem;
+  line-height: 0.48rem;
 }
 .tag-area-nav-item {
   color: #171826;
   font-size: 0.28rem;
-  line-height: 0.4rem;
+  line-height: 0.48rem;
 }
 .tag-area-nav-item:not(:last-of-type) {
-  margin-right: .46rem;
+  margin-right: .48rem;
 }
 /* tag-area-nav-container */
 
@@ -542,6 +543,10 @@ body.loading {
   white-space: nowrap;
   border-bottom: 1px solid transparent;
 }
+.tag-industry-content-item {
+  min-width: 1.6rem;
+  max-width: 1.8rem;
+}
 .tag-industry-item.active {
   color: #2ABED1;
   border-color: #2ABED1;
@@ -549,21 +554,23 @@ body.loading {
 /* tag-industry-nav */
 
 /* tag-card-text-list */
+.text-list-container:first-of-type {
+  margin-top: 0;
+}
+.text-list-container .tag-card-bd-content {
+  padding: 0.24rem 0.32rem;
+}
 .text-list-container .tag-card-i-content-list {
   display: block;
-  
+  padding: 0;
 }
 .tag-card-i-content-list.max-height {
-  max-height: 3rem;
+  max-height: 2.76rem;
   overflow: hidden;
 }
-.text-list-item {
-  float: left;
-}
-.text-list-item.action-group {
-  position: absolute;
-  bottom: 0;
-  right: 0;
+.text-list-container .action-group {
+  margin: 0;
+  text-align: right;
 }
 /* tag-card-text-list */
 

src/jfw/modules/app/src/web/staticres/jyapp/tags/js/tag-common.js

@@ -128,7 +128,7 @@ var textTagListShowMore = {
   bindEvents: function () {
     this.$el.find('.action-group').on('click', '.more,.shouqi', function () {
       var $this = $(this)
-      var parentWrapper = $(this).parents('.tag-card-i-content-list')
+      var parentWrapper = $(this).parents('.tag-card-bd').find('.tag-card-i-content-list')
       if ($(this).hasClass('more')) {
         parentWrapper.removeClass('max-height')
       }

src/jfw/modules/app/src/web/templates/tags/template/tag-card-bidding-info-list.html

@@ -12,37 +12,33 @@
           <a class="bidding-info-title ellipsis-2" href="{{$info.Url}}"> {{$info.Title}} </a>
         </div>
         <div class="bidding-info-bd">
-          <div class="tag-group">
+          <div class="tag-group clearfix">
             {{if $info.Site}}
-            <p class="tag-item red">{{$info.Site}}</p>
+            <p class="tag-item red fl">{{$info.Site}}</p>
             {{end}}
             {{if $info.Area}}
-            <p class="tag-item grey">{{$info.Area}}</p>
+            <p class="tag-item grey fl">{{$info.Area}}</p>
             {{end}}
             {{if $info.BuyerClass}}
-            <p class="tag-item grey">{{$info.BuyerClass}}</p>
+            <p class="tag-item grey fl">{{$info.BuyerClass}}</p>
             {{end}}
             {{if $info.Subtype}}
-            <p class="tag-item grey">{{$info.Subtype}}</p>
+            <p class="tag-item grey fl">{{$info.Subtype}}</p>
             {{end}}
             {{if $info.Price}}
-            <p class="tag-item grey">{{$info.Price}}</p>
+            <p class="tag-item grey fl">{{$info.Price}}</p>
+            {{end}}
+            {{if $info.FileExists}}
+            <p class="tag-item main fl">有附件</p>
+            {{end}}
+            {{if $info.PublishTime }}
+            <p class="tag-item tag-item--time fr">{{$info.PublishTime }}</p>
             {{end}}
-
           </div>
         </div>
-        <div class="bidding-info-ft">
-          {{if $info.FileExists}}
-          <p class="tag-item main">有附件</p>
-          {{else}}
-          <p></p>
-          {{end}}
-          {{if $info.PublishTime }}
-          <p class="tag-item--time">{{$info.PublishTime }}</p>
-          {{end}}
-        </div>
+        <!-- <div class="bidding-info-ft"></div> -->
       </li>
-{{end}}
+      {{end}}
     </ul>
   </main>
   <footer class="tag-card-ft">

src/jfw/modules/app/src/web/templates/tags/template/tag-card-text-list.html

@@ -1,21 +1,25 @@
-{{range $industry:=.T.industryData.List}}
-<section class="tag-card bg-white text-list-container mt12">
-  <header class="tag-card-hd">
-    <h3 class="tag-card-title">{{$industry.Name}}</h3>
-    <div class="tag-card-actions"></div>
-  </header>
-  <main class="tag-card-bd">
-    <ul class="tag-card-i-content-list max-height clearfix">
-      {{range $v:=$industry.List}}
-      <li class="text-list-item text-button">
-        <a href="{{$v.Url}}">{{$v.Name}}</a>
-      </li>
-      {{end}}
-      <li class="text-list-item text-button action-group highlight-text fr">
-        <span class="more">更多&gt;</span>
-        <span class="shouqi" style="display: none;">收起&lt;</span>
-      </li>
-    </ul>
-  </main>
+<section>
+  {{range $industry:=.T.industryData.List}}
+  <section class="tag-card bg-white text-list-container mt12">
+    <header class="tag-card-hd">
+      <h3 class="tag-card-title">{{$industry.Name}}</h3>
+      <div class="tag-card-actions"></div>
+    </header>
+    <main class="tag-card-bd">
+      <div class="tag-card-bd-content">
+        <ul class="tag-card-i-content-list max-height clearfix">
+          {{range $v:=$industry.List}}
+          <li class="text-list-item text-button fl">
+            <a href="{{$v.Url}}">{{$v.Name}}</a>
+          </li>
+          {{end}}
+        </ul>
+        <div class="text-button action-group highlight-text">
+          <span class="more">更多&gt;</span>
+          <span class="shouqi" style="display: none;">收起&lt;</span>
+        </div>
+      </div>
+    </main>
+  </section>
+  {{end}}
 </section>
-{{end}}