fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 3704f502b22136a901a986eaa8362237e7f303a6 2 parents e69dc3cb d847c03d

Merge branch 'develop'

Inline Side-by-side
Showing 12 changed files with 28 additions and 20 deletions
@@ -105,13 +105,6 @@ if ($('.cart-nav').length > 0) { @@ -105,13 +105,6 @@ if ($('.cart-nav').length > 0) {
105 return; 105 return;
106 } 106 }
107 107
108 - if (switchChose === false) {  
109 - $cartContentShow.find('.shopping-cart-good .name').each(function() {  
110 - this.mlellipsis(2);  
111 - });  
112 - switchChose = true;  
113 - }  
114 -  
115 if (cartType === 'ordinary') { 108 if (cartType === 'ordinary') {
116 cartType = 'advance'; 109 cartType = 'advance';
117 $('#cartType').val('advance'); 110 $('#cartType').val('advance');
@@ -128,6 +121,13 @@ if ($('.cart-nav').length > 0) { @@ -128,6 +121,13 @@ if ($('.cart-nav').length > 0) {
128 121
129 $cartContentShow = $cartContent.not('.hide'); 122 $cartContentShow = $cartContent.not('.hide');
130 123
  124 + if (switchChose === false) {
  125 + $cartContentShow.find('.shopping-cart-good .name').each(function() {
  126 + this.mlellipsis(2);
  127 + });
  128 + switchChose = true;
  129 + }
  130 +
131 //trigger lazyload 131 //trigger lazyload
132 $(window).trigger('scroll'); 132 $(window).trigger('scroll');
133 }); 133 });
@@ -166,7 +166,7 @@ function didUpdateAllGoodsCheckStatus() { @@ -166,7 +166,7 @@ function didUpdateAllGoodsCheckStatus() {
166 $(checkedBox).removeClass('icon-cb-checked').addClass('icon-checkbox'); 166 $(checkedBox).removeClass('icon-cb-checked').addClass('icon-checkbox');
167 }); 167 });
168 } 168 }
169 - window.history.go(0); 169 + window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
170 } 170 }
171 171
172 function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) { 172 function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 * @author: chenglong<chenglong.wang@yoho.cn> 3 * @author: chenglong<chenglong.wang@yoho.cn>
4 * @date: 2015/11/12 4 * @date: 2015/11/12
5 */ 5 */
6 -  
7 var $ = require('jquery'), 6 var $ = require('jquery'),
8 Hammer = require('yoho.hammer'), 7 Hammer = require('yoho.hammer'),
9 Swiper = require('yoho.iswiper'); 8 Swiper = require('yoho.iswiper');
@@ -4,9 +4,11 @@ @@ -4,9 +4,11 @@
4 padding-left: 16rem / $pxConvertRem; 4 padding-left: 16rem / $pxConvertRem;
5 5
6 .prevent-img-click { 6 .prevent-img-click {
  7 + position: absolute;
7 width: 20rem / $pxConvertRem; 8 width: 20rem / $pxConvertRem;
8 height: 200rem / $pxConvertRem; 9 height: 200rem / $pxConvertRem;
9 - position: absolute; 10 + top: 0.4rem;
  11 + left: 0;
10 background-color: transparent; 12 background-color: transparent;
11 z-index: 99; 13 z-index: 99;
12 } 14 }
@@ -59,6 +61,7 @@ @@ -59,6 +61,7 @@
59 } 61 }
60 62
61 .info { 63 .info {
  64 + position: relative;
62 float: left; 65 float: left;
63 margin-left: 60rem / $pxConvertRem; 66 margin-left: 60rem / $pxConvertRem;
64 padding: 16rem / $pxConvertRem 0; 67 padding: 16rem / $pxConvertRem 0;
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 } 119 }
120 120
121 .coupon-use { 121 .coupon-use {
122 - box-sizing: border-box; 122 + @include box-sizing(border-box);
123 position: relative; 123 position: relative;
124 float: right; 124 float: right;
125 padding-right: 30rem / $pxConvertRem; 125 padding-right: 30rem / $pxConvertRem;
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
78 } 78 }
79 79
80 .not-avaliable { 80 .not-avaliable {
81 - -webkit-filter: grayscale(100%); 81 + // -webkit-filter: grayscale(100%);
  82 + @include filter(grayscale(100%));
82 } 83 }
83 } 84 }
@@ -9,6 +9,10 @@ $basicBtnC:#eb0313; @@ -9,6 +9,10 @@ $basicBtnC:#eb0313;
9 overflow: hidden; 9 overflow: hidden;
10 background-color: #f0f0f0; 10 background-color: #f0f0f0;
11 11
  12 + .yoho-tip {
  13 + z-index: 4;
  14 + }
  15 +
12 .page-block { 16 .page-block {
13 background-color: #fff; 17 background-color: #fff;
14 box-sizing: border-box; 18 box-sizing: border-box;
@@ -15,9 +15,7 @@ @@ -15,9 +15,7 @@
15 {{# navBtn}} 15 {{# navBtn}}
16 <!-- <span class="nav-btn">{{.}}</span> --> 16 <!-- <span class="nav-btn">{{.}}</span> -->
17 <!-- <i class="iconfont nav-home">&#xe638;</i> --> 17 <!-- <i class="iconfont nav-home">&#xe638;</i> -->
18 - {{/ navBtn}}  
19 -</header>  
20 - <div class="homebuttom none"> 18 + <!-- <div class="homebuttom none">
21 <ul> 19 <ul>
22 <li> 20 <li>
23 <i class="iconfont">&#xe62a;</i> 21 <i class="iconfont">&#xe62a;</i>
@@ -36,5 +34,8 @@ @@ -36,5 +34,8 @@
36 <span>我的</span> 34 <span>我的</span>
37 </li> 35 </li>
38 </ul> 36 </ul>
39 - </div> 37 + </div> -->
  38 + {{/ navBtn}}
  39 +</header>
  40 +
40 {{/pageHeader}} 41 {{/pageHeader}}
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.2.1" 53 +application.version = "1.2.2"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.2.1" 53 +application.version = "1.2.2"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.2.1" 53 +application.version = "1.2.2"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.2.1" 53 +application.version = "1.2.2"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"