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

@@ -168,7 +168,7 @@ class DetailModel
                 foreach ($baseInfo['goodsList'] as $value) {
                 foreach ($baseInfo['goodsList'] as $value) {
                     $sizeList = array();
                     $sizeList = array();
                     $colorStorageNum = 0;
                     $colorStorageNum = 0;
-                    $sizeStorageStr = ''; // clear to empty
+                    $sizeStorageStr = '';
                     
                     
                     // 商品分组
                     // 商品分组
                     if (isset($value['goodsImagesList'])) {
                     if (isset($value['goodsImagesList'])) {
@@ -210,7 +210,7 @@ class DetailModel
                     // 缩略图
                     // 缩略图
                     $thumbImageList[] = array('img' => Helpers::getImageUrl($value['colorImage'], 60, 60) );
                     $thumbImageList[] = array('img' => Helpers::getImageUrl($value['colorImage'], 60, 60) );
                     
                     
-                    // 统计每个尺码对应的各个颜色的库存量
+                    // 统计尺码对应的各个颜色的库存量
                     foreach ($sizeList as &$sizeArr) {
                     foreach ($sizeList as &$sizeArr) {
                         $sizeArr['colorNumStr'] = implode('/', array_values($colorStorageGroup[ $sizeArr['name'] ]) );
                         $sizeArr['colorNumStr'] = implode('/', array_values($colorStorageGroup[ $sizeArr['name'] ]) );
                     }
                     }

@@ -86,6 +86,7 @@ class BindController extends AbstractAction
         $sourceType = $this->get('sourceType');
         $sourceType = $this->get('sourceType');
         $nickname = $this->get('nickname');
         $nickname = $this->get('nickname');
         $areaCode = $this->get('areaCode', '86');
         $areaCode = $this->get('areaCode', '86');
+        $phoneNum=$this->get('phoneNum');
         $data = array(
         $data = array(
             'bindPwd'=>true,//js标识
             'bindPwd'=>true,//js标识
             'backUrl' => '/', // 返回的URL链接
             'backUrl' => '/', // 返回的URL链接
@@ -94,7 +95,8 @@ class BindController extends AbstractAction
             'sourceType' => $sourceType, // 第三方登录来源
             'sourceType' => $sourceType, // 第三方登录来源
             'openId' => $openId, // openId
             'openId' => $openId, // openId
             'nickname' => $nickname, //昵称
             'nickname' => $nickname, //昵称
-            'areaCode' => $areaCode   //国别码
+            'areaCode' => $areaCode,   //国别码
+            'phoneNum' => $phoneNum   //国别码
         );
         );
 
 
         // 渲染模板
         // 渲染模板