Merge remote-tracking branch 'origin/master'

src/main/resources/static/www/tuiyijunren/images/page.css

@@ -105,9 +105,7 @@ input,textarea{
 	margin: 0 10px 0 0;
 }
 .zixun dl{
-	display: flex;
-	justify-content:space-between;
-	flex-wrap: wrap;
+	overflow: hidden;
 }
 .zixun dl a{
 	display: block;
@@ -115,7 +113,9 @@ input,textarea{
 	background: #fff;
 	padding: 30px;
 	border-radius: 5px;
-	margin: 20px 0 0 0;
+	margin: 20px 11px;
+	float: left;
+	height: 300px;
 }
 .zixun dl dd{
 	width:100%;

src/main/resources/templates/www/tuiyijunren/list-seek.html

@@ -26,7 +26,7 @@
 								</div>
 							</div>
 							<div class="ls-cont">
-								<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>200?strutil.subStringTo(bean.description,0,200)+"...":bean.description}</p>
+								<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 							</div>
 						</dd>
 					</a>

src/main/resources/templates/www/tuiyijunren/list-zx.html

@@ -19,7 +19,7 @@
 							</div>
 						</div>
 						<div class="ls-cont">
-							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>200?strutil.subStringTo(bean.description,0,200)+"...":bean.description}</p>
+							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 						</div>
 					</dd>
 				</a>
@@ -41,7 +41,7 @@
 							</div>
 						</div>
 						<div class="ls-cont">
-							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>200?strutil.subStringTo(bean.description,0,200)+"...":bean.description}</p>
+							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 						</div>
 					</dd>
 				</a>
@@ -63,7 +63,7 @@
 							</div>
 						</div>
 						<div class="ls-cont">
-							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>200?strutil.subStringTo(bean.description,0,200)+"...":bean.description}</p>
+							<p>${isNotEmpty(bean.description)&&strutil.length(bean.description)>100?strutil.subStringTo(bean.description,0,100)+"...":bean.description}</p>
 						</div>
 					</dd>
 				</a>