wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit c03e17da78c4acfed2365845be7fa498488b13c9 2 parents 1b7f2fb0 b29318d4

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

Inline Side-by-side
Showing 8 changed files with 27 additions and 19 deletions
@@ -4,12 +4,4 @@ @@ -4,12 +4,4 @@
4 * @date: 2015/11/12 4 * @date: 2015/11/12
5 */ 5 */
6 6
7 -var Swiper = require('yoho.iswiper');  
8 -  
9 -var recommendSwiper;  
10 -  
11 -recommendSwiper = new Swiper('.swiper-recommend', {  
12 - lazyLoading: true,  
13 - lazyLoadingInPrevNext: true,  
14 - slidesPerView: 'auto'  
15 -});  
  7 +require('../product/recommend-for-you.js');
  1 +/**
  2 + * 为您优选
  3 + * @author: bikai<kai.bi@yoho.cn>
  4 + * @date: 2015/11/16
  5 + */
  6 +
  7 +
  8 +var Swiper = require('yoho.iswiper');
  9 +
  10 +var recommendSwiper;
  11 +
  12 +recommendSwiper = new Swiper('.swiper-recommend', {
  13 + lazyLoading: true,
  14 + lazyLoadingInPrevNext: true,
  15 + slidesPerView: 'auto'
  16 +});
1 -@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "recommend-for-you", "fav", "suggest", "address", "online-service"; 1 +@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service";
  2 +
1 -@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank";  
  1 +@import "new-arrival", "discount", "list", "detail", "suspend-cart", "hot-rank", "_recommend-for-you.scss";
@@ -87,6 +87,6 @@ @@ -87,6 +87,6 @@
87 </div> 87 </div>
88 </div> 88 </div>
89 89
90 - {{> me/recommend-for-you}} 90 + {{> product/recommend-for-you}}
91 </div> 91 </div>
92 {{> layout/footer}} 92 {{> layout/footer}}
@@ -3,12 +3,11 @@ @@ -3,12 +3,11 @@
3 {{# service}} 3 {{# service}}
4 <div class="question"> 4 <div class="question">
5 <div class="question-title">问题查询</div> 5 <div class="question-title">问题查询</div>
6 - <div class="question-tab">  
7 - <span class="tab-item" data-tab="order">订单问题</span>  
8 - <span class="line"></span>  
9 - <span class="tab-item current" data-tab="shopping">购物问题</span>  
10 - <span class="line"></span>  
11 - <span class="tab-item" data-tab="other">其他问题</span> 6 + <div class="question-tab">
  7 + {{#tab}}
  8 + <span class="tab-item {{#current}}current{{/current}}" data-tab="{{tabid}}">{{tabname}}</span>
  9 + {{#iscut}}<span class="line"></span>{{/iscut}}
  10 + {{/tab}}
12 </div> 11 </div>
13 {{#question}} 12 {{#question}}
14 <ul class="question-list {{#current}}current{{/current}}" data-tab-name="{{name}}"> 13 <ul class="question-list {{#current}}current{{/current}}" data-tab-name="{{name}}">
@@ -26,7 +25,7 @@ @@ -26,7 +25,7 @@
26 {{/ service}} 25 {{/ service}}
27 <div class="connect-info"> 26 <div class="connect-info">
28 <div class="connect-item connect-online"> 27 <div class="connect-item connect-online">
29 - <a href="#" title="在线客服"> 28 + <a href="http://chat80.live800.com/live800/chatClient/chatbox.jsp?companyID=493979&amp;configID=123576&amp;jid=9277320930" target="_blank" title="在线客服">
30 <span class="icon iconfont icon-chat">&#xe620;</span> 29 <span class="icon iconfont icon-chat">&#xe620;</span>
31 在线客服 30 在线客服
32 <span class="iconfont icon-yoho-enter">&#xe604;</span> 31 <span class="iconfont icon-yoho-enter">&#xe604;</span>