diff --git a/packages/design-core/src/login/ForgotPassword.vue b/packages/design-core/src/login/ForgotPassword.vue
index c3f8bfbbc9..29159986dd 100644
--- a/packages/design-core/src/login/ForgotPassword.vue
+++ b/packages/design-core/src/login/ForgotPassword.vue
@@ -52,14 +52,17 @@
         </tiny-tooltip>
       </tiny-form-item>
       <tiny-form-item>
-        <tiny-button type="primary" @click="handleForgot"> 提交</tiny-button>
+        <tiny-button :disabled="!isReady" type="primary" @click="handleForgot"> 提交</tiny-button>
       </tiny-form-item>
     </tiny-form>
+    <div class="forgot-bottom">
+      <div class="to-login" @click="toLogin">去登录</div>
+    </div>
   </div>
 </template>
 
 <script lang="ts">
-import { reactive, watch } from 'vue'
+import { reactive, watch, computed } from 'vue'
 import { TinyForm, TinyFormItem, TinyInput, TinyButton, TinyTooltip } from '@opentiny/vue'
 import useLogin from './js/useLogin'
 import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
@@ -87,6 +90,17 @@ export default {
       rules: [...useLogin().passwordRules]
     })
 
+    const isReady = computed(() => {
+      return (
+        state.forgotData.username &&
+        state.forgotData.password &&
+        state.forgotData.key &&
+        state.forgotData.confirmPassword &&
+        !state.pwManualShow &&
+        state.forgotData.confirmPassword === state.forgotData.password
+      )
+    })
+
     const handleConfirmPwChange = () => {
       if (state.forgotData.confirmPassword !== state.forgotData.password) {
         state.confirmManualShow = true
@@ -131,6 +145,10 @@ export default {
       }
     }
 
+    const toLogin = () => {
+      emit('changeStatus', useLogin().LOGIN)
+    }
+
     watch(
       () => state.forgotData.password,
       () => {
@@ -139,7 +157,9 @@ export default {
     )
     return {
       state,
-      handleForgot
+      isReady,
+      handleForgot,
+      toLogin
     }
   }
 }
@@ -150,7 +170,7 @@ export default {
   color: #191919;
   font-size: 24px;
   font-weight: 600;
-  margin-bottom: 28px;
+  margin-bottom: 36px;
 }
 
 .pw-tips {
@@ -170,6 +190,16 @@ export default {
   }
 }
 
+.forgot-bottom {
+  display: flex;
+  justify-content: center;
+  font-size: 14px;
+  .to-login {
+    cursor: pointer;
+    color: #1476ff;
+  }
+}
+
 :deep(.tiny-form-item__content) {
   margin-left: 0 !important;
 }
diff --git a/packages/design-core/src/login/Index.vue b/packages/design-core/src/login/Index.vue
index 4354e56c8c..63a5888c7a 100644
--- a/packages/design-core/src/login/Index.vue
+++ b/packages/design-core/src/login/Index.vue
@@ -61,12 +61,11 @@ export default {
   height: 100vh;
   background: linear-gradient(to top left, #e7f0ff, #fff);
   display: flex;
-  padding: 10%;
+  padding: 10% 10% 0 10%;
   .login-left {
     flex: 2;
     .login-img {
       max-height: 500px;
-      min-height: 298px;
       width: 100%;
       height: 100%;
       background-image: url(../../assets/login-bg.svg);
@@ -77,21 +76,46 @@ export default {
   }
 
   .login-right {
-    flex: 1;
+    flex: 1.2;
+    margin-top: 50px;
     margin-left: 80px;
     .login-form {
       box-sizing: border-box;
       max-width: 440px;
       min-width: 340px;
-      max-height: 500px;
-      min-height: 298px;
       width: 100%;
-      height: 100%;
       background: #fff;
       border-radius: 12px;
       box-shadow: 0 8px 40px 0 #dce6f6;
-      padding: 48px 60px;
+      padding: 52px 60px 80px 60px;
+      max-height: 100%;
+      overflow-y: auto;
     }
   }
+
+  :deep(.tiny-form-item__content) {
+    margin-left: 0 !important;
+  }
+  :deep(.tiny-button.tiny-button.tiny-button.tiny-button) {
+    width: 100%;
+    background: #191919;
+    height: 32px;
+    margin-top: 20px;
+    font-size: 14px;
+  }
+  :deep(.tiny-button.tiny-button.tiny-button.tiny-button.tiny-button--primary) {
+    border: none;
+  }
+  :deep(.tiny-input.tiny-input .tiny-input__inner.tiny-input__inner) {
+    height: 32px;
+    font-size: 14px;
+  }
+  :deep(.tiny-input.tiny-input .tiny-input__inner.tiny-input__inner)::placeholder {
+    font-size: 14px;
+  }
+
+  :deep(.tiny-form.tiny-form.tiny-form .tiny-form-item) {
+    margin-bottom: 20px;
+  }
 }
 </style>
diff --git a/packages/design-core/src/login/Login.vue b/packages/design-core/src/login/Login.vue
index f880a487c7..301be2b81c 100644
--- a/packages/design-core/src/login/Login.vue
+++ b/packages/design-core/src/login/Login.vue
@@ -14,7 +14,7 @@
         ></tiny-input>
       </tiny-form-item>
       <tiny-form-item>
-        <tiny-button type="primary" @click="handleLogin"> 登录 </tiny-button>
+        <tiny-button :disabled="!isReady" type="primary" @click="handleLogin"> 登录 </tiny-button>
       </tiny-form-item>
     </tiny-form>
     <div class="login-bottom">
@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts">
-import { reactive } from 'vue'
+import { reactive, computed } from 'vue'
 import { TinyForm, TinyFormItem, TinyInput, TinyButton } from '@opentiny/vue'
 import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 import useLogin from './js/useLogin'
@@ -51,6 +51,10 @@ export default {
       }
     })
 
+    const isReady = computed(() => {
+      return state.loginData.username && state.loginData.password
+    })
+
     const handleLogin = () => {
       getMetaApi(META_SERVICE.Http)
         .post('/platform-center/api/user/login', {
@@ -78,8 +82,10 @@ export default {
     const toForgot = () => {
       emit('changeStatus', useLogin().FORGOT)
     }
+
     return {
       state,
+      isReady,
       handleLogin,
       toRegister,
       toForgot
@@ -93,15 +99,14 @@ export default {
   color: #191919;
   font-size: 24px;
   font-weight: 600;
-  margin-bottom: 28px;
+  margin-bottom: 36px;
 }
 
 .login-bottom {
-  margin-top: 16px;
   display: flex;
   justify-content: space-between;
   color: #1476ff;
-  margin-bottom: 32px;
+  font-size: 14px;
   div {
     cursor: pointer;
   }
@@ -140,11 +145,4 @@ export default {
     cursor: pointer;
   }
 }
-:deep(.tiny-form-item__content) {
-  margin-left: 0 !important;
-}
-:deep(.tiny-button.tiny-button.tiny-button.tiny-button) {
-  width: 100%;
-  background: #595959;
-}
 </style>
diff --git a/packages/design-core/src/login/Register.vue b/packages/design-core/src/login/Register.vue
index bbbd1e04bf..b3c617085d 100644
--- a/packages/design-core/src/login/Register.vue
+++ b/packages/design-core/src/login/Register.vue
@@ -49,7 +49,7 @@
         </tiny-tooltip>
       </tiny-form-item>
       <tiny-form-item>
-        <tiny-button type="primary" @click="handleRegister"> 注册</tiny-button>
+        <tiny-button :disabled="!isReady" type="primary" @click="handleRegister"> 注册</tiny-button>
       </tiny-form-item>
     </tiny-form>
     <div class="register-bottom">
@@ -60,7 +60,7 @@
 </template>
 
 <script lang="ts">
-import { reactive, watch } from 'vue'
+import { reactive, watch, computed } from 'vue'
 import { TinyForm, TinyFormItem, TinyInput, TinyButton, TinyTooltip } from '@opentiny/vue'
 import useLogin from './js/useLogin'
 import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
@@ -86,6 +86,16 @@ export default {
       rules: [...useLogin().passwordRules]
     })
 
+    const isReady = computed(() => {
+      return (
+        state.registerData.username &&
+        state.registerData.password &&
+        state.registerData.confirmPassword &&
+        !state.pwManualShow &&
+        state.registerData.confirmPassword === state.registerData.password
+      )
+    })
+
     const handleConfirmPwChange = () => {
       if (state.registerData.confirmPassword !== state.registerData.password) {
         state.confirmManualShow = true
@@ -144,6 +154,7 @@ export default {
 
     return {
       state,
+      isReady,
       handleRegister,
       handlePwChange,
       toLogin
@@ -157,7 +168,7 @@ export default {
   color: #191919;
   font-size: 24px;
   font-weight: 600;
-  margin-bottom: 28px;
+  margin-bottom: 36px;
 }
 
 .pw-tips {
@@ -178,11 +189,10 @@ export default {
 }
 
 .register-bottom {
-  margin-top: 16px;
   display: flex;
   justify-content: center;
   color: #808080;
-  margin-bottom: 32px;
+  font-size: 14px;
   .to-login {
     cursor: pointer;
     color: #1476ff;
diff --git a/packages/design-core/src/login/RegisterSuccess.vue b/packages/design-core/src/login/RegisterSuccess.vue
index f420ade21f..1cb95fed38 100644
--- a/packages/design-core/src/login/RegisterSuccess.vue
+++ b/packages/design-core/src/login/RegisterSuccess.vue
@@ -19,6 +19,7 @@
 import { reactive, computed } from 'vue'
 import { TinyCheckbox, TinyButton } from '@opentiny/vue'
 import useLogin from './js/useLogin'
+import { useModal } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
@@ -37,14 +38,13 @@ export default {
       emit('changeStatus', useLogin().LOGIN)
     }
 
-    const copy = () => {
-      const textarea = document.createElement('textarea')
-
-      textarea.value = `${publicKey.value}`
-      document.body.appendChild(textarea)
-      textarea.select()
-      document.execCommand('copy')
-      document.body.removeChild(textarea)
+    const copy = async () => {
+      try {
+        await navigator.clipboard.writeText(publicKey.value)
+        useModal().message({ message: '复制成功', status: 'success' })
+      } catch (err) {
+        useModal().message({ message: '复制失败', status: 'error' })
+      }
     }
 
     return {
@@ -94,14 +94,4 @@ export default {
     margin-bottom: 20px;
   }
 }
-
-:deep(.tiny-button.tiny-button.tiny-button.tiny-button) {
-  margin-top: 20px;
-  background: #fff;
-  color: #191919;
-  border: 1px solid #c9c9c9;
-}
-:deep(.tiny-button.tiny-button.tiny-button.tiny-button.tiny-button--primary:not(.is-disabled)):hover {
-  background: #fff;
-}
 </style>