Jeecg-Boot 2.1.0 版本发布，Online表单开发&在线代码生成器（迟到的版本）

ant-design-vue-jeecg/src/views/user/Alteration.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" style="width: 160%;text-align: center;margin-left:-25%">
     <a-steps class="steps" :current="currentTab">
       <a-step title="账户信息" />
       <a-step title="身份验证" />

ant-design-vue-jeecg/src/views/user/Login.vue

@@ -85,12 +85,12 @@
 
       <a-form-item>
         <a-checkbox v-model="formLogin.rememberMe">自动登陆</a-checkbox>
-        <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
+  <!--      <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>
+        </router-link>-->
       </a-form-item>
 
       <a-form-item style="margin-top:24px">
@@ -176,6 +176,8 @@
   import { putAction } from '@/api/manage'
   import { postAction } from '@/api/manage'
   import { encryption , getEncryptedString } from '@/utils/encryption/aesEncrypt'
+  import store from '@/store/'
+  import { USER_INFO } from "@/store/mutation-types"
 
   export default {
     components: {
@@ -342,7 +344,9 @@
         })
       },
       loginSuccess () {
-        this.loginBtn = false
+        // update-begin- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
+        // this.loginBtn = false
+        // update-end- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
         this.$router.push({ name: "dashboard" })
         this.$notification.success({
           message: '欢迎',
@@ -425,6 +429,10 @@
         }
         putAction("/sys/selectDepart",obj).then(res=>{
           if(res.success){
+            const userInfo = res.result.userInfo;
+            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000);
+            store.commit('SET_INFO', userInfo);
+            //console.log("---切换组织机构---userInfo-------",store.getters.userInfo.orgCode);
             this.departClear()
             this.loginSuccess()
           }else{

ant-design-vue-jeecg/src/views/user/Step1.vue

@@ -41,7 +41,7 @@
 <script>
   import JGraphicCode from '@/components/jeecg/JGraphicCode'
   import { getAction } from  '@/api/manage'
-  import {duplicateCheck } from '@/api/api'
+  import {checkOnlyUser } from '@/api/api'
   export default {
     name: "Step1",
     components: {
@@ -116,14 +116,12 @@
           callback("请输入用户名和手机号！");
         }
 
+        //判断用户输入账号还是手机号码
         if(reg.test(value)){
           var params = {
-            tableName: 'sys_user',
-            fieldName: 'phone',
-            fieldVal: value,
-            dataId: null
+            phone : value,
           };
-          duplicateCheck(params).then((res) => {
+          checkOnlyUser(params).then((res) => {
             if (res.success) {
             callback("用户名不存在!")
           } else {
@@ -132,18 +130,15 @@
         })
         }else{
           var params = {
-            tableName: 'sys_user',
-            fieldName: 'username',
-            fieldVal: value,
-            dataId: null
+            username: value,
           };
-          duplicateCheck(params).then((res) => {
+          checkOnlyUser(params).then((res) => {
             if (res.success) {
-            callback("用户名不存在!")
-          } else {
-            callback()
-          }
-        })
+              callback("用户名不存在!")
+            } else {
+              callback()
+            }
+          })
         }
       },
 

ant-design-vue-jeecg/src/views/user/Step2.vue

@@ -30,22 +30,22 @@
       </a-input>
     </a-form-item>
       <a-form-item
+        label="验证码"
         :labelCol="{span: 5}"
         :wrapperCol="{span: 19}"
-       style="margin-left:106px"
         v-if="show">
-          <a-row :gutter="16" >
-            <a-col class="gutter-row" :span="16">
+          <a-row :gutter="16" style="margin-left: 35px">
+            <a-col class="gutter-row" :span="10">
                 <a-input
                   v-decorator="['captcha',validatorRules.captcha]"
                   type="text"
-                  placeholder="请输入验证码" >
+                  placeholder="手机短信验证码" >
                 </a-input>
             </a-col>
             <a-col class="gutter-row" :span="8" >
               <a-button
-                class="getCaptcha"
                 tabindex="-1"
+                size="default"
                 :disabled="state.smsSendBtn"
                 @click.stop.prevent="getCaptcha"
                 v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>