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

@@ -102,14 +102,14 @@ class HelperSearch
         $result['opts']['pageCount'] = $data['product']['page_total'];
         $result['opts']['pageCount'] = $data['product']['page_total'];
         $result['opts']['nextHref'] = ($next = self::next($data['product']['page_total'],$data['product']['filter'])) ? $next['href'] : '';
         $result['opts']['nextHref'] = ($next = self::next($data['product']['page_total'],$data['product']['filter'])) ? $next['href'] : '';
         $result['hasNextPage'] = self::next($data['product']['page_total']);
         $result['hasNextPage'] = self::next($data['product']['page_total']);
+        //全部折扣
+        $result['leftContent'][]['allDiscount'] = isset($data['discount']) ? self::getDiscount($data['discount']['discount']) : array();
         //分类条件
         //分类条件
         $result['filters']['sort'] = isset($data['sort']) ? self::searchSort($data['sort']['sort']) : array();
         $result['filters']['sort'] = isset($data['sort']) ? self::searchSort($data['sort']['sort']) : array();
         //左侧分类分类
         //左侧分类分类
         $result['leftContent'][]['allSort'] = isset($data['sort']) ? self::groupSort($data['sort']['sort']) : array();
         $result['leftContent'][]['allSort'] = isset($data['sort']) ? self::groupSort($data['sort']['sort']) : array();
         //一周新品上架
         //一周新品上架
         $result['leftContent'][]['newSales'] = isset($data['recent']) ? self::recentShelve($data['recent']['recent']) : array();
         $result['leftContent'][]['newSales'] = isset($data['recent']) ? self::recentShelve($data['recent']['recent']) : array();
-        //全部折扣
-        $result['leftContent'][]['allDiscount'] = isset($data['discount']) ? self::getDiscount($data['discount']['discount']) : array();
        //总记录数
        //总记录数
         $result['totalCount'] = $data['product']['total'];
         $result['totalCount'] = $data['product']['total'];
         //品牌店铺信息
         //品牌店铺信息

@@ -86,6 +86,7 @@ $('.invoice').on('touchend', '.checkbox', function() {
     if ($this.hasClass('icon-checkbox')) {
     if ($this.hasClass('icon-checkbox')) {
         $('.invoice').removeClass('focus');
         $('.invoice').removeClass('focus');
     }
     }
+    return false;
 });
 });
 
 
 function orderCompute(firstEnter) {
 function orderCompute(firstEnter) {

 <div class="register-page">
 <div class="register-page">
-    <!--<form id="register-form" class="register-form" method="POST" action="{{actionUrl}}" autocomplete="off">-->
     <ul>
     <ul>
         <li class="clearfix">
         <li class="clearfix">
             <select id="region" class="region" name="region">
             <select id="region" class="region" name="region">
@@ -49,7 +48,7 @@
         {{# loginUrl}}
         {{# loginUrl}}
         <li class="quick-login-container">
         <li class="quick-login-container">
             我已注册YOHO!有货账号
             我已注册YOHO!有货账号
-                <a class="link go-login" href="{{.}}">完善信息</a>
+            <a class="link go-login" href="{{.}}">快速登录</a>
         </li>
         </li>
         {{/loginUrl}}
         {{/loginUrl}}
 
 
@@ -64,5 +63,4 @@
         <span></span>
         <span></span>
         <b></b>
         <b></b>
     </div>
     </div>
-    <!--</form>-->
 </div>
 </div>

@@ -39,12 +39,12 @@
     <div class="good-detail-text">
     <div class="good-detail-text">
         <a href="{{url}}">{{name}}</a>
         <a href="{{url}}">{{name}}</a>
         <p class="price">
         <p class="price">
-            <span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
-                ¥{{salePrice}}
-            </span>
             {{# marketPrice}}
             {{# marketPrice}}
                 <span class="market-price">¥{{.}}</span>
                 <span class="market-price">¥{{.}}</span>
             {{/ marketPrice}}
             {{/ marketPrice}}
+            <span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
+                ¥{{salePrice}}
+            </span>
         </p>
         </p>
     </div>
     </div>
 </div>
 </div>

@@ -29,7 +29,9 @@ var $pwdIntensity = $('.pwd-intensity'),
 
 
 //signup验证
 //signup验证
 var $region = $('#country-code'),
 var $region = $('#country-code'),
-    $regionSelect = $('#region');
+    $regionSelect = $('#region'),
+    isPwd = false,
+    pwdVal;
 
 
 setTimeout(function() {
 setTimeout(function() {
     $pn.val('');
     $pn.val('');
@@ -43,10 +45,13 @@ setTimeout(function() {
 $ca.attr('maxlength', caCount);
 $ca.attr('maxlength', caCount);
 
 
 //密码规则提示
 //密码规则提示
-$pwd.focus(function() {
+$pwd.focus(function(event) {
     $pwdTips.removeClass('hide');
     $pwdTips.removeClass('hide');
+    isPwd = true;
+    pwdVal = $(this).val();
 }).blur(function() {
 }).blur(function() {
     $pwdTips.addClass('hide');
     $pwdTips.addClass('hide');
+    isPwd = false;
 });
 });
 
 
 
 
@@ -509,6 +514,23 @@ exports.init = function(page) {
         });
         });
     });
     });
 
 
+    // 防止粘贴密码
+    /*$('#pwd, #repwd').keydown(function (event) {
+
+        console.log(event.ctrlKey);
+        console.log(isPwd);
+        console.log(event.keyCode);
+
+        if (event.ctrlKey && isPwd && event.keyCode === 86) {
+            $(this).val(pwdVal);
+        }
+
+    });*/
+
+    $pwd[0].onpaste = function() {
+        return false;
+    };
+
     //ajax表单提交
     //ajax表单提交
     $registerBtn.click(function() {
     $registerBtn.click(function() {
 
 

@@ -27,7 +27,7 @@
                 outline: none;
                 outline: none;
             }
             }
 
 
-            input {
+            input.input {
                 height: 43px;
                 height: 43px;
                 line-height: 43px;
                 line-height: 43px;
                 font-size: 16px;
                 font-size: 16px;
@@ -53,7 +53,12 @@
                     float: left;
                     float: left;
                 }
                 }
 
 
-                &.send-captcha {
+                &.agree-terms {
+                    vertical-align: middle;
+                }
+            }
+
+            input.send-captcha {
                 top: 0;
                 top: 0;
                 background: #ff1901;
                 background: #ff1901;
                 position: absolute;
                 position: absolute;
@@ -68,13 +73,6 @@
                 }
                 }
             }
             }
 
 
-                &.agree-terms {
-                    width: initial;
-                    height: initial;
-                    vertical-align: middle;
-                }
-            }
-
             .link {
             .link {
                 text-decoration: underline;
                 text-decoration: underline;
                 color: #ff1901;
                 color: #ff1901;

@@ -52,6 +52,11 @@
         > .price {
         > .price {
             margin-top: 10px;
             margin-top: 10px;
         }
         }
+
+        .market-price {
+            text-decoration: line-through;
+            color: #999;
+        }
     }
     }
 
 
     .col-btn {
     .col-btn {

@@ -102,9 +102,6 @@ class SearchModel
         if (!isset($condition['order']) || empty($condition['order'])) {
         if (!isset($condition['order']) || empty($condition['order'])) {
             $condition['order'] = 's_n_desc';
             $condition['order'] = 's_n_desc';
         }
         }
-        if (!isset($condition['p_d']) || empty($condition['p_d'])) {
-            $condition['p_d'] = '0,0.9';
-        }
         $options = array(
         $options = array(
             'imgSize' => $imgSize,
             'imgSize' => $imgSize,
             'minImgSize' => $minImgSize,
             'minImgSize' => $minImgSize,
@@ -168,8 +165,10 @@ class SearchModel
         // 组合搜索分类url
         // 组合搜索分类url
         $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
         $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
         // 组合搜索店铺url
         // 组合搜索店铺url
+        if (isset($param['keyword'])) {
             $param['keyword'] = $searchCondition['condition']['query'];
             $param['keyword'] = $searchCondition['condition']['query'];
             $urlList['shop'] = HelperSearch::getShopUrl($param);
             $urlList['shop'] = HelperSearch::getShopUrl($param);
+        }
         //用户浏览记录
         //用户浏览记录
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         $result = Yohobuy::getMulti($urlList, array(), true);
         $result = Yohobuy::getMulti($urlList, array(), true);

@@ -2,7 +2,7 @@
 
 
 use Action\AbstractAction;
 use Action\AbstractAction;
 
 
-class RegisterController extends AbstractAction
+class Register1Controller extends AbstractAction
 {
 {
     /**
     /**
      * 登录页
      * 登录页
@@ -49,7 +49,7 @@ class RegisterController extends AbstractAction
                 'coverImg' => 'http://img12.static.yhbimg.com/yhb-img01/2015/12/01/07/020a0b6e7ff908d0c2bc4045b4fef42b9f.png?imageView/2/w/252/h/190'
                 'coverImg' => 'http://img12.static.yhbimg.com/yhb-img01/2015/12/01/07/020a0b6e7ff908d0c2bc4045b4fef42b9f.png?imageView/2/w/252/h/190'
             )
             )
         );
         );
-        $this->_view->display('index', $data);
+        $this->_view->display('../register/index', $data);
     }
     }
 
 
     public function checkmobileAction()
     public function checkmobileAction()

@@ -17,7 +17,11 @@ class ListController extends WebAction
      */
      */
     public function saleAction()
     public function saleAction()
     {
     {
-        $list = SearchModel::getListData();
+        //排序
+        $condition['order'] = 's_n_desc';
+        //打折
+        $condition['p_d'] = '0,0.9';
+        $list = SearchModel::getListData($condition);
         $data = array(
         $data = array(
             //初始化js
             //初始化js
             'productListPage' => true,
             'productListPage' => true,