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

@@ -19,7 +19,7 @@
                 </div>
                 <div class="item-content">
                     <h2>{{title}}</h2>
-                    <p>¥{{# price}}<span>{{.}}</span>{{/ price}}¥{{sPrice}}</p>
+                    <p>{{# price}}<span>¥{{.}}</span>{{/ price}}¥{{sPrice}}</p>
                 </div>
             </li>
             {{/ list}} 

@@ -51,6 +51,8 @@
                 {{/ newMain}}
 
                 {{> product/standard-content}}
+
+                {{> product/latest-walk}}
             </div>
         </div>
     {{/ newSale}}

@@ -3532,7 +3532,7 @@ slide = new Slide({
     loop: false,
     auto: false,
     timeout: 2,
-    index: 1
+    index: 0
 });
 
 slide.on('change', function(data) {
@@ -4931,10 +4931,20 @@ exports.init = function(page) {
     $('#agree-terms').click(function() {
         if ($(this).attr('notchecked')) {
             $(this).removeAttr('notchecked');
+            $registerBtn.addClass('disable').attr('disabled', 'true');
         } else {
             $(this).attr('notchecked', 'true');
+            $registerBtn.removeClass('disable').removeAttr('disabled');
         }
+    });
+
+    // 按回车键提交
+    $registerPage.on('keydown', function(e) {
+        var key = e.which;
 
+        if (key === 13) {
+            $registerBtn.click();
+        }
     });
 
     $registerPage.find('.va').keyup(function() {
@@ -5041,7 +5051,6 @@ exports.init = function(page) {
 
     //ajax表单提交
     $registerBtn.click(function() {
-
         var url;
 
         if (page === 'reg') {
@@ -5111,7 +5120,8 @@ exports.init = function(page) {
 
         $captchaImg.attr('src', captchaImgSrc + '?t=' + time.getTime());
     });
-};
+};
+
 });
 define("js/passport/mail-phone-regx", [], function(require, exports, module){
 /**

@@ -422,10 +422,20 @@ exports.init = function(page) {
     $('#agree-terms').click(function() {
         if ($(this).attr('notchecked')) {
             $(this).removeAttr('notchecked');
+            $registerBtn.addClass('disable').attr('disabled', 'true');
         } else {
             $(this).attr('notchecked', 'true');
+            $registerBtn.removeClass('disable').removeAttr('disabled');
         }
+    });
+
+    // 按回车键提交
+    $registerPage.on('keydown', function(e) {
+        var key = e.which;
 
+        if (key === 13) {
+            $registerBtn.click();
+        }
     });
 
     $registerPage.find('.va').keyup(function() {
@@ -532,7 +542,6 @@ exports.init = function(page) {
 
     //ajax表单提交
     $registerBtn.click(function() {
-
         var url;
 
         if (page === 'reg') {
@@ -602,4 +611,4 @@ exports.init = function(page) {
 
         $captchaImg.attr('src', captchaImgSrc + '?t=' + time.getTime());
     });
-};
\ No newline at end of file
+};

@@ -479,6 +479,9 @@
             }
         }
     }
+    .tpl-brands{
+        margin-top:-8px!important; 
+    }
 }
 .boys,.lifestyle{
     .goods-container{

@@ -383,7 +383,7 @@
 
     .multi .checkbox {
         display: block;
-        color: #ccc;
+        color: #444;
         font-size: 12px;
         margin-right: 3px;
     }

@@ -202,10 +202,8 @@
                 float: left;
                 display: block;
                 width: 110px;
-                height: 14px;
-                line-height: 14px;
+                line-height: 20px;
                 font-size: 12px;
-                margin-bottom: 5px;
                 color: #069;
                 text-decoration: underline;
             }

@@ -70,6 +70,11 @@ class ToolsController extends WebAction
             }
         }
     }
+    
+    public function logAction()
+    {
+        print_r($_SERVER);
+    }
 }           
 
 ?>
\ No newline at end of file

@@ -110,18 +110,20 @@ class HotrankModel
             'gender' => $data['gender'],
             'road' => $data['road']);
         $list = self::getSearchData($config, $page, 1);
-        $lister = $list['hotWeek']['list'];
-        $lister = array_values($lister);
-        if ($sid == 1 && $page == 1) {
-            $lister = array_slice($lister, 10, 50);
-        }
-        else {
-            $lister = array_slice($lister, 0, 50);
+        if (!empty($list)) {
+            $lister = $list['hotWeek']['list'];
+            $lister = array_values($lister);
+            if ($sid == 1 && $page == 1) {
+                $lister = array_slice($lister, 10, 50);
+            }
+            else {
+                $lister = array_slice($lister, 0, 50);
+            }
+            $data = array(
+                'code' => 200,
+                'data' => $lister,);
+            return $data;
         }
-        $data = array(
-            'code' => 200,
-            'data' => $lister,);
-        return $data;
     }
 
     /**
@@ -171,6 +173,7 @@ class HotrankModel
         }
         //根据给定查询数据搜索数据列表
         $result = SearchData::searchElasticByCondition($param);
+        //人气单品，一周热卖数据处理
         $data = self::getProductList($result, $page, $ajax);
         return $data;
     }
@@ -208,13 +211,13 @@ class HotrankModel
             return $product;
         }
         $data = $result['data']['product_list'];
-        $popular = array();
-        $hotWeek = array();
+        $popular = array(); //一周热卖
+        $hotWeek = array(); //人气单品
         foreach ($data as $key => $val) {
             if (empty($val['goods_list'])) {
                 continue;
             }
-            //$defaultGoodsId = 0;
+            $defaultGoodsId = 0;
             foreach ($val['goods_list'] as $v) {
                 if ($v['is_default'] == 'Y') {
                     $defaultGoodsId = empty($v['goods_id']) ? $val['goods_list'][0]['goods_id'] : $v['goods_id'];
@@ -226,8 +229,8 @@ class HotrankModel
                 $product['rank'] = $key + 1;
                 $product['title'] = $val['product_name'];
                 $product['href'] = $url . '_' . $product_id . '_' . $defaultGoodsId . '.html';
-                $product['price'] = (int) $val['market_price'] == (int) $val['sales_price'] ? '' : $val['market_price'];
-                $product['sPrice'] = empty($val['sales_price']) ? '' : $val['sales_price'];
+                $product['price'] = (int) $val['market_price'] == (int) $val['sales_price'] ? false : $val['market_price'];
+                $product['sPrice'] = empty($val['sales_price']) ? false : $val['sales_price'];
                 if ($key <= 5) {
                     //6张大图
                     $product['img'] = empty($val['default_images']) ? '' : Images::getImageUrl($val['default_images'], 378, 504, 2);
@@ -243,8 +246,8 @@ class HotrankModel
                 //一周热卖
                 $product['name'] = $val['product_name'];
                 $product['url'] = $url . '_' . $product_id . '_' . $defaultGoodsId . '.html';
-                $product['marketPrice'] = (int) $val['market_price'] == (int) $val['sales_price'] ? '' : $val['market_price'];
-                $product['salePrice'] = empty($val['sales_price']) ? '' : $val['sales_price'];
+                $product['marketPrice'] = (int) $val['market_price'] == (int) $val['sales_price'] ? false : $val['market_price'];
+                $product['salePrice'] = empty($val['sales_price']) ? false : $val['sales_price'];
                 $product['rank'] = '';
                 $product['thumb'] = empty($val['default_images']) ? '' : Images::getImageUrl($val['default_images'], 280, 373, 2);
                 $hot[] = $product;

@@ -148,6 +148,7 @@ class IndexController extends WebAction
         //获取频道
         $channel = HotrankModel::getChannelResource();
         $this->setWebNavHeader($channel['channel']);
+        $this->setTitle('热销排行|YOHO!BUY有货');
         $page = $this->get('page', 1);
         $sort = $this->get('sid', 1);
         $data = array('hotrankPage' => true,

-;woman首页
-routes.girlindex.type = "rewrite"
-routes.girlindex.match = "/woman"
-routes.girlindex.route.module = Index
-routes.girlindex.route.controller = Girls
-routes.girlindex.route.action = index
-
-;验证码
-routes.passportimage.type = "rewrite"
-routes.passportimage.match = "/passport/images"
-routes.passportimage.route.module = Passport
-routes.passportimage.route.controller = Images
-routes.passportimage.route.action = index
-
-; 登录页
-routes.login.type = "rewrite"
-routes.login.match = "/signin.html"
-routes.login.route.module = Passport
-routes.login.route.controller = Login
-routes.login.route.action = Index
-
-; 登录退出页
-routes.logout.type = "rewrite"
-routes.logout.match = "/logout.html"
-routes.logout.route.module = Passport
-routes.logout.route.controller = Login
-routes.logout.route.action = Out
-
-; 注册页
-routes.reg.type = "rewrite"
-routes.reg.match = "/reg.html"
-routes.reg.route.module = Passport
-routes.reg.route.controller = Register
+;默认首页
+routes.index.type = "rewrite"
+routes.index.match = "/index.html"
+routes.index.route.module = Index
+routes.index.route.controller = Index
+routes.index.route.action = Index
+
+;woman首页
+routes.girlindex.type = "rewrite"
+routes.girlindex.match = "/woman"
+routes.girlindex.route.module = Index
+routes.girlindex.route.controller = Girls
+routes.girlindex.route.action = index
+
+;验证码
+routes.passportimage.type = "rewrite"
+routes.passportimage.match = "/passport/images"
+routes.passportimage.route.module = Passport
+routes.passportimage.route.controller = Images
+routes.passportimage.route.action = index
+
+; 登录页
+routes.login.type = "rewrite"
+routes.login.match = "/signin.html"
+routes.login.route.module = Passport
+routes.login.route.controller = Login
+routes.login.route.action = Index
+
+; 登录退出页
+routes.logout.type = "rewrite"
+routes.logout.match = "/logout.html"
+routes.logout.route.module = Passport
+routes.logout.route.controller = Login
+routes.logout.route.action = Out
+
+; 注册页
+routes.reg.type = "rewrite"
+routes.reg.match = "/reg.html"
+routes.reg.route.module = Passport
+routes.reg.route.controller = Register
 routes.reg.route.action = Index
\ No newline at end of file