wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by uedxwg
Commit a8b21ccc67a779b7892439721b685ee29096365a 2 parents abf4b25c 7085a6b3

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

Inline Side-by-side
Showing 13 changed files with 22 additions and 32 deletions
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </span> 11 </span>
12 <ul id="country-code-list" class="country-code-list"> 12 <ul id="country-code-list" class="country-code-list">
13 {{# countryList}} 13 {{# countryList}}
14 - <li data-cc="+{{code}}">{{name}} +{{code}}</li> 14 + <li data-cc="{{areaCode}}">{{name}} {{areaCode}}</li>
15 {{/ countryList}} 15 {{/ countryList}}
16 </ul> 16 </ul>
17 </div> 17 </div>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 </li> 28 </li>
29 <li class="input-container-li clearfix"> 29 <li class="input-container-li clearfix">
30 <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="验证码" autocomplete="off" maxlength="4"> 30 <input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="验证码" autocomplete="off" maxlength="4">
31 - <img id="captcha-img" class="captcha-img" src="http://web.dev.yohobuy.com/passport/images" alt=""> 31 + <img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">
32 <a id="change-captcha" class="link change-captcha">换一张</a> 32 <a id="change-captcha" class="link change-captcha">换一张</a>
33 <span id="captcha-err" class="err-tip captcha-err hide"> 33 <span id="captcha-err" class="err-tip captcha-err hide">
34 <i></i> 34 <i></i>
@@ -1744,9 +1744,12 @@ if ($udPrice.length > 0) { @@ -1744,9 +1744,12 @@ if ($udPrice.length > 0) {
1744 1744
1745 //【高级选项】鼠标移入显示子项 1745 //【高级选项】鼠标移入显示子项
1746 $seniorAttrWrap.on('mouseenter', '.attr', function() { 1746 $seniorAttrWrap.on('mouseenter', '.attr', function() {
1747 - var index = $(this).addClass('hover').index(); 1747 + var $this = $(this);
  1748 + var index = $this.index();
  1749 +
  1750 + $this.addClass('hover').siblings().removeClass('hover');
1748 1751
1749 - $seniorSubWrap.children('.senior-sub:eq(' + index + ')').removeClass('hide'); 1752 + $seniorSubWrap.children('.senior-sub:eq(' + index + ')').removeClass('hide').siblings().addClass('hide');
1750 }).on('mouseleave', '.attr', function() { 1753 }).on('mouseleave', '.attr', function() {
1751 var $this = $(this), 1754 var $this = $(this),
1752 index = $this.index(); 1755 index = $this.index();
@@ -1782,6 +1785,7 @@ $('.senior-sub').on('click', '.multi-select', function() { @@ -1782,6 +1785,7 @@ $('.senior-sub').on('click', '.multi-select', function() {
1782 }).on('mouseleave', function() { 1785 }).on('mouseleave', function() {
1783 hideSeniorPanel(); 1786 hideSeniorPanel();
1784 }); 1787 });
  1788 +
1785 }); 1789 });
1786 define("js/product/sort-pager", ["jquery"], function(require, exports, module){ 1790 define("js/product/sort-pager", ["jquery"], function(require, exports, module){
1787 /** 1791 /**
@@ -3962,7 +3966,7 @@ function picCaptchaAjaxFn(page, callback) { @@ -3962,7 +3966,7 @@ function picCaptchaAjaxFn(page, callback) {
3962 type: 'POST', 3966 type: 'POST',
3963 url: url, 3967 url: url,
3964 data: { 3968 data: {
3965 - code: $ca.val() 3969 + verifyCode: $ca.val()
3966 3970
3967 //mobile: $pn.val(), 3971 //mobile: $pn.val(),
3968 //area: $region.text().split('+')[1] 3972 //area: $region.text().split('+')[1]
@@ -3995,7 +3999,7 @@ function msgCaptchaAjaxFn(page, callback) { @@ -3995,7 +3999,7 @@ function msgCaptchaAjaxFn(page, callback) {
3995 type: 'POST', 3999 type: 'POST',
3996 url: url, 4000 url: url,
3997 data: { 4001 data: {
3998 - code: $ca.val(), 4002 + verifyCode: $ca.val(),
3999 mobile: $pn.val(), 4003 mobile: $pn.val(),
4000 area: $region.text().split('+')[1] 4004 area: $region.text().split('+')[1]
4001 } 4005 }
@@ -4291,7 +4295,7 @@ exports.init = function(page) { @@ -4291,7 +4295,7 @@ exports.init = function(page) {
4291 4295
4292 $regionSelect.change(function() { 4296 $regionSelect.change(function() {
4293 4297
4294 - $region.text('+' + $('#region').val()); 4298 + $region.text($('#region').val());
4295 4299
4296 validateRule(page, $pn, showErrTip); //验证 4300 validateRule(page, $pn, showErrTip); //验证
4297 }); 4301 });
@@ -4319,7 +4323,7 @@ exports.init = function(page) { @@ -4319,7 +4323,7 @@ exports.init = function(page) {
4319 data: { 4323 data: {
4320 area: $region.text().split('+')[1], 4324 area: $region.text().split('+')[1],
4321 mobile: $pn.val(), 4325 mobile: $pn.val(),
4322 - code: $ca.val() 4326 + verifyCode: $ca.val()
4323 } 4327 }
4324 }).then(function(data) { 4328 }).then(function(data) {
4325 if (data.code === 200) { 4329 if (data.code === 200) {
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -218,10 +218,11 @@ @@ -218,10 +218,11 @@
218 .price-sure { 218 .price-sure {
219 height: 24px; 219 height: 24px;
220 width: 44px; 220 width: 44px;
221 - border: 1px solid #e0e0e0;  
222 - background: #fff;  
223 - color: #666; 221 + background: #333;
  222 + color: #fff;
224 margin-left: 10px; 223 margin-left: 10px;
  224 + outline: none;
  225 + border: none;
225 } 226 }
226 227
227 .color-block { 228 .color-block {
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
43 color: #222; 43 color: #222;
44 cursor: pointer; 44 cursor: pointer;
45 margin-right: 10px; 45 margin-right: 10px;
  46 + background: #fff;
46 } 47 }
47 48
48 .iconfont { 49 .iconfont {
@@ -22,6 +22,7 @@ class BackController extends WebAction @@ -22,6 +22,7 @@ class BackController extends WebAction
22 'coverImg' => $banner['img'], 22 'coverImg' => $banner['img'],
23 'countryCode' => '86', 23 'countryCode' => '86',
24 'countryName' => '中国', 24 'countryName' => '中国',
  25 + 'captchaUrl'=>'/passport/images?t=1449799445',
25 'countryList' => RegData::getAreasData(), 26 'countryList' => RegData::getAreasData(),
26 ) 27 )
27 ); 28 );
@@ -40,7 +41,7 @@ class BackController extends WebAction @@ -40,7 +41,7 @@ class BackController extends WebAction
40 { 41 {
41 $phoneNum = $this->post('phoneNum',''); 42 $phoneNum = $this->post('phoneNum','');
42 $area = $this->post('area','86'); 43 $area = $this->post('area','86');
43 - $captcha = $this->post('captcha',''); 44 + $verifyCode = $this->post('verifyCode','');
44 if(Helpers::verifyEmail($phoneNum)){ //验证邮箱 45 if(Helpers::verifyEmail($phoneNum)){ //验证邮箱
45 $email = $phoneNum; 46 $email = $phoneNum;
46 $data = BackData::sendCodeToEmail($email); 47 $data = BackData::sendCodeToEmail($email);
@@ -56,7 +57,7 @@ class BackController extends WebAction @@ -56,7 +57,7 @@ class BackController extends WebAction
56 $data = BackData::sendCodeToMobile($mobile); 57 $data = BackData::sendCodeToMobile($mobile);
57 $this->setSession('phoneNum', $phoneNum); 58 $this->setSession('phoneNum', $phoneNum);
58 $this->setSession('area', $area); 59 $this->setSession('area', $area);
59 - $this->setSession('captcha', $captcha); 60 + $this->setSession('verifyCode', $verifyCode);
60 if($data['code'] == 200) { 61 if($data['code'] == 200) {
61 $this->redirect('verification'); 62 $this->redirect('verification');
62 } 63 }
@@ -75,23 +76,6 @@ class BackController extends WebAction @@ -75,23 +76,6 @@ class BackController extends WebAction
75 $this->redirect('index'); 76 $this->redirect('index');
76 } 77 }
77 $banner = PassportModel::getLeftBanner(PassportModel::BACK_LFFT_BANNER_CODE); 78 $banner = PassportModel::getLeftBanner(PassportModel::BACK_LFFT_BANNER_CODE);
78 - $simpleHeader = array(  
79 - 'logo' => array(  
80 - 'img' => 'http://static.yohobuy.com/newheader/img/logo_e.png',  
81 - 'url' => 'http://www.yohobuy.com'  
82 - ),  
83 - 'tool' => array(  
84 - 'user' => '2586703@qq.com',  
85 - 'userCenter' => '',  
86 - 'loginHref' => '',  
87 - 'logoutHref' => '',  
88 - 'registerHref' => '',  
89 - 'favoriteHref' => '',  
90 - 'couponHref' => '',  
91 - 'orderHref' => '',  
92 - 'helpHref' => ''  
93 - )  
94 - );  
95 $data = array( 79 $data = array(
96 'simpleHeader' => PassportModel::getSimpleHeader(false), 80 'simpleHeader' => PassportModel::getSimpleHeader(false),
97 'sendEmail' => array( 81 'sendEmail' => array(
@@ -176,7 +160,7 @@ class BackController extends WebAction @@ -176,7 +160,7 @@ class BackController extends WebAction
176 public function verificationAction() { 160 public function verificationAction() {
177 $phoneNum = $this->getSession('phoneNum'); 161 $phoneNum = $this->getSession('phoneNum');
178 $area = $this->getSession('area'); 162 $area = $this->getSession('area');
179 - $captcha = $this->getSession('captcha'); 163 + $verifyCode = $this->getSession('verifyCode');
180 if(empty($phoneNum)) { 164 if(empty($phoneNum)) {
181 $this->redirect('index'); 165 $this->redirect('index');
182 } 166 }
@@ -27,7 +27,7 @@ class RegisterController extends WebAction @@ -27,7 +27,7 @@ class RegisterController extends WebAction
27 'loginUrl' => '/signin.html?refer='.$refer, 27 'loginUrl' => '/signin.html?refer='.$refer,
28 'coverHref' => $cover['url'], 28 'coverHref' => $cover['url'],
29 'coverImg' => $cover['img'], 29 'coverImg' => $cover['img'],
30 - 'regBtnText' => '快速登录' 30 + 'regBtnText' => '立即注册'
31 ) 31 )
32 ); 32 );
33 $this->setCookie('refer', $refer); 33 $this->setCookie('refer', $refer);