Prechádzať zdrojové kódy

Merge branch 'dev/v4.8.51_yf' of qmx/jy into feature/v4.8.51

yangfeng 1 rok pred
rodič
commit
6d2b9dbf43

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

@@ -791,6 +791,9 @@ body.loading {
 .strategy-list:not(:first-child){
 .strategy-list:not(:first-child){
   margin-top: 0.24rem;
   margin-top: 0.24rem;
 }
 }
+.strategy-list .tag-card-bd{
+  padding: .16rem 0;
+}
 .tag-card-strategy-item,
 .tag-card-strategy-item,
 .tag-card-strategy-item > a{
 .tag-card-strategy-item > a{
   display: flex;
   display: flex;
@@ -798,7 +801,10 @@ body.loading {
 }
 }
 .tag-card-strategy-item > a{
 .tag-card-strategy-item > a{
   width: 100%;
   width: 100%;
-  padding: .32rem;
+  padding: .16rem .32rem;
+}
+.tag-card-strategy-item:not(:last-child) {
+  margin-bottom: 0.08rem;
 }
 }
 .tag-card-strategy-item .card-item-left{
 .tag-card-strategy-item .card-item-left{
   width: 2.2rem;
   width: 2.2rem;
@@ -811,6 +817,8 @@ body.loading {
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   object-fit: fill;
   object-fit: fill;
+  border: 0;
+  border-radius: 0.08rem;
 }
 }
 .tag-card-strategy-item .card-item-right{
 .tag-card-strategy-item .card-item-right{
   flex: 1;
   flex: 1;
@@ -836,6 +844,8 @@ body.loading {
 }
 }
 
 
 .strategy-list-container .tag-card-bd{
 .strategy-list-container .tag-card-bd{
+  padding: .16rem 0;
+  background-color: #fff;
   border-top: 1px solid rgba(0, 0, 0, 0.08);
   border-top: 1px solid rgba(0, 0, 0, 0.08);
   border-bottom: 1px solid rgba(0, 0, 0, 0.08);
   border-bottom: 1px solid rgba(0, 0, 0, 0.08);
 }
 }

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/tags/css/tags-strategy.css

@@ -75,7 +75,7 @@
   margin-right: .64rem;
   margin-right: .64rem;
 }
 }
 .page-button.next-page {
 .page-button.next-page {
-  margin-right: .64rem;
+  /* margin-right: .64rem; */
 }
 }
 
 
 .page-button.last-page .icon-arrow-right-gray{
 .page-button.last-page .icon-arrow-right-gray{

+ 1 - 1
src/jfw/modules/app/src/web/templates/tags/template/tag-card-strategy-recommend.html

@@ -9,7 +9,7 @@
       <li class="tag-card-item tag-card-strategy-item">
       <li class="tag-card-item tag-card-strategy-item">
         <a href="/jySite/{{$v._id}}.html">
         <a href="/jySite/{{$v._id}}.html">
           <div class="card-item-left">
           <div class="card-item-left">
-            <img class="" src="{{$v.s_pic1}}" alt="{{$v.s_title}}">
+            <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}" onerror="">
           </div>
           </div>
           <div class="card-item-right">
           <div class="card-item-right">
             <h3 class="item-title ellipsis" title="{{$v.s_title}}">{{$v.s_title}}</h3>
             <h3 class="item-title ellipsis" title="{{$v.s_title}}">{{$v.s_title}}</h3>

+ 3 - 3
src/jfw/modules/app/src/web/templates/tags/template/tag-card-strategy-title.html

@@ -7,13 +7,13 @@
         <a href="/jySchool/{{$column.code}}/index.html">更多<i class="j-icon base-icon icon-arrow-up"></i></a>
         <a href="/jySchool/{{$column.code}}/index.html">更多<i class="j-icon base-icon icon-arrow-up"></i></a>
       </div>
       </div>
     </header>
     </header>
-    {{range $article := $column.list}}
     <main class="tag-card-bd">
     <main class="tag-card-bd">
       <ul class="tag-card-list">
       <ul class="tag-card-list">
+      {{range $article := $column.list}}
         <li class="tag-card-item tag-card-strategy-item">
         <li class="tag-card-item tag-card-strategy-item">
           <a href="/jySite/{{$article._id}}.html">
           <a href="/jySite/{{$article._id}}.html">
             <div class="card-item-left">
             <div class="card-item-left">
-              <img class="" src="{{$article.s_pic1}}" alt="">
+              <img src="{{$article.s_pic1}}" alt="{{$article.s_title}}" onerror="">
             </div>
             </div>
             <div class="card-item-right">
             <div class="card-item-right">
               <h3 class="item-title ellipsis" title="{{$article.s_title}}">{{$article.s_title}}</h3>
               <h3 class="item-title ellipsis" title="{{$article.s_title}}">{{$article.s_title}}</h3>
@@ -22,9 +22,9 @@
             </div>
             </div>
           </a>
           </a>
         </li>
         </li>
+      {{end}}
       </ul>
       </ul>
     </main>
     </main>
-    {{end}}
   </section>
   </section>
   {{end}}
   {{end}}
 </section>
 </section>

+ 1 - 1
src/jfw/modules/app/src/web/templates/tags/template/tag-card-strategy.html

@@ -5,7 +5,7 @@
       <li class="tag-card-item tag-card-strategy-item">
       <li class="tag-card-item tag-card-strategy-item">
         <a href="/jySite/{{$v._id}}.html">
         <a href="/jySite/{{$v._id}}.html">
           <div class="card-item-left">
           <div class="card-item-left">
-            <img class="" src="{{$v.s_pic1}}" alt="">
+            <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}" onerror="">
           </div>
           </div>
           <div class="card-item-right">
           <div class="card-item-right">
             <h3 class="item-title ellipsis" title="{{$v.s_title}}">{{$v.s_title}}</h3>
             <h3 class="item-title ellipsis" title="{{$v.s_title}}">{{$v.s_title}}</h3>

+ 8 - 0
src/jfw/modules/app/src/web/templates/tags/template/tag-strategy-nav.html

@@ -9,3 +9,11 @@
 
 
   </ul>
   </ul>
 </section>
 </section>
+<script>
+  $(function(){
+    try {
+      var active = document.querySelector('.tag-strategy-nav-item.active').offsetLeft
+      document.querySelector('.tag-strategy-nav-list').scrollTo(active, 0)
+    } catch (error) {}
+  })
+</script>