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

@@ -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'];
 

@@ -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>

@@ -56,6 +56,10 @@ if ($('.cart-nav').length > 0) {
     }, 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;

@@ -17,9 +17,6 @@ var $chosePanel = $('#chose-panel'),
     $num,
     $chosed,
     $imgsThumb,
-
-    // re = /\d+/,
-
     $leftNum,
     leftNum,
     confirming,
@@ -32,6 +29,7 @@ var $chosePanel = $('#chose-panel'),
     $sizeRowList,
     cbFn,
     $allChoseItems,
+    queryString,
     $yohoPage = $('.yoho-page');
 
 //初始化购物车面板显示
@@ -41,10 +39,11 @@ function init() {
     hasChooseColor = false;
     hasChooseSize = false;
     $curSizeBlock = null;
-    $imgsThumb = $('.chose-panel').find('.thumb'),
-    $allChoseItems = $('.chose-items'),
-    $sizeRowList = $('.size-list ul'),
-    $leftNum = $('#left-num'),
+    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;
@@ -77,7 +76,6 @@ function show(html, cb) {
 //隐藏当前Panel
 function hide() {
     $('.chose-panel').hide();
-    cbFn = null;
 }
 
 //修改加入购物车的文字和背景
@@ -168,10 +166,8 @@ $yohoPage.on('touchstart', '.color-list .block', function(e) {
         // 之前选中的尺码去掉勾选样式
         if ($preSiblingBlock.length > 0) {
             $preSiblingBlock.removeClass('chosed');
-
-        }
-
             curSizeBlock = $curSizeRow.children().get(scindex);
+        }
 
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
         if (curSizeBlock) {
@@ -328,7 +324,8 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
                 productSku: productSku,
                 buyNumber: buyNumber,
                 promotionId: promotionId,
-                isEdit: isEdit
+                isEdit: isEdit,
+                cartType: queryString.cartType
             }
         }).done(function(res) {
             loading.hideLoadingMask();
@@ -338,7 +335,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
                 hide();
 
                 if (cbFn) {
-                    cbFn(res.location);
+                    cbFn();
                 }
             }
             if (res.message) {

@@ -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'));
 
@@ -24,7 +25,9 @@ function getProductInfo(skn, promotionId) {
             tip.show('网络错误');
             return;
         }
-        chosePanel.show(html);
+        chosePanel.show(html, function() {
+            window.location.href = '/cart/index/index?cartType=' + queryString.cartType;
+        });
     }, function() {
         tip.show('网络错误');
     }).always(function() {

@@ -108,7 +108,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
                     fast: true
                 });
                 orderInfo('couponCode', null);
-                orderInfo('couponValue', null);
+                orderInfo('couponName', null);
                 history.go(0);
             } else {
                 tip.show(data.message);

@@ -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: queryString.cartType || queryString.carttype || 'ordinary',
+            cartType: orderInfo('cartType') || 'ordinary',
             deliveryId: orderInfo('deliveryId'),
             paymentTypeId: orderInfo('paymentTypeId'),
             couponCode: orderInfo('couponCode'),
@@ -139,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'), //支付方式

@@ -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));
 }

@@ -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);
 });
 
 

@@ -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;
             }

@@ -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: '加价购';
         }

@@ -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>
                             {{^}}
@@ -119,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}}
@@ -129,6 +130,7 @@
                 </span>
                 {{name}}
             </li>
+            {{/if}}
             {{/ paymentWay}}
         </ul>
     {{/ orderEnsure}}

@@ -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>

@@ -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>

@@ -37,7 +37,7 @@
 
                     <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}}">
+                        <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}}

@@ -4,11 +4,13 @@
     {{/if}}
 
     {{#if showCheckbox}}
-        <span class="checkbox{{#if checked}} icon-cb-checked{{^}} icon-checkbox{{/if}}iconfont"></span>
+        <span class="checkbox{{#if checked}} icon-cb-checked{{^}} icon-checkbox{{/if}} iconfont"></span>
     {{/if}}
 
     <div class="info">
+        <a href="{{link}}">
             <img class="thumb lazy" data-original="{{thumb}}">
+        </a>
         {{#if isAdvanceBuy}}
             <p class="few-tag plus-tag">加价购</p>
         {{/if}}
@@ -17,7 +19,7 @@
         {{/if}}
 
         <div class="deps show">
-            <p class="name row">{{name}}</p>
+            <a href="{{link}}" class="name row">{{name}}</a>
             <span class="count">
                 ×{{count}}
             </span>

@@ -424,6 +424,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;
                 }
             }
@@ -436,6 +443,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;
@@ -453,24 +461,6 @@ class CartModel
                 $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['price'] = Helpers::transPrice($price);
-
-                /*$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'];
-                $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;*/
             }
 
             // 发票有关数据
@@ -498,7 +488,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;
         }

@@ -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;

@@ -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);
 
         // 渲染模板
@@ -271,7 +271,7 @@ class IndexController extends AbstractAction
         $this->auditJumpLogin();
 
         $this->setTitle('确认订单');
-        $this->setNavHeader('确认订单', true, false); // 不显示右上角home按钮
+        $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
 
         // 购物车商品为空跳转到购物车页面
         $shoppingKey = Helpers::getShoppingKeyByCookie();