Merge branch 'master' of http://gitlab.pubdata.cn/hlm/hlm_mall

app/home/view/default/mall/article/article_list.html

@@ -55,18 +55,22 @@
         <h3>{$class_name}</h3>
       </div>
       {notempty name="article"}
-        <ul class="dsh-article-list">
+        <div class="dsh-article-list clearfix">
           {foreach name="article" item="article"}
-            <li><i></i>
+            <div class="item">
               <a {if $article.article_url !=""}target="_blank"{/if}
                 href="{if $article.article_url !=""}{$article.article_url}{else /}{:url('Article/show',['article_id'=>$article.article_id])}{/if} ">
-                {if $article.article_pic !=""}<img src="{$article.article_pic}">{/if}
+              {if $article.article_pic !=""}
+                 <div class="img-anm"><img class="img" src="{:ds_get_pic(ATTACH_ARTICLE,$article.article_pic)}"></div>
+                  {else /}
+                  <img class="img" src="{:ds_get_pic(ATTACH_ARTICLE,$article.article_pic)}">
+                {/if}
                 <div class="title">{$article.article_title}</div>
               </a>
-                <time>{:date('Y-m-d H:i',$article.article_time)}</time>
-            </li>
+                <div class="time">{:date('Y-m-d H:i',$article.article_time)}</div>
+            </div>
             {/foreach}
-      </ul>
+      </div>
        {else /}
         <div>{$Think.lang.article_article_not_found}</div>
      {/notempty}

public/static/home/css/home.css

@@ -421,16 +421,16 @@ form label.validate_right{padding-left:20px;background:transparent url(../images
 
 .dsh-recommend-borand{background-color:#FCF8E3;border:solid 1px #FBEED5;margin-top:10px;position:relative;z-index:1}
 .dsh-recommend-borand .title{transform:rotate(45deg);
--ms-transform:rotate(45deg); 	/* IE 9 */
--moz-transform:rotate(45deg); 	/* Firefox */
--webkit-transform:rotate(45deg); /* Safari 和 Chrome */
--o-transform:rotate(45deg); 	/* Opera */width:0px;height:0px;position:absolute;z-index:1;top:-40px;left:-40px;border:40px solid ;border-color:transparent #d10000 transparent transparent}
+    -ms-transform:rotate(45deg); 	/* IE 9 */
+    -moz-transform:rotate(45deg); 	/* Firefox */
+    -webkit-transform:rotate(45deg); /* Safari 和 Chrome */
+    -o-transform:rotate(45deg); 	/* Opera */width:0px;height:0px;position:absolute;z-index:1;top:-40px;left:-40px;border:40px solid ;border-color:transparent #d10000 transparent transparent}
 .dsh-recommend-borand .title:after{content:'' ;position:absolute;border:20px solid ;border-color:transparent #FCF8E3 transparent transparent;display:block;width:0;height:0;top:-20px;left:-20px}
 .dsh-recommend-borand .title p{line-height:14px;position:relative;z-index:2;color:#fff;top:-10px;left:2px;width:56px;    letter-spacing: 2px;transform:rotate(-90deg);
--ms-transform:rotate(-90deg); 	/* IE 9 */
--moz-transform:rotate(-90deg); 	/* Firefox */
--webkit-transform:rotate(-90deg); /* Safari 和 Chrome */
--o-transform:rotate(-90deg); 	/* Opera */}
+    -ms-transform:rotate(-90deg); 	/* IE 9 */
+    -moz-transform:rotate(-90deg); 	/* Firefox */
+    -webkit-transform:rotate(-90deg); /* Safari 和 Chrome */
+    -o-transform:rotate(-90deg); 	/* Opera */}
 .dsh-barnd-list{margin-top:20px}
 .dsh-barnd-list ul{font-size:0;width:1170px;margin:0 auto}
 .dsh-barnd-list ul li{vertical-align:top;letter-spacing:normal;word-spacing:normal;display:inline-block;width:195px;padding:0;margin:0 0 20px 0;overflow:hidden}
@@ -638,5 +638,20 @@ form label.validate_right{padding-left:20px;background:transparent url(../images
 .js-max-input{font-size:20px;color:#F40;background:#FFFAE5;white-space:nowrap;padding:7px;border:solid 1px #FFD2B2}
 
 
+.chaochu	{ display:block; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+.chaochu_1	{overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 1;-webkit-box-orient: vertical; word-break:break-all;}
+.chaochu_2	{overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical; word-break:break-all;}
+.chaochu_3	{overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 3;-webkit-box-orient: vertical; word-break:break-all;}
+.chaochu_4	{overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 4;-webkit-box-orient: vertical; word-break:break-all;}
+
 /*文章列表*/
-.article-container {}
+.article-container .dsh-article-con { border: none; padding:20px;}
+.img-anm { display: block; overflow: hidden; }
+.img-anm .img { -webkit-transition: all 0.5s;-moz-transition: all 0.5s;transition: all 0.5s;}
+.img-anm:hover .img {-webkit-transform:scale(1.2);-moz-transform:scale(1.2);transform: scale(1.2);}
+.article-container .right { width: 100%}
+.article-container .right .dsh-article-list  .item { float: left; width: 280px; height: 350px; margin-right: 10px; margin-bottom: 10px}
+.article-container .right .dsh-article-list  .item a { display: block; color: #000}
+.article-container .right .dsh-article-list  .item  img  { width: 280px; height: 280px;}
+.article-container .right .dsh-article-list  .item  .title  { font-size: 16px; height: 35px; line-height: 35px;  display:block; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+.article-container .right .dsh-article-list  .item   .time  { font-size: 12px; color: #999}