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

@@ -23,16 +23,17 @@ class Yohobuy
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
-//    const API_URL = 'http://apih5.yoho.cn/';
+   // const API_URL = 'http://apih5.yoho.cn/';
 //    const API_URL2 = 'http://apih5.yoho.cn/';
 //    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     /* 测试环境 */
-    const API_URL = 'http://testapi.yoho.cn:28078/';
+     const API_URL = 'http://testapi.yoho.cn:28078/';
     const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
+
     /**
      * 私钥列表
      *

@@ -583,8 +583,11 @@ class Helpers
             $oneGoods['isVipPrice'] = $value['sales_price'] !== $value['last_vip_price'];
             $oneGoods['count'] = $value['buy_number'];
 
-            if ($isValid) { // 库存不足
+            if ($isValid) {
+                // 库存不足
                 $oneGoods['lowStocks'] = ($value['buy_number'] > $value['storage_number']);
+            } else { // 失效商品
+                $oneGoods['inValid'] = true;
             }
 
             //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;

@@ -286,10 +286,11 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
     }
 
     if (num === 1 || 0 === leftNum - 0) {
+        tip.show('您选择的数量不能为零~');
         return;
     }
-    if (num < 1) {
-        $num.val(1);
+    if (num < 0) {
+        tip.show('您选择的数量不能为零~');
         return;
     }
 
@@ -310,7 +311,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
 
     //TODO:库存数验证
     if (num > leftNum - 1) {
-        $num.val(leftNum);
+        tip.show('您选择的数量超过了最大库存量~');
         return;
     }
     $num.val(num + 1);
@@ -327,10 +328,6 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
     if (!checkColorSizeNum()) {
         return;
     }
-    if (isNaN(num)) {
-        tip.show('您选择的数量不是一个数字~');
-        return;
-    }
 
     //TODO status change
     if ($('#chose-btn-sure').html() === '已售罄') {

@@ -6,6 +6,7 @@
 
 var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload'),
+    Hammer = require('yoho.hammer'),
     tip = require('../plugin/tip'),
     loading = require('../plugin/loading'),
     chosePanel = require('./chose-panel');
@@ -35,10 +36,22 @@ function getProductInfo(skn, promotionId) {
     });
 }
 
-$page.on('touchend', '.chose', function() {
-    var $this = $(this),
-        id = $this.closest('.gift-advance-good').data('id'),
-        promotionId = $this.closest('.advance-block').data('promotion-id');
+$page.find('.chose').each(function(i, elem) {
+    var choseHammer = new Hammer(elem);
 
-    getProductInfo(id, promotionId);
+    choseHammer.on('tap', function(e) {
+        var $this = $(e.target),
+            id = $this.closest('.gift-advance-good').data('id'),
+            promotionId = $this.closest('.advance-block').data('promotion-id');
+
+        getProductInfo(id, promotionId);
+    });
 });
+
+// $page.on('touchend', '.chose', function() {
+//     var $this = $(this),
+//         id = $this.closest('.gift-advance-good').data('id'),
+//         promotionId = $this.closest('.advance-block').data('promotion-id');
+//
+//     getProductInfo(id, promotionId);
+// });

@@ -9,7 +9,6 @@
         margin-top: -14rem / $pxConvertRem;
         margin-left: 20rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
-        color: #f0f0f0;
 
         &.icon-cb-checked {
             color: #000;
@@ -54,6 +53,10 @@
         padding-right: 20rem / $pxConvertRem;
     }
 
+    .fixed-height {
+        height: 2.7rem;
+    }
+
     .thumb {
         float: left;
         width: 180rem / $pxConvertRem;
@@ -65,54 +68,49 @@
     .deps {
         position: relative;
         width: 380rem / $pxConvertRem;
-        height: 5.3rem;
         margin-left: 4.7rem;
         border-bottom: 1px solid #e0e0e0;
-        padding-top: 0.5rem;
+        padding: 0.5rem 0;
     }
 
     .name {
-        font-size: 18px;
-        color: #5a5a5a;
-        width: 80%;
         display: inline-block;
+        width: 80%;
+        color: #5a5a5a;
+        font-size: 0.6rem;
     }
 
-    .color-size-row {
-        margin: 0.2rem 0;
-
-        > span {
-            margin-right: 15rem / $pxConvertRem;
-        }
+    .color-size-row > span {
+        margin-right: 15rem / $pxConvertRem;
     }
 
     .color, .size {
-        font-size: 16px;
+        font-size: 0.6rem;
         color: #b6b6b6;
     }
 
     .appear-date {
+        float: left;
         color: $cartRed;
         display: block;
-        margin-top: 4rem / $pxConvertRem;
+        font-size: 0.5rem;
     }
 
     .price {
-        font-size: 16px;
+        font-size: 0.6rem;
         color: $cartRed;
     }
 
     .count {
         font-size: 32rem / $pxConvertRem;
         color: #999;
-        //margin-left: 22rem / $pxConvertRem;
         display: inline-block;
         width: 19%;
         position: absolute;
         text-align: center;
     }
 
-    .sold-out, .low-stocks {
+    .low-stocks {
         display: inline-block;
         width: 100rem / $pxConvertRem;
         height: 30rem / $pxConvertRem;
@@ -122,20 +120,31 @@
         color: #fff;
         text-align: center;
         float: right;
-        margin-top: 20rem / $pxConvertRem;
         margin-right: 16rem / $pxConvertRem;
-        border-radius: 20rem / $pxConvertRem;
         padding: 4rem / $pxConvertRem;
-    }
 
-    .sold-out {
-        background: #999;
+        border-radius: 20rem / $pxConvertRem;
     }
 
     .low-stocks {
         background: #7f7f7f;
     }
 
+    .vip {
+        display: inline-block;
+        color: #fff;
+        background: #d1021c;
+        border: 1px solid #9d0000;
+        @include border-radius(0.5rem);
+        padding: 4rem / $pxConvertRem 0.5rem;
+        margin-left: 0.2rem;
+    }
+
+    .la-tag {
+        margin-top: 0.3rem;
+        min-height: 1rem;
+    }
+
     .icon-del,
     .icon-edit {
         position: absolute;

@@ -7,6 +7,11 @@
 .shopping-cart-page {
     padding-bottom: 120rem / $pxConvertRem;
     overflow-x: hidden;
+    background: #f0f0f0;
+
+    .cart-content > * {
+        background: #fff;
+    }
 
     .cart-nav {
         color: #c6c6c6;
@@ -111,23 +116,29 @@
 
     .cart-goods {
         border-bottom: 1px solid #e0e0e0;
+        margin-bottom: 0.75rem;
 
         .shopping-cart-good:last-child .info {
             border-bottom: none;
         }
     }
 
+    .invalid-goods {
+        border-top: 1px solid #e0e0e0;
+        border-bottom: 1px solid #e0e0e0;
+        margin: 0.75rem 0;
+    }
+
     .freebie-and-advance-buy {
         padding: 20rem / $pxConvertRem;
         font-size: 24rem / $pxConvertRem;
-        //border-bottom: 1px solid #e0e0e0;
+        border-top: 1px solid #e0e0e0;
 
         > li {
             box-sizing: border-box;
             height: 90rem / $pxConvertRem;
             line-height: 90rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
-            background: #f8f8f8;
             padding: 0 20rem / $pxConvertRem;
 
             &:last-child {

@@ -2,13 +2,16 @@
     {{# goods}}
         {{> cart/good}}
     {{/ goods}}
-
-    {{# notValidGoods}}
-       {{> cart/good}}
-    {{/ notValidGoods}}
-
 </div>
 
+{{#if notValidGoods}}
+    <div class="invalid-goods">
+        {{# notValidGoods}}
+           {{> cart/good}}
+        {{/ notValidGoods}}
+    </div>
+{{/if}}
+
 {{#if freebieOrAdvanceBuy}}
     <ul class="freebie-and-advance-buy">
         {{# freebie}}

@@ -52,7 +52,7 @@
                         <a class="btn btn-minus" href="javascript:void(0);">
                             <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe625;</span>
                         </a>
-                        <input id="good-num" class="good-num {{#if promotionId}}disabled{{/if}}" type="text" value="1" {{#if promotionId}}disabled="true"{{/if}}>
+                        <input id="good-num" class="good-num disabled" type="text" value="1" disabled="true">
                         <a class="btn btn-plus" href="javascript:void(0);">
                             <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe624;</span>
                         </a>

@@ -10,9 +10,6 @@
             {{#if price}}
             <span class="price market-price">&yen;{{marketPrice}}</span>
             {{/if}}
-            <span class="count">
-                ×{{count}}
-            </span>
         </p>
         <button class="chose">选择</button>
     </div>

@@ -19,51 +19,51 @@
         {{/if}}
 
         <div class="deps show">
-            <a href="{{link}}" class="name row">{{name}}</a>
-            <span class="count">
-                ×{{count}}
-            </span>
-            <p class="row color-size-row">
-                {{#if color}}
-                    <span class="color">
-                        颜色:{{color}}
-                    </span>
-                {{/if}}
+            <div class="fixed-height">
+                <a href="{{link}}" class="name row">{{name}}</a>
+                <span class="count">
+                    ×{{count}}
+                </span>
+                <p class="row color-size-row">
+                    {{#if color}}
+                        <span class="color">
+                            颜色:{{color}}
+                        </span>
+                    {{/if}}
 
-                {{#if size}}
-                    <span class="size">
-                        尺码:{{size}}
-                    </span>
-                {{/if}}
+                    {{#if size}}
+                        <span class="size">
+                            尺码:{{size}}
+                        </span>
+                    {{/if}}
 
-            </p>
+                </p>
+            </div>
             <p class="row">
                 <span class="price">
                     ¥{{price}}
                 </span>
 
-                {{#if soldOut}}
-                    <span class="sold-out">
-                        已售罄
+                {{#if vip}}
+                    <span class="vip">
+                        VIP
                     </span>
                 {{/if}}
 
                 <span class="iconfont icon-del" data-count="{{count}}">&#xe621;</span>
             </p>
-            {{#if lowStocks}}
-                <p class="row">
+            <p class="la-tag row clearfix">
+                {{#if lowStocks}}
                     <span class="low-stocks">
                         库存不足
                     </span>
-                </p>
-            {{/if}}
-            {{#if appearDate}}
-                <p class="row">
+                {{/if}}
+                {{#if appearDate}}
                     <span class="appear-date">
                         上市期:{{appearDate}}
                     </span>
-                </p>
-            {{/if}}
+                {{/if}}
+            </p>
         </div>
     </div>
 </div>