Merge branch 'release/4.5' of http://git.dev.yoho.cn/web/yohobuywap into release/4.5

@@ -516,4 +516,17 @@ class FloorProcess
         $result['notice']['img'] = Helpers::getImageUrl($data['img'], 110, 25);
         return $result;
     }
+    /**
+     * 文本数据处理方法
+     *
+     * @param  array $data 文本数据
+     * @param $type 类型 默认1:男首页 2:女首页  3:kids 4:lifestyle
+     * @author sefon 2016-5-26 17:13:06
+     * @return array       处理之后的文本数据
+     */
+
+    private static function text($data, $type)
+    {
+        return $data;
+    }
 }

@@ -183,6 +183,14 @@ function searchResult() {
     writeSearch.bindWirteLocal($('.brand-list'));
 }
 
+if ($('.history-search').length > 0) {
+    writeSearch.bindWirteLocal($('.history-search'));
+}
+
+if ($('.hot-search').length > 0) {
+    writeSearch.bindWirteLocal($('.hot-search'));
+}
+
 if ($('.brand-search-page').length > 0) {
     brandsData = $.parseJSON($('#brands-data').html());
     $keyword = $('#keyword');

@@ -29,7 +29,7 @@ function addHistory(brandName, brandId, brandDomain) {
 
 //绑定提交前的存local操作
 function bindWirteLocal($brandList) {
-    $brandList.on('click', 'p', function(e) {
+    $brandList.on('click', 'p , li', function(e) {
         var brandName, brandId, brandDomain, url;
         var a = $(this).find('a');
         var query = a.attr('brandName') + a.attr('href'),

@@ -36,20 +36,18 @@
 
         <div class="brandNav">
             <ul>
-                {{#if brandType}}
                 <li class="allbrand active" data-id="0">
                     <span>{{brandType}}</span>
                     <span class="split-border"></span>
                 </li>
                 <li class="newbrand" data-id="1">
-                    <span>{{brandType}}</span>
+                    <span>{{secondBrandType}}</span>
                     <span class="split-border"></span>
                 </li>
                 <li class="recommandbrand" data-id="2">
-                    <span>{{brandType}}</span>
+                    <span>{{thirdBrandType}}</span>
                     <span class="split-border"></span>
                 </li>
-                {{/if}
             </ul>
         </div>
         <div class="second-level-brand">

@@ -24,7 +24,7 @@
             <ul class="history clearfix">
                 {{# history}}
                 <li>
-                    <a href={{url}}>{{name}}</a>
+                    <a href={{url}} brandName="{{name}}" brandId="{{brandId}}" brandDomain="{{brandDomain}}">{{name}}</a>
                 </li>
                 {{/ history}}
             </ul>
@@ -32,7 +32,7 @@
         {{else}}
             <div class="history-search local-search hide">
                 <h3><span class="iconfont">&#xe64a;</span>最近搜索
-                    <button id="clear-history" class="clear-icon iconfont hide">&#xe621;</button>
+                    <button id="clear-history" class="clear-icon iconfont hide">&#xe64c;</button>
                 </h3>
                 <ul class="history clearfix">
                 </ul>
@@ -43,7 +43,7 @@
             <ul class="hot clearfix">
                 {{# hot}}
                     <li>
-                        <a href={{url}}>{{name}}</a>
+                        <a href={{url}} brandName="{{name}}" brandId="{{brandId}}" brandDomain="{{brandDomain}}">{{name}}</a>
                     </li>
                 {{/ hot}}
             </ul>

@@ -30,13 +30,11 @@ class BrandModel
 
     /**
      * 根据频道获取品牌一览数据
-     *
-     * @param $code 资源码
      * @param int $channel 1表示男生频道, 2表示女生频道, 3表示潮童频道, 4表示创意生活频道
      * @return array
      * @modify sefon 2016-5-13 10:52:55 添加新入驻品牌，推荐品牌
      */
-    public static function getBrandByChannel($code,$channel)
+    public static function getBrandByChannel($channel)
     {
         $result = array();
         $brand = array();
@@ -58,25 +56,21 @@ class BrandModel
         );
         $channels[$channel-1]['active'] = true;
         $result['channels'] = $channels;
-
-        // tar modified 通过资源位获取数据
         /* 根据频道调用接口 */
-//        switch (intval($channel)) {
-//            case 1:   // 男生
-//                $brand = BrandData::package(self::CODE_TOPPOS_BOYS, 1);
-//                break;
-//            case 2:   // 女生
-//                $brand = BrandData::package(self::CODE_TOPPOS_GIRLS, 2);
-//                break;
-//            case 3:   // 潮童
-//                $brand = BrandData::package(self::CODE_TOPPOS_KIDS, 3);
-//                break;
-//            case 4:   // 创意生活
-//                $brand = BrandData::package(self::CODE_TOPPOS_LIFESTYLE, 4);
-//                break;
-//        }
-        $brand = BrandData::package($code, intval($channel));
-//        print_r($brand); exit;
+        switch (intval($channel)) {
+            case 1:   // 男生
+                $brand = BrandData::package(self::CODE_TOPPOS_BOYS, 1);
+                break;
+            case 2:   // 女生
+                $brand = BrandData::package(self::CODE_TOPPOS_GIRLS, 2);
+                break;
+            case 3:   // 潮童
+                $brand = BrandData::package(self::CODE_TOPPOS_KIDS, 3);
+                break;
+            case 4:   // 创意生活
+                $brand = BrandData::package(self::CODE_TOPPOS_LIFESTYLE, 4);
+                break;
+        }
         // 模板中的使用JS标识
         $result['brandPage'] = true;
         // 是否显示app下载浮层标识
@@ -86,7 +80,19 @@ class BrandModel
 
         // 资源位处理
         $result['topData'] = FloorProcess::getContent(array('list' => $brand['brandTop']), $channel);
-
+        //品牌分类tab从资源位获取..
+        $brandTypeCount = 0;
+        $result['brandType'] = '全部品牌';
+        $brandTypeName = array('secondBrandType', 'thirdBrandType');
+        foreach ($result['topData'] as $key => $val) {
+            if ($brandTypeCount >1) {
+                break;
+            }
+            if (isset($val['text']) && !empty($val['text'])) {
+                $result[$brandTypeName[$brandTypeCount]]= $val['text'];
+                $brandTypeCount++ ;
+            }
+        }
         /* 按字母'A-Z'分组的品牌列表 */
         if (!empty($brand['brandList']['all_list'])) {
             $list = array();
@@ -191,9 +197,10 @@ class BrandModel
             }
             foreach ($list['data'] as $key => $val) {
                 $result[$val['brandDomain']]  = array(
+                    'brandDomain' => $val['brandDomain'],
+                    'brandId' => $val['brandId'],
+                    'name' => $val['searchTerms'],
                     'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
-                    'id' => $val['brandId'],
-                    'name' => $val['searchTerms']
                 );
             }
         } while(false);
@@ -216,9 +223,10 @@ class BrandModel
             }
             foreach ($hot['data'] as $key => $val) {
                 $result[]  = array(
-                    'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
                     'id' => isset($val['brandId']) ? $val['brandId'] : '',
-                    'name' => isset($val['brandName']) ? $val['brandName'] : ''
+                    'brandDomain' => isset($val['brandDomain']) ? $val['brandDomain'] : '',
+                    'name' => isset($val['brandName']) ? $val['brandName'] : '',
+                    'url' => isset($val['brandDomain']) ? Helpers::url('', '', $val['brandDomain']) : '',
                 );
             }
         } while(false);

@@ -695,10 +695,12 @@ class UserModel
         } else if (!empty($email) && !Helpers::verifyEmail($email)) {
             $result['code'] = 404;
             $result['message'] = '输入的邮箱地址格式不正确';
-        } else if (!empty($mobile) && !Helpers::verifyMobile($mobile)) {
-            $result['code'] = 404;
-            $result['message'] = '输入的手机号码格式不正确';
-        } else {
+        }
+//        else if (!empty($mobile) && !Helpers::verifyMobile($mobile)) {
+//            $result['code'] = 404;
+//            $result['message'] = '输入的手机号码格式不正确';
+//        }
+        else {
             // 调用接口保存地址数据
             $address = UserData::saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code);
             // 处理返回结果

@@ -41,8 +41,7 @@ class BrandController extends AbstractAction
                 $channel = 1;
             }
         }
-        $code = 'ce6ac059493ec26241a8cbe0bfa1b17a';
-        $channel = Category\BrandModel::getBrandByChannel($code,$channel);
+        $channel = Category\BrandModel::getBrandByChannel($channel);
         // 渲染模板
         $this->_view->display('index', array(
             'brandPage' => true,