Merge branch 'dev/v4.8.96_yf' of qmx/jy into feature/v4.8.96

src/web/staticres/css/common.css

@@ -179,12 +179,12 @@ a{
     position: fixed;
     left: 50%;
     top: 50%;
-    z-index: 9999;
+    z-index: 999999;
     transform: translate(-50%,-50%);
     display: flex;
 	align-items: center;
 	justify-content: center;
-	padding: 6px 12px;
+	padding: 16px 32px;
     line-height: 22px;
     border-radius: 5px;
     color: #fff;

src/web/staticres/css/pc.css

@@ -4749,8 +4749,10 @@ h6 {
 }
 
 .login-dig-tabbar-navbar {
-  margin-top: 32px;
-  padding-bottom: 12px;
+  /* margin-top: 32px; */
+  height: 32px;
+  text-align: center;
+  padding-bottom: 8px;
 }
 
 .login-dig-tabbar-navbar span {
@@ -4770,7 +4772,8 @@ h6 {
 
 .login-dig-tabbar-navbar .line-box {
   margin-top: 8px;
-  width: 118px;
+  margin-left: 54px;
+  width: 80px;
   height: 3px;
   background: #2CB7CA;
   transition: all 0.33s;
@@ -4781,7 +4784,7 @@ h6 {
 }
 
 .login-dig-tabbar-navbar span + span.is-active + .line-box {
-  transform: translateX(104px);
+  transform: translateX(100px);
 }
 
 .login-dig-tabbar-navbar .line-box.pass-line-box{
@@ -4789,7 +4792,7 @@ h6 {
 }
 
 .login-dig-tabbar-navbar span + span.is-active + .line-box.pass-line-box{
-  transform: translateX(140px);
+  transform: translateX(100px);
 }
 
 .login-dig-tabbar-content {
@@ -4798,6 +4801,10 @@ h6 {
 
 .login-dig-tabbar-content.is-active {
   display: block;
+  margin-top: 20px;
+}
+.login-dig-tabbar-content.password-login{
+  margin-top: 38px;
 }
 
 .icon-tip {
@@ -4817,7 +4824,6 @@ h6 {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 12px;
 }
 .login-dig-box .auto-login-container {
   display: flex;
@@ -4968,11 +4974,12 @@ h6 {
 
 .login-dig-input-box.is-error {
   border-color: #FF3A20;
-  margin-bottom: 36px;
+  /* margin-bottom: 36px; */
 }
 
 .login-dig-input-box.is-error::after {
-  content: attr(data-error);
+  /* content: attr(data-error); */
+  content: '';
   position: absolute;
   bottom: -24px;
   left: 8px;
@@ -5051,7 +5058,7 @@ h6 {
 }
 
 .login-dig-footer-box p {
-  margin-top: 32px;
+  margin-top: 12px;
 }
 
 .login-dig-footer-box a {
@@ -5064,11 +5071,15 @@ h6 {
   display: flex;
   flex-direction: column;
   align-items: center;
+  margin-right: 80px;
 }
 
 .login-dig-wx-qrcode-box .wx-qrcode {
-  max-width: 240px;
-  max-height: 240px;
+  max-width: 200px;
+  max-height: 200px;
+  margin-top: 36px;
+  border-radius: 16px;
+  border: 1px solid #ECECEC;
 }
 
 .login-dig-wx-qrcode-box .wx-tip {
@@ -5312,11 +5323,25 @@ h6 {
   margin-top: 32px;
 }
 
+.login-auth--title{
+  padding: 40px 0 20px;
+  text-align: center;
+  font-size: 24px;
+  line-height: 36px;
+  background: linear-gradient(to bottom, rgba(135, 223, 234, 0.24), rgba(135, 223, 234, 0));
+}
+.login-wx--title{
+  font-size: 16px;
+  line-height: 24px;
+  color: #1d1d1d;
+  text-align: center;
+}
+
 .new_login{
-  /* display: flex; */
+  /* display: flex;
   flex: 1;
   width: 360px;
-  padding: 32px 40px 36px;
+  padding: 0 40px 36px; */
 }
 .login_ad_space{
   width: 360px;
@@ -5382,7 +5407,8 @@ h6 {
 }
 
 .login-dig-footer-box p.passTip{
-	margin-top: 100px;
+	/* margin-top: 100px; */
+  margin-top: 12px;
 }
 
 .guide-intro-dialog{

src/web/staticres/js/login.js

@@ -935,7 +935,7 @@ $(function(){
                     $.post("/phone/login",{
                         reqType:"sendIdentCode",
                         phone:$("#bidLogin .login-dig-input-box [name='verify_phone']").val(),
-                        // isAutoLogin: $('.sms-login .auto-login-checkbox').hasClass('checked'),
+                        // isAutoLogin: $('.auto-login-checkbox').hasClass('checked'),
                         code:$("#bidLogin .login-dig-input-box [name='verify_code']").val()
                     },function(r){
                         if(r.status==-1){
@@ -1080,7 +1080,7 @@ $(function(){
         ajaxLoginPass: function (e, arr) {
             var payload = {
               reqType:"phoneLogin",
-              isAutoLogin: $('.password-login .auto-login-checkbox').hasClass('checked'),
+              isAutoLogin: $('.auto-login-checkbox').hasClass('checked'),
               phone:arr[0].value,
               password: arr[1].value
             }
@@ -1165,7 +1165,7 @@ $(function(){
                 var payload = {
                   reqType:"identCodeLogin",
                   identCode:arr[2].value,
-                  isAutoLogin: $('.sms-login .auto-login-checkbox').hasClass('checked'),
+                  isAutoLogin: $('.auto-login-checkbox').hasClass('checked'),
                   source:source
                 }
                 // 短信验证码登录
@@ -1189,14 +1189,19 @@ $(function(){
         },
         // 新用户设置密码
         showSetPassModule: function (type) {
-          var otherArr = ['.login-dig-footer-box .wx-logo-box', '.login-dig-footer-box .login-dig-text-split' ,'.login-dig-tabbar-navbar', '.login-dig-tabbar-content', '.login-dig-tabbar-content.is-active', '.pass-bottom', '.login-dig-wx-qrcode-box', '.login-dig-top-back-box', '.code-bottom']
-          var setPassArr = ['.login-dig-tabbar-content.set-password', '.login-dig-tabbar-navbar.set-pass-module', '.set-pass-bottom']
+          var otherArr = ['.login-dig-footer-box .wx-logo-box', '.login-dig-footer-box .login-dig-text-split' ,'.login-dig-tabbar-navbar', '.login-dig-tabbar-content', '.login-dig-tabbar-content.is-active', '.pass-bottom', '.login-dig-wx-qrcode-box', '.login-dig-top-back-box', '.code-bottom', '.login-common-title', '.login-auto-card']
+          var setPassArr = ['.login-dig-tabbar-content.set-password', '.login-dig-tabbar-navbar.set-pass-module', '.set-pass-bottom', '.set-pass-title']
           for(var i=0;i<otherArr.length;i++){
-            document.querySelector(otherArr[i]).style.display = (type ? 'none' : '')
+            if (document.querySelector(otherArr[i])) {
+              document.querySelector(otherArr[i]).style.display = (type ? 'none' : '')
+            }
           }
           for(var i=0;i<setPassArr.length;i++){
-            document.querySelector(setPassArr[i]).style.display = (type ? 'block' : 'none')
+            if (document.querySelector(setPassArr[i])) {
+              document.querySelector(setPassArr[i]).style.display = (type ? 'block' : 'none')
+            }
           }
+          
         },
         ajaxRegister: function (e, arr) {
           var source =	 getParam("source");//百度SEM
@@ -1217,7 +1222,7 @@ $(function(){
             s_entname: arr[3].value,
             identCode:arr[2].value,
             source:source,
-            isAutoLogin: $('.sms-login .auto-login-checkbox').hasClass('checked'),
+            isAutoLogin: $('.auto-login-checkbox').hasClass('checked'),
             email: arr[4].value
           }
           // 短信验证码登录
@@ -1237,6 +1242,9 @@ $(function(){
             });
         }
     }
+    // Direct.showSetPassModule(true) // 模拟显示 设置密码弹框
+    // openLoginDigForReg() // 模拟显示注册弹框
+    // openBindPhoneDig() // 模拟显示绑定手机号弹框
   // @手机号绑定以及账号合并 2021/1/25
   function toggleNeedVerifyInput (f, src) {
     var verifyInput = $(".login-dig-tabbar-content.is-active .login-dig-input-box:eq(1)")
@@ -1453,12 +1461,14 @@ $(function(){
                 if (error) {
                     this.el.parentNode.setAttribute('data-error', error)
                     this.el.parentNode.classList.add(errClass)
+                    showToast(error)
                 }
             }
         }
         // 错误提示
         if (formOption.errorTip && formOption.errorTip !== '') {
             nowEle.parentNode.setAttribute('data-error', formOption.errorTip)
+            showToast(formOption.errorTip)
         }
         // 校验规则
         if (typeof formOption.rule !== "function") {
@@ -1491,6 +1501,8 @@ $(function(){
                     errorTarget.classList.remove(errClass)
                 } else {
                     errorTarget.classList.add(errClass)
+                    var errorMsg = errorTarget.getAttribute('data-error')
+                    showToast(errorMsg, 4000)
                 }
             })
         }
@@ -1572,12 +1584,12 @@ $(function(){
                 return
             }
             if(e.target.innerText === '密码登录') {
-              $('.code-bottom').hide()
+              // $('.code-bottom').hide()
               $('.pass-bottom').show()
               $('.line-box').addClass('pass-line-box')
             } else {
               $('.pass-bottom').hide()
-              $('.code-bottom').show()
+              // $('.code-bottom').show()
               $('.line-box').removeClass('pass-line-box')
             }
             var SelectName = e.target.getAttribute('name')
@@ -2070,18 +2082,20 @@ function trackClick (c_type) {
 }
 // type: true登录后直接跳转工作桌面
 function openLoginDig(type, redirectUrl,Logincallback) {
-    $('#bidLogin .logo').show()
+    $('#bidLogin .logo').hide()
     $('#bidLogin .bind-phone-head').hide()
     $(".login-dig-tabbar-content.is-active .login-dig-input-box").show()
+    $('.login-auto-card').show()
   	if ($('#bidLogin').attr('data-name') === 'bind-phone') {
         $("#bidLogin").removeAttr('data-name')
         $('.login-dig-submit-button').removeClass('bindphonebtn')
         $('.login-dig-submit-button:disabled').css('background', '#E0E0E0')
         $('.login-dig-submit-button:disabled').css('opacity', '0.5')
         $('.login-dig-submit-button').css('margin-bottom', '0')
-      	$("#bidLogin .login-dig-submit-button[name='verify_submit']").text('登录 / 注册')
+      	$("#bidLogin .login-dig-submit-button[name='verify_submit']").text('登 录')
       	$(".login-dig-tabbar-content[data-name='code'] .login-dig-input-box").removeClass('is-error').children('input').val('')
   	}
+
 	var href = window.location.href;
     var sourceStr =""
 	if (href.indexOf("/front/structed/pc_index.html?source=baidusem")>-1){//结构化数据
@@ -2163,6 +2177,7 @@ function openBindPhoneDig() {
     openLoginDigForWx(false);
     $('#bidLogin .logo').hide()
     $('#bidLogin .bind-phone-head').show()
+    $('.login-auto-card').hide()
     if ($('#bidLogin').attr('data-name') !== 'bind-phone') {
         $("#bidLogin").attr('data-name', 'bind-phone')
         // $('.login-dig-submit-button:disabled').css('background', '#2CB7CA')
@@ -2171,6 +2186,7 @@ function openBindPhoneDig() {
         $('.login-dig-submit-button').addClass('bindphonebtn')
         $("#bidLogin .login-dig-submit-button[name='verify_submit']").text('立即绑定')
         $(".login-dig-tabbar-content[data-name='code'] .login-dig-input-box").removeClass('is-error').children('input').val('')
+        $('.login-auto-card').show()
     }
     $("#bidLogin").modal("show");
 }
@@ -2192,7 +2208,9 @@ function openLoginDigForWx (type) {
 	var otherArr = ['.login-dig-footer-box .wx-logo-box', '.login-dig-footer-box .login-dig-text-split' ,'.login-dig-tabbar-navbar', '.login-dig-tabbar-content', '.login-dig-tabbar-content.is-active', '.pass-bottom']
 	var wxArr = ['.login-dig-wx-qrcode-box', '.login-dig-top-back-box', '.code-bottom']
 	for(var i=0;i<otherArr.length;i++){
-		document.querySelector(otherArr[i]).style.display = (type ? 'none' : '')
+    if (document.querySelector(otherArr[i])) {
+		  document.querySelector(otherArr[i]).style.display = (type ? 'none' : '')
+    }
 	}
 	for(var i=0;i<wxArr.length;i++){
 		document.querySelector(wxArr[i]).style.display = (type ? '' : 'none')
@@ -2207,14 +2225,17 @@ function openLoginDigForReg (type) {
   $('.login-dig-tabbar-navbar').hide()
   $('.login-dig-reg').show()
   $('.login-dig-footer-box').hide()
+  $('.login-auto-card').hide()
   // 埋点
   trackClick('注册行为-登录或注册弹窗')
 }
 
 function backLogin (type) {
-  var otherArr = ['.login-dig-box .new_login > .logo', '.login-dig-footer-box','.login-dig-footer-box .wx-logo-box', '.login-dig-footer-box .login-dig-text-split' ,'.login-dig-tabbar-navbar', '.login-dig-tabbar-content', '.login-dig-tabbar-content.is-active']
+  var otherArr = ['.login-dig-box .new_login > .logo', '.login-dig-footer-box','.login-dig-footer-box .wx-logo-box', '.login-dig-footer-box .login-dig-text-split' ,'.login-dig-tabbar-navbar', '.login-dig-tabbar-content', '.login-dig-tabbar-content.is-active', '.login-dig-wx-qrcode-box', '.login-auto-card']
   for(var i=0;i<otherArr.length;i++){
-		document.querySelector(otherArr[i]).style.display = (type ? 'none' : '')
+		if (document.querySelector(otherArr[i])) {
+      document.querySelector(otherArr[i]).style.display = (type ? 'none' : '')
+    }
 	}
   $('.login-dig-reg').hide()
 }
@@ -2230,7 +2251,7 @@ var loginDialog = {
   },
   bindKeepLoginQr: function () {
     var payload = {
-      isAutoLogin: $('.wx-qr-login .auto-login-checkbox').hasClass('checked'),
+      isAutoLogin: $('.auto-login-checkbox').hasClass('checked'),
       // pageshareid: pageshareid,
       // kopshareid: kopshareid,
       loginER: [pageshareid, kopshareid].join('___')

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

@@ -9,60 +9,21 @@
   aria-labelledby="bidLogin"
   aria-hidden="true"
 >
-  <div class="modal-dialog login-dig-box is-show" style="max-width: 720px; height: 584px; width: auto; width:100%; display: flex">
-    <div class="login_ad_space">
-      <div class="active-tip-group" style="display: none">
-        <img src="" alt="二维码" />
-      </div>
-    </div>
-    <div class="new_login">
-      <div class="login-dig-icon-close" onclick="closeLoginDig()"></div>
-      <img class="logo" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block" />
-      <div class="bind-phone-head" style="display: none">
-        <h3 class="bind-phone-title">绑定手机号</h3>
-        <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
-      </div>
-      <div class="login-dig-tabbar-navbar" style="">
-        <span name="code" class="is-active">验证码登录/注册</span>
-        <span name="pass" class="">密码登录</span>
-        <div class="line-box"></div>
-      </div>
-      <div class="login-dig-tabbar-navbar set-pass-module" data-name="set-password" style="display: none;">
-          <span name="setpass" class="is-active">设置密码</span>
-          <div class="line-box" style="width: 64px;"></div>
-      </div>
-      <!-- <div class="login-dig-tabbar-navbar" data-name="bind-phone" style="display: none;">
-          <span name="phone" class="is-active">手机号绑定</span>
-          <div class="line-box"></div>
-      </div> -->
-      <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" />
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4" />
-          <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
-          </div>
+  <div class="modal-dialog login-dig-box is-show" style="max-width: 720px; min-height: 448px; width:100%; padding-bottom: 40px;">
+    <h2 class="login-auth--title login-common-title"><span class="highlight-text">免费</span>查询招标采购信息，对接<span class="highlight-text">项目联系人</span></h2>
+    <h2 class="login-auth--title set-pass-title" data-name="set-password" style="display: none;">设置登录密码</h2>
+    <div style="width: 100%;display: flex;justify-content: center;padding: 0 80px;">
+      <!-- <div class="login_ad_space">
+        <div class="active-tip-group" style="display: none">
+          <img src="" alt="二维码" />
         </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input
-            autocomplete="off"
-            name="verify_sms"
-            class="enter-action-login"
-            type="text"
-            placeholder="输入短信验证码"
-            maxlength="6"
-          />
-          <div class="after-input-box">
-            <span data-name="verify_get_sms" class="l-get-sms is-stop">获取验证码</span>
-          </div>
+      </div> -->
+      <div class="login-dig-wx-qrcode-box login-module-card wx-qr-login">
+        <div class="login-wx--title">
+          <span>微信扫码登录</span>
         </div>
-        <button class="login-dig-submit-button" name="verify_submit" disabled="true">登录/注册</button>
-        <div class="footer-action-container">
+        <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
+        <!-- <div class="footer-action-container">
           <div class="auto-login-container no-selected">
             <div class="auto-login-checkbox"></div>
             <label for="autoLogin">下次自动登录</label>
@@ -71,170 +32,212 @@
               <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
             </div>
           </div>
-          <!-- <a class="go-register" href="/phone/register" >立即注册</a> -->
-          <!-- <div class="go-register" onclick="openLoginDigForReg(true)">立即注册</div> -->
         </div>
+        <div class="login-dig-top-back-box" style="display: none" onclick="openLoginDigForWx(false)">
+          <i class="login-dig-icon-blue-back"></i>
+          <span>验证码/密码登录</span>
+        </div> -->
       </div>
-      <!-- 密码登录 -->
-      <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
-            autocomplete="off"
-            class="enter-action-login"
-            name="pass_phone"
-            type="text"
-            placeholder="请输入手机号或账号名"
-          />
-        </div>
-        <div class="login-dig-input-box" data-error="密码输入错误">
-          <i class="login-dig-icon-pass"></i>
-          <input
-            autocomplete="off"
-            class="enter-action-login pass-login"
-            name="pass_pass"
-            type="password"
-            placeholder="输入密码"
-          />
-          <i class="login-dig-icon-biyan" onclick="switchPassShow(event, '.pass-login')"></i>
+      <div class="new_login">
+        <div class="login-dig-icon-close" onclick="closeLoginDig()"></div>
+        <!-- <img class="logo" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: none" /> -->
+        <div class="bind-phone-head" style="display: none">
+          <h3 class="bind-phone-title">绑定手机号</h3>
+          <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
+        </div>
+        <div class="login-dig-tabbar-navbar" style="">
+          <span name="code" class="is-active">验证码登录</span>
+          <span name="pass" class="">密码登录</span>
+          <div class="line-box"></div>
         </div>
-        <button class="login-dig-submit-button" name="pass_submit" disabled="true">登录</button>
-        <div class="footer-action-container f-box right-box" style="justify-content: space-between;">
-          <div class="auto-login-container no-selected">
-            <div class="auto-login-checkbox"></div>
-            <label for="autoLogin">下次自动登录</label>
-            <div class="icon-tip-container">
-              <div class="icon-tip"></div>
-              <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+        <!-- <div class="login-dig-tabbar-navbar set-pass-module" data-name="set-password" style="display: none;">
+            <span name="setpass" class="is-active">设置密码</span>
+            <div class="line-box" style="width: 64px;"></div>
+        </div> -->
+        <!-- <div class="login-dig-tabbar-navbar" data-name="bind-phone" style="display: none;">
+            <span name="phone" class="is-active">手机号绑定</span>
+            <div class="line-box"></div>
+        </div> -->
+        <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" />
+          </div>
+          <div class="login-dig-input-box" data-error="图形验证码输入错误">
+            <i class="login-dig-icon-guard"></i>
+            <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4" />
+            <div class="after-input-box">
+              <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
             </div>
           </div>
-          <div class="login-right-actions">
-            <!-- <div class="forget-pass-link" onclick="openLoginDigForReg(true)">立即注册</div>
-            <span class="login-splitter"></span> -->
-            <a class="forget-pass-link" href="/phone/forgetPwd">忘记密码？</a>
-            <!-- <a class="forget-pass-link" style="color: #2ABED1!important;" href="/phone/register">立即注册</a> -->
+          <div class="login-dig-input-box" data-error="短信验证码输入错误">
+            <i class="login-dig-icon-guard"></i>
+            <input
+              autocomplete="off"
+              name="verify_sms"
+              class="enter-action-login"
+              type="text"
+              placeholder="输入短信验证码"
+              maxlength="6"
+            />
+            <div class="after-input-box">
+              <span data-name="verify_get_sms" class="l-get-sms is-stop">获取验证码</span>
+            </div>
           </div>
-        </div>
-      </div>
-      <!-- 设置密码 -->
-      <div class="login-dig-tabbar-content login-module-card set-password" data-name="setpass">
-        <div class="login-dig-input-box" data-error="密码不少于6位">
-          <i class="login-dig-icon-pass"></i>
-          <input
-            autocomplete="off"
-            class="enter-action-login init-pass"
-            name="init_pass"
-            type="password"
-            placeholder="设置密码（最少6位）"
-          />
-          <i class="login-dig-icon-biyan" onclick="switchPassShow(event, '.init-pass')"></i>
-        </div>
-        <div class="login-dig-input-box" data-error="两次密码输入不一致">
-          <i class="login-dig-icon-pass"></i>
-          <input
-            autocomplete="off"
-            class="enter-action-login check-pass"
-            name="check_pass"
-            type="password"
-            placeholder="确认密码"
-          />
-          <i class="login-dig-icon-biyan" onclick="switchPassShow(event, '.check-pass')"></i>
-        </div>
-        <button class="login-dig-submit-button" name="set_pass_submit" disabled="true">确定</button>
-        <button class="login-dig-cancel-button" name="set_pass_cancel">暂不设置</button>
-      </div>
-      <div class="login-dig-wx-qrcode-box login-module-card wx-qr-login" style="display: none">
-        <div class="wx-tip">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-          <span>微信扫码登录，安全便捷</span>
-        </div>
-        <!-- <img class="wx-qrcode" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;"> -->
-        <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
-        <div class="footer-action-container">
-          <div class="auto-login-container no-selected">
-            <div class="auto-login-checkbox"></div>
-            <label for="autoLogin">下次自动登录</label>
-            <div class="icon-tip-container">
-              <div class="icon-tip"></div>
-              <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+          <button class="login-dig-submit-button" name="verify_submit" disabled="true">登 录</button>
+        </div>
+        <!-- 密码登录 -->
+        <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
+              autocomplete="off"
+              class="enter-action-login"
+              name="pass_phone"
+              type="text"
+              placeholder="请输入手机号或账号名"
+            />
+          </div>
+          <div class="login-dig-input-box" data-error="密码输入错误">
+            <i class="login-dig-icon-pass"></i>
+            <input
+              autocomplete="off"
+              class="enter-action-login pass-login"
+              name="pass_pass"
+              type="password"
+              placeholder="输入密码"
+            />
+            <i class="login-dig-icon-biyan" onclick="switchPassShow(event, '.pass-login')"></i>
+          </div>
+          <button class="login-dig-submit-button" name="pass_submit" disabled="true">登 录</button>
+          <div class="footer-action-container f-box right-box" style="justify-content: center;margin-bottom: 6px;">
+            <div class="login-right-actions">
+              <a class="forget-pass-link" href="/phone/forgetPwd">忘记密码？</a>
             </div>
           </div>
         </div>
-        <div class="login-dig-top-back-box" style="display: none" onclick="openLoginDigForWx(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>验证码/密码登录</span>
-        </div>
-      </div>
-      <div class="login-dig-reg register-form-box" style="display: none">
-        <div class="login-dig-input-box" data-error="手机号码输入错误">
-          <i class="login-dig-icon-phone"></i>
-          <input autocomplete="off" name="register_phone" type="tel" placeholder="输入手机号码" maxlength="11" />
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4" />
-          <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
+        <!-- 设置密码 -->
+        <div class="login-dig-tabbar-content login-module-card set-password" data-name="setpass" style="width: 100%;">
+          <div style="display: flex;flex-direction: column;align-items: center;margin-top: 20px;">
+            <div class="login-dig-input-box" data-error="密码不少于6位">
+              <i class="login-dig-icon-pass"></i>
+              <input
+                autocomplete="off"
+                class="enter-action-login init-pass"
+                name="init_pass"
+                type="password"
+                placeholder="设置密码（最少6位）"
+              />
+              <i class="login-dig-icon-biyan" onclick="switchPassShow(event, '.init-pass')"></i>
+            </div>
+            <div class="login-dig-input-box" data-error="两次密码输入不一致">
+              <i class="login-dig-icon-pass"></i>
+              <input
+                autocomplete="off"
+                class="enter-action-login check-pass"
+                name="check_pass"
+                type="password"
+                placeholder="确认密码"
+              />
+              <i class="login-dig-icon-biyan" onclick="switchPassShow(event, '.check-pass')"></i>
+            </div>
+            <button class="login-dig-submit-button" name="set_pass_submit" disabled="true">确定</button>
+            <button class="login-dig-cancel-button" name="set_pass_cancel">暂不设置</button>
           </div>
         </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="register_sms" type="text" placeholder="输入短信验证码" maxlength="6" />
-          <div class="after-input-box">
-            <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
+        <div class="login-dig-wx-qrcode-box login-module-card wx-qr-login" style="display: none">
+          <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
+          <div class="footer-action-container">
+            <div class="auto-login-container no-selected">
+              <div class="auto-login-checkbox"></div>
+              <label for="autoLogin">下次自动登录</label>
+              <div class="icon-tip-container">
+                <div class="icon-tip"></div>
+                <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+              </div>
+            </div>
           </div>
-        </div>
-        <div class="login-dig-input-box" data-error="公司名称最少4个字">
-          <i class="login-dig-icon-ent"></i>
-          <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称" />
-          <div class="autocomplete-box">
-            <ul>
-              <li> </li>
-            </ul>
+          <div class="login-dig-top-back-box" style="display: none" onclick="openLoginDigForWx(false)">
+            <i class="login-dig-icon-blue-back"></i>
+            <span>验证码/密码登录</span>
           </div>
         </div>
-        <div class="login-dig-input-box" data-error="邮箱输入错误">
-          <i class="login-dig-icon-email"></i>
-          <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱" />
-        </div>
-        <!-- <div class="login-dig-input-box" data-error="邮箱输入错误">
-          <i class="login-dig-icon-email"></i>
-          <input autocomplete="off" name="register_email" type="text" placeholder="输入电子邮箱">
-        </div> -->
-        <div class="ad_small_space">
-          <img src="{{Msg "seo" "cdn"}}/images/pc/register_email.png?v={{Msg "seo" "version"}}" alt="">
-        </div>
-        <button class="login-dig-submit-button reg-dig-submit-button" name="register_submit_phone" disabled="true">
-          立即注册
-        </button>
-        <!-- <button class="reg-dig-submit-button" name="verify_register" disabled="true">立即注册</button> -->
-        <div class="back-login" onclick="backLogin(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>登录</span>
+        <div class="login-dig-reg register-form-box" style="display: none">
+          <div class="login-dig-input-box" data-error="手机号码输入错误">
+            <i class="login-dig-icon-phone"></i>
+            <input autocomplete="off" name="register_phone" type="tel" placeholder="输入手机号码" maxlength="11" />
+          </div>
+          <div class="login-dig-input-box" data-error="图形验证码输入错误">
+            <i class="login-dig-icon-guard"></i>
+            <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4" />
+            <div class="after-input-box">
+              <img data-name="verfiy-login" class="verify-img" src="" alt="verify" />
+            </div>
+          </div>
+          <div class="login-dig-input-box" data-error="短信验证码输入错误">
+            <i class="login-dig-icon-guard"></i>
+            <input autocomplete="off" name="register_sms" type="text" placeholder="输入短信验证码" maxlength="6" />
+            <div class="after-input-box">
+              <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
+            </div>
+          </div>
+          <div class="login-dig-input-box" data-error="公司名称最少4个字">
+            <i class="login-dig-icon-ent"></i>
+            <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称" />
+            <div class="autocomplete-box">
+              <ul>
+                <li> </li>
+              </ul>
+            </div>
+          </div>
+          <div class="login-dig-input-box" data-error="邮箱输入错误">
+            <i class="login-dig-icon-email"></i>
+            <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱" />
+          </div>
+          <!-- <div class="login-dig-input-box" data-error="邮箱输入错误">
+            <i class="login-dig-icon-email"></i>
+            <input autocomplete="off" name="register_email" type="text" placeholder="输入电子邮箱">
+          </div> -->
+          <div class="ad_small_space">
+            <img src="{{Msg "seo" "cdn"}}/images/pc/register_email.png?v={{Msg "seo" "version"}}" alt="">
+          </div>
+          <button class="login-dig-submit-button reg-dig-submit-button" name="register_submit_phone" disabled="true">
+            立即注册
+          </button>
+          <!-- <button class="reg-dig-submit-button" name="verify_register" disabled="true">立即注册</button> -->
+          <div class="back-login" onclick="backLogin(false)">
+            <i class="login-dig-icon-blue-back"></i>
+            <span>登 录</span>
+          </div>
         </div>
       </div>
-      <!-- <div class="login-dig-footer-box" data-name="bind-phone" name="tip-bind-phone" style="display: none;">
-          <p>为了确保您账号的安全性与唯一性，在您购买剑鱼标讯任意功能前，请先绑定手机号，以便后期维护。</p>
-      </div> -->
-      <div class="login-dig-footer-box">
-        <div class="login-dig-text-split" style=""><i></i><span>使用微信扫码登录</span><i></i></div>
-        <div class="wx-logo-box" onclick="openLoginDigForWx(true)" style="">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
+    </div>
+    <div class="login-auto-card" style="margin-top: 26px;">
+      <div class="footer-action-container">
+        <div class="auto-login-container no-selected">
+          <div class="auto-login-checkbox"></div>
+          <label for="autoLogin">下次自动登录</label>
+          <div class="icon-tip-container">
+            <div class="icon-tip"></div>
+            <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+          </div>
         </div>
-        <p class="code-bottom" style="width: 294px;text-align: center;">
-          未注册用户验证后自动注册，登录/注册即代表同意
-          <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
-          <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
-        </p>
-        <p class="pass-bottom" style="display: none;text-align: center;">
-          登录即代表同意
-          <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
-          <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
-        </p>
-        <p class="set-pass-bottom" style="display: none;text-align: center;margin-top: 12px;">
-          您可前往【设置-帐号与安全】设置或修改登录密码
-        </p>
       </div>
     </div>
+    <div class="login-dig-footer-box">
+      <p class="code-bottom" style="text-align: center;">
+        未注册用户登录后将自动创建账号，登录即代表同意
+        <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
+        <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
+      </p>
+      <!-- <p class="pass-bottom" style="display: none;text-align: center;">
+        登录即代表同意
+        <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
+        <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
+      </p> -->
+      <p class="set-pass-bottom" style="display: none;text-align: center;margin-top: 12px;">
+        您可前往【设置-帐号与安全】设置或修改登录密码
+      </p>
+    </div>
   </div>
 </div>

src/web/templates/site/common/pc-help-center-head.html

@@ -32,133 +32,9 @@
   </div>
 </section>
 
-<div class="modal fade bidLogin" id="bidLogin" tabindex="-1" role="dialog" aria-labelledby="bidLogin"
-  aria-hidden="true">
-  <div class="modal-dialog login-dig-box is-show" style="max-width:720px;height:584px;width: auto;width:100%;display: flex;">
-    <div class="login_ad_space">
-      <div class="active-tip-group" style="display: none;">
-        <img src="" alt="二维码">
-      </div>
-    </div>
-    <div class="new_login">
-      <div class="login-dig-icon-close" onclick="closeLoginDig()"></div>
-      <img class="logo" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;">
-      <div class="bind-phone-head" style="display: none;">
-        <h3 class="bind-phone-title">绑定手机号</h3>
-        <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
-      </div>
-      <div class="login-dig-tabbar-navbar" style="">
-        <span name="code" class="is-active">验证码登录</span>
-        <span name="pass" class="">密码登录</span>
-        <div class="line-box"></div>
-      </div>
-      <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">
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4">
-          <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify">
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="verify_sms" type="text" placeholder="输入短信验证码" maxlength="6">
-          <div class="after-input-box">
-            <span data-name="verify_get_sms" class="l-get-sms is-stop">获取验证码</span>
-          </div>
-        </div>
-        <button class="login-dig-submit-button" name="verify_submit" disabled="true">登录</button>
-        <div class="go-register" onclick="openLoginDigForReg(true)">立即注册</div>
-      </div>
-      <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">
-        </div>
-        <div class="login-dig-input-box" data-error="密码输入错误">
-          <i class="login-dig-icon-pass"></i>
-          <input autocomplete="off" name="pass_pass" type="password" placeholder="输入密码">
-        </div>
-        <button class="login-dig-submit-button" name="pass_submit" disabled="true">登录</button>
-        <div class="f-box right-box">
-          <a class="forget-pass-link" href="/phone/forgetPwd">忘记密码？</a>
-          <div style="color: #2ABED1!important;" class="forget-pass-link" onclick="openLoginDigForReg(true)">立即注册</div>
-        </div>
-      </div>
-      <div class="login-dig-wx-qrcode-box" style="display: none;">
-        <div class="wx-tip">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-          <span>微信扫码登录</span>
-        </div>
-        <!-- <img class="wx-qrcode" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;"> -->
-        <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
-        <div class="login-dig-top-back-box" style="display: none;" onclick="openLoginDigForWx(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>验证码/密码登录</span>
-        </div>
-      </div>
-      <div class="login-dig-reg register-form-box" style="display: none;">
-        <div class="login-dig-input-box" data-error="手机号码输入错误">
-          <i class="login-dig-icon-phone"></i>
-          <input autocomplete="off" name="register_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4">
-          <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify">
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="register_sms" type="text" placeholder="输入短信验证码" maxlength="6">
-          <div class="after-input-box">
-            <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="公司名称最少4个字">
-          <i class="login-dig-icon-ent"></i>
-          <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称">
-          <div class="autocomplete-box">
-            <ul>
-              <li></li>
-            </ul>
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="邮箱输入错误">
-          <i class="login-dig-icon-email"></i>
-          <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱">
-        </div>
-        <div class="ad_small_space">
-          <img src='{{Msg "seo" "cdn"}}/images/pc/register_email.png?v={{Msg "seo" "version"}}' alt="">
-        </div>
-        <button class="login-dig-submit-button reg-dig-submit-button" name="register_submit_phone"
-          disabled="true">立即注册</button>
-        <div class="back-login" onclick="backLogin(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>登录</span>
-        </div>
-      </div>
-      <div class="login-dig-footer-box">
-        <div class="login-dig-text-split" style="">
-          <i></i><span>使用微信扫码登录</span><i></i>
-        </div>
-        <div class="wx-logo-box" onclick="openLoginDigForWx(true)" style="">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-        </div>
-        <p>
-          未注册用户验证后自动注册，注册即代表同意
-          <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
-          <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
-        </p>
-      </div>
-    </div>
-  </div>
-</div>
+<!-- pc登录弹窗html结构 -->
+{{include "/common/pc-login-dialog.html"}}
+
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/site/common/js/pc-help-center-head.js?v={{Msg "seo" "version"}}'></script>