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

-{{> layout/header}}
-<div class="gift-advance-page yoho-page">
-    {{# shoppingCart}}
-        {{#if gift}}
-            {{# gift}}
-                {{> shopping-cart/gift-advance-good}}
-            {{/ gift}}
-        {{^}}
-            {{# advance}}
-                <div class="advance-block">
-                    <p class="title">{{title}}</p>
-                    {{# goods}}
-                        {{> shopping-cart/gift-advance-good}}
-                    {{/ goods}}
-                </div>
-            {{/ advance}}
-        {{/if}}
-    {{/ shoppingCart}}
-</div>
-{{> layout/footer}}

-{{> layout/header}}
-<div id="mainCart" class="shopping-cart-page yoho-page">
-    {{# shoppingCart}}
-        {{#if cartNav}}
-            <ul class="cart-nav clearfix">
-                <li class="active">
-                    <span>
-                        普通商品({{commonGoodsCount}})
-                    </span>
-                </li>
-                <li>
-                    <span>
-                        预售商品({{presellGoodsCount}})
-                    </span>
-                </li>
-            </ul>
-        {{/if}}
-
-        {{#if showLoginInfo}}
-            <p class="login-info">
-                <span class="iconfont">&#xe628;</span>
-                请您先
-                <a class="btn btn-login">登录</a>
-                可以同步电脑和手机中的商品
-            </p>
-        {{/if}}
-
-        {{# commonCart}}
-            <div class="cart-content common">
-                {{> shopping-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>
-                {{> shopping-cart/cart-content}}
-            </div>
-        {{/ preSellCart}}
-
-    {{/ shoppingCart}}
-</div>
-<div id="advanceBuy" class="shopping-cart-page yoho-page hide">
-{{# shoppingCart}}
-    {{# commonCart}}
-        {{# advanceBuy}}
-        <span>
-            {{promotionTitle}}
-        </span>
-        {{# goods}}
-            {{> shopping-cart/gift-advance-good}}
-        {{/ goods}}
-        {{/ advanceBuy}}
-    {{/ commonCart}}
-{{/ shoppingCart}}
-</div>
-
-<div class="shopping-cart-zero yoho-page hide">
-    <div class="cart-zero">
-        <i class="iconfont">&#xe62c</i>
-        <p>您的购物车暂无商品</p>
-        <a href="">随便逛逛</a>
-    </div>
-    {{> product/recommend-for-you}}
-</div>
-
-        {{> shopping-cart/chose-panel}}
-{{> layout/footer}}

-{{> layout/header}}
-<div class="order-ensure-page yoho-page">
-    {{# orderEnsure}}
-        <a class="address-wrap block" data-id="{{addressId}}" href="/shoppingCart/selectAddress">
-            <p class="infos">
-                收货地址
-                <span class="per-info">{{name}} {{phoneNum}}</span>
-                <span class="address">{{area}} {{address}}</span>
-            </p>
-            <span class="iconfont">&#xe614;</span>
-        </a>
-
-        <section class="dispatch block">
-            <div class="sub-block">
-                <h3 class="title">配送方式</h3>
-                <ul class="dispatch-mode clearfix">
-                    {{#each dispatchMode}}
-                        <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>
-                    {{/each}}
-                </ul>
-            </div>
-
-            <div class="sub-block">
-                <h3 class="title">送货时间</h3>
-                <ul class="dispatch-time clearfix">
-                    {{#each dispatchTime}}
-                        <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">{{name}}</li>
-                    {{/each}}
-                </ul>
-            </div>
-        </section>
-
-        <section class="block">
-            <h3 class="title">商品</h3>
-            <div class="goods">
-                {{#each goods}}
-                    {{> me/order/good}}
-                {{/each}}
-            </div>
-        </section>
-
-        <section class="block">
-            <ul class="sale-invoice">
-                {{# coupon}}
-                    <li class="coupon">
-                        <a href="/shoppingCart/selectCoupon">
-                            <span class="title">优惠券</span>
-                            {{#if count}}
-                                <span class="coupon-count">
-                                    {{count}}张可用
-                                </span>
-                            {{/if}}
-
-                            {{#if value}}
-                                <span class="used coupon-use">
-                                    -¥{{value}}
-                                    <i class="iconfont">&#xe614;</i>
-                                </span>
-                            {{^}}
-                                <span class="not-used coupon-use">
-                                    未使用
-                                    <i class="iconfont">&#xe614;</i>
-                                </span>
-                            {{/if}}
-                        </a>
-                    </li>
-                {{/coupon}}
-
-                <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>
-                </li>
-
-                {{#if invoice}}
-                    <li class="invoice {{#if needInvoice}}focus{{/if}}">
-                        <span class="title">发票</span>
-                        <span class="iconfont checkbox {{#if needInvoice}}icon-cb-checked{{else}}icon-checkbox{{/if}}"></span>
-                        <form id="invoice">
-                            <input type="text" name="invoice-title" value="{{invoiceText}}" placeholder="发票抬头">
-                            <label>
-                                发票类型
-                                <select class="invoice-type" name="invoice-type">
-                                    {{# invoice}}
-                                    <option value="{{id}}" {{#if isSelected}}selected{{/if}}>{{name}}</option>
-                                    {{/ invoice}}
-                                </select>
-                            </label>
-                        </form>
-                    </li>
-                {{/if}}
-            </ul>
-
-            <form id="msg" action="" method="post">
-                <input type="text" name="msg" value="{{msg}}" placeholder="留言">
-            </form>
-        </section>
-
-        <section class="price-cal block">
-            <ul class="total">
-                <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}}
-                </li>
-                <li class="cost">
-                    应付金额： <em>¥{{price}}</em>
-                </li>
-            </ul>
-        </section>
-
-        <ul class="pay-mode">
-            {{# paymentWay}}
-            <li class="{{#if default}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">
-                <span class="iconfont">
-                    {{#if default}}
-                        &#xe62f;
-                    {{else}}
-                        &#xe62e;
-                    {{/if}}
-                </span>
-                {{name}}
-            </li>
-            {{/ paymentWay}}
-        </ul>
-    {{/ orderEnsure}}
-</div>
-<script id="tmpl-price" type="text/tmpl">
-    <ul class="total">
-        <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}}
-        </li>
-        <li class="cost">
-            应付金额： <em>¥\{{price}}</em>
-        </li>
-    </ul>
-</script>
-{{> layout/footer}}

-{{> layout/header}}
-<div class="my-address-page select-address-page yoho-page">
-    <div class="page-wrap">
-        {{# address}}
-        <a class="address-item" data-address-id="{{address_id}}" href="/shoppingCart/orderEnsure">
-            <span class="name">{{consignee}}</span>
-            <span class="tel">{{mobile}}</span>
-            <p class="address-info">{{area}} {{address}}</p>
-            <div class="action iconfont">
-                <span class="edit" data-href="/home/addressAct?id={{address_id}}&refer=shopping">&#xe61e;</span>
-                <span class="del" data-id="{{address_id}}">&#xe621;</span>
-            </div>
-        </a>
-        {{/ address}}
-
-        <a class="add-address" data-href="/home/addressAct?refer=shopping">
-           添加新地址
-        </a>
-
-        <div class="confim-mask hide">
-            <div class="confim-box">
-                <div class="content">
-                    您确定要删除地址？
-                </div>
-                <div class="action">
-                    <span class="cancel">
-                        取消
-                    </span>
-                    <span class="confim">
-                        确认
-                    </span>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{> layout/footer}}

-{{> layout/header}}
-<div class="yoho-page select-coupon-page my-coupon-page">
-    <form id="new-coupon" method="POST" action="">
-        <input type="text" name="couponCode" value="" placeholder="输入优惠券码">
-        <button type="submit" class="submit">确定</button>
-    </form>
-    <div id="coupon-list" class="coupon-list"></div>
-    <div class="not-avaliable-coupon-line hide">不可使用的优惠券</div>
-    <div id="coupon-list-not" class="coupon-list"></div>
-</div>
-<script id="tmpl-coupon" type="text/tmpl">
-\{{#coupons}}
-    \{{^ notAvailable}}
-    <a class="employ-main" data-coupon-code="\{{ couponCode}}" data-coupon-value="\{{ couponValue}}" href="/shoppingCart/orderEnsure">
-        <span>\{{ couponValue}}</span>
-        <p class="coupon-name">\{{ couponDetailInfomation}}</p>
-        <p>有效期：\{{ couponValidity}}</p>
-    </a>
-    \{{/ notAvailable}}
-\{{/coupons}}
-</script>
-<script id="tmpl-coupon-not-avaliable" type="text/tmpl">
-\{{# notAvailableCoupons}}
-    <div class="employ-main not-avaliable">
-        <span>\{{ couponValue}}</span>
-        <p class="coupon-name">\{{ couponDetailInfomation}}</p>
-        <p>有效期：\{{ couponValidity}}</p>
-    </div>
-\{{/ notAvailableCoupons}}
-</script>
-<script id="tmpl-no-coupon" type="text/tmpl">
-<div class="coupon-list">
-    <div class="null">
-        <i></i>
-        <p>您还没有优惠券!</p>
-    </div>
-</div>
-</script>
-{{> layout/footer}}

@@ -72,10 +72,11 @@ class ShoppingcartController extends AbstractAction
 		$result = array();
 		$result = array();
 
 
 		if ($this->isAjax()) {
 		if ($this->isAjax()) {
-			$productId = $this->post('id', 0);
 			$uid = $this->getUid(true);
 			$uid = $this->getUid(true);
 			$shoppingKey = $this->getSession('shoppingKey');
 			$shoppingKey = $this->getSession('shoppingKey');
-			$result = CartModel::selectGoods($uid, $productId, $shoppingKey);
+
+            $skuList = $this->post('skuList', null);
+			$result = CartModel::selectGoods($uid, $skuList, $shoppingKey);
 		}
 		}
 
 
 		if (empty($result)) {
 		if (empty($result)) {

@@ -96,22 +96,25 @@ class CartModel
      * 购物车商品选择与取消接口返回的数据处理
      * 购物车商品选择与取消接口返回的数据处理
      *
      *
      * @param int $uid 用户ID
      * @param int $uid 用户ID
-     * @param string $sku 商品sku列表
+     * @param string $skuList 商品sku列表
      * @param string $shoppingKey 未登录用户唯一识别码
      * @param string $shoppingKey 未登录用户唯一识别码
      * @return array 处理之后的数据的数据
      * @return array 处理之后的数据的数据
      */
      */
-    public static function selectGoods($uid, $sku, $shoppingKey)
+    public static function selectGoods($uid, $skuList, $shoppingKey)
     {
     {
         $result = array('code' => 400, 'message' => '出错啦~');
         $result = array('code' => 400, 'message' => '出错啦~');
 
 
-        // 处理sku
-        $sku_list = json_encode(array($sku => 1));
+        do {
+            if (empty($skuList)) {
+                break;
+            }
 
 
-        $select = CartData::selectGoods($uid, $sku_list, $shoppingKey);
-        if ($select && isset($select['code'])) {
-            $result['code'] = $select['code'];
-            $result['message'] = $select['message'];
-        }
+            $select = CartData::selectGoods($uid, $skuList, $shoppingKey);
+            if ($select && isset($select['code'])) {
+                $result['code'] = $select['code'];
+                $result['message'] = $select['message'];
+            }
+        }while(0);
 
 
         return $result;
         return $result;
     }
     }

@@ -254,13 +254,13 @@ class BindController extends AbstractAction
             {
             {
                 $refer = rawurldecode($refer);
                 $refer = rawurldecode($refer);
             }
             }
-
+            
             if (isset($res['code']) && $res['code'] == 200 && !empty($res['data']['uid']))
             if (isset($res['code']) && $res['code'] == 200 && !empty($res['data']['uid']))
             {
             {
                 $token = Helpers::makeToken($res['data']['uid']);
                 $token = Helpers::makeToken($res['data']['uid']);
                 $this->setCookie('_TOKEN', $token);
                 $this->setCookie('_TOKEN', $token);
                 $this->setSession('_TOKEN', $token);
                 $this->setSession('_TOKEN', $token);
-                $refer = Helpers::syncUserSession($data['data']['uid'], $refer);
+                $refer = Helpers::syncUserSession($res['data']['uid'], $refer);
                 $data = array('code' => $res['code'], 'message' => $res['message'], 'data' => array('refer' => $refer));
                 $data = array('code' => $res['code'], 'message' => $res['message'], 'data' => array('refer' => $refer));
             }
             }
             else
             else