diff --git a/admin/src/App.vue b/admin/src/App.vue
index 2facb873e..9d4754cbd 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -35,7 +35,8 @@ onMounted(() => {
 })
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
+<style>
  .el-page-header__header .el-page-header__left .el-page-header__content{
     font-size: 14px !important;
     font-weight: 500 !important;
diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts
index 5cef0b3d0..9e145a302 100644
--- a/admin/src/app/api/notice.ts
+++ b/admin/src/app/api/notice.ts
@@ -60,7 +60,7 @@ export function getSmsList() {
  * @returns
  */
 export function getSmsInfo(sms_type: string) {
-    return request.get(`notice/notice/sms/${ sms_type }`,)
+    return request.get(`notice/notice/sms/${ sms_type }`)
 }
 
 /**
@@ -91,7 +91,7 @@ export function getAccountIsLogin() {
  * @param params
  */
 export function loginAccount(params: Record<string, any>) {
-    return request.post(`notice/niusms/account/login`,params,{ showSuccessMessage: true })
+    return request.post(`notice/niusms/account/login`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -99,7 +99,7 @@ export function loginAccount(params: Record<string, any>) {
  * @param params
  */
 export function registerAccount(params: Record<string, any>) {
-    return request.post(`notice/niusms/account/register`,params,{ showSuccessMessage: true })
+    return request.post(`notice/niusms/account/register`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -115,7 +115,7 @@ export function getAccountInfo(username: string) {
  * @param params
  */
 export function getTemplateList(params: Record<string, any>) {
-    return request.get(`notice/niusms/template/list/${params.sms_type}/${params.username}`,{})
+    return request.get(`notice/niusms/template/list/${params.sms_type}/${params.username}`, {})
 }
 
 /**
@@ -124,7 +124,7 @@ export function getTemplateList(params: Record<string, any>) {
  * @param params
  */
 export function getSignList(username: string, params: Record<string, any>) {
-    return request.get(`notice/niusms/sign/list/${username}`,{params})
+    return request.get(`notice/niusms/sign/list/${username}`, { params })
 }
 
 /**
@@ -150,8 +150,8 @@ export function deleteSign(username: string, params: Record<string, any>) {
  * @param username
  * @param params
  */
-export function editAccount(username: string,params: Record<string, any>) {
-  return request.post(`notice/niusms/account/edit/${username}`, params, { showSuccessMessage: true });
+export function editAccount(username: string, params: Record<string, any>) {
+    return request.post(`notice/niusms/account/edit/${username}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -160,7 +160,7 @@ export function editAccount(username: string,params: Record<string, any>) {
  * @param params
  */
 export function getSmsSendList(username: string, params: Record<string, any>) {
-    return request.get(`notice/niusms/account/send_list/${username}`,{params})
+    return request.get(`notice/niusms/account/send_list/${username}`, { params })
 }
 
 /**
@@ -169,7 +169,7 @@ export function getSmsSendList(username: string, params: Record<string, any>) {
  * @param params
  */
 export function getSmsOrdersList(username: string, params: Record<string, any>) {
-    return request.get(`notice/niusms/order/list/${username}`,{params})
+    return request.get(`notice/niusms/order/list/${username}`, { params })
 }
 
 /**
@@ -191,7 +191,7 @@ export function getSmsCaptcha() {
  * @param params
  */
 export function getSmsSend(params: Record<string, any>) {
-    return request.post(`notice/niusms/send`,params,{ showSuccessMessage: true })
+    return request.post(`notice/niusms/send`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -217,7 +217,7 @@ export function getTemplateReportConfig() {
  * @param params
  */
 export function reportTemplate(sms_type: string, username: string, params: Record<string, any>) {
-    return request.post(`notice/niusms/template/report/${sms_type}/${username}`,params,{ showSuccessMessage: true })
+    return request.post(`notice/niusms/template/report/${sms_type}/${username}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -228,8 +228,8 @@ export function reportTemplate(sms_type: string, username: string, params: Recor
  * @param username
  * @param params
  */
-export function getreportTemplateInfo(sms_type: string, username: string,params: Record<string, any>) {
-    return request.get(`notice/niusms/template/info/${sms_type}/${username}`,{params})
+export function getreportTemplateInfo(sms_type: string, username: string, params: Record<string, any>) {
+    return request.get(`notice/niusms/template/info/${sms_type}/${username}`, { params })
 }
 
 
@@ -248,7 +248,7 @@ export function smsOrderCreate(username: string, params: Record<string, any>) {
  * @param params
  */
 export function getOrderPayInfo(username: string, params: Record<string, any>) {
-    return request.get(`notice/niusms/order/pay/${username}`, {params})
+    return request.get(`notice/niusms/order/pay/${username}`, { params })
 }
 
 /**
@@ -257,7 +257,7 @@ export function getOrderPayInfo(username: string, params: Record<string, any>) {
  * @param params
  */
 export function getOrderInfo(username: string, params: Record<string, any>) {
-    return request.get(`notice/niusms/order/info/${username}`, {params})
+    return request.get(`notice/niusms/order/info/${username}`, { params })
 }
 
 /**
@@ -266,7 +266,7 @@ export function getOrderInfo(username: string, params: Record<string, any>) {
  * @param params
  */
 export function getOrderPayStatus(username: string, params: Record<string, any>) {
-    return request.get(`notice/niusms/order/status/${username}`, {params})
+    return request.get(`notice/niusms/order/status/${username}`, { params })
 }
 
 /**
@@ -283,7 +283,7 @@ export function calculateOrderPay(username: string, params: Record<string, any>)
  * @param params
  */
 export function enableNiusms(params: Record<string, any>) {
-    return request.put(`notice/niusms/enable`,params,{ showSuccessMessage: true })
+    return request.put(`notice/niusms/enable`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -301,8 +301,8 @@ export function templateSync(sms_type: string, username: string) {
  * @param username
  * @param params
  */
-export function resetPassword(username: string,params: Record<string, any>) {
-    return request.post(`notice/niusms/account/reset/password/${username}`,params,{ showSuccessMessage: true})
+export function resetPassword(username: string, params: Record<string, any>) {
+    return request.post(`notice/niusms/account/reset/password/${username}`, params, { showSuccessMessage: true })
 }
 
 /**
diff --git a/admin/src/app/api/printer.ts b/admin/src/app/api/printer.ts
index eccf6213c..877445d24 100644
--- a/admin/src/app/api/printer.ts
+++ b/admin/src/app/api/printer.ts
@@ -159,10 +159,10 @@ export function getPrinterBrand(params: Record<string, any>) {
  * @returns
  */
 export function refreshPrinterToken(printer_id: number) {
-    return request.put(`sys/printer/refreshtoken/${ printer_id }`,{},{
+    return request.put(`sys/printer/refreshtoken/${ printer_id }`, {}, {
         showErrorMessage: true,
         showSuccessMessage: true
-    });
+    })
 }
 
 /**
@@ -171,7 +171,7 @@ export function refreshPrinterToken(printer_id: number) {
  * @returns
  */
 export function testPrint(printer_id: number) {
-    return request.put(`sys/printer/testprint/${ printer_id }`, {},{ showErrorMessage: true, showSuccessMessage: true });
+    return request.put(`sys/printer/testprint/${ printer_id }`, {}, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts
index b81001e50..6fc24b787 100644
--- a/admin/src/app/api/sys.ts
+++ b/admin/src/app/api/sys.ts
@@ -573,21 +573,21 @@ export function setPatConfig(params: Record<string, any>) {
 /**
  * 刷新菜单
  */
-export function menuRefresh(params: Record<string, any>) {
+export function menuRefresh() {
     return request.post(`sys/menu/refresh`, {})
 }
 
 /**
  * 清理数据字段缓存
  */
-export function clearSchemaCache(params: Record<string, any>) {
+export function clearSchemaCache() {
     return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true })
 }
 
 /**
  * 清理缓存
  */
-export function clearCache(params: Record<string, any>) {
+export function clearCache() {
     return request.post(`sys/cache/clear`, {}, { showSuccessMessage: true })
 }
 
@@ -734,3 +734,11 @@ export function getInstallConfig() {
 export function getQrcode(params: Record<string, any>) {
     return request.get(`sys/qrcode`, { params, showErrorMessage: false })
 }
+
+/**
+ * 校验消息队列
+ * @returns
+ */
+export function checkJobStatus() {
+    return request.get(`sys/job`)
+}
diff --git a/admin/src/app/api/verify.ts b/admin/src/app/api/verify.ts
index e61305004..cdca76ff6 100644
--- a/admin/src/app/api/verify.ts
+++ b/admin/src/app/api/verify.ts
@@ -36,7 +36,7 @@ export function getVerifyDetailInfo(verifyCode: string) {
  * @returns
  */
 export function verify(verifyCode: string, params: Record<string, any>) {
-    return request.post(`verify/verify/${ verifyCode }`,params,{ showSuccessMessage: true})
+    return request.post(`verify/verify/${ verifyCode }`, params, { showSuccessMessage: true })
 }
 /***************************************************** 核销员 ****************************************************/
 
@@ -97,5 +97,5 @@ export function getVerifyInfo(id: number) {
  * @returns
  */
 export function editVerifier(params: Record<string, any>) {
-    return request.post(`verify/verifier/${ params.id }`, params,{ showSuccessMessage: true })
+    return request.post(`verify/verifier/${ params.id }`, params, { showSuccessMessage: true })
 }
diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue
index 9c16709b9..f062c8fab 100644
--- a/admin/src/app/components/cloud-build/index.vue
+++ b/admin/src/app/components/cloud-build/index.vue
@@ -377,7 +377,7 @@ const dialogCancel = () => {
 }
 
 const cloudBuildCheckDirFn = () => {
-    window.open('https://doc.niucloud.com/v6.html?keywords=/chang-jian-wen-ti-chu-li/er-shi-wu-3001-sheng-7ea7-yun-bian-yi-mu-lu-du-xie-quan-xian-zhuang-tai-bu-tong-guo-ru-he-chu-li')
+    window.open('https://doc.press.niucloud.com/php/v6-shop/use/chang-jian-wen-ti-chu-li/er-shi-wu-3001-sheng-7ea7-yun-bian-yi-mu-lu-du-xie-quan-xian-zhuang-tai-bu-tong-guo-ru-he-chu-li.html')
 }
 
 watch(() => showDialog.value, () => {
diff --git a/admin/src/app/components/upgrade-log/index.vue b/admin/src/app/components/upgrade-log/index.vue
index 6bacfd39a..e78d2d6b0 100644
--- a/admin/src/app/components/upgrade-log/index.vue
+++ b/admin/src/app/components/upgrade-log/index.vue
@@ -33,6 +33,7 @@
 <script lang="ts" setup>
 import { computed, ref, defineProps, nextTick } from "vue"
 import { t } from "@/lang"
+import { ElMessage } from "element-plus"
 import { getAppVersionList, getFrameworkVersionList } from "@/app/api/module"
 
 const props = defineProps({
diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue
index 1e5aa17ed..f4f9384f5 100644
--- a/admin/src/app/components/upgrade/index.vue
+++ b/admin/src/app/components/upgrade/index.vue
@@ -34,37 +34,14 @@
                     </div>
                 </template>
             </template>
-            <div v-if="step == 2">
-                <el-steps :active="numberOfSteps" align-center class="number-of-steps" process-status="process" v-if="!errorDialog && active != 'complete'">
+            <div v-show="step == 2">
+                <el-steps :active="numberOfSteps" align-center class="number-of-steps" process-status="process">
                     <el-step :title="t('testDirectoryPermissions')" />
                     <el-step :title="t('upgrade.option')" />
                     <el-step :title="t('startUpgrade')" />
                     <el-step :title="t('upgradeEnd')" />
                 </el-steps>
                 <div class="h-[400px]" style="overflow: auto">
-<!--                    <div class="time-dialog-wrap mt-[30px]" v-show="active == 'content'">-->
-<!--                        <el-timeline style="width: 100%">-->
-<!--                            <el-timeline-item v-for="(item, index) in upgradeContent.version_list" :key="index" placement="left">-->
-<!--                                <div class="relative">-->
-<!--                                    <span class="text-[#333333] text-[16px] absolute">{{ timeSplit(item.release_time)[0] }}</span>-->
-<!--                                    <br />-->
-<!--                                    <span class="text-[#999999] text-[14px] w-[78px] block mt-[10px] absolute" style="text-align: right"> {{ timeSplit(item.release_time)[1] }}</span>-->
-<!--                                </div>-->
-<!--                                <el-collapse v-model="activeName" accordion>-->
-<!--                                    <el-collapse-item :name="index">-->
-<!--                                        <template #title>-->
-<!--                                            <span class="text-[#333] text-[16px]"> v{{ item.version_no }} </span>-->
-<!--                                        </template>-->
-
-<!--                                        <div class="px-[20px] py-[20px] bg-overlay timeline-log-wrap whitespace-pre-wrap rounded-[4px]" style="background: rgba(25, 103, 249, 0.03);" v-if="item['upgrade_log']">-->
-<!--                                            <div v-html="item['upgrade_log']"></div>-->
-<!--                                        </div>-->
-<!--                                    </el-collapse-item>-->
-<!--                                </el-collapse>-->
-<!--                            </el-timeline-item>-->
-<!--                        </el-timeline>-->
-<!--                    </div>-->
-
                     <!-- 判断文件权限 -->
                     <div v-show="active == 'upgrade'">
                         <div class="flex flex-col" v-if="upgradeCheck && !upgradeTask">
@@ -132,7 +109,6 @@
                         <div class="h-[370px] mt-[30px]" v-show="showTerminal && upgradeTask && !errorDialog">
                             <terminal ref="terminalRef" :name="`upgrade-${terminalId}`"  :context="upgradeTask ? upgradeTask.upgrade.app_key : ''" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
                         </div>
-
                     </div>
                     <!-- 是否备份选择 -->
                     <div class="flex flex-col" v-show="active == 'backup'">
@@ -156,36 +132,63 @@
                             </div>
                         </el-scrollbar>
                     </div>
-                    <div class="mt-[20px] h-[370px]" v-show="errorDialog">
-                        <el-result icon="error" :title="t('升级失败')">
-                            <template #icon>
-                                <img src="@/app/assets/images/error_icon.png" alt="" />
-                            </template>
-                            <template #extra>
-                                <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
-                                    {{errorMsg}}
-                                </el-scrollbar>
-                                <el-button @click="handleBack()" class="!w-[90px]">错误信息</el-button>
-                                <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
-                            </template>
-                        </el-result>
-                    </div>
-                    <div class="mt-[20px]" v-show="active == 'complete'">
-                        <el-result icon="success" :title="t('upgrade.upgradeSuccess')">
-                            <template #icon>
-                                <img src="@/app/assets/images/success_icon.png" alt="">
-                            </template>
-                            <template #extra>
-                                <div class="text-[16px] text-[#4F516D] mt-[-5px]" v-show="upgradeTask && upgradeTask.executed && !upgradeTask.executed.includes('cloudBuild')">{{ t('upgrade.upgradeCompleteTips') }}</div>
-                                <div class="text-[16px] text-[#9699B6] mt-[10px]">本次升级用时{{ formatUpgradeDuration }}</div>
-                                <div class="mt-[20px]">
-                                    <el-button @click="handleBack()" class="!w-[90px]">返回</el-button>
-                                    <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
+
+                </div>
+            </div>
+            <div v-if="step == 3">
+                <div class="mt-[10px]" v-show="active == 'complete'">
+                    <el-result icon="success" :title="t('upgrade.upgradeSuccess')">
+                        <template #icon>
+                            <img src="@/app/assets/images/success_icon.png" alt="">
+                        </template>
+                        <template #extra>
+                            <div class="text-[16px] text-[#4F516D] mt-[-5px]" v-show="upgradeTask && upgradeTask.executed && !upgradeTask.executed.includes('cloudBuild')">{{ t('upgrade.upgradeCompleteTips') }}</div>
+                            <!-- <div class="text-[16px] text-[#9699B6] mt-[10px]">本次升级用时{{ formatUpgradeDuration }}</div> -->
+                            <div class="w-[750px]" v-if="upgradeTask.cloud_build_error">
+                                <el-alert class="!w-[750px] border-warning !border-[1px] !rounded-[0px] border-solid" type="warning" :closable="false">
+                                    <template #title>
+                                        <span class="text-error">警告：</span>
+                                        <span class="text-black">升级过程中发生云编译错误</span>
+                                    </template>
+                                </el-alert>
+                                <div class="text-left mt-[10px] leading-8">
+                                    <div class="font-bold">为了保证系统稳定，建议您做以下处理:</div>
+                                    <div><span class="w-[6px] h-[6px] rounded-[6px] bg-black inline-block mr-[10px]"></span>如果您是开发者，安装的框架或者插件二开过或者正在开发中，可能是因为您的本地代码不完整导致的云编译失败，需要自己调试并重新进行编译才算升级完成(云编译会把本地插件前端代码上传编译)。</div>
+                                    <div><span class="w-[6px] h-[6px] rounded-[6px] bg-black inline-block mr-[10px]"></span>如果您没有二开过任何代码，可能是本地插件存在兼容性问题，请联系插件开发者或者官方客服解决。</div>
+                                    <div><span class="w-[6px] h-[6px] rounded-[6px] bg-black inline-block mr-[10px]"></span>如果您的项目已经投入正式运营中，请立即回滚。</div>
                                 </div>
-                            </template>
-                        </el-result>
-                        <!-- <el-alert :title="t('upgrade.upgradeCompleteTips')" type="error" :closable="false" v-show="upgradeTask && upgradeTask.executed && !upgradeTask.executed.includes('cloudBuild')"/> -->
-                    </div>
+                                <div class="text-left mt-[10px]">
+                                    <div class="font-bold">编译信息错误</div>
+                                    <div class="mt-[10px] text-secondary overflow-hidden line-clamp-4">
+                                        {{  upgradeTask.cloud_build_error }}
+                                    </div>
+                                </div>
+                                <div class="mt-[20px]">
+                                    <el-button @click="handleBack()" class="!w-[90px]">更多信息</el-button>
+                                    <el-button @click="showDialog=false" type="primary" plain class="!w-[90px]">我已知晓</el-button>
+                                    <el-button @click="cloudBuildError('cloud_build_error_rollback')" type="primary" class="!w-[90px]">回滚</el-button>
+                                </div>
+                            </div>
+                            <div class="mt-[20px]" v-else>
+                                <el-button @click="handleBack()" class="!w-[90px]">返回</el-button>
+                                <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
+                            </div>
+                        </template>
+                    </el-result>
+                </div>
+                <div class="mt-[20px] h-[370px]" v-show="active == 'fail'">
+                    <el-result icon="error" :title="t('升级失败')">
+                        <template #icon>
+                            <img src="@/app/assets/images/error_icon.png" alt="" />
+                        </template>
+                        <template #extra>
+                            <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+                                {{errorMsg}}
+                            </el-scrollbar>
+                            <el-button @click="handleBack()" class="!w-[90px]">错误信息</el-button>
+                            <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
+                        </template>
+                    </el-result>
                 </div>
             </div>
         </template>
@@ -226,6 +229,18 @@
             </div>
         </template>
     </el-dialog>
+    <el-dialog v-model="dialogUpgradePrompt" title="升级提示" width="500" :before-close="handleClose">
+        <p>您当前使用的{{applicationType == 'app' ? '应用' : '插件'}}版本是 {{applicationVersion}}，若想升级到 {{newApplicationVersion}} 版本，需要先把框架从 v{{frameworkVersion}} 升级到 v{{ newFrameworkVersion }} 。</p>
+        <div class="flex items-center">
+            <span>如需升级框架，请点击升级框架操作。</span>
+        </div>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button type="primary" @click="upgradePromptConfirm">升级框架</el-button>
+                <el-button @click="dialogUpgradePrompt = false">取消</el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -354,8 +369,6 @@ const getUpgradeTaskFn = () => {
                     errorMsg.value = item
                 }
             })
-            errorDialog.value = true
-            showTerminal.value = false
             if (upgradeTimer) {
                 clearInterval(upgradeTimer)
                 upgradeTimer = null
@@ -365,12 +378,17 @@ const getUpgradeTaskFn = () => {
         // 恢复完毕
         if (data.step == 'restoreComplete') {
             flashInterval && clearInterval(flashInterval)
+            step.value = 3
+            active.value = 'fail'
             return
         }
         // 升级完成
         if (data.step == 'upgradeComplete') {
+            if (data.cloud_build_error) {
+                terminalRef.value.pushMessage({ content: data.cloud_build_error, class: 'error' })
+            }
+            step.value = 3
             active.value = 'complete'
-            showTerminal.value = false
             numberOfSteps.value = 4
             notificationEl && notificationEl.close()
             emits('complete')
@@ -379,22 +397,29 @@ const getUpgradeTaskFn = () => {
                 upgradeTimer = null
             }
             timeloading.value = false
-            clearUpgradeTask()
             return
         }
         numberOfSteps.value = 2
         active.value = 'upgrade'
         executeUpgradeFn()
+    }).catch((err) => {
+        console.log(err)
     })
 }
-
 getUpgradeTaskFn()
+
+const upgradePromptConfirm = ()=>{
+    dialogUpgradePrompt.value = false
+    open('niucloud-admin')
+}
+
 const isBack = ref(false)
 const handleBack = () => {
     active.value = 'upgrade'
     isBack.value = true
     showTerminal.value = true
     errorDialog.value = false // 隐藏错误弹窗
+    step.value = 2
 }
 
 const formatUpgradeDuration = computed(() => {
@@ -505,8 +530,11 @@ const upgradeAddonFn = () => {
         loading.value = false
     })
 }
-
-const open = (addonKey: string = '', callback = null) => {
+const dialogUpgradePrompt = ref(false)
+const applicationVersion = ref('')
+const newApplicationVersion = ref('')
+const applicationType = ref('app')
+const open = (addonKey: string = '', callback = null, otherData: any = {}) => {
     errorDialog.value = false // 隐藏错误弹窗
     if (upgradeTask.value) {
         ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
@@ -517,7 +545,10 @@ const open = (addonKey: string = '', callback = null) => {
         if (callback) callback()
     } else {
         if (addonKey && addonKey.indexOf('niucloud-admin') == -1 && frameworkVersion.value != newFrameworkVersion.value) {
-            ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
+            applicationVersion.value = otherData.install_info.version
+            newApplicationVersion.value = otherData.version
+            applicationType.value = otherData.type
+            dialogUpgradePrompt.value = true
             if (callback) callback()
             return
         }
@@ -646,6 +677,12 @@ const cloudBuildError = (event: string) => {
                 getUpgradeTaskFn()
             })
             break
+        case 'cloud_build_error_rollback':
+            upgradeUserOperate(event).then(() => {
+                handleBack()
+                executeUpgradeFn()
+            })
+            break
     }
 }
 
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.config.json b/admin/src/app/lang/zh-cn/channel.wechat.config.json
index 73e8a1b72..fed35519a 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.config.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.config.json
@@ -32,5 +32,5 @@
     "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高",
     "wechatBaseUri": "借权域名",
     "wechatBaseUriPlaceholder": "",
-    "wechatBaseUriTips": "默认留空，填写后将替换https://open.weixin.gg.com/获取授权!"
+    "wechatBaseUriTips": "默认留空，填写后将替换https://open.weixin.qq.com/获取授权!"
 }
diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json
index 02fe72870..fac445428 100644
--- a/admin/src/app/lang/zh-cn/diy.edit.json
+++ b/admin/src/app/lang/zh-cn/diy.edit.json
@@ -243,7 +243,7 @@
   "carouselSearchSwiperSet": "轮播图设置",
   "carouselSearchSwiperControl": "展示开关",
   "carouselSearchSwiperInterval": "切换间隔 / 秒",
-  "carouselSearchSwiperTips": "建议上传尺寸相同的图片，推荐尺寸750*350；鼠标拖拽可调整图片顺序",
+  "carouselSearchSwiperTips": "建议上传尺寸相同的图片，推荐尺寸750*580；鼠标拖拽可调整图片顺序",
   "carouselSearchTabStyle": "选项卡样式",
   "carouselSearchStyle": "搜索框样式",
   "noColor": "常规颜色",
diff --git a/admin/src/app/lang/zh-cn/diy_form.edit.json b/admin/src/app/lang/zh-cn/diy_form.edit.json
index d731cc525..952fe36bc 100644
--- a/admin/src/app/lang/zh-cn/diy_form.edit.json
+++ b/admin/src/app/lang/zh-cn/diy_form.edit.json
@@ -244,7 +244,7 @@
   "carouselSearchSwiperSet": "轮播图设置",
   "carouselSearchSwiperControl": "展示开关",
   "carouselSearchSwiperInterval": "切换间隔 / 秒",
-  "carouselSearchSwiperTips": "建议上传尺寸相同的图片，推荐尺寸750*350；鼠标拖拽可调整图片顺序",
+  "carouselSearchSwiperTips": "建议上传尺寸相同的图片，推荐尺寸750*580；鼠标拖拽可调整图片顺序",
   "carouselSearchTabStyle": "选项卡样式",
   "carouselSearchStyle": "搜索框样式",
   "noColor": "常规颜色",
diff --git a/admin/src/app/lang/zh-cn/setting.adminlogin.json b/admin/src/app/lang/zh-cn/setting.adminlogin.json
index 35f71ff52..4c5eee955 100644
--- a/admin/src/app/lang/zh-cn/setting.adminlogin.json
+++ b/admin/src/app/lang/zh-cn/setting.adminlogin.json
@@ -1,7 +1,6 @@
 {
-      "isCaptcha": "是否启用验证码",
-      "bgImg": "登录页广告图",
-      "admin": "平台端",
-      "adminBgImgTip": "建议上传尺寸为450*400px",
-      "siteBgImgTip": "建议上传尺寸为620*980px"
+  "isCaptcha": "是否启用验证码",
+  "bgImg": "登录页广告图",
+  "admin": "平台端",
+  "adminBgImgTip": "建议上传尺寸为450*400px"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json
index 1eec51781..77f29d7ce 100644
--- a/admin/src/app/lang/zh-cn/setting.login.json
+++ b/admin/src/app/lang/zh-cn/setting.login.json
@@ -17,7 +17,7 @@
   "mobileOrUsernameNoEmpty": "普通注册方式至少需启用一种",
   "loginPageSet": "界面设置",
   "bgUrl": "背景图",
-  "bgUrlPlaceholder": "建议图片尺寸：750*669像素；图片格式：jpg、png、jpeg",
+  "bgUrlPlaceholder": "前台快捷登录/注册页的背景图，建议图片尺寸：750*669像素；图片格式：jpg、png、jpeg",
   "desc": "描述",
   "descPlaceholder": "请输入描述"
 }
diff --git a/admin/src/app/lang/zh-cn/setting.system.json b/admin/src/app/lang/zh-cn/setting.system.json
index af44cb0a2..5c0f975bf 100644
--- a/admin/src/app/lang/zh-cn/setting.system.json
+++ b/admin/src/app/lang/zh-cn/setting.system.json
@@ -30,13 +30,9 @@
   "customerServiceCode": "客服二维码",
   "contactsTel": "联系电话",
   "contactsTelPlaceholder": "请输入联系电话",
-  "logoPlaceholder": "建议图片尺寸：210*30像素；图片格式：jpg、png、jpeg。",
-  "iconPlaceholder": "建议图片尺寸：100*100像素；图片格式：jpg、png、jpeg。",
-  "siteLoginLogo": "站点登录Logo",
-  "siteLoginLogoTips": "站点端登录Logo，建议图片尺寸：132*40像素；图片格式：jpg、png、jpeg。",
-  "siteLoginBgImg": "站点登录背景图",
-  "siteLoginBgImgTips": "站点端登录背景图，建议图片尺寸：1920*1280像素；图片格式：jpg、png、jpeg。",
-   "metaTitle": "Meta 标题",
+  "logoPlaceholder": "管理系统左上角的长方形Logo，建议图片尺寸：210*30像素；图片格式：jpg、png、jpeg。",
+  "iconPlaceholder": "管理系统左上角的正方形Logo，建议图片尺寸：100*100像素；图片格式：jpg、png、jpeg。",
+  "metaTitle": "Meta 标题",
   "MetaPlaceholder": "请输入Meta 标题",
   "metaDescription": "Meta 描述",
   "metaDescriptionPlaceholder": "请输入Meta描述",
diff --git a/admin/src/app/lang/zh-cn/tools.backup_records.json b/admin/src/app/lang/zh-cn/tools.backup_records.json
index c17032eb0..72ad42d86 100644
--- a/admin/src/app/lang/zh-cn/tools.backup_records.json
+++ b/admin/src/app/lang/zh-cn/tools.backup_records.json
@@ -24,5 +24,6 @@
   "startBackUp": "开始备份",
   "backUpEnd": "备份完成",
   "remark": "备注",
-  "remarkEmpty": "无"
+  "remarkEmpty": "无",
+  "status": "状态"
 }
diff --git a/admin/src/app/views/app/index.vue b/admin/src/app/views/app/index.vue
index d3f56ce4e..bad018ce4 100644
--- a/admin/src/app/views/app/index.vue
+++ b/admin/src/app/views/app/index.vue
@@ -66,7 +66,7 @@ getAppList()
 
 const toLink = (item: any) => {
     if (item.url) {
-            // 判断如果携带is_target=true就通过新窗口打开
+        // 判断如果携带is_target=true就通过新窗口打开
         if (item.url.indexOf('is_target=true') != -1) {
             const url = router.resolve(item.url)
             window.open(url.href)
diff --git a/admin/src/app/views/app/marketing.vue b/admin/src/app/views/app/marketing.vue
index 2a38e7b93..61ba5a7ce 100644
--- a/admin/src/app/views/app/marketing.vue
+++ b/admin/src/app/views/app/marketing.vue
@@ -1,46 +1,46 @@
 <template>
-  <!--营销管理-->
-  <div class="main-container" v-loading="loading">
-    <el-card class="box-card !border-none" shadow="never">
+    <!--营销管理-->
+    <div class="main-container" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never">
 
-      <template v-if="Object.keys(marketingList).length">
+            <template v-if="Object.keys(marketingList).length">
 
-        <template v-for="(item, index) in marketingList" :key="index + 'b'">
-          <div class="flex justify-between items-center">
-            <span class="text-page-title">{{ item.title }}</span>
-          </div>
-
-          <div class="flex flex-wrap plug-list pb-10 plug-large">
-            <div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)">
-              <div class="w-[264px] flex py-[20px] px-[17px] app-item relative">
-                <el-image class="w-[40px] h-[40px] mr-[10px] rounded-[6px] overflow-hidden" :src="img(childItem.icon)" fit="contain">
-                  <template #error>
-                    <div class="image-slot">
-                      <img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" />
+                <template v-for="(item, index) in marketingList" :key="index + 'b'">
+                    <div class="flex justify-between items-center" v-if="item.list.length > 0">
+                        <span class="text-page-title">{{ item.title }}</span>
                     </div>
-                  </template>
-                </el-image>
-                <div class="flex flex-col justify-between w-[180px]">
-                  <div class="text-[14px] flex items-center">
-                    <span class="app-text max-w-[170px]">{{ childItem.title }}</span>
-                    <!--                                        <span class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"></span>-->
-                  </div>
-                  <!-- <el-icon color="#666">
-                      <QuestionFilled />
-                  </el-icon> -->
-                  <p class="app-text text-[12px] text-[#999]">{{childItem.desc}}</p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </template>
-      </template>
 
-      <div class="empty flex items-center justify-center" v-if="!loading && !Object.keys(marketingList).length">
-        <el-empty :description="t('emptyAppData')" />
-      </div>
-    </el-card>
-  </div>
+                    <div class="flex flex-wrap plug-list pb-10 plug-large">
+                        <div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)">
+                            <div class="w-[264px] flex py-[20px] px-[17px] app-item relative">
+                                <el-image class="w-[40px] h-[40px] mr-[10px] rounded-[6px] overflow-hidden" :src="img(childItem.icon)" fit="contain">
+                                    <template #error>
+                                        <div class="image-slot">
+                                            <img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" />
+                                        </div>
+                                    </template> 
+                                </el-image>
+                                <div class="flex flex-col justify-between w-[180px]">
+                                    <div class="text-[14px] flex items-center">
+                                        <span class="app-text max-w-[170px]">{{ childItem.title }}</span>
+<!--                                        <span class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"></span>-->
+                                    </div>
+                                        <!-- <el-icon color="#666">
+                                            <QuestionFilled />
+                                        </el-icon> -->
+                                    <p class="app-text text-[12px] text-[#999]">{{childItem.desc}}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </template>
+
+            <div class="empty flex items-center justify-center" v-if="!loading && !Object.keys(marketingList).length">
+                <el-empty :description="t('emptyAppData')" />
+            </div>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -56,36 +56,36 @@ const marketingList = ref<Record<string, any>[]>([])
 
 const loading = ref(true)
 const getMarketingList = async () => {
-  loading.value = false
+    loading.value = false
 }
-getMarketingList()
+// getMarketingList()
 
 const toLink = (item: any) => {
-  if (item.url) {
-    // 判断如果携带is_target=true就通过新窗口打开
-    if (item.url.indexOf('is_target=true') != -1) {
-      const url = router.resolve(item.url)
-      window.open(url.href)
+    if (item.url) {
+        // 判断如果携带is_target=true就通过新窗口打开
+        if (item.url.indexOf('is_target=true') != -1) {
+            const url = router.resolve(item.url)
+            window.open(url.href)
+        } else {
+            router.push(item.url)
+        }
     } else {
-      router.push(item.url)
+        addonIndexRoute[item.key] && router.push({ name: addonIndexRoute[item.key] })
     }
-  } else {
-    addonIndexRoute[item.key] && router.push({ name: addonIndexRoute[item.key] })
-  }
 }
 </script>
 
 <style lang="scss" scoped>
-.app-text {
-  overflow: hidden;
-  /* 超出部分隐藏 */
-  white-space: nowrap;
-  /* 禁止文本换行 */
-  text-overflow: ellipsis;
-  /* 显示省略号 */
-}
-.app-item:hover{
-  transition: 0.5s;
-  box-shadow: 0 2px 8px 0 rgba(0,0,0,0.1);
-}
+    .app-text {
+        overflow: hidden;
+        /* 超出部分隐藏 */
+        white-space: nowrap;
+        /* 禁止文本换行 */
+        text-overflow: ellipsis;
+        /* 显示省略号 */
+    }
+    .app-item:hover{
+        transition: 0.5s;
+        box-shadow: 0 2px 8px 0 rgba(0,0,0,0.1);
+    }
 </style>
diff --git a/admin/src/app/views/auth/components/edit-menu.vue b/admin/src/app/views/auth/components/edit-menu.vue
index 6a39834f0..0806ca08b 100644
--- a/admin/src/app/views/auth/components/edit-menu.vue
+++ b/admin/src/app/views/auth/components/edit-menu.vue
@@ -24,10 +24,10 @@
 
             <el-form-item :label="t('parentMenu')" prop="parent_key">
                 <el-tree-select class="input-width" v-if="formData.addon != ''" v-model="formData.parent_key"
-                    :props="{ label: 'menu_name', value: 'menu_key' }" :data="addonMenuList" check-strictly
+                    :props="{ label: 'menu_name', value: 'menu_key' }" :data="addonMenuListWithDisabled" check-strictly
                     :render-after-expand="false" />
                 <el-tree-select class="input-width" v-else v-model="formData.parent_key"
-                    :props="{ label: 'menu_name', value: 'menu_key' }" :data="sysMenuList" check-strictly
+                    :props="{ label: 'menu_name', value: 'menu_key' }" :data="sysMenuListWithDisabled" check-strictly
                     :render-after-expand="false" />
             </el-form-item>
 
@@ -183,6 +183,38 @@ const getAddonMenuFn = async (key: any) => {
     addonMenuList.value = data
 }
 
+const markMenuDisabled = (menuList: any[], menuType: number): any[] => {
+    return menuList.map(item => {
+        const newItem = { ...item }
+        // 判断当前节点是否可选
+        if (item.menu_key === '') {
+            // “顶级”节点（仅存在于 sysMenuList）
+            newItem.disabled = menuType === 2 // 按钮不能选顶级
+        } else {
+            if (menuType === 2) {
+                // 当前要创建的是按钮 → 只允许选择 menu_type === 1（菜单）
+                newItem.disabled = item.menu_type !== 1
+            } else {
+                // 当前要创建的是目录/菜单 → 只允许选择 menu_type === 0（目录）
+                newItem.disabled = item.menu_type !== 0
+            }
+        }
+        // 递归处理 children
+        if (Array.isArray(item.children) && item.children.length > 0) {
+            newItem.children = markMenuDisabled(item.children, menuType)
+        }
+        return newItem
+    })
+}
+
+const sysMenuListWithDisabled = computed(() => {
+    return markMenuDisabled(sysMenuList.value, formData.menu_type)
+})
+
+const addonMenuListWithDisabled = computed(() => {
+    return markMenuDisabled(addonMenuList.value, formData.menu_type)
+})
+
 // 选择应用
 const addonChange = async (val: any) => {
     formData.parent_key = ''
diff --git a/admin/src/app/views/auth/components/edit-role.vue b/admin/src/app/views/auth/components/edit-role.vue
index 16093e80e..9245d59ab 100644
--- a/admin/src/app/views/auth/components/edit-role.vue
+++ b/admin/src/app/views/auth/components/edit-role.vue
@@ -54,8 +54,34 @@ let popTitle: string = ''
 // 获取权限数据
 const menus = ref<Record<string, any>[]>([])
 getAuthMenus({ is_button: 0 }).then((res) => {
-    menus.value = res.data
+    menus.value = mergeMenuKeyAndAuth(res.data)
 })
+
+const mergeMenuKeyAndAuth = (arr: any) => {
+  // 递归终止条件：非数组直接返回原值
+  if (!Array.isArray(arr)) {
+    return arr;
+  }
+
+  // 遍历数组每个元素，返回新数组
+  return arr.map(item => {
+    // 深拷贝当前对象，避免修改原数据
+    const newItem = { ...item };
+
+    // 1. 如果当前节点有 menu_key 和 auth，执行合并
+    if (newItem.menu_key && Array.isArray(newItem.auth)) {
+      // 注意：menu_key 是字符串，需转为数组后合并（concat 支持非数组参数，会自动包装）
+      newItem.menu_key = newItem.auth.concat(newItem.menu_key);
+    }
+
+    // 2. 递归处理下一层 children（如果有）
+    if (Array.isArray(newItem.children)) {
+      newItem.children = mergeMenuKeyAndAuth(newItem.children);
+    }
+
+    return newItem;
+  });
+}
 // 全选
 const selectAll = ref(false)
 const checkStrictly = ref(false)
@@ -71,7 +97,7 @@ watch(selectAll, () => {
 })
 
 const handleCheckChange = debounce((e) => {
-    formData.rules = treeRef.value.getCheckedKeys()
+    formData.rules = treeRef.value.getCheckedKeys().flat(1)
 })
 
 const menuAction = () => {
@@ -145,7 +171,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
             loading.value = true
 
             const data = Object.assign({}, formData)
-            data.rules = data.rules.concat(treeRef.value.getHalfCheckedKeys())
+            data.rules = data.rules.concat(treeRef.value.getHalfCheckedKeys().flat(1))
 
             save(data).then(res => {
                 loading.value = false
@@ -190,7 +216,7 @@ const setFormData = async (row: any = null) => {
 function checked (menuKey:string, data:any, newArr:any) {
     Object.keys(data).forEach((key:string) => {
         const item = data[key]
-        if (item.menu_key == menuKey) {
+        if (!Array.isArray(item.menu_key) && item.menu_key == menuKey || Array.isArray(item.menu_key) && item.menu_key.indexOf(menuKey) != -1) {
             if (!item.children || item.children.length == 0) {
                 newArr.push(item.menu_key)
             }
diff --git a/admin/src/app/views/auth/menu.vue b/admin/src/app/views/auth/menu.vue
index 810e7adb0..5fa5bfda3 100644
--- a/admin/src/app/views/auth/menu.vue
+++ b/admin/src/app/views/auth/menu.vue
@@ -9,7 +9,7 @@
                     <el-button type="primary" class="w-[100px]" @click="addEvent">
                         {{ t('addMenu') }}
                     </el-button>
-                    <el-button class="w-[100px]" @click="refreshMenu">
+                    <el-button class="w-[100px]" :loading="refreshLoading" @click="refreshMenu">
                         {{ t('initializeMenu') }}
                     </el-button>
                 </div>
@@ -129,6 +129,7 @@ const getMenuList = () => {
 }
 getMenuList()
 // 重置菜单
+const refreshLoading = ref(false)
 const refreshMenu = () => {
     ElMessageBox.confirm(h('div', null, [
         h('p', null, t('initializeMenuTipsOne')),
@@ -140,10 +141,13 @@ const refreshMenu = () => {
             // type: 'warning'
         }
     ).then(() => {
+        refreshLoading.value = true
         menuRefresh({}).then(res => {
-            location.reload()
-        }).catch(() => {})
-    }).catch(()=>{})
+            refreshLoading.value = false
+        }).catch(() => {
+            refreshLoading.value = false
+        })
+    }).catch(() => {})
 
 }
 /**
diff --git a/admin/src/app/views/channel/weapp/config.vue b/admin/src/app/views/channel/weapp/config.vue
index 1f2834fb0..5602cecf6 100644
--- a/admin/src/app/views/channel/weapp/config.vue
+++ b/admin/src/app/views/channel/weapp/config.vue
@@ -196,10 +196,6 @@ getWeappConfig().then(res => {
     loading.value = false
 })
 
-getWeappConfig().then(res => {
-    Object.assign(res.data)
-})
-
 /**
  * 复制
  */
diff --git a/admin/src/app/views/diy/member.vue b/admin/src/app/views/diy/member.vue
index 1bff91954..789921d16 100644
--- a/admin/src/app/views/diy/member.vue
+++ b/admin/src/app/views/diy/member.vue
@@ -30,8 +30,8 @@
 
                 <div class="w-[700px]">
                     <div class="flex flex-wrap">
-                        <!-- 多应用切换启动页 -->
-                        <el-button type="primary" @click="showDialog = true" v-if="siteApps.length > 1">{{ t('changePage') }}</el-button>
+                        <!-- 多应用切换启动页  v-if="siteApps.length > 1" -->
+                        <el-button type="primary" @click="showDialog = true">{{ t('changePage') }}</el-button>
                         <el-button type="primary" @click="toDecorate()" v-show="page.use_template.action == 'decorate'" class="ml-[12px]">{{ t('decorate') }}</el-button>
                     </div>
 
@@ -59,7 +59,7 @@
                 </div>
             </div>
 
-            <el-dialog v-model="showDialog" :title="t('pageSelectTips')" width="400px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+            <el-dialog v-model="showDialog" :title="t('pageSelectTips')" width="400px" :close-on-press-escape="true" :destroy-on-close="true" :close-on-click-modal="false">
                 <div class="flex items-start">
                     <el-scrollbar class="pl-4 h-[300px] flex-1">
                         <div class="flex flex-wrap">
diff --git a/admin/src/app/views/diy_form/records.vue b/admin/src/app/views/diy_form/records.vue
index 59fc02a97..33ef5b716 100644
--- a/admin/src/app/views/diy_form/records.vue
+++ b/admin/src/app/views/diy_form/records.vue
@@ -115,7 +115,7 @@
                 <div class="mt-[16px] flex justify-end">
                     <el-pagination v-model:current-page="formMemberList.page" v-model:page-size="formMemberList.limit"
                                    layout="total, sizes, prev, pager, next, jumper" :total="formMemberList.total"
-                                   @size-change="getFormRecordsMemberFn()" @current-change="getFormRecordsMemberFn()" />
+                                   @size-change="getFormRecordsMemberFn()" @current-change="getFormRecordsMemberFn" />
                 </div>
 
             </el-tab-pane>
diff --git a/admin/src/app/views/finance/account.vue b/admin/src/app/views/finance/account.vue
index 95d15a70f..7a30abd57 100644
--- a/admin/src/app/views/finance/account.vue
+++ b/admin/src/app/views/finance/account.vue
@@ -194,7 +194,7 @@ const searchFormRef = ref<FormInstance>()
 
 // 去空操作
 watch(() => siteAccountLogTable.searchParam.trade_no, (nval) => {
-    siteAccountLogTable.searchParam.trade_no = nval.trim();
+    siteAccountLogTable.searchParam.trade_no = nval.trim()
 })
 
 /**
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index 9e01807cb..d4daa5155 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -1,588 +1,953 @@
 <template>
-    <!--应用市场-->
-    <div class="main-container bg-body min-h-[70vh]" v-loading="loading">
-        <el-card class="box-card !border-none" shadow="never" v-if="!loading">
-            <div class="flex items-center mb-4">
-                <div class="flex items-center flex-1">
-                    <h2 class="text-lg font-semibold mr-[20px]">应用列表</h2>
-                    <button class="text-gray-500 text-sm mr-[20px]" @click="activeNameTabFn('installed')" :class="{'!text-primary': activeName == 'installed'}">已安装</button>
-                    <button class="text-gray-500 text-sm mr-[20px]" @click="activeNameTabFn('uninstalled')" :class="{'!text-primary': activeName == 'uninstalled'}">未安装</button>
-                    <button class="text-gray-500 text-sm mr-[20px]" @click="activeNameTabFn('all')" :class="{'!text-primary': activeName == 'all'}">已购买</button>
-                    <button class="text-gray-500 text-sm relative" @click="activeNameTabFn('recentlyUpdated')" :class="{'!text-primary': activeName == 'recentlyUpdated'}">
-                        可更新
-                        <div v-if="localList.recentlyUpdated.length" class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]"></div>
-                    </button>
-                </div>
-                <i class="iconfont cursor-pointer" @click="switchShowType" :class="showType == 'card' ? 'iconliebiao' : 'iconliebiaoqiehuan'"></i>
-            </div>
+	<!--应用市场-->
+	<div class="main-container app-market bg-body min-h-[70vh]" v-loading="loading">
+		<el-card class="box-card app-head !border-none !pb-[0]" shadow="never">
+			<div class="flex flex-col mb-[8px]">
+				<div class="flex items-center justify-between mb-[5px]">
+					<h2 class="text-lg font-semibold">应用列表</h2>
+					<i class="iconfont cursor-pointer" @click="switchShowType" :class="showType == 'card' ? 'iconliebiao' : 'iconliebiaoqiehuan'"></i>
+				</div>
+				<el-tabs v-model="activeName" @tab-change="activeNameTabFn">
+					<el-tab-pane name="installed">
+						<template #label>
+							<span>已安装</span>
+						</template>
+					</el-tab-pane>
+					<el-tab-pane name="uninstalled">
+						<template #label>
+							<span>未安装</span>
+						</template>
+					</el-tab-pane>
+					<el-tab-pane name="all">
+						<template #label>
+							<span>已购买</span>
+						</template>
+					</el-tab-pane>
+					<el-tab-pane name="recentlyUpdated">
+						<template #label>
+							<span class="relative">
+								可更新
+								<div
+									v-if="localList.recentlyUpdated.length"
+									class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]"
+								></div>
+							</span>
+						</template>
+					</el-tab-pane>
+				</el-tabs>
+			</div>
+			
+			<el-form :inline="true" :model="searchParam" ref="searchFormRef" class="search-form" v-if="!loading && !isShowDetail && (activeName == 'installed' || activeName == 'all' || activeName == 'uninstalled')">
+				<el-form-item prop="type">
+					<el-select v-model="searchParam.type" clearable :placeholder="t('应用类型')" class="input-width">
+						<el-option :label="t('应用')" value="app" />
+						<el-option :label="t('插件')" value="addon" />
+					</el-select>
+				</el-form-item>
 
-            <!-- 系统版本栏 -->
-            <div class="flex items-center justify-between bg-body p-4 rounded-md border rounded border-solid border-[var(--el-color-info-light-8)]">
-                <div class="flex">
-                    <div class="flex items-center">
-                        <div class="w-[40px] h-[40px] bg-purple-100 rounded flex items-center justify-center mr-2 relative">
-                            <img class="max-w-full max-h-full" src="@/app/assets/images/app_store/system_version.png" alt="" />
-                            <div v-if="frameworkVersion != frameworkNewVersion" class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]"></div>
-                        </div>
-                        <div>
-                            <p class="text-sm font-bold">系统版本:
-                                <span v-if="frameworkVersion">V{{frameworkVersion}} ({{frameworkVersionCode}})</span>
-                            </p>
-                            <p class="text-xs text-gray-500">最新版本: V{{ frameworkNewVersion }}</p>
-                        </div>
-                        <el-button class="ml-[25px]" @click="updateInformationFn({key: 'niucloud-admin'})"><el-icon class="mr-[5px]"><DocumentCopy /></el-icon>更新记录</el-button>
-                    </div>
-                    <div class="border-r mx-[25px] border-solid border-[var(--el-color-info-light-8)] hidden xl:inline-block"></div>
-                    <div class="items-center hidden xl:flex">
-                        <div class="flex items-center mr-4">
-                            <div class="w-[40px] h-[40px] bg-green-100 rounded flex items-center justify-center mr-2">
-                                <img class="max-w-full max-h-full" src="@/app/assets/images/app_store/app_manage.png" alt="" />
-                            </div>
-                            <div>
-                                <p class="text-sm font-bold">应用管理</p>
-                                <p class="text-xs text-gray-500">
-                                    <span class="mr-[15px] text-success">已安装: {{ localList.installed.length }}</span>
-                                    <span class="mr-[15px] text-warning">可更新: {{ localList.recentlyUpdated.length }}</span>
-                                    <span class="mr-[15px] text-primary">未安装: {{ localList.uninstalled.length }}</span>
-                                    <span class="mr-[15px] text-error">已购买: {{ localList.all.length }}</span>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="flex items-center flex-1 w-0 justify-end">
-                    <el-button @click="oneClickRepair"><i class="iconfont iconyijianxiufu mr-[5px]" ></i>一键修复</el-button>
-                    <el-button type="primary" v-show="activeName == 'uninstalled'" @click="batchInstall"><i class="iconfont iconanzhuang1 mr-[5px]"></i>安装<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span></el-button>
-                    <el-button type="primary" v-show="activeName == 'recentlyUpdated' || (frameworkVersion != frameworkNewVersion && activeName != 'uninstalled')" @click="batchUpgrade">
-                        <i class="iconfont iconyijianshengji mr-[5px]"></i>一键升级<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span>
-                    </el-button>
-                    <el-checkbox label="全选" :model-value="localList[activeName].length && localList[activeName].length == batchUpgradeApp.length" @change="appKeyAllSelect" v-show="activeName == 'uninstalled' || activeName == 'recentlyUpdated'" value="Value A" class="ml-[12px]"/>
-                </div>
-            </div>
-        </el-card>
+				<el-form-item prop="keywords">
+					<el-input v-model.trim="searchParam.keywords" class="!w-[200px]" :placeholder="t('搜索关键词')" clearable />
+				</el-form-item>
 
-        <div class="flex mb-4 flex-wrap" v-show="showType == 'card'" v-if="localList[activeName].length && !loading">
-            <div class="rounded-md border p-[16px] pr-[20px] app-card mb-[20px] ml-[20px] cursor-pointer"
-                 @click="appKeySingleSelect($event, row.key)"
-                 :class="{'border-primary': batchUpgradeApp.includes(row.key)}" v-for="row in localList[activeName]" :key="row.key">
+				<el-form-item>
+					<el-button type="primary" @click="searchFn()">{{ t('search') }}</el-button>
+					<el-button @click="resetForm(searchFormRef)">{{ t('重置') }}</el-button>
+				</el-form-item>
+			</el-form>
 
-                <div class="flex justify-between mb-2">
-                    <div class="flex items-center flex-1 w-0">
-                        <div class="w-[48px] h-[48px] bg-purple-100 rounded flex items-center justify-center mr-2 relative">
-                            <div class="w-full h-full overflow-hidden rounded">
-                                <el-image class="w-full h-full overflow-hidden rounded" :src="row.icon" fit="contain">
-                                    <template #error>
-                                        <div class="flex items-center w-full h-full">
-                                            <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
-                                        </div>
-                                    </template>
-                                </el-image>
-                                <img src="@/app/assets/images/app_store/app_type_addon.png" alt="" class="absolute z-1 right-0 bottom-0" v-if="row.type == 'addon'">
-                                <img src="@/app/assets/images/app_store/app_type_app.png" alt="" class="absolute z-1 right-0 bottom-0" v-else>
-                            </div>
-                            <div class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]" v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version"></div>
-                        </div>
-                        <div class="flex-1 w-0">
-                            <p class="text-sm font-medium truncate" :title="row.title">{{ row.title }}</p>
-                            <p class="text-xs text-gray-500 truncate"  :title="row.key">{{ row.key }}</p>
-                        </div>
-                    </div>
-                    <el-checkbox @click.stop :model-value="batchUpgradeApp.includes(row.key)" :value="row.key" @change="appKeySingleSelect($event, row.key)" class="!w-[14px] !h-[14px]" v-if="activeName == 'recentlyUpdated' || activeName == 'uninstalled'"></el-checkbox>
-                </div>
-                <div class="flex justify-between">
-                    <div class="text-base">
-                        <span>版本: </span>
-                        <span>{{ row.install_info && Object.keys(row.install_info)?.length ? row.install_info.version : row.version }}</span>
-                        <template v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version">
-                            <i class="iconfont iconyoujiantou text-warning mx-[2px]"></i>
-                            <span class="text-warning">{{ row.version }}</span>
-                        </template>
-                    </div>
-                    <el-button type="primary" link @click.stop="updateInformationFn(row)">更新记录</el-button>
-                </div>
+			<div v-if="!loading && !isShowDetail && activeName == 'recentlyUpdated'">
+				<div class="flex items-center bg-[#F4F5F7] h-[80px] justify-between px-[20px]">
+					<div class="flex items-center">
+						<div class="w-[42px] h-[42px] bg-purple-100 rounded flex items-center justify-center mr-2 relative">
+							<img class="max-w-full max-h-full" src="@/app/assets/images/app_store/system_version.png" alt="" />
+							<div
+								v-if="frameworkVersion != frameworkNewVersion"
+								class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]"
+							></div>
+						</div>
+						<div>
+							<p class="flex items-center" v-if="frameworkNewVersion != frameworkVersion">
+								<span class="text-[16px] font-[500] text-[#1D1F3A]">框架更新</span>
+								<span class="text-[12px] text-[#9699B6] ml-[10px]">必须优先更新</span>
+							</p>
+							<p class="flex items-center" v-else>
+								<span class="text-[16px] font-[500] text-[#1D1F3A]">当前框架为最新版 V{{frameworkVersion}}</span>
+							</p>
+							<p class="text-[14px] text-[#374151]">
+								<span v-if="frameworkNewVersion != frameworkVersion" class="">框架 V{{ frameworkVersion }}</span>
+								<span v-if="frameworkNewVersion != frameworkVersion" class="iconfont iconjiang-right text-[#F09000] mx-[2px]"></span>
+								<span v-if="frameworkNewVersion != frameworkVersion" class="text-[#F09000] mr-[4px]">{{ frameworkNewVersion }}</span>
+								<span v-if="frameworkNewVersion != frameworkVersion" class="mr-[4px]">和</span>
+								<span class="text-[#F09000] mr-[4px]">{{batchUpgradeApp.length}}</span>
+								<span>个应用可更新</span>
+							</p>
+						</div>
+					</div>
+					
+					<el-button class="ml-[auto]" @click="updateInformationFn({ key: 'niucloud-admin' })">
+						<el-icon class="mr-[5px]">
+							<DocumentCopy />
+						</el-icon>
+						更新记录
+					</el-button>
+					<el-button
+						type="primary"
+						v-show="activeName == 'recentlyUpdated' || (frameworkVersion != frameworkNewVersion && activeName != 'uninstalled')"
+						@click="batchUpgrade"
+					>
+						一键升级<span v-if="batchUpgradeApp.length"
+							>({{ batchUpgradeApp.length }})</span
+						>
+					</el-button>
+				</div>
+				<div class="flex items-center justify-between mt-[14px] mb-[6px]">
+					<p class="flex items-center text-[12px]">
+						<span>共</span>
+						<span class="text-[#EF3826]">{{batchUpgradeApp.length}}</span>
+						<span>个应用更新</span>
+					</p>
+					<el-checkbox
+						label="全选"
+						:model-value="localList[activeName].length && localList[activeName].length == batchUpgradeApp.length"
+						@change="appKeyAllSelect"
+						value="Value A"
+						class="ml-[12px]"
+					/>
+				</div>
+			</div>
+		</el-card>
+		<div class="flex mb-4 flex-wrap" v-show="showType == 'card' && !isShowDetail">
+			<template v-if="localList[activeName].length && !loading">
+				<div
+					class="rounded-md p-[16px] app-card mb-[20px] ml-[20px] cursor-pointer product-card-item flex justify-between items-start"
+					@click="openDetail(row)"
+					:class="{ selected: batchUpgradeApp.includes(row.key), 'hidden': row.isHideen}"
+					v-for="row in localList[activeName]"
+					:key="row.key"
+				>
+					<div class="flex items-start flex-1 w-0">
+						<div class="w-[42px] h-[42px] bg-purple-100 rounded flex items-center justify-center mr-2 relative">
+							<div class="w-full h-full overflow-hidden rounded">
+								<el-image class="w-full h-full overflow-hidden rounded" :src="row.icon" fit="contain">
+									<template #error>
+										<div class="flex items-center w-full h-full">
+											<img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
+										</div>
+									</template>
+								</el-image>
+							</div>
+						</div>
+						<div class="flex-1 w-0">
+							<div class="flex items-center">
+								<p class="text-[16px] text-[#374151] truncate leading-[20px]" :title="row.title">{{ row.title }}</p>	
+								<span :class="{'app-ident': row.type == 'app', 'addon-ident': row.type == 'addon'}">{{row.type == 'app' ? '应用' : '插件'}}</span>
+							</div>
+							<p class="text-xs text-[#4F516D] truncate mt-[2px] font-bold" :title="row.key">{{ row.key }}</p>
+							<div class="text-[#374151] text-[12px] leading-[16px] mt-[4px]">
+								<span>当前版本：</span>
+								<span>{{ row.install_info && Object.keys(row.install_info)?.length ? row.install_info.version : row.version }}</span>
+								<span v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version && activeName == 'recentlyUpdated'" class="text-[#374151] ml-[5px] text-[12px]">最新版本：{{ row.version }}</span>
+							</div>
+						</div>
+					</div>
+					<view class="w-[25px] flex items-end flex-col h-full justify-between" :class="{ 'w-[40px]': !row.is_download && downloading == row.key }">
+						<template v-if="activeName == 'recentlyUpdated'">
+							<el-checkbox class="!h-[auto] leading-[1]" v-if="batchUpgradeApp.includes(row.key)" checked @click.stop="appKeySingleSelect($event, row.key)" />
+							<el-checkbox class="!h-[auto] leading-[1]" v-else @click.stop="appKeySingleSelect($event, row.key)" />
+						</template>
+						<template v-if="activeName == 'installed' || activeName == 'all' || activeName == 'uninstalled'">
+							<el-button
+								v-if="!row.is_download"
+								class="!text-[#0766F5] mt-[auto] !p-0 !border-[0] !bg-transparent !text-[12px] !h-[20px]"
+								:loading="downloading == row.key"
+								:disabled="downloading != ''"
+								@click.stop="downEvent(row)"
+								>安装
+							</el-button>
+							<el-button v-else-if="!row.install_info || Object.keys(row.install_info).length == 0" class=" mt-[auto] !text-[#0766F5] !p-0 !border-[0] !bg-transparent !text-[12px] !h-[20px]" @click.stop="installAddonFn(row.key)">安装</el-button>
+							<el-button class=" mt-[auto] !text-[#4F516D] !p-0 !border-[0] !bg-transparent !text-[12px] !h-[20px]" v-if="row.install_info && Object.keys(row.install_info)?.length"
+								link @click.stop="uninstallAddonFn(row.key)"
+								>{{ t('unload') }}
+							</el-button>
+						</template>
+						<template v-else>
+							<el-button
+								class="!text-[#008C1E] mt-[auto] !p-0 !border-[0] !bg-transparent !text-[12px] !h-[20px]"
+								@click.stop="upgradeAddonFn(row)"
+								v-if="row.install_info.version != row.version"
+							>
+								升级
+							</el-button>
+						</template>
+					</view>
+				</div>
+			</template>
+		</div>
 
-                <div class="flex mt-[20px]">
-                    <template v-if="!row.is_download">
-                        <el-button type="primary" class="flex-1" :loading="downloading == row.key" :disabled="downloading != ''" @click.stop="downEvent(row)"><i class="iconfont iconanzhuang1 mr-[5px]"></i>立即下载</el-button>
-                    </template>
-                    <template v-else-if="!row.install_info || Object.keys(row.install_info).length == 0">
-                        <el-button type="primary" class="flex-1" @click.stop="installAddonFn(row.key)"><i class="iconfont iconanzhuang1 mr-[5px]"></i>立即安装</el-button>
-                        <el-button plain @click.stop="deleteAddonFn(row.key)">删除</el-button>
-                    </template>
-                    <template v-else>
-                        <el-button type="warning" class="flex-1" @click.stop="upgradeAddonFn(row.key)" v-if="row.install_info.version != row.version">
-                            <i class="iconfont icongengxin mr-[5px]"></i>立即更新
-                        </el-button>
-                        <el-button class="flex-1" :disabled="true" v-else>
-                            <el-icon class="mr-[5px]"><Check /></el-icon>已是最新
-                        </el-button>
-                        <el-button plain @click.stop="uninstallAddonFn(row.key)">卸载</el-button>
-                    </template>
-                </div>
-            </div>
-        </div>
+		<div class="relative px-[20px] pb-[20px]" v-show="showType == 'list' && !isShowDetail">
+			<el-table
+				v-if="localList[activeName].length && !loading && !isShowDetail"
+				ref="tableRef"
+				:tree-props="{ children: 'children' }"
+				:default-expand-all="true"
+				:data="info[activeName]"
+				row-key="key"
+				size="large"
+			>
+				<el-table-column width="24">
+					<template #default="{ row }">
+						<div
+							class="tree-child-cell"
+							:class="{
+								'is-tree-parent': row.children?.length,
+								'is-tree-child': typeof row.support_app === 'string' && row.support_app !== '' && visibleRowKeys.has(row.support_app),
+							}"
+						>
+							<span style="opacity: 0">.</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column v-if="activeName === 'recentlyUpdated'" width="60px">
+					<template #default="{ row }">
+						<el-checkbox
+							@click.stop
+							:model-value="batchUpgradeApp.includes(row.key)"
+							:value="row.key"
+							@change="appKeySingleSelect($event, row.key)"
+						></el-checkbox>
+					</template>
+				</el-table-column>
+				<el-table-column :label="t('appName')" align="left" width="300">
+					<template #default="{ row }">
+						<div class="flex items-center cursor-pointer relative left-[-10px]" @click="openDetail(row)">
+							<el-image class="w-[54px] h-[54px]" :src="row.icon" fit="contain">
+								<template #error>
+									<div class="flex items-center w-full h-full">
+										<img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
+									</div>
+								</template>
+							</el-image>
+							<div class="flex-1 w-0 flex flex-col justify-center pl-[20px] font-500 text-[13px]">
+								<div class="w-[236px] truncate leading-[18px]">{{ row.title }}</div>
+								<div
+									class="w-[236px] truncate leading-[18px] mt-[6px]"
+									v-if="row.install_info && Object.keys(row.install_info)?.length"
+								>
+									{{ row.install_info.version }}
+								</div>
+								<div class="w-[236px] truncate leading-[18px] mt-[6px]" v-else>{{ row.version }}</div>
+								<div class="mt-[3px] flex flex-nowrap">
+									<el-tag
+										type="danger"
+										size="small"
+										v-if="
+											activeName == 'recentlyUpdated' &&
+											row.install_info &&
+											Object.keys(row.install_info)?.length &&
+											row.install_info.version != row.version
+										"
+									>
+										{{ t('newVersion') }}{{ row.version }}
+									</el-tag>
+									<el-tooltip
+										v-if="versionJudge(row) && activeName == 'recentlyUpdated'"
+										effect="dark"
+										:content="`该插件适配框架版本为${row.support_version}，与已安装框架版本${frameworkVersion}不完全兼容`"
+										placement="top-start"
+									>
+										<el-tag type="warning" size="small" class="app-list-tip ml-[3px] overflow-hidden"
+											>该插件适配框架版本为{{ row.support_version }}，与已安装框架版本{{ frameworkVersion }}不完全兼容
+										</el-tag>
+									</el-tooltip>
+								</div>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
 
-        <div class="relative px-[20px] pb-[20px]" v-show="showType == 'list'">
-            <el-table v-if="localList[activeName].length && !loading" ref="tableRef" :tree-props="{ children: 'children' }" :default-expand-all="true" :data="info[activeName]" row-key="key" size="large">
-                <el-table-column width="24">
-                    <template #default="{ row }">
-                        <div class="tree-child-cell" :class="{ 'is-tree-parent': row.children?.length, 'is-tree-child': typeof row.support_app === 'string' && row.support_app !== '' && visibleRowKeys.has(row.support_app)}">
-                        <span style="opacity: 0;">.</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column v-if="activeName === 'recentlyUpdated' || activeName === 'uninstalled'" width="60px">
-                    <template #default="{ row }">
-                        <el-checkbox @click.stop :model-value="batchUpgradeApp.includes(row.key)" :value="row.key" @change="appKeySingleSelect($event, row.key)"></el-checkbox>
-                    </template>
-                </el-table-column>
-                <el-table-column :label="t('appName')" align="left" width="500">
-                    <template #default="{ row }">
-                        <div class="flex items-center cursor-pointer relative left-[-10px]">
-                            <el-image class="w-[54px] h-[54px]" :src="row.icon" fit="contain">
-                                <template #error>
-                                    <div class="flex items-center w-full h-full">
-                                    <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
-                                    </div>
-                                </template>
-                            </el-image>
-                            <div class="flex-1 w-0 flex flex-col justify-center pl-[20px] font-500 text-[13px]">
-                                <div class="w-[236px] truncate leading-[18px]">{{ row.title }}</div>
-                                <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-if="row.install_info && Object.keys(row.install_info)?.length">{{ row.install_info.version }}</div>
-                                <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-else>{{ row.version }}</div>
-                                <div class="mt-[3px] flex flex-nowrap">
-                                    <el-tag type="danger" size="small" v-if="activeName == 'recentlyUpdated' && row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version">{{ t("newVersion") }}{{ row.version }}</el-tag>
-                                    <el-tooltip v-if="versionJudge(row)" effect="dark" :content="`该插件适配框架版本为${ row.support_version }，与已安装框架版本${frameworkVersion}不完全兼容`" placement="top-start">
-                                        <el-tag type="warning" size="small" class="ml-[3px]">该插件适配框架版本为{{ row.support_version }}，与已安装框架版本{{frameworkVersion}}不完全兼容</el-tag>
-                                    </el-tooltip>
-                                </div>
-                            </div>
-                        </div>
-                    </template>
-                </el-table-column>
+				<el-table-column align="left" min-width="150">
+					<template #header>
+						<div class="flex items-center">
+							<span class="font-500 text-[13px] mr-[5px]">{{ t('appIdentification') }}</span>
+							<el-tooltip class="box-item" effect="light" :content="t('tipText')" placement="bottom">
+								<el-icon class="cursor-pointer text-[16px] text-[#a9a9a9]">
+									<QuestionFilled />
+								</el-icon>
+							</el-tooltip>
+						</div>
+					</template>
+					<template #default="{ row }">
+						<span class="font-500 text-[13px]">{{ row.key }}</span>
+					</template>
+				</el-table-column>
 
-                <el-table-column align="left" min-width="150">
-                    <template #header>
-                        <div class="flex items-center">
-                            <span class="font-500 text-[13px] mr-[5px]">{{ t("appIdentification") }}</span>
-                            <el-tooltip class="box-item" effect="light" :content="t('tipText')" placement="bottom">
-                            <el-icon class="cursor-pointer text-[16px] text-[#a9a9a9]">
-                                <QuestionFilled />
-                            </el-icon>
-                            </el-tooltip>
-                        </div>
-                    </template>
-                    <template #default="{ row }">
-                        <span class="font-500 text-[13px]">{{ row.key }}</span>
-                    </template>
-                </el-table-column>
+				<el-table-column :label="t('introduction')" align="left" min-width="250">
+					<template #default="{ row }">
+						<span class="font-500 text-[13px] multi-hidden">{{ row.desc }}</span>
+					</template>
+				</el-table-column>
 
-                <el-table-column :label="t('introduction')" align="left" min-width="250">
-                    <template #default="{ row }">
-                        <span class="font-500 text-[13px] multi-hidden">{{ row.desc }}</span>
-                    </template>
-                </el-table-column>
+				<el-table-column :label="t('type')" align="left" min-width="80">
+					<template #default="{ row }">
+						<span class="font-500 text-[13px] multi-hidden">{{ row.type === 'app' ? t('app') : t('addon') }}</span>
+					</template>
+				</el-table-column>
 
-                <el-table-column :label="t('type')" align="left" min-width="80">
-                    <template #default="{ row }">
-                        <span class="font-500 text-[13px] multi-hidden">{{ row.type === "app" ? t("app") : t("addon") }}</span>
-                    </template>
-                </el-table-column>
+				<el-table-column :label="t('author')" align="left" min-width="80">
+					<template #default="{ row }">
+						<span class="font-500 text-[13px]">{{ row.author }}</span>
+					</template>
+				</el-table-column>
 
-                <el-table-column :label="t('author')" align="left" min-width="80">
-                    <template #default="{ row }">
-                        <span class="font-500 text-[13px]">{{ row.author }}</span>
-                    </template>
-                </el-table-column>
+				<el-table-column :label="t('operation')" fixed="right" align="right" min-width="200">
+					<template #default="{ row }">
+						<template v-if="activeName == 'installed' || activeName == 'all' || activeName == 'uninstalled'">
+							<el-button
+								class="!text-[13px]"
+								v-if="row.install_info && Object.keys(row.install_info)?.length"
+								type="primary"
+								link
+								@click="uninstallAddonFn(row.key)"
+								>{{ t('unload') }}
+							</el-button>
+							<template v-if="row.is_download && (!row.install_info || !Object.keys(row.install_info).length)">
+								<el-button class="!text-[13px]" type="primary" link @click="installAddonFn(row.key)">{{ t('install') }}</el-button>
+							</template>
+							<el-button
+								class="!text-[13px]"
+								v-if="!row.is_download"
+								:loading="downloading == row.key"
+								:disabled="downloading != ''"
+								type="primary"
+								link
+								@click.stop="downEvent(row)"
+							>
+								<span>{{ t('down') }}</span>
+							</el-button>
+						</template>
+						<template v-else>
+							<el-button
+								class="!text-[13px]"
+								v-if="
+									activeName == 'recentlyUpdated' &&
+									row.install_info &&
+									Object.keys(row.install_info)?.length &&
+									row.install_info.version != row.version
+								"
+								type="primary"
+								link
+								@click="upgradeAddonFn(row)"
+								>{{ t('升级') }}
+							</el-button>
+						</template>
+						<el-button class="!text-[13px]" type="primary" link @click="openDetail(row)">{{ t('detail') }}</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="data-loading" v-if="loading || !localList[activeName].length">
+				<el-table :data="[]" size="large" class="pt-[5px]">
+					<el-table-column :label="t('appName')" align="left" width="320" />
+					<el-table-column align="left" min-width="120" />
+					<el-table-column :label="t('introduction')" align="left" min-width="200" />
+					<el-table-column :label="t('type')" align="left" min-width="100" />
+					<el-table-column :label="t('author')" align="left" min-width="100" />
+					<el-table-column :label="t('operation')" fixed="right" align="right" width="150" />
+					<!-- <template #empty>
+						<span></span>
+					</template> -->
+				</el-table>
+				<div class="h-[100px]" v-loading="loading" v-if="loading"></div>
+			</div>
+		</div>
 
-                <el-table-column :label="t('operation')" fixed="right" align="right" width="250">
-                    <template #default="{ row }">
-                        <el-button class="!text-[13px]" v-if="activeName == 'recentlyUpdated' && row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version" type="primary" link @click="upgradeAddonFn(row.key)">{{ t("upgrade") }}</el-button>
-                        <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length" type="primary" link @click="uninstallAddonFn(row.key)">{{ t("unload") }}</el-button>
-                        <template v-if="row.is_download && (!row.install_info || !Object.keys(row.install_info).length)">
-                            <el-button class="!text-[13px]" type="primary" link @click="installAddonFn(row.key)">{{ t("install") }}</el-button>
-                            <el-button class="!text-[13px]" type="primary" link @click="deleteAddonFn(row.key)">{{ t("delete") }}</el-button>
-                        </template>
-                        <el-button class="!text-[13px]" v-if="!row.is_download" :loading="downloading == row.key" :disabled="downloading != ''" type="primary" link @click.stop="downEvent(row)">
-                            <span>{{ t("down") }}</span>
-                        </el-button>
-                        <el-button class="!text-[13px]" type="primary" link @click="getAddonDetailFn(row)">{{ t("detail") }}</el-button>
-                        <el-button class="!text-[13px]" type="primary" link @click="updateInformationFn(row)">更新信息</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div class="data-loading" v-if="loading || !localList[activeName].length">
-                <el-table :data="[]" size="large" class="pt-[5px]">
-                    <el-table-column :label="t('appName')" align="left" width="320" />
-                    <el-table-column align="left" min-width="120" />
-                    <el-table-column :label="t('introduction')" align="left" min-width="200" />
-                    <el-table-column :label="t('type')" align="left" min-width="100" />
-                    <el-table-column :label="t('author')" align="left" min-width="100" />
-                    <el-table-column :label="t('operation')" fixed="right" align="right" width="150" />
-                    <template #empty>
-                        <span></span>
-                    </template>
-                </el-table>
-                <div class="h-[100px]" v-loading="loading" v-if="loading"></div>
-            </div>
-        </div>
+		<el-empty class="mx-auto overview-empty" v-if="showType == 'card' && noAppLen && !loading && activeName == 'installed' && !authLoading && !isShowDetail">
+			<template #image>
+				<div class="w-[230px] mx-auto">
+					<img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+				</div>
+			</template>
+			<template #description>
+				<p class="flex items-center">{{ t('installed-empty') }}</p>
+			</template>
+		</el-empty>
+		<el-empty class="mx-auto overview-empty" v-if="showType == 'card' && noAppLen && !loading && activeName == 'uninstalled' && !authLoading && !isShowDetail">
+			<template #image>
+				<div class="w-[230px] mx-auto">
+					<img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+				</div>
+			</template>
+			<template #description>
+				<p class="flex items-center">
+					<span>{{ t('descriptionLeft') }}</span>
+					<el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t('link') }}</el-link>
+					<span>{{ t('descriptionRight') }}</span>
+				</p>
+			</template>
+		</el-empty>
+		<div
+			v-if="!localList.all.length && !loading && !authinfo && activeName == 'all' && !authLoading && !isShowDetail"
+			class="mx-auto overview-empty flex flex-col items-center pt-14 pb-6"
+		>
+			<div class="mb-[20px] text-sm text-[#888]">检测到当前账号尚未绑定授权，请先绑定授权！</div>
+			<div class="flex flex-1 flex-wrap justify-center relative">
+				<el-button class="w-[154px] !h-[48px] mt-[8px]" type="primary" @click="authCodeApproveFn">授权码认证</el-button>
+				<el-popover ref="getAuthCodeDialog" placement="bottom" :width="478" trigger="click" class="mt-[8px]">
+					<div class="px-[18px] py-[8px]">
+						<p class="leading-[32px] text-[14px]">
+							您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务
+						</p>
+						<div class="flex justify-end mt-[36px]">
+							<el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
+							<el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
+						</div>
+					</div>
+					<template #reference>
+						<el-button
+							class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent"
+							plain
+							type="primary"
+							>如何获取授权码?
+						</el-button>
+					</template>
+				</el-popover>
+			</div>
+		</div>
+		<el-empty class="mx-auto overview-empty" v-if="showType == 'card' && noAppLen && !loading && authinfo && activeName == 'all' && !authLoading && !isShowDetail">
+			<template #image>
+				<div class="w-[230px] mx-auto">
+					<img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+				</div>
+			</template>
+			<template #description>
+				<p class="flex items-center">
+					<span>{{ t('buyDescriptionLeft') }}</span>
+					<el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t('link') }}</el-link>
+					<span>{{ t('descriptionRight') }}</span>
+				</p>
+			</template>
+		</el-empty>
+		<el-empty class="mx-auto overview-empty" v-if="showType == 'card' && noAppLen && !loading && activeName == 'recentlyUpdated' && !isShowDetail">
+			<template #image>
+				<div class="w-[230px] mx-auto">
+					<img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+				</div>
+			</template>
+			<template #description>
+				<p class="flex items-center">{{ t('recentlyUpdatedEmpty') }}</p>
+			</template>
+		</el-empty>
 
-        <el-empty class="mx-auto overview-empty" v-if="!localList.installed.length && !loading && activeName == 'installed' && !authLoading">
-            <template #image>
-                <div class="w-[230px] mx-auto">
-                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
-                </div>
-            </template>
-            <template #description>
-                <p class="flex items-center">{{ t("installed-empty") }}</p>
-            </template>
-        </el-empty>
-        <el-empty class="mx-auto overview-empty" v-if="!localList.uninstalled.length && !loading && activeName == 'uninstalled' && !authLoading">
-            <template #image>
-                <div class="w-[230px] mx-auto">
-                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
-                </div>
-            </template>
-            <template #description>
-                <p class="flex items-center">
-                    <span>{{ t("descriptionLeft") }}</span>
-                    <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t("link") }}</el-link>
-                    <span>{{ t("descriptionRight") }}</span>
-                </p>
-            </template>
-        </el-empty>
-        <div v-if="!localList.all.length && !loading && !authinfo && activeName == 'all' && !authLoading" class="mx-auto overview-empty flex flex-col items-center pt-14 pb-6">
-            <div class="mb-[20px] text-sm text-[#888]">检测到当前账号尚未绑定授权，请先绑定授权！</div>
-            <div class="flex flex-1 flex-wrap justify-center relative">
-                <el-button class="w-[154px] !h-[48px] mt-[8px]" type="primary" @click="authCodeApproveFn">授权码认证</el-button>
-                <el-popover ref="getAuthCodeDialog" placement="bottom" :width="478" trigger="click" class="mt-[8px]">
-                    <div class="px-[18px] py-[8px]">
-                        <p class="leading-[32px] text-[14px]">您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务</p>
-                        <div class="flex justify-end mt-[36px]">
-                            <el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
-                            <el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
-                        </div>
-                    </div>
-                    <template #reference>
-                        <el-button class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent" plain type="primary">如何获取授权码?</el-button>
-                    </template>
-                </el-popover>
-            </div>
-        </div>
-        <el-empty class="mx-auto overview-empty" v-if="!localList.all.length && !loading && authinfo && activeName == 'all' && !authLoading">
-            <template #image>
-                <div class="w-[230px] mx-auto">
-                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
-                </div>
-            </template>
-            <template #description>
-                <p class="flex items-center">
-                    <span>{{ t("buyDescriptionLeft") }}</span>
-                    <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t("link") }}</el-link>
-                    <span>{{ t("descriptionRight") }}</span>
-                </p>
-            </template>
-        </el-empty>
-        <el-empty class="mx-auto overview-empty" v-if="!localList.recentlyUpdated.length && !loading && activeName == 'recentlyUpdated'">
-            <template #image>
-                <div class="w-[230px] mx-auto">
-                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
-                </div>
-            </template>
-            <template #description>
-                <p class="flex items-center">{{ t("recentlyUpdatedEmpty") }}</p>
-            </template>
-        </el-empty>
+		<el-dialog v-model="authCodeApproveDialog" title="授权码认证" width="400px">
+			<el-form :model="formData" label-width="0" ref="formRef" :rules="formRules" class="page-form">
+				<el-card class="box-card !border-none" shadow="never">
+					<el-form-item prop="auth_code">
+						<el-input
+							v-model.trim="formData.auth_code"
+							:placeholder="t('authCodePlaceholder')"
+							class="input-width"
+							clearable
+							size="large"
+						/>
+					</el-form-item>
 
-        <el-dialog v-model="authCodeApproveDialog" title="授权码认证" width="400px">
-            <el-form :model="formData" label-width="0" ref="formRef" :rules="formRules" class="page-form">
-                <el-card class="box-card !border-none" shadow="never">
-                    <el-form-item prop="auth_code">
-                        <el-input v-model.trim="formData.auth_code" :placeholder="t('authCodePlaceholder')" class="input-width" clearable size="large" />
-                    </el-form-item>
+					<div class="mt-[20px]">
+						<el-form-item prop="auth_secret">
+							<el-input
+								v-model.trim="formData.auth_secret"
+								clearable
+								:placeholder="t('authSecretPlaceholder')"
+								class="input-width"
+								size="large"
+							/>
+						</el-form-item>
+					</div>
 
-                    <div class="mt-[20px]">
-                        <el-form-item prop="auth_secret">
-                            <el-input v-model.trim="formData.auth_secret" clearable :placeholder="t('authSecretPlaceholder')" class="input-width" size="large" />
-                        </el-form-item>
-                    </div>
+					<div class="text-sm mt-[10px] text-info">{{ t('authInfoTips') }}</div>
 
-                    <div class="text-sm mt-[10px] text-info">{{ t("authInfoTips") }}</div>
+					<div class="mt-[20px]">
+						<el-button type="primary" class="w-full" size="large" :loading="saveLoading" @click="save(formRef)">
+							{{ t('confirm') }}
+						</el-button>
+					</div>
+					<div class="mt-[10px] text-right">
+						<el-button type="primary" link @click="market">{{ t('notHaveAuth') }}</el-button>
+					</div>
+				</el-card>
+			</el-form>
+		</el-dialog>
 
-                    <div class="mt-[20px]">
-                        <el-button type="primary" class="w-full" size="large" :loading="saveLoading" @click="save(formRef)">{{ t("confirm") }}
-                        </el-button>
-                    </div>
-                    <div class="mt-[10px] text-right">
-                        <el-button type="primary" link @click="market">{{ t("notHaveAuth") }}</el-button>
-                    </div>
-                </el-card>
-            </el-form>
-        </el-dialog>
-        <!-- 详情 -->
-        <el-dialog v-model="appStoreShowDialog" :title="t('plugDetail')" width="500px" :destroy-on-close="true">
-            <el-form :model="appStoreInfo" label-width="120px" ref="formRef" class="page-form">
-                <el-form-item :label="t('title')">
-                    <div class="input-width">{{ appStoreInfo.title }}</div>
-                </el-form-item>
-                <el-form-item :label="t('desc')">
-                    <div class="input-width">{{ appStoreInfo.desc }}</div>
-                </el-form-item>
-                <el-form-item :label="t('author')">
-                    <div class="input-width">{{ appStoreInfo.author }}</div>
-                </el-form-item>
-                <el-form-item :label="t('version')">
-                    <div class="input-width">{{ appStoreInfo.version }}</div>
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button type="primary" @click="appStoreShowDialog = false">{{ t("confirm") }}</el-button>
-                </span>
-            </template>
-        </el-dialog>
+		<!-- 安装弹窗 -->
+		<el-dialog
+			v-model="installShowDialog"
+			:title="t('addonInstall')"
+			width="850px"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:before-close="installShowDialogClose"
+		>
+			<el-steps
+				:space="200"
+				:active="installStep"
+				class="number-of-steps"
+				process-status="process"
+				align-center
+				v-if="installStep != 2 && !errorDialog"
+			>
+				<el-step :title="t('envCheck')" class="flex-1" />
+				<el-step :title="t('installProgress')" class="flex-1" />
+				<el-step :title="t('installComplete')" class="flex-1" />
+			</el-steps>
+			<div v-show="installStep == 0" v-loading="!installCheckResult.dir">
+				<!-- <el-scrollbar max-height="50vh"> -->
+				<div class="min-h-[150px]">
+					<el-scrollbar style="height: calc(50vh); overflow: auto">
+						<div class="mt-3" v-if="installCheckResult.dir">
+							<p class="pt-[20px] pl-[20px]">{{ t('dirPermission') }}</p>
+							<div
+								v-if="!installCheckResult.file_permission_is_pass"
+								class="mt-[10px] mx-[20px] text-[14px] cursor-pointer text-primary flex items-center justify-between bg-[#EFF6FF] rounded-[4px] p-[10px]"
+								@click="cloudBuildCheckDirFn"
+							>
+								<div class="flex items-center">
+									<el-icon :size="17">
+										<QuestionFilled />
+									</el-icon>
+									<span class="ml-[5px] leading-[20px]">编译权限错误，查看解决方案</span>
+								</div>
+								<div class="border-[1px] border-primary rounded-[3px] w-[72px] h-[26px] leading-[25px] text-center">立即查看</div>
+							</div>
+							<div class="px-[20px] pt-[10px] text-[14px]">
+								<el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+									<el-col :span="18">
+										<span>{{ t('path') }}</span>
+									</el-col>
+									<el-col :span="3">
+										<span>{{ t('demand') }}</span>
+									</el-col>
+									<el-col :span="3">
+										<span>{{ t('status') }}</span>
+									</el-col>
+								</el-row>
+								<el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_readable" :key="index">
+									<el-col :span="18">
+										<span>{{ item.dir }}</span>
+									</el-col>
+									<el-col :span="3">
+										<span>{{ t('readable') }}</span>
+									</el-col>
+									<el-col :span="3">
+										<span v-if="item.status">
+											<el-icon color="green">
+												<Select />
+											</el-icon>
+										</span>
+										<span v-else>
+											<el-icon color="red">
+												<CloseBold />
+											</el-icon>
+										</span>
+									</el-col>
+								</el-row>
+								<el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_write" :key="index">
+									<el-col :span="18">
+										<span>{{ item.dir }}</span>
+									</el-col>
+									<el-col :span="3">
+										<span>{{ t('write') }}</span>
+									</el-col>
+									<el-col :span="3">
+										<span v-if="item.status" class="text-right">
+											<el-icon color="green">
+												<Select />
+											</el-icon>
+										</span>
+										<span v-else>
+											<el-icon color="red">
+												<CloseBold />
+											</el-icon>
+										</span>
+									</el-col>
+								</el-row>
+							</div>
+						</div>
+						<div class="my-3" v-if="installCheckResult.addon_check && installCheckResult.addon_check.length">
+							<p class="pl-[20px]">插件验证</p>
+							<div class="px-[20px] pt-[10px] text-[14px]">
+								<el-alert class="!mb-[10px]" v-for="item in installCheckResult.addon_check" type="error" :closable="false">
+									<div v-html="item.msg"></div>
+								</el-alert>
+							</div>
+						</div>
+					</el-scrollbar>
+				</div>
+				<!-- </el-scrollbar> -->
+				<div class="flex justify-end">
+					<el-tooltip effect="dark" placement="top">
+						<template #content>
+							<div class="w-[400px]">
+								{{ t('installTips') }}
+							</div>
+						</template>
+						<el-button :disabled="!installCheckResult.is_pass || cloudInstalling" :loading="localInstalling" @click="handleInstall"
+							>{{ t('localInstall') }}
+						</el-button>
+					</el-tooltip>
+					<el-tooltip effect="dark" placement="top">
+						<template #content>
+							<div class="w-[400px]">
+								{{ t('cloudInstallTips') }}
+							</div>
+						</template>
+						<el-button
+							type="primary"
+							:disabled="!installCheckResult.is_pass || localInstalling"
+							:loading="cloudInstalling"
+							@click="handleCloudInstall"
+							>{{ t('cloudInstall') }}
+						</el-button>
+					</el-tooltip>
+				</div>
+			</div>
+			<div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]">
+				<div class="flex flex-col h-full">
+					<div class="flex-1 h-0">
+						<terminal
+							ref="terminalRef"
+							:name="`install-${terminalId}`"
+							:context="currAddon"
+							:init-log="null"
+							:show-header="false"
+							:show-log-time="true"
+							@exec-cmd="onExecCmd"
+						/>
+					</div>
+					<div class="flex justify-end mt-[20px]">
+						<el-button type="primary" :loading="true" class="!w-[140px]">已用时 {{ formatUpgradeDuration }}</el-button>
+					</div>
+				</div>
+			</div>
+			<div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col">
+				<!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> -->
+				<!-- 提示信息 -->
+				<!-- <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
+            <el-alert :title="item" type="error" :closable="false" />
+        </div> -->
+				<el-result icon="success" :title="t('addonInstallSuccess')">
+					<template #icon>
+						<img src="@/app/assets/images/success_icon.png" alt="" />
+					</template>
+					<template #extra>
+						<div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
+							<div class="text-[16px] text-[#4F516D] mt-[5px]">{{ item }}</div>
+						</div>
+						<div class="text-[16px] text-[#9699B6] mt-[10px]" v-if="upgradeDuration > 0">本次安装用时{{ formatUpgradeDuration }}</div>
+						<div class="mt-[20px]">
+							<el-button @click="handleBack()" v-if="installType == 'cloud'" class="!w-[90px]">返回</el-button>
+							<el-button @click="installShowDialog = false" type="primary" class="!w-[90px]">完成</el-button>
+						</div>
+					</template>
+				</el-result>
+			</div>
+			<div class="h-[50vh] mt-[20px] flex flex-col" v-show="errorDialog">
+				<el-result icon="error" :title="t('安装失败')">
+					<template #icon>
+						<img src="@/app/assets/images/error_icon.png" alt="" />
+					</template>
+					<template #extra>
+						<el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+							{{ errorMsg }}
+						</el-scrollbar>
+						<el-button @click="handleBack()" v-if="installType == 'cloud'" class="!w-[90px]">错误信息</el-button>
+						<el-button @click="installShowDialog = false" type="primary" class="!w-[90px]">完成</el-button>
+					</template>
+				</el-result>
+			</div>
+		</el-dialog>
 
-        <!-- 安装弹窗 -->
-        <el-dialog v-model="installShowDialog" :title="t('addonInstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="installShowDialogClose">
-            <el-steps :space="200" :active="installStep" class="number-of-steps" process-status="process" align-center v-if="installStep != 2 && !errorDialog ">
-                <el-step :title="t('envCheck')" class="flex-1" />
-                <el-step :title="t('installProgress')" class="flex-1" />
-                <el-step :title="t('installComplete')" class="flex-1" />
-            </el-steps>
-            <div v-show="installStep == 0" v-loading="!installCheckResult.dir">
-                <!-- <el-scrollbar max-height="50vh"> -->
-                    <div class="min-h-[150px]">
-                        <el-scrollbar style="height: calc(50vh); overflow: auto">
-                            <div class="mt-3" v-if="installCheckResult.dir">
-                                <p class="pt-[20px] pl-[20px]">{{ t("dirPermission") }}</p>
-                                <div v-if="!installCheckResult.file_permission_is_pass" class="mt-[10px] mx-[20px] text-[14px] cursor-pointer text-primary flex items-center justify-between bg-[#EFF6FF] rounded-[4px] p-[10px]" @click="cloudBuildCheckDirFn">
-                                    <div class="flex items-center">
-                                        <el-icon :size="17"><QuestionFilled /></el-icon>
-                                        <span class="ml-[5px] leading-[20px]">编译权限错误，查看解决方案</span></div>
-                                    <div class="border-[1px] border-primary rounded-[3px] w-[72px] h-[26px] leading-[25px] text-center">立即查看</div>
-                                </div>
-                                <div class="px-[20px] pt-[10px] text-[14px]">
-                                    <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
-                                        <el-col :span="18">
-                                            <span>{{ t("path") }}</span>
-                                        </el-col>
-                                        <el-col :span="3">
-                                            <span>{{ t("demand") }}</span>
-                                        </el-col>
-                                        <el-col :span="3">
-                                            <span>{{ t("status") }}</span>
-                                        </el-col>
-                                    </el-row>
-                                    <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_readable" :key="index">
-                                        <el-col :span="18">
-                                            <span>{{ item.dir }}</span>
-                                        </el-col>
-                                        <el-col :span="3">
-                                            <span>{{ t("readable") }}</span>
-                                        </el-col>
-                                        <el-col :span="3" >
-                                            <span v-if="item.status">
-                                                <el-icon color="green">
-                                                    <Select />
-                                                </el-icon>
-                                            </span>
-                                            <span v-else>
-                                                <el-icon color="red">
-                                                    <CloseBold />
-                                                </el-icon>
-                                            </span>
-                                        </el-col>
-                                    </el-row>
-                                    <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_write" :key="index">
-                                        <el-col :span="18">
-                                            <span>{{ item.dir }}</span>
-                                        </el-col>
-                                        <el-col :span="3">
-                                            <span>{{ t("write") }}</span>
-                                        </el-col>
-                                        <el-col :span="3">
-                                            <span v-if="item.status" class="text-right">
-                                                <el-icon color="green">
-                                                    <Select />
-                                                </el-icon>
-                                            </span>
-                                            <span v-else>
-                                                <el-icon color="red">
-                                                    <CloseBold />
-                                                </el-icon>
-                                            </span>
-                                        </el-col>
-                                    </el-row>
-                                </div>
-                            </div>
-                            <div class="my-3" v-if="installCheckResult.addon_check && installCheckResult.addon_check.length">
-                                <p class="pl-[20px]">插件验证</p>
-                                <div class="px-[20px] pt-[10px] text-[14px]">
-                                    <el-alert class="!mb-[10px]" v-for="item in installCheckResult.addon_check" type="error" :closable="false">
-                                        <div v-html="item.msg"></div>
-                                    </el-alert>
-                                </div>
-                            </div>
-                        </el-scrollbar>
-                    </div>
-                <!-- </el-scrollbar> -->
-                <div class="flex justify-end">
-                    <el-tooltip effect="dark" placement="top">
-                        <template #content>
-                            <div class="w-[400px]">
-                                {{t("installTips")}}
-                            </div>
-                        </template>
-                        <el-button :disabled="!installCheckResult.is_pass || cloudInstalling" :loading="localInstalling" @click="handleInstall">{{ t("localInstall") }}</el-button>
-                    </el-tooltip>
-                    <el-tooltip effect="dark" placement="top">
-                        <template #content>
-                            <div class="w-[400px]">
-                                {{t("cloudInstallTips")}}
-                            </div>
-                        </template>
-                        <el-button type="primary" :disabled="!installCheckResult.is_pass || localInstalling" :loading="cloudInstalling" @click="handleCloudInstall">{{ t("cloudInstall") }}</el-button>
-                    </el-tooltip>
-                </div>
-            </div>
-            <div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]">
-                <terminal ref="terminalRef" :name="`install-${terminalId}`" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
-            </div>
-            <div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col">
-                <!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> -->
-                <!-- 提示信息 -->
-                <!-- <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
-                    <el-alert :title="item" type="error" :closable="false" />
-                </div> -->
-                <el-result icon="success" :title="t('addonInstallSuccess')">
-                    <template #icon>
-                        <img src="@/app/assets/images/success_icon.png" alt="">
-                    </template>
-                    <template #extra>
-                        <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
-                            <div class="text-[16px] text-[#4F516D] mt-[5px]">{{ item }}</div>
-                        </div>
-                        <div class="text-[16px] text-[#9699B6] mt-[10px]" v-if="upgradeDuration>0">本次安装用时{{ formatUpgradeDuration }}</div>
-                        <div class="mt-[20px]">
-                            <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">返回</el-button>
-                            <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
-                        </div>
-                    </template>
-                </el-result>
-            </div>
-            <div class="h-[50vh] mt-[20px] flex flex-col" v-show="errorDialog">
-                <el-result icon="error" :title="t('安装失败')">
-                    <template #icon>
-                        <img src="@/app/assets/images/error_icon.png" alt="">
-                    </template>
-                    <template #extra>
-                        <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
-                            {{errorMsg}}
-                        </el-scrollbar>
-                        <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">错误信息</el-button>
-                        <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
-                    </template>
-                </el-result>
-            </div>
-        </el-dialog>
+		<el-dialog
+			v-model="uninstallShowDialog"
+			:title="t('addonUninstall')"
+			width="850px"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+		>
+			<el-scrollbar max-height="50vh">
+				<div class="min-h-[150px]">
+					<div class="bg-[#fff] my-3" v-if="uninstallCheckResult.dir">
+						<p class="pt-[20px] pl-[20px]">{{ t('dirPermission') }}</p>
+						<div class="px-[20px] pt-[10px] text-[14px]">
+							<el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+								<el-col :span="18">
+									<span>{{ t('path') }}</span>
+								</el-col>
+								<el-col :span="3">
+									<span>{{ t('demand') }}</span>
+								</el-col>
+								<el-col :span="3">
+									<span>{{ t('status') }}</span>
+								</el-col>
+							</el-row>
+							<el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_readable" :key="index">
+								<el-col :span="18">
+									<span>{{ item.dir }}</span>
+								</el-col>
+								<el-col :span="3">
+									<span>{{ t('readable') }}</span>
+								</el-col>
+								<el-col :span="3">
+									<span v-if="item.status">
+										<el-icon color="green">
+											<Select />
+										</el-icon>
+									</span>
+									<span v-else>
+										<el-icon color="red">
+											<CloseBold />
+										</el-icon>
+									</span>
+								</el-col>
+							</el-row>
+							<el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_write" :key="index">
+								<el-col :span="18">
+									<span>{{ item.dir }}</span>
+								</el-col>
+								<el-col :span="3">
+									<span>{{ t('write') }}</span>
+								</el-col>
+								<el-col :span="3">
+									<span v-if="item.status">
+										<el-icon color="green">
+											<Select />
+										</el-icon>
+									</span>
+									<span v-else>
+										<el-icon color="red">
+											<CloseBold />
+										</el-icon>
+									</span>
+								</el-col>
+							</el-row>
+						</div>
+					</div>
+				</div>
+			</el-scrollbar>
+		</el-dialog>
 
-        <el-dialog v-model="uninstallShowDialog" :title="t('addonUninstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false">
-            <el-scrollbar max-height="50vh">
-                <div class="min-h-[150px]">
-                    <div class="bg-[#fff] my-3" v-if="uninstallCheckResult.dir">
-                        <p class="pt-[20px] pl-[20px]">{{ t("dirPermission") }}</p>
-                        <div class="px-[20px] pt-[10px] text-[14px]">
-                            <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
-                                <el-col :span="18">
-                                    <span>{{ t("path") }}</span>
-                                </el-col>
-                                <el-col :span="3">
-                                    <span>{{ t("demand") }}</span>
-                                </el-col>
-                                <el-col :span="3">
-                                    <span>{{ t("status") }}</span>
-                                </el-col>
-                            </el-row>
-                            <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_readable" :key="index">
-                                <el-col :span="18">
-                                    <span>{{ item.dir }}</span>
-                                </el-col>
-                                <el-col :span="3">
-                                    <span>{{ t("readable") }}</span>
-                                </el-col>
-                                <el-col :span="3">
-                                    <span v-if="item.status">
-                                        <el-icon color="green">
-                                            <Select />
-                                        </el-icon>
-                                    </span>
-                                    <span v-else>
-                                        <el-icon color="red">
-                                            <CloseBold />
-                                        </el-icon>
-                                    </span>
-                                </el-col>
-                            </el-row>
-                            <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_write" :key="index">
-                                <el-col :span="18">
-                                    <span>{{ item.dir }}</span>
-                                </el-col>
-                                <el-col :span="3">
-                                    <span>{{ t("write") }}</span>
-                                </el-col>
-                                <el-col :span="3" >
-                                    <span v-if="item.status">
-                                        <el-icon color="green">
-                                            <Select />
-                                        </el-icon>
-                                    </span>
-                                    <span v-else>
-                                        <el-icon color="red">
-                                            <CloseBold />
-                                        </el-icon>
-                                    </span>
-                                </el-col>
-                            </el-row>
-                        </div>
-                    </div>
-                </div>
-            </el-scrollbar>
-        </el-dialog>
+		<!-- 下载提示 -->
+		<el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
+			<span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="unloadHintDialog = false">取消</el-button>
+					<el-button type="primary" @click="downEventHintFn">确定</el-button>
+				</span>
+			</template>
+		</el-dialog>
 
-        <!-- 下载提示 -->
-        <el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
-            <span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button @click="unloadHintDialog = false">取消</el-button>
-                    <el-button type="primary" @click="downEventHintFn">确定</el-button>
-                </span>
-            </template>
-        </el-dialog>
-        <!-- 更新信息 -->
-    </div>
-    <upgrade-log :upgradeKey="upgradeKey" ref="upgradeLogRef" />
-    <upgrade ref="upgradeRef" @complete="localListFn" @cloudbuild="handleCloudBuild" />
-    <cloud-build ref="cloudBuildRef" />
+		<el-card class="box-card app-detail-static !border-none" shadow="never" v-if="!loading && isShowDetail">
+			<div class="flex items-center text-[14px] text-primary cursor-pointer mb-[20px]" @click="closeDetail">
+				<el-icon class="mr-[6px]"><ArrowLeft /></el-icon>
+				<span>返回应用列表</span>
+			</div>
+
+			<div class="border-[1px] border-solid border-[#EBEEF5] p-[20px]">
+
+				<div class="flex items-center justify-between">
+					<div class="flex items-center">
+						<div class="w-[42px] h-[42px] rounded-[6px] flex items-center justify-center mr-[10px] overflow-hidden">
+							<el-image class="w-full h-full" :src="detailAddon?.icon" fit="contain">
+								<template #error>
+									<div class="flex items-center w-full h-full">
+										<img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
+									</div>
+								</template>
+							</el-image>
+						</div>
+						<div>
+							<div class="text-[16px] font-[500] leading-[20px]">{{ detailAddon?.title || '-' }}</div>
+							<div class="text-[12px] text-[#374151] leading-[18px] mt-[5px]">{{ detailAddon?.key || '-' }}</div>
+						</div>
+					</div>
+					<div class="flex items-center ml-[auto] gap-[10px] detail-btn-box">
+						<template v-if="detailAddon.key != 'niucloud-admin'">
+							<el-button v-if="!detailAddon.is_download"
+								type="primary"
+								class="download-btn !bg-[#0766F5]"
+								:loading="downloading == detailAddon.key"
+								:disabled="downloading != ''"
+								@click.stop="downEvent(detailAddon)"
+								>安装
+							</el-button>
+							<el-button v-else-if="!detailAddon.install_info || Object.keys(detailAddon.install_info).length == 0" type="primary" class="!bg-[#0766F5]" @click.stop="installAddonFn(detailAddon.key)">安装</el-button>
+							<el-button
+								type="warning"
+								@click.stop="upgradeAddonFn(detailAddon)"
+								v-else-if="detailAddon.install_info.version != detailAddon.version"
+							>
+								升级
+							</el-button>
+							<el-button type="info" v-if="detailAddon.is_download && (!detailAddon.install_info || !Object.keys(detailAddon.install_info).length)" @click="deleteAddonFn(detailAddon.key)"> 删除 </el-button>
+							<el-button type="info" v-if="detailAddon.is_download && detailAddon.install_info && Object.keys(detailAddon.install_info).length" @click="uninstallAddonFn(detailAddon.key)"> 卸载 </el-button>
+						</template>
+						<template v-else>
+							<el-button
+								type="warning"
+								@click.stop="upgradeAddonFn(detailAddon)"
+								v-if="detailAddon.install_info.version != detailAddon.version"
+							>
+								升级
+							</el-button>
+						</template>
+					</div>
+				</div>
+
+				<div class="app-section-header mt-[20px] mb-[12px]" v-if="detailAddon?.type || detailAddon?.desc">
+					<div class="app-section-title">应用信息</div>
+					<div class="app-section-line"></div>
+				</div>
+				<div class="space-y-[10px] text-[14px]" v-if="detailAddon?.type || detailAddon?.desc">
+					<div class="flex items-center">
+						<div class="w-[84px] text-[#9699B6]">应用类型：</div>
+						<div class="text-[#374151]">{{ detailAddon?.type == 'app' ? '应用' : '插件' }}</div>
+					</div>
+					<div class="flex items-start">
+						<div class="w-[84px] text-[#9699B6] pt-[2px]">应用简介：</div>
+						<div class="text-[#374151] flex-1">{{ detailAddon?.desc || '-' }}</div>
+					</div>
+				</div>
+
+				<div class="app-section-header mt-[20px] mb-[12px]">
+					<div class="app-section-title">服务周期</div>
+					<div class="app-section-line"></div>
+				</div>
+				<div class="space-y-[10px] text-[14px]">
+					<div class="flex items-center">
+						<div class="w-[84px] text-[#9699B6]">有效期至：</div>
+						<div class="text-[#374151] flex items-center">
+							<div class="text-[#374151]">{{ detailAddon.expire_time || '--' }}</div>
+							<div class="ml-[10px] flex items-center gap-[3px]" v-if="detailAddon.app_id">
+								<span class="iconfont icongouwuche text-[var(--el-color-primary)]"></span>
+								<span class="text-[var(--el-color-primary)] text-[14px] cursor-pointer" @click="toLink('pc')">续费应用</span>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<template v-if="detailAddon?.author || detailAddon?.author_phone">
+					<div class="app-section-header mt-[20px] mb-[12px]">
+						<div class="app-section-title">开发者信息</div>
+						<div class="app-section-line"></div>
+					</div>
+					<div class="space-y-[10px] text-[14px]">
+						<div class="flex items-center">
+							<div class="w-[84px] text-[#9699B6]">开发者：</div>
+							<div class="text-[#374151]">{{ detailAddon?.author || '-' }}</div>
+						</div>
+						<div class="flex items-center" v-if="detailAddon?.author_phone">
+							<div class="w-[84px] text-[#9699B6]">联系方式：</div>
+							<div class="text-[#374151] inline-flex items-center">
+								{{detailAddon?.author_phone}}
+								<el-icon class="ml-[6px] text-primary"><Phone /></el-icon>
+							</div>
+						</div>
+					</div>
+				</template>
+
+				<div class="app-section-header mt-[20px] mb-[12px]" v-if="detailAddon.key != 'niucloud-admin' && detailAddon.app_id">
+					<div class="app-section-title">访问应用</div>
+					<div class="app-section-line"></div>
+				</div>
+				<div class="flex gap-[30px]" v-if="detailAddon.key != 'niucloud-admin' && detailAddon.app_id">
+					<div class="bg-[#F5F5F5] w-[336px] h-[60px] px-[20px] flex items-center justify-between cursor-pointer" @click="toLink('pc')">
+						<div class="flex items-center">
+							<div class="w-[28px] h-[28px] flex items-center justify-center mr-[2px]">
+								<el-icon><Monitor /></el-icon>
+							</div>
+							<div class="text-[14px] text-[#374151]">PC端应用主页</div>
+						</div>
+						<span class="iconfont iconjiang-right"></span>
+					</div>
+					<div class="bg-[#F5F5F5] w-[336px] h-[60px] px-[20px] flex items-center justify-between cursor-pointer" @click="toLink('pc')">
+						<div class="flex items-center">
+							<div class="w-[28px] h-[28px] flex items-center justify-center mr-[2px]">
+								<el-icon><Cellphone /></el-icon>
+							</div>
+							<div class="text-[14px] text-[#374151]">移动端应用主页</div>
+						</div>
+						<span class="iconfont iconjiang-right"></span>
+					</div>
+				</div>
+
+				<div class="app-section-header mt-[20px] mb-[12px]">
+					<div class="app-section-title">应用版本</div>
+					<div class="app-section-line"></div>
+				</div>
+				<div class="flex items-center text-[14px]">
+					<div class="w-[84px] text-[#9699B6]">当前版本：</div>
+					<div class="text-[#374151]">{{ detailCurrentVersion }}</div>
+				</div>
+
+				<div class="app-section-header mt-[20px] mb-[12px]">
+					<div class="app-section-title">更新历史</div>
+					<div class="app-section-line"></div>
+				</div>
+				<div class="detail-upgrade-log -mx-[20px] h-[500px] overflow-auto" v-loading="detailLogLoading">
+					<el-scrollbar class="px-[20px]">
+						<el-timeline style="width: 100%" v-if="detailVersionList.length">
+							<el-timeline-item v-for="(item, index) in detailVersionList" :key="item.version_no || index" placement="left">
+								<el-collapse v-model="detailLogActive" accordion>
+									<el-collapse-item :name="index">
+										<template #title>
+											<div class="flex items-center justify-between flex-1">
+												<div class="flex flex-col items-baseline">
+													<p class="text-[#1D1F3A] text-[14px]">版本：V{{ item.version_no }} </p>
+													<div class="flex items-center leading-[1] mt-[2px]">
+														<span class="text-[#9699B6] text-[14px]">{{ timeSplit(item.release_time)[0] }}</span>
+														<span class="text-[#9699B6] text-[14px] ml-[3px]">{{ timeSplit(item.release_time)[1] }}</span>
+													</div>
+												</div>
+												<div class="flex items-center collapse-arrow">
+													<span class="expand text-[14px] !text-[#374151]">更新内容</span>
+													<span class="fold-up text-[14px] !text-[#374151]">收起</span>
+													<span class="nc-iconfont nc-icon-xiaV6xx ml-[2px] text-[#9699B6]"></span>
+												</div>
+											</div>
+										</template>
+										<div class="timeline-log-wrap" v-if="item.upgrade_log">
+											<div v-html="item.upgrade_log"></div>
+										</div>
+									</el-collapse-item>
+								</el-collapse>
+							</el-timeline-item>
+						</el-timeline>
+						<el-empty v-else description="暂无版本更新信息" />
+					</el-scrollbar>
+				</div>
+			</div>
+		</el-card>
+	</div>
+	<upgrade-log :upgradeKey="upgradeKey" ref="upgradeLogRef" />
+	<upgrade ref="upgradeRef" @complete="upgradeCompleteFn" @cloudbuild="handleCloudBuild" />
+	<cloud-build ref="cloudBuildRef" />
 </template>
 
 <script lang="ts" setup>
 import { ref, reactive, watch, h, computed, nextTick } from 'vue'
 import { t } from '@/lang'
 import {
-    getAddonLocal,
-    uninstallAddon,
-    installAddon,
-    preInstallCheck,
-    cloudInstallAddon,
-    getAddonInstalltask,
-    getAddonCloudInstallLog,
-    preUninstallCheck,
-    cancelInstall,
-    getAddonInit
+	getAddonLocal,
+	uninstallAddon,
+	installAddon,
+	preInstallCheck,
+	cloudInstallAddon,
+	getAddonInstalltask,
+	getAddonCloudInstallLog,
+	preUninstallCheck,
+	cancelInstall,
+	getAddonInit,
 } from '@/app/api/addon'
 import { deleteAddonDevelop } from '@/app/api/tools'
-import { downloadVersion, getAuthInfo, setAuthInfo, getFrameworkNewVersion } from '@/app/api/module'
+import { downloadVersion, getAuthInfo, setAuthInfo, getFrameworkNewVersion, getAppVersionList } from '@/app/api/module'
 import { getVersions } from '@/app/api/auth'
 import { ElMessage, ElMessageBox, ElNotification, FormInstance, FormRules } from 'element-plus'
 import 'vue-web-terminal/lib/theme/dark.css'
@@ -594,7 +959,7 @@ import useUserStore from '@/stores/modules/user'
 import Upgrade from '@/app/components/upgrade/index.vue'
 import CloudBuild from '@/app/components/cloud-build/index.vue'
 import UpgradeLog from '@/app/components/upgrade-log/index.vue'
-import {deepClone} from "@/utils/common";
+import { deepClone } from '@/utils/common'
 
 const tableRef = ref(null)
 const router = useRouter()
@@ -614,69 +979,90 @@ const frameworkVersionCode = ref('')
 const upgradeLogRef = ref<any>(null)
 const showType = ref(storage.get('storeShowType') || 'card')
 const frameworkNewVersion = ref('')
-getVersions().then((res) => {
-    frameworkVersion.value = res.data.version.version
-    frameworkVersionCode.value = res.data.version.code
-})
-getFrameworkNewVersion().then(({ data }) => {
-    frameworkNewVersion.value = data.last_version
+const searchParam = reactive({
+	keywords: '',
+	type: '',
 })
+const getFrameworkInfo = ()=>{
+	getVersions().then((res) => {
+		frameworkVersion.value = res.data.version.version
+		frameworkVersionCode.value = res.data.version.code
+	})
+	getFrameworkNewVersion().then(({ data }) => {
+		frameworkNewVersion.value = data.last_version
+	})
+}
+getFrameworkInfo()
+
+
+
+const upgradeCompleteFn = ()=>{
+	getFrameworkInfo()
+	localListFn()
+}
 
 const switchShowType = () => {
-    showType.value = showType.value == 'card' ? 'list' : 'card'
-    storage.set({key: 'storeShowType', data: showType.value})
+	showType.value = showType.value == 'card' ? 'list' : 'card'
+	storage.set({ key: 'storeShowType', data: showType.value })
 }
 
 const typeList = ref({})
 const getAddonInitFn = () => {
-    getAddonInit().then((res) => {
-        typeList.value = res.data.type_list
-    })
+	getAddonInit().then((res) => {
+		typeList.value = res.data.type_list
+	})
 }
 getAddonInitFn()
 const currDownData = ref()
 const downEventHintFn = () => {
-    downEvent(currDownData.value, true)
+	downEvent(currDownData.value, true)
 }
 
+const batchUpgradeApp = ref<String[]>([])
+
 const activeNameTabFn = (data: any) => {
-    activeName.value = data
-    storage.set({ key: 'storeActiveName', data })
+	activeName.value = data
+	storage.set({ key: 'storeActiveName', data })
 
-    if ((data == 'uninstalled' || data == 'recentlyUpdated') && localList.value[activeName.value].length) {
-        batchUpgradeApp.value = localList.value[activeName.value].map(item => item.key)
-    } else {
-        batchUpgradeApp.value = []
-    }
+	if (data == 'recentlyUpdated' && localList.value[activeName.value].length) {
+		batchUpgradeApp.value = localList.value[activeName.value].map((item) => item.key)
+	} else {
+		batchUpgradeApp.value = []
+	}
+	if (isShowDetail.value){
+		closeDetail()
+	}
 }
 if (route.query.id) {
-    activeNameTabFn(route.query.id)
+	activeNameTabFn(route.query.id)
 }
 const downEvent = (param: Record<string, any>, isDown = false) => {
-    if (param.is_download && activeName.value == 'all' && !isDown) {
-        unloadHintDialog.value = true
-        currDownData.value = param
-        return false
-    }
+	if (param.is_download && activeName.value == 'all' && !isDown) {
+		unloadHintDialog.value = true
+		currDownData.value = param
+		return false
+	}
 
-    if (downloading.value) return
-    downloading.value = param.key
+	if (downloading.value) return
+	downloading.value = param.key
 
-    downloadVersion({ addon: param.key, version: param.version }).then(() => {
-        unloadHintDialog.value = false
-        installAddonFn(param.key)
-        localListFn()
-        downloading.value = ''
-    }).catch(() => {
-        downloading.value = ''
-    })
+	downloadVersion({ addon: param.key, version: param.version })
+		.then(() => {
+			unloadHintDialog.value = false
+			installAddonFn(param.key)
+			localListFn()
+			downloading.value = ''
+		})
+		.catch(() => {
+				downloading.value = ''
+		})
 }
 
 const authCode = ref('')
 getAuthInfo().then((res) => {
-    if (res.data.data && res.data.data.auth_code) {
-        authCode.value = res.data.data.auth_code
-    }
+	if (res.data.data && res.data.data.auth_code) {
+		authCode.value = res.data.data.auth_code
+	}
 })
 
 /**
@@ -686,126 +1072,164 @@ const search_name = ref('')
 const search_type = ref('')
 // 表格展示数据
 const info = ref({
-    installed: [],
-    uninstalled: [],
-    all: [],
-    recentlyUpdated: []
+	installed: [],
+	uninstalled: [],
+	all: [],
+	recentlyUpdated: [],
 })
 const buildInfo = (list: any[]) => {
-    const map = new Map()
-    const result: any[] = []
+	const map = new Map()
+	const result: any[] = []
 
-    // 所有插件都先放进 map，初始化 children
-    list.forEach(item => {
-        map.set(item.key, { ...item, children: [] })
-    })
+	// 所有插件都先放进 map，初始化 children
+	list.forEach((item) => {
+		if(!item.isHideen){
+			map.set(item.key, { ...item, children: [] })
+		}
+	})
 
-    // 第二次遍历构建父子关系
-    list.forEach(item => {
-        if (item.support_app && map.has(item.support_app)) {
-            const parent = map.get(item.support_app)
-            parent.children.push(map.get(item.key)) // 直接取已经构建好的对象
-        }
-    })
+	// 第二次遍历构建父子关系
+	list.forEach((item) => {
+		if (!item.isHideen && item.support_app && map.has(item.support_app)) {
+			const parent = map.get(item.support_app)
+			parent.children.push(map.get(item.key)) // 直接取已经构建好的对象
+		}
+	})
 
-    // 最终收集那些没有作为子插件挂载出去的插件（即顶层插件）
-    map.forEach((item: any) => {
-        if (!item.support_app || !map.has(item.support_app)) {
-            result.push(item)
-        }
-    })
+	// 最终收集那些没有作为子插件挂载出去的插件（即顶层插件）
+	map.forEach((item: any) => {
+		if (!item.support_app || !map.has(item.support_app)) {
+			result.push(item)
+		}
+	})
 
-    return result
+	return result
 }
 
 const query = () => {
-    const name = search_name.value
-    const type = search_type.value
+	const name = search_name.value
+	const type = search_type.value
 
-    // 如果没填搜索关键词也没选类型，重置所有列表
-    if ((!name || name === '') && (type === '' || type == null)) {
-        info.value.installed = buildInfo(localList.value.installed)
-        info.value.uninstalled = buildInfo(localList.value.uninstalled)
-        info.value.all = buildInfo(localList.value.all)
-        info.value.recentlyUpdated = buildInfo(localList.value.recentlyUpdated)
-        return
-    }
+	// 如果没填搜索关键词也没选类型，重置所有列表
+	if ((!name || name === '') && (type === '' || type == null)) {
+		info.value.installed = buildInfo(localList.value.installed)
+		info.value.uninstalled = buildInfo(localList.value.uninstalled)
+		info.value.all = buildInfo(localList.value.all)
+		info.value.recentlyUpdated = buildInfo(localList.value.recentlyUpdated)
+		return
+	}
 
-    // 公共筛选函数
-    const filterList = (list: any[]) => {
-        return list.filter((el: any) => {
-        const matchName = !name || el.title.includes(name)
-        const matchType = !type || el.type === type
-        return matchName && matchType
-        })
-    }
+	// 公共筛选函数
+	const filterList = (list: any[]) => {
+		return list.filter((el: any) => {
+			const matchName = !name || el.title.includes(name)
+			const matchType = !type || el.type === type
+			return matchName && matchType
+		})
+	}
 
-    info.value.installed = buildInfo(filterList(localList.value.installed))
-    info.value.uninstalled = buildInfo(filterList(localList.value.uninstalled))
-    info.value.all = buildInfo(filterList(localList.value.all))
-    info.value.recentlyUpdated = buildInfo(filterList(localList.value.recentlyUpdated))
+	info.value.installed = buildInfo(filterList(localList.value.installed))
+	info.value.uninstalled = buildInfo(filterList(localList.value.uninstalled))
+	info.value.all = buildInfo(filterList(localList.value.all))
+	info.value.recentlyUpdated = buildInfo(filterList(localList.value.recentlyUpdated))
 }
 
 const localList = ref({
-    installed: [],
-    uninstalled: [],
-    all: [],
-    recentlyUpdated: [],
-    error: ''
+	installed: [],
+	uninstalled: [],
+	all: [],
+	recentlyUpdated: [],
+	error: '',
 })
 
 const localListFn = () => {
-    loading.value = true
-    getAddonLocal({}).then((res) => {
-        const data = res.data.list
-        localList.value.error = res.data.error
-        localList.value.installed = []
-        localList.value.uninstalled = []
-        localList.value.all = []
-        localList.value.recentlyUpdated = []
-        for (const i in data) {
-            if (data[i].is_local == false) localList.value.all.push(data[i])
+	loading.value = true
+	getAddonLocal({})
+		.then((res) => {
+			const data = res.data.list
+			localList.value.error = res.data.error
+			localList.value.installed = []
+			localList.value.uninstalled = []
+			localList.value.all = []
+			localList.value.recentlyUpdated = []
+			for (const i in data) {
+				if (data[i].is_local == false) localList.value.all.push(data[i])
 
-            if (data[i].install_info && Object.keys(data[i].install_info)?.length) {
-                localList.value.installed.push(data[i])
-                if (data[i].install_info.version != data[i].version) {
-                    localList.value.recentlyUpdated.push(data[i])
-                }
-            } else {
-                if (data[i].is_download == true) localList.value.uninstalled.push(data[i])
-            }
-        }
-        query()
-        userStore.routers.forEach((item, index) => {
-            if (item.children && item.children.length) {
-                item.name = findFirstValidRoute(item.children)
-                appLink.value[item.meta.app] = findFirstValidRoute(item.children)
-            } else {
-                appLink.value[item.meta.app] = item.name
-            }
-        })
-        activeNameTabFn(activeName.value)
-        loading.value = false
-    }).catch(() => {
-        loading.value = false
-    })
+				if (data[i].install_info && Object.keys(data[i].install_info)?.length) {
+					localList.value.installed.push(data[i])
+					if (data[i].install_info.version != data[i].version) {
+						localList.value.recentlyUpdated.push(data[i])
+					}
+				} else {
+					if (data[i].is_download == true) localList.value.uninstalled.push(data[i])
+				}
+			}
+			query()
+			userStore.routers.forEach((item, index) => {
+				if (item.children && item.children.length) {
+					item.name = findFirstValidRoute(item.children)
+					appLink.value[item.meta.app] = findFirstValidRoute(item.children)
+				} else {
+					appLink.value[item.meta.app] = item.name
+				}
+			})
+			activeNameTabFn(activeName.value)
+			loading.value = false
+		})
+		.catch(() => {
+			loading.value = false
+		})
 }
-
 localListFn()
 
-// 点击应用可以进系统
+const noAppLen = computed(()=>{
+	let num = 0
+	if(localList.value[activeName.value] && localList.value[activeName.value].length){
+		localList.value[activeName.value].forEach(item=>{
+			if(item.isHideen){
+				num++
+			}
+		})
+	}
+	return num == localList.value[activeName.value].length
+})
 
+const searchFormRef = ref<FormInstance>()
+const searchFn = ()=>{
+	localList.value[activeName.value].forEach(item=>{
+		item.isHideen = true
+		let keywords = searchParam.keywords;
+		let type = searchParam.type;
+		const typeMatch = !type || item.type === type;
+		const keywordsMatch = !keywords || item.title.indexOf(keywords) !== -1;
+		if(typeMatch && keywordsMatch){
+			item.isHideen = false
+		}
+	})
+
+	if(showType.value != 'card') query()
+}
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+	searchParam.keywords = ''
+	searchParam.type = ''
+	searchFn()
+}
+
+// 点击应用可以进系统
 const appLink: any = ref({})
 const itemPath = (data: any) => {
-    if (data.type == 'app' && Object.keys(data.install_info).length) {
-        storage.set({ key: 'menuAppStorage', data: data.key })
-        storage.set({ key: 'plugMenuTypeStorage', data: '' })
-        const appMenuList = userStore.appMenuList
-        appMenuList.push(data.key)
-        userStore.setAppMenuList(appMenuList)
-        const name: any = appLink.value[data.key]
-        router.push({ name })
-    }
+	if (data.type == 'app' && Object.keys(data.install_info).length) {
+		storage.set({ key: 'menuAppStorage', data: data.key })
+		storage.set({ key: 'plugMenuTypeStorage', data: '' })
+		const appMenuList = userStore.appMenuList
+		appMenuList.push(data.key)
+		userStore.setAppMenuList(appMenuList)
+		const name: any = appLink.value[data.key]
+		router.push({ name })
+	}
 }
 
 const currAddon = ref('')
@@ -822,44 +1246,44 @@ const installCheckResult = ref({})
 let flashInterval = null
 const terminalFlash = new TerminalFlash()
 const onExecCmd = (key, command, success, failed, name) => {
-    if (command == '开始安装插件') {
-        success(terminalFlash)
-        const frames = makeIterator(['/', '——', '\\', '|'])
-        flashInterval = setInterval(() => {
-            terminalFlash.flush('> ' + frames.next().value)
-        }, 150)
-    }
+	if (command == '开始安装插件') {
+		success(terminalFlash)
+		const frames = makeIterator(['/', '——', '\\', '|'])
+		flashInterval = setInterval(() => {
+			terminalFlash.flush('> ' + frames.next().value)
+		}, 150)
+	}
 }
 
-function makeIterator (array: string[]) {
-    let nextIndex = 0
-    return {
-        next () {
-            if (nextIndex + 1 == array.length) {
-                nextIndex = 0
-            }
-            return { value: array[nextIndex++] }
-        }
-    }
+function makeIterator(array: string[]) {
+	let nextIndex = 0
+	return {
+		next() {
+			if (nextIndex + 1 == array.length) {
+				nextIndex = 0
+			}
+			return { value: array[nextIndex++] }
+		},
+	}
 }
 
 /**
  * 安装
  * @param key
- */
+*/
 const installAddonFn = (key: string) => {
-    currAddon.value = key
+	currAddon.value = key
 
-    preInstallCheck(key).then((res) => {
-        installStep.value = 0
-        isBack.value = false
-        errorDialog.value = false
-        installType.value = ''
-        installShowDialog.value = true
-        installAfterTips.value = []
-        installCheckResult.value = res.data
-        userStore.clearRouters()
-    })
+	preInstallCheck(key).then((res) => {
+		installStep.value = 0
+		isBack.value = false
+		errorDialog.value = false
+		installType.value = ''
+		installShowDialog.value = true
+		installAfterTips.value = []
+		installCheckResult.value = res.data
+		userStore.clearRouters()
+	})
 }
 
 /**
@@ -871,89 +1295,93 @@ let upgradeTimer: ReturnType<typeof setInterval> | null = null
 let notificationEl = null
 
 const getInstallTask = (first: boolean = true) => {
-    getAddonInstalltask().then((res) => {
-        if (res.data) {
-            upgradeStartTime.value = Date.now()
-            upgradeDuration.value = 0
-            if (upgradeTimer) clearInterval(upgradeTimer)
-            upgradeTimer = setInterval(() => {
-                upgradeDuration.value++
-            }, 1000)
-            if (first) {
-                installLog = []
-                currAddon.value = res.data.addon
-                if (!installShowDialog.value) {
-                    notificationEl = ElNotification.success({
-                        title: t('warning'),
-                        dangerouslyUseHTMLString: true,
-                        message: h('div', {}, [t('installingTips'), h('span', {
-                            class: 'text-primary cursor-pointer',
-                            onClick: checkInstallTask
-                        }, [t('installPercent')])]),
-                        duration: 0,
-                        showClose: false
-                    })
-                }
-            }
-            if (res.data.error) {
-                terminalRef.value.pushMessage({ content: res.data.error, class: 'error' })
-                errorMsg.value = res.data.error
-                errorDialog.value = true
-                if (upgradeTimer) {
-                    clearInterval(upgradeTimer)
-                    upgradeTimer = null
-                }
-                // ElMessage({ message: '插件安装失败', type: 'error', duration: 5000 })
-                return
-            }
-            if (res.data.mode == 'cloud') {
-                getCloudInstallLog()
-            }
-            setTimeout(() => {
-                getInstallTask(false)
-            }, 2000)
-
-        } else {
-            if (!first) {
-                installStep.value = 2
-                if (upgradeTimer) {
-                    clearInterval(upgradeTimer)
-                    upgradeTimer = null
-                }
-                localListFn()
-                userStore.clearRouters()
-                notificationEl.close()
-            }
-        }
-    }).catch((e) => {
-        terminalRef.value.pushMessage({ content: e.message, class: 'error' })
-    })
+	getAddonInstalltask()
+		.then((res) => {
+			if (res.data) {
+				if (first) {
+					installLog = []
+					currAddon.value = res.data.addon
+					if (!installShowDialog.value) {
+						notificationEl = ElNotification.success({
+							title: t('warning'),
+							dangerouslyUseHTMLString: true,
+							message: h('div', {}, [
+								t('installingTips'),
+								h(
+									'span',
+									{
+										class: 'text-primary cursor-pointer',
+										onClick: checkInstallTask,
+									},
+									[t('installPercent')],
+								),
+							]),
+							duration: 0,
+							showClose: false,
+						})
+					}
+					if (upgradeTimer) clearInterval(upgradeTimer)
+					upgradeDuration.value = parseInt(Date.now() / 1000) - res.data.timestamp
+					upgradeTimer = setInterval(() => {
+						upgradeDuration.value++
+					}, 1000)
+				}
+				if (res.data.error) {
+					terminalRef.value?.pushMessage({ content: res.data.error, class: 'error' })
+					errorMsg.value = res.data.error
+					errorDialog.value = true
+					if (upgradeTimer) {
+						clearInterval(upgradeTimer)
+						upgradeTimer = null
+					}
+					// ElMessage({ message: '插件安装失败', type: 'error', duration: 5000 })
+					return
+				}
+				if (res.data.mode == 'cloud') {
+					getCloudInstallLog()
+				}
+				setTimeout(() => {
+					getInstallTask(false)
+				}, 2000)
+			} else {
+				if (!first) {
+					installStep.value = 2
+					if (upgradeTimer) {
+						clearInterval(upgradeTimer)
+						upgradeTimer = null
+					}
+					localListFn()
+					userStore.clearRouters()
+					notificationEl?.close()
+				}
+			}
+		})
+		.catch((e) => {
+			console.log(e)
+			terminalRef.value?.pushMessage({ content: e.message, class: 'error' })
+		})
 }
 
 getInstallTask()
 
 const isBack = ref(false)
 const handleBack = () => {
-    isBack.value = true
-    installStep.value = 1
-    errorDialog.value = false
+	isBack.value = true
+	installStep.value = 1
+	errorDialog.value = false
 }
 
 const formatUpgradeDuration = computed(() => {
-    const s = upgradeDuration.value
-    const h = Math.floor(s / 3600)
-    const m = Math.floor((s % 3600) / 60)
-    const sec = s % 60
-    return [
-        h > 0 ? `${h}小时` : '',
-        m > 0 ? `${m}分钟` : '',
-        `${sec}秒`
-    ].filter(Boolean).join('')
+	const s = upgradeDuration.value
+	const h = Math.floor(s / 3600)
+	const m = Math.floor((s % 3600) / 60)
+	const sec = s % 60
+	return [h > 0 ? `${h}小时` : '', m > 0 ? `${m}分钟` : '', `${sec}秒`].filter(Boolean).join('')
 })
 
 const checkInstallTask = () => {
-    installShowDialog.value = true
-    installStep.value = 1
+	installShowDialog.value = true
+	installStep.value = 1
 }
 
 const localInstalling = ref(false)
@@ -962,28 +1390,30 @@ const localInstalling = ref(false)
  */
 const installType = ref('')
 const handleInstall = () => {
-    if (!installCheckResult.value.is_pass || localInstalling.value) return
-    installType.value = 'local'
-    localInstalling.value = true
-    upgradeStartTime.value = Date.now()
-    upgradeDuration.value = 0
-    if (upgradeTimer) clearInterval(upgradeTimer)
-    upgradeTimer = setInterval(() => {
-        upgradeDuration.value++
-    }, 1000)
+	if (!installCheckResult.value.is_pass || localInstalling.value) return
+	installType.value = 'local'
+	localInstalling.value = true
+	upgradeStartTime.value = Date.now()
+	upgradeDuration.value = 0
+	if (upgradeTimer) clearInterval(upgradeTimer)
+	upgradeTimer = setInterval(() => {
+		upgradeDuration.value++
+	}, 1000)
 
-    installAddon({ addon: currAddon.value }).then((res) => {
-        installStep.value = 2
-        if (upgradeTimer) {
-            clearInterval(upgradeTimer)
-            upgradeTimer = null
-        }
-        localListFn()
-        localInstalling.value = false
-        if (res.data.length) installAfterTips.value = res.data
-    }).catch((res) => {
-        localInstalling.value = false
-    })
+	installAddon({ addon: currAddon.value })
+		.then((res) => {
+			installStep.value = 2
+			if (upgradeTimer) {
+				clearInterval(upgradeTimer)
+				upgradeTimer = null
+			}
+			localListFn()
+			localInstalling.value = false
+			if (res.data.length) installAfterTips.value = res.data
+		})
+		.catch((res) => {
+			localInstalling.value = false
+		})
 }
 
 const cloudInstalling = ref(false)
@@ -992,65 +1422,71 @@ const cloudInstalling = ref(false)
  * 云安装插件
  */
 const handleCloudInstall = () => {
-    if (!authCode.value) {
-        authElMessageBox()
-        return
-    }
+	if (!authCode.value) {
+		authElMessageBox()
+		return
+	}
 
-    if (!installCheckResult.value.is_pass || cloudInstalling.value) return
-    cloudInstalling.value = true
-    installType.value = 'cloud'
+	if (!installCheckResult.value.is_pass || cloudInstalling.value) return
+	cloudInstalling.value = true
+	installType.value = 'cloud'
 
-    cloudInstallAddon({ addon: currAddon.value }).then((res) => {
-        installStep.value = 1
-        terminalRef.value.execute('clear')
-        terminalRef.value.execute('开始安装插件')
-        if (res.data.length) installAfterTips.value = res.data
-        getInstallTask()
-        cloudInstalling.value = false
-    }).catch((res) => {
-        cloudInstalling.value = false
-    })
+	cloudInstallAddon({ addon: currAddon.value })
+		.then((res) => {
+			installStep.value = 1
+			terminalRef.value.execute('clear')
+			terminalRef.value.execute('开始安装插件')
+			if (res.data.length) installAfterTips.value = res.data
+			getInstallTask()
+			cloudInstalling.value = false
+		})
+		.catch((res) => {
+			cloudInstalling.value = false
+		})
 }
 
 const authElMessageBox = () => {
-    ElMessageBox.confirm(t('authTips'), t('warning'), {
-        distinguishCancelAndClose: true,
-        confirmButtonText: t('toBind'),
-        cancelButtonText: t('toNiucloud')
-    }).then(() => {
-        authCodeApproveFn()
-    }).catch((action: string) => {
-        if (action === 'cancel') {
-            window.open('https://www.niucloud.com/app')
-        }
-    })
+	ElMessageBox.confirm(t('authTips'), t('warning'), {
+		distinguishCancelAndClose: true,
+		confirmButtonText: t('toBind'),
+		cancelButtonText: t('toNiucloud'),
+	})
+		.then(() => {
+			authCodeApproveFn()
+		})
+		.catch((action: string) => {
+			if (action === 'cancel') {
+				window.open('https://www.niucloud.com/app')
+			}
+		})
 }
 const errorDialog = ref(false)
 const errorMsg = ref('')
 let installLog: string[] = []
 const getCloudInstallLog = () => {
-    getAddonCloudInstallLog(currAddon.value).then((res) => {
-        const data = res.data.data ?? []
-        if (data[0] && data[0].length && installShowDialog.value == true) {
-            data[0].forEach((item) => {
-                if (!installLog.includes(item.action)) {
-                    terminalRef.value.pushMessage({ content: `${ item.action }` })
-                    installLog.push(item.action)
+	getAddonCloudInstallLog(currAddon.value)
+		.then((res) => {
+			const data = res.data.data ?? []
+			if (data[0] && data[0].length && installShowDialog.value == true) {
+				data[0].forEach((item) => {
+					if (!installLog.includes(item.action)) {
+						terminalRef.value.pushMessage({ content: `${item.action}` })
+						installLog.push(item.action)
 
-                    if (item.code == 0) {
-                        terminalRef.value.pushMessage({ content: item.msg, class: 'error' })
-                    }
-                }
-            })
-        }
-    }).catch(() => {
-        notificationEl?.close()
-    })
+						if (item.code == 0) {
+							terminalRef.value.pushMessage({ content: item.msg, class: 'error' })
+						}
+					}
+				})
+			}
+		})
+		.catch(() => {
+			notificationEl?.close()
+		})
 }
 
 watch(currAddon, (nval) => {
-    installCheckResult.value = {}
+	installCheckResult.value = {}
 })
 
 // 卸载面板弹窗
@@ -1064,63 +1500,65 @@ const uninstallCheckResult = ref({})
  * @param key
  */
 const uninstallAddonFn = (key: string) => {
-    ElMessageBox.confirm(t('uninstallTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning'
-    }).then(() => {
-        handleUninstallAddon(key)
-    })
+	ElMessageBox.confirm(t('uninstallTips'), t('warning'), {
+		confirmButtonText: t('confirm'),
+		cancelButtonText: t('cancel'),
+		type: 'warning',
+	}).then(() => {
+		handleUninstallAddon(key)
+	})
 }
 
 /**
  * 插件升级
  * @param key
  */
-const upgradeAddonFn = (key: string) => {
-    upgradeRef.value?.open(key)
+const upgradeAddonFn = (data: any) => {
+	upgradeRef.value?.open(data.key,null,data)
 }
 
 /**
  * 云编译
  */
 const handleCloudBuild = () => {
-    if (!authCode.value) {
-        authElMessageBox()
-        return
-    }
-    if (cloudBuildRef.value.cloudBuildTask) {
-        cloudBuildRef.value?.open()
-        return
-    }
-    ElMessageBox.confirm(t('cloudBuildTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning'
-    }).then(() => {
-        cloudBuildRef.value?.open()
-    })
+	if (!authCode.value) {
+		authElMessageBox()
+		return
+	}
+	if (cloudBuildRef.value.cloudBuildTask) {
+		cloudBuildRef.value?.open()
+		return
+	}
+	ElMessageBox.confirm(t('cloudBuildTips'), t('warning'), {
+		confirmButtonText: t('confirm'),
+		cancelButtonText: t('cancel'),
+		type: 'warning',
+	}).then(() => {
+		cloudBuildRef.value?.open()
+	})
 }
 
 const handleUninstallAddon = (key: string) => {
-    preUninstallCheck(key).then(({ data }) => {
-        if (data.is_pass) {
-            uninstallAddon({ addon: key }).then((res) => {
-                localListFn()
-                userStore.clearRouters()
-                loading.value = false
-            }).catch(() => {
-                loading.value = false
-            })
-        } else {
-            uninstallCheckResult.value = data
-            uninstallShowDialog.value = true
-        }
-    })
+	preUninstallCheck(key).then(({ data }) => {
+		if (data.is_pass) {
+			uninstallAddon({ addon: key })
+				.then((res) => {
+					localListFn()
+					userStore.clearRouters()
+					loading.value = false
+				})
+				.catch(() => {
+					loading.value = false
+				})
+		} else {
+			uninstallCheckResult.value = data
+			uninstallShowDialog.value = true
+		}
+	})
 }
 
 const market = () => {
-    window.open('https://www.niucloud.com/app')
+	window.open('https://www.niucloud.com/app')
 }
 
 /**
@@ -1128,46 +1566,40 @@ const market = () => {
  * @param done
  */
 const installShowDialogClose = (done: () => {}) => {
-    if (installStep.value == 1 && !isBack.value && !errorDialog.value) {
-        ElMessageBox.confirm(t('installShowDialogCloseTips'), t('warning'), {
-            confirmButtonText: t('confirm'),
-            cancelButtonText: t('cancel'),
-            type: 'warning'
-        }).then(() => {
-            cancelInstall(currAddon.value)
-            if (upgradeTimer) {
-                clearInterval(upgradeTimer)
-                upgradeTimer = null
-            }
-            isBack.value = false
-            installType.value = ''
-            errorDialog.value = false
-            done()
-        })
-    } else if (installStep.value == 2) {
-        activeNameTabFn('installed')
-        location.reload()
-    } else {
-        done()
-    }
+	if (installStep.value == 1 && !isBack.value && !errorDialog.value) {
+		ElMessageBox.confirm(t('installShowDialogCloseTips'), t('warning'), {
+			confirmButtonText: t('confirm'),
+			cancelButtonText: t('cancel'),
+			type: 'warning',
+		}).then(() => {
+			cancelInstall(currAddon.value)
+			if (upgradeTimer) {
+				clearInterval(upgradeTimer)
+				upgradeTimer = null
+			}
+			isBack.value = false
+			installType.value = ''
+			errorDialog.value = false
+			done()
+		})
+	} else if (installStep.value == 2) {
+		activeNameTabFn('installed')
+		location.reload()
+	} else {
+		done()
+	}
 
-    flashInterval && clearInterval(flashInterval)
+	flashInterval && clearInterval(flashInterval)
 }
 
-// 插件详情
-const appStoreShowDialog = ref(false)
-const appStoreInfo = ref({})
-const getAddonDetailFn = (data: any) => {
-    appStoreShowDialog.value = true
-    appStoreInfo.value = data
-}
 // 更新信息
-
-const upgradeKey = ref<string>('')
 const updateInformationFn = (data: any) => {
-    // updateInformationDialog.value = true
-    upgradeKey.value = data.key
-    upgradeLogRef.value?.open()
+	data.version = frameworkNewVersion.value
+	data.title = '框架'
+	data.install_info = {
+		version: frameworkVersion.value
+	}
+	openDetail(data)
 }
 // 授权
 const authCodeApproveDialog = ref(false)
@@ -1176,419 +1608,665 @@ const getAuthCodeDialog = ref(null)
 const saveLoading = ref(false)
 const authLoading = ref(true)
 const checkAppMange = () => {
-    authLoading.value = true
-    getAuthInfo().then((res) => {
-        authLoading.value = false
-        if (res.data.data && res.data.data.length != 0) {
-            authinfo.value = res.data.data
-        }
-    }).catch(() => {
-        authLoading.value = false
-        authCodeApproveDialog.value = false
-    })
+	authLoading.value = true
+	getAuthInfo()
+		.then((res) => {
+			authLoading.value = false
+			if (res.data.data && res.data.data.length != 0) {
+				authinfo.value = res.data.data
+			}
+		})
+		.catch(() => {
+			authLoading.value = false
+			authCodeApproveDialog.value = false
+		})
 }
 
 checkAppMange()
 const authCodeApproveFn = () => {
-    authCodeApproveDialog.value = true
+	authCodeApproveDialog.value = true
 }
 
 const formData = reactive<Record<string, string>>({
-    auth_code: '',
-    auth_secret: ''
+	auth_code: '',
+	auth_secret: '',
 })
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-    auth_code: [{ required: true, message: t('authCodePlaceholder'), trigger: 'blur' }],
-    auth_secret: [{ required: true, message: t('authSecretPlaceholder'), trigger: 'blur' }]
+	auth_code: [{ required: true, message: t('authCodePlaceholder'), trigger: 'blur' }],
+	auth_secret: [{ required: true, message: t('authSecretPlaceholder'), trigger: 'blur' }],
 })
 
 const save = async (formEl: FormInstance | undefined) => {
-    if (saveLoading.value || !formEl) return
+	if (saveLoading.value || !formEl) return
 
-    await formEl.validate(async(valid) => {
-        if (valid) {
-            saveLoading.value = true
+	await formEl.validate(async (valid) => {
+		if (valid) {
+			saveLoading.value = true
 
-            setAuthInfo(formData).then(() => {
-                saveLoading.value = false
-                setTimeout(() => {
-                    location.reload()
-                }, 1000)
-            }).catch(() => {
-                saveLoading.value = false
-            })
-        }
-    })
+			setAuthInfo(formData)
+				.then(() => {
+					saveLoading.value = false
+					setTimeout(() => {
+						location.reload()
+					}, 1000)
+				})
+				.catch(() => {
+					saveLoading.value = false
+				})
+		}
+	})
 }
 
 const goRouter = () => {
-    window.open('https://www.niucloud.com/app')
+	window.open('https://www.niucloud.com/app')
 }
 
 const cloudBuildCheckDirFn = () => {
-    window.open('https://doc.niucloud.com/v6.html?keywords=/chang-jian-wen-ti-chu-li/er-shi-wu-3001-sheng-7ea7-yun-bian-yi-mu-lu-du-xie-quan-xian-zhuang-tai-bu-tong-guo-ru-he-chu-li')
+	window.open(
+		'https://doc.press.niucloud.com/php/v6-shop/use/chang-jian-wen-ti-chu-li/er-shi-wu-3001-sheng-7ea7-yun-bian-yi-mu-lu-du-xie-quan-xian-zhuang-tai-bu-tong-guo-ru-he-chu-li.html',
+	)
 }
 
 const deleteAddonFn = (key: string) => {
-    ElMessageBox.confirm(t('deleteAddonTips'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning'
-    }).then(() => {
-        deleteAddonDevelop(key).then(() => {
-            localListFn()
-        })
-    })
+	ElMessageBox.confirm(t('deleteAddonTips'), t('warning'), {
+		confirmButtonText: t('confirm'),
+		cancelButtonText: t('cancel'),
+		type: 'warning',
+	}).then(() => {
+		deleteAddonDevelop(key).then(() => {
+			localListFn()
+		})
+	})
 }
 
 const versionJudge = (row: any) => {
-    if (!row.support_version) return false
-    const supportVersionApp = row.support_version.split('.')
-    const frameworkVersionArr = frameworkVersion.value.split('.')
-    if (parseFloat(`${ supportVersionApp[0] }.${ supportVersionApp[1] }`) < parseFloat(`${ frameworkVersionArr[0] }.${ frameworkVersionArr[1] }`)) return true
-    return false
+	if (!row.support_version) return false
+	const supportVersionApp = row.support_version.split('.')
+	const frameworkVersionArr = frameworkVersion.value.split('.')
+	if (parseFloat(`${supportVersionApp[0]}.${supportVersionApp[1]}`) < parseFloat(`${frameworkVersionArr[0]}.${frameworkVersionArr[1]}`)) return true
+	return false
 }
 
-const batchUpgradeApp = ref<String[]>([])
-
 const appKeyAllSelect = () => {
-    if (localList.value[activeName.value].length) {
-        if (localList.value[activeName.value].length == batchUpgradeApp.value.length) {
-            batchUpgradeApp.value = []
-        } else {
-            batchUpgradeApp.value = localList.value[activeName.value].map(item => item.key)
-        }
-    }
+	if (localList.value[activeName.value].length) {
+		if (localList.value[activeName.value].length == batchUpgradeApp.value.length) {
+			batchUpgradeApp.value = []
+		} else {
+			batchUpgradeApp.value = localList.value[activeName.value].map((item) => item.key)
+		}
+	}
 }
 
 const appKeySingleSelect = (event: any, key: string) => {
-    if (activeName.value != 'recentlyUpdated' && activeName.value != 'uninstalled') return
-    if (batchUpgradeApp.value.includes(key)) {
-        batchUpgradeApp.value.splice(batchUpgradeApp.value.indexOf(key), 1)
-    } else {
-        batchUpgradeApp.value.push(key)
-    }
+	if (activeName.value != 'recentlyUpdated' && activeName.value != 'uninstalled') return
+	if (batchUpgradeApp.value.includes(key)) {
+		batchUpgradeApp.value.splice(batchUpgradeApp.value.indexOf(key), 1)
+	} else {
+		batchUpgradeApp.value.push(key)
+	}
 }
 
 const batchUpgrade = () => {
-    const appKeys = deepClone(batchUpgradeApp.value)
-    if (frameworkVersion.value != frameworkNewVersion.value) {
-        appKeys.unshift('niucloud-admin')
-    }
-    if (!appKeys.length) {
-        ElMessage({ message: localList.recentlyUpdated.length ? '请先勾选要升级的插件' : '当前已是最新版', type: 'error', duration: 5000 })
-        return
-    }
-    upgradeAddonFn(appKeys.toString())
+	const appKeys = deepClone(batchUpgradeApp.value)
+	if (frameworkVersion.value != frameworkNewVersion.value) {
+		appKeys.unshift('niucloud-admin')
+	}
+	if (!appKeys.length) {
+		ElMessage({
+			message: localList.recentlyUpdated.length ? '请先勾选要升级的插件' : '当前已是最新版',
+			type: 'error',
+			duration: 5000,
+		})
+		return
+	}
+	upgradeAddonFn({'key': appKeys.toString()})
 }
 
 const batchInstall = () => {
-    const appKeys = batchUpgradeApp.value
-    if (!appKeys.length) {
-        ElMessage({ message: '请先勾选要安装的插件', type: 'error', duration: 5000 })
-        return
-    }
-    installAddonFn(appKeys.toString())
+	const appKeys = batchUpgradeApp.value
+	if (!appKeys.length) {
+		ElMessage({ message: '请先勾选要安装的插件', type: 'error', duration: 5000 })
+		return
+	}
+	installAddonFn(appKeys.toString())
 }
 
 const visibleRowKeys = computed(() => {
-    return new Set((info.value[activeName.value] || []).map(row => row.key))
+	return new Set((info.value[activeName.value] || []).map((row) => row.key))
 })
 
-const oneClickRepair = () => {
-    ElMessage({ message: '即将上线敬请期待', duration: 5000 })
+// 应用详情  ------ start
+const isShowDetail = ref(false)
+const detailAddon = ref<any>(null)
+
+const detailInstalled = computed(() => {
+	const installInfo = detailAddon.value?.install_info
+	return Boolean(installInfo && Object.keys(installInfo).length)
+})
+const detailCurrentVersion = computed(() => {
+	const installInfo = detailAddon.value?.install_info
+	if (installInfo && Object.keys(installInfo).length) return installInfo.version || '-'
+	return detailAddon.value?.version || '-'
+})
+
+const detailVersionList = ref<any[]>([])
+const detailLogLoading = ref(false)
+const detailLogActive = ref(0)
+
+const timeSplit = (str: string) => {
+	if (!str) return ['-', '-']
+	const [date, time] = str.split(' ')
+	if (!time) return [date || '-', '-']
+	const [hours, minutes] = time.split(':')
+	return [date, `${hours}:${minutes}`]
+}
+
+const getDetailVersionList = async (appKey: string) => {
+	detailLogLoading.value = true
+	try {
+		const { data } = await getAppVersionList({ app_key: appKey })
+		detailVersionList.value = Array.isArray(data) ? data : []
+	} finally {
+		detailLogLoading.value = false
+	}
+}
+
+const openDetail = (row: any) => {
+	detailAddon.value = row
+	isShowDetail.value = true
+	detailLogActive.value = 0
+	detailVersionList.value = []
+	if (row?.key) getDetailVersionList(row.key)
+}
+
+const closeDetail = () => {
+	isShowDetail.value = false
+	detailAddon.value = null
+	detailVersionList.value = []
+}
+// 应用详情  ------ end
+
+const toLink = (type)=>{
+	if(type=='pc'){
+		window.open(`https://www.niucloud.com/app/detail/?id=${detailAddon.value.app_id}`)
+	}else{
+		window.open(`https://wap.niucloud.com/pages/product/detail?id=${detailAddon.value.app_id}`)
+	}
 }
 </script>
 
 <style lang="scss" scoped>
 .multi-hidden {
-    word-break: break-all;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-
-// 插件安装-弹窗-表格样式
-.table-head-bg {
-    background: #f5f7f9;
-}
-
-html.dark .table-head-bg {
-    background: #141414;
-}
-
-.el-alert .el-alert__title {
-    font-size: 16px;
-    line-height: 18px;
-}
-
-:deep(.terminal .t-log-box span) {
-    white-space: pre-wrap;
-}
-
-:deep(.data-loading) {
-    .el-table__body-wrapper {
-        display: none !important;
-    }
-}
-:deep(.hide-expand .el-table__expand-icon>.el-icon){
-  visibility: hidden;
-  pointer-events: none;
-}
-:deep(.el-input__wrapper){
-    box-shadow: none !important;
-    border-radius: 4px !important;
-    border: 1px solid #D1D5DB !important;
-    height: 32px !important;
-}
-:deep(.el-select__wrapper){
-    box-shadow: none !important;
-    border-radius: 4px !important;
-    border: 1px solid #D1D5DB !important;
-    height: 32px !important;
-}
-:deep(.el-button){
-    border-radius: 4px !important;
-}
-/* 设置 el-select 的 placeholder 颜色 */
-:deep(.search-form .el-select__placeholder.is-transparent) {
-    color: #C4C7DA;
-    font-size: 12px;
-}
-
-/* 设置 el-select 选中后的颜色 */
-:deep(.search-form .el-select__placeholder) {
-    color: #4F516D;
-    font-size: 12px;
-
-}
-/* 设置 el-input 的 placeholder 颜色 */
-:deep(.search-form .el-input__inner::placeholder) {
-    color: #C4C7DA;
-    font-size: 12px;
-
-}
-/* 设置 el-input 输入内容后的颜色 */
-:deep(.search-form .el-input__inner) {
-    color: #4F516D;
-    font-size: 12px;
-
-}
-/* 设置 el-date-picker 的 placeholder 颜色 */
-:deep(.search-form .el-date-editor .el-range-input::placeholder) {
-  color: #C4C7DA;
-  font-size: 12px;
-}
-
-/* 设置 el-date-picker 的输入内容颜色 */
-:deep(.search-form .el-date-editor .el-range-input) {
-  color: #4F516D;
-  font-size: 12px;
-}
-
-
-:deep(.el-table tr td:first-child) {
-    border-bottom: none;
-    // background-color: inherit !important;
-    height: 100px;
-}
-:deep(.el-table__body tr:hover td:first-child) {
-    // border-bottom: 1px solid var(--el-table-border-color);
-}
-:deep(.el-table__body tr) {
-  position: relative;
-}
-:deep(.el-table__body td:first-child::before) {
-    opacity: 0;
-    content: '';
-    position: absolute;
-    top: -1px;
-    left: 0;
-    right: 0;
-    height: 1px;
-    background-color: var(--el-table-border-color);
-    // transition: opacity 0.2s;
-    z-index: 1;
-}
-:deep(.el-table__body td:first-child) {
-    position: relative;
-}
-
-:deep(.el-table__body tr:hover td:first-child::before) {
-    opacity: 1;
-
-}
-/* 创建伪元素当作 hover 边框线，默认隐藏 */
-:deep(.el-table__body td:first-child::after) {
-    content: '';
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    height: 1px;
-    background-color: var(--el-table-border-color);
-    opacity: 0;
-    // transition: opacity 0.2s ease;
-    pointer-events: none;
-    z-index: 1;
-}
-
-/* 悬浮时显示这条伪边框线 */
-:deep(.el-table__body tr:hover td:first-child::after) {
-    opacity: 1;
-}
-
-:deep(.el-table__fixed-body-wrapper .el-table__row .el-table__cell) {
-    overflow: visible;
-}
-:deep(.el-table .el-table__expand-icon){
-    position: relative;
-    top: 12.5px;
-    left: -13px;
-    z-index: 99;
-    margin: 3px;
-    overflow: hidden;
-}
-:deep(.el-table__fixed-body-wrapper .el-table__cell:first-child) {
-  background-color: inherit !important; /* 从行继承背景色 */
-}
-
-:deep(.el-table tr td:nth-child(1)::before){
-    overflow: hidden !important;
-}
-:deep(.tree-child-cell) {
-  position: relative;
-  height: 100%;
-}
-:deep(.el-table .cell){
-    overflow: visible !important;
-}
-:deep(.tree-child-cell.is-tree-child::before) {
-  content: '';
-  position: absolute;
-  left: -5px;
-  top: -99px;
-  bottom: 0;
-  width: 1px;
-  height: 100px;
-  background-color: #F5F5F5;
-}
-
-:deep(.tree-child-cell.is-tree-child::after) {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: -5px;
-  width: 8px;
-  height: 1px;
-  background-color: #F5F5F5;
-}
-
-:deep(.hidden-selection-column .cell) {
-  display: none;
-}
-:deep(.el-dialog__title){
-    font-size: 20px;
-    font-weight: bold;
-}
-:deep(.el-result__title p){
-    font-size: 25px;
-    color: #1D1F3A;
-    font-weight: 500;
-}
-:deep(.el-result__subtitle p){
-    font-size: 15px;
-    color: #4F516D;
-    font-weight: 500;
-    word-break: break-all;
+	word-break: break-all;
 	text-overflow: ellipsis;
 	overflow: hidden;
 	display: -webkit-box;
 	-webkit-line-clamp: 2;
 	-webkit-box-orient: vertical;
 }
+
+// 插件安装-弹窗-表格样式
+.table-head-bg {
+	background: #f5f7f9;
+}
+
+html.dark .table-head-bg {
+	background: #141414;
+}
+
+.el-alert .el-alert__title {
+	font-size: 16px;
+	line-height: 18px;
+}
+
+:deep(.terminal .t-log-box span) {
+	white-space: pre-wrap;
+}
+
+:deep(.data-loading) {
+	.el-table__body-wrapper {
+		// display: none !important;
+	}
+}
+
+:deep(.hide-expand .el-table__expand-icon > .el-icon) {
+	visibility: hidden;
+	pointer-events: none;
+}
+
+:deep(.el-input__wrapper) {
+	box-shadow: none !important;
+	border-radius: 4px !important;
+	border: 1px solid #d1d5db !important;
+	height: 32px !important;
+}
+
+:deep(.el-select__wrapper) {
+	box-shadow: none !important;
+	border-radius: 4px !important;
+	border: 1px solid #d1d5db !important;
+	height: 32px !important;
+}
+
+:deep(.el-button) {
+	border-radius: 4px !important;
+}
+
+/* 设置 el-select 的 placeholder 颜色 */
+:deep(.search-form .el-select__placeholder.is-transparent) {
+	color: #c4c7da;
+	font-size: 12px;
+}
+
+/* 设置 el-select 选中后的颜色 */
+:deep(.search-form .el-select__placeholder) {
+	color: #4f516d;
+	font-size: 12px;
+}
+
+/* 设置 el-input 的 placeholder 颜色 */
+:deep(.search-form .el-input__inner::placeholder) {
+	color: #c4c7da;
+	font-size: 12px;
+}
+
+/* 设置 el-input 输入内容后的颜色 */
+:deep(.search-form .el-input__inner) {
+	color: #4f516d;
+	font-size: 12px;
+}
+
+/* 设置 el-date-picker 的 placeholder 颜色 */
+:deep(.search-form .el-date-editor .el-range-input::placeholder) {
+	color: #c4c7da;
+	font-size: 12px;
+}
+
+/* 设置 el-date-picker 的输入内容颜色 */
+:deep(.search-form .el-date-editor .el-range-input) {
+	color: #4f516d;
+	font-size: 12px;
+}
+
+:deep(.el-table tr td:first-child) {
+	border-bottom: none;
+	// background-color: inherit !important;
+	height: 100px;
+}
+
+:deep(.el-table__body tr:hover td:first-child) {
+	// border-bottom: 1px solid var(--el-table-border-color);
+}
+
+:deep(.el-table__body tr) {
+	position: relative;
+}
+
+:deep(.el-table__body td:first-child::before) {
+	opacity: 0;
+	content: '';
+	position: absolute;
+	top: -1px;
+	left: 0;
+	right: 0;
+	height: 1px;
+	background-color: var(--el-table-border-color);
+	// transition: opacity 0.2s;
+	z-index: 1;
+}
+
+:deep(.el-table__body td:first-child) {
+	position: relative;
+}
+
+:deep(.el-table__body tr:hover td:first-child::before) {
+	opacity: 1;
+}
+
+/* 创建伪元素当作 hover 边框线，默认隐藏 */
+:deep(.el-table__body td:first-child::after) {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	height: 1px;
+	background-color: var(--el-table-border-color);
+	opacity: 0;
+	// transition: opacity 0.2s ease;
+	pointer-events: none;
+	z-index: 1;
+}
+
+/* 悬浮时显示这条伪边框线 */
+:deep(.el-table__body tr:hover td:first-child::after) {
+	opacity: 1;
+}
+
+:deep(.el-table__fixed-body-wrapper .el-table__row .el-table__cell) {
+	overflow: visible;
+}
+
+:deep(.el-table .el-table__expand-icon) {
+	position: relative;
+	top: 12.5px;
+	left: -13px;
+	z-index: 99;
+	margin: 3px;
+	overflow: hidden;
+}
+
+:deep(.el-table__fixed-body-wrapper .el-table__cell:first-child) {
+	background-color: inherit !important; /* 从行继承背景色 */
+}
+
+:deep(.el-table tr td:nth-child(1)::before) {
+	overflow: hidden !important;
+}
+
+:deep(.tree-child-cell) {
+	position: relative;
+	height: 100%;
+}
+
+:deep(.el-table .cell) {
+	overflow: visible !important;
+}
+
+:deep(.tree-child-cell.is-tree-child::before) {
+	content: '';
+	position: absolute;
+	left: -5px;
+	top: -99px;
+	bottom: 0;
+	width: 1px;
+	height: 100px;
+	background-color: #f5f5f5;
+}
+
+:deep(.tree-child-cell.is-tree-child::after) {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: -5px;
+	width: 8px;
+	height: 1px;
+	background-color: #f5f5f5;
+}
+
+:deep(.hidden-selection-column .cell) {
+	display: none;
+}
+
+:deep(.el-dialog__title) {
+	font-size: 20px;
+	font-weight: bold;
+}
+
+:deep(.el-result__title p) {
+	font-size: 25px;
+	color: #1d1f3a;
+	font-weight: 500;
+}
+
+:deep(.el-result__subtitle p) {
+	font-size: 15px;
+	color: #4f516d;
+	font-weight: 500;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
 :deep(.number-of-steps) {
-    .el-step__line {
-        margin: 0 25px;
-        background: #dddddd;
-    }
+	.el-step__line {
+		margin: 0 25px;
+		background: #dddddd;
+	}
 
-    .el-step__head {
-        margin-top: 10px;
-    }
+	.el-step__head {
+		margin-top: 10px;
+	}
 
-    .is-success {
-        color: var(--el-color-primary);
-        border-color: var(--el-color-primary);
+	.is-success {
+		color: var(--el-color-primary);
+		border-color: var(--el-color-primary);
 
-        .el-step__icon {
-            background: var(--el-color-primary);
-            color: #fff;
-            // box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
+		.el-step__icon {
+			background: var(--el-color-primary);
+			color: #fff;
+			// box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
 
-            i {
-                color: #fff;
-            }
-        }
+			i {
+				color: #fff;
+			}
+		}
 
-        .el-step__line {
-            margin: 0 25px;
-            background: var(--el-color-primary);
-        }
-    }
-    .is-finish {
-        color: var(--el-color-primary);
-        border-color: var(--el-color-primary);
+		.el-step__line {
+			margin: 0 25px;
+			background: var(--el-color-primary);
+		}
+	}
 
-        .el-step__icon {
-            background: var(--el-color-primary)!important;
-            color: #fff !important;
-            // box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
+	.is-finish {
+		color: var(--el-color-primary);
+		border-color: var(--el-color-primary);
 
-            i {
-                color: #fff;
-            }
-        }
+		.el-step__icon {
+			background: var(--el-color-primary) !important;
+			color: #fff !important;
+			// box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
 
-        .el-step__line {
-            margin: 0 25px;
-            background: var(--el-color-primary);
-        }
-    }
+			i {
+				color: #fff;
+			}
+		}
 
-    .is-process {
-        color: var(--el-color-primary);
-        font-weight: inherit;
+		.el-step__line {
+			margin: 0 25px;
+			background: var(--el-color-primary);
+		}
+	}
 
-        // font-size: 18px;
-        .el-step__icon {
-            padding: 10px;
-            border: 1px solid var(--el-color-primary);
-            background: var(--el-color-primary)!important;
-            color: #fff !important;
-            // box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
-        }
-    }
+	.is-process {
+		color: var(--el-color-primary);
+		font-weight: inherit;
 
-    .is-wait {
-        color: #333;
-    }
+		// font-size: 18px;
+		.el-step__icon {
+			padding: 10px;
+			border: 1px solid var(--el-color-primary);
+			background: var(--el-color-primary) !important;
+			color: #fff !important;
+			// box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
+		}
+	}
+
+	.is-wait {
+		color: #333;
+	}
 }
 
 .app-card {
-    width: calc((100% - 120px) / 5);
-    min-width: 260px;
+	width: calc((100% - 120px) / 5);
+	min-width: 260px;
+
+	&.selected {
+		background-color: #f9f9f9;
+		border-color: #f9f9f9;
+	}
+}
+.product-card-item{
+	border: 1px solid #F1F1F1;
+	&:hover{
+		background-color: #f8f8f8;
+		border-color: #f8f8f8;
+	}
+}
+.app-ident{
+	margin: 0 3px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	min-width: 32px;
+	width: 32px;
+	height: 16px;
+	border-radius: 3px;
+	background: #F3321D;
+	font-size: 12px;
+	color: #fff;
+	white-space: nowrap;
+}
+.addon-ident{
+	margin: 0 3px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	min-width: 32px;
+	width: 32px;
+	height: 16px;
+	border-radius: 3px;
+	background: #8031F0;
+	font-size: 12px;
+	color: #fff;
+	white-space: nowrap;
 }
 
+.app-section-header {
+	display: flex;
+	align-items: center;
+	gap: 20px;
+}
+
+.app-section-title {
+	font-size: 16px;
+	font-weight: 400;
+	line-height: 20px;
+	white-space: nowrap;
+	color: #374151;
+}
+
+.app-section-line {
+	flex: 1;
+	height: 1px;
+	background: #EBEEF5;
+}
+:deep(.app-detail-static .el-card__body){
+	padding-top: 0 !important;
+}
+:deep(.detail-upgrade-log .el-timeline-item) {
+	min-height: 75px;
+}
+
+:deep(.detail-upgrade-log .el-timeline-item__node--normal) {
+	top: 32px;
+	left: 0;
+	width: 18px;
+	height: 18px;
+	background: #DCDDE6 !important;
+	border-radius: 50%;
+	position: relative;
+}
+
+:deep(.detail-upgrade-log .el-timeline-item__node--normal::before) {
+	content: '';
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 8px;
+	height: 8px;
+	background-color: #9699B6;
+	border-radius: 50%;
+	transform: translate(-50%, -50%);
+}
+
+:deep(.detail-upgrade-log .el-timeline-item__tail) {
+	top: 35px;
+	left: 8px;
+	border-left-color: #dddddd;
+	border-left-style: solid;
+	margin: 14px 0 0px;
+	height: calc(100% - 14px);
+}
+
+:deep(.detail-upgrade-log .el-timeline-item__wrapper) {
+	top: -15px !important;
+	padding-left: 32px !important;
+}
+
+:deep(.detail-upgrade-log .el-collapse) {
+	margin-left: 0;
+	background: #F9F9FB;
+	border: 1px solid #F1F1F8;
+	border-radius: 4px;
+}
+
+:deep(.detail-upgrade-log .el-collapse-item__header) {
+	border: none;
+	line-height: 25px;
+	height: auto;
+	position: relative;
+	z-index: 999;
+	background-color: transparent;
+	padding: 14px 16px;
+}
+
+:deep(.detail-upgrade-log .el-collapse-item__content) {
+	margin-top: 0;
+	padding-bottom: 0 !important;
+}
+:deep(.detail-upgrade-log .el-collapse-item .el-collapse-item__wrap){
+    border: 0;
+	border-top: 1px solid #F1F1F8;
+	background-color: transparent;
+	padding: 14px 16px;
+}
+:deep(.detail-upgrade-log .el-collapse-item .el-collapse-item__arrow){
+	display: none;
+}
+:deep(.detail-upgrade-log .el-collapse-item .collapse-arrow .expand){
+	display: block;
+}
+:deep(.detail-upgrade-log .el-collapse-item .collapse-arrow .fold-up){
+	display: none;
+}
+:deep(.detail-upgrade-log .el-collapse-item.is-active .collapse-arrow .expand){
+	display: none;
+}
+:deep(.detail-upgrade-log .el-collapse-item.is-active .collapse-arrow .fold-up){
+	display: block;
+}
+:deep(.app-list-tip .el-tag__content){
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.detail-btn-box button{
+	width: 90px;
+	height: 36px;
+	font-size: 14px !important;
+	border: 0;
+	&.el-button--info{
+		background-color: #ddd;
+		color: #666;
+	}
+	&.el-button--warning{
+		background-color: #03C92E;
+	}
+}
 </style>
 
 <style>
+.app-market .app-head .el-card__body{
+	padding-bottom: 3px !important;
+}
 .el-empty .el-empty__image {
-    width: auto;
+	width: auto;
 }
 </style>
diff --git a/admin/src/app/views/member/components/gift-point.vue b/admin/src/app/views/member/components/gift-point.vue
index 5cbda0870..71119b6ff 100644
--- a/admin/src/app/views/member/components/gift-point.vue
+++ b/admin/src/app/views/member/components/gift-point.vue
@@ -47,7 +47,7 @@ const formRules = reactive<FormRules>({
                         callback('请输入积分数量')
                     } else if (isNaN(value) || !regExp.number.test(value)) {
                         callback('积分数量格式错误')
-                    } else if (value <=0) {
+                    } else if (value <= 0) {
                         callback('积分数量不能小于等于0')
                     } else{
                         callback();
diff --git a/admin/src/app/views/member/components/member-balance-edit.vue b/admin/src/app/views/member/components/member-balance-edit.vue
index e6a38b4f2..598ca092e 100644
--- a/admin/src/app/views/member/components/member-balance-edit.vue
+++ b/admin/src/app/views/member/components/member-balance-edit.vue
@@ -14,7 +14,9 @@
             </el-form-item>
 
             <el-form-item :label="t('adjustBalance')" prop="adjust">
-                <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustBalancePlaceholder')" @focus="formData.adjust = ''"  class="!w-[200px]"/>
+                <div>
+                    <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustBalancePlaceholder')" @focus="formData.adjust = ''"  class="!w-[200px]"/>
+                </div>
             </el-form-item>
 
             <el-form-item :label="t('memo')" prop="memo">
@@ -70,7 +72,7 @@ const formRules = computed(() => {
                         callback(new Error(t('adjustBalancePlaceholder')))
                     }
 
-                    if (formData.adjust_type == -1 && (parseFloat(formData.balance) - adjust < 0)) {
+                    if (formData.adjust_type == -1 && (parseFloat(formData.balance) - adjust) < 0) {
                         callback(new Error(t('adjustBalanceMaxAccountMessage')))
                     }
 
diff --git a/admin/src/app/views/member/components/member-point-edit.vue b/admin/src/app/views/member/components/member-point-edit.vue
index c89edefe7..214bf2842 100644
--- a/admin/src/app/views/member/components/member-point-edit.vue
+++ b/admin/src/app/views/member/components/member-point-edit.vue
@@ -14,7 +14,9 @@
             </el-form-item>
 
             <el-form-item :label="t('adjustPoint')" prop="adjust">
-                <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustPlaceholder')"  @focus="formData.adjust = ''"  class="!w-[200px]"/>
+                <div>
+                    <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustPlaceholder')"  @focus="formData.adjust = ''"  class="!w-[200px]"/>
+                </div>
             </el-form-item>
 
             <el-form-item :label="t('memo')" prop="memo">
@@ -72,7 +74,7 @@ const formRules = computed(() => {
                         callback(new Error(t('adjustPointPlaceholder')))
                     }
 
-                    if (formData.adjust_type == -1 && (parseFloat(formData.point) - adjust < 0)) {
+                    if (formData.adjust_type == -1 && (parseFloat(formData.point) - adjust) < 0) {
                         callback(new Error(t('adjustPointMaxAccountMessage')))
                     }
 
diff --git a/admin/src/app/views/poster/list.vue b/admin/src/app/views/poster/list.vue
index 72462ac25..d28a4a524 100644
--- a/admin/src/app/views/poster/list.vue
+++ b/admin/src/app/views/poster/list.vue
@@ -279,6 +279,8 @@ const previewPoster = (data: any) => {
             previewDialogVisible.value = true
         } 
         isRepeat.value = false
+    }).catch(() => {
+        isRepeat.value = false
     })
 }
 
diff --git a/admin/src/app/views/setting/components/sms_signature.vue b/admin/src/app/views/setting/components/sms_signature.vue
index 379a71b2c..6e7d2dcb6 100644
--- a/admin/src/app/views/setting/components/sms_signature.vue
+++ b/admin/src/app/views/setting/components/sms_signature.vue
@@ -1,142 +1,247 @@
 <template>
-    <div>
-        <el-dialog v-model="visible" :title="t('选择签名')" width="1200px" destroy-on-close :close-on-click-modal="false">
-            <el-alert type="warning" :closable="false" class="!mb-[10px]">
-                <template #default>
-                    <p>签名数据的变更（新增 / 删除）需经过五分钟的生效周期，在此期间系统将完成数据同步与更新</p>
-                </template>
-            </el-alert>
-            <div class="flex justify-between items-center mb-[16px]">
-                <el-button type="primary" @click="addEvent">{{ t('添加短信签名') }}</el-button>
-            </div>
-            <div class="mb-[10px] flex items-center">
-                <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
-                <el-button @click="batchDeleteEvent" size="small">{{t("批量删除")}}</el-button>
-            </div>
-            <el-table :data="tableData.data" size="large" v-loading="tableData.loading" ref="smsSignListTableRef" @selection-change="handleSelectionChange">
-                <template #empty>
-                    <span>{{ !tableData.loading ? t("emptyData") : "" }}</span>
-                </template>
-                <el-table-column type="selection" :selectable="checkSelectable" width="55" />
-                <el-table-column prop="sign" :label="t('签名名称')" min-width="200" />
-                <el-table-column prop="is_default" :label="t('使用状态')" min-width="120">
-                    <template #default="{ row }">
-                        <div>{{ row.is_default? t('使用中') : t('未使用') }}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="auditResultName" :label="t('审核状态')" min-width="200">
-                    <template #default="{ row }">
-                        <div>
-                            <div :class="[row.auditResult == 2 ? 'text-green-600' : '']">{{ row.auditResultName }}</div>
-                            <div class="text-red-600" v-if="row.auditResult != 2">{{ row.auditMsg }}</div>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="realNameDx" :label="t('实名状态')" min-width="200">
-                    <template #header>
-                        <div style="display: inline-flex; align-items: center">
-                            <span class="mr-[5px]">{{ t('实名状态') }}</span>
-                            <el-tooltip class="box-item" effect="light" placement="top">
-                                <template #content>
-                                    状态标识说明：<br />未实名状态显示为灰色；<br />实名通过状态显示为绿色；<br />实名失败状态显示为红色。<br />
-                                    短信接收条件：仅当手机号在对应运营商处实名通过后，才可接收短信。
-                                </template>
-                                <el-icon color="#666">
-                                    <QuestionFilled />
-                                </el-icon>
-                            </el-tooltip>
-                        </div>
-                    </template>
-                    <template #default="{ row }">
-                        <div class="flex gap-[5px]">
-                            <el-tag :type="row.realNameLt == 0 ? 'info' : row.realNameLt == 1 ? 'success' : 'danger'">{{ t("联通") }}</el-tag>
-                            <el-tag :type="row.realNameYd == 0 ? 'info' : row.realNameYd == 1 ? 'success' : 'danger'">{{ t("移动") }}</el-tag>
-                            <el-tag :type="row.realNameDx == 0 ? 'info' : row.realNameDx == 1 ? 'success' : 'danger'">{{ t("电信") }}</el-tag>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="create_time" :label="t('createTime')" min-width="120">
-                    <template #default="{ row }">
-                        <div>{{ row.createTime }}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column :label="t('操作')" fixed="right" align="right" min-width="120">
-                    <template #default="{ row }">
-                        <el-button type="primary" link @click="selectTemplate(row)" v-if="!row.is_default && row.auditResult == 2">
-                            {{ t("使用") }}
-                        </el-button>
-                        <el-button type="primary" link @click="deleteTemplate(row)" v-if="!row.is_default">
-                            {{ t("删除") }}
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
+	<div>
+		<el-dialog v-model="visible" :title="t('选择签名')" width="1200px" destroy-on-close :close-on-click-modal="false">
+			<el-alert type="warning" :closable="false" class="!mb-[10px]">
+				<template #default>
+					<p>签名数据的变更（新增 / 删除）需经过五分钟的生效周期，在此期间系统将完成数据同步与更新</p>
+				</template>
+			</el-alert>
+			<div class="flex justify-between items-center mb-[16px]">
+				<el-button type="primary" @click="addEvent">{{ t('添加短信签名') }}</el-button>
+			</div>
+			<div class="mb-[10px] flex items-center">
+				<el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
+				<el-button @click="batchDeleteEvent" size="small">{{ t('批量删除') }}</el-button>
+			</div>
+			<el-table
+				:data="tableData.data"
+				size="large"
+				v-loading="tableData.loading"
+				ref="smsSignListTableRef"
+				@selection-change="handleSelectionChange"
+			>
+				<template #empty>
+					<span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+				</template>
+				<el-table-column type="selection" :selectable="checkSelectable" width="55" />
+				<el-table-column prop="sign" :label="t('签名名称')" min-width="200" />
+				<el-table-column prop="is_default" :label="t('使用状态')" min-width="120">
+					<template #default="{ row }">
+						<div>
+							{{ row.is_default ? t('使用中') : t('未使用') }}
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="auditResultName" :label="t('审核状态')" min-width="200">
+					<template #default="{ row }">
+						<div>
+							<div :class="[row.auditResult == 2 ? 'text-green-600' : '']">
+								{{ row.auditResultName }}
+							</div>
+							<div class="text-red-600" v-if="row.auditResult != 2">
+								{{ row.auditMsg }}
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="realNameDx" :label="t('实名状态')" min-width="200">
+					<template #header>
+						<div style="display: inline-flex; align-items: center">
+							<span class="mr-[5px]">{{ t('实名状态') }}</span>
+							<el-tooltip class="box-item" effect="light" placement="top">
+								<template #content>
+									状态标识说明：<br />未实名状态显示为灰色；<br />实名通过状态显示为绿色；<br />实名失败状态显示为红色。<br />
+									短信接收条件：仅当手机号在对应运营商处实名通过后，才可接收短信。
+								</template>
+								<el-icon color="#666">
+									<QuestionFilled />
+								</el-icon>
+							</el-tooltip>
+						</div>
+					</template>
+					<template #default="{ row }">
+						<div class="flex gap-[5px]">
+							<el-tag :type="row.realNameLt == 0 ? 'info' : row.realNameLt == 1 ? 'success' : 'danger'">{{ t('联通') }}</el-tag>
+							<el-tag :type="row.realNameYd == 0 ? 'info' : row.realNameYd == 1 ? 'success' : 'danger'">{{ t('移动') }}</el-tag>
+							<el-tag :type="row.realNameDx == 0 ? 'info' : row.realNameDx == 1 ? 'success' : 'danger'">{{ t('电信') }}</el-tag>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="create_time" :label="t('createTime')" min-width="120">
+					<template #default="{ row }">
+						<div>{{ row.createTime }}</div>
+					</template>
+				</el-table-column>
+				<el-table-column :label="t('操作')" fixed="right" align="right" min-width="120">
+					<template #default="{ row }">
+						<el-button type="primary" link @click="selectTemplate(row)" v-if="!row.is_default && row.auditResult == 2">
+							{{ t('使用') }}
+						</el-button>
+						<el-button type="primary" link @click="deleteTemplate(row)" v-if="!row.is_default">
+							{{ t('删除') }}
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
 
-            <div class="mt-[16px] flex justify-end">
-                <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
-                    layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"  @size-change="loadSignList()" @current-change="loadSignList" />
-            </div>
+			<div class="mt-[16px] flex justify-end">
+				<el-pagination
+					v-model:current-page="tableData.page"
+					v-model:page-size="tableData.limit"
+					layout="total, sizes, prev, pager, next, jumper"
+					:total="tableData.total"
+					@size-change="loadSignList()"
+					@current-change="loadSignList"
+				/>
+			</div>
 
-            <template #footer>
-                <el-button @click="visible = false">{{ t("cancel") }}</el-button>
-            </template>
-        </el-dialog>
-        <el-dialog v-model="visibleAdd" :title="t('添加签名')" width="800px" destroy-on-close :close-on-click-modal="false">
-            <el-form label-width="150px" :model="formData" ref="formRef" :rules="formRules" class="page-form ml-[20px]">
-                <el-form-item :label="t('短信签名')" prop="signature">
-                    <el-input v-model="formData.signature" placeholder="请输入短信签名" class="input-width" maxlength="20"  show-word-limit clearable />
-                </el-form-item>
-                <div class="ml-[150px] text-[12px] text-[#999] leading-[20px]">必须由【】包裹，例如：【test】</div>
-                <div class="my-[5px] ml-[150px] text-[12px] text-[#999] leading-[20px]">字数要求在2-20个字符，不能使用空格和特殊符号“ - + = * & % # @ ~等;</div>
-                <el-form-item :label="t('短信示例内容')" prop="contentExample">
-                    <el-input v-model="formData.contentExample" placeholder="请输入短信示例内容" clearable  maxlength="50"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('企业名称')" prop="companyName">
-                    <el-input v-model="formData.companyName" placeholder="请输入企业名称" clearable  maxlength="20"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('社会统一信用代码')" prop="creditCode">
-                    <el-input v-model="formData.creditCode" placeholder="请输入社会统一信用代码" clearable  maxlength="20"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('法人姓名')" prop="legalPerson">
-                    <el-input v-model="formData.legalPerson" placeholder="请输入法人姓名" clearable  maxlength="20"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('经办人姓名')" prop="principalName">
-                    <el-input v-model="formData.principalName" placeholder="请输入经办人姓名" clearable  maxlength="20"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('经办人手机号')" prop="principalMobile">
-                    <el-input v-model="formData.principalMobile" placeholder="请输入经办人手机号" clearable  maxlength="20"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('经办人身份证')" prop="principalIdCard">
-                    <el-input v-model="formData.principalIdCard" placeholder="请输入经办人身份证" clearable  maxlength="18"  show-word-limit class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('签名来源')">
-                    <el-radio-group v-model="formData.signSource" >
-                        <el-radio v-for="item in signConfig.signSourceList" :key="item.type" :label="item.type" >{{item.name}}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item :label="t('签名类型')">
-                    <el-radio-group v-model="formData.signType">
-                        <el-radio v-for="item in signConfig.signTypeList" :key="item.type" :label="item.type" >{{item.name}}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item :label="t('上传图片')" prop="imgUrl">
-                    <upload-image v-model="formData.imgUrl" :limit="1" />
-                </el-form-item>
-                <div class="ml-[150px] text-[12px] text-[#999] leading-[20px]">当签名来源为商标、APP、小程序、事业单位简称或企业名称简称时，需必填此字段</div>
-                <div class="my-[5px] ml-[150px] text-[12px] text-[#999] leading-[20px]">当签名来源为事业单位全称或企业名称全称时，选填此字段。</div>
-                <el-form-item :label="t('是否默认')">
-                    <el-radio-group v-model="formData.defaultSign" >
-                        <el-radio :label="1">是</el-radio>
-                        <el-radio :label="0">否</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <el-button @click="visibleAdd = false">{{ t("cancel") }}</el-button>
-                <el-button type="primary" @click="onSave()">{{ t("confirm") }}</el-button>
-            </template>
-        </el-dialog>
-    </div>
+			<template #footer>
+				<el-button @click="visible = false">{{ t('cancel') }}</el-button>
+			</template>
+		</el-dialog>
+		<el-dialog v-model="visibleAdd" :title="t('添加签名')" width="800px" destroy-on-close :close-on-click-modal="false">
+			<div class="max-h-[600px] overflow-auto">
+				<el-form label-width="150px" :model="formData" ref="formRef" :rules="formRules" class="page-form ml-[20px]">
+					<el-form-item :label="t('短信签名')" prop="signature">
+						<el-input
+							v-model="formData.signature"
+							placeholder="请输入短信签名"
+							class="input-width"
+							maxlength="20"
+							show-word-limit
+							clearable
+						/>
+					</el-form-item>
+					<div class="ml-[150px] text-[12px] text-[#999] leading-[20px]">必须由【】包裹，例如：【test】</div>
+					<div class="my-[5px] ml-[150px] text-[12px] text-[#999] leading-[20px]">
+						字数要求在2-20个字符，不能使用空格和特殊符号“ - + = * & % # @ ~等;
+					</div>
+					<el-form-item :label="t('短信示例内容')" prop="contentExample">
+						<el-input
+							v-model="formData.contentExample"
+							placeholder="请输入短信示例内容"
+							clearable
+							maxlength="50"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('企业名称')" prop="companyName">
+						<el-input
+							v-model="formData.companyName"
+							placeholder="请输入企业名称"
+							clearable
+							maxlength="20"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('社会统一信用代码')" prop="creditCode">
+						<el-input
+							v-model="formData.creditCode"
+							placeholder="请输入社会统一信用代码"
+							clearable
+							maxlength="20"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('法人姓名')" prop="legalPerson">
+						<el-input
+							v-model="formData.legalPerson"
+							placeholder="请输入法人姓名"
+							clearable
+							maxlength="20"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('责任人姓名')" prop="principalName">
+						<el-input
+							v-model="formData.principalName"
+							placeholder="请输入责任人姓名"
+							clearable
+							maxlength="20"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('责任人手机号')" prop="principalMobile">
+						<el-input
+							v-model="formData.principalMobile"
+							placeholder="请输入责任人手机号"
+							clearable
+							maxlength="20"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('责任人身份证')" prop="principalIdCard">
+						<el-input
+							v-model="formData.principalIdCard"
+							placeholder="请输入责任人身份证"
+							clearable
+							maxlength="18"
+							show-word-limit
+							class="input-width"
+						/>
+					</el-form-item>
+					<el-form-item :label="t('签名来源')">
+						<el-radio-group v-model="formData.signSource">
+							<el-radio v-for="item in signConfig.signSourceList" :key="item.type" :label="item.type">{{ item.name }}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<el-form-item :label="t('签名类型')">
+						<el-radio-group v-model="formData.signType">
+							<el-radio v-for="item in signConfig.signTypeList" :key="item.type" :label="item.type">{{ item.name }}</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<!-- <el-form-item :label="t('上传图片')" prop="imgUrl">
+					<upload-image v-model="formData.imgUrl" :limit="1" />
+				</el-form-item>
+				<div class="ml-[150px] text-[12px] text-[#999] leading-[20px]">
+					当签名来源为商标、APP、小程序、事业单位简称或企业名称简称时，需必填此字段
+				</div>
+				<div
+					class="my-[5px] ml-[150px] text-[12px] text-[#999] leading-[20px]"
+				>
+					当签名来源为事业单位全称或企业名称全称时，选填此字段。
+				</div> -->
+					<el-form-item :label="t('营业执照')" prop="bizLicenseUrl">
+						<upload-image v-model="formData.bizLicenseUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('企查查唯一性截图')" prop="qccUrl">
+						<upload-image v-model="formData.qccUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('中国商标网截图')" prop="tmnetUrl">
+						<upload-image v-model="formData.tmnetUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('移动ICP截图')" prop="mobileIcpUrl">
+						<upload-image v-model="formData.mobileIcpUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('应用商店 /小程序页面开发者截图')" prop="telecomAppstoreUrl">
+						<upload-image v-model="formData.telecomAppstoreUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('身份证正面(人像面)')" prop="idcardFrontUrl">
+						<upload-image v-model="formData.idcardFrontUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('身份证反面URL')" prop="idcardBackUrl">
+						<upload-image v-model="formData.idcardBackUrl" :limit="1" />
+					</el-form-item>
+					<el-form-item :label="t('是否默认')">
+						<el-radio-group v-model="formData.defaultSign">
+							<el-radio :label="1">是</el-radio>
+							<el-radio :label="0">否</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-form>
+			</div>
+			<template #footer>
+				<el-button @click="visibleAdd = false">{{ t('cancel') }}</el-button>
+				<el-button type="primary" @click="onSave()">{{ t('confirm') }}</el-button>
+			</template>
+		</el-dialog>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -148,196 +253,277 @@ const visible = ref(false)
 const visibleAdd = ref(false)
 const emit = defineEmits(['select'])
 const props = defineProps({
-    username: {
-        type: String,
-        default: ''
-    }
+	username: {
+		type: String,
+		default: '',
+	},
 })
 const initialFormData = {
-    defaultSign: 0,
-    imgUrl: '',
-    contentExample: '',
-    signType: '',
-    signSource: '',
-    principalIdCard: '',
-    principalName: '',
-    principalMobile: '',
-    legalPerson: '',
-    creditCode: '',
-    companyName: '',
-    signature: ''
+	defaultSign: 0,
+	imgUrl: '',
+	bizLicenseUrl: '',
+	qccUrl: '',
+	tmnetUrl: '',
+	mobileIcpUrl: '',
+	telecomAppstoreUrl: '',
+	idcardFrontUrl: '',
+	idcardBackUrl: '',
+	contentExample: '',
+	signType: '',
+	signSource: '',
+	principalIdCard: '',
+	principalName: '',
+	principalMobile: '',
+	legalPerson: '',
+	creditCode: '',
+	companyName: '',
+	signature: '',
 }
 const formData = reactive({ ...initialFormData })
 
 const signConfig = reactive({
-    signTypeList: [],
-    signSourceList: []
+	signTypeList: [],
+	signSourceList: [],
 })
 const getSmsSignConfigFn = () => {
-    getSmsSignConfig().then(res => {
-        signConfig.signTypeList = res.data.sign_type_list
-        signConfig.signSourceList = res.data.sign_source_list
-        formData.signSource = res.data.sign_source_list[0].type
-        formData.signType = res.data.sign_type_list[0].type
-    })
+	getSmsSignConfig().then((res) => {
+		signConfig.signTypeList = res.data.sign_type_list
+		signConfig.signSourceList = res.data.sign_source_list
+		formData.signSource = res.data.sign_source_list[0].type
+		formData.signType = res.data.sign_type_list[0].type
+	})
 }
 
 getSmsSignConfigFn()
 
 const formRef = ref()
 const formRules = computed(() => {
-    return {
-        signature: [
-            { required: true, message: '请输入短信签名', trigger: 'blur' },
-            {
-                validator: (rule, value, callback) => {
-                    const singleBracketValid = /^【[^【】]*】$/.test(value)
-                    if (!singleBracketValid) {
-                        return callback(new Error('短信签名必须被【】包裹'))
-                    }
+	return {
+		signature: [
+			{ required: true, message: '请输入短信签名', trigger: 'blur' },
+			{
+				validator: (rule, value, callback) => {
+					const singleBracketValid = /^【[^【】]*】$/.test(value)
+					if (!singleBracketValid) {
+						return callback(new Error('短信签名必须被【】包裹'))
+					}
 
-                    const content = value.slice(1, -1)
+					const content = value.slice(1, -1)
 
-                    const lengthValid = content.length >= 2 && content.length <= 20
-                    if (!lengthValid) {
-                        return callback(new Error('短信签名内容需在 2-20 个字符之间'))
-                    }
+					const lengthValid = content.length >= 2 && content.length <= 20
+					if (!lengthValid) {
+						return callback(new Error('短信签名内容需在 2-20 个字符之间'))
+					}
 
-                    const invalidChars = /[\s\-+=*&%#@~;]/
-                    if (invalidChars.test(content)) {
-                        return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'))
-                    }
+					const invalidChars = /[\s\-+=*&%#@~;]/
+					if (invalidChars.test(content)) {
+						return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'))
+					}
 
-                    callback()
-                },
-                trigger: 'blur'
-            }
-        ],
-        principalMobile: [
-            { required: true, message: '请输入经办人手机号', trigger: 'blur' },
-            { validator: phoneVerify, trigger: 'blur' }
-        ],
-        companyName: [
-            { required: true, message: '请输入企业名称', trigger: 'blur' }
-        ],
-        contentExample: [
-            { required: true, message: '请输入短信示例内容', trigger: 'blur' }
-        ],
-        creditCode: [
-            { required: true, message: '请输入社会统一信用代码', trigger: 'blur' }
-        ],
-        legalPerson: [
-            { required: true, message: '请输入法人姓名', trigger: 'blur' }
-        ],
-        principalName: [
-            { required: true, message: '请输入经办人姓名', trigger: 'blur' }
-        ],
-        principalIdCard: [
-            { required: true, message: '请输入经办人身份证', trigger: 'blur' },
-            { validator: idCardVerify, trigger: 'blur' }
-        ],
-        imgUrl: [
-            {
-                validator: (rule, value, callback) => {
-                    const needImage = [3, 4, 5].includes(formData.signSource) || formData.signType === 1
-                    if (needImage) {
-                        if (!value || value.length === 0) {
-                            callback(new Error('请上传图片'))
-                        } else {
-                            callback()
-                        }
-                    } else {
-                        callback() // 不需要校验
-                    }
-                },
-                trigger: 'blur'
-            }
-        ]
-
-    }
+					callback()
+				},
+				trigger: 'blur',
+			},
+		],
+		principalMobile: [
+			{ required: true, message: '请输入责任人手机号', trigger: 'blur' },
+			{ validator: phoneVerify, trigger: 'blur' },
+		],
+		companyName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
+		contentExample: [{ required: true, message: '请输入短信示例内容', trigger: 'blur' }],
+		creditCode: [
+			{
+				required: true,
+				message: '请输入社会统一信用代码',
+				trigger: 'blur',
+			},
+		],
+		legalPerson: [{ required: true, message: '请输入法人姓名', trigger: 'blur' }],
+		principalName: [{ required: true, message: '请输入责任人姓名', trigger: 'blur' }],
+		principalIdCard: [
+			{ required: true, message: '请输入责任人身份证', trigger: 'blur' },
+			{ validator: idCardVerify, trigger: 'blur' },
+		],
+		imgUrl: [
+			{
+				validator: (rule, value, callback) => {
+					const needImage = [3, 4, 5].includes(formData.signSource) || formData.signType === 1
+					if (needImage) {
+						if (!value || value.length === 0) {
+							callback(new Error('请上传图片'))
+						} else {
+							callback()
+						}
+					} else {
+						callback() // 不需要校验
+					}
+				},
+				trigger: 'blur',
+			},
+		],
+		bizLicenseUrl: [{ required: true, message: '请输入营业执照', trigger: 'blur' }],
+		qccUrl: [
+			{
+				validator: (rule, value, callback) => {
+					const needImage = [1, 2].includes(formData.signSource) || formData.signType === 1
+					if (needImage) {
+						if (!value || value.length === 0) {
+							callback(new Error('请上传企查查唯一性截图'))
+						} else {
+							callback()
+						}
+					} else {
+						callback() // 不需要校验
+					}
+				},
+				trigger: 'blur',
+			},
+		],
+		tmnetUrl: [
+			{
+				validator: (rule, value, callback) => {
+					const needImage = [3].includes(formData.signSource)
+					if (needImage) {
+						if (!value || value.length === 0) {
+							callback(new Error('请上传中国商标网截图'))
+						} else {
+							callback()
+						}
+					} else {
+						callback() // 不需要校验
+					}
+				},
+				trigger: 'blur',
+			},
+		],
+		mobileIcpUrl: [
+			{
+				validator: (rule, value, callback) => {
+					const needImage = [4, 5].includes(formData.signSource)
+					if (needImage) {
+						if (!value || value.length === 0) {
+							callback(new Error('请上传移动ICP截图'))
+						} else {
+							callback()
+						}
+					} else {
+						callback() // 不需要校验
+					}
+				},
+				trigger: 'blur',
+			},
+		],
+		telecomAppstoreUrl: [
+			{
+				validator: (rule, value, callback) => {
+					const needImage = [4, 5].includes(formData.signSource)
+					if (needImage) {
+						if (!value || value.length === 0) {
+							callback(new Error('请上传应用商店/小程序页面开发者截图'))
+						} else {
+							callback()
+						}
+					} else {
+						callback() // 不需要校验
+					}
+				},
+				trigger: 'blur',
+			},
+		],
+		idcardFrontUrl: [
+			{
+				required: true,
+				message: '请输入身份证正面(人像面)',
+				trigger: 'blur',
+			},
+		],
+		idcardBackUrl: [{ required: true, message: '请输入身份证反面', trigger: 'blur' }],
+	}
 })
 
 const idCardVerify = (rule: any, value: any, callback: any) => {
-    if (value && !/^[1-9]\d{5}(19|20)\d{2}((0\d)|(1[0-2]))(([0-2]\d)|3[0-1])\d{3}([0-9Xx])$/.test(value)) {
-        callback(new Error(t('请输入正确的身份证号码')))
-    } else {
-        callback()
-    }
+	if (value && !/^[1-9]\d{5}(19|20)\d{2}((0\d)|(1[0-2]))(([0-2]\d)|3[0-1])\d{3}([0-9Xx])$/.test(value)) {
+		callback(new Error(t('请输入正确的身份证号码')))
+	} else {
+		callback()
+	}
 }
 
 const phoneVerify = (rule: any, value: any, callback: any) => {
-    if (value && !/^1[3-9]\d{9}$/.test(value)) {
-        callback(new Error(t('请输入正确的手机号码')))
-    } else {
-        callback()
-    }
+	if (value && !/^1[3-9]\d{9}$/.test(value)) {
+		callback(new Error(t('请输入正确的手机号码')))
+	} else {
+		callback()
+	}
 }
 
 const onSave = async () => {
-    await formRef.value?.validate(async (valid) => {
-        if (valid) {
-            addSign(props.username, formData).then((res) => {
-                setTimeout(() => {
-                    visibleAdd.value = false
-                    loadSignList()
-                }, 500)
-            })
-        }
-    })
+	await formRef.value?.validate(async (valid) => {
+		if (valid) {
+			addSign(props.username, formData).then((res) => {
+				setTimeout(() => {
+					visibleAdd.value = false
+					loadSignList()
+				}, 500)
+			})
+		}
+	})
 }
 
 // 表单内容
 const tableData = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: false,
-    data: [],
-    searchParam: {}
+	page: 1,
+	limit: 10,
+	total: 0,
+	loading: false,
+	data: [],
+	searchParam: {},
 })
 
 const open = () => {
-    visible.value = true
-    loadSignList()
+	visible.value = true
+	loadSignList()
 }
 // 获取列表
 const loadSignList = () => {
-    tableData.loading = true
-    const params = {
-        page: tableData.page,
-        limit: tableData.limit,
-        ...tableData.searchParam
-    }
-    getSignList(props.username, params).then((res) => {
-        tableData.loading = false
-        tableData.data = res.data.data
-        tableData.total = res.data.total
-    }).catch(() => {
-        tableData.loading = false
-    })
+	tableData.loading = true
+	const params = {
+		page: tableData.page,
+		limit: tableData.limit,
+		...tableData.searchParam,
+	}
+	getSignList(props.username, params)
+		.then((res) => {
+			tableData.loading = false
+			tableData.data = res.data.data
+			tableData.total = res.data.total
+		})
+		.catch(() => {
+			tableData.loading = false
+		})
 }
 
 const addEvent = () => {
-    Object.assign(formData, initialFormData)
-    formData.signSource = signConfig.signSourceList[0].type
-    formData.signType = signConfig.signTypeList[0].type
-    visibleAdd.value = true
+	Object.assign(formData, initialFormData)
+	formData.signSource = signConfig.signSourceList[0].type
+	formData.signType = signConfig.signTypeList[0].type
+	visibleAdd.value = true
 }
 
-const deleteTemplate = (row:any) => {
-    ElMessageBox.confirm(t('确定删除该签名吗？'), t('提示'), {
-        confirmButtonText: t('确定'),
-        cancelButtonText: t('取消'),
-        type: 'warning'
-    }).then(() => {
-        deleteSign(props.username, { signatures: [row.sign] }).then((res) => {
-            // loadSignList()
-            tableData.loading = true
-            setTimeout(() => {
-                loadSignList()
-            }, 1000)
-        })
-    })
+const deleteTemplate = (row: any) => {
+	ElMessageBox.confirm(t('确定删除该签名吗？'), t('提示'), {
+		confirmButtonText: t('确定'),
+		cancelButtonText: t('取消'),
+		type: 'warning',
+	}).then(() => {
+		deleteSign(props.username, { signatures: [row.sign] }).then((res) => {
+			// loadSignList()
+			tableData.loading = true
+			setTimeout(() => {
+				loadSignList()
+			}, 1000)
+		})
+	})
 }
 
 // 批量复选框
@@ -348,8 +534,8 @@ const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-    isIndeterminate.value = false
-    smsSignListTableRef.value.toggleAllSelection()
+	isIndeterminate.value = false
+	smsSignListTableRef.value.toggleAllSelection()
 }
 
 const smsSignListTableRef = ref()
@@ -359,58 +545,59 @@ const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-    multipleSelection.value = val
+	multipleSelection.value = val
 
-    toggleCheckbox.value = false
-    if (multipleSelection.value.length > 0 && multipleSelection.value.length < tableData.data.length) {
-        isIndeterminate.value = true
-    } else {
-        isIndeterminate.value = false
-    }
+	toggleCheckbox.value = false
+	if (multipleSelection.value.length > 0 && multipleSelection.value.length < tableData.data.length) {
+		isIndeterminate.value = true
+	} else {
+		isIndeterminate.value = false
+	}
 
-    if (multipleSelection.value.length == tableData.data.length && tableData.data.length && multipleSelection.value.length) {
-        toggleCheckbox.value = true
-    }
+	if (multipleSelection.value.length == tableData.data.length && tableData.data.length && multipleSelection.value.length) {
+		toggleCheckbox.value = true
+	}
 }
 const checkSelectable = (row: any, index: number) => {
-    return !row.is_default // 只有不是“使用中”的行可选
+	return !row.is_default // 只有不是“使用中”的行可选
 }
 
 // 批量删除
 const batchDeleteEvent = () => {
-    if (multipleSelection.value.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: `${t('请选择要删除的签名')}`
-        })
-        return
-    }
+	if (multipleSelection.value.length == 0) {
+		ElMessage({
+			type: 'warning',
+			message: `${t('请选择要删除的签名')}`,
+		})
+		return
+	}
 
-    ElMessageBox.confirm(t('确定删除选中的签名吗？'), t('warning'), {
-        confirmButtonText: t('confirm'),
-        cancelButtonText: t('cancel'),
-        type: 'warning'
-    }).then(() => {
-        const signatures: any = []
-        multipleSelection.value.forEach((item: any) => {
-            signatures.push(item.sign)
-        })
+	ElMessageBox.confirm(t('确定删除选中的签名吗？'), t('warning'), {
+		confirmButtonText: t('confirm'),
+		cancelButtonText: t('cancel'),
+		type: 'warning',
+	}).then(() => {
+		const signatures: any = []
+		multipleSelection.value.forEach((item: any) => {
+			signatures.push(item.sign)
+		})
 
-        deleteSign(props.username, {
-            signatures
-        }).then(() => {
-            tableData.loading = true
-            setTimeout(() => {
-                loadSignList()
-            }, 1000)
-        }).catch(() => {
-        })
-    })
+		deleteSign(props.username, {
+			signatures,
+		})
+			.then(() => {
+				tableData.loading = true
+				setTimeout(() => {
+					loadSignList()
+				}, 1000)
+			})
+			.catch(() => {})
+	})
 }
 
-const selectTemplate = (row:any) => {
-    visible.value = false
-    emit('select', row)
+const selectTemplate = (row: any) => {
+	visible.value = false
+	emit('select', row)
 }
 
 defineExpose({ open })
diff --git a/admin/src/app/views/setting/point_rule.vue b/admin/src/app/views/setting/point_rule.vue
index 4f8fdbaea..d3262bc14 100644
--- a/admin/src/app/views/setting/point_rule.vue
+++ b/admin/src/app/views/setting/point_rule.vue
@@ -100,7 +100,7 @@ const onSave = async () => {
     if (await ruleRefs.value[0].verify()) {
         if (saveLoading.value) return
         saveLoading.value = true
-      
+
         setPointRuleConfig(formData.value).then(() => {
             ruleDialog.value = false
             saveLoading.value = false
diff --git a/admin/src/app/views/setting/system.vue b/admin/src/app/views/setting/system.vue
index 5ef0d85cb..7d61f61a5 100644
--- a/admin/src/app/views/setting/system.vue
+++ b/admin/src/app/views/setting/system.vue
@@ -43,6 +43,16 @@
                 <el-form-item :label="t('icon')">
                     <upload-image v-model="formData.front_end_icon" />
                 </el-form-item>
+
+                <el-form-item :label="t('metaTitle')">
+                    <el-input v-model.trim="formData.meta_title" :placeholder="t('MetaPlaceholder')" class="input-width" clearable maxlength="40" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('metaDescription')">
+                    <el-input v-model.trim="formData.meta_desc" :placeholder="t('metaDescriptionPlaceholder')" class="input-width" clearable maxlength="200" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('metaKeywords')">
+                    <el-input v-model.trim="formData.meta_keyword" :placeholder="t('metaKeywordsPlaceholder')" class="input-width" clearable maxlength="200" show-word-limit />
+                </el-form-item>
             </el-card>
 
             <el-card class="box-card mt-[15px] !border-none" shadow="never">
@@ -75,13 +85,10 @@ import { setWebsite, getWebsite, getService } from '@/app/api/sys'
 import { FormInstance, FormRules } from 'element-plus'
 import { getAppType } from '@/utils/common'
 import { useRoute } from 'vue-router'
-import useUserStore from '@/stores/modules/user'
-import useSystemStore from '@/stores/modules/system';
 
 const route = useRoute()
 const pageName = route.meta.title
 const loading = ref(true)
-const appType = ref(getAppType())
 const formData = reactive<Record<string, string>>({
     site_name: '',
     logo: '',
@@ -102,7 +109,10 @@ const formData = reactive<Record<string, string>>({
     icon: '',
     wechat_code: '',
     enterprise_wechat: '',
-    tel: ''
+    tel: '',
+    meta_title: '',
+    meta_desc: '',
+    meta_keyword: ''
 })
 
 const setFormData = async () => {
diff --git a/admin/src/app/views/tools/cloud_compile.vue b/admin/src/app/views/tools/cloud_compile.vue
index 39b324704..c6d39762d 100644
--- a/admin/src/app/views/tools/cloud_compile.vue
+++ b/admin/src/app/views/tools/cloud_compile.vue
@@ -83,7 +83,7 @@
                         温馨提示
                     </span>
                     <span class="text-[12px] text-[#9699B6] ml-[10px]">运行环境要求：需预先配置 Nodejs 环境</span>
-                    <span class="text-[14px]  text-primary cursor-pointer ml-[10px] border-b-[1px] border-solid border-primary"  @click="linkEvent('https://doc.niucloud.com/saas.html?keywords=/di-san-fang-yun-bian-yi-pei-zhi')">搭建教程</span>
+                    <span class="text-[14px]  text-primary cursor-pointer ml-[10px] border-b-[1px] border-solid border-primary"  @click="linkEvent('https://doc.press.niucloud.com/php/saas-framework/use/other/third-party-cloud-compilation.html')">搭建教程</span>
                 </div>
                  <div class="ml-[40px] text-[14px] text-[#4F516D] mb-[18px]">
                     <span>1、下载第三方云编译服务器搭建程序包</span><span class="text-primary cursor-pointer "  @click="linkEvent('https://gitee.com/niucloud-team/niucloud-compile-server')"> niucloud-compile-server</span>
@@ -139,7 +139,7 @@
                 </div>
                 <div>
                     <div class="ml-[40px] text-[#374151] text-[14px] italic">
-                        <span class="text-[16px] italic">#安装依赖：</span>
+                        <span class="text-[16px] italic font-500">#安装依赖：</span>
                         <span class="italic">进入admin端与uniapp端以及web端目录都可执行</span>
                     </div>
                     <div class="ml-[40px] w-[1085px] h-[40px]  bg-[#F9F9FB] rounded-[4px] mt-[10px] flex items-center justify-between border-[#F1F1F8] border-solid border-[1px] px-[10px]">
@@ -149,9 +149,9 @@
                 </div>
                 <div class="mt-[21px]">
                     <div class="ml-[40px] text-[14px] text-[#374151] italic">
-                        <span class="text-[16px] italic">#后台admin端口打包：</span>
+                        <span class="text-[16px] italic font-500">#后台admin端口打包：</span>
                         <span>进入admin目录下执行，执行后编译代码默认移动到系统的niucloud下的</span>
-                        <span class="text-[#F09000] mx-[3px]">public/admin</span>
+                        <span class="text-[#F09000] mx-[3px] font-bold">public/admin</span>
                         <span>目录下</span>
                     </div>
                     <div class="ml-[40px] w-[1085px] h-[40px]  bg-[#F9F9FB] rounded-[4px] mt-[10px] flex items-center justify-between border-[#F1F1F8] border-solid border-[1px] px-[10px]">
@@ -161,9 +161,9 @@
                 </div>
                 <div class="mt-[21px]">
                     <div class="ml-[40px] text-[14px] text-[#374151] italic">
-                        <span class="text-[16px] italic">#使用uniapp打包H5：</span>
+                        <span class="text-[16px] italic font-500">#使用uniapp打包H5：</span>
                         <span>进入uniapp目录下执行，执行后编译代码默认移动到系统niucloud下的</span>
-                        <span class="text-[#F09000] mx-[3px]">public/wap</span>
+                        <span class="text-[#F09000] mx-[3px] font-bold">public/wap</span>
                         <span>目录下</span>
                     </div>
                     <div class="ml-[40px] w-[1085px] h-[40px]  bg-[#F9F9FB] rounded-[4px] mt-[10px] flex items-center justify-between border-[#F1F1F8] border-solid border-[1px] px-[10px]">
@@ -173,9 +173,9 @@
                 </div>
                 <div class="mt-[21px]">
                     <div class="ml-[40px] text-[14px] text-[#374151] italic">
-                        <span class="text-[16px] italic">#使用uniapp打包微信小程序：</span>
+                        <span class="text-[16px] italic font-500">#使用uniapp打包微信小程序：</span>
                         <span>进入uniapp目录下执行，执行后编译代码默认移动到系统niucloud下的</span>
-                        <span class="text-[#F09000] mx-[3px]">uni-app/dist/build/mp-weixin</span>
+                        <span class="text-[#F09000] mx-[3px] font-bold">uni-app/dist/build/mp-weixin</span>
                         <span>目录</span>
                     </div>
                     <div class="ml-[40px] w-[1085px] h-[40px]  bg-[#F9F9FB] rounded-[4px] mt-[10px] flex items-center justify-between border-[#F1F1F8] border-solid border-[1px] px-[10px]">
@@ -185,9 +185,9 @@
                 </div>
                 <div class="mt-[21px]">
                     <div class="ml-[40px] text-[14px] text-[#374151] italic">
-                        <span class="text-[16px] italic">#前台web(pc)端打包:：</span>
+                        <span class="text-[16px] italic font-500">#前台web(pc)端打包:：</span>
                         <span>进入web目录下执行，执行后编译代码默认移动到系统niucloud下的</span>
-                        <span class="text-[#F09000] mx-[3px]">public/web</span>
+                        <span class="text-[#F09000] mx-[3px] font-bold">public/web</span>
                         <span>目录下</span>
                     </div>
                     <div class="ml-[40px] w-[1085px] h-[40px]  bg-[#F9F9FB] rounded-[4px] mt-[10px] flex items-center justify-between border-[#F1F1F8] border-solid border-[1px] px-[10px]">
diff --git a/admin/src/app/views/tools/code/index.vue b/admin/src/app/views/tools/code/index.vue
index 8fe57ca67..65f6b0ea7 100644
--- a/admin/src/app/views/tools/code/index.vue
+++ b/admin/src/app/views/tools/code/index.vue
@@ -264,7 +264,7 @@ const deleteEvent = (id: number) => {
         }
     ).then(() => {
         deleteGenerateTable(id).then(() => {
-            loadGenerateTableList()
+            loadGenerateTableList(getTablePageStorage(codeTableData.searchParam).page)
         }).catch(() => {
         })
     })
@@ -314,7 +314,7 @@ const generateCreateFn = (id: any, generate_type: any) => {
             codeTableData.loading = false
             window.open(img(res.data.file), '_blank')
         } else {
-            loadGenerateTableList()
+            loadGenerateTableList(getTablePageStorage(codeTableData.searchParam).page)
         }
     }).catch(() => {
         codeTableData.loading = false
@@ -368,7 +368,7 @@ const listToTree = (arr:any) => {
                     }
                 }
                 if (!obj) {
-                    obj = { name: name, path: name.indexOf('.') < 0 ? '' : arr[i], key: 'k' + i + j + k }
+                    obj = { name, path: name.indexOf('.') < 0 ? '' : arr[i], key: 'k' + i + j + k }
                     if (name.indexOf('.') < 0) obj.children = []
                     if (obj.path === arr[0]) treeKey.value = obj.key
                     _ret.push(obj)
diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue
index 4fd464428..b507a819b 100644
--- a/admin/src/components/upload-attachment/attachment.vue
+++ b/admin/src/components/upload-attachment/attachment.vue
@@ -60,11 +60,11 @@
                     <el-input v-model="attachmentParam.real_name" class="m-0 !w-[200px]" clearable :placeholder="t('upload.placeholder' + type + 'Name')" prefix-icon="Search" @input="getAttachmentList()" />
                 </el-col>
             </el-row>
-            <div class="flex-1 my-[15px] h-0" v-loading="attachment.loading">
+            <div class="flex-1 mb-[15px] mt-[10px] h-0" v-loading="attachment.loading">
                 <el-scrollbar>
                     <!-- 选择弹出框 -->
                     <div class="flex flex-wrap" v-if="attachment.data.length && (operate === true || scene != 'attachment')">
-                        <div class="attachment-item mr-[10px]" :class="scene == 'select' ? 'w-[100px]' : 'w-[120px]'" v-for="(item, index) in attachment.data" :key="index">
+                        <div class="attachment-item relative mr-[10px] mt-[6px]" :class="scene == 'select' ? 'w-[100px]' : 'w-[120px]'" v-for="(item, index) in attachment.data" :key="index">
                             <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center" :class="scene == 'select' ? 'h-[100px]' : 'h-[120px]'" @click="selectFile(item)">
 
                                 <el-image :src="img(item.thumb)" fit="contain" v-if="type == 'image'"/>
@@ -76,9 +76,10 @@
                                         <span class="absolute bottom-[2px] right-[2px] text-white z-[2] leading-none">{{ getFileIndex(item.att_id) }}</span>
                                     </div>
                                 </div>
-
                             </div>
 
+                            <icon name="element CircleCloseFilled" v-if="type != 'icon' && !operate" @click="deleteAttachmentEvent(index)" class="top-[-6px] right-[-6px] absolute z-[3] del-icon hidden cursor-pointer opacity-[0.8]" />
+
                             <div class="flex items-center">
                                 <el-tooltip placement="top">
                                     <template #content>{{ item.real_name }}</template>
@@ -110,7 +111,7 @@
 
                     <!-- 素材管理 -->
                     <div class="flex flex-wrap" v-else-if="attachment.data.length && operate === false">
-                        <div class="attachment-item mr-[10px] w-[120px]" v-for="(item, index) in attachment.data" :key="index">
+                        <div class="attachment-item relative mr-[10px] mt-[6px] w-[120px]" v-for="(item, index) in attachment.data" :key="index">
                             <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]">
                                 <el-image :src="img(item.thumb)" fit="contain" v-if="type == 'image'" :preview-src-list="item.image_list"/>
                                 <video :src="img(item.thumb)" v-else-if="type == 'video'" @click="previewVideo(index)"></video>
@@ -122,6 +123,7 @@
                                     <div class="truncate my-[10px] cursor-pointer text-base flex-1 text-center">{{ item.real_name }}</div>
                                 </el-tooltip>
                             </div>
+                            <icon name="element CircleCloseFilled" v-if="type != 'icon'" @click="deleteAttachmentEvent(index)" class="top-[-6px] right-[-6px] absolute z-[3] del-icon hidden cursor-pointer opacity-[0.8]" />
                         </div>
                     </div>
                     <div class="flex absolute top-0 left-0 right-0 bottom-0 items-center justify-center" v-else>
@@ -668,6 +670,9 @@ defineExpose({
     .attachment-action {
         display: block;
     }
+    .del-icon {
+        display: block;
+    }
 }
 
 .attachment-list-wrap {
diff --git a/admin/src/components/upload-image/index.vue b/admin/src/components/upload-image/index.vue
index 9cf78eb91..d69ece4e0 100644
--- a/admin/src/components/upload-image/index.vue
+++ b/admin/src/components/upload-image/index.vue
@@ -11,7 +11,7 @@
                         <icon name="element Delete" color="#fff" size="18px" @click.stop="removeImage" />
                     </div>
                 </div>
-                <upload-attachment :limit="limit" @confirm="confirmSelect" v-else>
+                <upload-attachment :limit="uploadImgNum" @confirm="confirmSelect" v-else>
                     <div class="w-full h-full flex items-center justify-center flex-col content-wrap">
                         <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
                         <div class="leading-none text-xs mt-[10px] text-secondary">{{ imageText || t('upload.root') }}</div>
@@ -34,7 +34,7 @@
                 </div>
             </div>
             <div class="rounded cursor-pointer overflow-hidden relative border border-dashed border-color" :style="style" v-if="images.data.length < limit">
-                <upload-attachment :limit="limit" @confirm="confirmSelect">
+                <upload-attachment :limit="uploadImgNum" @confirm="confirmSelect">
                     <div class="w-full h-full flex items-center justify-center flex-col content-wrap">
                         <icon name="element Plus" size="20px" color="var(--el-text-color-secondary)" />
                         <div class="leading-none text-xs mt-[10px] text-secondary">{{ imageText || t('upload.root') }}</div>
@@ -105,6 +105,11 @@ const setValue = () => {
     previewImageList = toRaw(images.data).map((url: string) => { return url.indexOf('data:image') != -1 ? url : img(url) })
 }
 
+const uploadImgNum = computed(() => {
+    const num = prop.limit - images.data.length
+    return num
+})
+
 watch(() => value.value, () => {
     if (value.value.indexOf('data:image') != -1) {
         images.data = [value.value]
diff --git a/admin/src/components/verifition/Verify.vue b/admin/src/components/verifition/Verify.vue
index f37ca196e..e57c915a6 100644
--- a/admin/src/components/verifition/Verify.vue
+++ b/admin/src/components/verifition/Verify.vue
@@ -27,113 +27,113 @@
 	</div>
 </template>
 <script type="text/babel">
-    /**
+/**
      * Verify 验证码组件
      * @description 分发验证码使用
      * */
-    import VerifySlide from './Verify/VerifySlide.vue'
-    import VerifyPoints from './Verify/VerifyPoints.vue'
-    import { computed, ref, toRefs, watchEffect } from 'vue'
+import VerifySlide from './Verify/VerifySlide.vue'
+import VerifyPoints from './Verify/VerifyPoints.vue'
+import { computed, ref, toRefs, watchEffect } from 'vue'
 
-    export default {
-        name: 'Vue2Verify',
-        components: {
-            VerifySlide,
-            VerifyPoints
+export default {
+    name: 'Vue2Verify',
+    components: {
+        VerifySlide,
+        VerifyPoints
+    },
+    props: {
+        captchaType: {
+            type: String,
+            required: true
         },
-        props: {
-            captchaType: {
-                type: String,
-                required: true
-            },
-            figure: {
-                type: Number
-            },
-            arith: {
-                type: Number
-            },
-            mode: {
-                type: String,
-                default: 'pop'
-            },
-            vSpace: {
-                type: Number
-            },
-            explain: {
-                type: String
-            },
-            imgSize: {
-                type: Object,
-                default() {
-                    return {
-                        width: '310px',
-                        height: '155px'
-                    }
+        figure: {
+            type: Number
+        },
+        arith: {
+            type: Number
+        },
+        mode: {
+            type: String,
+            default: 'pop'
+        },
+        vSpace: {
+            type: Number
+        },
+        explain: {
+            type: String
+        },
+        imgSize: {
+            type: Object,
+            default () {
+                return {
+                    width: '310px',
+                    height: '155px'
                 }
-            },
-            blockSize: {
-                type: Object
-            },
-            barSize: {
-                type: Object
             }
         },
-        setup(props) {
-            const { captchaType, figure, arith, mode, vSpace, explain, imgSize, blockSize, barSize } = toRefs(props)
-            const clickShow = ref(false)
-            const verifyType = ref(undefined)
-            const componentType = ref(undefined)
-            const instance = ref({})
+        blockSize: {
+            type: Object
+        },
+        barSize: {
+            type: Object
+        }
+    },
+    setup (props) {
+        const { captchaType, figure, arith, mode, vSpace, explain, imgSize, blockSize, barSize } = toRefs(props)
+        const clickShow = ref(false)
+        const verifyType = ref(undefined)
+        const componentType = ref(undefined)
+        const instance = ref({})
 
-            const showBox = computed(() => {
-                if (mode.value == 'pop') {
-                    return clickShow.value
-                } else {
-                    return true
-                }
-            })
-            /**
+        const showBox = computed(() => {
+            if (mode.value == 'pop') {
+                return clickShow.value
+            } else {
+                return true
+            }
+        })
+        /**
              * refresh
              * @description 刷新
              * */
-            const refresh = () => {
-                if (instance.value.refresh) {
-                    instance.value.refresh()
-                }
-            }
-            const closeBox = () => {
-                clickShow.value = false
-                refresh()
-            }
-            const show = () => {
-                if (mode.value == 'pop') {
-                    clickShow.value = true
-                }
-            }
-            watchEffect(() => {
-                switch (captchaType.value) {
-                    case 'blockPuzzle':
-                        verifyType.value = '2'
-                        componentType.value = 'VerifySlide'
-                        break
-                    case 'clickWord':
-                        verifyType.value = ''
-                        componentType.value = 'VerifyPoints'
-                        break
-                }
-            })
-
-            return {
-                clickShow,
-                verifyType,
-                componentType,
-                instance,
-                showBox,
-                closeBox,
-                show
+        const refresh = () => {
+            if (instance.value.refresh) {
+                instance.value.refresh()
             }
         }
+        const closeBox = () => {
+            clickShow.value = false
+            refresh()
+        }
+        const show = () => {
+            if (mode.value == 'pop') {
+                clickShow.value = true
+            }
+        }
+        watchEffect(() => {
+            switch (captchaType.value) {
+                case 'blockPuzzle':
+                    verifyType.value = '2'
+                    componentType.value = 'VerifySlide'
+                    break
+                case 'clickWord':
+                    verifyType.value = ''
+                    componentType.value = 'VerifyPoints'
+                    break
+            }
+        })
+
+        return {
+            clickShow,
+            verifyType,
+            componentType,
+            instance,
+            showBox,
+            closeBox,
+            show
+        }
     }
+}
 </script>
 <style>
 	.verifybox {
@@ -188,8 +188,8 @@
 
 	.verify-tips {
 		position: absolute;
-		left: 0px;
-		bottom: 0px;
+		left: 0;
+		bottom: 0;
 		width: 100%;
 		height: 30px;
 		line-height: 30px;
@@ -279,7 +279,7 @@
 
 	.verify-bar-area .verify-move-block {
 		position: absolute;
-		top: 0px;
+		top: 0;
 		left: 0;
 		background: #fff;
 		cursor: pointer;
@@ -417,7 +417,6 @@
 		right: 0;
 		top: 0;
 		bottom: 0;
-		background-size: cover;
 		z-index: 9999;
 		background-image: url("data:image/png;base64,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");
 		background-size: contain;
diff --git a/admin/src/components/verifition/Verify/VerifySlide.vue b/admin/src/components/verifition/Verify/VerifySlide.vue
index 261ac40ee..5e182d024 100644
--- a/admin/src/components/verifition/Verify/VerifySlide.vue
+++ b/admin/src/components/verifition/Verify/VerifySlide.vue
@@ -42,338 +42,342 @@
 	</div>
 </template>
 <script type="text/babel">
-    /**
+/**
      * VerifySlide
      * @description 滑块
      * */
-    import { aesEncrypt } from './../utils/ase'
-    import { resetSize } from './../utils/util'
-    import { reqGet, reqCheck } from './../api/index'
-    import { computed, onMounted, reactive, ref, watch, nextTick, toRefs, getCurrentInstance } from 'vue'
-    //  "captchaType":"blockPuzzle",
-    export default {
-        name: 'VerifySlide',
-        props: {
-            captchaType: {
-                type: String
-            },
-            type: {
-                type: String,
-                default: '1'
-            },
-            // 弹出式pop，固定fixed
-            mode: {
-                type: String,
-                default: 'fixed'
-            },
-            vSpace: {
-                type: Number,
-                default: 5
-            },
-            explain: {
-                type: String,
-                default: '向右滑动完成验证'
-            },
-            imgSize: {
-                type: Object,
-                default() {
-                    return {
-                        width: '310px',
-                        height: '155px'
-                    }
-                }
-            },
-            blockSize: {
-                type: Object,
-                default() {
-                    return {
-                        width: '50px',
-                        height: '50px'
-                    }
-                }
-            },
-            barSize: {
-                type: Object,
-                default() {
-                    return {
-                        width: '310px',
-                        height: '40px'
-                    }
+import { aesEncrypt } from './../utils/ase'
+import { resetSize } from './../utils/util'
+import { reqGet, reqCheck } from './../api/index'
+import { computed, onMounted, reactive, ref, watch, nextTick, toRefs, getCurrentInstance } from 'vue'
+//  "captchaType":"blockPuzzle",
+export default {
+    name: 'VerifySlide',
+    props: {
+        captchaType: {
+            type: String
+        },
+        type: {
+            type: String,
+            default: '1'
+        },
+        // 弹出式pop，固定fixed
+        mode: {
+            type: String,
+            default: 'fixed'
+        },
+        vSpace: {
+            type: Number,
+            default: 5
+        },
+        explain: {
+            type: String,
+            default: '向右滑动完成验证'
+        },
+        imgSize: {
+            type: Object,
+            default () {
+                return {
+                    width: '310px',
+                    height: '155px'
                 }
             }
         },
-        setup(props, context) {
-            const { mode, captchaType, vSpace, imgSize, barSize, type, blockSize, explain } = toRefs(props)
-            const { proxy } = getCurrentInstance()
-            const secretKey = ref(''), // 后端返回的ase加密秘钥
-                passFlag = ref(''), // 是否通过的标识
-                backImgBase = ref(''), // 验证码背景图片
-                blockBackImgBase = ref(''), // 验证滑块的背景图片
-                backToken = ref(''), // 后端返回的唯一token值
-                startMoveTime = ref(''), // 移动开始的时间
-                endMoveTime = ref(''), // 移动结束的时间
-                tipsBackColor = ref(''), // 提示词的背景颜色
-                tipWords = ref(''),
-                text = ref(''),
-                finishText = ref(''),
-                setSize = reactive({
-                    imgHeight: 0,
-                    imgWidth: 0,
-                    barHeight: 0,
-                    barWidth: 0
-                }),
-                top = ref(0),
-                left = ref(0),
-                moveBlockLeft = ref(undefined),
-                leftBarWidth = ref(undefined),
-                // 移动中样式
-                moveBlockBackgroundColor = ref(undefined),
-                leftBarBorderColor = ref('#ddd'),
-                iconColor = ref(undefined),
-                iconClass = ref('icon-right'),
-                status = ref(false), // 鼠标状态
-                isEnd = ref(false),		// 是够验证完成
-                showRefresh = ref(true),
-                transitionLeft = ref(''),
-                transitionWidth = ref(''),
-                startLeft = ref(0)
-
-            const barArea = computed(() => {
-                return proxy.$el.querySelector('.verify-bar-area')
-            })
-
-            function init() {
-                text.value = explain.value
-                getPictrue()
-                nextTick(() => {
-                    let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
-                    setSize.imgHeight = imgHeight
-                    setSize.imgWidth = imgWidth
-                    setSize.barHeight = barHeight
-                    setSize.barWidth = barWidth
-                    proxy.$parent.$emit('ready', proxy)
-                })
-
-                window.removeEventListener('touchmove', function (e) {
-                    move(e)
-                })
-                window.removeEventListener('mousemove', function (e) {
-                    move(e)
-                })
-
-                // 鼠标松开
-                window.removeEventListener('touchend', function () {
-                    end()
-                })
-                window.removeEventListener('mouseup', function () {
-                    end()
-                })
-
-                window.addEventListener('touchmove', function (e) {
-                    move(e)
-                })
-                window.addEventListener('mousemove', function (e) {
-                    move(e)
-                })
-
-                // 鼠标松开
-                window.addEventListener('touchend', function () {
-                    end()
-                })
-                window.addEventListener('mouseup', function () {
-                    end()
-                })
-            }
-
-            watch(type, () => {
-                init()
-            })
-            onMounted(() => {
-                // 禁止拖拽
-                init()
-                proxy.$el.onselectstart = function () {
-                    return false
+        blockSize: {
+            type: Object,
+            default () {
+                return {
+                    width: '50px',
+                    height: '50px'
                 }
+            }
+        },
+        barSize: {
+            type: Object,
+            default () {
+                return {
+                    width: '310px',
+                    height: '40px'
+                }
+            }
+        }
+    },
+    setup (props, context) {
+        const { mode, captchaType, vSpace, imgSize, barSize, type, blockSize, explain } = toRefs(props)
+        const { proxy } = getCurrentInstance()
+        const secretKey = ref('') // 后端返回的ase加密秘钥
+        const passFlag = ref('') // 是否通过的标识
+        const backImgBase = ref('') // 验证码背景图片
+        const blockBackImgBase = ref('') // 验证滑块的背景图片
+        const backToken = ref('') // 后端返回的唯一token值
+        const startMoveTime = ref('') // 移动开始的时间
+        const endMoveTime = ref('') // 移动结束的时间
+        const tipsBackColor = ref('') // 提示词的背景颜色
+        const tipWords = ref('')
+        const text = ref('')
+        const finishText = ref('')
+        const setSize = reactive({
+            imgHeight: 0,
+            imgWidth: 0,
+            barHeight: 0,
+            barWidth: 0
+        })
+        const top = ref(0)
+        const left = ref(0)
+        const moveBlockLeft = ref(undefined)
+        const leftBarWidth = ref(undefined)
+        // 移动中样式
+        const moveBlockBackgroundColor = ref(undefined)
+        const leftBarBorderColor = ref('#ddd')
+        const iconColor = ref(undefined)
+        const iconClass = ref('icon-right')
+        const status = ref(false) // 鼠标状态
+        const isEnd = ref(false)		// 是够验证完成
+        const showRefresh = ref(true)
+        const transitionLeft = ref('')
+        const transitionWidth = ref('')
+        const startLeft = ref(0)
+
+        const barArea = computed(() => {
+            return proxy.$el.querySelector('.verify-bar-area')
+        })
+
+        function init () {
+            text.value = explain.value
+            getPictrue()
+            nextTick(() => {
+                const { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+                setSize.imgHeight = imgHeight
+                setSize.imgWidth = imgWidth
+                setSize.barHeight = barHeight
+                setSize.barWidth = barWidth
+                proxy.$parent.$emit('ready', proxy)
             })
 
-            // 鼠标按下
-            function start(e) {
-                e = e || window.event
+            window.removeEventListener('touchmove', function (e) {
+                move(e)
+            })
+            window.removeEventListener('mousemove', function (e) {
+                move(e)
+            })
+
+            // 鼠标松开
+            window.removeEventListener('touchend', function () {
+                end()
+            })
+            window.removeEventListener('mouseup', function () {
+                end()
+            })
+
+            window.addEventListener('touchmove', function (e) {
+                move(e)
+            })
+            window.addEventListener('mousemove', function (e) {
+                move(e)
+            })
+
+            // 鼠标松开
+            window.addEventListener('touchend', function () {
+                end()
+            })
+            window.addEventListener('mouseup', function () {
+                end()
+            })
+        }
+
+        watch(type, () => {
+            init()
+        })
+        onMounted(() => {
+            // 禁止拖拽
+            init()
+            proxy.$el.onselectstart = function () {
+                return false
+            }
+        })
+
+        // 鼠标按下
+        function start (e) {
+            e = e || window.event
+            if (!e.touches) { // 兼容PC端
+                var x = e.clientX
+            } else { // 兼容移动端
+                var x = e.touches[0].pageX
+            }
+            startLeft.value = Math.floor(x - barArea.value.getBoundingClientRect().left)
+            startMoveTime.value = +new Date() // 开始滑动的时间
+            if (isEnd.value == false) {
+                text.value = ''
+                moveBlockBackgroundColor.value = '#337ab7'
+                leftBarBorderColor.value = '#337AB7'
+                iconColor.value = '#fff'
+                e.stopPropagation()
+                status.value = true
+            }
+        }
+
+        // 鼠标移动
+        function move (e) {
+            e = e || window.event
+            if (status.value && isEnd.value == false) {
                 if (!e.touches) { // 兼容PC端
                     var x = e.clientX
                 } else { // 兼容移动端
                     var x = e.touches[0].pageX
                 }
-                startLeft.value = Math.floor(x - barArea.value.getBoundingClientRect().left)
-                startMoveTime.value = +new Date() // 开始滑动的时间
-                if (isEnd.value == false) {
-                    text.value = ''
-                    moveBlockBackgroundColor.value = '#337ab7'
-                    leftBarBorderColor.value = '#337AB7'
-                    iconColor.value = '#fff'
-                    e.stopPropagation()
-                    status.value = true
+                const bar_area_left = barArea.value.getBoundingClientRect().left
+                let move_block_left = x - bar_area_left // 小方块相对于父元素的left值
+                if (move_block_left >= barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2) {
+                    move_block_left = barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
                 }
-            }
-
-            // 鼠标移动
-            function move(e) {
-                e = e || window.event
-                if (status.value && isEnd.value == false) {
-                    if (!e.touches) { // 兼容PC端
-                        var x = e.clientX
-                    } else { // 兼容移动端
-                        var x = e.touches[0].pageX
-                    }
-                    var bar_area_left = barArea.value.getBoundingClientRect().left
-                    var move_block_left = x - bar_area_left // 小方块相对于父元素的left值
-                    if (move_block_left >= barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2) {
-                        move_block_left = barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
-                    }
-                    if (move_block_left <= 0) {
-                        move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
-                    }
-                    // 拖动后小方块的left值
-                    moveBlockLeft.value = ( move_block_left - startLeft.value ) + 'px'
-                    leftBarWidth.value = ( move_block_left - startLeft.value ) + 'px'
+                if (move_block_left <= 0) {
+                    move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
                 }
+                // 拖动后小方块的left值
+                moveBlockLeft.value = (move_block_left - startLeft.value) + 'px'
+                leftBarWidth.value = (move_block_left - startLeft.value) + 'px'
             }
+        }
 
-            // 鼠标松开
-            function end() {
-                endMoveTime.value = +new Date()
-                // 判断是否重合
-                if (status.value && isEnd.value == false) {
-                    var moveLeftDistance = parseInt(( moveBlockLeft.value || '' ).replace('px', ''))
-                    moveLeftDistance = moveLeftDistance * 310 / parseInt(setSize.imgWidth)
-                    const data = {
-                        captchaType: captchaType.value,
-                        'captcha_code': secretKey.value ? aesEncrypt(JSON.stringify({
+        // 鼠标松开
+        function end () {
+            endMoveTime.value = +new Date()
+            // 判断是否重合
+            if (status.value && isEnd.value == false) {
+                let moveLeftDistance = parseInt((moveBlockLeft.value || '').replace('px', ''))
+                moveLeftDistance = moveLeftDistance * 310 / parseInt(setSize.imgWidth)
+                const data = {
+                    captchaType: captchaType.value,
+                    captcha_code: secretKey.value
+                        ? aesEncrypt(JSON.stringify({
                             x: moveLeftDistance,
                             y: 5.0
-                        }), secretKey.value) : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
-                        'captcha_key': backToken.value
-                    }
-                    reqCheck(data).then(res => {
-                        if (res.code == 1) {
-                            moveBlockBackgroundColor.value = '#5cb85c'
-                            leftBarBorderColor.value = '#5cb85c'
-                            iconColor.value = '#fff'
-                            iconClass.value = 'icon-check'
-                            showRefresh.value = false
-                            isEnd.value = true
-                            if (mode.value == 'pop') {
-                                setTimeout(() => {
-                                    proxy.$parent.clickShow = false
-                                    refresh()
-                                }, 1500)
-                            }
-                            passFlag.value = true
-                            tipWords.value = `${ ( ( endMoveTime.value - startMoveTime.value ) / 1000 ).toFixed(2) }s验证成功`
-                            var captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify({
+                        }), secretKey.value)
+                        : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
+                    captcha_key: backToken.value
+                }
+                reqCheck(data).then(res => {
+                    if (res.code == 1) {
+                        moveBlockBackgroundColor.value = '#5cb85c'
+                        leftBarBorderColor.value = '#5cb85c'
+                        iconColor.value = '#fff'
+                        iconClass.value = 'icon-check'
+                        showRefresh.value = false
+                        isEnd.value = true
+                        if (mode.value == 'pop') {
+                            setTimeout(() => {
+                                proxy.$parent.clickShow = false
+                                refresh()
+                            }, 1500)
+                        }
+                        passFlag.value = true
+                        tipWords.value = `${((endMoveTime.value - startMoveTime.value) / 1000).toFixed(2)}s验证成功`
+                        const captchaVerification = secretKey.value
+                            ? aesEncrypt(backToken.value + '---' + JSON.stringify({
                                 x: moveLeftDistance,
                                 y: 5.0
-                            }), secretKey.value) : backToken.value + '---' + JSON.stringify({
+                            }), secretKey.value)
+                            : backToken.value + '---' + JSON.stringify({
                                 x: moveLeftDistance,
                                 y: 5.0
                             })
-                            setTimeout(() => {
-                                tipWords.value = ''
-                                proxy.$parent.closeBox()
-                                proxy.$parent.$emit('success', { captchaVerification })
-                            }, 1000)
-                        } else {
-                            moveBlockBackgroundColor.value = '#d9534f'
-                            leftBarBorderColor.value = '#d9534f'
-                            iconColor.value = '#fff'
-                            iconClass.value = 'icon-close'
-                            passFlag.value = false
-                            setTimeout(function () {
-                                refresh()
-                            }, 1000)
-                            proxy.$parent.$emit('error', proxy)
-                            tipWords.value = '验证失败'
-                            setTimeout(() => {
-                                tipWords.value = ''
-                            }, 1000)
-                        }
-                    })
-                    status.value = false
-                }
-            }
-
-            const refresh = () => {
-                showRefresh.value = true
-                finishText.value = ''
-
-                transitionLeft.value = 'left .3s'
-                moveBlockLeft.value = 0
-
-                leftBarWidth.value = undefined
-                transitionWidth.value = 'width .3s'
-
-                leftBarBorderColor.value = '#ddd'
-                moveBlockBackgroundColor.value = '#fff'
-                iconColor.value = '#000'
-                iconClass.value = 'icon-right'
-                isEnd.value = false
-
-                getPictrue()
-                setTimeout(() => {
-                    transitionWidth.value = ''
-                    transitionLeft.value = ''
-                    text.value = explain.value
-                }, 300)
-            }
-
-            // 请求背景图片和验证图片
-            function getPictrue() {
-                const data = {
-                    captchaType: captchaType.value
-                }
-                reqGet(data).then(res => {
-                    if (res.code == 1) {
-                        backImgBase.value = res.data.originalImageBase64
-                        blockBackImgBase.value = res.data.jigsawImageBase64
-                        backToken.value = res.data.token
-                        secretKey.value = res.data.secretKey
+                        setTimeout(() => {
+                            tipWords.value = ''
+                            proxy.$parent.closeBox()
+                            proxy.$parent.$emit('success', { captchaVerification })
+                        }, 1000)
                     } else {
-                        tipWords.value = res.msg
+                        moveBlockBackgroundColor.value = '#d9534f'
+                        leftBarBorderColor.value = '#d9534f'
+                        iconColor.value = '#fff'
+                        iconClass.value = 'icon-close'
+                        passFlag.value = false
+                        setTimeout(function () {
+                            refresh()
+                        }, 1000)
+                        proxy.$parent.$emit('error', proxy)
+                        tipWords.value = '验证失败'
+                        setTimeout(() => {
+                            tipWords.value = ''
+                        }, 1000)
                     }
                 })
-            }
-
-            return {
-                secretKey, // 后端返回的ase加密秘钥
-                passFlag, // 是否通过的标识
-                backImgBase, // 验证码背景图片
-                blockBackImgBase, // 验证滑块的背景图片
-                backToken, // 后端返回的唯一token值
-                startMoveTime, // 移动开始的时间
-                endMoveTime, // 移动结束的时间
-                tipsBackColor, // 提示词的背景颜色
-                tipWords,
-                text,
-                finishText,
-                setSize,
-                top,
-                left,
-                moveBlockLeft,
-                leftBarWidth,
-                // 移动中样式
-                moveBlockBackgroundColor,
-                leftBarBorderColor,
-                iconColor,
-                iconClass,
-                status, // 鼠标状态
-                isEnd,		// 是够验证完成
-                showRefresh,
-                transitionLeft,
-                transitionWidth,
-                barArea,
-                refresh,
-                start
+                status.value = false
             }
         }
+
+        const refresh = () => {
+            showRefresh.value = true
+            finishText.value = ''
+
+            transitionLeft.value = 'left .3s'
+            moveBlockLeft.value = 0
+
+            leftBarWidth.value = undefined
+            transitionWidth.value = 'width .3s'
+
+            leftBarBorderColor.value = '#ddd'
+            moveBlockBackgroundColor.value = '#fff'
+            iconColor.value = '#000'
+            iconClass.value = 'icon-right'
+            isEnd.value = false
+
+            getPictrue()
+            setTimeout(() => {
+                transitionWidth.value = ''
+                transitionLeft.value = ''
+                text.value = explain.value
+            }, 300)
+        }
+
+        // 请求背景图片和验证图片
+        function getPictrue () {
+            const data = {
+                captchaType: captchaType.value
+            }
+            reqGet(data).then(res => {
+                if (res.code == 1) {
+                    backImgBase.value = res.data.originalImageBase64
+                    blockBackImgBase.value = res.data.jigsawImageBase64
+                    backToken.value = res.data.token
+                    secretKey.value = res.data.secretKey
+                } else {
+                    tipWords.value = res.msg
+                }
+            })
+        }
+
+        return {
+            secretKey, // 后端返回的ase加密秘钥
+            passFlag, // 是否通过的标识
+            backImgBase, // 验证码背景图片
+            blockBackImgBase, // 验证滑块的背景图片
+            backToken, // 后端返回的唯一token值
+            startMoveTime, // 移动开始的时间
+            endMoveTime, // 移动结束的时间
+            tipsBackColor, // 提示词的背景颜色
+            tipWords,
+            text,
+            finishText,
+            setSize,
+            top,
+            left,
+            moveBlockLeft,
+            leftBarWidth,
+            // 移动中样式
+            moveBlockBackgroundColor,
+            leftBarBorderColor,
+            iconColor,
+            iconClass,
+            status, // 鼠标状态
+            isEnd,		// 是够验证完成
+            showRefresh,
+            transitionLeft,
+            transitionWidth,
+            barArea,
+            refresh,
+            start
+        }
     }
+}
 </script>
diff --git a/admin/src/layout/default/components/aside/menu-item.vue b/admin/src/layout/default/components/aside/menu-item.vue
index 9e0f298c7..00964c78d 100644
--- a/admin/src/layout/default/components/aside/menu-item.vue
+++ b/admin/src/layout/default/components/aside/menu-item.vue
@@ -1,39 +1,39 @@
 <template>
-  <template v-if="meta.show">
-    <el-sub-menu v-if="hasVisibleChild" :index="String(routes.name)">
-      <template #title>
-        <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
-          <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
-        </div>
-        <span class="ml-[10px]">{{ meta.title }}</span>
-      </template>
-      <menu-item v-for="(route, index) in routes.children" :routes="route" :key="index" :level="props.level + 1" />
-      <template v-if="routes.name == 'addon_list' || routes.name == 'marketing_list'">
-        <template v-if="addonsMenus">
-          <menu-item :routes="addonsMenus" :key="index" :level="props.level + 1"/>
+    <template v-if="meta.show">
+        <el-sub-menu v-if="hasVisibleChild" :index="String(routes.name)">
+            <template #title>
+                <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
+                    <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                </div>
+                <span class="ml-[10px]">{{ meta.title }}</span>
+            </template>
+            <menu-item v-for="(route, index) in routes.children" :routes="route" :key="index" :level="props.level + 1" />
+            <template v-if="routes.name == 'addon_list' || routes.name == 'marketing_list'">
+                <template v-if="addonsMenus">
+                    <menu-item :routes="addonsMenus" :key="index" :level="props.level + 1"/>
+                </template>
+            </template>
+        </el-sub-menu>
+        <template v-else>
+            <el-menu-item :index="String(routes.name)" @click="handleJump(routes.name)" v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''">
+                <template #title>
+                    <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
+                        <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                    </div>
+                    <span class="ml-[10px]">{{ meta.title }}</span>
+                </template>
+            </el-menu-item>
+            <el-menu-item :index="String(routes.name)" @click="handleJump(routes.name)" v-else>
+                <template #title>
+                    <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
+                        <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                    </div>
+                    <span class="ml-[10px]">{{ meta.title }}</span>
+                </template>
+            </el-menu-item>
         </template>
-      </template>
-    </el-sub-menu>
-    <template v-else>
-      <el-menu-item :index="String(routes.name)" @click="handleJump(routes.name)" v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''">
-        <template #title>
-          <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
-            <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
-          </div>
-          <span class="ml-[10px]">{{ meta.title }}</span>
-        </template>
-      </el-menu-item>
-      <el-menu-item :index="String(routes.name)" @click="handleJump(routes.name)" v-else>
-        <template #title>
-          <div class="w-[16px] h-[16px] relative flex items-center" v-if="props.level == 1">
-            <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
-          </div>
-          <span class="ml-[10px]">{{ meta.title }}</span>
-        </template>
-      </el-menu-item>
+        <div v-if="routes.is_border" class="!border-0 !border-t-[1px] border-solid mx-[25px] bg-[#f7f7f7] my-[5px]"></div>
     </template>
-    <div v-if="routes.is_border" class="!border-0 !border-t-[1px] border-solid mx-[25px] bg-[#f7f7f7] my-[5px]"></div>
-  </template>
 
 </template>
 
@@ -50,14 +50,14 @@ const router = useRouter()
 const route = useRoute()
 const routers = useUserStore().routers
 const props = defineProps({
-  routes: {
-    type: Object,
-    required: true
-  },
-  level: {
-    type: Number,
-    default: 1
-  }
+    routes: {
+        type: Object,
+        required: true
+    },
+    level: {
+        type: Number,
+        default: 1
+    }
 })
 const systemStore = useSystemStore()
 const meta = computed(() => props.routes.meta)
@@ -66,14 +66,14 @@ const meta = computed(() => props.routes.meta)
 const specialMenuNames = ref<string[]>([])
 const specialMenuNamesLevel1 = ref<string[]>([])
 const addons = computed(() => {
-  const addons:Record<string, any> = {}
-  systemStore?.apps.forEach((item: any) => { addons[item.key] = item })
-  systemStore?.addons.forEach((item: any) => { addons[item.key] = item })
-  return addons
+    const addons:Record<string, any> = {}
+    systemStore?.apps.forEach((item: any) => { addons[item.key] = item })
+    systemStore?.addons.forEach((item: any) => { addons[item.key] = item })
+    return addons
 })
 
 const systemAddonKeys = computed(() => {
-  return systemStore?.addons.map((item: any) => item.key)
+    return systemStore?.addons.map((item: any) => item.key)
 })
 
 const hasVisibleChild = computed(() => {
@@ -85,235 +85,232 @@ const hasVisibleChild = computed(() => {
 
 const addonRouters: Record<string, any> = {}
 routers.forEach(item => {
-  item.original_name = item.name
-  if (item.meta.addon) {
-    addonRouters[item.meta.addon] = item
-  }
-  if (item.meta.attr) {
-    addonRouters[item.meta.attr] = item
-  }
+    item.original_name = item.name
+    if (item.meta.addon) {
+        addonRouters[item.meta.addon] = item
+    }
+    if (item.meta.attr) {
+        addonRouters[item.meta.attr] = item
+    }
 })
 
 const addonsMenus = ref(null)
 
 // 提取所有特殊菜单的name
 const collectSpecialMenuNames = (menus: any[]) => {
-  const names: string[] = []
-  const traverse = (children: any[]) => {
-    children.forEach(child => {
-      if (child.name) {
-        names.push(child.name)
-      }
-      // 递归处理子菜单
-      if (child.children && Array.isArray(child.children)) {
-        traverse(child.children)
-      }
-    })
-  }
-
-  menus.forEach(menu => {
-    if (menu.children && Array.isArray(menu.children)) {
-      traverse(menu.children)
+    const names: string[] = []
+    const traverse = (children: any[]) => {
+        children.forEach(child => {
+            if (child.name) {
+                names.push(child.name)
+            }
+            // 递归处理子菜单
+            if (child.children && Array.isArray(child.children)) {
+                traverse(child.children)
+            }
+        })
     }
-  })
-  return names
+    
+    menus.forEach(menu => {
+        if (menu.children && Array.isArray(menu.children)) {
+            traverse(menu.children)
+        }
+    })
+    return names
 }
 // 提取所有一级特殊菜单的name
 const collectSpecialMenuNamesLevel1 = (menus: any[]) =>{
-  const names: string[] = []
-  menus.forEach(menu => {
-    if (menu.name) {
-      names.push(menu.name)
-    }
-  })
-  return names
+    const names: string[] = []
+    menus.forEach(menu => {
+        if (menu.name) {
+            names.push(menu.name)
+        }
+    })
+    return names
 }
 
 // 从 addonKeys 中提取所有需要匹配的 key
 const getAddonAllKeys = (addonData) => {
-  if (!addonData || typeof addonData !== 'object') return [];
-  const allKeys = [];
-  Object.values(addonData).forEach(category => {
-    if (Array.isArray(category.list)) {
-      category.list.forEach(item => {
-        if (item.key) allKeys.push(item.key);
-      });
-    }
-  });
-  return allKeys;
+    if (!addonData || typeof addonData !== 'object') return [];
+    const allKeys = [];
+    Object.values(addonData).forEach(category => {
+        if (Array.isArray(category.list)) {
+            category.list.forEach(item => {
+                if (item.key) allKeys.push(item.key);
+            });
+        }
+    });
+    return allKeys;
 };
 
 // 处理 specialMenusKeys 子菜单 show 的方法
 const handleSpecialMenus = () => {
-  const specialMenusKeys = storage.get('specialAppList')
-  if (Array.isArray(specialMenusKeys) && specialMenusKeys.length) {
-    const processedSpecialMenus = JSON.parse(JSON.stringify(specialMenusKeys));
-    const activeAppKey = storage.get('activeAppKey');
-
-    // 收集所有特殊菜单的name
-    processedSpecialMenus.forEach(menu => {
-      if (menu.children && Array.isArray(menu.children)) {
-        const traverseChildren = (children) => {
-          children.forEach(child => {
-            if (child && child.is_show !== undefined) {
-              child.is_show = (child.menu_key === activeAppKey) ? 1 : 0;
+    const specialMenusKeys = storage.get('specialAppList')
+    if (Array.isArray(specialMenusKeys) && specialMenusKeys.length) {
+        const processedSpecialMenus = JSON.parse(JSON.stringify(specialMenusKeys));
+        const activeAppKey = storage.get('activeAppKey');
+        
+        // 收集所有特殊菜单的name
+        processedSpecialMenus.forEach(menu => {
+            if (menu.children && Array.isArray(menu.children)) {
+                const traverseChildren = (children) => {
+                    children.forEach(child => {
+                        if (child && child.is_show !== undefined) {
+                            child.is_show = (child.menu_key === activeAppKey) ? 1 : 0;
+                        }
+                    });
+                };
+                traverseChildren(menu.children);
             }
-          });
-        };
-        traverseChildren(menu.children);
-      }
-    });
-    // 过滤掉 children 为空的特殊菜单
-    const filteredSpecialMenus = processedSpecialMenus.filter(menu => {
-      return menu.children && menu.children.length > 0;
-    });
-    return formatRouters(filteredSpecialMenus);
-  }
-  return [];
+        });
+        // 过滤掉 children 为空的特殊菜单
+        const filteredSpecialMenus = processedSpecialMenus.filter(menu => {
+            return menu.children && menu.children.length > 0;
+        });
+        return formatRouters(filteredSpecialMenus);
+    }
+    return [];
 };
 
 // 统一处理跳转逻辑
 const handleJump = (routeName: string) => {
-  // 检查目标路由是否在特殊菜单列表中
-  const isInSpecialMenus = specialMenuNames.value.includes(routeName)
-  // 核心逻辑：如果不在特殊菜单中，就删除activeAppKey
-  if (!isInSpecialMenus) {
-    storage.remove('activeAppKey')
-  } else {
-  }
-  const processedSpecialMenus = handleSpecialMenus();
-  specialMenuNamesLevel1.value = collectSpecialMenuNamesLevel1(processedSpecialMenus)
+    // 检查目标路由是否在特殊菜单列表中
+    const isInSpecialMenus = specialMenuNames.value.includes(routeName)
+    // 核心逻辑：如果不在特殊菜单中，就删除activeAppKey
+    if (!isInSpecialMenus) {
+        storage.remove('activeAppKey')
+    } else {
+    }
+    // 点击特殊菜单的一级，跳转应用列表
+    if (specialMenuNamesLevel1.value.includes(routeName)) {
+        routeName = 'addon_list'
+    }
+    // 跳转时添加随机查询参数（用于触发页面感知）
+    const query = route.name === routeName
+        ? { refresh: Date.now() } // 相同路由时添加随机参数
+        : {};
 
-  // 点击特殊菜单的一级，跳转应用列表
-  if (specialMenuNamesLevel1.value.includes(routeName)) {
-    routeName = 'addon_list'
-  }
-  // 跳转时添加随机查询参数（用于触发页面感知）
-  const query = route.name === routeName
-      ? { refresh: Date.now() } // 相同路由时添加随机参数
-      : {};
-
-  // 执行跳转
-  router.push({ name: routeName, query });
+    // 执行跳转
+    router.push({ name: routeName, query });
 }
 
 watch(route, () => {
-  const addonKeys = storage.get('defaultAppList')
-  if (props.routes.name == 'addon_list') {
-    const addonAllKeys = getAddonAllKeys(addonKeys);
-    if (props.routes.children) {
-      // 过滤掉不需要显示的子菜单
-      props.routes.children = props.routes.children.filter(child => {
-        return !child.name || !addonAllKeys.includes(child.name);
-      });
-      // 处理特殊菜单
-      const processedSpecialMenus = handleSpecialMenus();
-      if (processedSpecialMenus.length) {
-        const newChildren = [...(props.routes.children || [])];
-        processedSpecialMenus.forEach(special => {
-          const index = newChildren.findIndex(child => child.name === special.name);
-          if (index !== -1) {
-            newChildren[index] = special;
-          } else {
-            newChildren.push(special);
-          }
-        });
-        props.routes.children = newChildren;
-      }
+    const addonKeys = storage.get('defaultAppList')
+    if (props.routes.name == 'addon_list') {
+        const addonAllKeys = getAddonAllKeys(addonKeys);
+        if (props.routes.children) {
+            // 过滤掉不需要显示的子菜单
+            props.routes.children = props.routes.children.filter(child => {
+                return !child.name || !addonAllKeys.includes(child.name);
+            });
+            // 处理特殊菜单
+            const processedSpecialMenus = handleSpecialMenus();
+            if (processedSpecialMenus.length) {
+                const newChildren = [...(props.routes.children || [])];
+                processedSpecialMenus.forEach(special => {
+                    const index = newChildren.findIndex(child => child.name === special.name);
+                    if (index !== -1) {
+                        newChildren[index] = special;
+                    } else {
+                        newChildren.push(special);
+                    }
+                });
+                props.routes.children = newChildren;
+            }
+        }
+
+        if (systemAddonKeys.value.includes(route.meta.addon) && addonRouters[route.meta.addon]) {
+            addonsMenus.value = addonRouters[route.meta.addon]
+        } else if (route.meta.attr && addonRouters[route.meta.attr]) {
+            addonsMenus.value = addonRouters[route.meta.attr]
+        } else {
+            addonsMenus.value = null
+        }
     }
 
-    if (systemAddonKeys.value.includes(route.meta.addon) && addonRouters[route.meta.addon]) {
-      addonsMenus.value = addonRouters[route.meta.addon]
-    } else if (route.meta.attr && addonRouters[route.meta.attr]) {
-      addonsMenus.value = addonRouters[route.meta.attr]
-    } else {
-      addonsMenus.value = null
+    const marketingKeys = storage.get('defaultMarketingKeys')
+    const matchedName = route.matched[1]?.name
+    if (props.routes.name == 'marketing_list') {
+        if (marketingKeys && marketingKeys.includes(matchedName)) {
+            addonsMenus.value = route.matched[1] ?? []
+            addonsMenus.value.meta.show = 1
+        } else {
+            addonsMenus.value = null
+        }
     }
-  }
-
-  const marketingKeys = storage.get('defaultMarketingKeys')
-  const matchedName = route.matched[1]?.name
-  if (props.routes.name == 'marketing_list') {
-    if (marketingKeys && marketingKeys.includes(matchedName)) {
-      addonsMenus.value = route.matched[1] ?? []
-      addonsMenus.value.meta.show = 1
-    } else {
-      addonsMenus.value = null
-    }
-  }
-  // console.log('addonsMenus', props.routes)
+    // console.log('addonsMenus', props.routes)
 }, { immediate: true })
 const getAppList = async () => {
-  const res = await getShowApp()
-  const res2 = await getShowSpecialMenu()
-  storage.set({ key: 'specialAppList', data: res2.data.list })
-  storage.set({ key: 'defaultAppList', data: res.data })
-  if (props.routes.name == 'addon_list') {
-    const addonAllKeys = getAddonAllKeys(res.data);
-    if (props.routes.children) {
-      // 过滤掉不需要显示的子菜单
-      props.routes.children = props.routes.children.filter(child => {
-        return !child.name || !addonAllKeys.includes(child.name);
-      });
-      // 处理特殊菜单
-      const processedSpecialMenus = handleSpecialMenus();
-      if (processedSpecialMenus.length) {
-        const newChildren = [...(props.routes.children || [])];
-        processedSpecialMenus.forEach(special => {
-          const index = newChildren.findIndex(child => child.name === special.name);
-          if (index !== -1) {
-            newChildren[index] = special;
-          } else {
-            newChildren.push(special);
-          }
-        });
-        props.routes.children = newChildren;
-      }
+    const res = await getShowApp()
+    const res2 = await getShowSpecialMenu()
+    storage.set({ key: 'specialAppList', data: res2.data.list })
+    storage.set({ key: 'defaultAppList', data: res.data })
+    if (props.routes.name == 'addon_list') {
+        const addonAllKeys = getAddonAllKeys(res.data);
+        if (props.routes.children) {
+            // 过滤掉不需要显示的子菜单
+            props.routes.children = props.routes.children.filter(child => {
+                return !child.name || !addonAllKeys.includes(child.name);
+            });
+            // 处理特殊菜单
+            const processedSpecialMenus = handleSpecialMenus();
+            if (processedSpecialMenus.length) {
+                const newChildren = [...(props.routes.children || [])];
+                processedSpecialMenus.forEach(special => {
+                    const index = newChildren.findIndex(child => child.name === special.name);
+                    if (index !== -1) {
+                        newChildren[index] = special;
+                    } else {
+                        newChildren.push(special);
+                    }
+                });
+                props.routes.children = newChildren;
+            }
+        }
     }
-  }
 }
 // 监听 localStorage 中 activeAppKey 的变化
 onMounted(() => {
-  // 暂时这么处理
-  if(props.routes.name == 'addon_list'){
-    getAppList();
-  }
-  const processedSpecialMenus = handleSpecialMenus();
-  specialMenuNames.value = collectSpecialMenuNames(processedSpecialMenus)
-  specialMenuNamesLevel1.value = collectSpecialMenuNamesLevel1(processedSpecialMenus)
-  const handleStorageChange = (event: StorageEvent) => {
-    if (event.key === 'activeAppKey') {
-      if (props.routes.name == 'addon_list') {
-        const processedSpecialMenus = handleSpecialMenus();
-        if (processedSpecialMenus.length && props.routes.children) {
-          const newChildren = [...(props.routes.children || [])];
-          processedSpecialMenus.forEach(special => {
-            const index = newChildren.findIndex(child => child.name === special.name);
-            if (index !== -1) {
-              newChildren[index] = special;
-            } else {
-              newChildren.push(special);
-            }
-          });
-          props.routes.children = newChildren;
-        }
-      }
+    // 暂时这么处理
+    if(props.routes.name == 'addon_list'){
+        getAppList();
     }
-  };
+    const processedSpecialMenus = handleSpecialMenus();
+    specialMenuNames.value = collectSpecialMenuNames(processedSpecialMenus)
+    specialMenuNamesLevel1.value = collectSpecialMenuNamesLevel1(processedSpecialMenus)
+    const handleStorageChange = (event: StorageEvent) => {
+        if (event.key === 'activeAppKey') {
+            if (props.routes.name == 'addon_list') {
+                const processedSpecialMenus = handleSpecialMenus();
+                if (processedSpecialMenus.length && props.routes.children) {
+                    const newChildren = [...(props.routes.children || [])];
+                    processedSpecialMenus.forEach(special => {
+                        const index = newChildren.findIndex(child => child.name === special.name);
+                        if (index !== -1) {
+                            newChildren[index] = special;
+                        } else {
+                            newChildren.push(special);
+                        }
+                    });
+                    props.routes.children = newChildren;
+                }
+            }
+        }
+    };
 
-  window.addEventListener('storage', handleStorageChange);
+    window.addEventListener('storage', handleStorageChange);
 
-  // 组件卸载时移除事件监听
-  onUnmounted(() => {
-    window.removeEventListener('storage', handleStorageChange);
-  });
+    // 组件卸载时移除事件监听
+    onUnmounted(() => {
+        window.removeEventListener('storage', handleStorageChange);
+    });
 });
 </script>
 
 <style lang="scss">
-.el-sub-menu{
-  .el-icon{
-    width: auto;
-  }
+.el-sub-menu {
+    .el-icon {
+        width: auto;
+    }
 }
 </style>
diff --git a/admin/src/layout/default/components/aside/side.vue b/admin/src/layout/default/components/aside/side.vue
index 6871f9ea2..f0dece717 100644
--- a/admin/src/layout/default/components/aside/side.vue
+++ b/admin/src/layout/default/components/aside/side.vue
@@ -1,25 +1,25 @@
 <template>
-  <el-container class="w-[200px] h-screen layout-aside flex flex-col">
-    <el-header class="logo-wrap flex items-center justify-center h-[64px]">
-      <div class="logo flex items-center justify-center m-auto w-full h-[64px]" v-if="!systemStore.menuIsCollapse">
-        <template v-if="webSite">
-          <img class="max-h-[40px] max-w-[70%]" v-if="webSite.logo" :src="img(webSite.logo)" alt="">
-          <img class="max-h-[40px] max-w-[70%]" src="@/app/assets/images/icon-addon-one.png" alt="" v-else>
-        </template>
-      </div>
-      <div class="logo flex items-center justify-center h-[64px]" v-else>
-        <i class="text-3xl iconfont iconyunkongjian"></i>
-      </div>
-    </el-header>
-    <el-main class="menu-wrap">
-      <el-scrollbar>
-        <el-menu :default-active="route.name" :router="true" class="aside-menu h-full" :unique-opened="true" :collapse="systemStore.menuIsCollapse" >
-          <menu-item v-for="(route, index) in menuData" :routes="route" :key="index" />
-        </el-menu>
-        <div class="h-[48px]"></div>
-      </el-scrollbar>
-    </el-main>
-  </el-container>
+    <el-container class="w-[200px] h-screen layout-aside flex flex-col">
+        <el-header class="logo-wrap flex items-center justify-center h-[64px]">
+            <div class="logo flex items-center justify-center m-auto w-full h-[64px]" v-if="!systemStore.menuIsCollapse">
+                <template v-if="webSite">
+                    <img class="max-h-[40px] max-w-[70%]" v-if="webSite.logo" :src="img(webSite.logo)" alt="">
+                    <img class="max-h-[40px] max-w-[70%]" src="@/app/assets/images/icon-addon-one.png" alt="" v-else>
+                </template>
+            </div>
+            <div class="logo flex items-center justify-center h-[64px]" v-else>
+                <i class="text-3xl iconfont iconyunkongjian"></i>
+            </div>
+        </el-header>
+        <el-main class="menu-wrap">
+            <el-scrollbar>
+                <el-menu :default-active="route.name" :router="true" class="aside-menu h-full" :unique-opened="true" :collapse="systemStore.menuIsCollapse" >
+                    <menu-item v-for="(route, index) in menuData" :routes="route" :key="index" />
+                </el-menu>
+                <div class="h-[48px]"></div>
+            </el-scrollbar>
+        </el-main>
+    </el-container>
 </template>
 
 <script lang="ts" setup>
@@ -60,94 +60,93 @@ const addonRouters: Record<string, any> = {}
 //     storage.set({ key: 'specialAppList', data: specialList.value })
 // }
 
-
 onMounted(() => {
-  getWebConfig().then(({ data }) => {
-    webSite.value = data
-  });
-  // getAppList()
-  // getShowSpecialMenuList()
+    getWebConfig().then(({ data }) => {
+        webSite.value = data
+    });
+    // getAppList()
+    // getShowSpecialMenuList()
 })
 
 routers.forEach(item => {
-  item.original_name = item.name
-  if (item.meta.addon == '') {
-    if (item.meta.attr == '' && item.name != 'sign' && item.name != 'verify') {
-      if (item.children && item.children.length) {
-        item.name = findFirstValidRoute(item.children)
-      }
-      menuData.value.push(item)
-    }
-  } else if (item.meta.addon != '' && systemStore?.apps.length == 1 && systemStore?.apps[0].key == item.meta.addon && item.meta.show) {
-    if (item.children) {
-      item.children.forEach((citem: Record<string, any>) => {
-        citem.original_name = citem.name
-        if (citem.children && citem.children.length) {
-          citem.name = findFirstValidRoute(citem.children)
+    item.original_name = item.name
+    if (item.meta.addon == '') {
+        if (item.meta.attr == '' && item.name != 'sign' && item.name != 'verify') {
+            if (item.children && item.children.length) {
+                item.name = findFirstValidRoute(item.children)
+            }
+            menuData.value.push(item)
+        }
+    } else if (item.meta.addon != '' && systemStore?.apps.length == 1 && systemStore?.apps[0].key == item.meta.addon && item.meta.show) {
+        if (item.children) {
+            item.children.forEach((citem: Record<string, any>) => {
+                citem.original_name = citem.name
+                if (citem.children && citem.children.length) {
+                    citem.name = findFirstValidRoute(citem.children)
+                }
+            })
+            menuData.value.unshift(...item.children)
+        } else {
+            menuData.value.unshift(item)
         }
-      })
-      menuData.value.unshift(...item.children)
     } else {
-      menuData.value.unshift(item)
+        addonRouters[item.meta.addon] = item
     }
-  } else {
-    addonRouters[item.meta.addon] = item
-  }
 
-  // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
-  // menuData.value.sort((a, b) => {
-  //     if (a.meta.sort && b.meta.sort) {
-  //         return b.meta.sort - a.meta.sort
-  //     } else if (a.meta.sort) {
-  //         return -1
-  //     } else if (b.meta.sort) {
-  //         return 1
-  //     } else {
-  //         return 0
-  //     }
-  // })
+    // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
+    menuData.value.sort((a, b) => {
+        if (a.meta.sort && b.meta.sort) {
+            return b.meta.sort - a.meta.sort
+        } else if (a.meta.sort) {
+            return -1
+        } else if (b.meta.sort) {
+            return 1
+        } else {
+            return 0
+        }
+    })
 })
 
 // 多应用时将应用插入菜单
 if (systemStore?.apps.length > 1) {
-  const routers:Record<string, any>[] = []
-  systemStore?.apps.forEach((item: Record<string, any>) => {
-    if (addonRouters[item.key]) {
-      addonRouters[item.key].name = addonIndexRoute[item.key]
-      routers.push(addonRouters[item.key])
-    }
-  })
-  menuData.value.unshift(...routers)
+    const routers:Record<string, any>[] = []
+    systemStore?.apps.forEach((item: Record<string, any>) => {
+        if (addonRouters[item.key]) {
+            addonRouters[item.key].name = addonIndexRoute[item.key]
+            routers.push(addonRouters[item.key])
+        }
+    })
+    menuData.value.unshift(...routers)
 
-  // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
-  // menuData.value.sort((a, b) => {
-  //     if (a.meta.sort && b.meta.sort) {
-  //         return b.meta.sort - a.meta.sort
-  //     } else if (a.meta.sort) {
-  //         return -1
-  //     } else if (b.meta.sort) {
-  //         return 1
-  //     } else {
-  //         return 0
-  //     }
-  // })
+    // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
+    menuData.value.sort((a, b) => {
+        if (a.meta.sort && b.meta.sort) {
+            return b.meta.sort - a.meta.sort
+        } else if (a.meta.sort) {
+            return -1
+        } else if (b.meta.sort) {
+            return 1
+        } else {
+            return 0
+        }
+    })
 }
 </script>
 
 <style lang="scss">
 .menu-wrap {
-  padding: 0!important;
+    padding: 0!important;
 
-  .el-menu {
-    border-right: 0!important;
+    .el-menu {
+        border-right: 0!important;
 
-    .el-menu-item, .el-sub-menu__title {
-      --el-menu-item-height: 40px;
+        .el-menu-item, .el-sub-menu__title {
+            --el-menu-item-height: 40px;
+        }
+
+        .el-sub-menu .el-menu-item {
+            --el-menu-sub-item-height: 40px;
+        }
     }
-
-    .el-sub-menu .el-menu-item {
-      --el-menu-sub-item-height: 40px;
-    }
-  }
 }
 </style>
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index 32d69f627..e875689af 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -258,4 +258,8 @@ const toPreview = () => {
     font-weight: inherit !important;
     color: var(--el-text-color-regular) !important;
 }
+:deep(.inter .el-breadcrumb__inner){
+    font-weight: inherit !important;
+    color: var(--el-text-color-regular) !important;
+}
 </style>
diff --git a/admin/src/layout/default/components/tabs.vue b/admin/src/layout/default/components/tabs.vue
index 561663f98..3304940b1 100644
--- a/admin/src/layout/default/components/tabs.vue
+++ b/admin/src/layout/default/components/tabs.vue
@@ -1,15 +1,15 @@
 <template>
-    <div class="tab-wrap w-full px-[16px]">
-        <el-tabs :closable="tabbarStore.tabLength > 1" :model-value="route.path" @tab-click="tabClick" @tab-remove="removeTab">
-            <el-tab-pane v-for="(tab, key, index) in tabbarStore.tabs" :name="tab.path" :key="index">
+    <div class="tab-wrap w-full px-[16px]" v-show="systemStore.tab">
+        <el-tabs :closable="tabbarStore.tabLength > 1" :model-value="route.name" @tab-click="tabClick" @tab-remove="removeTab">
+            <el-tab-pane v-for="(tab, key, index) in tabbarStore.tabs" :name="tab.name" :key="index">
                 <template #label>
                     <el-dropdown trigger="contextmenu" placement="bottom-start">
-                        <span :class="{ 'text-primary': route.path == tab.path }" class="tab-name">{{ tab.title }}</span>
+                        <span :class="{ 'text-primary': route.name == tab.name }" class="tab-name">{{ tab.title }}</span>
                         <template #dropdown>
                             <el-dropdown-menu>
-                                <el-dropdown-item icon="Back" :disabled="index == 0" @click="closeLeft(tab.path)">{{t('tabs.closeLeft') }}</el-dropdown-item>
-                                <el-dropdown-item icon="Right" :disabled="index == (tabbarStore.tabLength - 1)" @click="closeRight(tab.path)">{{t('tabs.closeRight') }}</el-dropdown-item>
-                                <el-dropdown-item icon="Close" :disabled="tabbarStore.tabLength == 1" @click="closeOther(tab.path)">{{t('tabs.closeOther') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Back" :disabled="index == 0" @click="closeLeft(tab.name)">{{t('tabs.closeLeft') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Right" :disabled="index == (tabbarStore.tabLength - 1)" @click="closeRight(tab.name)">{{t('tabs.closeRight') }}</el-dropdown-item>
+                                <el-dropdown-item icon="Close" :disabled="tabbarStore.tabLength == 1" @click="closeOther(tab.name)">{{t('tabs.closeOther') }}</el-dropdown-item>
                             </el-dropdown-menu>
                         </template>
                     </el-dropdown>
@@ -22,10 +22,12 @@
 <script lang="ts" setup>
 import { watch, onMounted } from 'vue'
 import useTabbarStore from '@/stores/modules/tabbar'
+import useSystemStore from '@/stores/modules/system'
 import { useRoute, useRouter } from 'vue-router'
 import { t } from '@/lang'
 
 const tabbarStore = useTabbarStore()
+const systemStore = useSystemStore()
 const route = useRoute()
 const router = useRouter()
 
@@ -43,7 +45,7 @@ watch(route, (nval: any) => {
  */
 const tabClick = (content: any) => {
     const tabRoute = tabbarStore.tabs[content.props.name]
-    router.push({ path: tabRoute.path, query: tabRoute.query })
+    router.push({ name: tabRoute.name, query: tabRoute.query })
 }
 
 /**
@@ -51,45 +53,49 @@ const tabClick = (content: any) => {
  * @param content
  */
 const removeTab = (content: any) => {
-    if (route.path == content) {
+    if (route.name == content) {
         const tabs = Object.keys(tabbarStore.tabs)
-        router.push({ path: tabs[tabs.indexOf(content) - 1] })
+        if (tabs.indexOf(content) == 0) {
+            router.push({ name: tabs[1] })
+        } else {
+            router.push({ name: tabs[tabs.indexOf(content) - 1] })
+        }
     }
     tabbarStore.removeTab(content)
 }
 
 /**
  * 关闭左侧
- * @param path
+ * @param name
  */
-const closeLeft = (path: string) => {
+const closeLeft = (name: string) => {
     const tabs = Object.keys(tabbarStore.tabs)
-    for (let i = tabs.indexOf(path) - 1; i >= 0; i--) {
+    for (let i = tabs.indexOf(name) - 1; i >= 0; i--) {
         delete tabbarStore.tabs[tabs[i]]
     }
-    router.push({ path })
+    router.push({ name })
 }
 
 /**
  * 关闭右侧
- * @param path
+ * @param name
  */
-const closeRight = (path: string) => {
+const closeRight = (name: string) => {
     const tabs = Object.keys(tabbarStore.tabs)
-    for (let i = tabs.indexOf(path) + 1; i < tabs.length; i++) {
+    for (let i = tabs.indexOf(name) + 1; i < tabs.length; i++) {
         delete tabbarStore.tabs[tabs[i]]
     }
-    router.push({ path })
+    router.push({ name })
 }
 
 /**
  * 关闭其他
- * @param path
+ * @param name
  */
-const closeOther = (path: string) => {
+const closeOther = (name: string) => {
     const tabs = Object.keys(tabbarStore.tabs)
-    tabs.forEach((key: string) => { key != path && delete tabbarStore.tabs[key] })
-    router.push({ path })
+    tabs.forEach((key: string) => { key != name && delete tabbarStore.tabs[key] })
+    router.push({ name })
 }
 </script>
 
diff --git a/admin/src/layout/default/index.vue b/admin/src/layout/default/index.vue
index 13121b350..50788f406 100644
--- a/admin/src/layout/default/index.vue
+++ b/admin/src/layout/default/index.vue
@@ -11,12 +11,14 @@
             </el-header>
             <!-- 顶部 end -->
 
+            <layout-tab />
+
             <!-- 主体 -->
             <el-main class="h-full p-0 bg-page">
                 <el-scrollbar>
                     <div class="p-[15px]">
                         <router-view v-slot="{ Component, route }" v-if="appStore.routeRefreshTag">
-                            <keep-alive :include="tabbarStore.tabNames">
+                            <keep-alive :include="tabbarStore.tabNames" :max="15">
                                 <component :is="Component" :key="route.fullPath" />
                             </keep-alive>
                         </router-view>
@@ -32,6 +34,7 @@
 import { computed } from 'vue'
 import layoutHeader from './components/header/index.vue'
 import layoutAside from './components/aside/index.vue'
+import layoutTab from './components/tabs.vue'
 import useAppStore from '@/stores/modules/app'
 import useTabbarStore from '@/stores/modules/tabbar'
 import useSystemStore from '@/stores/modules/system'
diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index c19c1bbc7..a067fa49c 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -79,8 +79,12 @@ router.beforeEach(async (to: any, from, next) => {
 
                 // 设置首页路由
                 let firstRoute: symbol | string | undefined = findFirstValidRoute(userStore.routers)
-                if (systemStore.apps[0]) {
-                    firstRoute = userStore.addonIndexRoute[ systemStore.apps[0].key ]
+                for (let i = 0; i < systemStore.apps.length; i++) {
+                    const item = systemStore.apps[i]
+                    if (userStore.addonIndexRoute[item.key]) {
+                        firstRoute = userStore.addonIndexRoute[item.key]
+                        break
+                    }
                 }
 
                 ROOT_ROUTER.redirect = { name: firstRoute }
diff --git a/admin/src/stores/modules/system.ts b/admin/src/stores/modules/system.ts
index 9bb691ffb..21fe54f91 100644
--- a/admin/src/stores/modules/system.ts
+++ b/admin/src/stores/modules/system.ts
@@ -1,17 +1,20 @@
 import { defineStore } from 'pinia'
 import storage from '@/utils/storage'
 import { useCssVar } from '@vueuse/core'
-import { useCssVar } from '@vueuse/core'
 import { getInstalledAddonList } from '@/app/api/addon'
 
-
 interface System {
     menuIsCollapse: boolean,
+    menuDrawer: boolean,
     dark: boolean,
     theme: string,
     lang: string,
     apps: Record<string, any>[],
     addons: Record<string, any>[]
+    sidebar: string,
+    sidebarStyle: string,
+    currHeadMenuName: any,
+    tab: Boolean
 }
 
 const theme = storage.get('theme') ?? {}
@@ -20,14 +23,22 @@ const useSystemStore = defineStore('system', {
     state: (): System => {
         return {
             menuIsCollapse: false,
+            menuDrawer: false,
             dark: theme.dark ?? false,
             theme: theme.theme ?? '#273de3',
+            sidebar: theme.sidebar ?? 'oneType',
             lang: storage.get('lang') ?? 'zh-cn',
             apps: [],
-            addons: []
+            addons: [],
+            sidebarStyle: theme.sidebarStyle ?? 'threeType',
+            currHeadMenuName: '',
+            tab: storage.get('tab') ?? false
         }
     },
     actions: {
+        setHeadMenu(value: any) {
+            this.currHeadMenuName = value
+        },
         setTheme(state: string, value: any) {
             this[state] = value
             theme[state] = value
diff --git a/admin/src/stores/modules/tabbar.ts b/admin/src/stores/modules/tabbar.ts
index 3397b7d6c..f299a8b24 100644
--- a/admin/src/stores/modules/tabbar.ts
+++ b/admin/src/stores/modules/tabbar.ts
@@ -1,10 +1,11 @@
 import { defineStore } from 'pinia'
-import type { RouteLocationNormalizedLoaded } from 'vue-router'
+import type { RouteLocationNormalizedLoaded, RouteRecordName } from 'vue-router'
+import useSystemStore from '@/stores/modules/system'
 
 interface Tabbar {
     curr: string,
     tabs: {
-        [key: string]: any
+        [key: RouteRecordName]: any
     }
 }
 
@@ -16,17 +17,18 @@ const useTabbarStore = defineStore('tabbar', {
         }
     },
     actions: {
-        addTab(roter: RouteLocationNormalizedLoaded) {
-            if (roter.meta && roter.meta.type != 1) return
-            if (this.tabs[roter.path]) {
-                this.tabs[roter.path].query = roter.query || {}
+        addTab(router: RouteLocationNormalizedLoaded) {
+            if (router.meta && router.meta.type != 1) return
+            if (this.tabs[router.name]) {
+                this.tabs[router.name].query = router.query || {}
                 return
             }
-            this.tabs[roter.path] = {
-                path: roter.path,
-                title: roter.meta ? roter.meta.title : '',
-                name: roter.name,
-                query: roter.query || {}
+            this.tabs[router.name] = {
+                path: router.path,
+                title: router.meta ? router.meta.title : '',
+                name: router.name,
+                query: router.query || {},
+                componentName: router.matched.at(-1)?.components.default.__name
             }
         },
         removeTab(path: string) {
@@ -40,12 +42,13 @@ const useTabbarStore = defineStore('tabbar', {
         tabLength: (state) => Object.keys(state.tabs).length,
         tabNames: (state) => {
             const name: any[] = []
+            if (!useSystemStore().tab) return name
             Object.keys(state.tabs).forEach(key => {
-                name.push(state.tabs[key].name)
+                name.push(state.tabs[key].componentName)
             })
             return name
         }
     }
 })
 
-export default useTabbarStore
\ No newline at end of file
+export default useTabbarStore
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index b92a835aa..a5378c616 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -53,7 +53,9 @@ const useUserStore = defineStore('user', {
             logout()
             // 清除tabbar
             useTabbarStore().clearTab()
-            router.push('/login')
+            const login = '/login'
+            // router.push(login)
+            location.href = `${location.origin}${login}`
         },
         getAuthMenusFn() {
             return new Promise((resolve, reject) => {
diff --git a/admin/src/styles/font/price.ttf b/admin/src/styles/font/price.ttf
deleted file mode 100644
index 6483758ed..000000000
Binary files a/admin/src/styles/font/price.ttf and /dev/null differ
diff --git a/admin/src/styles/icon/addon-iconfont.css b/admin/src/styles/icon/addon-iconfont.css
index b630d0ece..4401b31bd 100644
--- a/admin/src/styles/icon/addon-iconfont.css
+++ b/admin/src/styles/icon/addon-iconfont.css
@@ -1 +1,2 @@
-/* addon-iconfont.css */
+@import "addon/o2o/iconfont.css";
+@import "addon/tourism/iconfont.css";
diff --git a/admin/src/styles/icon/addon/o2o/iconfont.css b/admin/src/styles/icon/addon/o2o/iconfont.css
new file mode 100644
index 000000000..17076410c
--- /dev/null
+++ b/admin/src/styles/icon/addon/o2o/iconfont.css
@@ -0,0 +1,38 @@
+@font-face {
+  font-family: "o2o"; /* Project id 4412516 */
+  src: url('//at.alicdn.com/t/c/font_4412516_cacqsbew46.woff2?t=1705720131974') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4412516_cacqsbew46.woff?t=1705720131974') format('woff'),
+       url('//at.alicdn.com/t/c/font_4412516_cacqsbew46.ttf?t=1705720131974') format('truetype');
+}
+
+.o2o {
+  font-family: "o2o" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.o2o-icon-danhanghuadong:before {
+  content: "\e66f";
+}
+
+.o2o-icon-yuanjiao:before {
+  content: "\e6c0";
+}
+
+.o2o-icon-gl-square:before {
+  content: "\ea92";
+}
+
+.o2o-icon-sousuo12:before {
+  content: "\e699";
+}
+
+.o2o-icon-sousuo11:before {
+  content: "\e6d4";
+}
+
+.o2o-icon-jishi:before {
+  content: "\e600";
+}
diff --git a/admin/src/styles/icon/addon/o2o/iconfont.json b/admin/src/styles/icon/addon/o2o/iconfont.json
new file mode 100644
index 000000000..4ae38c0c4
--- /dev/null
+++ b/admin/src/styles/icon/addon/o2o/iconfont.json
@@ -0,0 +1,51 @@
+{
+  "id": "4412516",
+  "name": "上门服务",
+  "font_family": "o2o",
+  "css_prefix_text": "o2o-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "30621139",
+      "name": "单行滑动",
+      "font_class": "danhanghuadong",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "7149037",
+      "name": "圆角",
+      "font_class": "yuanjiao",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "7594344",
+      "name": "20gl-square",
+      "font_class": "gl-square",
+      "unicode": "ea92",
+      "unicode_decimal": 60050
+    },
+    {
+      "icon_id": "10133070",
+      "name": "搜索",
+      "font_class": "sousuo12",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "14652583",
+      "name": "搜索",
+      "font_class": "sousuo11",
+      "unicode": "e6d4",
+      "unicode_decimal": 59092
+    },
+    {
+      "icon_id": "6818781",
+      "name": "技师",
+      "font_class": "jishi",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    }
+  ]
+}
diff --git a/admin/src/styles/icon/addon/tourism/iconfont.css b/admin/src/styles/icon/addon/tourism/iconfont.css
new file mode 100644
index 000000000..4e28126c0
--- /dev/null
+++ b/admin/src/styles/icon/addon/tourism/iconfont.css
@@ -0,0 +1,58 @@
+@font-face {
+  font-family: "tourism"; /* Project id 4137250 */
+  src: url('//at.alicdn.com/t/c/font_4137250_st1ha9l0k1e.woff2?t=1687685028672') format('woff2'),
+  url('//at.alicdn.com/t/c/font_4137250_st1ha9l0k1e.woff?t=1687685028672') format('woff'),
+  url('//at.alicdn.com/t/c/font_4137250_st1ha9l0k1e.ttf?t=1687685028672') format('truetype');
+}
+
+.tourism {
+  font-family: "tourism" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.tourism-icon-feiji:before {
+  content: "\e600";
+}
+
+.tourism-icon-lvyou:before {
+  content: "\e6a9";
+}
+
+.tourism-icon-lvyouchanpin:before {
+  content: "\e63b";
+}
+
+.tourism-icon-lvyou1:before {
+  content: "\e623";
+}
+
+.tourism-icon-lvyou2:before {
+  content: "\e601";
+}
+
+.tourism-icon-lvyou3:before {
+  content: "\e60c";
+}
+
+.tourism-icon-lvyoubaochedingdan:before {
+  content: "\e612";
+}
+
+.tourism-icon-lvyou4:before {
+  content: "\e653";
+}
+
+.tourism-icon-lvyou5:before {
+  content: "\e610";
+}
+
+.tourism-icon-lvyouguanguang:before {
+  content: "\e87e";
+}
+
+.tourism-icon-lvyou6:before {
+  content: "\e642";
+}
diff --git a/admin/src/styles/icon/addon/tourism/iconfont.json b/admin/src/styles/icon/addon/tourism/iconfont.json
new file mode 100644
index 000000000..f9bc2b78e
--- /dev/null
+++ b/admin/src/styles/icon/addon/tourism/iconfont.json
@@ -0,0 +1,86 @@
+{
+  "id": "4137250",
+  "name": "旅游业",
+  "font_family": "tourism",
+  "css_prefix_text": "tourism-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1443",
+      "name": "飞机",
+      "font_class": "feiji",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "446824",
+      "name": "旅游",
+      "font_class": "lvyou",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "1167173",
+      "name": "旅游产品",
+      "font_class": "lvyouchanpin",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "1354920",
+      "name": "旅游",
+      "font_class": "lvyou1",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "1505555",
+      "name": "旅游",
+      "font_class": "lvyou2",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "2121726",
+      "name": "旅游",
+      "font_class": "lvyou3",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "2357494",
+      "name": "旅游包车订单",
+      "font_class": "lvyoubaochedingdan",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "3944019",
+      "name": "旅游",
+      "font_class": "lvyou4",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "4838220",
+      "name": "旅游",
+      "font_class": "lvyou5",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
+    {
+      "icon_id": "7444178",
+      "name": "旅游观光",
+      "font_class": "lvyouguanguang",
+      "unicode": "e87e",
+      "unicode_decimal": 59518
+    },
+    {
+      "icon_id": "9748082",
+      "name": "旅游",
+      "font_class": "lvyou6",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    }
+  ]
+}
diff --git a/admin/src/styles/icon/iconfont.css b/admin/src/styles/icon/iconfont.css
index f718a72c0..826e60c78 100644
--- a/admin/src/styles/icon/iconfont.css
+++ b/admin/src/styles/icon/iconfont.css
@@ -1,9 +1,8 @@
 @font-face {
-  font-family: "iconfont";
-  /* Project id 3883393 */
-  src: url('//at.alicdn.com/t/c/font_3883393_0604cbkh5j03.woff2?t=1762651161569') format('woff2'),
-    url('//at.alicdn.com/t/c/font_3883393_0604cbkh5j03.woff?t=1762651161569') format('woff'),
-    url('//at.alicdn.com/t/c/font_3883393_0604cbkh5j03.ttf?t=1762651161569') format('truetype');
+  font-family: "iconfont"; /* Project id 3883393 */
+  src: url('//at.alicdn.com/t/c/font_3883393_jquqyagjvf.woff2?t=1773643077865') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3883393_jquqyagjvf.woff?t=1773643077865') format('woff'),
+       url('//at.alicdn.com/t/c/font_3883393_jquqyagjvf.ttf?t=1773643077865') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconjiang-right:before {
+  content: "\e921";
+}
+
+.iconpeisongshezhi:before {
+  content: "\e920";
+}
+
+.iconai:before {
+  content: "\e91f";
+}
+
 .icona-zhulixiangqingpc30:before {
   content: "\e914";
 }
@@ -3276,4 +3287,4 @@
 
 .iconquanping:before {
   content: "\eb11";
-}
\ No newline at end of file
+}
diff --git a/admin/src/styles/icon/official-iconfont.css b/admin/src/styles/icon/official-iconfont.css
index 894813d90..ebfa08010 100644
--- a/admin/src/styles/icon/official-iconfont.css
+++ b/admin/src/styles/icon/official-iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "nc-iconfont"; /* Project id 4567203 */
-  src: url('//at.alicdn.com/t/c/font_4567203_9qmfc2elgrt.woff2?t=1741345195504') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4567203_9qmfc2elgrt.woff?t=1741345195504') format('woff'),
-       url('//at.alicdn.com/t/c/font_4567203_9qmfc2elgrt.ttf?t=1741345195504') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4567203_mq3zv60st5a.woff2?t=1767940264104') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4567203_mq3zv60st5a.woff?t=1767940264104') format('woff'),
+       url('//at.alicdn.com/t/c/font_4567203_mq3zv60st5a.ttf?t=1767940264104') format('truetype');
 }
 
 .nc-iconfont {
@@ -13,6 +13,578 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.nc-icon-huiyuangaikuang:before {
+  content: "\e91b";
+}
+
+.nc-icon-jiaoyigaikuang:before {
+  content: "\e91a";
+}
+
+.nc-icon-zhanghuruzhushenqing:before {
+  content: "\e919";
+}
+
+.nc-icon-jiesuanzhanghu1:before {
+  content: "\e918";
+}
+
+.nc-icon-zhanghuguanli:before {
+  content: "\e917";
+}
+
+.nc-icon-banbenhao:before {
+  content: "\e8ff";
+}
+
+.nc-icon-shangjiashoujiduan:before {
+  content: "\e8fd";
+}
+
+.nc-icon-xinxi:before {
+  content: "\e900";
+}
+
+.nc-icon-a-gongyingshangzhangdanpc30:before {
+  content: "\e771";
+}
+
+.nc-icon-a-jifenshangchengzhangdanpc30:before {
+  content: "\e772";
+}
+
+.nc-icon-a-shangchengzhangdanpc30:before {
+  content: "\e773";
+}
+
+.nc-icon-a-chongzhizhangdanpc30:before {
+  content: "\e774";
+}
+
+.nc-icon-gongzuotai:before {
+  content: "\e8ec";
+}
+
+.nc-icon-shoujiV6xx1:before {
+  content: "\e8ed";
+}
+
+.nc-icon-shoujiV6xxmm:before {
+  content: "\e8fe";
+}
+
+.nc-icon-xuanfuanniu:before {
+  content: "\e8e5";
+}
+
+.nc-icon-pintuanguanli:before {
+  content: "\e8e0";
+}
+
+.nc-icon-huodongliebiao1:before {
+  content: "\e8e1";
+}
+
+.nc-icon-pintuanliebiao:before {
+  content: "\e8e2";
+}
+
+.nc-icon-pintuandingdan:before {
+  content: "\e8e3";
+}
+
+.nc-icon-pintuanpeizhi:before {
+  content: "\e8e4";
+}
+
+.nc-icon-xia:before {
+  content: "\e8de";
+}
+
+.nc-icon-shang:before {
+  content: "\e8df";
+}
+
+.nc-icon-shoujiV6xx:before {
+  content: "\e7a1";
+}
+
+.nc-icon-ditumichi:before {
+  content: "\e8ca";
+}
+
+.nc-icon-qiehuanV6xx:before {
+  content: "\e8eb";
+}
+
+.nc-icon-dingdanbianhaoV6xx:before {
+  content: "\e8ea";
+}
+
+.nc-icon-dingdanbianhaoV6mm:before {
+  content: "\e8e9";
+}
+
+.nc-icon-dianpuzhandianV6xx2:before {
+  content: "\e8e6";
+}
+
+.nc-icon-huocheV6mm:before {
+  content: "\e8e7";
+}
+
+.nc-icon-huocheV6xx:before {
+  content: "\e8e8";
+}
+
+.nc-icon-wannengbiaodanV6xx:before {
+  content: "\e8d9";
+}
+
+.nc-icon-shujudaochuV6xx:before {
+  content: "\e8da";
+}
+
+.nc-icon-shujudaochuV6xx-1:before {
+  content: "\e8db";
+}
+
+.nc-icon-dayinjiV6xx:before {
+  content: "\e8dc";
+}
+
+.nc-icon-dayinV6xx:before {
+  content: "\e8dd";
+}
+
+.nc-icon-fenzuguanliV6xx:before {
+  content: "\e8d6";
+}
+
+.nc-icon-shangpinliebiaoV6xx:before {
+  content: "\e8d7";
+}
+
+.nc-icon-dingdanliebiaoV6xx:before {
+  content: "\e8d4";
+}
+
+.nc-icon-tuikuanV6xx2:before {
+  content: "\e8d8";
+}
+
+.nc-icon-jifenshangchengV6xx:before {
+  content: "\e8d5";
+}
+
+.nc-icon-chakandituV6xx:before {
+  content: "\e8d2";
+}
+
+.nc-icon-a-peisongguanliPC30:before {
+  content: "\e6ed";
+}
+
+.nc-icon-a-tongchengpeisongPC30:before {
+  content: "\e6ec";
+}
+
+.nc-icon-a-wuliupeisongPC30:before {
+  content: "\e6ee";
+}
+
+.nc-icon-a-shangjiapeisongPC30:before {
+  content: "\e6f2";
+}
+
+.nc-icon-xianshiV6mm:before {
+  content: "\e8ac";
+}
+
+.nc-icon-a-dianneifenrun34:before {
+  content: "\e811";
+}
+
+.nc-icon-xiaochengxu:before {
+  content: "\e8a8";
+}
+
+.nc-icon-qianV6xx:before {
+  content: "\e784";
+}
+
+.nc-icon-mimaV6xx:before {
+  content: "\e8a6";
+}
+
+.nc-icon-yanzhengmaV6xx:before {
+  content: "\e8a7";
+}
+
+.nc-icon-bianjiV6xx2:before {
+  content: "\e8a4";
+}
+
+.nc-icon-fenxiangV6mm-1:before {
+  content: "\e89c";
+}
+
+.nc-icon-a-Group1036V6xx:before {
+  content: "\e77b";
+}
+
+.nc-icon-shanchu-yuangaiV6xx:before {
+  content: "\e6eb";
+}
+
+.nc-icon-hezuogonghuoshangV6xx:before {
+  content: "\e88b";
+}
+
+.nc-icon-hezuodianpu:before {
+  content: "\e85b";
+}
+
+.nc-icon-gongyingshangxitong:before {
+  content: "\e852";
+}
+
+.nc-icon-shangchengxitong:before {
+  content: "\e858";
+}
+
+.nc-icon-fenzhangshezhi:before {
+  content: "\e843";
+}
+
+.nc-icon-xuanpinpingtai:before {
+  content: "\e845";
+}
+
+.nc-icon-a-Maskgroup:before {
+  content: "\e840";
+}
+
+.nc-icon-fenzhangguanli:before {
+  content: "\e84b";
+}
+
+.nc-icon-gongyingshangdingdan:before {
+  content: "\e84d";
+}
+
+.nc-icon-gongyingshangshangpin:before {
+  content: "\e84e";
+}
+
+.nc-icon-shuaxinV6mm2:before {
+  content: "\e889";
+}
+
+.nc-icon-yitiaohuo:before {
+  content: "\e888";
+}
+
+.nc-icon-shangchengdingdan:before {
+  content: "\e837";
+}
+
+.nc-icon-shangchengshangpin:before {
+  content: "\e83f";
+}
+
+.nc-icon-gouwudaiV6xx1:before {
+  content: "\e886";
+}
+
+.nc-icon-dianpuV6xx1:before {
+  content: "\e880";
+}
+
+.nc-icon-youhuiquanV6xx2:before {
+  content: "\e87a";
+}
+
+.nc-icon-yinhangka2:before {
+  content: "\e83e";
+}
+
+.nc-icon-huiyuantixian:before {
+  content: "\e839";
+}
+
+.nc-icon-a-Financing-tworongzi2:before {
+  content: "\e825";
+}
+
+.nc-icon-a-Weixin-marketweixindianshang:before {
+  content: "\e821";
+}
+
+.nc-icon-a-Repairbianji:before {
+  content: "\e818";
+}
+
+.nc-icon-a-Diskcipan:before {
+  content: "\e81c";
+}
+
+.nc-icon-a-Historylishijilu:before {
+  content: "\e81b";
+}
+
+.nc-icon-a-Deliveryjiaohuo:before {
+  content: "\e81a";
+}
+
+.nc-icon-dianpuV6xx:before {
+  content: "\e871";
+}
+
+.nc-icon-Frame:before {
+  content: "\e816";
+}
+
+.nc-icon-zhifujianshu1:before {
+  content: "\e815";
+}
+
+.nc-icon-jiagoushuliang:before {
+  content: "\e814";
+}
+
+.nc-icon-xiadanshu:before {
+  content: "\e813";
+}
+
+.nc-icon-shangpinliulanliang:before {
+  content: "\e812";
+}
+
+.nc-icon-fenxiaodengji:before {
+  content: "\e807";
+}
+
+.nc-icon-fenxiaoguanli:before {
+  content: "\e809";
+}
+
+.nc-icon-dianzimiandan:before {
+  content: "\e806";
+}
+
+.nc-icon-fenxiaodingdan:before {
+  content: "\e804";
+}
+
+.nc-icon-fenxiaoshang:before {
+  content: "\e808";
+}
+
+.nc-icon-hexiaoyuan:before {
+  content: "\e805";
+}
+
+.nc-icon-shangpintongji:before {
+  content: "\e80a";
+}
+
+.nc-icon-fenxiaogaikuang:before {
+  content: "\e802";
+}
+
+.nc-icon-fenxiaoshangpin:before {
+  content: "\e801";
+}
+
+.nc-icon-yingyongliebiao:before {
+  content: "\e80b";
+}
+
+.nc-icon-huodongliebiao:before {
+  content: "\e80c";
+}
+
+.nc-icon-hexiaojilu:before {
+  content: "\e80d";
+}
+
+.nc-icon-piliangfahuo:before {
+  content: "\e80e";
+}
+
+.nc-icon-fenxiaoshezhi:before {
+  content: "\e80f";
+}
+
+.nc-icon-dianpu:before {
+  content: "\e800";
+}
+
+.nc-icon-caozuorizhi1:before {
+  content: "\e7ef";
+}
+
+.nc-icon-dingdanliebiao:before {
+  content: "\e7f0";
+}
+
+.nc-icon-hexiaoguanli:before {
+  content: "\e7ee";
+}
+
+.nc-icon-fapiaoguanli:before {
+  content: "\e7ed";
+}
+
+.nc-icon-dingdanshezhi:before {
+  content: "\e7ea";
+}
+
+.nc-icon-huiyuanbiaoqian:before {
+  content: "\e7eb";
+}
+
+.nc-icon-huishouzhan:before {
+  content: "\e7db";
+}
+
+.nc-icon-jiesuanzhanghu:before {
+  content: "\e7f1";
+}
+
+.nc-icon-guanliyuan1:before {
+  content: "\e7e6";
+}
+
+.nc-icon-huiyuanliebiao:before {
+  content: "\e7da";
+}
+
+.nc-icon-shangpinfenlei:before {
+  content: "\e7dd";
+}
+
+.nc-icon-jiaoseguanli:before {
+  content: "\e7e3";
+}
+
+.nc-icon-shangpinliebiao:before {
+  content: "\e7e8";
+}
+
+.nc-icon-shangpinpingjia:before {
+  content: "\e7e9";
+}
+
+.nc-icon-dianpushezhi:before {
+  content: "\e7e7";
+}
+
+.nc-icon-sucaiguanli1:before {
+  content: "\e7f2";
+}
+
+.nc-icon-tixianjilu:before {
+  content: "\e7e4";
+}
+
+.nc-icon-xiaopiaodayin:before {
+  content: "\e7f3";
+}
+
+.nc-icon-shangjiadizhiku:before {
+  content: "\e7e1";
+}
+
+.nc-icon-shujudaochu:before {
+  content: "\e7de";
+}
+
+.nc-icon-shangpincanshu:before {
+  content: "\e7e0";
+}
+
+.nc-icon-tuikuanweiquan:before {
+  content: "\e7f4";
+}
+
+.nc-icon-weiyemian:before {
+  content: "\e7f5";
+}
+
+.nc-icon-shouyezhuangxiu:before {
+  content: "\e7d9";
+}
+
+.nc-icon-xianshizhekou:before {
+  content: "\e7d8";
+}
+
+.nc-icon-youhuiquan:before {
+  content: "\e7d7";
+}
+
+.nc-icon-zichangaikuang:before {
+  content: "\e7d6";
+}
+
+.nc-icon-yunfeimoban:before {
+  content: "\e7f6";
+}
+
+.nc-icon-daifukuandingdan:before {
+  content: "\e7fa";
+}
+
+.nc-icon-cangkushangpinshuliang:before {
+  content: "\e7f9";
+}
+
+.nc-icon-daishouhuodingdan:before {
+  content: "\e7f8";
+}
+
+.nc-icon-tuikuan:before {
+  content: "\e7f7";
+}
+
+.nc-icon-tuikuandingdan:before {
+  content: "\e7fb";
+}
+
+.nc-icon-chushoushangpinshuliang:before {
+  content: "\e7fc";
+}
+
+.nc-icon-daifahuodingdan:before {
+  content: "\e7fd";
+}
+
+.nc-icon-dingdanliang:before {
+  content: "\e7fe";
+}
+
+.nc-icon-xiaoshoue:before {
+  content: "\e7ff";
+}
+
+.nc-icon-paihangbangV6xx1:before {
+  content: "\e7e2";
+}
+
+.nc-icon-bangdanguanliV6xx:before {
+  content: "\e86d";
+}
+
+.nc-icon-bangdanshezhiV6xx:before {
+  content: "\e86e";
+}
+
+.nc-icon-zhuanzhangV6xx-1:before {
+  content: "\e86a";
+}
+
 .nc-icon-qingliV6xx:before {
   content: "\e865";
 }
diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts
index 42c66c060..5302c2076 100644
--- a/admin/src/utils/common.ts
+++ b/admin/src/utils/common.ts
@@ -127,13 +127,14 @@ export function isUrl(str: string): boolean {
  * @returns
  */
 export function img(path: string): string {
+    if (!path) return ''
+    
     let imgDomain = import.meta.env.VITE_IMG_DOMAIN || location.origin
 
-    if (typeof path == 'string' && path.startsWith('/')) path = path.replace(/^\//, '')
-    if (typeof imgDomain == 'string' && imgDomain.endsWith('/')) imgDomain = imgDomain.slice(0, -1)
-	if(path){
-		return isUrl(path) ? path : `${imgDomain}/${path}`
-	}
+    if (path.startsWith('/')) path = path.replace(/^\//, '')
+    if (imgDomain.endsWith('/')) imgDomain = imgDomain.slice(0, -1)
+    
+    return isUrl(path) ? path : `${imgDomain}/${path}`
 }
 
 /**
@@ -401,3 +402,37 @@ export function getTablePageStorage(where: any = {}) {
     }
     return data;
 }
+
+
+// 距离显示
+
+export function distance(distance: string | number): string {
+    const dist = typeof distance === 'string' ? parseFloat(distance) : distance;
+    if (isNaN(dist)) return distance.toString();
+    return dist < 1 ? parseInt((dist * 1000).toString()) + 'm' : dist.toFixed(1) + 'km'
+}
+
+// 获取图片尺寸的函数
+export function getImageDimensions (url: string) {
+
+    return new Promise((resolve) => {
+        const imgObj = new Image()
+        imgObj.onload = () => {
+            // 成功加载
+            const size = {
+                width: imgObj.naturalWidth,
+                height: imgObj.naturalHeight
+            }
+            resolve(size)
+        }
+
+        imgObj.onerror = (err) => {
+            // 加载失败
+            resolve(null)
+        }
+
+        // 设置图片源，开始加载
+        // 注意：如果图片跨域且服务器未设置CORS，可能会触发onerror
+        imgObj.src = img(url)
+    })
+}
\ No newline at end of file
diff --git a/admin/src/utils/qqmap.ts b/admin/src/utils/qqmap.ts
index 225719e40..e1c89ac16 100644
--- a/admin/src/utils/qqmap.ts
+++ b/admin/src/utils/qqmap.ts
@@ -134,6 +134,9 @@ export const createPolygon = (map: any, geometriesData: any) => {
  * @param key
  */
 export const deleteGeometry = (key: string) => {
+    if (!geometry[key]) {
+        return
+    }
     geometry[key].graphical.remove(key)
     geometry[key].editor.delete()
 }
@@ -143,6 +146,9 @@ export const deleteGeometry = (key: string) => {
  * @param key
  */
 export const selectGeometry = (key: string) => {
+    if (!geometry[key] || !geometry[key].editor) {
+        return
+    }
     geometry[key].editor.select([key])
 }
 
diff --git a/admin/src/utils/request.ts b/admin/src/utils/request.ts
index 751b62dee..910378d2a 100644
--- a/admin/src/utils/request.ts
+++ b/admin/src/utils/request.ts
@@ -82,8 +82,9 @@ class Request {
     }
 
     /**
-     * 发送get请求
+     * 发送post请求
      * @param url
+     * @param data
      * @param config
      * @returns
      */
@@ -92,8 +93,9 @@ class Request {
     }
 
     /**
-     * 发送get请求
+     * 发送put请求
      * @param url
+     * @param data
      * @param config
      * @returns
      */
@@ -102,7 +104,7 @@ class Request {
     }
 
     /**
-     * 发送get请求
+     * 发送delete请求
      * @param url
      * @param config
      * @returns
@@ -180,15 +182,27 @@ class Request {
     }
 
     private messageCache = new Map();
+    private readonly CACHE_EXPIRY = 5000; // 5秒内重复内容不再弹出，可自定义过期时间
+    private readonly MAX_CACHE_SIZE = 100;
 
     private showElMessage(options: MessageParams) {
         const cacheKey = options.message
+        const now = Date.now()
         const cachedMessage = this.messageCache.get(cacheKey);
 
-        if (!cachedMessage || Date.now() - cachedMessage.timestamp > 5000) { // 5秒内重复内容不再弹出，可自定义过期时间
-            this.messageCache.set(cacheKey, { timestamp: Date.now() });
+        if (!cachedMessage || now - cachedMessage.timestamp > this.CACHE_EXPIRY) {
+            this.messageCache.set(cacheKey, { timestamp: now });
             ElMessage(options)
         }
+        
+        // 定期清理过期缓存，防止内存泄漏
+        if (this.messageCache.size > this.MAX_CACHE_SIZE) {
+            for (const [key, value] of this.messageCache.entries()) {
+                if (now - value.timestamp > this.CACHE_EXPIRY) {
+                    this.messageCache.delete(key)
+                }
+            }
+        }
     }
 }
 
diff --git a/admin/src/utils/storage.ts b/admin/src/utils/storage.ts
index 999e02918..75cf755c2 100644
--- a/admin/src/utils/storage.ts
+++ b/admin/src/utils/storage.ts
@@ -34,10 +34,12 @@ class Storage {
      */
     public get(key: string) {
         try {
-            const json: any = window.localStorage.getItem(`${this.prefix}.${key}`)
-            return JSON.parse(json)
+            const value = window.localStorage.getItem(`${this.prefix}.${key}`)
+            if (value === null) return null
+            return JSON.parse(value)
         } catch (error) {
-            return window.localStorage.getItem(`${this.prefix}.${key}`)
+            const value = window.localStorage.getItem(`${this.prefix}.${key}`)
+            return value !== null ? value : null
         }
     }