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

hf
Commit d39eb4ce385e642d81cc37d046272a38c22acc2a 2 parents 59d1fb46 673938aa
Showing 35 changed files with 401 additions and 518 deletions
docs/data-structure.md
library/LibModels/Wap/Product/DetailData.php
library/Plugin/Helpers.php
library/Plugin/Partner/sinaweibo/class/Saev2.class.php
static/font/iconfont.eot
static/font/iconfont.svg
static/font/iconfont.ttf
static/font/iconfont.woff
static/js/cart/cart-info.js
static/js/cart/cart.js
static/js/cart/chose-panel.js
static/js/cart/gift-advance.js
static/js/cart/good.js
static/js/cart/order-ensure.js
static/js/cart/order-info.js
static/js/cart/select-address.js
static/js/cart/select-coupon.js
static/js/passport/bind/bind.js
static/js/product/detail/comments-consults.js
static/sass/cart/_chose-panel.scss
--- a/docs/data-structure.md
View file @d39eb4c
+++ b/docs/data-structure.md
View file @d39eb4c
@@ -846,7 +846,16 @@
     {
         id: 1,
+        inValid: true, //是否是失效商品,
+
+        showCheckbox: true, //是否显示checkbox【赠品和加价购不显示】
+        checked: true, //是否选中
+
         thumb: '',
+
+        isAdvanceBuy: true, //是否是加价购商品
+        isGift: ture, //是否是赠品
+
         name: '',
         color: '黄色',
         size: 'L',
--- a/library/LibModels/Wap/Product/DetailData.php
View file @d39eb4c
+++ b/library/LibModels/Wap/Product/DetailData.php
View file @d39eb4c
@@ -27,6 +27,7 @@ class DetailData
      * 
      * @param int $productId 商品ID
      * @param int $uid 用户ID
+     * @param int $productSkn SKN
      * @return array
      */
     public static function baseInfo($productId, $uid, $productSkn = null)
--- a/library/Plugin/Helpers.php
View file @d39eb4c
+++ b/library/Plugin/Helpers.php
View file @d39eb4c
@@ -576,30 +576,31 @@ class Helpers
             $oneGoods['thumb'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 90, 100) : '';
             $oneGoods['color'] = $value['color_name'];
             $oneGoods['size'] = $value['size_name'];
-            $oneGoods['isSelected'] = $value['selected'] === 'Y';
+            $oneGoods['checked'] = $value['selected'] === 'Y';
             $oneGoods['price'] = self::transPrice($value['sales_price']);
             $oneGoods['count'] = $value['buy_number'];
-            if ($isValid) {
+            if ($isValid) { // 库存不足
                 $oneGoods['lowStocks'] = ($value['buy_number'] > $value['storage_number']);
             }
             //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;
             if (!isset($value['goods_type'])) {
-                $oneGoods['isSoldOut'] = true;
+                $oneGoods['inValid'] = true;
             } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
                 $oneGoods['isGift'] = true;
             } elseif ($value['goods_type'] == 'price_gift') {
                 $oneGoods['isAdvanceBuy'] = true;
+            } else {
+                $oneGoods['showCheckbox'] = true;
             }
+
             // 上市期
             if ($isAdvanceCart && !empty($value['expect_arrival_time'])) {
                 $oneGoods['appearDate'] = $value['expect_arrival_time'];
             }
             // 商品链接
-            if (isset($value['cn_alphabet'])) {
-                $oneGoods['url'] = self::url('/product/pro_' . $value['product_id'] . '_' . $value['goods_id'] . '/' . $value['cn_alphabet'] . '.html');
-            }
+            $oneGoods['link'] = self::url('/product/show_' . $value['product_skn'] . '.html');
             $arr[$key] = $oneGoods;
         }
@@ -629,7 +630,7 @@ class Helpers
                 $oneGoods['id'] = $single['product_skn'];
                 $oneGoods['name'] = $single['product_name'];
                 $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : '';
-                $oneGoods['price'] = self::transPrice($single['last_price']);
+                $oneGoods['price'] = self::transPrice($single['sales_price']);
                 $oneGoods['marketPrice'] = self::transPrice($single['market_price']);
                 $oneGoods['count'] = $single['storage_number'];
--- a/library/Plugin/Partner/sinaweibo/class/Saev2.class.php
View file @d39eb4c
+++ b/library/Plugin/Partner/sinaweibo/class/Saev2.class.php
View file @d39eb4c
@@ -8,7 +8,7 @@
 /**
  * @ignore
  */
-class OAuthException extends Exception {
+class OAuthException extends \Exception {
 	// pass
 }
--- a/static/font/iconfont.eot
View file @d39eb4c
+++ b/static/font/iconfont.eot
View file @d39eb4c
--- a/static/font/iconfont.svg
View file @d39eb4c
+++ b/static/font/iconfont.svg
View file @d39eb4c
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Sat Dec  5 16:26:44 2015
+Created by FontForge 20120731 at Thu Dec 17 13:53:30 2015
  By Ads
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Sat Dec  5 16:26:44 2015
     bbox="-0.75 -224 3943 833"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E63F"
+    unicode-range="U+0078-E640"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -257,5 +257,11 @@ d="M512 -66q-10 0 -24.5 -0.5t-25 -1t-24 0t-24.5 1.5l-222 -146q0 227 5 243q-164 1
 q-91 0 -176.5 -31.5t-148.5 -83.5t-100.5 -124.5t-37.5 -150.5q0 -95 53 -179t142 -138v-170l146 97q16 -3 35.5 -4t49 0t37.5 1q41 0 81 6.5t77 18.5t72 29.5t65 39.5t56.5 47.5t47 55t35 61t22 66t7.5 69.5q0 104 -63.5 194.5t-170.5 143t-229 52.5zM768 300
 q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM512 300q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5zM256 300q-27 0 -45.5 18.5t-18.5 45.5t18.5 45.5t45.5 18.5
 t45.5 -18.5t18.5 -45.5t-18.5 -45.5t-45.5 -18.5z" />
+    <glyph glyph-name="uniE640" unicode="&#xe640;" 
+d="M957 510q-5 8 -14 13.5t-24 5.5h-598l-29 62l-4 7q-1 3 -4 7t-8 8q-4 3 -7 6l-2 1l-8 4h-2q-5 2 -9 2l-4 1h-5h-118q-23 0 -40 -16.5t-17 -40.5q0 -6 1.5 -12.5t4.5 -12.5t7 -10.5t8.5 -8.5t10.5 -7t12.5 -4.5t12.5 -1.5h81l33 -71q3 -10 8 -21t8 -17l3 -5l81 -181
+q0 -2 2 -5l15 -32q9 -30 39 -38v-3h392l18 1v2q14 4 24.5 14t14.5 24l98 217q40 77 19 112zM909 413l-93 -207l-3 1l-4 -15q-5 -19 -25 -19l-19 1v-1h-340h-18q-8 0 -15 5t-9 14l-4 15l-3 -1l-93 208q-1 1 -3.5 5.5t-7 14.5t-7.5 20l-42 92h-102q-10 0 -17 7t-7 17
+q0 7 3 12.5t9 9t12 3.5h119l3 -1h2q1 0 2 -1l4 -2q2 -1 4 -3q1 -1 2 -1.5t1 -1.5l4 -6l38 -83h619q8 0 10 -3q3 -6 1 -19t-7.5 -29.5t-13.5 -31.5zM470 107q-33 0 -56.5 -23t-23.5 -56q0 -22 10.5 -40.5t29 -29t40.5 -10.5q33 0 56.5 23.5t23.5 56.5t-23.5 56t-56.5 23z
+M470 -23q-21 0 -36 15t-15 36t15 36t36 15q14 0 25.5 -7t18.5 -19t7 -25q0 -22 -15 -36.5t-36 -14.5zM747 107q-33 0 -56.5 -23t-23.5 -56q0 -22 10.5 -40.5t29 -29t40.5 -10.5q33 0 56.5 23.5t23.5 56.5t-23.5 56t-56.5 23zM747 -23q-14 0 -26 6.5t-18.5 18.5t-6.5 25.5
+t6.5 25.5t18.5 19t26 7q21 0 36 -15t15 -36t-15 -36t-36 -15z" />
   </font>
 </defs></svg>
--- a/static/font/iconfont.ttf
View file @d39eb4c
+++ b/static/font/iconfont.ttf
View file @d39eb4c
--- a/static/font/iconfont.woff
View file @d39eb4c
+++ b/static/font/iconfont.woff
View file @d39eb4c
--- a/static/js/cart/cart-info.js deleted 100644 → 0
View file @59d1fb4
+++ b/static/js/cart/cart-info.js deleted 100644 → 0
View file @59d1fb4
-/**
- * 购物车信息读取
- * @author: liangzhifeng<zhifeng.liang@yoho.cn>
- * @date: 2015/12/15
- */
-var info = window.cookie('cart-info');
-
-// info 必须是 JSON 字符串
-try {
-    info = JSON.parse(info);
-} catch (e) {
-    info = {
-        deliveryId: null,
-        deliveryTimeId: null,
-        paymentTypeId: null,
-        yohoCoin: null,
-        addressId: null,
-        couponCode: null,
-        couponValue: null,
-        invoice: null,
-        invoiceText: null,
-        invoiceType: null,
-        msg: null
-    };
-    window.setCookie('cart-info', JSON.stringify(info));
-}
-
-exports.cartInfo = function(key, value) {
-    if (value === undefined) {
-        return info[key];
-    }
-    info[key] = value;
-    window.setCookie('cart-info', JSON.stringify(info));
-};
--- a/static/js/cart/cart.js
View file @d39eb4c
+++ b/static/js/cart/cart.js
View file @d39eb4c
@@ -50,8 +50,16 @@ if ($('.cart-nav').length > 0) {
         //trigger lazyload
         $(window).trigger('scroll');
     });
+
+    setTimeout(function() {
+        $('#presell-tip').addClass('hide');
+    }, 3000);
 }
+$('.advance-buy').on('touchend', function() {
+    window.location.href = '/cart/index/advanceBuy?cartType=' + cartType;
+});
+
 $('.btn-balance').on('touchend', function() {
     if (hasChecked) {
         window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
--- a/static/js/cart/chose-panel.js
View file @d39eb4c
+++ b/static/js/cart/chose-panel.js
View file @d39eb4c
@@ -10,53 +10,41 @@
 // 异步渲染的模板统一插入 #chose-panel ,兼容页面多个选择框
 var $ = require('jquery'),
-    Handlebars = require('yoho.handlebars'),
     tip = require('../plugin/tip'),
     loading = require('../plugin/loading');
-var panelTmpl,
-    $chosePanel = $('#chose-panel'),
+var $chosePanel = $('#chose-panel'),
     $num,
     $chosed,
-
-    // re = /\d+/,
+    $imgsThumb,
+    $leftNum,
     leftNum,
     confirming,
-    hasChooseColor = false,
-    hasChooseSize = false,
     curColorIndex,
     curSizeIndex,
     $curSizeRow,
-    $curSizeBlock = null,
-    $sizeRowList = $('.size-list ul');
-
-// 读取模板
-$.get('/cart/index/giftinfoTpl', function(html) {
-    if (!html) {
-        tip.show('网络错误');
-        return;
-    }
-    panelTmpl = Handlebars.compile(html);
-}).fail(function() {
-    tip.show('网络错误');
-});
+    hasChooseColor,
+    hasChooseSize,
+    $curSizeBlock,
+    $sizeRowList,
+    cbFn,
+    $allChoseItems,
+    queryString,
+    $yohoPage = $('.yoho-page');
 //初始化购物车面板显示
 function init() {
-
-    //$colorList = $('.chose-panel .color-list ul>li');
-    //$sizeList = $('.chose-panel .size-list ul>li');
-    //firstColorId = $colorList.eq(0).data('id');
-    //$sizeList.each(function() {
-    //    colorIndex = $(this).data('colorid');
-    //
-    //    if (colorIndex === firstColorId) {
-    //        $(this).removeClass('hide');
-    //    }
-    //});
-
-    var $firstRow = $sizeRowList.eq(0);
-
+    var $firstRow;
+
+    hasChooseColor = false;
+    hasChooseSize = false;
+    $curSizeBlock = null;
+    queryString = $.queryString();
+    $imgsThumb = $('.chose-panel').find('.thumb');
+    $allChoseItems = $('.chose-items');
+    $sizeRowList = $('.size-list ul');
+    $leftNum = $('#left-num');
+    $firstRow = $sizeRowList.eq(0);
     $firstRow.toggleClass('hide');
     $curSizeRow = $firstRow;
 }
@@ -75,34 +63,63 @@ function checkColorSizeNum() {
     return true;
 }
-init();
-
-function show(data) {
-    if (data) {
-        $chosePanel.html(panelTmpl(data));
+function show(html, cb) {
+    if (html) {
+        $chosePanel.html(html);
         init();
     }
     $('.chose-panel').show();
-
-    $('body').css('overflow', 'hidden');
     $num = $('#good-num');
+    cbFn = cb;
 }
-////显示当前Panel
-//function show() {
-//    $('.chose-panel').show();
-//
-//    $('body').css('overflow', 'hidden');
-//    $num = $('#good-num');
-//}
-
 //隐藏当前Panel
 function hide() {
     $('.chose-panel').hide();
-    $('body').css('overflow', 'auto');
 }
-$('.yoho-page').on('touchstart', '.chose-panel', function(e) {
+//修改加入购物车的文字和背景
+function updateConformButtonClassAndText() {
+    $chosed = $allChoseItems.find('.chosed');
+    if (2 === $chosed.closest('.zero-stock').length) {
+        $('#chose-btn-sure').css('background-color', '#c0c0c0').html('已售罄');
+    } else {
+        $('#chose-btn-sure').css('background-color', '#eb0313').html('确定');
+    }
+}
+
+//重置颜色块的库存为0的样式
+function resetColorZeroStock($siblingBlock) {
+    var numArray = ($curSizeBlock.data('numstr') + '').split('/'),
+        i;
+
+    if (!hasChooseSize) {
+        $siblingBlock.find('ul>li').each(function() {
+            $(this).removeClass('zero-stock');
+            if ('0' === $(this).data('num')) {
+                $(this).addClass('zero-stock');
+            }
+        });
+
+    } else {
+        for (i = 0; i < numArray.length; i++) {
+            if ('0' === numArray[i]) {
+                $siblingBlock.find('.block').eq(i).addClass('zero-stock');
+            }
+        }
+    }
+}
+
+// 选择了颜色切换商品图片
+function changeGoodImgWhenClickColor() {
+    if (hasChooseColor && curColorIndex) {
+        $imgsThumb.addClass('hide').eq(curColorIndex).removeClass('hide');
+    }
+}
+
+init();
+
+$yohoPage.on('touchstart', '.chose-panel', function(e) {
     var $cur = $(e.target);
     if ($cur.closest('.main').length > 0) {
@@ -113,12 +130,11 @@ $('.yoho-page').on('touchstart', '.chose-panel', function(e) {
     hide();
 });
-$('.color-list').on('touchstart', '.block', function(e) {
+$yohoPage.on('touchstart', '.color-list .block', function(e) {
     var $this = $(this),
-        $that = $(e.target).closest('.chose-items'),
         index,
-        curSelectedSizeBlock,
-        $sizeChosed,
+        curSizeBlock,
+        $preSiblingBlock,
         scindex,
         curGoodNum;
@@ -127,50 +143,44 @@ $('.color-list').on('touchstart', '.block', function(e) {
     $this.siblings('.chosed').removeClass('chosed');
     index = $this.index();
-    $sizeChosed = $siblingBlock.find('.chosed');
-    scindex = $sizeChosed.index();
+    $preSiblingBlock = $siblingBlock.find('.chosed');
+    scindex = $preSiblingBlock.index();
     $curSizeRow = $sizeRowList.eq(index);
     // 当前颜色已经是选中状态,再点击时
     if ($this.hasClass('chosed')) {
         //颜色原来已经是勾选时，要清空剩余件数的提示
-        $that.find('.num .left-num').html('');
-        $('#left-num').val(0);
+        $allChoseItems.find('.num .left-num').html('');
+        $leftNum.val(0);
         hasChooseColor = false;
         // 当前颜色不是选中状态,选中时
     } else {
         hasChooseColor = true;
-        //根据颜色切换图片
-        if ($this.closest('.block-list').hasClass('color-list')) {
-            $('.chose-panel').find('.thumb').addClass('hide').eq(index).removeClass('hide');
-        }
-
         //把当前选中颜色对应的尺码那一行显示出来
         $sizeRowList.addClass('hide');
         $curSizeRow.removeClass('hide').addClass('show');
         // 之前选中的尺码去掉勾选样式
-        if ($sizeChosed.length > 0) {
-            $sizeChosed.removeClass('chosed');
-            curSelectedSizeBlock = $curSizeRow.children().get(scindex);
+        if ($preSiblingBlock.length > 0) {
+            $preSiblingBlock.removeClass('chosed');
+            curSizeBlock = $curSizeRow.children().get(scindex);
         }
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
-        if (curSelectedSizeBlock) {
-            curGoodNum = $(curSelectedSizeBlock).data('num');
-            $(curSelectedSizeBlock).addClass('chosed');
+        if (curSizeBlock) {
+            curGoodNum = $(curSizeBlock).data('num');
+            $(curSizeBlock).addClass('chosed');
             //如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式
             if (curGoodNum > 0) {
-                $that.find('.num .left-num').html('剩余' + curGoodNum + '件');
-                $('#left-num').val(curGoodNum);
+                $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件');
+                $leftNum.val(curGoodNum);
             } else {
-                $(curSelectedSizeBlock).removeClass('zero-stock').addClass('zero-stock');
-                $that.find('.num .left-num').html('');
-                $('#left-num').val(0);
+                $allChoseItems.find('.num .left-num').html('');
+                $leftNum.val(0);
             }
         }
     }
@@ -180,106 +190,31 @@ $('.color-list').on('touchstart', '.block', function(e) {
     curColorIndex = index;
     // 设置按钮的样式和文字
-    $chosed = $('.chose-items').find('.chosed');
-    if (2 === $chosed.closest('.zero-stock').length) {
-        $('#chose-btn-sure').css('background-color', '#c0c0c0');
-        $('#chose-btn-sure').html('已售罄');
-    } else {
-        $('#chose-btn-sure').css('background-color', '#eb0313');
-        $('#chose-btn-sure').html('确定');
-    }
-
-    /**if ($chosed.length === 0) {
-        $this.closest('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
-            if ('0' === $(this).data('num')) {
-                $(this).addClass('zero-stock');
-            }
-        });
-
-        $siblingBlock.find('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
-            if ('0' === $(this).data('num')) {
-                $(this).addClass('zero-stock');
-            }
-        });
-    } else if ($chosed.length === 1 && $this.hasClass('chosed')) {
-        $sizeList.addClass('hide');
-
-        //切换尺码信息
-        $sizeList.each(function() {
-            colorIndex = $(this).data('colorid');
-            if (colorIndex === $this.data('id')) {
-                $(this).removeClass('hide');
-            }
-        });
-
-        numArray = ($chosed.data('numstr') + '').split('/');
-        $siblingBlock.find('.block').removeClass('zero-stock');
-        for (i = 0; i < numArray.length; i++) {
-            if ('0' === numArray[i]) {
-                $siblingBlock.find('.block').eq(i).addClass('zero-stock');
-            }
-        }
-    } else if ($chosed.length === 1 && !$this.hasClass('chosed')) {
-        $('#chose-btn-sure').css('background-color', '#eb0313');
-        $('#chose-btn-sure').html('确定');
-
-        $siblingBlock.find('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
-            if ('0' === $(this).data('num')) {
-                $(this).addClass('zero-stock');
-            }
-        });
-        $that.find('.num .left-num').html('');
-    } else if ($chosed.length === 2) {
-        $siblingBlock.find('.block').removeClass('zero-stock');
-        for (i = 0; i < currentNumArray.length; i++) {
-            if ('0' === currentNumArray[i]) {
-                $siblingBlock.find('.block').eq(i).addClass('zero-stock');
-            }
-        }
-        numArray = ($siblingBlock.find('.chosed').data('numstr') + '').split('/');
-        $that.find('.num .left-num').html('剩余' + numArray[index] + '件');
-        if (2 === $chosed.closest('.zero-stock').length) {
-            $('#chose-btn-sure').css('background-color', '#c0c0c0');
-            $('#chose-btn-sure').html('已售罄');
-        } else {
-            $('#chose-btn-sure').css('background-color', '#eb0313');
-            $('#chose-btn-sure').html('确定');
-        }
-    }**/
+    updateConformButtonClassAndText();
+    // 修改颜色时修改商品图片
+    changeGoodImgWhenClickColor();
 });
-$('.size-list').on('touchstart', '.block', function(e) {
+$yohoPage.on('touchstart', '.size-list .block', function(e) {
     var $this = $(this),
-        $that = $(e.target).closest('.chose-items'),
         index,
-        $colorChosed,
         curGoodNum;
     var $siblingBlock = $this.closest('.block-list').siblings(':first');
     $this.siblings('.chosed').removeClass('chosed');
     index = $this.index();
-
-    $colorChosed = $siblingBlock.find('.chosed');
     $curSizeRow = $sizeRowList.eq(index);
     // 当前尺码已经是选中状态,再点击时
     if ($this.hasClass('chosed')) {
         //尺码原来已经是勾选时，要清空剩余件数的提示
-        $that.find('.num .left-num').html('');
+        $allChoseItems.find('.num .left-num').html('');
         $('#left-num').val(0);
         hasChooseSize = false;
-        // 去掉已经选中颜色的 数量为0的样式
-        if ($colorChosed.length > 0) {
-            $colorChosed.removeClass('zero-stock').addClass('zero-stock');
-        }
-
         // 当前尺码不是选中状态,选中时
     } else {
         hasChooseSize = true;
@@ -291,15 +226,15 @@ $('.size-list').on('touchstart', '.block', function(e) {
             $curSizeBlock.removeClass('chosed');
         }
-        // 如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式, 否则显示剩余件数
+        // 如果当前有尺码被选中，且数量等于0, 否则显示剩余件数
         if (curGoodNum > 0 && hasChooseColor) {
-            $that.find('.num .left-num').html('剩余' + curGoodNum + '件');
+            $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件');
             $('#left-num').val(curGoodNum);
         } else {
-            $colorChosed.removeClass('zero-stock').addClass('zero-stock');
-            $that.find('.num .left-num').html('');
+            $allChoseItems.find('.num .left-num').html('');
             $('#left-num').val(0);
         }
+
     }
     $this.toggleClass('chosed');
@@ -307,83 +242,15 @@ $('.size-list').on('touchstart', '.block', function(e) {
     $curSizeBlock = $this;
     // 设置按钮的样式和文字
-    $chosed = $('.chose-items').find('.chosed');
-    if (2 === $chosed.closest('.zero-stock').length) {
-        $('#chose-btn-sure').css('background-color', '#c0c0c0');
-        $('#chose-btn-sure').html('已售罄');
-    } else {
-        $('#chose-btn-sure').css('background-color', '#eb0313');
-        $('#chose-btn-sure').html('确定');
-    }
+    updateConformButtonClassAndText();
-    /**if ($chosed.length === 0) {
-        $this.closest('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
-            if ('0' === $(this).data('num')) {
-                $(this).addClass('zero-stock');
-            }
-        });
-
-        $siblingBlock.find('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
-            if ('0' === $(this).data('num')) {
-                $(this).addClass('zero-stock');
-            }
-        });
-    } else if ($chosed.length === 1 && $this.hasClass('chosed')) {
-        if ($this.closest('.block-list').hasClass('color-list')) {
-
-            $sizeList.addClass('hide');
-
-            //切换尺码信息
-            $sizeList.each(function() {
-                colorIndex = $(this).data('colorid');
-                if (colorIndex === $this.data('id')) {
-                    $(this).removeClass('hide');
-                }
-            });
-        }
-
-        numArray = ($chosed.data('numstr') + '').split('/');
-        $siblingBlock.find('.block').removeClass('zero-stock');
-        for (i = 0; i < numArray.length; i++) {
-            if ('0' === numArray[i]) {
-                $siblingBlock.find('.block').eq(i).addClass('zero-stock');
-            }
-        }
-    } else if ($chosed.length === 1 && !$this.hasClass('chosed')) {
-        $('#chose-btn-sure').css('background-color', '#eb0313');
-        $('#chose-btn-sure').html('确定');
-
-        $siblingBlock.find('ul>li').each(function() {
-            $(this).removeClass('zero-stock');
-            if ('0' === $(this).data('num')) {
-                $(this).addClass('zero-stock');
-            }
-        });
-        $that.find('.num .left-num').html('');
-    } else if ($chosed.length === 2) {
-        $siblingBlock.find('.block').removeClass('zero-stock');
-        for (i = 0; i < currentNumArray.length; i++) {
-            if ('0' === currentNumArray[i]) {
-                $siblingBlock.find('.block').eq(i).addClass('zero-stock');
-            }
-        }
-        numArray = ($siblingBlock.find('.chosed').data('numstr') + '').split('/');
-        $that.find('.num .left-num').html('剩余' + numArray[index] + '件');
-        if (2 === $chosed.closest('.zero-stock').length) {
-            $('#chose-btn-sure').css('background-color', '#c0c0c0');
-            $('#chose-btn-sure').html('已售罄');
-        } else {
-            $('#chose-btn-sure').css('background-color', '#eb0313');
-            $('#chose-btn-sure').html('确定');
-        }
-    }**/
+    // 重置颜色块的样式
+    resetColorZeroStock($siblingBlock);
 });
-$('.btn-minus').on('touchstart', function() {
-    var num = $num.val();
+$yohoPage.on('touchstart', '.btn-minus', function() {
+    var num = parseInt($num.val(), 10);
     leftNum = $('#left-num').val();
@@ -396,10 +263,8 @@ $('.btn-minus').on('touchstart', function() {
     }
     $num.val(num - 1);
-});
-
-$('.btn-plus').on('touchstart', function() {
-    var num = $num.val();
+}).on('touchstart', '.btn-plus', function() {
+    var num = parseInt($num.val(), 10);
     leftNum = $('#left-num').val();
@@ -414,9 +279,7 @@ $('.btn-plus').on('touchstart', function() {
     //TODO:库存数验证
     $num.val(num + 1);
-});
-
-$('#chose-btn-sure').on('touchstart', function() {
+}).on('touchstart', '#chose-btn-sure', function() {
     var productSku,
         buyNumber = $('#good-num').val() - 0,
@@ -426,10 +289,12 @@ $('#chose-btn-sure').on('touchstart', function() {
         numInCart = $('.num-tag').html() - 0,
         num = $num.val();
+    //颜色尺码没有选择
     if (!checkColorSizeNum()) {
         return;
     }
+    //TODO status change
     if ($('#chose-btn-sure').html() === '已售罄') {
         return;
     }
@@ -459,15 +324,19 @@ $('#chose-btn-sure').on('touchstart', function() {
                 productSku: productSku,
                 buyNumber: buyNumber,
                 promotionId: promotionId,
-                isEdit: isEdit
+                isEdit: isEdit,
+                cartType: queryString.cartType
             }
         }).done(function(res) {
             loading.hideLoadingMask();
             if (res.code === 200) {
-                $('.num-tag').html(numInCart + buyNumber);
-                $('.num-tag').removeClass('hide');
+                $('.num-tag').html(numInCart + buyNumber).removeClass('hide');
                 confirming = false;
                 hide();
+
+                if (cbFn) {
+                    cbFn();
+                }
             }
             if (res.message) {
                 tip.show(res.message);
--- a/static/js/cart/gift-advance.js
View file @d39eb4c
+++ b/static/js/cart/gift-advance.js
View file @d39eb4c
@@ -10,7 +10,8 @@ var $ = require('jquery'),
     loading = require('../plugin/loading'),
     chosePanel = require('./chose-panel');
-var $page = $('.gift-advance-page');
+var $page = $('.gift-advance-page'),
+    queryString = $.queryString();
 lazyLoad($('.lazy'));
@@ -19,19 +20,15 @@ function getProductInfo(skn, promotionId) {
     $.get('/cart/index/giftinfo', {
         skn: skn,
         promotionId: promotionId
-    }).then(function(res) {
-        if (!res) {
+    }).then(function(html) {
+        if (!html) {
             tip.show('网络错误');
             return;
         }
-        if (res.code === 200) {
-            chosePanel.show({
-            cartInfo: res.data
+        chosePanel.show(html, function() {
+            window.location.href = '/cart/index/index?cartType=' + queryString.cartType;
         });
-        } else {
-            tip.show(res.message || '网络错误');
-        }
-    }).fail(function() {
+    }, function() {
         tip.show('网络错误');
     }).always(function() {
         loading.hideLoadingMask();
--- a/static/js/cart/good.js
View file @d39eb4c
+++ b/static/js/cart/good.js
View file @d39eb4c
@@ -10,7 +10,8 @@ var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload');
 var dialog = require('../me/dialog'),
-    tip = require('../plugin/tip');
+    tip = require('../plugin/tip'),
+    orderInfo = require('./order-info').orderInfo;
 var $selectAllBtn = $('.balance .checkbox'),
     cartType = $('#cartType').val(),
@@ -106,13 +107,14 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
                     autoHide: true,
                     fast: true
                 });
+                orderInfo('couponCode', null);
+                orderInfo('couponName', null);
                 history.go(0);
+            } else {
+                tip.show(data.message);
             }
         }, function() {
-            dialog.showDialog({
-                autoHide: true,
-                dialogText: '网络异常'
-            });
+            tip.show('网络异常');
         });
     });
@@ -224,5 +226,3 @@ $selectAllBtn.on('touchend', function() {
 $('.down').on('touchend', function() {
     chosePanel.show();
 });
-
-
--- a/static/js/cart/order-ensure.js
View file @d39eb4c
+++ b/static/js/cart/order-ensure.js
View file @d39eb4c
@@ -28,11 +28,13 @@ if (window.getUid() !== orderInfo('uid')) {
     order.init();
 }
-if ($couponUse.data('value') !== orderInfo('couponValue')) {
+if ($couponUse.data('name') !== orderInfo('couponName')) {
     orderInfo('couponCode', null);
-    orderInfo('couponValue', null);
+    orderInfo('couponName', null);
 }
+orderInfo('cartType', queryString.cartType || queryString.carttype || 'ordinary');
+
 function dispacthTapEvt(e) {
     var $cur = $(e.target).closest('li');
@@ -78,7 +80,7 @@ function orderCompute() {
         method: 'POST',
         url: '/cart/index/orderCompute',
         data: {
-            cartType: orderInfo('cartType'),
+            cartType: orderInfo('cartType') || 'ordinary',
             deliveryId: orderInfo('deliveryId'),
             paymentTypeId: orderInfo('paymentTypeId'),
             couponCode: orderInfo('couponCode'),
@@ -89,22 +91,19 @@ function orderCompute() {
         if (!res) {
             tip.show('网络出错');
+            window.location.reload();
         } else {
-            if (res.order_amount) {
+            /*if (res.order_amount) {
                 res.order_amount = (+res.order_amount).toFixed(2);
             }
             if (res.discount_amount) {
                 res.discount_amount = (+res.discount_amount).toFixed(2);
-            }
+            }*/
             if (res.last_order_amount) {
                 res.last_order_amount = (+res.last_order_amount).toFixed(2);
             }
             priceHtml = priceTmpl({
-                sumPrice: res.order_amount,
-                salePrice: res.discount_amount,
-                freight: res.promotion_formula_list[1].promotion_amount,
-                couponPrice: res.coupon_amount,
-                yohoCoin: res.use_yoho_coin,
+                cartPayData: res.promotion_formula_list,
                 price: res.last_order_amount
             });
@@ -112,6 +111,7 @@ function orderCompute() {
         }
     }).fail(function() {
         tip.show('网络出错');
+        window.location.reload();
     });
 }
@@ -141,11 +141,12 @@ function submitOrder() {
         url: '/cart/index/orderSub',
         data: {
             addressId: orderInfo('addressId'),
-            cartType: queryString.cartType || queryString.carttype || 'ordinary',
+            cartType: orderInfo('cartType') || 'ordinary',
             deliveryId: orderInfo('deliveryId'),
             deliveryTimeId: orderInfo('deliveryTimeId'),
-            invoiceText: invoiceText,
-            invoiceType: $invoice.find('.invoice-type').val() || orderInfo('invoiceType'),
+            invoiceText: orderInfo('invoice') ? invoiceText : null,
+            invoiceType: orderInfo('invoice') ? ($invoice.find('.invoice-type').val() ||
+                orderInfo('invoiceType')) : null,
             msg: msg,
             paymentTypeId: orderInfo('paymentTypeId'),
             paymentType: orderInfo('paymentType'), //支付方式
--- a/static/js/cart/order-info.js
View file @d39eb4c
+++ b/static/js/cart/order-info.js
View file @d39eb4c
@@ -15,11 +15,12 @@ function init() {
         yohoCoin: $('.coin').data('yoho-coin') || 0,
         addressId: null,
         couponCode: null,
-        couponValue: null,
+        couponName: null,
         invoice: null,
         invoiceText: null,
         invoiceType: null,
-        msg: null
+        msg: null,
+        cartType: 'ordinary'
     };
     window.setCookie('order-info', JSON.stringify(info));
 }
--- a/static/js/cart/select-address.js
View file @d39eb4c
+++ b/static/js/cart/select-address.js
View file @d39eb4c
@@ -7,9 +7,20 @@
 var $ = require('jquery'),
     orderInfo = require('./order-info').orderInfo;
+var $confim = $('.confim-mask'),
+    deleteId;
+
 $('.address-item').on('touchend', function() {
     orderInfo('addressId', $(this).data('address-id'));
 }).on('touchend', '.edit', function() {
     window.location.href = $(this).data('href');
     return false;
+}).on('touchend', '.del', function() {
+    deleteId = $(this).data('address-id');
+});
+
+$confim.on('touchend', '.confim', function() {
+    if (orderInfo('addressId') === deleteId) {
+        orderInfo('addressId', null);
+    }
 });
--- a/static/js/cart/select-coupon.js
View file @d39eb4c
+++ b/static/js/cart/select-coupon.js
View file @d39eb4c
@@ -37,7 +37,7 @@ $newCoupon.on('submit', function() {
         if (res.code === 200) {
             tip.show('优惠券可用');
             orderInfo('couponCode', res.data.coupon_code);
-            orderInfo('couponValue', res.data.coupon_value);
+            orderInfo('couponName', res.data.coupon_title);
             window.location.href = '/cart/index/orderEnsure';
         } else {
             tip.show(res.message || '网络错误');
@@ -52,12 +52,12 @@ $('#coupon-list').on('touchend', '.employ-main', function() {
     var $this = $(this);
     orderInfo('couponCode', $this.data('coupon-code'));
-    orderInfo('couponValue', $this.data('coupon-value'));
+    orderInfo('couponName', $this.data('coupon-name'));
 });
 $('body').on('touchend', '.not-use', function() {
     orderInfo('couponCode', null);
-    orderInfo('couponValue', null);
+    orderInfo('couponName', null);
 });
--- a/static/js/passport/bind/bind.js
View file @d39eb4c
+++ b/static/js/passport/bind/bind.js
View file @d39eb4c
@@ -20,7 +20,15 @@ var api = require('../api'),
 var trim = $.trim;
 var showErrTip = tip.show;
+var requesting = false;
+
 function nextStep(url, mobileNo, areaCode) {
+    if (requesting) {
+        return false;
+    }
+
+    requesting = true;
+
     $.ajax({
         type: 'POST',
         url: '/passport/bind/sendBindMsg',
@@ -31,9 +39,13 @@ function nextStep(url, mobileNo, areaCode) {
         success: function(res) {
             console.log(res.data);
             location.href = url;
+
+            requesting = false;
         },
         error: function() {
             tip.show('出错了，请重试！');
+
+            requesting = false;
         }
     });
 }
--- a/static/js/product/detail/comments-consults.js
View file @d39eb4c
+++ b/static/js/product/detail/comments-consults.js
View file @d39eb4c
@@ -65,7 +65,7 @@ if (navtabHammer) {
 if (gotoConsultHammer) {
     gotoConsultHammer.on('tap', function() {
-        location.href = $(gotoConsultEle).data('href');
+        location.href = $(gotoConsultEle).find('a').attr('href');
     });
 }
--- a/static/sass/cart/_chose-panel.scss
View file @d39eb4c
+++ b/static/sass/cart/_chose-panel.scss
View file @d39eb4c
@@ -40,7 +40,6 @@
     .thumb {
         float: left;
         width: 80rem / $pxConvertRem;
-        height: 106rem / $pxConvertRem;
     }
     .text-info {
--- a/static/sass/cart/_index.scss
View file @d39eb4c
+++ b/static/sass/cart/_index.scss
View file @d39eb4c
@@ -36,6 +36,37 @@
         li:first-child span {
             border-right: 1px solid #e0e0e0;
         }
+
+        li:last-child {
+            position: relative;
+        }
+
+        .presell-tip {
+            position: absolute;
+            z-index: 1;
+            left: -2rem;
+            top: 1.75rem;
+        }
+
+        .triangle {
+            width: 0;
+            height: 0;
+            border-left: 8px solid transparent;
+            border-right: 8px solid transparent;
+            border-bottom: 12px solid #000;
+            margin-left: 6rem;
+        }
+
+        .pt-content {
+            position: relative;
+            padding: 10px;
+            background: #000;
+            color: #fff;
+            font-size: 20px;
+            @include border-radius(5px);
+            text-align: center;
+            width: 7rem;
+        }
     }
     .login-info {
@@ -195,8 +226,6 @@
         }
     }
-}
-.shopping-cart-zero{
     .cart-zero{
         width: 100%;
         height: auto;
--- a/static/sass/cart/_order-ensure.scss
View file @d39eb4c
+++ b/static/sass/cart/_order-ensure.scss
View file @d39eb4c
@@ -118,14 +118,14 @@
             margin-left: 20rem / $pxConvertRem;
         }
-        .coupon-use,
-        .coin-check {
+        .coupon-use {
             float: right;
             color: #999;
-
-            &.used {
-                color: #f00;
-            }
+            text-align: right;
+            width: 360rem / $pxConvertRem;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
             .iconfont {
                 color: #999;
@@ -141,6 +141,10 @@
                 color: #000;
             }
+            &.used {
+                color: #f00;
+            }
+
             em {
                 color: #f00;
             }
--- a/static/sass/me/_order.scss
View file @d39eb4c
+++ b/static/sass/me/_order.scss
View file @d39eb4c
@@ -161,11 +161,18 @@
         color: #fff;
         text-align: center;
         font-size: 12px;
+
+        &:before {
+            display: block;
+            line-height: 1;
+            @include transform(scale(0.833));
+        }
     }
     .gift-tag {
         height: 25rem / $pxConvertRem;
         background: #a1ce4e;
+
         &:before {
             content: '赠品';
         }
@@ -174,6 +181,7 @@
     .advance-buy-tag {
         height: 25rem / $pxConvertRem;
         background: #eb76aa;
+
         &:before {
             content: '加价购';
         }
@@ -228,4 +236,4 @@
     .appear-date {
         color: #f00;
     }
-}
+}
--- a/template/m.yohobuy.com/actions/cart/index/gift-info.phtml 0 → 100644
View file @d39eb4c
+++ b/template/m.yohobuy.com/actions/cart/index/gift-info.phtml 0 → 100644
View file @d39eb4c
+{{> cart/chose-panel}}
--- a/template/m.yohobuy.com/actions/cart/index/index.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/actions/cart/index/index.phtml
View file @d39eb4c
 {{> layout/header}}
-        {{# shoppingCart}}
-        {{#if isEmptyCart}}
-            <div class="shopping-cart-zero yoho-page">
-                <div class="cart-zero">
-                    <i class="iconfont">&#xe62c</i>
-                    <p>您的购物车暂无商品</p>
-                    <a href="/product/new">随便逛逛</a>
-                </div>
-                {{> product/recommend-for-you}}
-            </div>
-        {{^}}
-            <div id="mainCart" class="shopping-cart-page yoho-page">
-
-
-
-            {{#if showLoginInfo}}
+<div id="mainCart" class="shopping-cart-page yoho-page">
+    {{# shoppingCart}}
+        {{#if showLoginInfo}}
             <p class="login-info">
                 <span class="iconfont">&#xe628;</span>
                 请您先
                 <a class="btn btn-login" href="{{signurl}}">登录</a>
                 可以同步电脑和手机中的商品
             </p>
-            {{^}}
-                {{#if cartNav}}
+        {{/if}}
+        {{#if isEmptyCart}}
+            <div class="cart-zero">
+                <i class="iconfont">&#xe62c</i>
+                <p>您的购物车暂无商品</p>
+                <a href="/product/new">随便逛逛</a>
+            </div>
+            {{> product/recommend-for-you}}
+        {{^}}
+            {{#if cartNav}}
                 <ul class="cart-nav clearfix">
                     <li class="active">
                         <span>
@@ -33,33 +28,33 @@
                         <span>
                             预售商品({{presellGoodsCount}})
                         </span>
+                        <div id="presell-tip" class="presell-tip">
+                            <div class="triangle"></div>
+                            <p class="pt-content">预售商品点这里结算哦~</p>
+                        </div>
                     </li>
                 </ul>
-                {{/if}}
             {{/if}}
             {{# commonCart}}
-            <div class="cart-content common">
-                {{> cart/cart-content}}
-            </div>
+                <div class="cart-content common">
+                    {{> cart/cart-content}}
+                </div>
             {{/ commonCart}}
             {{# preSellCart}}
-            <div class="cart-content presell hide">
-                <p class="presell-info">
-                    <span class="iconfont">&#xe61a;</span>
-                    <span class="txt">预售商品全场包邮，到货后立即发货</span>
-                    <span class="txt">预售商品不参加活动，不可使用优惠券</span>
-                </p>
-                {{> cart/cart-content}}
-            </div>
+                <div class="cart-content presell hide">
+                    <p class="presell-info">
+                        <span class="iconfont">&#xe61a;</span>
+                        <span class="txt">预售商品全场包邮，到货后立即发货</span>
+                        <span class="txt">预售商品不参加活动，不可使用优惠券</span>
+                    </p>
+                    {{> cart/cart-content}}
+                </div>
             {{/ preSellCart}}
-
-            </div>
         {{/if}}
          <input id="cartType" type="hidden" value="{{cartType}}">
-        {{/ shoppingCart}}
-
-        {{> cart/chose-panel}}
+    {{/ shoppingCart}}
+</div>
 {{> layout/footer}}
--- a/template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @d39eb4c
@@ -49,9 +49,9 @@
                                 {{count}}张可用
                             </span>
-                            {{#if value}}
-                                <span class="used coupon-use" data-value="{{value}}">
-                                    -¥{{value}}
+                            {{#if couponName}}
+                                <span class="used coupon-use" data-name="{{couponName}}">
+                                    {{couponName}}
                                     <i class="iconfont">&#xe614;</i>
                                 </span>
                             {{^}}
@@ -65,11 +65,18 @@
                 </li>
                 <li class="coin" data-yoho-coin="{{yohoCoin}}">
                     <span class="title">YOHO币</span>
-                    <span class="desc">可抵¥{{yohoCoin}}</span>
-                    <span class="coin-check">
-                        <em>- ¥ {{yohoCoin}}</em>
-                        <i class="iconfont checkbox icon-cb-checked"></i>
-                    </span>
+
+                    {{#if yohoCoin}}
+                        <span class="desc">可抵¥{{yohoCoin}}</span>
+                        <span class="coin-check">
+                            <em>- ¥ {{yohoCoin}}</em>
+                            <i class="iconfont checkbox icon-cb-checked"></i>
+                        </span>
+                    {{^}}
+                        <span class="not-used coin-check">
+                            无YOHO币可用
+                        </span>
+                    {{/if}}
                 </li>
                 {{#if invoice}}
@@ -98,28 +105,12 @@
         <section class="price-cal block">
             <ul class="total">
+                {{#cartPayData}}
                 <li>
-                    <span>总价</span>
-                    &nbsp;&nbsp;¥{{sumPrice}}
-                </li>
-                <li>
-                    <span>活动价</span>
-                    - ¥{{salePrice}}
-                </li>
-                <li>
-                    <span>运费</span>
-                    + {{freight}}
-                </li>
-	            {{#couponPrice}}
-                <li>
-                    <span>优惠券</span>
-                    - ¥{{.}}
-                </li>
-	            {{/couponPrice}}
-                <li>
-                    <span>YOHO币</span>
-                    - ¥{{yohoCoin}}
+                    <span>{{promotion}}</span>
+                    &nbsp;&nbsp;{{promotion_amount}}
                 </li>
+                {{/cartPayData}}
                 <li class="cost">
                     应付金额： <em>¥{{price}}</em>
                 </li>
@@ -128,6 +119,7 @@
         <ul class="pay-mode">
             {{# paymentWay}}
+            {{#if isSupport}}
             <li class="{{#if recommend}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">
                 <span class="iconfont">
                     {{#if recommend}}
@@ -138,34 +130,19 @@
                 </span>
                 {{name}}
             </li>
+            {{/if}}
             {{/ paymentWay}}
         </ul>
     {{/ orderEnsure}}
 </div>
 <script id="tmpl-price" type="text/tmpl">
     <ul class="total">
+        \{{#cartPayData}}
         <li>
-            <span>总价</span>
-            &nbsp;&nbsp;¥\{{sumPrice}}
-        </li>
-        <li>
-            <span>活动价</span>
-            - ¥\{{salePrice}}
-        </li>
-        <li>
-            <span>运费</span>
-            + \{{freight}}
-        </li>
-        \{{#couponPrice}}
-        <li>
-            <span>优惠券</span>
-            - ¥\{{.}}
-        </li>
-        \{{/couponPrice}}
-        <li>
-            <span>YOHO币</span>
-            - ¥\{{yohoCoin}}
+            <span>\{{promotion}}</span>
+            &nbsp;&nbsp;\{{promotion_amount}}
         </li>
+        \{{/cartPayData}}
         <li class="cost">
             应付金额： <em>¥\{{price}}</em>
         </li>
--- a/template/m.yohobuy.com/actions/cart/index/select-coupon.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/actions/cart/index/select-coupon.phtml
View file @d39eb4c
@@ -13,7 +13,7 @@
 <script id="tmpl-coupon" type="text/tmpl">
 \{{#coupons}}
     \{{^ notAvailable}}
-    <a class="employ-main" data-coupon-code="\{{ couponCode}}" data-coupon-value="\{{ couponValue}}" href="/cart/index/orderEnsure">
+    <a class="employ-main" data-coupon-code="\{{ couponCode}}" data-coupon-name="\{{ couponDetailInfomation}}" href="/cart/index/orderEnsure">
         <span>\{{ couponValue}}</span>
         <p class="coupon-name">\{{ couponDetailInfomation}}</p>
         <p>有效期：\{{ couponValidity}}</p>
--- a/template/m.yohobuy.com/actions/product/detail/index.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/actions/product/detail/index.phtml
View file @d39eb4c
@@ -93,9 +93,9 @@
         {{#if consultsNum}}
           {{> product/feedback-tab}}
         {{else}}
-        <div class="nodata tap-hightlight">
+        <div class="nodata tap-hightlight" id="goto-consult">
             <span>暂无商品评价和咨询</span>
-            <a href="{{link}}" class="go-consult">我要咨询<span class="iconfont">&#xe604;</span></a>
+            <a href="{{consultsUrl}}" class="go-consult">我要咨询<span class="iconfont">&#xe604;</span></a>
         </div>
         {{/if}}
       {{/if}}
--- a/template/m.yohobuy.com/partials/cart/cart-content.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/partials/cart/cart-content.phtml
View file @d39eb4c
@@ -25,7 +25,7 @@
             <li class="advance-buy">
                 <span class="iconfont">&#xe61b;</span>
                 加价购
-                <a href="/cart/index/advanceBuy">
+                <a href="">
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                 </a>
@@ -33,14 +33,16 @@
         {{/if}}
     </ul>
 {{/if}}
+
+{{# promotionInfo}}
 <div class="activity">
-    <h1>以参与活动</h1>
+    <h1>已参与活动</h1>
     <ul>
-        {{# promotionInfo}}
-            <li>{{name}}</li>
-        {{/ promotionInfo}}
+        <li>{{name}}</li>
     </ul>
 </div>
+{{/ promotionInfo}}
+
 <div class="price-compute">
     <p>
         <span>总价（¥{{price}}）<i>-</i></span>
--- a/template/m.yohobuy.com/partials/cart/chose-panel.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/partials/cart/chose-panel.phtml
View file @d39eb4c
@@ -37,34 +37,34 @@
                     <ul class="size-row clearfix hide">
                         {{# size}}
-                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless sizeNum}}zero-stock{{/unless}}" data-id={{id}} data-colorid="{{colorId}}" data-num="{{sizeNum}}" data-numstr="{{colorNumStr}}" data-skuid="{{skuId}}" data-goodid="{{goodsId}}">
-                        {{name}}
-                    </li>
-                    {{/ size}}
-                </ul>
+                        <li class="block {{#if chosed}}chosed{{/if}} {{#unless sizeNum}}zero-stock{{/unless}}" data-id="{{id}}" data-colorid="{{colorId}}" data-num="{{sizeNum}}" data-numstr="{{colorNumStr}}" data-skuid="{{skuId}}" data-goodid="{{goodsId}}">
+                            {{name}}
+                        </li>
+                        {{/ size}}
+                    </ul>
-                {{/ sizes}}
-            </div>
-            <p>
-            <div class="num">
-                <span>数量</span>
-                <div class="clearfix">
-                    <a class="btn btn-minus" href="javascript:void(0);">
-                        <span class="iconfont">&#xe625;</span>
-                    </a>
-                    <input id="good-num" class="good-num" type="text" value="1">
-                    <a class="btn btn-plus" href="javascript:void(0);">
-                        <span class="iconfont">&#xe624;</span>
-                    </a>
+                    {{/ sizes}}
+                </div>
+                <p>
+                <div class="num">
+                    <span>数量</span>
+                    <div class="clearfix">
+                        <a class="btn btn-minus" href="javascript:void(0);">
+                            <span class="iconfont">&#xe625;</span>
+                        </a>
+                        <input id="good-num" class="good-num" type="text" value="1">
+                        <a class="btn btn-plus" href="javascript:void(0);">
+                            <span class="iconfont">&#xe624;</span>
+                        </a>
+                    </div>
+                    <span class="left-num"></span>
+                    <input id="left-num" type="hidden" value="0">
                 </div>
-                <span class="left-num"></span>
-                <input id="left-num" type="hidden" value="0">
             </div>
         </div>
-    </div>
-    <div class="btn-wrap">
-        <button id="chose-btn-sure" class="btn btn-sure">确定</button>
+        <div class="btn-wrap">
+            <button id="chose-btn-sure" class="btn btn-sure">确定</button>
+        </div>
     </div>
 </div>
-        </div>
-        {{/cartInfo}}
+{{/cartInfo}}
--- a/template/m.yohobuy.com/partials/cart/good.phtml
View file @d39eb4c
+++ b/template/m.yohobuy.com/partials/cart/good.phtml
View file @d39eb4c
-<div class="shopping-cart-good clearfix" data-id={{id}}>
-    {{#if isSoldOut}}
+<div class="shopping-cart-good clearfix" data-id="{{id}}">
+    {{#if inValid}}
         <span class="few-tag-expire">失效</span>
-    {{^}}
-        {{#if isSelected}}
-            <span class="checkbox icon-cb-checked iconfont"></span>
-        {{^}}
-            <span class="checkbox icon-checkbox iconfont"></span>
-        {{/if}}
+    {{/if}}
+
+    {{#if showCheckbox}}
+        <span class="checkbox{{#if checked}} icon-cb-checked{{^}} icon-checkbox{{/if}} iconfont"></span>
     {{/if}}
     <div class="info">
-        <img class="thumb lazy" data-original={{thumb}}>
+        <a href="{{link}}">
+            <img class="thumb lazy" data-original="{{thumb}}">
+        </a>
         {{#if isAdvanceBuy}}
             <p class="few-tag plus-tag">加价购</p>
-        {{^}}
-            {{#if isGift}}
+        {{/if}}
+        {{#if isGift}}
             <p class="few-tag gift-tag">赠品</p>
-            {{/if}}
         {{/if}}
-        </a>
         <div class="deps show">
-            <p class="name row">{{name}}</p>
+            <a href="{{link}}" class="name row">{{name}}</a>
             <span class="count">
                 ×{{count}}
             </span>
@@ -67,15 +65,5 @@
                 </p>
             {{/if}}
         </div>
-        <div class="calculate-num hide">
-            <div class="calculate">
-                <p><i class="iconfont cut">&#xe625;</i><span>{{count}}</span><i class="iconfont add">&#xe624;</i></p>
-                <p><span>颜色:{{color}}尺码:{{size}}{{name}}</span><i class="iconfont down">&#xe616;</i></p>
-            </div>
-            <p><span class="price"> ¥{{price}}</span></p>
-            <span class="count">
-                ×{{count}}
-            </span>
-        </div>
     </div>
 </div>
--- a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @d39eb4c
+++ b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @d39eb4c
@@ -411,6 +411,13 @@ class CartModel
                     $oneGoods['price'] = Helpers::transPrice($single['sales_price']);
                     $oneGoods['count'] = $single['buy_number'];
+                    //gift=>是否赠品,advanceBuy=>是否加价购;
+                    if ($single['goods_type'] == 'gift' && !isset($single['isAdvanceBuy'])) {
+                        $oneGoods['gift'] = true;
+                    } elseif ($single['goods_type'] == 'price_gift') {
+                        $oneGoods['advanceBuy'] = true;
+                    }
+
                     $result['goods'][] = $oneGoods;
                 }
             }
@@ -423,6 +430,7 @@ class CartModel
                     $onePay['id'] = $pay['payment_id'];
                     $onePay['paymentType'] = $pay['payment_type'];
                     $onePay['name'] = $pay['payment_type_name'];
+                    $onePay['isSupport'] = $pay['is_support'] === 'Y';
 //                    $onePay['default'] = ($pay['default'] === 'Y');
                     if ($onePay['paymentType'] == 1) {
                         $onePay['recommend'] = true;
@@ -437,23 +445,9 @@ class CartModel
             // 订单数据
             if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {
-                $sumPrice = isset($orderCompute['order_amount']) ? $orderCompute['order_amount'] : $payReturn['shopping_cart_data']['order_amount'];
-
-                $freight = '¥0';
-                if (isset($orderCompute['promotion_formula_list'][1]['promotion_amount'])) {
-                    $freight = $orderCompute['promotion_formula_list'][1]['promotion_amount'];
-                } elseif(isset($payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'])) {
-                    $freight = $payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'];
-                }
-
-                $couponPrice = isset($orderCompute['coupon_amount']) ? $orderCompute['coupon_amount'] : false;
-                $salePrice = isset($orderCompute['discount_amount']) ? $orderCompute['discount_amount'] : $payReturn['shopping_cart_data']['discount_amount'];
+                $result['cartPayData'] = isset($orderCompute['promotion_formula_list']) ? $orderCompute['promotion_formula_list'] : $payReturn['shopping_cart_data']['promotion_formula_list'];
                 $price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
-                $result['sumPrice'] = Helpers::transPrice($sumPrice);
-                $result['salePrice'] = Helpers::transPrice($salePrice);
                 $result['price'] = Helpers::transPrice($price);
-                $result['freight'] = $freight;
-                $result['couponPrice'] = $couponPrice;
             }
             // 发票有关数据
@@ -481,7 +475,7 @@ class CartModel
             // 优惠券数据
             $coupons = array();
-            !empty($orderCompute['coupon_amount']) && $coupons['value'] = $orderInfo['couponValue'];
+            !empty($orderCompute['coupon_amount']) && $coupons['couponName'] = $orderInfo['couponName'];
             $coupons += self::getCouponList($uid, true);
             $result['coupon'] = $coupons;
         }
@@ -554,17 +548,21 @@ class CartModel
         $coupons = CartData::getCouponList($uid);
         do {
-            if ($onlyTotal) {
-                $result['count'] = count($coupons['data']['couponList']);
-                break;
-            }
-
             if (isset($coupons['data']['couponList'])) {
-                foreach ($coupons['data']['couponList'] as &$val) {
-                    $val['notAvailable'] = $val['isValidity'] === 'N';
+                foreach ($coupons['data']['couponList'] as $val) {
+                    $notAvailableRes = self::searchCoupon($uid, $val['couponCode']);
+                    // 处理可用的优惠券
+                    if ($val['isValidity'] === 'N' || (isset($notAvailableRes['code']) && $notAvailableRes['code'] !== 200)) {
+//                        $val['notAvailable'] = true;
+                        continue;
+                    }
+                    $result[] = $val;
                 }
+            }
-                $result = $coupons['data']['couponList'];
+            if ($onlyTotal) {
+                $count = count($result);
+                $result = array('count' => $count);
             }
         }while(0);
@@ -776,8 +774,6 @@ class CartModel
                     $result['promotionInfo'][] = $info;
                 }
-
-                $result['promotionFormula'] = $data['shopping_cart_data']['promotion_formula'];
             }
             // 结算数据
--- a/yohobuy/m.yohobuy.com/application/models/Index/User.php
View file @d39eb4c
+++ b/yohobuy/m.yohobuy.com/application/models/Index/User.php
View file @d39eb4c
@@ -316,7 +316,7 @@ class UserModel
             } else {
                 $data = $records['data']['product_list'];
                 foreach ($data as &$val) {
-                    $val['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
+                    $val['link'] = Helpers::url('/product/show_' . $val['product_skn'] . '.html');
                     $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                     $val['sales_price'] = Helpers::transPrice($val['sales_price']);
                     $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
--- a/yohobuy/m.yohobuy.com/application/models/Product/Detail.php
View file @d39eb4c
+++ b/yohobuy/m.yohobuy.com/application/models/Product/Detail.php
View file @d39eb4c
@@ -39,7 +39,7 @@ class DetailModel
         elseif (is_numeric($productSkn)) {
             $baseInfo = DetailData::baseInfo(null, $uid, $productSkn);
         }
-        
+
         // 商品名称
         if (empty($baseInfo['productName'])) {
             return $result;
@@ -186,7 +186,7 @@ class DetailModel
                 // 商品的尺码列表
                 if (isset($value['goodsSizeBoList'])) {
                     foreach ($value['goodsSizeBoList'] as $size) {
-                        $sizeList[$value['colorId']][] = array(
+                        $sizeList[$value['productSkc']][] = array(
                             'id' => $size['id'],
                             'skuId' => $size['goodsSizeSkuId'],
                             'goodsId' => $size['goodsId'],
@@ -196,7 +196,7 @@ class DetailModel
                         );
                         $colorStorageNum += intval($size['goodsSizeStorageNum']);
                         $sizeStorageStr .= $size['goodsSizeStorageNum'] . '/';
-                        $colorStorageGroup[$size['sizeName']][$value['colorId']] = $size['goodsSizeStorageNum'];
+                        $colorStorageGroup[$size['sizeName']][$value['productSkc']] = $size['goodsSizeStorageNum'];
                     }
                     // 颜色分组
@@ -214,9 +214,9 @@ class DetailModel
                 $thumbImageList[] = array('img' => Helpers::getImageUrl($value['colorImage'], 60, 60));
                 // 添加尺码对应的各个颜色的库存量
-                foreach ($sizeList as $colorId => $sizeArr) {
+                foreach ($sizeList as $skc => $sizeArr) {
                     foreach ($sizeArr as $key => $value) {
-                        $sizeList[$colorId][$key]['colorNumStr'] = implode('/', array_values($colorStorageGroup[$value['name']]));
+                        $sizeList[$skc][$key]['colorNumStr'] = implode('/', array_values($colorStorageGroup[$value['name']]));
                     }
                 }
@@ -226,7 +226,7 @@ class DetailModel
             // 格式化尺码对应的各个颜色分组
             foreach ($colorGroup as $value) {
-                $sizeGroup[]['size'] = $sizeList[ $value['id'] ];
+                $sizeGroup[]['size'] = $sizeList[ $value['skcId'] ];
             }
             // 商品图: 多个
--- a/yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @d39eb4c
+++ b/yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @d39eb4c
@@ -149,7 +149,7 @@ class IndexController extends AbstractAction
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $cartType = $this->get('cartType', 'ordinary');
-        $data = array('giftPage' => true);
+        $data = array('giftPage' => true, 'cartType' => $cartType);
         $data += CartModel::getCartData($uid, $shoppingKey, $cartType, true);
         // 渲染模板
@@ -167,7 +167,7 @@ class IndexController extends AbstractAction
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $cartType = $this->get('cartType', 'ordinary');
-        $data = array('advanceBuyPage' => true);
+        $data = array('advanceBuyPage' => true, 'cartType' => $cartType);
         $data += CartModel::getCartData($uid, $shoppingKey, $cartType, false, true);
         // 渲染模板
@@ -192,15 +192,15 @@ class IndexController extends AbstractAction
         $this->echoJson($result);
     }
-    /*
-     * 获取购物车加价购商品数据模板
-     */
-    public function giftinfoTplAction()
-    {
-        if ($this->isAjax()) {
-            echo file_get_contents($this->_view->getScriptPath() . '/../partials/cart/chose-panel.phtml');
-        }
-    }
+//    /*
+//     * 获取购物车加价购商品数据模板
+//     */
+//    public function giftinfoTplAction()
+//    {
+//        if ($this->isAjax()) {
+//            echo file_get_contents($this->_view->getScriptPath() . '/../partials/cart/chose-panel.phtml');
+//        }
+//    }
     /*
      * 获取购物车加价购商品数据
@@ -215,7 +215,9 @@ class IndexController extends AbstractAction
             $result = CartModel::giftProductData($skn, $promotionId);
         }
-        $this->echoJson($result);
+        $this->_view->display('gift-info', array(
+            'cartInfo' => $result['data']
+        ));
     }
     /**
@@ -269,7 +271,7 @@ class IndexController extends AbstractAction
         $this->auditJumpLogin();
         $this->setTitle('确认订单');
-        $this->setNavHeader('确认订单');
+        $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
         // 购物车商品为空跳转到购物车页面
         $shoppingKey = Helpers::getShoppingKeyByCookie();