Merge branch 'feature/xieweiguang' into 'develop'

Feature/xieweiguang

See merge request !11

@@ -32,7 +32,9 @@
 		height: 180rem / $pxConvertRem;
 		height: 180rem / $pxConvertRem;
 		overflow: hidden;
 		overflow: hidden;
 		margin: 20rem / $pxConvertRem auto;
 		margin: 20rem / $pxConvertRem auto;
-		background: image-url('me/employ/employ.jpg') top center no-repeat;
+		background-image: image-url('me/employ/employ.jpg');
+		background-position: top center;
+		background-repeat:no-repeat;
 		background-size: 100% 100%;
 		background-size: 100% 100%;
 		color: #fff;
 		color: #fff;
 		position: relative;
 		position: relative;

@@ -35,6 +35,9 @@
 				font-size: 48em / $pxConvertRem;
 				font-size: 48em / $pxConvertRem;
 				margin-right: 8%;
 				margin-right: 8%;
 				float: left;
 				float: left;
+				text-overflow:ellipsis; 
+				white-space:nowrap; 
+				overflow:hidden;
 				.head-portrait{
 				.head-portrait{
 					width:90rem / $pxConvertRem;
 					width:90rem / $pxConvertRem;
 					height: 90rem / $pxConvertRem;
 					height: 90rem / $pxConvertRem;

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

 {{> layout/header}}
 {{> layout/header}}
     <div class="personal-details">
     <div class="personal-details">
         <ul>
         <ul>
-            <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li>
+            <li><span>头像</span><span><i class="head-portrait user-avatar" data-avatar="{{head_ico}}"></i></span></li>
             <li><span>昵称</span><span>{{ nickname }}</span></li>
             <li><span>昵称</span><span>{{ nickname }}</span></li>
             <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>