Merge remote-tracking branch 'origin/gst4base' into gst4base

jeecgboot-vue3-master/src/assets/loginmini/style/home.less

@@ -30,7 +30,7 @@
 }
 .aui-form {
   width: 100%;
-  padding: 40px 30px;
+  padding: 20px 30px;
   background-color: transparent !important;
 }
 
@@ -117,7 +117,7 @@
   border: none;
   color: #333333;
   font-size: 14px;
-  background: unset;
+  // background: unset;
   padding-left: 40px;
 }
 
@@ -343,7 +343,7 @@
 .aui-inputClear {
   width: 100%;
   position: relative;
-  padding-left: 20px;
+  padding-left: 31px;
   // background: #fff;
   margin-bottom: 8px;
   margin-top: 20px;
@@ -352,7 +352,7 @@
 .aui-inputClear .icon {
   position: absolute;
   top: 10px;
-  left: 0;
+  left: 9px;
 }
 
 .aui-inputClear input {
@@ -418,17 +418,18 @@
 }
 
 .aui-formButton {
-  padding-top: 10px;
+  // padding-top: 10px;
 }
 
 .aui-formButton a {
+
   height: 42px;
   padding: 10px 15px;
   font-size: 14px;
   border-radius: 8px;
-  border-color: #67b5ff;
-  background: #1b90ff;
-  width: 100%;
+  border-color: #0bd7c6;
+  background: #0bd7c6;
+  width: 218px;
   cursor: pointer;
   border: none;
   color: #fff;
@@ -452,8 +453,8 @@
 }
 
 .aui-formButton .aui-linek-code:hover {
-  color: #1b90ff;
-  border: 1px solid #1b90ff;
+  color: #30e3ce;
+  border: 1px solid #30e3ce;
 }
 
 .aui-third-text {

jeecgboot-vue3-master/src/views/system/loginmini/MiniForgotpad.vue

@@ -2,11 +2,11 @@
   <div class="aui-content">
     <div class="aui-container">
       <div class="aui-form">
-        <div class="aui-image">
-          <!-- <div class="aui-image-text">
+        <!-- <div class="aui-image">
+          <div class="aui-image-text">
             <img :src="adTextImg" alt="" />
-          </div> -->
           </div>
+        </div> -->
         <div class="aui-formBox">
           <div class="aui-formWell">
             <div class="aui-step-box">

jeecgboot-vue3-master/src/views/system/loginmini/MiniRegister.vue

@@ -4,24 +4,27 @@
       <div class="aui-form">
         <div class="aui-formBox">
           <div class="aui-formWell">
+            <div class="login-title">{{ t('sys.login.signUpFormTitle') }}</div>
             <a-form ref="formRef" :model="formData">
-              <div class="aui-flex aui-form-nav aui-clear-left" style="padding-bottom: 21px">
-                <div class="aui-flex-box activeNav on">{{ t('sys.login.signUpFormTitle') }}</div>
-              </div>
+
               <div class="aui-form-box">
                 <div class="aui-account aui-account-line">
                   <a-form-item>
-                    <div class="aui-input-line">
+                    <div style="display: flex;align-items: center;justify-content: space-between;">
+                       <div class="aui-input-line" style="flex: 1;">
                       <Icon class="aui-icon" icon="ant-design:user-outlined" />
                       <a-input class="fix-auto-fill" type="text" :placeholder="t('sys.login.userName')" v-model:value="formData.username" />
                     </div>
-                  </a-form-item>
-                  <a-form-item>
-                    <div class="aui-input-line">
+                    <div class="aui-input-line" style="flex: 1;margin-left: 24px;">
                       <Icon class="aui-icon" icon="ant-design:mobile-outlined" />
                       <a-input class="fix-auto-fill" type="text" :placeholder="t('sys.login.name')" v-model:value="formData.realname" />
                     </div>
+                    </div>
+                   
                   </a-form-item>
+                  <!-- <a-form-item>
+                    
+                  </a-form-item> -->
                   <a-form-item>
                     <div class="aui-input-line">
                       <Icon class="aui-icon" icon="ant-design:mobile-outlined" />
@@ -102,12 +105,12 @@
                   <!--                  </a-form-item>-->
                 </div>
               </div>
-              <div class="aui-formButton">
+              <div class="aui-formButton" style="display: flex;align-items: center;justify-content: center;">
                 <div class="aui-flex">
                   <a class="aui-link-login aui-flex-box"  @click="registerHandleClick"> {{ t('sys.login.registerButton') }}</a>
                 </div>
                 <div class="aui-flex">
-                  <a class="aui-linek-code aui-flex-box" @click="goBackHandleClick">{{ t('sys.login.backSignIn') }}</a>
+                  <a class="aui-linek-code aui-flex-box" style="margin-left: 20px;" @click="goBackHandleClick">{{ t('sys.login.backSignIn') }}</a>
                 </div>
               </div>
             </a-form>
@@ -119,7 +122,6 @@
 </template>
 
 <script lang="ts" setup name="mini-register">
-
   import { ref, reactive, unref, toRaw, onMounted } from 'vue';
   import { getCaptcha, registerStu, getCodeInfo } from '/@/api/sys/user';
   import { SmsEnum } from '/@/views/sys/login/useLogin';
@@ -293,7 +295,16 @@ const randCodeData = reactive<any>({
    * 初始化表单
    */
   function initForm() {
-    Object.assign(formData, { workno: '', username: '', mobile: '', realname: '', department: '', smscode: '', password: '', confirmPassword: ''/*, policy: false*/ });
+    Object.assign(formData, {
+      workno: '',
+      username: '',
+      mobile: '',
+      realname: '',
+      department: '',
+      smscode: '',
+      password: '',
+      confirmPassword: '' /*, policy: false*/,
+    });
     if (!unref(timer)) {
       showInterval.value = true;
       clearInterval(unref(timer));
@@ -335,4 +346,8 @@ const randCodeData = reactive<any>({
     left: 10px;
     font-size: 20px !important;
   }
+  :deep(.ant-btn-primary){
+    background-color: #0bd7c6;
+    border: none;
+  }
 </style>