Merge pull request #134 from suyuan32/dev

Dev
suyuan32 · Nov 17, 2023 · ce64179 · ce64179
2 parents a654ed0 + 7fd2e72
commit ce64179
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -119,11 +119,9 @@
     "@purge-icons/generated": "^0.9.0",
     "@types/codemirror": "^5.60.13",
     "@types/crypto-js": "^4.2.1",
-    "@types/intro.js": "^5.1.4",
     "@types/lodash-es": "^4.17.11",
     "@types/mockjs": "^1.0.10",
     "@types/nprogress": "^0.2.3",
-    "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.9.10",
     "@types/showdown": "^2.0.4",
     "@types/sortablejs": "^1.15.5",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/views/sys/login/ForgetPasswordForm.vue b/src/views/sys/login/ForgetPasswordForm.vue
@@ -4,8 +4,12 @@
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
       <div class="pt-4 pb-4">
         <ARadioGroup v-model:value="formData.msgType" button-style="solid" size="large">
-          <ARadioButton value="email"> {{ t('sys.login.email') }} </ARadioButton>
-          <ARadioButton value="sms"> {{ t('sys.login.mobile') }} </ARadioButton>
+          <ARadioButton class="bg-transparent" value="email">
+            {{ t('sys.login.email') }}
+          </ARadioButton>
+          <ARadioButton class="bg-transparent" value="sms">
+            {{ t('sys.login.mobile') }}
+          </ARadioButton>
         </ARadioGroup>
       </div>
 

diff --git a/src/views/sys/login/LoginFormTitle.vue b/src/views/sys/login/LoginFormTitle.vue
@@ -1,5 +1,5 @@
 <template>
-  <h2 class="mb-3 text-2xl font-bold text-center xl:text-3xl enter-x xl:text-left form-title">
+  <h2 class="ml-4 mb-3 text-2xl font-bold text-center xl:text-3xl enter-x xl:text-left form-title">
     {{ getFormTitle }}
   </h2>
 </template>

diff --git a/src/views/sys/login/RegisterForm.vue b/src/views/sys/login/RegisterForm.vue
@@ -4,9 +4,15 @@
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
       <div class="pt-4 pb-4">
         <ARadioGroup v-model:value="formData.msgType" button-style="solid" size="large">
-          <ARadioButton value="captcha"> {{ t('sys.login.captcha') }} </ARadioButton>
-          <ARadioButton value="email"> {{ t('sys.login.email') }} </ARadioButton>
-          <ARadioButton value="sms"> {{ t('sys.login.mobile') }} </ARadioButton>
+          <ARadioButton class="bg-transparent" value="captcha">
+            {{ t('sys.login.captcha') }}
+          </ARadioButton>
+          <ARadioButton class="bg-transparent" value="email">
+            {{ t('sys.login.email') }}
+          </ARadioButton>
+          <ARadioButton class="bg-transparent" value="sms">
+            {{ t('sys.login.mobile') }}
+          </ARadioButton>
         </ARadioGroup>
       </div>
 
@@ -70,12 +76,20 @@
         class="enter-x"
         :rules="[{ required: true, len: 5 }]"
       >
-        <Input size="large" v-model:value="formData.captcha" :placeholder="t('sys.login.captcha')">
+        <Input
+          size="large"
+          v-model:value="formData.captcha"
+          :placeholder="t('sys.login.captcha')"
+          class="fix-auto-fill bg-transparent"
+        >
           <template #suffix>
-            <img
+            <Image
               :src="formData.imgPath"
-              class="absolute right-0 h-full cursor-pointer"
-              @click="getCaptchaData()"
+              :width="120"
+              :height="40"
+              :preview="false"
+              @click="getCaptchaData"
+              class="rounded"
             />
           </template>
         </Input>
@@ -87,7 +101,7 @@
 
       <FormItem class="enter-x" name="policy">
         <!-- No logic, you need to deal with it yourself -->
-        <Checkbox v-model:checked="formData.policy" size="small">
+        <Checkbox v-model:checked="formData.policy" class="bg-transparent" size="small">
           {{ t('sys.login.policy') }}
         </Checkbox>
       </FormItem>
@@ -111,7 +125,7 @@
 <script lang="ts" setup>
   import { reactive, ref, unref, computed } from 'vue';
   import LoginFormTitle from './LoginFormTitle.vue';
-  import { Form, Input, Button, Checkbox, RadioGroup, RadioButton } from 'ant-design-vue';
+  import { Form, Input, Button, Checkbox, RadioGroup, RadioButton, Image } from 'ant-design-vue';
   import { StrengthMeter } from '/@/components/StrengthMeter';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';