Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Conflicts:
	library/Api/Yohobuy.php

@@ -23,8 +23,9 @@
             width: 16rem / $pxConvertRem;
             width: 16rem / $pxConvertRem;
             height: 16rem / $pxConvertRem;
             height: 16rem / $pxConvertRem;
             margin: 0 (8rem / $pxConvertRem);
             margin: 0 (8rem / $pxConvertRem);
-            background: #efefef;
+            background: #f0f0f0;
             border-radius: 50%;
             border-radius: 50%;
+            opacity: 1;
         }
         }
 
 
         span.swiper-pagination-bullet-active {
         span.swiper-pagination-bullet-active {
@@ -85,4 +86,4 @@
             }
             }
         }
         }
     }
     }
-}
+}

@@ -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;

@@ -31,7 +31,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
 
 
     //意见反馈主体
     //意见反馈主体
     .suggest-content {
     .suggest-content {
-        border-top: pxToRem(30px) solid #fff;
+        border-top: 1px solid #e0e0e0;
 
 
         .suggest-item {
         .suggest-item {
             width: 100%;
             width: 100%;
@@ -76,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
                 &.suggest-active {
                 &.suggest-active {
                     > div {
                     > div {
                         width: 50%;
                         width: 50%;
+                        height: 100%;
                         float: left;
                         float: left;
                         text-align: left;
                         text-align: left;
                         padding-left: pxToRem(128px);
                         padding-left: pxToRem(128px);
@@ -135,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
         line-height: pxToRem(88px);
         line-height: pxToRem(88px);
         text-align: center;
         text-align: center;
         font-size: pxToRem(30px);
         font-size: pxToRem(30px);
-        border-top: 1px solid #e0e0e0;
-        border-bottom: 1px solid #e0e0e0;
+        //border-top: 1px solid #e0e0e0;
+        //border-bottom: 1px solid #e0e0e0;
+        border-top: pxToRem(30px) solid #f0f0f0;
+        border-bottom: pxToRem(30px) solid #f0f0f0;
+        position: relative;
+        &:after {
+            content: '';
+            width: 100%;
+            height: 1px;
+            border-top: 1px solid #e0e0e0;
+            position: absolute;
+            left: 0;
+            top: 0;
+        }
+        &:before {
+            content: '';
+            width: 100%;
+            height: 1px;
+            border-bottom: 1px solid #e0e0e0;
+            position: absolute;
+            left: 0;
+            bottom: 0;
+        }
 
 
         a {
         a {
             color: #444;
             color: #444;

 {{#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>

@@ -6,6 +6,12 @@
         我们希望了解您的意见和建议
         我们希望了解您的意见和建议
     </h2>
     </h2>
 
 
+    <div class="create-new-suggest">
+        <a href="./suggestSub">
+            反馈问题<span>（功能意见，界面意见）</span>
+        </a>
+    </div>
+
     <div class="suggest-content" id="suggest-content">
     <div class="suggest-content" id="suggest-content">
         {{# suggestContent}}
         {{# suggestContent}}
         <div class="suggest-item" data-id="{{suggest_id}}">
         <div class="suggest-item" data-id="{{suggest_id}}">
@@ -46,11 +52,6 @@
 
 
         {{/ suggestContent}}
         {{/ suggestContent}}
     </div>
     </div>
-    <div class="create-new-suggest">
-        <a href="./suggestSub">
-            反馈问题<span>（功能意见，界面意见）</span>
-        </a>
-    </div>
     {{/ suggest}}
     {{/ suggest}}
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}