Merge branch 'master' of http://120.79.101.85:8181/dengqi/msk

public/msk/css/app.css

@@ -91,6 +91,17 @@ input::-webkit-input-placeholder{color: #888; font-size:12px !important;}
 .space .tit_xian::after{content: ""; position: absolute; top: 50%; left: 0; right:0; margin-top: -2px; width:100%; height: 3px; background: #000; z-index: 1;}
 .space .tit_xian h2{ background: #fff;}
 
+.space .spaceTitle{
+	overflow: hidden;
+text-overflow:ellipsis;
+white-space: nowrap;
+}
+.space .spaceText{display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 3;
+	overflow: hidden;}
+
+
 .home_about{ width: 30%; float: left;}
 .home_about .con{ background: #ececec; padding: 30px; height: 450px;}
 .home_cases{ width: 70%; float: right;}

public/msk/css/map.css

@@ -4,7 +4,7 @@ ul,ol,dl{list-style-type:none}
 
 
 /* 销售网络 */
-.network{overflow: hidden; margin-bottom: 80px;}
+.network{overflow: hidden; margin-bottom: 80px;border: 1px solid #dcdcdc;}
 .network .net-in{
     background: #fff;
     overflow: hidden;
@@ -50,9 +50,9 @@ ul,ol,dl{list-style-type:none}
     box-sizing:border-box;
     border: 1px solid #fff;
 }
-.network .net-map{ margin-left: 30%; height: 100%; overflow: hidden; border: 1px solid #dcdcdc; box-sizing:border-box; background: #fff; }
+.network .net-map{ margin-left: 30%; height: 100%; overflow: hidden; box-sizing:border-box; background: #fff; }
 .network .net-map img{  width: 100%; height: 100%; }
-.network .net-left ul{ overflow-y: scroll; height: 568px; }
+.network .net-left ul{ overflow-y: scroll; height: 625px;padding-bottom: 30px; }
 .network .net-left li{padding: 20px 60px 20px 20px; border-bottom: 1px solid #e6e6e6;}
 .network .net-left .pic{
     height: 85px;

resources/views/index/index.blade.php

@@ -144,8 +144,8 @@
         @foreach($news as $new)
         <div class="swiper-slide">
           <a href="{{url('news_show')}}/{{$new->id}}.html">
-            <h3>{{$new->title}}</h3>
-            <p>{{str_limit(strip_tags($new->aDescription),160,'...')}}</p>
+            <h3 class="spaceTitle">{{$new->title}}</h3>
+            <p class="spaceText">{{str_limit(strip_tags($new->aDescription),160,'...')}}</p>
             <div class="pic"><img src="{{asset($new->pic)}}" class="am-img-responsive"/></div>
             <span>learn more</span>
           </a>