Merge branch 'master' of http://git.hzwlsoft.com/JeroBoot/jero-boot

jero-web/src/components/layouts/UserLayout.vue

@@ -1,28 +1,10 @@
 <template>
-  <div id="userLayout" :class="['user-layout-wrapper', device]">
+  <div id="userLayout" :class="['user-layout-wrapper',device]">
     <div class="container">
       <div class="top">
-        <div class="header">
-          <a href="/">
-            <img src="~@/assets/logo.svg" class="logo" alt="logo">
-            <span class="title">Jero Boot</span>
-          </a>
-        </div>
-        <div class="desc">
-          Jero Boot 快速开发平台
-        </div>
+        <!--<img src="~@/assets/logoNew.png" alt="">-->
       </div>
-
       <route-view></route-view>
-
-      <div class="footer">
-        <div class="links">
-          <a href="http://doc.jeecg.com" target="_blank">帮助</a>
-        </div>
-        <div class="copyright">
-          Copyright &copy; 2019 <a href="" target="_blank">hzwl&syxy</a>
-        </div>
-      </div>
     </div>
   </div>
 </template>
@@ -46,103 +28,140 @@
     },
   }
 </script>
-
-<style lang="less" scoped>
-  #userLayout.user-layout-wrapper {
+<style lang="less" >
+  #userLayout.user-layout-wrapper{
     height: 100%;
-
-    &.mobile {
-      .container {
-        .main {
-          max-width: 368px;
-          width: 98%;
-        }
-      }
-    }
-
     .container {
+      background: url(~@/assets/home3840.png) no-repeat;
       width: 100%;
-      min-height: 100%;
-      background: #f0f2f5 url(~@/assets/background.svg) no-repeat 50%;
-      background-size: 100%;
-      padding: 110px 0 144px;
+      height: 100%;
+      background-size: 100% 100%;
       position: relative;
-
-      a {
-        text-decoration: none;
-      }
-
-      .top {
-        text-align: center;
-
-        .header {
-          height: 44px;
-          line-height: 44px;
-
-          .badge {
-            position: absolute;
-            display: inline-block;
-            line-height: 1;
-            vertical-align: middle;
-            margin-left: -12px;
-            margin-top: -10px;
-            opacity: 0.8;
-          }
-
-          .logo {
-            height: 44px;
-            vertical-align: top;
-            margin-right: 16px;
-            border-style: none;
-          }
-
-          .title {
-            font-size: 33px;
-            color: rgba(0, 0, 0, .85);
-            font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-            font-weight: 600;
-            position: relative;
-            top: 2px;
-          }
-        }
-        .desc {
-          font-size: 14px;
-          color: rgba(0, 0, 0, 0.45);
-          margin-top: 12px;
-          margin-bottom: 40px;
-        }
-      }
-
-      .main {
-        min-width: 260px;
-        width: 368px;
-        margin: 0 auto;
-      }
-
-      .footer {
+      .top{
         position: absolute;
-        width: 100%;
-        bottom: 0;
-        padding: 0 16px;
-        margin: 48px 0 24px;
-        text-align: center;
-
-        .links {
-          margin-bottom: 8px;
-          font-size: 14px;
-          a {
-            color: rgba(0, 0, 0, 0.45);
-            transition: all 0.3s;
-            &:not(:last-child) {
-              margin-right: 40px;
-            }
-          }
-        }
-        .copyright {
-          color: rgba(0, 0, 0, 0.45);
-          font-size: 14px;
-        }
+        left: 1.5%;
+        top: 2%;
+        width: 207px;
+        height: 70px;
+        background: url("~@/assets/logoNew.png") no-repeat;
+        background-size:100%;
       }
     }
   }
-</style>
+  @media screen and (max-width:1920px){ // 分辨率<=1920px
+    #userLayout.user-layout-wrapper .container {
+      background: url(~@/assets/home1920.png) no-repeat;
+      background-size: 100% 100%;
+    }
+  }
+  @media screen and (max-width:1366px){ // 分辨率<=1366px
+    #userLayout.user-layout-wrapper .container {
+      background: url(~@/assets/home1366.png) no-repeat;
+      background-size: 100% 100%;
+    }
+  }
+</style>
+<!--<style lang="less" scoped>-->
+  <!--#userLayout.user-layout-wrapper {-->
+    <!--height: 100%;-->
+
+    <!--&.mobile {-->
+      <!--.container {-->
+        <!--.main {-->
+          <!--max-width: 368px;-->
+          <!--width: 98%;-->
+        <!--}-->
+      <!--}-->
+    <!--}-->
+
+    <!--.container {-->
+      <!--width: 100%;-->
+      <!--min-height: 100%;-->
+      <!--background: url(~@/assets/home3840.png) no-repeat;-->
+      <!--background-size: 100% 100%;-->
+      <!--padding: 110px 0 144px;-->
+      <!--position: relative;-->
+
+      <!--a {-->
+        <!--text-decoration: none;-->
+      <!--}-->
+
+      <!--.top {-->
+        <!--text-align: center;-->
+
+        <!--.header {-->
+          <!--height: 44px;-->
+          <!--line-height: 44px;-->
+
+          <!--.badge {-->
+            <!--position: absolute;-->
+            <!--display: inline-block;-->
+            <!--line-height: 1;-->
+            <!--vertical-align: middle;-->
+            <!--margin-left: -12px;-->
+            <!--margin-top: -10px;-->
+            <!--opacity: 0.8;-->
+          <!--}-->
+
+          <!--.logo {-->
+            <!--height: 44px;-->
+            <!--vertical-align: top;-->
+            <!--margin-right: 16px;-->
+            <!--border-style: none;-->
+          <!--}-->
+
+          <!--.title {-->
+            <!--font-size: 33px;-->
+            <!--color: rgba(0, 0, 0, .85);-->
+            <!--font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";-->
+            <!--font-weight: 600;-->
+            <!--position: relative;-->
+            <!--top: 2px;-->
+          <!--}-->
+        <!--}-->
+        <!--.desc {-->
+          <!--font-size: 14px;-->
+          <!--color: rgba(0, 0, 0, 0.45);-->
+          <!--margin-top: 12px;-->
+          <!--margin-bottom: 40px;-->
+        <!--}-->
+      <!--}-->
+
+      <!--.main {-->
+        <!--min-width: 260px;-->
+        <!--width: 368px;-->
+        <!--margin: 0 auto;-->
+      <!--}-->
+
+      <!--.footer {-->
+        <!--position: absolute;-->
+        <!--width: 100%;-->
+        <!--bottom: 0;-->
+        <!--padding: 0 16px;-->
+        <!--margin: 48px 0 24px;-->
+        <!--text-align: center;-->
+
+        <!--.links {-->
+          <!--margin-bottom: 8px;-->
+          <!--font-size: 14px;-->
+          <!--a {-->
+            <!--color: rgba(0, 0, 0, 0.45);-->
+            <!--transition: all 0.3s;-->
+            <!--&:not(:last-child) {-->
+              <!--margin-right: 40px;-->
+            <!--}-->
+          <!--}-->
+        <!--}-->
+        <!--.copyright {-->
+          <!--color: rgba(0, 0, 0, 0.45);-->
+          <!--font-size: 14px;-->
+        <!--}-->
+      <!--}-->
+    <!--}-->
+  <!--}-->
+  <!--@media screen and (max-width: 1920px) { // 屏幕宽度>=1920px时-->
+    <!--.contain {-->
+      <!--background:url("~@/assets/home1920.png") no-repeat !important;-->
+    <!--}-->
+  <!--}-->
+<!--</style>-->

jero-web/src/config/router.config.js

@@ -367,5 +367,4 @@ export const constantRouterMap = [
     path: '/404',
     component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
   },
-
 ]

jero-web/src/router/index.js

@@ -4,6 +4,12 @@ import { constantRouterMap } from '@/config/router.config'
 
 Vue.use(Router)
 
+const originalPush = Router.prototype.push
+Router.prototype.push = function push(location, onResolve, onReject) {
+  if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
+  return originalPush.call(this, location).catch(err => err)
+}
+
 export default new Router({
   mode: 'history',
   base: process.env.BASE_URL,

jero-web/src/views/user/Login.vue

@@ -1,154 +1,114 @@
 <template>
   <div class="main">
     <a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
-      <a-tabs
-        :activeKey="customActiveKey"
-        :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
-        @change="handleTabClick">
-        <a-tab-pane key="tab1" tab="账号密码登录">
-          <a-form-item>
-            <a-input
-              size="large"
-              v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
-              type="text"
-              placeholder="请输入帐户名 / admin">
-              <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
+      <div class="user-box">
+        <span class="title">用户登录</span>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <a-col :span="18">
+            <a-form-item>
+              <a-input
+                size="large"
+                v-decorator="['username',{initialValue:'', rules: validatorRules.username.rules,validateTrigger: 'blur'}]"
+                type="text"
+                placeholder="请输入帐号">
+                <a-icon slot="prefix" type="user" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+              </a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3"></a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <a-col :span="18">
+            <a-form-item>
+              <a-input
+                v-decorator="['password',{initialValue:'', rules: validatorRules.password.rules,validateTrigger: 'blur'}]"
+                size="large"
+                type="password"
+                autocomplete="false"
+                placeholder="请输入密码"
+                @paste.native.capture.prevent="handleOperate"
+              >
+                <a-icon slot="prefix" type="lock" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+              </a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3"></a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <a-col :span="12">
+            <a-form-item>
+              <a-input
+                v-decorator="['inputCode',validatorRules.inputCode]"
+                size="large"
+                type="text"
+                @change="inputCodeChange"
+                placeholder="请输入验证码">
+                <a-icon slot="prefix" type="safety" :style="{ color: '#B3B7C2',fontSize:'20px'}"/>
+              </a-input>
+            </a-form-item>
+          </a-col>
 
-          <a-form-item>
-            <a-input
-              v-decorator="['password',validatorRules.password]"
-              size="large"
-              type="password"
-              autocomplete="false"
-              placeholder="密码 / 123456">
-              <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-row :gutter="0">
-            <a-col :span="16">
-              <a-form-item>
-                <a-input
-                  v-decorator="['inputCode',validatorRules.inputCode]"
-                  size="large"
-                  type="text"
-                  @change="inputCodeChange"
-                  placeholder="请输入验证码">
-                  <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-                </a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="8" style="text-align: right">
-              <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
-              <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
-            </a-col>
-          </a-row>
-
-
-        </a-tab-pane>
-        <a-tab-pane key="tab2" tab="手机号登录">
-          <a-form-item>
-            <a-input
-              v-decorator="['mobile',validatorRules.mobile]"
-              size="large"
-              type="text"
-              placeholder="手机号">
-              <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-row :gutter="16">
-            <a-col class="gutter-row" :span="16">
-              <a-form-item>
-                <a-input
-                  v-decorator="['captcha',validatorRules.captcha]"
-                  size="large"
-                  type="text"
-                  placeholder="请输入验证码">
-                  <a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-                </a-input>
-              </a-form-item>
-            </a-col>
-            <a-col class="gutter-row" :span="8">
+          <a-col :span="6" style="text-align: right">
+            <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
+            <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
+          </a-col>
+          <a-col :span="3"></a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <a-col :span="6">
+            <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
+          </a-col>
+          <a-col :span="8"></a-col>
+          <a-col :span="4" style="text-align: right;color: #1891FF;">
+            <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
+              忘记密码
+            </router-link>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="3"></a-col>
+          <a-col :span="18">
+            <a-form-item>
               <a-button
-                class="getCaptcha"
-                tabindex="-1"
-                :disabled="state.smsSendBtn"
-                @click.stop.prevent="getCaptcha"
-                v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>
-            </a-col>
-          </a-row>
-        </a-tab-pane>
-      </a-tabs>
-
-      <a-form-item>
-        <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]" >自动登录</a-checkbox>
-        <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
-          忘记密码
-        </router-link>
-       <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
-          注册账户
-        </router-link>
-      </a-form-item>
-
-      <a-form-item style="margin-top:24px">
-        <a-button
-          size="large"
-          type="primary"
-          htmlType="submit"
-          class="login-button"
-          :loading="loginBtn"
-          @click.stop.prevent="handleSubmit"
-          :disabled="loginBtn">确定
-        </a-button>
-      </a-form-item>
+                block
+                size="large"
+                type="primary"
+                htmlType="submit"
+                class="login-button"
+                :loading="loginBtn"
+                @click.stop.prevent="handleSubmit"
+                :disabled="loginBtn">
+                {{ loginBtn ? "登录中" : "登录" }}
+              </a-button>
+            </a-form-item>
+          </a-col>
+          <a-col :span="3"></a-col>
+        </a-row>
+      </div>
     </a-form>
-
-    <two-step-captcha
-      v-if="requiredTwoStepCaptcha"
-      :visible="stepCaptchaVisible"
-      @success="stepCaptchaSuccess"
-      @cancel="stepCaptchaCancel"></two-step-captcha>
-    <login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
-    <third-login ref="thirdLogin"></third-login>
   </div>
 </template>
-
 <script>
-  //import md5 from "md5"
-  import api from '@/api'
-  import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
   import { mapActions } from "vuex"
   import { timeFix } from "@/utils/util"
   import Vue from 'vue'
   import { ACCESS_TOKEN ,ENCRYPTED_STRING} from "@/store/mutation-types"
   import { putAction,postAction,getAction } from '@/api/manage'
-  import { encryption , getEncryptedString } from '@/utils/encryption/aesEncrypt'
-  import store from '@/store/'
   import { USER_INFO } from "@/store/mutation-types"
-  import ThirdLogin from './third/ThirdLogin'
-  import LoginSelectTenant from "./LoginSelectTenant";
+
   export default {
-    components: {
-      LoginSelectTenant,
-      TwoStepCaptcha,
-      ThirdLogin
-    },
+    components: {},
     data () {
       return {
-        customActiveKey: "tab1",
         loginBtn: false,
         // login type: 0 email, 1 username, 2 telephone
         loginType: 0,
-        requiredTwoStepCaptcha: false,
         stepCaptchaVisible: false,
         form: this.$form.createForm(this),
-        encryptedString:{
-          key:"",
-          iv:"",
-        },
         state: {
           time: 60,
           smsSendBtn: false,
@@ -160,7 +120,7 @@
           captcha:{rule: [{ required: true, message: '请输入验证码!'}]},
           inputCode:{rules: [{ required: true, message: '请输入验证码!'}]}
         },
-        verifiedCode:"",
+        velorifiedCode:"",
         inputCodeContent:"",
         inputCodeNull:true,
         currentUsername:"",
@@ -174,13 +134,9 @@
       Vue.ls.remove(ACCESS_TOKEN)
       this.getRouterData();
       this.handleChangeCheckCode();
-      // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
-      //this.getEncrypte();
-      // update-end- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
     },
     methods: {
       ...mapActions(['Login', 'Logout', 'PhoneLogin']),
-      // handler
       handleUsernameOrEmail (rule, value, callback) {
         const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
         if (regex.test(value)) {
@@ -190,56 +146,34 @@
         }
         callback()
       },
-      handleTabClick (key) {
-        this.customActiveKey = key
-        // this.form.resetFields()
-      },
       handleSubmit () {
         let that = this
         let loginParams = {};
         that.loginBtn = true;
-        // 使用账户密码登录
-        if (that.customActiveKey === 'tab1') {
-          that.form.validateFields([ 'username', 'password','inputCode', 'rememberMe' ], { force: true }, (err, values) => {
-            if (!err) {
-              loginParams.username = values.username
-              // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
-              //loginParams.password = md5(values.password)
-              //loginParams.password = encryption(values.password,that.encryptedString.key,that.encryptedString.iv)
-              loginParams.password = values.password
-              loginParams.remember_me = values.rememberMe
-              // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
-              loginParams.captcha = that.inputCodeContent
-              loginParams.checkKey = that.currdatetime
-              console.log("登录参数",loginParams)
-              that.Login(loginParams).then((res) => {
-                this.$refs.loginSelect.show(res.result)
-              }).catch((err) => {
-                that.requestFailed(err);
-              });
+        that.form.validateFields([ 'username', 'password','inputCode', 'rememberMe' ], { force: true }, (err, values) => {
+          if (!err) {
+            loginParams.username = values.username
+            loginParams.password = values.password
+            loginParams.remember_me = values.rememberMe
+            loginParams.captcha = that.inputCodeContent
+            loginParams.checkKey = that.currdatetime
+            console.log("登录参数",loginParams)
+            that.Login(loginParams).then((res) => {
+              //登录成功
+              this.loginSuccess()
+            }).catch((err) => {
+              if (err.code === 500 && err.message === '验证码错误') {
+                // 刷新验证码
+                this.handleChangeCheckCode();
+              }
+              that.requestFailed(err);
+            });
 
 
-            }else {
-              that.loginBtn = false;
-            }
-          })
-          // 使用手机号登录
-        } else {
-          that.form.validateFields([ 'mobile', 'captcha', 'rememberMe' ], { force: true }, (err, values) => {
-            if (!err) {
-              loginParams.mobile = values.mobile
-              loginParams.captcha = values.captcha
-              loginParams.remember_me = values.rememberMe
-              that.PhoneLogin(loginParams).then((res) => {
-                console.log(res.result);
-                this.$refs.loginSelect.show(res.result)
-              }).catch((err) => {
-                that.requestFailed(err);
-              })
-
-            }
-          })
-        }
+          }else {
+            that.loginBtn = false;
+          }
+        })
       },
       getCaptcha (e) {
         e.preventDefault();
@@ -259,8 +193,8 @@
 
               const hide = this.$message.loading('验证码发送中..', 0);
               let smsParams = {};
-                  smsParams.mobile=values.mobile;
-                  smsParams.smsmode="0";
+              smsParams.mobile=values.mobile;
+              smsParams.smsmode="0";
               postAction("/sys/sms",smsParams)
                 .then(res => {
                   if(!res.success){
@@ -305,8 +239,9 @@
         })
       },
       loginSuccess () {
-        this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
-          console.log('登录跳转首页出错,这个错误从哪里来的')
+        this.$router.push({ path: "/dashboard/analysis" }).catch((res)=>{
+          console.log(res)
+          // console.log('登录跳转首页出错,这个错误从哪里来的')
         })
         this.$notification.success({
           message: '欢迎',
@@ -334,7 +269,6 @@
         }else{
           callback("您的手机号码格式不正确!");
         }
-
       },
       validateInputCode(rule,value,callback){
         if(!value || this.verifiedCode==this.inputCodeContent){
@@ -352,81 +286,68 @@
       loginSelectOk(){
         this.loginSuccess()
       },
-    getRouterData(){
-      this.$nextTick(() => {
-        if (this.$route.params.username) {
-          this.form.setFieldsValue({
-            'username': this.$route.params.username
-          });
-        }
-      })
-    },
-    //获取密码加密规则
-    getEncrypte(){
-      var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
-      if(encryptedString == null){
-        getEncryptedString().then((data) => {
-          this.encryptedString = data
-        });
-      }else{
-        this.encryptedString = encryptedString;
-      }
-    },
+      getRouterData(){
+        this.$nextTick(() => {
+          if (this.$route.params.username) {
+            this.form.setFieldsValue({
+              'username': this.$route.params.username
+            });
+          }
+        })
+      },
     }
   }
 </script>
 
 <style lang="less" scoped>
-
-  .user-layout-login {
-    label {
-      font-size: 14px;
-    }
-
-    .getCaptcha {
-      display: block;
+  .ant-input-affix-wrapper/deep/ .ant-input:not(:first-child){
+    padding-left: 40px;
+  }
+  .ant-row{
+    margin-bottom: 5%;
+  }
+  .user-layout-login{
+    width: 550px;
+    height: 650px;
+    background: #fff;
+    -webkit-border-radius: 20px;
+    -moz-border-radius: 20px;
+    border-radius: 20px;
+    position: absolute;
+    right: 8%;
+    top: 50%;
+    -webkit-transform: translateY(-50%);
+    -moz-transform: translateY(-50%);
+    -ms-transform: translateY(-50%);
+    -o-transform: translateY(-50%);
+    transform: translateY(-50%);
+    .user-box{
       width: 100%;
-      height: 40px;
-    }
-
-    .forge-password {
-      font-size: 14px;
-    }
-
-    button.login-button {
-      padding: 0 15px;
-      font-size: 16px;
-      height: 40px;
-      width: 100%;
-    }
-
-    .user-login-other {
-      text-align: left;
-      margin-top: 24px;
-      line-height: 22px;
-
-      .item-icon {
-        font-size: 24px;
-        color: rgba(0,0,0,.2);
-        margin-left: 16px;
-        vertical-align: middle;
-        cursor: pointer;
-        transition: color .3s;
-
-        &:hover {
-          color: #1890ff;
-        }
+      height: 100%;
+      overflow: hidden;
+      .title{
+        display: block;
+        color: #1891FF;
+        font-size: 34px;
+        font-weight: 700;
+        margin: 12% 0 9% 0;
+        text-align: center;
       }
-
-      .register {
-        float: right;
+      .login-button{
+        margin: 5% 0 0 0;
       }
     }
   }
-
+  @media screen and (max-width:1920px){ // 分辨率<=1920px
+    .user-layout-login {
+      width: 550px;
+      height: 650px;
+    }
+  }
+  @media screen and (max-width:1366px){ // 分辨率<=1366px
+    .user-layout-login {
+      width: 450px;
+      height: 532px;
+    }
+  }
 </style>
-<style>
-  .valid-error .ant-select-selection__placeholder{
-    color: #f5222d;
-  }
-</style>

jero-web/src/views/user/alteration/Alteration.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" style="width: 130%;text-align: center;margin-left:-10%">
+  <a-card :bordered="false" style="width: 100%;text-align: center;">
     <a-steps class="steps" :current="currentTab">
       <a-step title="手机验证"/>
       <a-step title="密码"/>

jero-web/src/views/user/register/Register.vue

@@ -38,7 +38,7 @@
       <a-form-item
         fieldDecoratorId="mobile"
         :fieldDecoratorOptions="{rules: [{ required: false}, { validator: this.handlePhoneCheck }]}">
-        <a-input size="large" placeholder="11 位手机号"> 
+        <a-input size="large" placeholder="11 位手机号">
           <a-select slot="addonBefore" size="large" defaultValue="+86">
             <a-select-option value="+86">+86</a-select-option>
             <a-select-option value="+87">+87</a-select-option>