Merge branch 'develop'

@@ -105,13 +105,6 @@ if ($('.cart-nav').length > 0) {
             return;
         }
 
-        if (switchChose === false) {
-            $cartContentShow.find('.shopping-cart-good .name').each(function() {
-                this.mlellipsis(2);
-            });
-            switchChose = true;
-        }
-
         if (cartType === 'ordinary') {
             cartType = 'advance';
             $('#cartType').val('advance');
@@ -128,6 +121,13 @@ if ($('.cart-nav').length > 0) {
 
         $cartContentShow = $cartContent.not('.hide');
 
+        if (switchChose === false) {
+            $cartContentShow.find('.shopping-cart-good .name').each(function() {
+                this.mlellipsis(2);
+            });
+            switchChose = true;
+        }
+
         //trigger lazyload
         $(window).trigger('scroll');
     });

@@ -166,7 +166,7 @@ function didUpdateAllGoodsCheckStatus() {
             $(checkedBox).removeClass('icon-cb-checked').addClass('icon-checkbox');
         });
     }
-    window.history.go(0);
+    window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
 }
 
 function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {

@@ -3,7 +3,6 @@
  * @author: chenglong<chenglong.wang@yoho.cn>
  * @date: 2015/11/12
  */
-
 var $ = require('jquery'),
     Hammer = require('yoho.hammer'),
     Swiper = require('yoho.iswiper');

@@ -4,9 +4,11 @@
     padding-left: 16rem / $pxConvertRem;
 
     .prevent-img-click {
+       position: absolute;
        width: 20rem / $pxConvertRem;
        height: 200rem / $pxConvertRem;
-       position: absolute;
+       top: 0.4rem;
+       left: 0;
        background-color: transparent;
        z-index: 99;
     }
@@ -59,6 +61,7 @@
     }
 
     .info {
+        position: relative;
         float: left;
         margin-left: 60rem / $pxConvertRem;
         padding: 16rem / $pxConvertRem 0;

@@ -119,7 +119,7 @@
         }
 
         .coupon-use {
-            box-sizing: border-box;
+            @include box-sizing(border-box);
             position: relative;
             float: right;
             padding-right: 30rem / $pxConvertRem;
@@ -137,7 +137,7 @@
                 color: #999;
             }
         }
-        
+
         .checkbox {
             display: inline-block;
             width: 80rem / $pxConvertRem;

@@ -78,6 +78,7 @@
     }
 
     .not-avaliable {
-        -webkit-filter: grayscale(100%);
+        // -webkit-filter: grayscale(100%);
+        @include filter(grayscale(100%));
     }
 }

@@ -9,6 +9,10 @@ $basicBtnC:#eb0313;
     overflow: hidden;
     background-color: #f0f0f0;
 
+    .yoho-tip {
+        z-index: 4;
+    }
+
     .page-block {
         background-color: #fff;
         box-sizing: border-box;

@@ -15,9 +15,7 @@
     {{# navBtn}}
     <!-- <span class="nav-btn">{{.}}</span> -->
     <!-- <i class="iconfont nav-home">&#xe638;</i> -->
-    {{/ navBtn}}
-</header>
-    <div class="homebuttom none">
+    <!--     <div class="homebuttom none">
         <ul>
             <li>
                 <i class="iconfont">&#xe62a;</i>
@@ -36,5 +34,8 @@
                 <span>我的</span>
             </li>
         </ul>
-    </div>
+    </div> -->
+    {{/ navBtn}}
+</header>
+
 {{/pageHeader}}

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.2.1"
+application.version = "1.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.2.1"
+application.version = "1.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.2.1"
+application.version = "1.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.2.1"
+application.version = "1.2.2"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"