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

@@ -4,12 +4,4 @@
  * @date: 2015/11/12
  * @date: 2015/11/12
  */
  */
 
 
-var Swiper = require('yoho.iswiper');
-
-var recommendSwiper;
-
-recommendSwiper = new Swiper('.swiper-recommend', {
-    lazyLoading: true,
-    lazyLoadingInPrevNext: true,
-    slidesPerView: 'auto'
-});
+require('../product/recommend-for-you.js');

+/**
+ * 为您优选
+ * @author: bikai<kai.bi@yoho.cn>
+ * @date: 2015/11/16
+ */
+
+
+var Swiper = require('yoho.iswiper');
+
+var recommendSwiper;
+
+recommendSwiper = new Swiper('.swiper-recommend', {
+    lazyLoading: true,
+    lazyLoadingInPrevNext: true,
+    slidesPerView: 'auto'
+});

-@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "recommend-for-you", "fav", "suggest", "address", "online-service";
+@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service";
+

-@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank";
+@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank", "_recommend-for-you.scss";

@@ -87,6 +87,6 @@
             </div>
             </div>
         </div>
         </div>
         
         
-        {{> me/recommend-for-you}}
+        {{> product/recommend-for-you}}
     </div>
     </div>
 {{> layout/footer}}
 {{> layout/footer}}

@@ -4,11 +4,10 @@
     <div class="question">
     <div class="question">
         <div class="question-title">问题查询</div>
         <div class="question-title">问题查询</div>
          <div class="question-tab">
          <div class="question-tab">
-            <span class="tab-item" data-tab="order">订单问题</span>
-            <span class="line"></span>
-            <span class="tab-item current" data-tab="shopping">购物问题</span>
-            <span class="line"></span>
-            <span class="tab-item" data-tab="other">其他问题</span>
+            {{#tab}}
+            <span class="tab-item {{#current}}current{{/current}}" data-tab="{{tabid}}">{{tabname}}</span>
+            {{#iscut}}<span class="line"></span>{{/iscut}}
+            {{/tab}}
         </div>
         </div>
         {{#question}}
         {{#question}}
         <ul class="question-list {{#current}}current{{/current}}" data-tab-name="{{name}}">
         <ul class="question-list {{#current}}current{{/current}}" data-tab-name="{{name}}">
@@ -26,7 +25,7 @@
     {{/ service}}
     {{/ service}}
     <div class="connect-info">
     <div class="connect-info">
         <div class="connect-item connect-online">
         <div class="connect-item connect-online">
-            <a href="#" title="在线客服">
+            <a href="http://chat80.live800.com/live800/chatClient/chatbox.jsp?companyID=493979&amp;configID=123576&amp;jid=9277320930" target="_blank" title="在线客服">
                 <span class="icon iconfont icon-chat">&#xe620;</span>
                 <span class="icon iconfont icon-chat">&#xe620;</span>
                 在线客服
                 在线客服
                 <span class="iconfont icon-yoho-enter">&#xe604;</span>
                 <span class="iconfont icon-yoho-enter">&#xe604;</span>