wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by ccbikai
Commit 77fc5856fbb979c98cf080a16fdebcef8b1d52fb 2 parents 60a6bdb5 227480d4

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

Inline Side-by-side
Showing 18 changed files with 170 additions and 169 deletions
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 Swiper = require('yoho.iswiper'), 9 Swiper = require('yoho.iswiper'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'); 8 + Hammer = require('yoho.hammer');
9 9
10 var $nav = $('.category-nav'), 10 var $nav = $('.category-nav'),
11 $categoryContainer = $('.category-container'), 11 $categoryContainer = $('.category-container'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 Swiper = require('yoho.iswiper'); 9 Swiper = require('yoho.iswiper');
10 10
11 var info = require('./info'), 11 var info = require('./info'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 ellipsis = require('mlellipsis'), 9 ellipsis = require('mlellipsis'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 ellipsis = require('mlellipsis'), 9 ellipsis = require('mlellipsis'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 lazyLoad = require('yoho.lazyload'), 9 lazyLoad = require('yoho.lazyload'),
10 Swiper = require('yoho.iswiper'); 10 Swiper = require('yoho.iswiper');
11 11
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 * @date: 2015/10/12 4 * @date: 2015/10/12
5 */ 5 */
6 var $ = require('jquery'), 6 var $ = require('jquery'),
7 - Hammer = require('hammer'), 7 + Hammer = require('yoho.hammer'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 lazyLoad = require('yoho.lazyload'), 9 lazyLoad = require('yoho.lazyload'),
10 $mobileWrap = $('.mobile-wrap'), 10 $mobileWrap = $('.mobile-wrap'),
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 tip = require('../plugin/tip'), 9 tip = require('../plugin/tip'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'); 8 + Hammer = require('yoho.hammer');
9 9
10 var floatLayerCloseHammer, floatLayerBtnHammer; 10 var floatLayerCloseHammer, floatLayerBtnHammer;
11 11
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'); 8 + Hammer = require('yoho.hammer');
9 9
10 var $input = $('#search-input input'); 10 var $input = $('#search-input input');
11 11
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 */ 6 */
7 7
8 var $ = require('jquery'), 8 var $ = require('jquery'),
9 - Hammer = require('hammer'); 9 + Hammer = require('yoho.hammer');
10 10
11 var $filter; 11 var $filter;
12 12
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 - Hammer = require('hammer'), 8 + Hammer = require('yoho.hammer'),
9 lazyLoad = require('yoho.lazyload'); 9 lazyLoad = require('yoho.lazyload');
10 10
11 //品牌页参数 11 //品牌页参数
@@ -398,6 +398,8 @@ if ($brandHeader.length > 0) { @@ -398,6 +398,8 @@ if ($brandHeader.length > 0) {
398 success: function(data) { 398 success: function(data) {
399 if (data.code === 200) { 399 if (data.code === 200) {
400 $this.toggleClass('coled'); 400 $this.toggleClass('coled');
  401 + } else if (data.code === 400 || data.code === 412) {
  402 + tip.show('未登录');
401 } else { 403 } else {
402 tip.show(data.message); 404 tip.show(data.message);
403 } 405 }
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - Hammer = require('hammer'), 9 + Hammer = require('yoho.hammer'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
12 var swiper; 12 var swiper;
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 Swiper = require('yoho.iswiper'), 8 Swiper = require('yoho.iswiper'),
9 - Hammer = require('hammer'), 9 + Hammer = require('yoho.hammer'),
10 lazyLoad = require('yoho.lazyload'); 10 lazyLoad = require('yoho.lazyload');
11 11
12 var swiper, 12 var swiper,
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 "import-style": "1.0.0", 23 "import-style": "1.0.0",
24 "yoho.lazyload": "1.1.0", 24 "yoho.lazyload": "1.1.0",
25 "yoho.handlebars": "3.0.3", 25 "yoho.handlebars": "3.0.3",
26 - "hammer": "2.0.4" 26 + "yoho.hammer": "2.0.4"
27 }, 27 },
28 "devDependencies": { 28 "devDependencies": {
29 "expect.js": "0.3.1" 29 "expect.js": "0.3.1"
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 height: 192rem / $pxConvertRem; 17 height: 192rem / $pxConvertRem;
18 border-bottom: 1px solid #e0e0e0; 18 border-bottom: 1px solid #e0e0e0;
19 border-right: 1px solid #e0e0e0; 19 border-right: 1px solid #e0e0e0;
20 - &:nth-child(-n+3) {  
21 - border-bottom: none;  
22 - }  
23 } 20 }
24 21
25 .classify-logo { 22 .classify-logo {
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="newarrival-page yoho-page"> 2 <div class="newarrival-page yoho-page">
3 - {{# headerBanner}}  
4 - {{> product/banner_swipe_and_single}}  
5 - {{/ headerBanner}}  
6 -  
7 - <ul id="list-nav" class="list-nav clearfix">  
8 - <li id="today" class="today active">  
9 - <a href="javascript:void(0);">  
10 - </a>  
11 - </li>  
12 - <li class="week">  
13 - <a href="javascript:void(0);">  
14 - 本周上新  
15 - </a>  
16 - </li>  
17 - <li class="sale">  
18 - <a href="javascript:void(0);">  
19 - 销量  
20 - </a>  
21 - </li>  
22 - <li class="filter">  
23 - <a href="javascript:void(0);">  
24 - 筛选  
25 - </a>  
26 - <span class="iconfont">&#xe613;</span>  
27 - </li>  
28 - </ul>  
29 -  
30 - <div id="goods-container" class="goods-container">  
31 - <div class="container clearfix">  
32 - {{# goods}}  
33 - {{> good}}  
34 - {{/ goods}}  
35 - </div>  
36 - <div class="container hide clearfix"></div>  
37 - <div class="container hide clearfix"></div>  
38 - {{> filter}} 3 + {{# headerBanner}}
  4 + {{> product/banner_swipe_and_single}}
  5 + {{/ headerBanner}}
  6 +
  7 + <ul id="list-nav" class="list-nav clearfix">
  8 + <li id="today" class="today active">
  9 + <a href="javascript:void(0);">
  10 + </a>
  11 + </li>
  12 + <li class="week">
  13 + <a href="javascript:void(0);">
  14 + 本周上新
  15 + </a>
  16 + </li>
  17 + <li class="sale">
  18 + <a href="javascript:void(0);">
  19 + 销量
  20 + </a>
  21 + </li>
  22 + <li class="filter">
  23 + <a href="javascript:void(0);">
  24 + 筛选
  25 + </a>
  26 + <span class="iconfont">&#xe613;</span>
  27 + </li>
  28 + </ul>
  29 +
  30 + <div id="goods-container" class="goods-container">
  31 + <div class="container clearfix">
  32 + {{# goods}}
  33 + {{> good}}
  34 + {{/ goods}}
39 </div> 35 </div>
40 -  
41 - {{#if brand}}  
42 - <input id="brand" type="hidden" value={{brand}}>  
43 - {{/if}} 36 + <div class="container hide clearfix"></div>
  37 + <div class="container hide clearfix"></div>
  38 + {{> filter}}
  39 + </div>
  40 +
  41 + {{#if brand}}
  42 + <input id="brand" type="hidden" value={{brand}}>
  43 + {{/if}}
44 44
45 - {{#if gender}}  
46 - <input id="gender" type="hidden" value={{gender}}>  
47 - {{/if}} 45 + {{#if gender}}
  46 + <input id="gender" type="hidden" value={{gender}}>
  47 + {{/if}}
48 48
49 - {{#if sort}}  
50 - <input id="sort" type="hidden" value={{sort}}>  
51 - {{/if}} 49 + {{#if sort}}
  50 + <input id="sort" type="hidden" value={{sort}}>
  51 + {{/if}}
52 52
53 - {{#if color}}  
54 - <input id="color" type="hidden" value={{color}}>  
55 - {{/if}} 53 + {{#if color}}
  54 + <input id="color" type="hidden" value={{color}}>
  55 + {{/if}}
56 56
57 - {{#if size}}  
58 - <input id="size" type="hidden" value={{size}}>  
59 - {{/if}} 57 + {{#if size}}
  58 + <input id="size" type="hidden" value={{size}}>
  59 + {{/if}}
60 60
61 - {{#if price}}  
62 - <input id="price" type="hidden" value={{price}}>  
63 - {{/if}} 61 + {{#if price}}
  62 + <input id="price" type="hidden" value={{price}}>
  63 + {{/if}}
64 64
65 - {{#if p_d}}  
66 - <input id="p_d" type="hidden" value={{p_d}}>  
67 - {{/if}} 65 + {{#if p_d}}
  66 + <input id="p_d" type="hidden" value={{p_d}}>
  67 + {{/if}}
68 68
69 - {{#if channel}}  
70 - <input id="channel" type="hidden" value={{channel}}>  
71 - {{/if}} 69 + {{#if channel}}
  70 + <input id="channel" type="hidden" value={{channel}}>
  71 + {{/if}}
72 72
73 - {{#if dayLimit}}  
74 - <input id="dayLimit" type="hidden" value={{dayLimit}}>  
75 - {{/if}} 73 + {{#if dayLimit}}
  74 + <input id="dayLimit" type="hidden" value={{dayLimit}}>
  75 + {{/if}}
76 76
77 - {{#if limit}}  
78 - <input id="limit" type="hidden" value={{limit}}>  
79 - {{/if}} 77 + {{#if limit}}
  78 + <input id="limit" type="hidden" value={{limit}}>
  79 + {{/if}}
80 80
81 - {{#if page}}  
82 - <input id="page" type="hidden" value={{page}}>  
83 - {{/if}} 81 + {{#if page}}
  82 + <input id="page" type="hidden" value={{page}}>
  83 + {{/if}}
84 84
  85 + {{> product/suspend-cart}}
85 </div> 86 </div>
86 {{> layout/footer}} 87 {{> layout/footer}}
87 {{> layout/download_app}} 88 {{> layout/download_app}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="discount-page yoho-page"> 2 <div class="discount-page yoho-page">
3 - {{# headerBanner}}  
4 - {{> product/banner_swipe_and_single}}  
5 - {{/ headerBanner}}  
6 -  
7 - <ul id="list-nav" class="list-nav clearfix">  
8 - <li class="new active">  
9 - <a href="javascript:void(0);">  
10 - <span class="spanTest">最新</span>  
11 - <span class="iconfont cur">&#xe616;</span>  
12 - </a>  
13 - </li>  
14 - <li class="price">  
15 - <a href="javascript:void(0);">  
16 - <span class="spanTest">价格</span>  
17 - <span class="icon">  
18 - <i class="iconfont up">&#xe615;</i>  
19 - <i class="iconfont down cur">&#xe616;</i>  
20 - </span>  
21 - </a>  
22 - </li>  
23 - <li class="discount">  
24 - <a href="javascript:void(0);">  
25 - <span class="spanTest">折扣</span>  
26 - <span class="icon">  
27 - <i class="iconfont up">&#xe615;</i>  
28 - <i class="iconfont down cur">&#xe616;</i>  
29 - </span>  
30 - </a>  
31 - </li>  
32 - <li class="filter">  
33 - <a href="javascript:void(0);">  
34 - <span class="spanTest">筛选</span>  
35 - <span class="iconfont">&#xe613;</span>  
36 - </a>  
37 - </li>  
38 - </ul> 3 + {{# headerBanner}}
  4 + {{> product/banner_swipe_and_single}}
  5 + {{/ headerBanner}}
39 6
40 - <div id="goods-container" class="goods-container">  
41 - <div class="new-goods container clearfix">  
42 - {{# goods}}  
43 - {{> good}}  
44 - {{/ goods}}  
45 - </div>  
46 - <div class="price-goods container hide clearfix"></div>  
47 - <div class="discount-goods container hide clearfix"></div>  
48 -  
49 - {{> filter}} 7 + <ul id="list-nav" class="list-nav clearfix">
  8 + <li class="new active">
  9 + <a href="javascript:void(0);">
  10 + <span class="spanTest">最新</span>
  11 + <span class="iconfont cur">&#xe616;</span>
  12 + </a>
  13 + </li>
  14 + <li class="price">
  15 + <a href="javascript:void(0);">
  16 + <span class="spanTest">价格</span>
  17 + <span class="icon">
  18 + <i class="iconfont up">&#xe615;</i>
  19 + <i class="iconfont down cur">&#xe616;</i>
  20 + </span>
  21 + </a>
  22 + </li>
  23 + <li class="discount">
  24 + <a href="javascript:void(0);">
  25 + <span class="spanTest">折扣</span>
  26 + <span class="icon">
  27 + <i class="iconfont up">&#xe615;</i>
  28 + <i class="iconfont down cur">&#xe616;</i>
  29 + </span>
  30 + </a>
  31 + </li>
  32 + <li class="filter">
  33 + <a href="javascript:void(0);">
  34 + <span class="spanTest">筛选</span>
  35 + <span class="iconfont">&#xe613;</span>
  36 + </a>
  37 + </li>
  38 + </ul>
  39 +
  40 + <div id="goods-container" class="goods-container">
  41 + <div class="new-goods container clearfix">
  42 + {{# goods}}
  43 + {{> good}}
  44 + {{/ goods}}
50 </div> 45 </div>
51 -  
52 - {{#if brand}}  
53 - <input id="brand" type="hidden" value={{brand}}>  
54 - {{/if}} 46 + <div class="price-goods container hide clearfix"></div>
  47 + <div class="discount-goods container hide clearfix"></div>
  48 +
  49 + {{> filter}}
  50 + </div>
  51 +
  52 + {{#if brand}}
  53 + <input id="brand" type="hidden" value={{brand}}>
  54 + {{/if}}
  55 +
  56 + {{#if gender}}
  57 + <input id="gender" type="hidden" value={{gender}}>
  58 + {{/if}}
55 59
56 - {{#if gender}}  
57 - <input id="gender" type="hidden" value={{gender}}>  
58 - {{/if}} 60 + {{#if sort}}
  61 + <input id="sort" type="hidden" value={{sort}}>
  62 + {{/if}}
59 63
60 - {{#if sort}}  
61 - <input id="sort" type="hidden" value={{sort}}>  
62 - {{/if}} 64 + {{#if color}}
  65 + <input id="color" type="hidden" value={{color}}>
  66 + {{/if}}
63 67
64 - {{#if color}}  
65 - <input id="color" type="hidden" value={{color}}>  
66 - {{/if}} 68 + {{#if size}}
  69 + <input id="size" type="hidden" value={{size}}>
  70 + {{/if}}
67 71
68 - {{#if size}}  
69 - <input id="size" type="hidden" value={{size}}>  
70 - {{/if}} 72 + {{#if price}}
  73 + <input id="price" type="hidden" value={{price}}>
  74 + {{/if}}
71 75
72 - {{#if price}}  
73 - <input id="price" type="hidden" value={{price}}>  
74 - {{/if}} 76 + {{#if p_d}}
  77 + <input id="p_d" type="hidden" value={{p_d}}>
  78 + {{/if}}
75 79
76 - {{#if p_d}}  
77 - <input id="p_d" type="hidden" value={{p_d}}>  
78 - {{/if}} 80 + {{#if channel}}
  81 + <input id="channel" type="hidden" value={{channel}}>
  82 + {{/if}}
79 83
80 - {{#if channel}}  
81 - <input id="channel" type="hidden" value={{channel}}>  
82 - {{/if}} 84 + {{#if limit}}
  85 + <input id="limit" type="hidden" value={{limit}}>
  86 + {{/if}}
83 87
84 - {{#if limit}}  
85 - <input id="limit" type="hidden" value={{limit}}>  
86 - {{/if}} 88 + {{#if page}}
  89 + <input id="page" type="hidden" value={{page}}>
  90 + {{/if}}
87 91
88 - {{#if page}}  
89 - <input id="page" type="hidden" value={{page}}>  
90 - {{/if}} 92 + {{#if discount}}
  93 + <input id="discount" type="hidden" value={{discount}}>
  94 + {{/if}}
91 95
92 - {{#if discount}}  
93 - <input id="discount" type="hidden" value={{discount}}>  
94 - {{/if}}  
95 - 96 + {{> product/suspend-cart}}
96 </div> 97 </div>
97 {{> layout/footer}} 98 {{> layout/footer}}
98 {{> layout/download_app}} 99 {{> layout/download_app}}