调整样式，DEP统计功能

src/main/resources/static/css/account/login.css

@@ -95,20 +95,20 @@ li{list-style:none}
  .loginForm .formLine-tabs .tabs-item:before{content: '';width: 24px;height: 4px;background: #FFFFFF;position: absolute;bottom: -5px;left: 50%;margin-left: -12px;}
  .loginForm .formLine-tabs .tabs-item.current{font-weight: bold;}
  .loginForm .formLine-tabs .tabs-item.current:before{background: #E15621;}
- .loginForm form{width:93.4vw;margin:50vw auto 0}
+ .loginForm form{width:100%;box-sizing: border-box;padding: 0 8vw; margin:50vw auto 0}
  .loginForm .formLine{height:16.4vw;padding:0;position: relative;}
  .loginForm .formLine.smscode{width: 100%;}
- .loginForm input{height:11.2vw;line-height:6vw;padding: 2.6vw 0;box-sizing: border-box;border-radius: 5.5vw;}
- .loginForm .formLine .code-btn{width: 24.8vw;height:11.2vw;line-height: 11.2vw;text-align: center;background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);font-size:3.4vw;color: #FFFFFF;position: absolute;right: 0;top: 0;border-radius: 0 8.2vw 8.2vw 0;}
+ .loginForm input{height:12vw;line-height:8vw;padding: 2vw 0;box-sizing: border-box;border-radius: 6vw;}
+ .loginForm .formLine .code-btn{width: 24.8vw;height:12vw;line-height: 12vw;text-align: center;background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);font-size:3.4vw;color: #FFFFFF;position: absolute;right: 0;top: 0;border-radius: 0 6vw 6vw 0;}
  .loginForm .formLine .code-btn.disabled{background: rgba(225,86,33,0.7);}
  .loginForm input.smscode{box-sizing: border-box;}
  .loginForm .checked{top:3.6vw;right:3.6vw;}
  .loginForm .forget{text-align:right;color:#4a4f58;font-size:3.4vw;line-height:3.4vw;margin-bottom:4.8vw}
  .loginForm .forget .btn{float: left;color: #E15621;}
  .loginForm .submit{line-height:11.2vw;font-size:3.4vw;text-align:center;color:#22272e;margin-top: 3vw;}
- .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:11.2vw;border-radius: 5.5vw;margin-bottom:4.8vw}
+ .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:12vw;border-radius: 6vw;margin-bottom:4.8vw;line-height: 12vw;font-size: 3.4vw;}
  .loginForm .submit button.btn{background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);color:#FFF;}
- .loginForm .submit button.disabled{background-color:#E1E1E1;color:#F7F7F7;border-color:#E1E1E1;}
+ .loginForm .submit button.disabled{background:#E1E1E1;color:#F7F7F7;}
  .loginForm .login-line{width: 100%;height: 1px;background: #E2E2E2;margin-top: 10px;float: left;position: relative;}
  .loginForm .login-line span{display: block;line-height: 24px;padding: 0 5px;text-align: center;font-size: 12px;color: #999999;position: absolute;background: #FFFFFF;left: 50%;top: -12px;margin-left: -30px;}
  .loginForm .submit .weChat{display:block;margin:10vw auto;width:50vw;color:#627386;line-height:8vw}
@@ -127,7 +127,7 @@ li{list-style:none}
  @keyframes slidetounlock { 0% {background-position: -100px 0;} 100% {background-position: 100px 0;} }
  .foot{display: none;}
  /*极验*/
- .verify-wrap{width: 93.4vw !important;margin-top: 0;float: left;height: 46px;margin-bottom: 4vw;border-radius: 23px;}
+ .verify-wrap{width: 100% !important;margin-top: 0;float: left;height: 46px;margin-bottom: 4vw;border-radius: 23px;}
  .verify-wrap .drag-btn{left:2px;top: 2px;height: 40px;border-radius:24px;border:1px solid #b8bfca;}
  .verify-wrap .fix-tips, .verify-msg{line-height: 44px;border-radius: 22px;}
  .verify-wrap .drag-progress{ top: 2px;border-radius: 22px 0 0 22px;}

src/main/resources/static/css/base/base.pc.css

@@ -55,7 +55,7 @@ iframe{width:320px !important;height: 280px !important}
 .content-model .model-content .model-form .refresh .icon:before{width: 16px;height: 16px;background-position:-200px -372px;}
 .content-model .model-content .model-form .refresh span{display: none;}
 .content-model .model-content .model-button{width: 100%;height: 32px;float: left;margin-top: 32px;}
-.content-model .model-content .model-button .button{width: 120px;height: 32px;border-radius: 16px;background-color: #FF5B00;text-align: center;line-height: 32px;font-size: 14px;float: right;color: #FFFFFF;cursor: pointer;}
+.content-model .model-content .model-button .button{width: 120px;height: 32px;border-radius: 16px;background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);text-align: center;line-height: 32px;font-size: 14px;float: right;color: #FFFFFF;cursor: pointer;}
 
 /* 头部 */
 .baseHeadTop{width:100%;font-size:14px;background:#F7F7F7;}

src/main/resources/static/css/base/form.css

@@ -32,8 +32,8 @@
 .formLine .showPwd.on:before{width:22px;height:20px;background-position:-205px -299px}
 .formLine.code input{width:312px}
 .formLine.code .checked{right:auto;left:288px}
-.formLine.code .getCode{position:absolute;right:0;top:32px;box-sizing:border-box;width:168px;height:36px;line-height:34px;text-align:center;background-color:#ffe6dc;border-radius:18px;border:solid 1px #FF5B00;color:#FF5B00;font-size:14px}
- .formLine.code .getCode.disabled{background-color: #F7F7F7;color: #999999;border-color: #999999;}
+.formLine.code .getCode{position:absolute;right:0;top:32px;box-sizing:border-box;width:168px;height:36px;line-height:34px;text-align:center;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius:18px;color:#FFFFFF;font-size:14px}
+ .formLine.code .getCode.disabled{background: #F7F7F7;color: #999999;}
 .subLine p{font-size:14px}
 .subLine p input{vertical-align:top;margin-right:10px;cursor:pointer}
 .subLine p a{color:#1890f9}
@@ -44,7 +44,7 @@
 .subLine .checked.show{display:block}
 .subLine .errTips.show{visibility:visible}
 .subLine .errTips:before{width:20px;height:20px;background-position:-172px -296px;vertical-align:top}
-.subLine .btn{cursor: pointer;display:block;margin:32px auto;width:232px;height:50px;line-height:50px;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius:25px;text-align:center;font-size:18px;color:#FFF}
+.subLine .btn{cursor: pointer;display:block;margin:32px auto;width:248px;height:50px;line-height:50px;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius:25px;text-align:center;font-size:18px;color:#FFF}
 .subLine .btn.disabled{background-color: #999999;}
 .subLine .iconfont{width:16px;height: 16px;display: block;background:url(/img/base/icon.png) no-repeat;float: left;margin-right: 5px;cursor: pointer;}
 .subLine .icon-weigouxuan{background-position: -236px 0;}

src/main/resources/static/js/account/mixins/loginMixins.js

@@ -27,7 +27,7 @@ var loginMixins = function () {
             }
         },
         methods: {
-            openFullScreen2(response) {
+            openFullScreen2() {
                 const _self = this
                 const loading = this.$loading({
                     lock: true,
@@ -38,7 +38,6 @@ var loginMixins = function () {
                 _self.isLoading = true
                 setTimeout(() => {
                     loading.close();
-                    _self.userUpdataeStatus(response)
                 }, 1000);
             },
             handleSubLogin(){// 点击账号密码登录
@@ -47,13 +46,13 @@ var loginMixins = function () {
                 this.$nextTick(function(){
                     if (!verifyForm()) { return false; }
                     _self.loginLoading = true;
+                    _self.openFullScreen2()
                     UserApi.PostLoginAccount(_self.accountParams,function(response){
                         if (sessionStorage.getItem('saveParams')) {
                             _self.requireBaseLoginStatus(response)
                             return
                         }
-                        _self.openFullScreen2(response)
-                        // _self.userUpdataeStatus(response)
+                        _self.userUpdataeStatus(response)
                     });
                 });
             },
@@ -63,12 +62,13 @@ var loginMixins = function () {
                 this.$nextTick(function(){
                     if (!verifyForm()) { return false; }
                     _self.loginLoading = true;
+                    _self.openFullScreen2()
                     UserApi.userCodeLogin(_self.codeParams,function(response){
                         if (sessionStorage.getItem('saveParams')) {
                             _self.requireBaseLoginStatus(response)
                             return
                         }
-                        _self.openFullScreen2(response)
+                        _self.userUpdataeStatus(response)
                     });
                 });
             },