Merge pull request #72 from suyuan32/dev

Dev
suyuan32 · Jul 9, 2023 · d05b1d9 · d05b1d9
2 parents 393ec98 + 9a1433a
commit d05b1d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-admin",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "homepage": "https://github.com/suyuan32/simple-admin-backend-ui",
   "bugs": {
     "url": "https://github.com/suyuan32/simple-admin-backend-ui/issue"

diff --git a/src/views/dashboard/workbench/components/data.ts b/src/views/dashboard/workbench/components/data.ts
@@ -52,5 +52,5 @@ export const navItems: NavItem[] = [
 
 export const systemInfoData = [
   ['sys.sys.Name', 'Simple Admin'],
-  ['sys.sys.version', 'V 1.0.12'],
+  ['sys.sys.version', 'V 1.0.13'],
 ];
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
@@ -69,22 +69,22 @@
       </Button>
     </FormItem>
     <ARow class="enter-x" :gutter="5">
-      <ACol :md="6" :xs="24">
+      <!-- <ACol :md="6" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.MOBILE)">
           {{ t('sys.login.mobileSignInFormTitle') }}
         </Button>
-      </ACol>
-      <ACol :md="6" :xs="24">
+      </ACol> -->
+      <ACol :md="8" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.QR_CODE)">
           {{ t('sys.login.qrSignInFormTitle') }}
         </Button>
       </ACol>
-      <ACol :md="6" :xs="24">
+      <ACol :md="8" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.REGISTER_BY_EMAIL)">
           {{ t('sys.login.registerButton') }}
         </Button>
       </ACol>
-      <ACol :md="6" :xs="24">
+      <ACol :md="8" :xs="24">
         <Button block @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">
           {{ t('sys.login.forgetFormTitle') }}
         </Button>
@@ -95,24 +95,18 @@
 
     <div class="flex justify-evenly enter-x" :class="`${prefixCls}-sign-in-way`">
       <GithubFilled @click="oauthLoginHandler('github')" />
-      <WechatFilled @click="oauthLoginHandler('wechat')" />
-      <AlipayCircleFilled @click="oauthLoginHandler('alipay')" />
+      <!-- <WechatFilled @click="oauthLoginHandler('wechat')" />
+      <AlipayCircleFilled @click="oauthLoginHandler('alipay')" /> -->
       <GoogleCircleFilled @click="oauthLoginHandler('google')" />
-      <TwitterCircleFilled @click="oauthLoginHandler('twitter')" />
+      <!-- <TwitterCircleFilled @click="oauthLoginHandler('twitter')" /> -->
     </div>
   </Form>
 </template>
 <script lang="ts" setup>
   import { reactive, ref, unref, computed } from 'vue';
 
   import { Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
-  import {
-    GithubFilled,
-    WechatFilled,
-    AlipayCircleFilled,
-    GoogleCircleFilled,
-    TwitterCircleFilled,
-  } from '@ant-design/icons-vue';
+  import { GithubFilled, GoogleCircleFilled } from '@ant-design/icons-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
 
   import { useI18n } from '/@/hooks/web/useI18n';