diff --git a/src/assets/imgs/avatar.gif b/src/assets/imgs/avatar.gif
new file mode 100644
index 00000000..fdbd32c6
Binary files /dev/null and b/src/assets/imgs/avatar.gif differ
diff --git a/src/assets/imgs/avatar.jpg b/src/assets/imgs/avatar.jpg
new file mode 100644
index 00000000..d46a70a4
Binary files /dev/null and b/src/assets/imgs/avatar.jpg differ
diff --git a/src/assets/imgs/diy/app-nav-bar-mp.png b/src/assets/imgs/diy/app-nav-bar-mp.png
new file mode 100644
index 00000000..c982804c
Binary files /dev/null and b/src/assets/imgs/diy/app-nav-bar-mp.png differ
diff --git a/src/assets/imgs/diy/statusBar.png b/src/assets/imgs/diy/statusBar.png
new file mode 100644
index 00000000..b85562e4
Binary files /dev/null and b/src/assets/imgs/diy/statusBar.png differ
diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png
new file mode 100644
index 00000000..7e1043f2
Binary files /dev/null and b/src/assets/imgs/logo.png differ
diff --git a/src/assets/imgs/profile.jpg b/src/assets/imgs/profile.jpg
new file mode 100644
index 00000000..e4bcf879
Binary files /dev/null and b/src/assets/imgs/profile.jpg differ
diff --git a/src/assets/imgs/wechat.png b/src/assets/imgs/wechat.png
new file mode 100644
index 00000000..6afc5e41
Binary files /dev/null and b/src/assets/imgs/wechat.png differ
diff --git a/src/components/Backtop/index.ts b/src/components/Backtop/index.ts
new file mode 100644
index 00000000..96de88d6
--- /dev/null
+++ b/src/components/Backtop/index.ts
@@ -0,0 +1,3 @@
+import Backtop from './src/Backtop.vue'
+
+export { Backtop }
diff --git a/src/components/Backtop/src/Backtop.vue b/src/components/Backtop/src/Backtop.vue
new file mode 100644
index 00000000..5d79f51a
--- /dev/null
+++ b/src/components/Backtop/src/Backtop.vue
@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+import { ElBacktop } from 'element-plus'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'BackTop' })
+
+const { getPrefixCls, variables } = useDesign()
+
+const prefixCls = getPrefixCls('backtop')
+</script>
+
+<template>
+  <ElBacktop
+    :class="`${prefixCls}-backtop`"
+    :target="`.${variables.namespace}-layout-content-scrollbar .${variables.elNamespace}-scrollbar__wrap`"
+  />
+</template>
diff --git a/src/components/formContainer/index.vue b/src/components/formContainer/index.vue
index e0ef7224..4c286b06 100644
--- a/src/components/formContainer/index.vue
+++ b/src/components/formContainer/index.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { mapState } from 'pinia'
-import { globalStore } from '@/store'
+import { globalStore } from '@/stores/indexs'
 
 const FormContainerTypeEnum = {
     DRAWER: 'drawer',
diff --git a/src/components/icon/index.ts b/src/components/icon/index.ts
new file mode 100644
index 00000000..33d1de38
--- /dev/null
+++ b/src/components/icon/index.ts
@@ -0,0 +1,4 @@
+import Icon from './src/Icon.vue'
+import IconSelect from './src/IconSelect.vue'
+
+export { Icon, IconSelect }
diff --git a/src/components/icon/src/Icon.vue b/src/components/icon/src/Icon.vue
new file mode 100644
index 00000000..4246539f
--- /dev/null
+++ b/src/components/icon/src/Icon.vue
@@ -0,0 +1,86 @@
+<script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
+import Iconify from '@purge-icons/generated'
+import { useDesign } from '@/hooks/web/useDesign'
+
+defineOptions({ name: 'Icon' })
+
+const { getPrefixCls } = useDesign()
+
+const prefixCls = getPrefixCls('icon')
+
+const props = defineProps({
+  // icon name
+  icon: propTypes.string,
+  // icon color
+  color: propTypes.string,
+  // icon size
+  size: propTypes.number.def(16),
+  // icon svg class
+  svgClass: propTypes.string.def('')
+})
+
+const elRef = ref<ElRef>(null)
+
+const isLocal = computed(() => props.icon.startsWith('svg-icon:'))
+
+const symbolId = computed(() => {
+  return unref(isLocal) ? `#icon-${props.icon.split('svg-icon:')[1]}` : props.icon
+})
+
+const getIconifyStyle = computed(() => {
+  const { color, size } = props
+  return {
+    fontSize: `${size}px`,
+    height: '1em',
+    color
+  }
+})
+
+const getSvgClass = computed(() => {
+  const { svgClass } = props
+  return `iconify ${svgClass}`
+})
+
+const updateIcon = async (icon: string) => {
+  if (unref(isLocal)) return
+
+  const el = unref(elRef)
+  if (!el) return
+
+  await nextTick()
+
+  if (!icon) return
+
+  const svg = Iconify.renderSVG(icon, {})
+  if (svg) {
+    el.textContent = ''
+    el.appendChild(svg)
+  } else {
+    const span = document.createElement('span')
+    span.className = 'iconify'
+    span.dataset.icon = icon
+    el.textContent = ''
+    el.appendChild(span)
+  }
+}
+
+watch(
+  () => props.icon,
+  (icon: string) => {
+    updateIcon(icon)
+  }
+)
+</script>
+
+<template>
+  <ElIcon :class="prefixCls" :color="color" :size="size">
+    <svg v-if="isLocal" :class="getSvgClass" aria-hidden="true">
+      <use :xlink:href="symbolId" />
+    </svg>
+
+    <span v-else ref="elRef" :class="$attrs.class" :style="getIconifyStyle">
+      <span :class="getSvgClass" :data-icon="symbolId"></span>
+    </span>
+  </ElIcon>
+</template>
diff --git a/src/components/icon/src/IconSelect.vue b/src/components/icon/src/IconSelect.vue
new file mode 100644
index 00000000..d4a5b074
--- /dev/null
+++ b/src/components/icon/src/IconSelect.vue
@@ -0,0 +1,229 @@
+<script lang="ts" setup>
+import { CSSProperties } from 'vue'
+import { cloneDeep } from 'lodash-es'
+import { IconJson } from '@/components/Icon/src/data'
+
+defineOptions({ name: 'IconSelect' })
+
+type ParameterCSSProperties = (item?: string) => CSSProperties | undefined
+
+const props = defineProps({
+  modelValue: {
+    require: false,
+    type: String
+  }
+})
+const emit = defineEmits<{ (e: 'update:modelValue', v: string) }>()
+
+const visible = ref(false)
+const inputValue = toRef(props, 'modelValue')
+const iconList = ref(IconJson)
+const icon = ref('add-location')
+const currentActiveType = ref('ep:')
+// 深拷贝图标数据，前端做搜索
+const copyIconList = cloneDeep(iconList.value)
+
+const pageSize = ref(96)
+const currentPage = ref(1)
+
+// 搜索条件
+const filterValue = ref('')
+
+const tabsList = [
+  {
+    label: 'Element Plus',
+    name: 'ep:'
+  },
+  {
+    label: 'Font Awesome 4',
+    name: 'fa:'
+  },
+  {
+    label: 'Font Awesome 5 Solid',
+    name: 'fa-solid:'
+  }
+]
+
+const pageList = computed(() => {
+  if (currentPage.value === 1) {
+    return copyIconList[currentActiveType.value]
+      ?.filter((v) => v.includes(filterValue.value))
+      .slice(currentPage.value - 1, pageSize.value)
+  } else {
+    return copyIconList[currentActiveType.value]
+      ?.filter((v) => v.includes(filterValue.value))
+      .slice(
+        pageSize.value * (currentPage.value - 1),
+        pageSize.value * (currentPage.value - 1) + pageSize.value
+      )
+  }
+})
+const iconCount = computed(() => {
+  return copyIconList[currentActiveType.value] == undefined
+    ? 0
+    : copyIconList[currentActiveType.value].length
+})
+
+const iconItemStyle = computed((): ParameterCSSProperties => {
+  return (item) => {
+    if (inputValue.value === currentActiveType.value + item) {
+      return {
+        borderColor: 'var(--el-color-primary)',
+        color: 'var(--el-color-primary)'
+      }
+    }
+  }
+})
+
+function handleClick({ props }) {
+  currentPage.value = 1
+  currentActiveType.value = props.name
+  emit('update:modelValue', currentActiveType.value + iconList.value[currentActiveType.value][0])
+  icon.value = iconList.value[currentActiveType.value][0]
+}
+
+function onChangeIcon(item) {
+  icon.value = item
+  emit('update:modelValue', currentActiveType.value + item)
+  visible.value = false
+}
+
+function onCurrentChange(page) {
+  currentPage.value = page
+}
+
+watch(
+  () => {
+    return props.modelValue
+  },
+  () => {
+    if (props.modelValue && props.modelValue.indexOf(':') >= 0) {
+      currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)
+      icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)
+    }
+  }
+)
+watch(
+  () => {
+    return filterValue.value
+  },
+  () => {
+    currentPage.value = 1
+  }
+)
+</script>
+
+<template>
+  <div class="selector">
+    <ElInput v-model="inputValue" @click="visible = !visible">
+      <template #append>
+        <ElPopover
+          :popper-options="{
+            placement: 'auto'
+          }"
+          :visible="visible"
+          :width="350"
+          popper-class="pure-popper"
+          trigger="click"
+        >
+          <template #reference>
+            <div
+              class="h-32px w-40px flex cursor-pointer items-center justify-center"
+              @click="visible = !visible"
+            >
+              <Icon :icon="currentActiveType + icon" />
+            </div>
+          </template>
+
+          <ElInput v-model="filterValue" class="p-2" clearable placeholder="搜索图标" />
+          <ElDivider border-style="dashed" />
+
+          <ElTabs v-model="currentActiveType" @tab-click="handleClick">
+            <ElTabPane
+              v-for="(pane, index) in tabsList"
+              :key="index"
+              :label="pane.label"
+              :name="pane.name"
+            >
+              <ElDivider border-style="dashed" class="tab-divider" />
+              <ElScrollbar height="220px">
+                <ul class="ml-2 flex flex-wrap px-2">
+                  <li
+                    v-for="(item, key) in pageList"
+                    :key="key"
+                    :style="iconItemStyle(item)"
+                    :title="item"
+                    class="icon-item mr-2 mt-1 w-1/10 flex cursor-pointer items-center justify-center border border-solid p-2"
+                    @click="onChangeIcon(item)"
+                  >
+                    <Icon :icon="currentActiveType + item" />
+                  </li>
+                </ul>
+              </ElScrollbar>
+            </ElTabPane>
+          </ElTabs>
+          <ElDivider border-style="dashed" />
+
+          <ElPagination
+            :current-page="currentPage"
+            :page-size="pageSize"
+            :total="iconCount"
+            background
+            class="h-10 flex items-center justify-center"
+            layout="prev, pager, next"
+            small
+            @current-change="onCurrentChange"
+          />
+        </ElPopover>
+      </template>
+    </ElInput>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.el-divider--horizontal {
+  margin: 1px auto !important;
+}
+
+.tab-divider.el-divider--horizontal {
+  margin: 0 !important;
+}
+
+.icon-item {
+  &:hover {
+    color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+    transform: scaleX(1.05);
+    transition: all 0.4s;
+  }
+}
+
+:deep(.el-tabs__nav-next) {
+  font-size: 15px;
+  line-height: 32px;
+  box-shadow: -5px 0 5px -6px #ccc;
+}
+
+:deep(.el-tabs__nav-prev) {
+  font-size: 15px;
+  line-height: 32px;
+  box-shadow: 5px 0 5px -6px #ccc;
+}
+
+:deep(.el-input-group__append) {
+  padding: 0;
+}
+
+:deep(.el-tabs__item) {
+  height: 30px;
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 30px;
+}
+
+:deep(.el-tabs__header),
+:deep(.el-tabs__nav-wrap) {
+  position: static;
+  margin: 0;
+}
+</style>
diff --git a/src/components/icon/src/data.ts b/src/components/icon/src/data.ts
new file mode 100644
index 00000000..2a4ed5a3
--- /dev/null
+++ b/src/components/icon/src/data.ts
@@ -0,0 +1,1961 @@
+export const IconJson = {
+  'ep:': [
+    'add-location',
+    'aim',
+    'alarm-clock',
+    'apple',
+    'arrow-down',
+    'arrow-down-bold',
+    'arrow-left',
+    'arrow-left-bold',
+    'arrow-right',
+    'arrow-right-bold',
+    'arrow-up',
+    'arrow-up-bold',
+    'avatar',
+    'back',
+    'baseball',
+    'basketball',
+    'bell',
+    'bell-filled',
+    'bicycle',
+    'bottom',
+    'bottom-left',
+    'bottom-right',
+    'bowl',
+    'box',
+    'briefcase',
+    'brush',
+    'brush-filled',
+    'burger',
+    'calendar',
+    'camera',
+    'camera-filled',
+    'caret-bottom',
+    'caret-left',
+    'caret-right',
+    'caret-top',
+    'cellphone',
+    'chat-dot-round',
+    'chat-dot-square',
+    'chat-line-round',
+    'chat-line-square',
+    'chat-round',
+    'chat-square',
+    'check',
+    'checked',
+    'cherry',
+    'chicken',
+    'circle-check',
+    'circle-check-filled',
+    'circle-close',
+    'circle-close-filled',
+    'circle-plus',
+    'circle-plus-filled',
+    'clock',
+    'close',
+    'close-bold',
+    'cloudy',
+    'coffee',
+    'coffee-cup',
+    'coin',
+    'cold-drink',
+    'collection',
+    'collection-tag',
+    'comment',
+    'compass',
+    'connection',
+    'coordinate',
+    'copy-document',
+    'cpu',
+    'credit-card',
+    'crop',
+    'd-arrow-left',
+    'd-arrow-right',
+    'd-caret',
+    'data-analysis',
+    'data-board',
+    'data-line',
+    'delete',
+    'delete-filled',
+    'delete-location',
+    'dessert',
+    'discount',
+    'dish',
+    'dish-dot',
+    'document',
+    'document-add',
+    'document-checked',
+    'document-copy',
+    'document-delete',
+    'document-remove',
+    'download',
+    'drizzling',
+    'edit',
+    'edit-pen',
+    'eleme',
+    'eleme-filled',
+    'expand',
+    'failed',
+    'female',
+    'files',
+    'film',
+    'filter',
+    'finished',
+    'first-aid-kit',
+    'flag',
+    'fold',
+    'folder',
+    'folder-add',
+    'folder-checked',
+    'folder-delete',
+    'folder-opened',
+    'folder-remove',
+    'food',
+    'football',
+    'fork-spoon',
+    'fries',
+    'full-screen',
+    'goblet',
+    'goblet-full',
+    'goblet-square',
+    'goblet-square-full',
+    'goods',
+    'goods-filled',
+    'grape',
+    'grid',
+    'guide',
+    'headset',
+    'help',
+    'help-filled',
+    'histogram',
+    'home-filled',
+    'hot-water',
+    'house',
+    'ice-cream',
+    'ice-cream-round',
+    'ice-cream-square',
+    'ice-drink',
+    'ice-tea',
+    'info-filled',
+    'iphone',
+    'key',
+    'knife-fork',
+    'lightning',
+    'link',
+    'list',
+    'loading',
+    'location',
+    'location-filled',
+    'location-information',
+    'lock',
+    'lollipop',
+    'magic-stick',
+    'magnet',
+    'male',
+    'management',
+    'map-location',
+    'medal',
+    'menu',
+    'message',
+    'message-box',
+    'mic',
+    'microphone',
+    'milk-tea',
+    'minus',
+    'money',
+    'monitor',
+    'moon',
+    'moon-night',
+    'more',
+    'more-filled',
+    'mostly-cloudy',
+    'mouse',
+    'mug',
+    'mute',
+    'mute-notification',
+    'no-smoking',
+    'notebook',
+    'notification',
+    'odometer',
+    'office-building',
+    'open',
+    'operation',
+    'opportunity',
+    'orange',
+    'paperclip',
+    'partly-cloudy',
+    'pear',
+    'phone',
+    'phone-filled',
+    'picture',
+    'picture-filled',
+    'picture-rounded',
+    'pie-chart',
+    'place',
+    'platform',
+    'plus',
+    'pointer',
+    'position',
+    'postcard',
+    'pouring',
+    'present',
+    'price-tag',
+    'printer',
+    'promotion',
+    'question-filled',
+    'rank',
+    'reading',
+    'reading-lamp',
+    'refresh',
+    'refresh-left',
+    'refresh-right',
+    'refrigerator',
+    'remove',
+    'remove-filled',
+    'right',
+    'scale-to-original',
+    'school',
+    'scissor',
+    'search',
+    'select',
+    'sell',
+    'semi-select',
+    'service',
+    'set-up',
+    'setting',
+    'share',
+    'ship',
+    'shop',
+    'shopping-bag',
+    'shopping-cart',
+    'shopping-cart-full',
+    'smoking',
+    'soccer',
+    'sold-out',
+    'sort',
+    'sort-down',
+    'sort-up',
+    'stamp',
+    'star',
+    'star-filled',
+    'stopwatch',
+    'success-filled',
+    'sugar',
+    'suitcase',
+    'sunny',
+    'sunrise',
+    'sunset',
+    'switch',
+    'switch-button',
+    'takeaway-box',
+    'ticket',
+    'tickets',
+    'timer',
+    'toilet-paper',
+    'tools',
+    'top',
+    'top-left',
+    'top-right',
+    'trend-charts',
+    'trophy',
+    'turn-off',
+    'umbrella',
+    'unlock',
+    'upload',
+    'upload-filled',
+    'user',
+    'user-filled',
+    'van',
+    'video-camera',
+    'video-camera-filled',
+    'video-pause',
+    'video-play',
+    'view',
+    'wallet',
+    'wallet-filled',
+    'warning',
+    'warning-filled',
+    'watch',
+    'watermelon',
+    'wind-power',
+    'zoom-in',
+    'zoom-out'
+  ],
+  'fa:': [
+    '500px',
+    'address-book',
+    'address-book-o',
+    'address-card',
+    'address-card-o',
+    'adjust',
+    'adn',
+    'align-center',
+    'align-justify',
+    'align-left',
+    'amazon',
+    'ambulance',
+    'american-sign-language-interpreting',
+    'anchor',
+    'android',
+    'angellist',
+    'angle-double-left',
+    'angle-double-up',
+    'angle-down',
+    'angle-left',
+    'angle-up',
+    'apple',
+    'archive',
+    'area-chart',
+    'arrow-circle-left',
+    'arrow-circle-o-left',
+    'arrow-circle-o-up',
+    'arrow-circle-up',
+    'arrow-left',
+    'arrow-up',
+    'arrows',
+    'arrows-alt',
+    'arrows-h',
+    'arrows-v',
+    'assistive-listening-systems',
+    'asterisk',
+    'at',
+    'audio-description',
+    'automobile',
+    'backward',
+    'balance-scale',
+    'ban',
+    'bandcamp',
+    'bank',
+    'bar-chart',
+    'barcode',
+    'bars',
+    'bath',
+    'battery',
+    'battery-0',
+    'battery-1',
+    'battery-2',
+    'battery-3',
+    'bed',
+    'beer',
+    'behance',
+    'behance-square',
+    'bell',
+    'bell-o',
+    'bell-slash',
+    'bell-slash-o',
+    'bicycle',
+    'binoculars',
+    'birthday-cake',
+    'bitbucket',
+    'bitbucket-square',
+    'bitcoin',
+    'black-tie',
+    'blind',
+    'bluetooth',
+    'bluetooth-b',
+    'bold',
+    'bolt',
+    'bomb',
+    'book',
+    'bookmark',
+    'bookmark-o',
+    'braille',
+    'briefcase',
+    'bug',
+    'building',
+    'building-o',
+    'bullhorn',
+    'bullseye',
+    'bus',
+    'buysellads',
+    'cab',
+    'calculator',
+    'calendar',
+    'calendar-check-o',
+    'calendar-minus-o',
+    'calendar-o',
+    'calendar-plus-o',
+    'calendar-times-o',
+    'camera',
+    'camera-retro',
+    'caret-down',
+    'caret-left',
+    'caret-square-o-left',
+    'caret-square-o-up',
+    'caret-up',
+    'cart-arrow-down',
+    'cart-plus',
+    'cc',
+    'cc-amex',
+    'cc-diners-club',
+    'cc-discover',
+    'cc-jcb',
+    'cc-mastercard',
+    'cc-paypal',
+    'cc-stripe',
+    'cc-visa',
+    'certificate',
+    'chain',
+    'chain-broken',
+    'check',
+    'check-circle',
+    'check-circle-o',
+    'check-square',
+    'check-square-o',
+    'chevron-circle-left',
+    'chevron-circle-up',
+    'chevron-down',
+    'chevron-left',
+    'chevron-up',
+    'child',
+    'chrome',
+    'circle',
+    'circle-o',
+    'circle-o-notch',
+    'circle-thin',
+    'clipboard',
+    'clock-o',
+    'clone',
+    'close',
+    'cloud',
+    'cloud-download',
+    'cloud-upload',
+    'cny',
+    'code',
+    'code-fork',
+    'codepen',
+    'codiepie',
+    'coffee',
+    'cog',
+    'cogs',
+    'columns',
+    'comment',
+    'comment-o',
+    'commenting',
+    'commenting-o',
+    'comments',
+    'comments-o',
+    'compass',
+    'compress',
+    'connectdevelop',
+    'contao',
+    'copy',
+    'copyright',
+    'creative-commons',
+    'credit-card',
+    'credit-card-alt',
+    'crop',
+    'crosshairs',
+    'css3',
+    'cube',
+    'cubes',
+    'cut',
+    'cutlery',
+    'dashboard',
+    'dashcube',
+    'database',
+    'deaf',
+    'dedent',
+    'delicious',
+    'desktop',
+    'deviantart',
+    'diamond',
+    'digg',
+    'dollar',
+    'dot-circle-o',
+    'download',
+    'dribbble',
+    'drivers-license',
+    'drivers-license-o',
+    'dropbox',
+    'drupal',
+    'edge',
+    'edit',
+    'eercast',
+    'eject',
+    'ellipsis-h',
+    'ellipsis-v',
+    'empire',
+    'envelope',
+    'envelope-o',
+    'envelope-open',
+    'envelope-open-o',
+    'envelope-square',
+    'envira',
+    'eraser',
+    'etsy',
+    'eur',
+    'exchange',
+    'exclamation',
+    'exclamation-circle',
+    'exclamation-triangle',
+    'expand',
+    'expeditedssl',
+    'external-link',
+    'external-link-square',
+    'eye',
+    'eye-slash',
+    'eyedropper',
+    'fa',
+    'facebook',
+    'facebook-official',
+    'facebook-square',
+    'fast-backward',
+    'fax',
+    'feed',
+    'female',
+    'fighter-jet',
+    'file',
+    'file-archive-o',
+    'file-audio-o',
+    'file-code-o',
+    'file-excel-o',
+    'file-image-o',
+    'file-movie-o',
+    'file-o',
+    'file-pdf-o',
+    'file-powerpoint-o',
+    'file-text',
+    'file-text-o',
+    'file-word-o',
+    'film',
+    'filter',
+    'fire',
+    'fire-extinguisher',
+    'firefox',
+    'first-order',
+    'flag',
+    'flag-checkered',
+    'flag-o',
+    'flask',
+    'flickr',
+    'floppy-o',
+    'folder',
+    'folder-o',
+    'folder-open',
+    'folder-open-o',
+    'font',
+    'fonticons',
+    'fort-awesome',
+    'forumbee',
+    'foursquare',
+    'free-code-camp',
+    'frown-o',
+    'futbol-o',
+    'gamepad',
+    'gavel',
+    'gbp',
+    'genderless',
+    'get-pocket',
+    'gg',
+    'gg-circle',
+    'gift',
+    'git',
+    'git-square',
+    'github',
+    'github-alt',
+    'github-square',
+    'gitlab',
+    'gittip',
+    'glass',
+    'glide',
+    'glide-g',
+    'globe',
+    'google',
+    'google-plus',
+    'google-plus-circle',
+    'google-plus-square',
+    'google-wallet',
+    'graduation-cap',
+    'grav',
+    'group',
+    'h-square',
+    'hacker-news',
+    'hand-grab-o',
+    'hand-lizard-o',
+    'hand-o-left',
+    'hand-o-up',
+    'hand-paper-o',
+    'hand-peace-o',
+    'hand-pointer-o',
+    'hand-scissors-o',
+    'hand-spock-o',
+    'handshake-o',
+    'hashtag',
+    'hdd-o',
+    'header',
+    'headphones',
+    'heart',
+    'heart-o',
+    'heartbeat',
+    'history',
+    'home',
+    'hospital-o',
+    'hourglass',
+    'hourglass-1',
+    'hourglass-2',
+    'hourglass-3',
+    'hourglass-o',
+    'houzz',
+    'html5',
+    'i-cursor',
+    'id-badge',
+    'ils',
+    'image',
+    'imdb',
+    'inbox',
+    'indent',
+    'industry',
+    'info',
+    'info-circle',
+    'inr',
+    'instagram',
+    'internet-explorer',
+    'intersex',
+    'ioxhost',
+    'italic',
+    'joomla',
+    'jsfiddle',
+    'key',
+    'keyboard-o',
+    'krw',
+    'language',
+    'laptop',
+    'lastfm',
+    'lastfm-square',
+    'leaf',
+    'leanpub',
+    'lemon-o',
+    'level-up',
+    'life-bouy',
+    'lightbulb-o',
+    'line-chart',
+    'linkedin',
+    'linkedin-square',
+    'linode',
+    'linux',
+    'list',
+    'list-alt',
+    'list-ol',
+    'list-ul',
+    'location-arrow',
+    'lock',
+    'long-arrow-left',
+    'long-arrow-up',
+    'low-vision',
+    'magic',
+    'magnet',
+    'mail-forward',
+    'mail-reply',
+    'mail-reply-all',
+    'male',
+    'map',
+    'map-marker',
+    'map-o',
+    'map-pin',
+    'map-signs',
+    'mars',
+    'mars-double',
+    'mars-stroke',
+    'mars-stroke-h',
+    'mars-stroke-v',
+    'maxcdn',
+    'meanpath',
+    'medium',
+    'medkit',
+    'meetup',
+    'meh-o',
+    'mercury',
+    'microchip',
+    'microphone',
+    'microphone-slash',
+    'minus',
+    'minus-circle',
+    'minus-square',
+    'minus-square-o',
+    'mixcloud',
+    'mobile',
+    'modx',
+    'money',
+    'moon-o',
+    'motorcycle',
+    'mouse-pointer',
+    'music',
+    'neuter',
+    'newspaper-o',
+    'object-group',
+    'object-ungroup',
+    'odnoklassniki',
+    'odnoklassniki-square',
+    'opencart',
+    'openid',
+    'opera',
+    'optin-monster',
+    'pagelines',
+    'paint-brush',
+    'paper-plane',
+    'paper-plane-o',
+    'paperclip',
+    'paragraph',
+    'pause',
+    'pause-circle',
+    'pause-circle-o',
+    'paw',
+    'paypal',
+    'pencil',
+    'pencil-square',
+    'percent',
+    'phone',
+    'phone-square',
+    'pie-chart',
+    'pied-piper',
+    'pied-piper-alt',
+    'pied-piper-pp',
+    'pinterest',
+    'pinterest-p',
+    'pinterest-square',
+    'plane',
+    'play',
+    'play-circle',
+    'play-circle-o',
+    'plug',
+    'plus',
+    'plus-circle',
+    'plus-square',
+    'plus-square-o',
+    'podcast',
+    'power-off',
+    'print',
+    'product-hunt',
+    'puzzle-piece',
+    'qq',
+    'qrcode',
+    'question',
+    'question-circle',
+    'question-circle-o',
+    'quora',
+    'quote-left',
+    'quote-right',
+    'ra',
+    'random',
+    'ravelry',
+    'recycle',
+    'reddit',
+    'reddit-alien',
+    'reddit-square',
+    'refresh',
+    'registered',
+    'renren',
+    'repeat',
+    'retweet',
+    'road',
+    'rocket',
+    'rotate-left',
+    'rouble',
+    'rss-square',
+    'safari',
+    'scribd',
+    'search',
+    'search-minus',
+    'search-plus',
+    'sellsy',
+    'server',
+    'share-alt',
+    'share-alt-square',
+    'share-square',
+    'share-square-o',
+    'shield',
+    'ship',
+    'shirtsinbulk',
+    'shopping-bag',
+    'shopping-basket',
+    'shopping-cart',
+    'shower',
+    'sign-in',
+    'sign-language',
+    'sign-out',
+    'signal',
+    'simplybuilt',
+    'sitemap',
+    'skyatlas',
+    'skype',
+    'slack',
+    'sliders',
+    'slideshare',
+    'smile-o',
+    'snapchat',
+    'snapchat-ghost',
+    'snapchat-square',
+    'snowflake-o',
+    'sort',
+    'sort-alpha-asc',
+    'sort-alpha-desc',
+    'sort-amount-asc',
+    'sort-amount-desc',
+    'sort-asc',
+    'sort-numeric-asc',
+    'sort-numeric-desc',
+    'soundcloud',
+    'space-shuttle',
+    'spinner',
+    'spoon',
+    'spotify',
+    'square',
+    'square-o',
+    'stack-exchange',
+    'stack-overflow',
+    'star',
+    'star-half',
+    'star-half-empty',
+    'star-o',
+    'steam',
+    'steam-square',
+    'step-backward',
+    'stethoscope',
+    'sticky-note',
+    'sticky-note-o',
+    'stop',
+    'stop-circle',
+    'stop-circle-o',
+    'street-view',
+    'strikethrough',
+    'stumbleupon',
+    'stumbleupon-circle',
+    'subscript',
+    'subway',
+    'suitcase',
+    'sun-o',
+    'superpowers',
+    'superscript',
+    'table',
+    'tablet',
+    'tag',
+    'tags',
+    'tasks',
+    'telegram',
+    'television',
+    'tencent-weibo',
+    'terminal',
+    'text-height',
+    'text-width',
+    'th',
+    'th-large',
+    'th-list',
+    'themeisle',
+    'thermometer',
+    'thermometer-0',
+    'thermometer-1',
+    'thermometer-2',
+    'thermometer-3',
+    'thumb-tack',
+    'thumbs-down',
+    'thumbs-o-up',
+    'thumbs-up',
+    'ticket',
+    'times-circle',
+    'times-circle-o',
+    'times-rectangle',
+    'times-rectangle-o',
+    'tint',
+    'toggle-off',
+    'toggle-on',
+    'trademark',
+    'train',
+    'transgender-alt',
+    'trash',
+    'trash-o',
+    'tree',
+    'trello',
+    'tripadvisor',
+    'trophy',
+    'truck',
+    'try',
+    'tty',
+    'tumblr',
+    'tumblr-square',
+    'twitch',
+    'twitter',
+    'twitter-square',
+    'umbrella',
+    'underline',
+    'universal-access',
+    'unlock',
+    'unlock-alt',
+    'upload',
+    'usb',
+    'user',
+    'user-circle',
+    'user-circle-o',
+    'user-md',
+    'user-o',
+    'user-plus',
+    'user-secret',
+    'user-times',
+    'venus',
+    'venus-double',
+    'venus-mars',
+    'viacoin',
+    'viadeo',
+    'viadeo-square',
+    'video-camera',
+    'vimeo',
+    'vimeo-square',
+    'vine',
+    'vk',
+    'volume-control-phone',
+    'volume-down',
+    'volume-off',
+    'volume-up',
+    'wechat',
+    'weibo',
+    'whatsapp',
+    'wheelchair',
+    'wheelchair-alt',
+    'wifi',
+    'wikipedia-w',
+    'window-maximize',
+    'window-minimize',
+    'window-restore',
+    'windows',
+    'wordpress',
+    'wpbeginner',
+    'wpexplorer',
+    'wpforms',
+    'wrench',
+    'xing',
+    'xing-square',
+    'y-combinator',
+    'yahoo',
+    'yelp',
+    'yoast',
+    'youtube',
+    'youtube-play',
+    'youtube-square'
+  ],
+  'fa-solid:': [
+    'abacus',
+    'ad',
+    'address-book',
+    'address-card',
+    'adjust',
+    'air-freshener',
+    'align-center',
+    'align-justify',
+    'align-left',
+    'align-right',
+    'allergies',
+    'ambulance',
+    'american-sign-language-interpreting',
+    'anchor',
+    'angle-double-down',
+    'angle-double-left',
+    'angle-double-right',
+    'angle-double-up',
+    'angle-down',
+    'angle-left',
+    'angle-right',
+    'angle-up',
+    'angry',
+    'ankh',
+    'apple-alt',
+    'archive',
+    'archway',
+    'arrow-alt-circle-down',
+    'arrow-alt-circle-left',
+    'arrow-alt-circle-right',
+    'arrow-alt-circle-up',
+    'arrow-circle-down',
+    'arrow-circle-left',
+    'arrow-circle-right',
+    'arrow-circle-up',
+    'arrow-down',
+    'arrow-left',
+    'arrow-right',
+    'arrow-up',
+    'arrows-alt',
+    'arrows-alt-h',
+    'arrows-alt-v',
+    'assistive-listening-systems',
+    'asterisk',
+    'at',
+    'atlas',
+    'atom',
+    'audio-description',
+    'award',
+    'baby',
+    'baby-carriage',
+    'backspace',
+    'backward',
+    'bacon',
+    'bacteria',
+    'bacterium',
+    'bahai',
+    'balance-scale',
+    'balance-scale-left',
+    'balance-scale-right',
+    'ban',
+    'band-aid',
+    'barcode',
+    'bars',
+    'baseball-ball',
+    'basketball-ball',
+    'bath',
+    'battery-empty',
+    'battery-full',
+    'battery-half',
+    'battery-quarter',
+    'battery-three-quarters',
+    'bed',
+    'beer',
+    'bell',
+    'bell-slash',
+    'bezier-curve',
+    'bible',
+    'bicycle',
+    'biking',
+    'binoculars',
+    'biohazard',
+    'birthday-cake',
+    'blender',
+    'blender-phone',
+    'blind',
+    'blog',
+    'bold',
+    'bolt',
+    'bomb',
+    'bone',
+    'bong',
+    'book',
+    'book-dead',
+    'book-medical',
+    'book-open',
+    'book-reader',
+    'bookmark',
+    'border-all',
+    'border-none',
+    'border-style',
+    'bowling-ball',
+    'box',
+    'box-open',
+    'box-tissue',
+    'boxes',
+    'braille',
+    'brain',
+    'bread-slice',
+    'briefcase',
+    'briefcase-medical',
+    'broadcast-tower',
+    'broom',
+    'brush',
+    'bug',
+    'building',
+    'bullhorn',
+    'bullseye',
+    'burn',
+    'bus',
+    'bus-alt',
+    'business-time',
+    'calculator',
+    'calculator-alt',
+    'calendar',
+    'calendar-alt',
+    'calendar-check',
+    'calendar-day',
+    'calendar-minus',
+    'calendar-plus',
+    'calendar-times',
+    'calendar-week',
+    'camera',
+    'camera-retro',
+    'campground',
+    'candy-cane',
+    'cannabis',
+    'capsules',
+    'car',
+    'car-alt',
+    'car-battery',
+    'car-crash',
+    'car-side',
+    'caravan',
+    'caret-down',
+    'caret-left',
+    'caret-right',
+    'caret-square-down',
+    'caret-square-left',
+    'caret-square-right',
+    'caret-square-up',
+    'caret-up',
+    'carrot',
+    'cart-arrow-down',
+    'cart-plus',
+    'cash-register',
+    'cat',
+    'certificate',
+    'chair',
+    'chalkboard',
+    'chalkboard-teacher',
+    'charging-station',
+    'chart-area',
+    'chart-bar',
+    'chart-line',
+    'chart-pie',
+    'check',
+    'check-circle',
+    'check-double',
+    'check-square',
+    'cheese',
+    'chess',
+    'chess-bishop',
+    'chess-board',
+    'chess-king',
+    'chess-knight',
+    'chess-pawn',
+    'chess-queen',
+    'chess-rook',
+    'chevron-circle-down',
+    'chevron-circle-left',
+    'chevron-circle-right',
+    'chevron-circle-up',
+    'chevron-down',
+    'chevron-left',
+    'chevron-right',
+    'chevron-up',
+    'child',
+    'church',
+    'circle',
+    'circle-notch',
+    'city',
+    'clinic-medical',
+    'clipboard',
+    'clipboard-check',
+    'clipboard-list',
+    'clock',
+    'clone',
+    'closed-captioning',
+    'cloud',
+    'cloud-download-alt',
+    'cloud-meatball',
+    'cloud-moon',
+    'cloud-moon-rain',
+    'cloud-rain',
+    'cloud-showers-heavy',
+    'cloud-sun',
+    'cloud-sun-rain',
+    'cloud-upload-alt',
+    'cocktail',
+    'code',
+    'code-branch',
+    'coffee',
+    'cog',
+    'cogs',
+    'coins',
+    'columns',
+    'comment',
+    'comment-alt',
+    'comment-dollar',
+    'comment-dots',
+    'comment-medical',
+    'comment-slash',
+    'comments',
+    'comments-dollar',
+    'compact-disc',
+    'compass',
+    'compress',
+    'compress-alt',
+    'compress-arrows-alt',
+    'concierge-bell',
+    'cookie',
+    'cookie-bite',
+    'copy',
+    'copyright',
+    'couch',
+    'credit-card',
+    'crop',
+    'crop-alt',
+    'cross',
+    'crosshairs',
+    'crow',
+    'crown',
+    'crutch',
+    'cube',
+    'cubes',
+    'cut',
+    'database',
+    'deaf',
+    'democrat',
+    'desktop',
+    'dharmachakra',
+    'diagnoses',
+    'dice',
+    'dice-d20',
+    'dice-d6',
+    'dice-five',
+    'dice-four',
+    'dice-one',
+    'dice-six',
+    'dice-three',
+    'dice-two',
+    'digital-tachograph',
+    'directions',
+    'disease',
+    'divide',
+    'dizzy',
+    'dna',
+    'dog',
+    'dollar-sign',
+    'dolly',
+    'dolly-flatbed',
+    'donate',
+    'door-closed',
+    'door-open',
+    'dot-circle',
+    'dove',
+    'download',
+    'drafting-compass',
+    'dragon',
+    'draw-polygon',
+    'drum',
+    'drum-steelpan',
+    'drumstick-bite',
+    'dumbbell',
+    'dumpster',
+    'dumpster-fire',
+    'dungeon',
+    'edit',
+    'egg',
+    'eject',
+    'ellipsis-h',
+    'ellipsis-v',
+    'empty-set',
+    'envelope',
+    'envelope-open',
+    'envelope-open-text',
+    'envelope-square',
+    'equals',
+    'eraser',
+    'ethernet',
+    'euro-sign',
+    'exchange-alt',
+    'exclamation',
+    'exclamation-circle',
+    'exclamation-triangle',
+    'expand',
+    'expand-alt',
+    'expand-arrows-alt',
+    'external-link-alt',
+    'external-link-square-alt',
+    'eye',
+    'eye-dropper',
+    'eye-slash',
+    'fan',
+    'fast-backward',
+    'fast-forward',
+    'faucet',
+    'fax',
+    'feather',
+    'feather-alt',
+    'female',
+    'fighter-jet',
+    'file',
+    'file-alt',
+    'file-archive',
+    'file-audio',
+    'file-code',
+    'file-contract',
+    'file-csv',
+    'file-download',
+    'file-excel',
+    'file-export',
+    'file-image',
+    'file-import',
+    'file-invoice',
+    'file-invoice-dollar',
+    'file-medical',
+    'file-medical-alt',
+    'file-pdf',
+    'file-powerpoint',
+    'file-prescription',
+    'file-signature',
+    'file-upload',
+    'file-video',
+    'file-word',
+    'fill',
+    'fill-drip',
+    'film',
+    'filter',
+    'fingerprint',
+    'fire',
+    'fire-alt',
+    'fire-extinguisher',
+    'first-aid',
+    'fish',
+    'fist-raised',
+    'flag',
+    'flag-checkered',
+    'flag-usa',
+    'flask',
+    'flushed',
+    'folder',
+    'folder-minus',
+    'folder-open',
+    'folder-plus',
+    'font',
+    'football-ball',
+    'forward',
+    'frog',
+    'frown',
+    'frown-open',
+    'function',
+    'funnel-dollar',
+    'futbol',
+    'gamepad',
+    'gas-pump',
+    'gavel',
+    'gem',
+    'genderless',
+    'ghost',
+    'gift',
+    'gifts',
+    'glass-cheers',
+    'glass-martini',
+    'glass-martini-alt',
+    'glass-whiskey',
+    'glasses',
+    'globe',
+    'globe-africa',
+    'globe-americas',
+    'globe-asia',
+    'globe-europe',
+    'golf-ball',
+    'gopuram',
+    'graduation-cap',
+    'greater-than',
+    'greater-than-equal',
+    'grimace',
+    'grin',
+    'grin-alt',
+    'grin-beam',
+    'grin-beam-sweat',
+    'grin-hearts',
+    'grin-squint',
+    'grin-squint-tears',
+    'grin-stars',
+    'grin-tears',
+    'grin-tongue',
+    'grin-tongue-squint',
+    'grin-tongue-wink',
+    'grin-wink',
+    'grip-horizontal',
+    'grip-lines',
+    'grip-lines-vertical',
+    'grip-vertical',
+    'guitar',
+    'h-square',
+    'hamburger',
+    'hammer',
+    'hamsa',
+    'hand-holding',
+    'hand-holding-heart',
+    'hand-holding-medical',
+    'hand-holding-usd',
+    'hand-holding-water',
+    'hand-lizard',
+    'hand-middle-finger',
+    'hand-paper',
+    'hand-peace',
+    'hand-point-down',
+    'hand-point-left',
+    'hand-point-right',
+    'hand-point-up',
+    'hand-pointer',
+    'hand-rock',
+    'hand-scissors',
+    'hand-sparkles',
+    'hand-spock',
+    'hands',
+    'hands-helping',
+    'hands-wash',
+    'handshake',
+    'handshake-alt-slash',
+    'handshake-slash',
+    'hanukiah',
+    'hard-hat',
+    'hashtag',
+    'hat-cowboy',
+    'hat-cowboy-side',
+    'hat-wizard',
+    'hdd',
+    'head-side-cough',
+    'head-side-cough-slash',
+    'head-side-mask',
+    'head-side-virus',
+    'heading',
+    'headphones',
+    'headphones-alt',
+    'headset',
+    'heart',
+    'heart-broken',
+    'heartbeat',
+    'helicopter',
+    'highlighter',
+    'hiking',
+    'hippo',
+    'history',
+    'hockey-puck',
+    'holly-berry',
+    'home',
+    'horse',
+    'horse-head',
+    'hospital',
+    'hospital-alt',
+    'hospital-symbol',
+    'hospital-user',
+    'hot-tub',
+    'hotdog',
+    'hotel',
+    'hourglass',
+    'hourglass-end',
+    'hourglass-half',
+    'hourglass-start',
+    'house-damage',
+    'house-user',
+    'hryvnia',
+    'i-cursor',
+    'ice-cream',
+    'icicles',
+    'icons',
+    'id-badge',
+    'id-card',
+    'id-card-alt',
+    'igloo',
+    'image',
+    'images',
+    'inbox',
+    'indent',
+    'industry',
+    'infinity',
+    'info',
+    'info-circle',
+    'integral',
+    'intersection',
+    'italic',
+    'jedi',
+    'joint',
+    'journal-whills',
+    'kaaba',
+    'key',
+    'keyboard',
+    'khanda',
+    'kiss',
+    'kiss-beam',
+    'kiss-wink-heart',
+    'kiwi-bird',
+    'lambda',
+    'landmark',
+    'language',
+    'laptop',
+    'laptop-code',
+    'laptop-house',
+    'laptop-medical',
+    'laugh',
+    'laugh-beam',
+    'laugh-squint',
+    'laugh-wink',
+    'layer-group',
+    'leaf',
+    'lemon',
+    'less-than',
+    'less-than-equal',
+    'level-down-alt',
+    'level-up-alt',
+    'life-ring',
+    'lightbulb',
+    'link',
+    'lira-sign',
+    'list',
+    'list-alt',
+    'list-ol',
+    'list-ul',
+    'location-arrow',
+    'lock',
+    'lock-open',
+    'long-arrow-alt-down',
+    'long-arrow-alt-left',
+    'long-arrow-alt-right',
+    'long-arrow-alt-up',
+    'low-vision',
+    'luggage-cart',
+    'lungs',
+    'lungs-virus',
+    'magic',
+    'magnet',
+    'mail-bulk',
+    'male',
+    'map',
+    'map-marked',
+    'map-marked-alt',
+    'map-marker',
+    'map-marker-alt',
+    'map-pin',
+    'map-signs',
+    'marker',
+    'mars',
+    'mars-double',
+    'mars-stroke',
+    'mars-stroke-h',
+    'mars-stroke-v',
+    'mask',
+    'medal',
+    'medkit',
+    'meh',
+    'meh-blank',
+    'meh-rolling-eyes',
+    'memory',
+    'menorah',
+    'mercury',
+    'meteor',
+    'microchip',
+    'microphone',
+    'microphone-alt',
+    'microphone-alt-slash',
+    'microphone-slash',
+    'microscope',
+    'minus',
+    'minus-circle',
+    'minus-square',
+    'mitten',
+    'mobile',
+    'mobile-alt',
+    'money-bill',
+    'money-bill-alt',
+    'money-bill-wave',
+    'money-bill-wave-alt',
+    'money-check',
+    'money-check-alt',
+    'monument',
+    'moon',
+    'mortar-pestle',
+    'mosque',
+    'motorcycle',
+    'mountain',
+    'mouse',
+    'mouse-pointer',
+    'mug-hot',
+    'music',
+    'network-wired',
+    'neuter',
+    'newspaper',
+    'not-equal',
+    'notes-medical',
+    'object-group',
+    'object-ungroup',
+    'oil-can',
+    'om',
+    'omega',
+    'otter',
+    'outdent',
+    'pager',
+    'paint-brush',
+    'paint-roller',
+    'palette',
+    'pallet',
+    'paper-plane',
+    'paperclip',
+    'parachute-box',
+    'paragraph',
+    'parking',
+    'passport',
+    'pastafarianism',
+    'paste',
+    'pause',
+    'pause-circle',
+    'paw',
+    'peace',
+    'pen',
+    'pen-alt',
+    'pen-fancy',
+    'pen-nib',
+    'pen-square',
+    'pencil-alt',
+    'pencil-ruler',
+    'people-arrows',
+    'people-carry',
+    'pepper-hot',
+    'percent',
+    'percentage',
+    'person-booth',
+    'phone',
+    'phone-alt',
+    'phone-slash',
+    'phone-square',
+    'phone-square-alt',
+    'phone-volume',
+    'photo-video',
+    'pi',
+    'piggy-bank',
+    'pills',
+    'pizza-slice',
+    'place-of-worship',
+    'plane',
+    'plane-arrival',
+    'plane-departure',
+    'plane-slash',
+    'play',
+    'play-circle',
+    'plug',
+    'plus',
+    'plus-circle',
+    'plus-square',
+    'podcast',
+    'poll',
+    'poll-h',
+    'poo',
+    'poo-storm',
+    'poop',
+    'portrait',
+    'pound-sign',
+    'power-off',
+    'pray',
+    'praying-hands',
+    'prescription',
+    'prescription-bottle',
+    'prescription-bottle-alt',
+    'print',
+    'procedures',
+    'project-diagram',
+    'pump-medical',
+    'pump-soap',
+    'puzzle-piece',
+    'qrcode',
+    'question',
+    'question-circle',
+    'quidditch',
+    'quote-left',
+    'quote-right',
+    'quran',
+    'radiation',
+    'radiation-alt',
+    'rainbow',
+    'random',
+    'receipt',
+    'record-vinyl',
+    'recycle',
+    'redo',
+    'redo-alt',
+    'registered',
+    'remove-format',
+    'reply',
+    'reply-all',
+    'republican',
+    'restroom',
+    'retweet',
+    'ribbon',
+    'ring',
+    'road',
+    'robot',
+    'rocket',
+    'route',
+    'rss',
+    'rss-square',
+    'ruble-sign',
+    'ruler',
+    'ruler-combined',
+    'ruler-horizontal',
+    'ruler-vertical',
+    'running',
+    'rupee-sign',
+    'sad-cry',
+    'sad-tear',
+    'satellite',
+    'satellite-dish',
+    'save',
+    'school',
+    'screwdriver',
+    'scroll',
+    'sd-card',
+    'search',
+    'search-dollar',
+    'search-location',
+    'search-minus',
+    'search-plus',
+    'seedling',
+    'server',
+    'shapes',
+    'share',
+    'share-alt',
+    'share-alt-square',
+    'share-square',
+    'shekel-sign',
+    'shield-alt',
+    'shield-virus',
+    'ship',
+    'shipping-fast',
+    'shoe-prints',
+    'shopping-bag',
+    'shopping-basket',
+    'shopping-cart',
+    'shower',
+    'shuttle-van',
+    'sigma',
+    'sign',
+    'sign-in-alt',
+    'sign-language',
+    'sign-out-alt',
+    'signal',
+    'signal-alt',
+    'signal-alt-slash',
+    'signal-slash',
+    'signature',
+    'sim-card',
+    'sink',
+    'sitemap',
+    'skating',
+    'skiing',
+    'skiing-nordic',
+    'skull',
+    'skull-crossbones',
+    'slash',
+    'sleigh',
+    'sliders-h',
+    'smile',
+    'smile-beam',
+    'smile-wink',
+    'smog',
+    'smoking',
+    'smoking-ban',
+    'sms',
+    'snowboarding',
+    'snowflake',
+    'snowman',
+    'snowplow',
+    'soap',
+    'socks',
+    'solar-panel',
+    'sort',
+    'sort-alpha-down',
+    'sort-alpha-down-alt',
+    'sort-alpha-up',
+    'sort-alpha-up-alt',
+    'sort-amount-down',
+    'sort-amount-down-alt',
+    'sort-amount-up',
+    'sort-amount-up-alt',
+    'sort-down',
+    'sort-numeric-down',
+    'sort-numeric-down-alt',
+    'sort-numeric-up',
+    'sort-numeric-up-alt',
+    'sort-up',
+    'spa',
+    'space-shuttle',
+    'spell-check',
+    'spider',
+    'spinner',
+    'splotch',
+    'spray-can',
+    'square',
+    'square-full',
+    'square-root',
+    'square-root-alt',
+    'stamp',
+    'star',
+    'star-and-crescent',
+    'star-half',
+    'star-half-alt',
+    'star-of-david',
+    'star-of-life',
+    'step-backward',
+    'step-forward',
+    'stethoscope',
+    'sticky-note',
+    'stop',
+    'stop-circle',
+    'stopwatch',
+    'stopwatch-20',
+    'store',
+    'store-alt',
+    'store-alt-slash',
+    'store-slash',
+    'stream',
+    'street-view',
+    'strikethrough',
+    'stroopwafel',
+    'subscript',
+    'subway',
+    'suitcase',
+    'suitcase-rolling',
+    'sun',
+    'superscript',
+    'surprise',
+    'swatchbook',
+    'swimmer',
+    'swimming-pool',
+    'synagogue',
+    'sync',
+    'sync-alt',
+    'syringe',
+    'table',
+    'table-tennis',
+    'tablet',
+    'tablet-alt',
+    'tablets',
+    'tachometer-alt',
+    'tag',
+    'tags',
+    'tally',
+    'tape',
+    'tasks',
+    'taxi',
+    'teeth',
+    'teeth-open',
+    'temperature-high',
+    'temperature-low',
+    'tenge',
+    'terminal',
+    'text-height',
+    'text-width',
+    'th',
+    'th-large',
+    'th-list',
+    'theater-masks',
+    'thermometer',
+    'thermometer-empty',
+    'thermometer-full',
+    'thermometer-half',
+    'thermometer-quarter',
+    'thermometer-three-quarters',
+    'theta',
+    'thumbs-down',
+    'thumbs-up',
+    'thumbtack',
+    'ticket-alt',
+    'tilde',
+    'times',
+    'times-circle',
+    'tint',
+    'tint-slash',
+    'tired',
+    'toggle-off',
+    'toggle-on',
+    'toilet',
+    'toilet-paper',
+    'toilet-paper-slash',
+    'toolbox',
+    'tools',
+    'tooth',
+    'torah',
+    'torii-gate',
+    'tractor',
+    'trademark',
+    'traffic-light',
+    'trailer',
+    'train',
+    'tram',
+    'transgender',
+    'transgender-alt',
+    'trash',
+    'trash-alt',
+    'trash-restore',
+    'trash-restore-alt',
+    'tree',
+    'trophy',
+    'truck',
+    'truck-loading',
+    'truck-monster',
+    'truck-moving',
+    'truck-pickup',
+    'tshirt',
+    'tty',
+    'tv',
+    'umbrella',
+    'umbrella-beach',
+    'underline',
+    'undo',
+    'undo-alt',
+    'union',
+    'universal-access',
+    'university',
+    'unlink',
+    'unlock',
+    'unlock-alt',
+    'upload',
+    'user',
+    'user-alt',
+    'user-alt-slash',
+    'user-astronaut',
+    'user-check',
+    'user-circle',
+    'user-clock',
+    'user-cog',
+    'user-edit',
+    'user-friends',
+    'user-graduate',
+    'user-injured',
+    'user-lock',
+    'user-md',
+    'user-minus',
+    'user-ninja',
+    'user-nurse',
+    'user-plus',
+    'user-secret',
+    'user-shield',
+    'user-slash',
+    'user-tag',
+    'user-tie',
+    'user-times',
+    'users',
+    'users-cog',
+    'users-slash',
+    'utensil-spoon',
+    'utensils',
+    'value-absolute',
+    'vector-square',
+    'venus',
+    'venus-double',
+    'venus-mars',
+    'vest',
+    'vest-patches',
+    'vial',
+    'vials',
+    'video',
+    'video-slash',
+    'vihara',
+    'virus',
+    'virus-slash',
+    'viruses',
+    'voicemail',
+    'volleyball-ball',
+    'volume',
+    'volume-down',
+    'volume-mute',
+    'volume-off',
+    'volume-slash',
+    'volume-up',
+    'vote-yea',
+    'vr-cardboard',
+    'walking',
+    'wallet',
+    'warehouse',
+    'water',
+    'wave-square',
+    'weight',
+    'weight-hanging',
+    'wheelchair',
+    'wifi',
+    'wifi-slash',
+    'wind',
+    'window-close',
+    'window-maximize',
+    'window-minimize',
+    'window-restore',
+    'wine-bottle',
+    'wine-glass',
+    'wine-glass-alt',
+    'won-sign',
+    'wrench',
+    'x-ray',
+    'yen-sign',
+    'yin-yang'
+  ]
+}
diff --git a/src/hooks/event/useScrollTo.ts b/src/hooks/event/useScrollTo.ts
new file mode 100644
index 00000000..92aec872
--- /dev/null
+++ b/src/hooks/event/useScrollTo.ts
@@ -0,0 +1,60 @@
+export interface ScrollToParams {
+  el: HTMLElement
+  to: number
+  position: string
+  duration?: number
+  callback?: () => void
+}
+
+const easeInOutQuad = (t: number, b: number, c: number, d: number) => {
+  t /= d / 2
+  if (t < 1) {
+    return (c / 2) * t * t + b
+  }
+  t--
+  return (-c / 2) * (t * (t - 2) - 1) + b
+}
+const move = (el: HTMLElement, position: string, amount: number) => {
+  el[position] = amount
+}
+
+export function useScrollTo({
+  el,
+  position = 'scrollLeft',
+  to,
+  duration = 500,
+  callback
+}: ScrollToParams) {
+  const isActiveRef = ref(false)
+  const start = el[position]
+  const change = to - start
+  const increment = 20
+  let currentTime = 0
+
+  function animateScroll() {
+    if (!unref(isActiveRef)) {
+      return
+    }
+    currentTime += increment
+    const val = easeInOutQuad(currentTime, start, change, duration)
+    move(el, position, val)
+    if (currentTime < duration && unref(isActiveRef)) {
+      requestAnimationFrame(animateScroll)
+    } else {
+      if (callback) {
+        callback()
+      }
+    }
+  }
+
+  function run() {
+    isActiveRef.value = true
+    animateScroll()
+  }
+
+  function stop() {
+    isActiveRef.value = false
+  }
+
+  return { start: run, stop }
+}
diff --git a/src/hooks/web/useIcon.ts b/src/hooks/web/useIcon.ts
new file mode 100644
index 00000000..629e89d9
--- /dev/null
+++ b/src/hooks/web/useIcon.ts
@@ -0,0 +1,8 @@
+import { h } from 'vue'
+import type { VNode } from 'vue'
+import { Icon } from '@/components/icon'
+import { IconTypes } from '@/types/icon'
+
+export const useIcon = (props: IconTypes): VNode => {
+  return h(Icon, props)
+}
diff --git a/src/hooks/web/useLocale.ts b/src/hooks/web/useLocale.ts
new file mode 100644
index 00000000..0565bf46
--- /dev/null
+++ b/src/hooks/web/useLocale.ts
@@ -0,0 +1,35 @@
+import { i18n } from '@/plugins/vueI18n'
+import { useLocaleStoreWithOut } from '@/stores/modules/locale'
+import { setHtmlPageLang } from '@/plugins/vueI18n/helper'
+
+const setI18nLanguage = (locale: LocaleType) => {
+  const localeStore = useLocaleStoreWithOut()
+
+  if (i18n.mode === 'legacy') {
+    i18n.global.locale = locale
+  } else {
+    ;(i18n.global.locale as any).value = locale
+  }
+  localeStore.setCurrentLocale({
+    lang: locale
+  })
+  setHtmlPageLang(locale)
+}
+
+export const useLocale = () => {
+  // Switching the language will change the locale of useI18n
+  // And submit to configuration modification
+  const changeLocale = async (locale: LocaleType) => {
+    const globalI18n = i18n.global
+
+    const langModule = await import(`../../locales/${locale}.ts`)
+
+    globalI18n.setLocaleMessage(locale, langModule.default)
+
+    setI18nLanguage(locale)
+  }
+
+  return {
+    changeLocale
+  }
+}
diff --git a/src/hooks/web/useNow.ts b/src/hooks/web/useNow.ts
new file mode 100644
index 00000000..09d3176b
--- /dev/null
+++ b/src/hooks/web/useNow.ts
@@ -0,0 +1,60 @@
+import { dateUtil } from '@/utils/dateUtil'
+import { reactive, toRefs } from 'vue'
+import { tryOnMounted, tryOnUnmounted } from '@vueuse/core'
+
+export const useNow = (immediate = true) => {
+  let timer: IntervalHandle
+
+  const state = reactive({
+    year: 0,
+    month: 0,
+    week: '',
+    day: 0,
+    hour: '',
+    minute: '',
+    second: 0,
+    meridiem: ''
+  })
+
+  const update = () => {
+    const now = dateUtil()
+
+    const h = now.format('HH')
+    const m = now.format('mm')
+    const s = now.get('s')
+
+    state.year = now.get('y')
+    state.month = now.get('M') + 1
+    state.week = '星期' + ['日', '一', '二', '三', '四', '五', '六'][now.day()]
+    state.day = now.get('date')
+    state.hour = h
+    state.minute = m
+    state.second = s
+
+    state.meridiem = now.format('A')
+  }
+
+  function start() {
+    update()
+    clearInterval(timer)
+    timer = setInterval(() => update(), 1000)
+  }
+
+  function stop() {
+    clearInterval(timer)
+  }
+
+  tryOnMounted(() => {
+    immediate && start()
+  })
+
+  tryOnUnmounted(() => {
+    stop()
+  })
+
+  return {
+    ...toRefs(state),
+    start,
+    stop
+  }
+}
diff --git a/src/hooks/web/useValidator.ts b/src/hooks/web/useValidator.ts
new file mode 100644
index 00000000..151e35b2
--- /dev/null
+++ b/src/hooks/web/useValidator.ts
@@ -0,0 +1,60 @@
+import { useI18n } from '@/hooks/web/useI18n'
+import { FormItemRule } from 'element-plus'
+
+const { t } = useI18n()
+
+interface LengthRange {
+  min: number
+  max: number
+  message?: string
+}
+
+export const useValidator = () => {
+  const required = (message?: string): FormItemRule => {
+    return {
+      required: true,
+      message: message || t('common.required')
+    }
+  }
+
+  const lengthRange = (options: LengthRange): FormItemRule => {
+    const { min, max, message } = options
+
+    return {
+      min,
+      max,
+      message: message || t('common.lengthRange', { min, max })
+    }
+  }
+
+  const notSpace = (message?: string): FormItemRule => {
+    return {
+      validator: (_, val, callback) => {
+        if (val?.indexOf(' ') !== -1) {
+          callback(new Error(message || t('common.notSpace')))
+        } else {
+          callback()
+        }
+      }
+    }
+  }
+
+  const notSpecialCharacters = (message?: string): FormItemRule => {
+    return {
+      validator: (_, val, callback) => {
+        if (/[`~!@#$%^&*()_+<>?:"{},.\/;'[\]]/gi.test(val)) {
+          callback(new Error(message || t('common.notSpecialCharacters')))
+        } else {
+          callback()
+        }
+      }
+    }
+  }
+
+  return {
+    required,
+    lengthRange,
+    notSpace,
+    notSpecialCharacters
+  }
+}
diff --git a/src/hooks/web/useWatermark.ts b/src/hooks/web/useWatermark.ts
new file mode 100644
index 00000000..4a313594
--- /dev/null
+++ b/src/hooks/web/useWatermark.ts
@@ -0,0 +1,55 @@
+const domSymbol = Symbol('watermark-dom')
+
+export function useWatermark(appendEl: HTMLElement | null = document.body) {
+  let func: Fn = () => {}
+  const id = domSymbol.toString()
+  const clear = () => {
+    const domId = document.getElementById(id)
+    if (domId) {
+      const el = appendEl
+      el && el.removeChild(domId)
+    }
+    window.removeEventListener('resize', func)
+  }
+  const createWatermark = (str: string) => {
+    clear()
+
+    const can = document.createElement('canvas')
+    can.width = 300
+    can.height = 240
+
+    const cans = can.getContext('2d')
+    if (cans) {
+      cans.rotate((-20 * Math.PI) / 120)
+      cans.font = '15px Vedana'
+      cans.fillStyle = 'rgba(0, 0, 0, 0.15)'
+      cans.textAlign = 'left'
+      cans.textBaseline = 'middle'
+      cans.fillText(str, can.width / 20, can.height)
+    }
+
+    const div = document.createElement('div')
+    div.id = id
+    div.style.pointerEvents = 'none'
+    div.style.top = '0px'
+    div.style.left = '0px'
+    div.style.position = 'absolute'
+    div.style.zIndex = '100000000'
+    div.style.width = document.documentElement.clientWidth + 'px'
+    div.style.height = document.documentElement.clientHeight + 'px'
+    div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
+    const el = appendEl
+    el && el.appendChild(div)
+    return id
+  }
+
+  function setWatermark(str: string) {
+    createWatermark(str)
+    func = () => {
+      createWatermark(str)
+    }
+    window.addEventListener('resize', func)
+  }
+
+  return { setWatermark, clear }
+}
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index d8962634..a8b27c70 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -1,8 +1,8 @@
 <script lang="tsx">
 import { computed, defineComponent, unref } from 'vue'
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { Backtop } from '@/components/Backtop'
-import { Setting } from '@/layout/components/Setting'
+import { Setting } from '@/layouts/components/Setting'
 import { useRenderLayout } from './components/useRenderLayout'
 import { useDesign } from '@/hooks/web/useDesign'
 
diff --git a/src/layouts/components/AppView.vue b/src/layouts/components/AppView.vue
index 44341873..b3b00b31 100644
--- a/src/layouts/components/AppView.vue
+++ b/src/layouts/components/AppView.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { useTagsViewStore } from '@/store/modules/tagsView'
-import { useAppStore } from '@/store/modules/app'
-import { Footer } from '@/layout/components/Footer'
+import { useTagsViewStore } from '@/stores/modules/tagsView'
+import { useAppStore } from '@/stores/modules/app'
+import { Footer } from '@/layouts/components/Footer'
 
 defineOptions({ name: 'AppView' })
 
diff --git a/src/layouts/components/Breadcrumb/src/Breadcrumb.vue b/src/layouts/components/Breadcrumb/src/Breadcrumb.vue
index 878d680f..7c36ffde 100644
--- a/src/layouts/components/Breadcrumb/src/Breadcrumb.vue
+++ b/src/layouts/components/Breadcrumb/src/Breadcrumb.vue
@@ -2,13 +2,13 @@
 import { ElBreadcrumb, ElBreadcrumbItem } from 'element-plus'
 import { ref, watch, computed, unref, defineComponent, TransitionGroup } from 'vue'
 import { useRouter } from 'vue-router'
-import { usePermissionStore } from '@/store/modules/permission'
+import { usePermissionStore } from '@/stores/modules/permission'
 import { filterBreadcrumb } from './helper'
 import { filter, treeToList } from '@/utils/tree'
 import type { RouteLocationNormalizedLoaded, RouteMeta } from 'vue-router'
 
 import { Icon } from '@/components/Icon'
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
 const { getPrefixCls } = useDesign()
diff --git a/src/layouts/components/Collapse/src/Collapse.vue b/src/layouts/components/Collapse/src/Collapse.vue
index 004957ef..addf5a54 100644
--- a/src/layouts/components/Collapse/src/Collapse.vue
+++ b/src/layouts/components/Collapse/src/Collapse.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
 import { Expand,Fold,ZoomIn,Delete} from '@element-plus/icons-vue'
diff --git a/src/layouts/components/Footer/src/Footer.vue b/src/layouts/components/Footer/src/Footer.vue
index 3eede386..4923330a 100644
--- a/src/layouts/components/Footer/src/Footer.vue
+++ b/src/layouts/components/Footer/src/Footer.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
 // eslint-disable-next-line vue/no-reserved-component-names
diff --git a/src/layouts/components/LocaleDropdown/src/LocaleDropdown.vue b/src/layouts/components/LocaleDropdown/src/LocaleDropdown.vue
index 95132db2..10c3bead 100644
--- a/src/layouts/components/LocaleDropdown/src/LocaleDropdown.vue
+++ b/src/layouts/components/LocaleDropdown/src/LocaleDropdown.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useLocaleStore } from '@/store/modules/locale'
+import { useLocaleStore } from '@/stores/modules/locale'
 import { useLocale } from '@/hooks/web/useLocale'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
diff --git a/src/layouts/components/Logo/src/Logo.vue b/src/layouts/components/Logo/src/Logo.vue
index d241130d..092bfd3d 100644
--- a/src/layouts/components/Logo/src/Logo.vue
+++ b/src/layouts/components/Logo/src/Logo.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref, unref, watch } from 'vue'
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
 defineOptions({ name: 'Logo' })
diff --git a/src/layouts/components/Menu/src/Menu.vue b/src/layouts/components/Menu/src/Menu.vue
index 9c13eed5..05f799be 100644
--- a/src/layouts/components/Menu/src/Menu.vue
+++ b/src/layouts/components/Menu/src/Menu.vue
@@ -1,8 +1,8 @@
 <script lang="tsx">
 import { PropType } from 'vue'
 import { ElMenu, ElScrollbar } from 'element-plus'
-import { useAppStore } from '@/store/modules/app'
-import { usePermissionStore } from '@/store/modules/permission'
+import { useAppStore } from '@/stores/modules/app'
+import { usePermissionStore } from '@/stores/modules/permission'
 import { useRenderMenuItem } from './components/useRenderMenuItem'
 import { isUrl } from '@/utils/is'
 import { useDesign } from '@/hooks/web/useDesign'
diff --git a/src/layouts/components/Setting/src/Setting.vue b/src/layouts/components/Setting/src/Setting.vue
index ac1c38cf..da3cbd28 100644
--- a/src/layouts/components/Setting/src/Setting.vue
+++ b/src/layouts/components/Setting/src/Setting.vue
@@ -7,8 +7,8 @@ import { useDesign } from '@/hooks/web/useDesign'
 
 import { setCssVar, trim } from '@/utils'
 import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
-import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import { useAppStore } from '@/stores/modules/app'
+import { ThemeSwitch } from '@/layouts/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 import InterfaceDisplay from './components/InterfaceDisplay.vue'
 import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
diff --git a/src/layouts/components/Setting/src/components/InterfaceDisplay.vue b/src/layouts/components/Setting/src/components/InterfaceDisplay.vue
index ebbbf4bc..b221f549 100644
--- a/src/layouts/components/Setting/src/components/InterfaceDisplay.vue
+++ b/src/layouts/components/Setting/src/components/InterfaceDisplay.vue
@@ -3,7 +3,7 @@ import { setCssVar } from '@/utils'
 
 import { useDesign } from '@/hooks/web/useDesign'
 import { useWatermark } from '@/hooks/web/useWatermark'
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 
 defineOptions({ name: 'InterfaceDisplay' })
 
diff --git a/src/layouts/components/Setting/src/components/LayoutRadioPicker.vue b/src/layouts/components/Setting/src/components/LayoutRadioPicker.vue
index c90171fa..950f3aa0 100644
--- a/src/layouts/components/Setting/src/components/LayoutRadioPicker.vue
+++ b/src/layouts/components/Setting/src/components/LayoutRadioPicker.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
 defineOptions({ name: 'LayoutRadioPicker' })
diff --git a/src/layouts/components/SizeDropdown/src/SizeDropdown.vue b/src/layouts/components/SizeDropdown/src/SizeDropdown.vue
index 3e152244..1d7e9678 100644
--- a/src/layouts/components/SizeDropdown/src/SizeDropdown.vue
+++ b/src/layouts/components/SizeDropdown/src/SizeDropdown.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
diff --git a/src/layouts/components/TabMenu/src/TabMenu.vue b/src/layouts/components/TabMenu/src/TabMenu.vue
index b4427842..b93f8166 100644
--- a/src/layouts/components/TabMenu/src/TabMenu.vue
+++ b/src/layouts/components/TabMenu/src/TabMenu.vue
@@ -1,10 +1,9 @@
 <script lang="tsx">
-import { usePermissionStore } from '@/store/modules/permission'
-import { useAppStore } from '@/store/modules/app'
+import { usePermissionStore } from '@/stores/modules/permission'
+import { useAppStore } from '@/stores/modules/app'
 
 import { ElScrollbar } from 'element-plus'
-import { Icon } from '@/components/Icon'
-import { Menu } from '@/layout/components/Menu'
+import { Menu } from '@/layouts/components/Menu'
 import { pathResolve } from '@/utils/routerHelper'
 import { cloneDeep } from 'lodash-es'
 import { filterMenusPath, initTabMap, tabPathMap } from './helper'
@@ -173,7 +172,6 @@ export default defineComponent({
                     }}
                   >
                     <div>
-                      <Icon icon={item?.meta?.icon}></Icon>
                     </div>
                     {!unref(showTitle) ? undefined : (
                       <p class="mt-5px break-words px-2px">{t(item.meta?.title)}</p>
@@ -191,7 +189,6 @@ export default defineComponent({
           ]}
           onClick={setCollapse}
         >
-          <Icon icon={unref(collapse) ? 'ep:d-arrow-right' : 'ep:d-arrow-left'}></Icon>
         </div>
         <Menu
           class={[
diff --git a/src/layouts/components/TabMenu/src/helper.ts b/src/layouts/components/TabMenu/src/helper.ts
index cce39323..0871372a 100644
--- a/src/layouts/components/TabMenu/src/helper.ts
+++ b/src/layouts/components/TabMenu/src/helper.ts
@@ -1,4 +1,4 @@
-import { getAllParentPath } from '@/layout/components/Menu/src/helper'
+import { getAllParentPath } from '@/layouts/components/Menu/src/helper'
 import type { RouteMeta } from 'vue-router'
 import { isUrl } from '@/utils/is'
 import { cloneDeep } from 'lodash-es'
diff --git a/src/layouts/components/TagsView/src/TagsView.vue b/src/layouts/components/TagsView/src/TagsView.vue
index 7cfca6c7..f24b177c 100644
--- a/src/layouts/components/TagsView/src/TagsView.vue
+++ b/src/layouts/components/TagsView/src/TagsView.vue
@@ -2,12 +2,12 @@
 import { onMounted, watch, computed, unref, ref, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import type { RouteLocationNormalizedLoaded, RouterLinkProps } from 'vue-router'
-import { usePermissionStore } from '@/store/modules/permission'
-import { useTagsViewStore } from '@/store/modules/tagsView'
-import { useAppStore } from '@/store/modules/app'
+import { usePermissionStore } from '@/stores/modules/permission'
+import { useTagsViewStore } from '@/stores/modules/tagsView'
+import { useAppStore } from '@/stores/modules/app'
 import { useI18n } from '@/hooks/web/useI18n'
 import { filterAffixTags } from './helper'
-import { ContextMenu, ContextMenuExpose } from '@/layout/components/ContextMenu'
+import { ContextMenu, ContextMenuExpose } from '@/layouts/components/ContextMenu'
 import { useDesign } from '@/hooks/web/useDesign'
 import { useTemplateRefsList } from '@vueuse/core'
 import { ElScrollbar } from 'element-plus'
diff --git a/src/layouts/components/ThemeSwitch/src/ThemeSwitch.vue b/src/layouts/components/ThemeSwitch/src/ThemeSwitch.vue
index 39a8cfd7..97b355cf 100644
--- a/src/layouts/components/ThemeSwitch/src/ThemeSwitch.vue
+++ b/src/layouts/components/ThemeSwitch/src/ThemeSwitch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { useIcon } from '@/hooks/web/useIcon'
 import { useDesign } from '@/hooks/web/useDesign'
 
diff --git a/src/layouts/components/ToolHeader.vue b/src/layouts/components/ToolHeader.vue
index 17b2ed0f..ec509df5 100644
--- a/src/layouts/components/ToolHeader.vue
+++ b/src/layouts/components/ToolHeader.vue
@@ -1,14 +1,13 @@
 <script lang="tsx">
 import { defineComponent, computed } from 'vue'
-import { Message } from '@/layout/components//Message'
-import { Collapse } from '@/layout/components/Collapse'
-import { UserInfo } from '@/layout/components/UserInfo'
-import { Screenfull } from '@/layout/components/Screenfull'
-import { Breadcrumb } from '@/layout/components/Breadcrumb'
-import { SizeDropdown } from '@/layout/components/SizeDropdown'
-import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
+import { Collapse } from '@/layouts/components/Collapse'
+import { UserInfo } from '@/layouts/components/UserInfo'
+import { Screenfull } from '@/layouts/components/Screenfull'
+import { Breadcrumb } from '@/layouts/components/Breadcrumb'
+import { SizeDropdown } from '@/layouts/components/SizeDropdown'
+import { LocaleDropdown } from '@/layouts/components/LocaleDropdown'
 import RouterSearch from '@/components/RouterSearch/index.vue'
-import { useAppStore } from '@/store/modules/app'
+import { useAppStore } from '@/stores/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
 const { getPrefixCls, variables } = useDesign()
@@ -76,7 +75,8 @@ export default defineComponent({
             ></LocaleDropdown>
           ) : undefined}
           {message.value ? (
-            <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
+              "undefined"
+            // <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
           ) : undefined}
           <UserInfo></UserInfo>
         </div>
diff --git a/src/layouts/components/UserInfo/src/UserInfo.vue b/src/layouts/components/UserInfo/src/UserInfo.vue
index 40ca4ad6..bb8c2e9a 100644
--- a/src/layouts/components/UserInfo/src/UserInfo.vue
+++ b/src/layouts/components/UserInfo/src/UserInfo.vue
@@ -3,11 +3,11 @@ import { ElMessageBox } from 'element-plus'
 import { Tools, Menu, Lock, SwitchButton } from '@element-plus/icons-vue'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useDesign } from '@/hooks/web/useDesign'
-import { useTagsViewStore } from '@/store/modules/tagsView'
-import { useUserStore } from '@/store/modules/user'
+import { useTagsViewStore } from '@/stores/modules/tagsView'
+import { useUserStore } from '@/stores/modules/user'
 import LockDialog from './components/LockDialog.vue'
 import LockPage from './components/LockPage.vue'
-import { useLockStore } from '@/store/modules/lock'
+import { useLockStore } from '@/stores/modules/lock'
 
 defineOptions({ name: 'UserInfo' })
 
diff --git a/src/layouts/components/UserInfo/src/components/LockDialog.vue b/src/layouts/components/UserInfo/src/components/LockDialog.vue
index f4ab7d4f..95de6ec8 100644
--- a/src/layouts/components/UserInfo/src/components/LockDialog.vue
+++ b/src/layouts/components/UserInfo/src/components/LockDialog.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { useValidator } from '@/hooks/web/useValidator'
 import { useDesign } from '@/hooks/web/useDesign'
-import { useLockStore } from '@/store/modules/lock'
+import { useLockStore } from '@/stores/modules/lock'
 import avatarImg from '@/assets/imgs/avatar.gif'
-import { useUserStore } from '@/store/modules/user'
+import { useUserStore } from '@/stores/modules/user'
 
 const { getPrefixCls } = useDesign()
 const prefixCls = getPrefixCls('lock-dialog')
diff --git a/src/layouts/components/UserInfo/src/components/LockPage.vue b/src/layouts/components/UserInfo/src/components/LockPage.vue
index bbd17d61..c288d01d 100644
--- a/src/layouts/components/UserInfo/src/components/LockPage.vue
+++ b/src/layouts/components/UserInfo/src/components/LockPage.vue
@@ -1,11 +1,10 @@
 <script lang="ts" setup>
-import { resetRouter } from '@/router'
 import { deleteUserCache } from '@/hooks/web/useCache'
-import { useLockStore } from '@/store/modules/lock'
+import { useLockStore } from '@/stores/modules/lock'
 import { useNow } from '@/hooks/web/useNow'
 import { useDesign } from '@/hooks/web/useDesign'
-import { useTagsViewStore } from '@/store/modules/tagsView'
-import { useUserStore } from '@/store/modules/user'
+import { useTagsViewStore } from '@/stores/modules/tagsView'
+import { useUserStore } from '@/stores/modules/user'
 import avatarImg from '@/assets/imgs/avatar.gif'
 
 const tagsViewStore = useTagsViewStore()
@@ -52,7 +51,7 @@ async function goLogin() {
   // 登出后清理
   deleteUserCache() // 清空用户缓存
   tagsViewStore.delAllViews()
-  resetRouter() // 重置静态路由表
+  // resetRouter() // 重置静态路由表
   lockStore.resetLockInfo()
   replace('/login')
 }
diff --git a/src/layouts/components/useRenderLayout.tsx b/src/layouts/components/useRenderLayout.tsx
index 1110cd86..668de51d 100644
--- a/src/layouts/components/useRenderLayout.tsx
+++ b/src/layouts/components/useRenderLayout.tsx
@@ -1,9 +1,9 @@
 import { computed } from 'vue'
-import { useAppStore } from '@/store/modules/app'
-import { Menu } from '@/layout/components/Menu'
-import { TabMenu } from '@/layout/components/TabMenu'
-import { TagsView } from '@/layout/components/TagsView'
-import { Logo } from '@/layout/components/Logo'
+import { useAppStore } from '@/stores/modules/app'
+import { Menu } from '@/layouts/components/Menu'
+import { TabMenu } from '@/layouts/components/TabMenu'
+import { TagsView } from '@/layouts/components/TagsView'
+import { Logo } from '@/layouts/components/Logo'
 import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'
diff --git a/src/stores/modules/app.ts b/src/stores/modules/app.ts
index 87336181..ea53adc4 100644
--- a/src/stores/modules/app.ts
+++ b/src/stores/modules/app.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { store } from '../index'
+import { store } from '../indexs'
 import { setCssVar, humpToUnderline } from '@/utils'
 import { ElMessage } from 'element-plus'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
diff --git a/src/stores/modules/lock.ts b/src/stores/modules/lock.ts
index 68ae1d7d..ad0d63bd 100644
--- a/src/stores/modules/lock.ts
+++ b/src/stores/modules/lock.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { store } from '@/store'
+import { store } from '@/stores/indexs'
 
 interface lockInfo {
   isLock?: boolean
diff --git a/src/stores/modules/permission.ts b/src/stores/modules/permission.ts
index 5e3287a7..93c56c92 100644
--- a/src/stores/modules/permission.ts
+++ b/src/stores/modules/permission.ts
@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
-import { store } from '@/store'
+import { store } from '@/stores/indexs'
 import { cloneDeep } from 'lodash-es'
-import remainingRouter from '@/router/modules/remaining'
 import { flatMultiLevelRoutes, generateRoute } from '@/utils/routerHelper'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
@@ -52,7 +51,6 @@ export const usePermissionStore = defineStore('permission', {
           }
         ])
         // 渲染菜单的所有路由
-        this.routers = cloneDeep(remainingRouter).concat(routerMap)
         resolve()
       })
     },
diff --git a/src/stores/modules/user.ts b/src/stores/modules/user.ts
index b3861809..6117fb7a 100644
--- a/src/stores/modules/user.ts
+++ b/src/stores/modules/user.ts
@@ -1,8 +1,8 @@
-import { store } from '@/store'
+import { store } from '@/stores/indexs'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
 import { CACHE_KEY, useCache, deleteUserCache } from '@/hooks/web/useCache'
-import { getInfo, loginOut } from '@/api/login'
+// import { getInfo, loginOut } from '@/api/login'
 
 const { wsCache } = useCache()
 
@@ -55,7 +55,7 @@ export const useUserStore = defineStore('admin-user', {
       }
       let userInfo = wsCache.get(CACHE_KEY.USER)
       if (!userInfo) {
-        userInfo = await getInfo()
+        // userInfo = await getInfo()
       }
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
@@ -79,7 +79,7 @@ export const useUserStore = defineStore('admin-user', {
       wsCache.set(CACHE_KEY.USER, userInfo)
     },
     async loginOut() {
-      await loginOut()
+      // await loginOut()
       removeToken()
       deleteUserCache() // 删除用户缓存
       this.resetState()
diff --git a/src/types/elementPlus.d.ts b/src/types/elementPlus.d.ts
new file mode 100644
index 00000000..2c6b76e7
--- /dev/null
+++ b/src/types/elementPlus.d.ts
@@ -0,0 +1,3 @@
+export type ElementPlusSize = 'default' | 'small' | 'large'
+
+export type ElementPlusInfoType = 'success' | 'info' | 'warning' | 'danger'
diff --git a/src/types/icon.d.ts b/src/types/icon.d.ts
new file mode 100644
index 00000000..d1ffcdb5
--- /dev/null
+++ b/src/types/icon.d.ts
@@ -0,0 +1,5 @@
+export interface IconTypes {
+  size?: number
+  color?: string
+  icon: string
+}
diff --git a/src/types/layout.d.ts b/src/types/layout.d.ts
new file mode 100644
index 00000000..cad3e2af
--- /dev/null
+++ b/src/types/layout.d.ts
@@ -0,0 +1 @@
+export type LayoutType = 'classic' | 'topLeft' | 'top' | 'cutMenu'
diff --git a/src/types/theme.d.ts b/src/types/theme.d.ts
new file mode 100644
index 00000000..ad649b02
--- /dev/null
+++ b/src/types/theme.d.ts
@@ -0,0 +1,16 @@
+export type ThemeTypes = {
+  elColorPrimary?: string
+  leftMenuBorderColor?: string
+  leftMenuBgColor?: string
+  leftMenuBgLightColor?: string
+  leftMenuBgActiveColor?: string
+  leftMenuCollapseBgActiveColor?: string
+  leftMenuTextColor?: string
+  leftMenuTextActiveColor?: string
+  logoTitleTextColor?: string
+  logoBorderColor?: string
+  topHeaderBgColor?: string
+  topHeaderTextColor?: string
+  topHeaderHoverColor?: string
+  topToolBorderColor?: string
+}
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
new file mode 100644
index 00000000..316b870b
--- /dev/null
+++ b/src/utils/dateUtil.ts
@@ -0,0 +1,18 @@
+/**
+ * Independent time operation tool to facilitate subsequent switch to dayjs
+ */
+// TODO 芋艿：【锁屏】可能后面删除掉
+import dayjs from 'dayjs'
+
+const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss'
+const DATE_FORMAT = 'YYYY-MM-DD'
+
+export function formatToDateTime(date?: dayjs.ConfigType, format = DATE_TIME_FORMAT): string {
+  return dayjs(date).format(format)
+}
+
+export function formatToDate(date?: dayjs.ConfigType, format = DATE_FORMAT): string {
+  return dayjs(date).format(format)
+}
+
+export const dateUtil = dayjs