Merge remote-tracking branch 'origin/wfc-modules-user' into wfc-modules-user

README.md

@@ -14,6 +14,8 @@
 
 **安装依赖**
 
+npm install -g pnpm
+
 ```bash
 pnpm i
 ```

src/service/request/index.ts

@@ -27,7 +27,10 @@ export const request = createFlatRequest<App.Service.Response, InstanceState>(
       // set token
       const token = localStg.get('token');
       const Authorization = token ? `Bearer ${token}` : null;
-      Object.assign(headers, { Authorization });
+
+      // set language
+      const ContentLanguage = localStg.get('lang') || 'zh-CN';
+      Object.assign(headers, { Authorization, "Content-Language": ContentLanguage });
 
       return config;
     },

src/views/_builtin/login/modules/pwd-login.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
+import { loginModuleRecord } from '@/constants/app';
+import { useRouterPush } from '@/hooks/common/router';
 import { useAntdForm, useFormRules } from '@/hooks/common/form';
 import { useAuthStore } from '@/store/modules/auth';
 
@@ -8,6 +10,7 @@ defineOptions({
 });
 
 const authStore = useAuthStore();
+const { toggleLoginModule } = useRouterPush();
 const { formRef, validate } = useAntdForm();
 const { patternRules } = useFormRules();
 const codeImg = ref('');
@@ -69,11 +72,20 @@ async function getCheckCode() {
     <ASpace direction="vertical" size="large" class="w-full">
       <div class="flex-y-center justify-between">
         <ACheckbox>{{ $t('page.login.pwdLogin.rememberMe') }}</ACheckbox>
-        <AButton type="text">{{ $t('page.login.pwdLogin.forgetPassword') }}</AButton>
+        <AButton type="text" @click="toggleLoginModule('reset-pwd')">{{ $t('page.login.pwdLogin.forgetPassword') }}</AButton>
       </div>
       <AButton type="primary" block size="large" shape="round" :loading="authStore.loginLoading" @click="handleSubmit">
         {{ $t('common.confirm') }}
       </AButton>
+      <div class="flex-y-center justify-between">
+        <AButton class="h-34px flex-1" block @click="toggleLoginModule('code-login')">
+          {{ $t(loginModuleRecord['code-login']) }}
+        </AButton>
+        <div class="w-12px"></div>
+        <AButton class="h-34px flex-1" block @click="toggleLoginModule('register')">
+          {{ $t(loginModuleRecord.register) }}
+        </AButton>
+      </div>
     </ASpace>
   </AForm>
 </template>