Merge branch 'dev/z-4.9.83' of qmx/jy into feature/v4.9.83

src/jfw/modules/app/src/web/templates/me/login.html

@@ -278,7 +278,7 @@
 		var left_1 = (bodyWidth/2-34) / 2;
 		var left_2 = (bodyWidth/2-56) / 2 + bodyWidth / 2;
 		var isIos = mySysIsIos();
-    var loginType = 'login-pass'
+    var loginType = 'login-code'
     var disWord = getParam("disWord");
     var hideNum = 0
     var timer = null

src/web/templates/_error.html

@@ -283,11 +283,11 @@ function seclectNavLi(el, $index) {
           <span>验证码/密码登录</span>
       </div>
       <div class="login-dig-tabbar-navbar" style="">
-          <span name="code">验证码登录</span>
-          <span name="pass" class="is-active">密码登录</span>
+          <span name="code"  class="is-active">验证码登录</span>
+          <span name="pass">密码登录</span>
           <div class="line-box"></div>
       </div>
-      <div class="login-dig-tabbar-content" data-name="code" style="">
+      <div class="login-dig-tabbar-content is-active" data-name="code" style="">
           <div class="login-dig-input-box" data-error="手机号码输入错误">
               <i class="login-dig-icon-phone"></i>
               <input autocomplete="off" name="verify_phone" type="tel" placeholder="输入手机号码" maxlength="11">
@@ -308,7 +308,7 @@ function seclectNavLi(el, $index) {
           </div>
           <button class="login-dig-submit-button" name="verify_submit" disabled="true">登录 / 注册</button>
       </div>
-      <div class="login-dig-tabbar-content is-active" data-name="pass">
+      <div class="login-dig-tabbar-content" data-name="pass">
           <div class="login-dig-input-box" data-error="手机号码输入错误">
               <i class="login-dig-icon-phone"></i>
               <input autocomplete="off" name="pass_phone" type="tel" placeholder="输入手机号码" maxlength="11">

src/web/templates/common/pc-login-dialog.html

@@ -26,8 +26,8 @@
           <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
         </div>
         <div class="login-dig-tabbar-navbar" style="">
-          <span name="code">验证码登录</span>
-          <span name="pass" class="is-active">密码登录</span>
+          <span name="code"  class="is-active">验证码登录</span>
+          <span name="pass">密码登录</span>
           <div class="line-box"></div>
         </div>
         <!-- <div class="login-dig-tabbar-navbar set-pass-module" data-name="set-password" style="display: none;">
@@ -38,7 +38,7 @@
             <span name="phone" class="is-active">手机号绑定</span>
             <div class="line-box"></div>
         </div> -->
-        <div class="login-dig-tabbar-content login-module-card sms-login" data-name="code" style="">
+        <div class="login-dig-tabbar-content login-module-card sms-login is-active" data-name="code" style="">
           <div class="login-dig-input-box" data-error="手机号码输入错误">
             <i class="login-dig-icon-phone"></i>
             <input autocomplete="off" name="verify_phone" type="tel" placeholder="输入手机号码" maxlength="11" />
@@ -67,7 +67,7 @@
           <button class="login-dig-submit-button" name="verify_submit" disabled="true">登 录</button>
         </div>
         <!-- 密码登录 -->
-        <div class="login-dig-tabbar-content login-module-card password-login  is-active" data-name="pass">
+        <div class="login-dig-tabbar-content login-module-card password-login" data-name="pass">
           <div class="login-dig-input-box" data-error="手机号或账号名输入错误">
             <i class="login-dig-icon-phone"></i>
             <input