css js modify

unknown
Commit f4bc725cedc912a11328d7f4e59cba7bc460d82e 1 parent 40198619
Showing 7 changed files with 65 additions and 33 deletions
template/www.yohobuy.com/actions/passport/back/index.phtml
template/www.yohobuy.com/actions/passport/back/reset-pwd.phtml
template/www.yohobuy.com/actions/passport/back/verification.phtml
web-static/js/passport/back.js
web-static/js/passport/reset.js
web-static/sass/passport/_back.scss
yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Back.php
--- a/template/www.yohobuy.com/actions/passport/back/index.phtml
View file @f4bc725
+++ b/template/www.yohobuy.com/actions/passport/back/index.phtml
View file @f4bc725
@@ -6,22 +6,13 @@
             <div class="back-header clearfix">
                 <h2 class="title">找回密码</h2>
                 <span id="country-code" class="country-code">
-                    <em>中国 +86</em>
+                    <em>{{countryName}} +{{countryCode}}</em>
                     <i class="iconfont">&#xe61d;</i>
                 </span>
                 <ul id="country-code-list" class="country-code-list">
-                    <li data-cc="+61">澳大利亚 +61</li>
-                    <li data-cc="+82">韩国 +82</li>
-                    <li data-cc="+1">加拿大 +1</li>
-                    <li data-cc="+60">马来西亚 +60</li>
-                    <li data-cc="+1">美国 +1</li>
-                    <li data-cc="+81">日本 +81</li>
-                    <li data-cc="+65">新加坡 +65</li>
-                    <li data-cc="+44">英国 +44</li>
-                    <li data-cc="+86">中国 +86</li>
-                    <li data-cc="+853">中国澳门 +853</li>
-                    <li data-cc="+886">中国台湾 +886</li>
-                    <li data-cc="+852">中国香港 +852</li>                      
+                    {{# countryList}}
+                    <li data-cc="+{{code}}">{{name}} +{{code}}</li>
+                    {{/ countryList}}                      
                 </ul>
             </div>
             <form id="back-form" class="back-form" action="">
@@ -30,19 +21,25 @@
                     <li class="input-container-li clearfix">
                         <input id="phone-num" class="input va phone-num" type="text" name="phoneNum" placeholder="邮箱/手机号码" autocomplete="off">
                         <ul id="tip-panel" class="tip-panel"></ul>
-                        <span id="account-err" class="err-tip hide">账户名不能为空</span>
+                        <span id="account-err" class="err-tip hide">
+                            <i></i>
+                            <em>账户名不能为空</em> 
+                        </span>
                     </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://www.yohobuy.com/passport/images" alt="">
                         <a id="change-captcha" class="link change-captcha">换一张</a>
-                        <span id="captcha-err" class="err-tip captcha-err hide">验证码不能为空</span>
+                        <span id="captcha-err" class="err-tip captcha-err hide">
+                            <i></i>
+                            <em>验证码不能为空</em>
+                        </span>
                     </li>
                     <li class="input-container-li clearfix">
                         <input name="refer" id="refer" type="hidden" value="http%3A%2F%2Fwww.yohobuy.com%2F">
-                        <input id="find-btn" class="btn find-btn disable" type="submit" value="下一步" disabled="">
+                        <input id="find-btn" class="btn find-btn disable" type="submit" value="下一步" disabled=""> 
                     </li>
-                </ul>
+                </ul> 
             </form>
         </div>
     {{/ back}} 
--- a/template/www.yohobuy.com/actions/passport/back/reset-pwd.phtml
View file @f4bc725
+++ b/template/www.yohobuy.com/actions/passport/back/reset-pwd.phtml
View file @f4bc725
@@ -17,11 +17,17 @@
                         <div class="default" id="pwd-tip1">密码只支持6-20位字符</div>
                         <div class="default" id="pwd-tip2">建议由字母、 数字、 符号两种以上组合</div>
                     </div>
-                    <span id="pwd-err" class="err-tip hide">请输入密码</span>
+                    <span id="pwd-err" class="err-tip hide">
+                        <i></i>
+                        <em>请输入密码</em> 
+                    </span>
                 </li>
                 <li class="input-container-li clearfix po-re">
                     <input id="re-input" class="input va re-input repwd" type="password" name="re-input" placeholder="再次输入" maxlength="20">
-                    <span id="repwd-err" class="err-tip hide">请输入密码确认</span>
+                    <span id="repwd-err" class="err-tip hide">
+                        <i></i>
+                        <em>请输入密码确认</em>
+                    </span>
                 </li>
                 <li class="input-container-li clearfix">
                 <input type="hidden" name="code" value="159bI6arxsuaPBxG2iV9OE9BrgDnAPiTecUqYh2iUC3ntt6S0eOtxXpVu+jWIlveXx9NRuwS9zdrXzcUyOd+d3ikzYBAo0k">
--- a/template/www.yohobuy.com/actions/passport/back/verification.phtml
View file @f4bc725
+++ b/template/www.yohobuy.com/actions/passport/back/verification.phtml
View file @f4bc725
@@ -15,7 +15,10 @@
                     <input id="captcha" class="input va captcha" type="text" name="captcha">
                     <input id="send-captcha" class="btn send-captcha" type="button" value="发送验证码" disabled="">
                     <div id="captcha-tip" class="captcha-tips"><i class="iconfont">&#xe61f;</i>验证码已发送至您的手机，请查收</div>
-                    <span id="err-tip" class="err-tip hide">请输入验证码</span>
+                    <span id="err-tip" class="err-tip hide">
+                        <i></i>
+                        <em>请输入验证码</em>
+                    </span>
                 </li>
                 <li>
                     <input name="area" id="area" type="hidden" value="86">
--- a/web-static/js/passport/back.js
View file @f4bc725
+++ b/web-static/js/passport/back.js
View file @f4bc725
@@ -200,7 +200,7 @@ $phoneNum.keyup(function() {
             $accErr.addClass('hide');
             $phoneNum.removeClass('error');
         } else {
-            $accErr.removeClass('hide').text(pnVa.errTxt);
+            $accErr.removeClass('hide').find('em').text(pnVa.errTxt);
             $phoneNum.addClass('error');
         }
     }, 170);
@@ -219,7 +219,7 @@ $ca.blur(function() {
         $caErr.addClass('hide');
         $ca.removeClass('error');
     } else {
-        $caErr.removeClass('hide').text(errTxt);
+        $caErr.removeClass('hide').find('em').text(errTxt);
         $ca.addClass('error');
         //验证码错误则刷新验证码
@@ -248,7 +248,7 @@ $tipPanel.delegate('li', 'click', function(e) {
             $accErr.addClass('hide');
             $phoneNum.removeClass('error');
         } else {
-            $accErr.removeClass('hide').text(pnVa.errTx);
+            $accErr.removeClass('hide').find('em').text(pnVa.errTx);
             $phoneNum.addClass('error');
         }
         time = null;
--- a/web-static/js/passport/reset.js
View file @f4bc725
+++ b/web-static/js/passport/reset.js
View file @f4bc725
@@ -170,16 +170,16 @@ $('.va').keyup(function() {
     if ($(this).hasClass('pwd')) {
         if (v === '') {
             $(this).addClass('error');
-            $pwdErr.removeClass('hide').text('请输入密码');
+            $pwdErr.removeClass('hide').find('em').text('请输入密码');
         } else if (v.length < 6 || v.length > 20) {
             $(this).addClass('error');
-            $pwdErr.removeClass('hide').text('密码只支持6-20位');
+            $pwdErr.removeClass('hide').find('em').text('密码只支持6-20位');
         } else {
             $pwdErr.addClass('hide');
             if ($repwd.val() !== '') {
                 if (v !== $repwd.val()) {
                     $repwd.addClass('error');
-                    $repwdErr.removeClass('hide').text('两次密码输入不一致，请重新输入');
+                    $repwdErr.removeClass('hide').find('em').text('两次密码输入不一致，请重新输入');
                 } else {
                     $repwd.removeClass('error');
                     $repwdErr.addClass('hide');
@@ -189,11 +189,11 @@ $('.va').keyup(function() {
     } else {
         if (v === '') {
             $(this).addClass('error');
-            $repwdErr.removeClass('hide').text('请输入密码确认');
+            $repwdErr.removeClass('hide').find('em').text('请输入密码确认');
         } else {
             if ($pwd.val() !== '' && v !== $pwd.val()) {
                 $(this).addClass('error');
-                $repwdErr.removeClass('hide').text('两次密码输入不一致，请重新输入');
+                $repwdErr.removeClass('hide').find('em').text('两次密码输入不一致，请重新输入');
             } else {
                 $(this).removeClass('error');
                 $repwdErr.addClass('hide');
--- a/web-static/sass/passport/_back.scss
View file @f4bc725
+++ b/web-static/sass/passport/_back.scss
View file @f4bc725
@@ -38,8 +38,9 @@
         font-weight: normal; 
     }
-    .err-tip {
-        position: absolute;
+    .err-tip.captcha-err {
+        top: 10px;
+        left: 326px;
     }
     .country-code-list { 
@@ -68,8 +69,6 @@
         font-family: Regular, arial, 'Microsoft YaHei';
     }
-    
-
     .input-container-li { 
         position: relative;
         margin-bottom: 22px;
@@ -84,6 +83,10 @@
             letter-spacing: 0;
         }
+        .captcha {
+            width: 160px;
+        }
+
         .captcha-img {
             height: 37px;
             width: 90px;
@@ -186,6 +189,10 @@
         letter-spacing: 0; 
     }
+    .err-tip {
+        left: 310px;
+    }
+
     .captcha-tips {
         position: absolute;
         top: 50px;
--- a/yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Back.php
View file @f4bc725
+++ b/yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Back.php
View file @f4bc725
@@ -54,7 +54,26 @@ class BackController extends AbstractAction
             'back' => array(
                 'coverHref' => '/passport',
                 'coverImg' => 'http://img12.static.yhbimg.com/yhb-img01/2015/12/01/07/020a0b6e7ff908d0c2bc4045b4fef42b9f.png?imageView/2/w/252/h/190',
-                'countrys' => array()
+                'countryCode' => '86',
+                'countryName' => '中国',
+                'countryList' => array(
+                    array(
+                        'code' => '61',
+                        'name' => '澳大利亚'
+                    ),
+                    array(
+                        'code' => '82',
+                        'name' => '韩国'
+                    ),
+                    array(
+                        'code' => '1',
+                        'name' => '加拿大'
+                    ),
+                    array(
+                        'code' => '86',
+                        'name' => '中国'
+                    )
+                )
             )
         );
         $this->_view->display('index', $data);