Merge branch 'sqy_dev' into 'main'

oem内容定制修改中

See merge request huang/yun-teng-iot-front!17

@@ -2,9 +2,10 @@
  * @Author: Vben
  * @Description: logo component
 -->
+<!-- TODO: appLogo -->
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img src="../../../assets/images/logo.png" />
+    <img :src="getLogoUrl" />
     <div class="ml-2 md:opacity-100" :class="getTitleClass" v-show="showTitle">
       {{ title }}
     </div>
@@ -18,7 +19,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useUserStore } from '/@/store/modules/user';
-
+  import { createLocalStorage } from '/@/utils/cache/index';
   const props = defineProps({
     /**
      * The theme of the current parent component
@@ -46,6 +47,14 @@
     { 'collapsed-show-title': unref(getCollapsedShowTitle) },
   ]);
 
+  const storage = createLocalStorage();
+  // 获取AppLogo
+  const getLogoUrl = computed(() => {
+    return storage.get('platformInfo')
+      ? storage.get('platformInfo').logo
+      : '/src/assets/images/logo.png';
+  });
+
   const getTitleClass = computed(() => [
     `${prefixCls}__title`,
     {

@@ -35,8 +35,8 @@
             :before-upload="beforeUploadIconPic"
           >
             <div v-if="iconPic">
-              <img :src="iconPic" />
-              <div style="background-color: #ccc">重新上传</div>
+              <img :src="iconPic" class="m-auto" />
+              <div style="background-color: #ccc; margin-top: 20px">重新上传</div>
             </div>
             <div v-else>
               <PlusOutlined style="font-size: 30px" />
@@ -95,6 +95,7 @@
   import type { FileItem } from '/@/components/Upload/src/typing';
   import { logoUpload, iconUpload, bgUpload, getPlatForm, updatePlatForm } from '/@/api/oem/index';
   import { PlusOutlined } from '@ant-design/icons-vue';
+  import { createLocalStorage } from '/@/utils/cache/index';
   export default defineComponent({
     components: {
       BasicForm,
@@ -146,7 +147,7 @@
         }
         return isJpgOrPng && isLt2M;
       };
-
+      // Icon上传
       async function customUploadIconPic({ file }) {
         if (beforeUploadIconPic(file)) {
           const formData = new FormData();
@@ -158,9 +159,9 @@
         }
       }
       const beforeUploadIconPic = (file: FileItem) => {
-        const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+        const isJpgOrPng = file.type === 'image/x-icon';
         if (!isJpgOrPng) {
-          createMessage.error('只能上传图片文件!');
+          createMessage.error('只能上传.icon图片文件!');
         }
         const isLt2M = (file.size as number) / 1024 < 500;
         if (!isLt2M) {
@@ -198,12 +199,16 @@
           compState.value.loading = true;
           await updatePlatForm({
             ...fieldValue,
-            background: unref(bgPic),
-            icon: unref(bgPic),
             logo: unref(logoPic),
+            icon: unref(iconPic),
+            background: unref(bgPic),
           });
           compState.value.loading = false;
           createMessage.success('保存信息成功');
+
+          // 保存一份数据到本地缓存中.
+          const storage = createLocalStorage();
+          storage.set('PlatformInfo', fieldValue);
         } catch (e) {
           createMessage.error('保存信息失败');
         }

@@ -61,13 +61,6 @@
         }
       };
 
-      onMounted(async () => {
-        const res = await getEnterPriseDetail();
-        console.log(res);
-        updateCityData(res.codeProv, res.codeCity, res.codeCoun);
-        setFieldsValue(res);
-      });
-
       async function updateCityData(codeProv: string, codeCity: string, codeCoun: string) {
         const nameCity = await getTownChild('codeProv', codeProv);
         const nameCoun = await getTownChild('codeCity', codeCity);
@@ -182,6 +175,12 @@
         });
       }
 
+      onMounted(async () => {
+        const res = await getEnterPriseDetail();
+        updateCityData(res.codeProv, res.codeCity, res.codeCoun);
+        setFieldsValue(res);
+      });
+
       return {
         registerForm,
         compState,