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

@@ -11,7 +11,7 @@
                 </span>
                 <ul id="country-code-list" class="country-code-list">
                     {{# countryList}}
-                    <li data-cc="+{{code}}">{{name}} +{{code}}</li>
+                    <li data-cc="{{areaCode}}">{{name}} {{areaCode}}</li>
                     {{/ countryList}}                      
                 </ul>
             </div>
@@ -28,7 +28,7 @@
                     </li>
                     <li class="input-container-li clearfix">
                         <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="验证码" autocomplete="off" maxlength="4">
-                        <img id="captcha-img" class="captcha-img" src="http://web.dev.yohobuy.com/passport/images" alt="">
+                        <img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">
                         <a id="change-captcha" class="link change-captcha">换一张</a>
                         <span id="captcha-err" class="err-tip captcha-err hide">
                             <i></i>

@@ -1744,9 +1744,12 @@ if ($udPrice.length > 0) {
 
 //【高级选项】鼠标移入显示子项
 $seniorAttrWrap.on('mouseenter', '.attr', function() {
-    var index = $(this).addClass('hover').index();
+    var $this = $(this);
+    var index = $this.index();
+
+    $this.addClass('hover').siblings().removeClass('hover');
 
-    $seniorSubWrap.children('.senior-sub:eq(' + index + ')').removeClass('hide');
+    $seniorSubWrap.children('.senior-sub:eq(' + index + ')').removeClass('hide').siblings().addClass('hide');
 }).on('mouseleave', '.attr', function() {
     var $this = $(this),
         index = $this.index();
@@ -1782,6 +1785,7 @@ $('.senior-sub').on('click', '.multi-select', function() {
 }).on('mouseleave', function() {
     hideSeniorPanel();
 });
+
 });
 define("js/product/sort-pager", ["jquery"], function(require, exports, module){
 /**
@@ -3962,7 +3966,7 @@ function picCaptchaAjaxFn(page, callback) {
         type: 'POST',
         url: url,
         data: {
-            code: $ca.val()
+            verifyCode: $ca.val()
 
             //mobile: $pn.val(),
             //area: $region.text().split('+')[1]
@@ -3995,7 +3999,7 @@ function msgCaptchaAjaxFn(page, callback) {
         type: 'POST',
         url: url,
         data: {
-            code: $ca.val(),
+            verifyCode: $ca.val(),
             mobile: $pn.val(),
             area: $region.text().split('+')[1]
         }
@@ -4291,7 +4295,7 @@ exports.init = function(page) {
 
     $regionSelect.change(function() {
 
-        $region.text('+' + $('#region').val());
+        $region.text($('#region').val());
 
         validateRule(page, $pn, showErrTip); //验证
     });
@@ -4319,7 +4323,7 @@ exports.init = function(page) {
             data: {
                 area: $region.text().split('+')[1],
                 mobile: $pn.val(),
-                code: $ca.val()
+                verifyCode: $ca.val()
             }
         }).then(function(data) {
             if (data.code === 200) {

@@ -218,10 +218,11 @@
     .price-sure {
         height: 24px;
         width: 44px;
-        border: 1px solid #e0e0e0;
-        background: #fff;
-        color: #666;
+        background: #333;
+        color: #fff;
         margin-left: 10px;
+        outline: none;
+        border: none;
     }
 
     .color-block {

@@ -43,6 +43,7 @@
             color: #222;
             cursor: pointer;
             margin-right: 10px;
+            background: #fff;
         }
 
         .iconfont {

@@ -22,6 +22,7 @@ class BackController extends WebAction
                 'coverImg' => $banner['img'],
                 'countryCode' => '86',
                 'countryName' => '中国',
+                'captchaUrl'=>'/passport/images?t=1449799445',
                 'countryList' => RegData::getAreasData(),
             )
         );
@@ -40,7 +41,7 @@ class BackController extends WebAction
     {
         $phoneNum = $this->post('phoneNum','');
         $area = $this->post('area','86');
-        $captcha = $this->post('captcha','');
+        $verifyCode = $this->post('verifyCode','');
         if(Helpers::verifyEmail($phoneNum)){ //验证邮箱
             $email = $phoneNum;
             $data = BackData::sendCodeToEmail($email);
@@ -56,7 +57,7 @@ class BackController extends WebAction
             $data = BackData::sendCodeToMobile($mobile);
             $this->setSession('phoneNum', $phoneNum);
             $this->setSession('area', $area);
-            $this->setSession('captcha', $captcha);
+            $this->setSession('verifyCode', $verifyCode);
             if($data['code'] == 200) {
                 $this->redirect('verification');
             }
@@ -75,23 +76,6 @@ class BackController extends WebAction
             $this->redirect('index');
         }
         $banner = PassportModel::getLeftBanner(PassportModel::BACK_LFFT_BANNER_CODE);
-        $simpleHeader = array(
-            'logo' => array(
-                'img' => 'http://static.yohobuy.com/newheader/img/logo_e.png',
-                'url' => 'http://www.yohobuy.com'
-            ),
-            'tool' => array(
-                'user' => '2586703@qq.com',
-                'userCenter' => '',
-                'loginHref' => '',
-                'logoutHref' => '',
-                'registerHref' => '',
-                'favoriteHref' => '',
-                'couponHref' => '',
-                'orderHref' => '',
-                'helpHref' => ''
-            )
-        );
         $data = array(
             'simpleHeader' => PassportModel::getSimpleHeader(false),
             'sendEmail' => array(
@@ -176,7 +160,7 @@ class BackController extends WebAction
     public function verificationAction() {
         $phoneNum = $this->getSession('phoneNum');
         $area = $this->getSession('area');
-        $captcha = $this->getSession('captcha');
+        $verifyCode = $this->getSession('verifyCode');
         if(empty($phoneNum)) {
             $this->redirect('index');
         }

@@ -27,7 +27,7 @@ class RegisterController extends WebAction
                 'loginUrl' => '/signin.html?refer='.$refer,
                 'coverHref' => $cover['url'],
                 'coverImg' => $cover['img'],
-                'regBtnText' => '快速登录'
+                'regBtnText' => '立即注册'
             )
         );
         $this->setCookie('refer', $refer);