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

@@ -95,12 +95,5 @@ $win.scroll(function() {
   updateLayerPosition();
   updateLayerPosition();
 });
 });
 
 
-$win.on('resize', function(){
-  console.log('resize');
-});
-
-$win.on('scrollstop', function(){
-  console.log('stop');
-});
 
 
 $doc.on('ready', updateLayerPosition);
 $doc.on('ready', updateLayerPosition);

@@ -3,6 +3,7 @@ var $ = require('jquery'),
 var employ;
 var employ;
 
 
 window.rePosFooter();
 window.rePosFooter();
+$('.yoho-footer').css('border-top', '1px solid #e0e0e0');
 $('.employ span').each(function(index) {
 $('.employ span').each(function(index) {
     employ = new Hammer($('.employ span')[index]);
     employ = new Hammer($('.employ span')[index]);
     employ.on('tap', function(e) {
     employ.on('tap', function(e) {

@@ -135,7 +135,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
 
 
         a {
         a {
             color: #444;
             color: #444;
-            display: block;
+            display: inline-block;
         }
         }
 
 
         > span {
         > span {

@@ -101,10 +101,10 @@ $basicBtnC:#eb0313;
             display: inline-block;
             display: inline-block;
             box-sizing: border-box;
             box-sizing: border-box;
             margin-left: .5px;
             margin-left: .5px;
-            font-size: pxToRem(23px);
+            font-size: pxToRem(18px);
             text-align: center;
             text-align: center;
-            line-height: pxToRem(33px);
-            padding: 0 5px;
+            line-height: pxToRem(30px);
+            padding: 0 15px;
         }
         }
         .new-tag {
         .new-tag {
             background-color: #78dc7e;
             background-color: #78dc7e;

@@ -21,6 +21,7 @@
             padding: pxToRem(16px) pxToRem(12px);
             padding: pxToRem(16px) pxToRem(12px);
             color: $mainFontC;
             color: $mainFontC;
             background-color: $tableCellC;
             background-color: $tableCellC;
+            border-top: 1px solid #fff;
         }
         }
     }
     }
     .tips {
     .tips {
@@ -65,7 +66,7 @@
     .wash-tips{
     .wash-tips{
         padding-top:pxToRem(18px); 
         padding-top:pxToRem(18px); 
         &.page-block{
         &.page-block{
-            border-top: 0px;
+            // border-top: 0px;
             padding-left: pxToRem(15px);
             padding-left: pxToRem(15px);
             padding-right: pxToRem(15px);
             padding-right: pxToRem(15px);
         }
         }
@@ -127,6 +128,7 @@
             .avatar {
             .avatar {
                 line-height: pxToRem(40px);
                 line-height: pxToRem(40px);
                 width: pxToRem(40px);
                 width: pxToRem(40px);
+                border-radius: 50%;
                 height: pxToRem(40px);
                 height: pxToRem(40px);
                 margin: pxToRem(18px) 0;
                 margin: pxToRem(18px) 0;
             }
             }

@@ -9,9 +9,9 @@
     <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}}">
-            {{# imgUrl}}
-                <img class="lazy" data-original="{{.}}" alt=""/>
-            {{/ imgUrl}}
+            {{#if imgUrl}}
+                <img class="lazy" data-original="{{imgUrl}}" alt=""/>
+            {{/if}}
             <h2>{{title}}</h2>
             <h2>{{title}}</h2>
             <p>{{content}}</p>
             <p>{{content}}</p>
 
 

@@ -47,7 +47,7 @@
         {{#if periodOfMarket}}
         {{#if periodOfMarket}}
         <div class="periodOfMarket">
         <div class="periodOfMarket">
             <h1>上市期：</h1>
             <h1>上市期：</h1>
-            <h1 >{{peridOfMarket}}</h1>
+            <h1 >{{periodOfMarket}}</h1>
         </div>
         </div>
         {{/if}}
         {{/if}}
     </div>
     </div>

@@ -11,7 +11,7 @@
                 {{userName}}
                 {{userName}}
             </span>
             </span>
             <span class="goods-spec">
             <span class="goods-spec">
-                {{desc}}
+                购买了{{desc}}
             </span>
             </span>
             <p class="detail-content">
             <p class="detail-content">
                 {{content}}
                 {{content}}