Merge branch 'feature/xieweiguang' into develop

@@ -47,14 +47,15 @@
 			font-size: 50px;
 		}
 		p{
-			width: 55.517241%;
+			width: 59.517241%;
 			height: auto;
-			padding: 0 5% 18em / $pxConvertRem;
+			margin: 0 3% 16em / $pxConvertRem;
 			float: left;
 			&:first-of-type{
-				padding-top: 0.75rem;
+				margin-top: 0.75rem;
 				font-size: 18px;
-				height: 76rem / $pxConvertRem;
+				height: auto;
+				min-height: 42px;
 				display: -webkit-box;
     			-webkit-line-clamp: 2;
     			-webkit-box-orient: vertical;

 {{#coupons}}
-<div class="employ-main"  style="background-image:url('{{coupon_pic}}')">
+<div class="employ-main">
         <span>{{ money}}</span>
         <p class="coupon-name">{{ coupon_name}}</p>
         <p>有效期：{{ couponValidity}}</p>