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

@@ -81,17 +81,21 @@ class BindData
      * @param  string $area       国别码
      * @param  string $password   密码
      */
-    public static function bindMobile($openId, $nickname, $sourceType, $mobile, $area, $password = '')
+    public static function bindMobile($openId, $sourceType, $mobile, $area, $password = '', $nickname = '')
     {
         $param = Yohobuy::param();
 
         $param['method'] = 'app.passport.bind';
         $param['mobile'] = $mobile;
         $param['open_id'] = $openId;
-        $param['nickname'] = $nickname;
         $param['source_type'] = $sourceType;
         $param['area'] = $area;
-        if (!empty($password)) {
+        if (!empty($nickname))
+        {
+            $param['nickname'] = $nickname;
+        }
+        if (!empty($password))
+        {
             $param['password'] = $password;
         }
         $param['client_secret'] = Sign::getSign($param);
@@ -99,7 +103,6 @@ class BindData
         return Yohobuy::get(Yohobuy::API_URL, $param);
     }
 
-    
     /**
      * 换绑手机检验
      * @param  string $mobile     手机号
@@ -116,7 +119,6 @@ class BindData
         return Yohobuy::get(Yohobuy::API_URL, $param);
     }
 
-    
     /**
      * 换绑手机
      * @param  string $uid        用户Id
@@ -138,5 +140,4 @@ class BindData
         return Yohobuy::get(Yohobuy::API_URL, $param);
     }
 
-    
 }

@@ -32,6 +32,9 @@ function showFooter() {
     }, 200);
 }
 
+if ($('#goodsDiscount h1').length < 1) {
+    $('.dropdown').remove();
+}
 showFooter();
 
 lazyLoad($('img.lazy'));

@@ -12,7 +12,7 @@
     {{else}}
         {{# freebie}}
             <div class="advance-block gift-block" data-promotion-id="{{promotionId}}">
-                <p class="title">{{title}}</p>
+                <p class="title">{{promotionTitle}}</p>
                 {{#goods}}
                     {{> cart/gift-advance-good}}
                 {{/goods}}

@@ -20,7 +20,7 @@
                 <span class="iconfont">&#xe620;</span>
                 赠品
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
-                    <span class="count">{{count}}</span>
+                    <span class="count">{{giftCount}}</span>
                 </a>
             </li>
         {{/ freebie}}

@@ -46,7 +46,7 @@ class CartModel
      *
      * @param integer $uid 用户ID
      * @param string $shoppingKey 未登录用户唯一识别码
-     * @param string $cartType 购物车类型
+     * @param string $cartType 购物车类型，默认是是所有购物车，ordinary为普通购物车，advance为预售购物车
      * @param bool $onlyGift 只获取赠品的商品数据
      * @param bool $onlyAdvanceBuy 只获取加价购的商品数据
      * @return array|mixed 处理之后的购物车数据
@@ -73,7 +73,7 @@ class CartModel
 
             $cart = $cartData['data'];
 
-            if ($cartType !== 'all') { // 加价购或者赠品数据
+            if ($onlyGift || $onlyAdvanceBuy) { // 加价购或者赠品数据
                 $result = self::procCartData($cart['ordinary_cart_data'], $onlyGift, $onlyAdvanceBuy);
                 break;
             }
@@ -99,7 +99,7 @@ class CartModel
             // 以上两个购物车中都有数据, 默认显示普通购物车
             else {
                 $result['cartNav'] = true;
-                $result['cartType'] = 'ordinary';
+                $result['cartType'] = $cartType !== 'all' ? $cartType : 'ordinary';
             }
 
             /* 普通购物车 */

@@ -40,10 +40,11 @@ class IndexController extends AbstractAction
 
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
+        $cartType = $this->get('cartType', 'all');
 
         $data = array(
             'shoppingCartPage' => true,
-            'shoppingCart' => CartModel::getCartData($uid, $shoppingKey)
+            'shoppingCart' => CartModel::getCartData($uid, $shoppingKey, $cartType)
         );
 
         // 渲染模板

@@ -225,14 +225,14 @@ class BindController extends AbstractAction
             $openId = $this->post('openId');
             $areaCode = $this->post('areaCode', '86');
             $sourceType = $this->post('sourceType');
-            $nickname = $this->post('nickname');
-            $password = $this->post('password');
+//            $nickname = $this->post('nickname');//nickname不同步信息
+            $password = !empty($this->post('password'))?$this->post('password'):'';
 
             if (!is_numeric($phoneNum) || !$openId || !$sourceType || !$areaCode) {
                 break;
             }
 
-            $res = BindData::bindMobile($openId, $nickname, $sourceType, $phoneNum, $areaCode, $password);
+            $res = BindData::bindMobile($openId,$sourceType, $phoneNum, $areaCode, $password);
             if (!isset($res['code'])) {
                 break;
             }