'暫存oemLogo代碼，待解決本地緩存問題'

@@ -32,6 +32,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
     },
     },
     {
     {
       errorMessageMode: mode,
       errorMessageMode: mode,
+      joinPrefix: false,
     }
     }
   );
   );
 }
 }

@@ -2,12 +2,12 @@
  * @Author: Vben
  * @Author: Vben
  * @Description: logo component
  * @Description: logo component
 -->
 -->
-<!-- TODO: appLogo -->
+
 <template>
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img src="../../../assets/images/logo.png" />
+    <img :src="getLogo" />
     <div class="ml-2 md:opacity-100" :class="getTitleClass" v-show="showTitle">
     <div class="ml-2 md:opacity-100" :class="getTitleClass" v-show="showTitle">
-      {{ title }}
+      {{ getTitle }}
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -55,6 +55,12 @@
   function goHome() {
   function goHome() {
     go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
     go(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
   }
   }
+  const getLogo = computed(() => {
+    return userStore.platInfo.logo ?? '/src/assets/images/logo.png';
+  });
+  const getTitle = computed(() => {
+    return userStore.platInfo.name ?? title;
+  });
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
   @prefix-cls: ~'@{namespace}-app-logo';
   @prefix-cls: ~'@{namespace}-app-logo';

@@ -29,6 +29,7 @@ export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__';
 // base global session key
 // base global session key
 export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY__';
 export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY__';
 
 
+export const PLATFORM = 'PLATFORM';
 export enum CacheTypeEnum {
 export enum CacheTypeEnum {
   SESSION,
   SESSION,
   LOCAL,
   LOCAL,

@@ -25,7 +25,7 @@ import { router } from '/@/router';
 import { usePermissionStore } from '/@/store/modules/permission';
 import { usePermissionStore } from '/@/store/modules/permission';
 import { RouteRecordRaw } from 'vue-router';
 import { RouteRecordRaw } from 'vue-router';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
-
+import { createLocalStorage } from '/@/utils/cache/index';
 interface UserState {
 interface UserState {
   platInfo: any;
   platInfo: any;
   userInfo: Nullable<UserInfo>;
   userInfo: Nullable<UserInfo>;
@@ -41,7 +41,7 @@ export const useUserStore = defineStore({
   id: 'app-user',
   id: 'app-user',
   state: (): UserState => ({
   state: (): UserState => ({
     //平台信息
     //平台信息
-    platInfo: null,
+    platInfo: createLocalStorage().get('platformInfo') || null,
     // user info
     // user info
     userInfo: null,
     userInfo: null,
     // token
     // token
@@ -58,7 +58,7 @@ export const useUserStore = defineStore({
 
 
   getters: {
   getters: {
     getPlatInfo(): any {
     getPlatInfo(): any {
-      return this.platInfo;
+      return this.platInfo || getAuthCache('platInfo');
     },
     },
     getUserInfo(): UserInfo {
     getUserInfo(): UserInfo {
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};
       return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {};

@@ -5,6 +5,7 @@ import type { RouteLocationNormalized } from 'vue-router';
 import { createLocalStorage, createSessionStorage } from '/@/utils/cache';
 import { createLocalStorage, createSessionStorage } from '/@/utils/cache';
 import { Memory } from './memory';
 import { Memory } from './memory';
 import {
 import {
+  PLATFORM,
   TOKEN_KEY,
   TOKEN_KEY,
   JWT_TOKEN_KEY,
   JWT_TOKEN_KEY,
   REFRESH_TOKEN_KEY,
   REFRESH_TOKEN_KEY,
@@ -21,6 +22,7 @@ import { toRaw } from 'vue';
 import { pick, omit } from 'lodash-es';
 import { pick, omit } from 'lodash-es';
 
 
 interface BasicStore {
 interface BasicStore {
+  [PLATFORM]: Object;
   [TOKEN_KEY]: string | number | null | undefined;
   [TOKEN_KEY]: string | number | null | undefined;
   [JWT_TOKEN_KEY]: string | number | null | undefined;
   [JWT_TOKEN_KEY]: string | number | null | undefined;
   [REFRESH_TOKEN_KEY]: string | number | null | undefined;
   [REFRESH_TOKEN_KEY]: string | number | null | undefined;

@@ -79,11 +79,10 @@
   const { t } = useI18n();
   const { t } = useI18n();
   const { notification, createErrorModal } = useMessage();
   const { notification, createErrorModal } = useMessage();
   const { prefixCls } = useDesign('login');
   const { prefixCls } = useDesign('login');
-  const userStore = useUserStore();
 
 
   const { setLoginState, getLoginState } = useLoginState();
   const { setLoginState, getLoginState } = useLoginState();
   const { getFormRules } = useFormRules();
   const { getFormRules } = useFormRules();
-
+  const userStore = useUserStore();
   const formRef = ref();
   const formRef = ref();
   const loading = ref(false);
   const loading = ref(false);
 
 
@@ -134,5 +133,15 @@
     } finally {
     } finally {
       loading.value = false;
       loading.value = false;
     }
     }
+
+    const res = await getPlatForm();
+    userStore.setPlatInfo(res);
+    // 设置icon
+    let link = (document.querySelector("link[rel*='icon']") ||
+      document.createElement('link')) as HTMLLinkElement;
+    link.type = 'image/x-icon';
+    link.rel = 'shortcut icon';
+    link.href = res.icon ?? '/public/favicon.ico';
+    document.getElementsByTagName('head')[0].appendChild(link);
   }
   }
 </script>
 </script>

@@ -95,8 +95,7 @@
   import type { FileItem } from '/@/components/Upload/src/typing';
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { logoUpload, iconUpload, bgUpload, getPlatForm, updatePlatForm } from '/@/api/oem/index';
   import { logoUpload, iconUpload, bgUpload, getPlatForm, updatePlatForm } from '/@/api/oem/index';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { PlusOutlined } from '@ant-design/icons-vue';
-  import { createLocalStorage } from '/@/utils/cache/index';
-
+  import { useUserStore } from '/@/store/modules/user';
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
       BasicForm,
       BasicForm,
@@ -113,6 +112,7 @@
         tip: '拼命加载中...',
         tip: '拼命加载中...',
       });
       });
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
+      const userStore = useUserStore();
       const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
       const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
         schemas,
         schemas,
         showSubmitButton: false,
         showSubmitButton: false,
@@ -198,26 +198,18 @@
         try {
         try {
           const fieldValue = getFieldsValue();
           const fieldValue = getFieldsValue();
           compState.value.loading = true;
           compState.value.loading = true;
-          await updatePlatForm({
+          const newFieldValue = {
             ...fieldValue,
             ...fieldValue,
             logo: unref(logoPic),
             logo: unref(logoPic),
             icon: unref(iconPic),
             icon: unref(iconPic),
             background: unref(bgPic),
             background: unref(bgPic),
-          });
+          };
+          await updatePlatForm(newFieldValue);
           compState.value.loading = false;
           compState.value.loading = false;
           createMessage.success('保存信息成功');
           createMessage.success('保存信息成功');
 
 
-          // 保存一份数据到本地缓存中.
-          const storage = createLocalStorage();
-          storage.set('platformInfo', fieldValue);
-          //保存到store
-          // 设置icon
-          let link = (document.querySelector("link[rel*='icon']") ||
-            document.createElement('link')) as HTMLLinkElement;
-          link.type = 'image/x-icon';
-          link.rel = 'shortcut icon';
-          link.href = fieldValue.icon;
-          document.getElementsByTagName('head')[0].appendChild(link);
+          userStore.platInfo = newFieldValue;
+          // console.log()
         } catch (e) {
         } catch (e) {
           createMessage.error('保存信息失败');
           createMessage.error('保存信息失败');
         }
         }

@@ -190,7 +190,7 @@ export const schemas: FormSchema[] = [
     colProps: {
     colProps: {
       span: 5,
       span: 5,
       style: {
       style: {
-        marginLeft: '-80px',
+        marginLeft: '-5rem',
       },
       },
     },
     },
   },
   },