From 65d9a386939b49fc1f398d10f39527e70d102b26 Mon Sep 17 00:00:00 2001
From: CQ <8051778+cq-hm@user.noreply.gitee.com>
Date: Fri, 3 Apr 2026 11:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/components.d.ts                         |    1 +
 admin/src/app/api/sys.ts                      |    4 +-
 admin/src/app/components/upgrade/index.vue    | 1372 +++----
 admin/src/app/views/diy/edit.vue              |   25 +-
 admin/src/app/views/index/store.vue           | 3314 ++++++++---------
 admin/src/app/views/setting/map.vue           |   55 +-
 admin/src/app/views/setting/notice.vue        |    4 +-
 admin/src/app/views/setting/system.vue        |  262 +-
 .../src/app/views/setting/transfer_scene.vue  |  277 +-
 admin/src/app/views/tools/attachment.vue      |   98 +-
 admin/src/components/map-selector/index.vue   |  512 +++
 .../lightside/components/aside/index.vue      |  626 ++--
 admin/src/utils/common.ts                     |  450 +--
 admin/src/utils/qqmap.ts                      |  269 +-
 admin/src/utils/tianditu.ts                   |  511 +++
 15 files changed, 4532 insertions(+), 3248 deletions(-)
 create mode 100644 admin/src/components/map-selector/index.vue
 create mode 100644 admin/src/utils/tianditu.ts

diff --git a/admin/components.d.ts b/admin/components.d.ts
index df043d213..1d480703d 100644
--- a/admin/components.d.ts
+++ b/admin/components.d.ts
@@ -85,6 +85,7 @@ declare module '@vue/runtime-core' {
     ExportSure: typeof import('./src/components/export-sure/index.vue')['default']
     HeatMap: typeof import('./src/components/heat-map/index.vue')['default']
     Icon: typeof import('./src/components/icon/index.vue')['default']
+    MapSelector: typeof import('./src/components/map-selector/index.vue')['default']
     Markdown: typeof import('./src/components/markdown/index.vue')['default']
     PopoverInput: typeof import('./src/components/popover-input/index.vue')['default']
     RangeInput: typeof import('./src/components/range-input/index.vue')['default']
diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts
index db877dfca..5c0f560c0 100644
--- a/admin/src/app/api/sys.ts
+++ b/admin/src/app/api/sys.ts
@@ -629,8 +629,8 @@ export function setMap(params: Record<string, any>) {
 /**
  * 获取地图配置
  */
-export function getMap() {
-    return request.get(`sys/config/map`)
+export function getMap(params: Record<string, any>) {
+    return request.get(`sys/config/map`, { params })
 }
 
 /**
diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue
index 4b2cc61a8..f4f9384f5 100644
--- a/admin/src/app/components/upgrade/index.vue
+++ b/admin/src/app/components/upgrade/index.vue
@@ -1,246 +1,246 @@
 <template>
-  <el-dialog v-model="showDialog" :title="t('upgrade.title')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="dialogClose">
+    <el-dialog v-model="showDialog" :title="t('upgrade.title')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="dialogClose">
 
-    <template v-if="upgradeContent">
-      <!-- 检测服务是否到期 -->
-      <template v-if="step == 1">
-        <template v-for="(item, index) in upgradeContent.content">
-          <div class="text-lg">
-            <template v-if="item.upgrade_version">
-              <span>【{{ item.app.app_name }}】本次升级将从</span>
-              <span class="font-bold px-[2px]">{{ item.version }}</span>
-              <span>升级到</span>
-              <span class="font-bold px-[2px]">{{ item.upgrade_version }}</span>
-              <span>版本</span>
-            </template>
-            <template v-else>
-              <template v-if="upgradeContent.content.length > 1">
-                <span>【{{ item.app.app_name }}】当前版本</span>
-                <span class="font-bold px-[2px]">{{ item.version }}</span>
-              </template>
-              <template v-else>
-                <span>当前版本</span>
-                <span class="font-bold px-[2px]">{{ item.version }}</span>
-              </template>
-            </template>
-          </div>
-          <div class="mt-[10px]" :class="{ 'mb-[10px]' : (index + 1) < upgradeContent.content.length }" v-if="item.upgrade_version != item.last_version">
-            <el-alert type="info" show-icon :closable="false">
-              <template #title>
-                <span>当前最新版本为{{ item.last_version }}，您的服务{{ item.expire_time ? `已于${item.expire_time}到期` : '长期有效' }}。</span>
-                <span>如需升级到最新版可在<a class="text-primary" href="https://www.niucloud.com" target="_blank">niucloud-admin官网</a>购买相关服务后再进行升级</span>
-              </template>
-            </el-alert>
-          </div>
-        </template>
-      </template>
-      <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 v-show="active == 'upgrade'">
-            <div class="flex flex-col" v-if="upgradeCheck && !upgradeTask">
-              <el-scrollbar>
-                <div class="bg-[#fff] my-3" v-if="upgradeCheck.dir">
-                  <div class="px-[20px] pt-[10px] text-[14px] el-table">
-                    <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
-                      <el-col :span="18">
-                        <span>{{ t("upgrade.path") }}</span>
-                      </el-col>
-                      <el-col :span="3">
-                        <span>{{ t("upgrade.demand") }}</span>
-                      </el-col>
-                      <el-col :span="3">
-                        <span>{{ t("status") }}</span>
-                      </el-col>
-                    </el-row>
-
-                    <div style="height: calc(300px); overflow: auto">
-                      <el-row class="pb-[10px] items pl-[15px]" v-for="item in upgradeCheck.dir.is_readable">
-                        <el-col :span="18">
-                          <span>{{ item.dir }}</span>
-                        </el-col>
-                        <el-col :span="3">
-                          <span>{{ t("upgrade.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 in upgradeCheck.dir.is_write">
-                        <el-col :span="18">
-                          <span>{{ item.dir }}</span>
-                        </el-col>
-                        <el-col :span="3">
-                          <span>{{ t("upgrade.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>
+        <template v-if="upgradeContent">
+            <!-- 检测服务是否到期 -->
+            <template v-if="step == 1">
+                <template v-for="(item, index) in upgradeContent.content">
+                    <div class="text-lg">
+                        <template v-if="item.upgrade_version">
+                            <span>【{{ item.app.app_name }}】本次升级将从</span>
+                            <span class="font-bold px-[2px]">{{ item.version }}</span>
+                            <span>升级到</span>
+                            <span class="font-bold px-[2px]">{{ item.upgrade_version }}</span>
+                            <span>版本</span>
+                        </template>
+                        <template v-else>
+                            <template v-if="upgradeContent.content.length > 1">
+                                <span>【{{ item.app.app_name }}】当前版本</span>
+                                <span class="font-bold px-[2px]">{{ item.version }}</span>
+                            </template>
+                            <template v-else>
+                                <span>当前版本</span>
+                                <span class="font-bold px-[2px]">{{ item.version }}</span>
+                            </template>
+                        </template>
                     </div>
-                  </div>
-                </div>
-              </el-scrollbar>
-            </div>
-            <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'">
-            <el-scrollbar>
-              <div class="bg-[#fff] my-3">
-                <div class="p-[20px] mt-[50px] mx-[10px] border-[1px] border-[#E6E6E6] rounded-[10px]">
-                  <div class="flex justify-between items-center mt-[-9px]">
-                    <el-checkbox v-model="upgradeOption.is_need_cloudbuild" :label="t('upgrade.isNeedCloudbuild')" :true-value="true" :false-value="false" size="large" ></el-checkbox>
-                  </div>
-                  <div class="text-[14px] text-[#374151] mb-[10px]">{{ t('upgrade.cloudbuildTips') }}</div>
-                </div>
-                <div class="p-[20px] mt-[20px] mx-[10px] border-[1px] border-[#E6E6E6] rounded-[10px]" v-if="upgradeContent.last_backup">
-                  <div class="flex justify-between items-center mt-[-9px]">
-                    <el-checkbox v-model="upgradeOption.is_need_backup" :label="t('upgrade.isNeedBackup')" :true-value="true" :false-value="false" size="large" ></el-checkbox>
-                    <el-button link type="primary" class="!text-[#9699B6]" @click="toBackupRecord">{{ t('upgrade.isNeedBackupBtn') }}</el-button>
-                  </div>
+                    <div class="mt-[10px]" :class="{ 'mb-[10px]' : (index + 1) < upgradeContent.content.length }" v-if="item.upgrade_version != item.last_version">
+                        <el-alert type="info" show-icon :closable="false">
+                            <template #title>
+                                <span>当前最新版本为{{ item.last_version }}，您的服务{{ item.expire_time ? `已于${item.expire_time}到期` : '长期有效' }}。</span>
+                                <span>如需升级到最新版可在<a class="text-primary" href="https://www.niucloud.com" target="_blank">niucloud-admin官网</a>购买相关服务后再进行升级</span>
+                            </template>
+                        </el-alert>
+                    </div>
+                </template>
+            </template>
+            <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 v-show="active == 'upgrade'">
+                        <div class="flex flex-col" v-if="upgradeCheck && !upgradeTask">
+                            <el-scrollbar>
+                                <div class="bg-[#fff] my-3" v-if="upgradeCheck.dir">
+                                    <div class="px-[20px] pt-[10px] text-[14px] el-table">
+                                        <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+                                            <el-col :span="18">
+                                                <span>{{ t("upgrade.path") }}</span>
+                                            </el-col>
+                                            <el-col :span="3">
+                                                <span>{{ t("upgrade.demand") }}</span>
+                                            </el-col>
+                                            <el-col :span="3">
+                                                <span>{{ t("status") }}</span>
+                                            </el-col>
+                                        </el-row>
 
-                  <div class="text-[14px] text-[#374151] mb-[10px]">{{ t('upgrade.isNeedBackupTips') }}</div>
-                  <div class="text-[14px] text-[#9699B6]">{{ t('上次备份时间：') }}{{ upgradeContent.last_backup.complete_time }}</div>
-                </div>
-              </div>
-            </el-scrollbar>
-          </div>
+                                        <div style="height: calc(300px); overflow: auto">
+                                            <el-row class="pb-[10px] items pl-[15px]" v-for="item in upgradeCheck.dir.is_readable">
+                                                <el-col :span="18">
+                                                    <span>{{ item.dir }}</span>
+                                                </el-col>
+                                                <el-col :span="3">
+                                                    <span>{{ t("upgrade.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 in upgradeCheck.dir.is_write">
+                                                <el-col :span="18">
+                                                    <span>{{ item.dir }}</span>
+                                                </el-col>
+                                                <el-col :span="3">
+                                                    <span>{{ t("upgrade.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>
+                        </div>
+                        <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'">
+                        <el-scrollbar>
+                            <div class="bg-[#fff] my-3">
+                                <div class="p-[20px] mt-[50px] mx-[10px] border-[1px] border-[#E6E6E6] rounded-[10px]">
+                                    <div class="flex justify-between items-center mt-[-9px]">
+                                        <el-checkbox v-model="upgradeOption.is_need_cloudbuild" :label="t('upgrade.isNeedCloudbuild')" :true-value="true" :false-value="false" size="large" ></el-checkbox>
+                                    </div>
+                                    <div class="text-[14px] text-[#374151] mb-[10px]">{{ t('upgrade.cloudbuildTips') }}</div>
+                                </div>
+                                <div class="p-[20px] mt-[20px] mx-[10px] border-[1px] border-[#E6E6E6] rounded-[10px]" v-if="upgradeContent.last_backup">
+                                    <div class="flex justify-between items-center mt-[-9px]">
+                                        <el-checkbox v-model="upgradeOption.is_need_backup" :label="t('upgrade.isNeedBackup')" :true-value="true" :false-value="false" size="large" ></el-checkbox>
+                                        <el-button link type="primary" class="!text-[#9699B6]" @click="toBackupRecord">{{ t('upgrade.isNeedBackupBtn') }}</el-button>
+                                    </div>
+
+                                    <div class="text-[14px] text-[#374151] mb-[10px]">{{ t('upgrade.isNeedBackupTips') }}</div>
+                                    <div class="text-[14px] text-[#9699B6]">{{ t('上次备份时间：') }}{{ upgradeContent.last_backup.complete_time }}</div>
+                                </div>
+                            </div>
+                        </el-scrollbar>
+                    </div>
 
-        </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>
-                <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 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>
+                                <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]">
-                  <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 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>
-              <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>
-    <template #footer>
-      <div class="dialog-footer">
-        <!-- 查看升级内容 -->
-        <el-button v-if="step == 1 && upgradeContent.content.length && isAllowUpgrade" @click="step = 2" type="primary">{{ t("upgrade.upgradeButton") }}</el-button>
-        <el-button type="primary" v-show="step == 2 && showTerminal && upgradeTask && !errorDialog"  :loading="timeloading" class="!w-[140px]">已用时 {{ formatUpgradeDuration }}</el-button>
-        <template v-if="step == 2 && active != 'complete'">
-          <!--                <el-button v-if="active == 'content'" @click="showDialog = false">{{ t("return") }}</el-button>-->
-          <el-button type="primary" :disabled="!is_pass" v-if="active == 'upgrade' && !upgradeTask" @click="() => { active = 'backup'; numberOfSteps = 1 }">{{ t("nextStep") }}</el-button>
-          <el-button v-if="active == 'backup'" @click="() => { active = 'upgrade'; numberOfSteps = 1 } ">{{ t("prev") }}</el-button>
-          <el-button type="primary" v-if="active == 'backup'" :loading="loading" @click="() => { upgradeAddonFn() }">{{ t("nextStep") }}</el-button>
-          <el-button v-if="active == 'complete'" @click="showDialog = false">{{ t("complete") }}</el-button>
+            </div>
         </template>
-      </div>
-    </template>
-  </el-dialog>
+        <template #footer>
+            <div class="dialog-footer">
+                <!-- 查看升级内容 -->
+                <el-button v-if="step == 1 && upgradeContent.content.length && isAllowUpgrade" @click="step = 2" type="primary">{{ t("upgrade.upgradeButton") }}</el-button>
+                <el-button type="primary" v-show="step == 2 && showTerminal && upgradeTask && !errorDialog"  :loading="timeloading" class="!w-[140px]">已用时 {{ formatUpgradeDuration }}</el-button>
+                <template v-if="step == 2 && active != 'complete'">
+                <!--                <el-button v-if="active == 'content'" @click="showDialog = false">{{ t("return") }}</el-button>-->
+                    <el-button type="primary" :disabled="!is_pass" v-if="active == 'upgrade' && !upgradeTask" @click="() => { active = 'backup'; numberOfSteps = 1 }">{{ t("nextStep") }}</el-button>
+                    <el-button v-if="active == 'backup'" @click="() => { active = 'upgrade'; numberOfSteps = 1 } ">{{ t("prev") }}</el-button>
+                    <el-button type="primary" v-if="active == 'backup'" :loading="loading" @click="() => { upgradeAddonFn() }">{{ t("nextStep") }}</el-button>
+                    <el-button v-if="active == 'complete'" @click="showDialog = false">{{ t("complete") }}</el-button>
+                </template>
+            </div>
+        </template>
+    </el-dialog>
 
-  <el-dialog v-model="upgradeTipsShowDialog" :title="t('warning')" width="500px" draggable>
-    <span v-html="t('upgrade.upgradeTips')"></span>
-    <template #footer>
-      <div class="flex justify-end">
-        <el-button @click="upgradeTipsConfirm(true)" type="primary">{{ t("upgrade.knownToKnow") }}</el-button>
-        <el-button @click="handleUpgrade()" type="primary" plain :loading="readyLoading">{{ t("upgrade.upgradeButton") }}</el-button>
-        <el-button @click="upgradeTipsShowDialog = false">{{ t("cancel") }}</el-button>
-      </div>
-    </template>
-  </el-dialog>
+    <el-dialog v-model="upgradeTipsShowDialog" :title="t('warning')" width="500px" draggable>
+        <span v-html="t('upgrade.upgradeTips')"></span>
+        <template #footer>
+            <div class="flex justify-end">
+                <el-button @click="upgradeTipsConfirm(true)" type="primary">{{ t("upgrade.knownToKnow") }}</el-button>
+                <el-button @click="handleUpgrade()" type="primary" plain :loading="readyLoading">{{ t("upgrade.upgradeButton") }}</el-button>
+                <el-button @click="upgradeTipsShowDialog = false">{{ t("cancel") }}</el-button>
+            </div>
+        </template>
+    </el-dialog>
 
-  <el-dialog v-model="cloudBuildErrorTipsShowDialog" :title="t('warning')" width="500px" draggable :show-close="false">
-    <span v-html="t('upgrade.cloudBuildErrorTips')"></span>
-    <template #footer>
-      <div class="flex justify-end">
-        <el-button @click="cloudBuildError('local')" type="primary">{{ t("upgrade.localBuild") }}</el-button>
-        <el-button @click="cloudBuildError('retry')" type="primary">{{ t("upgrade.cloudBuild") }}（{{ retrySecond }}S）</el-button>
-        <el-button @click="cloudBuildError('rollback')" type="primary">{{ t("upgrade.rollback") }}</el-button>
-      </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>
+    <el-dialog v-model="cloudBuildErrorTipsShowDialog" :title="t('warning')" width="500px" draggable :show-close="false">
+        <span v-html="t('upgrade.cloudBuildErrorTips')"></span>
+        <template #footer>
+            <div class="flex justify-end">
+                <el-button @click="cloudBuildError('local')" type="primary">{{ t("upgrade.localBuild") }}</el-button>
+                <el-button @click="cloudBuildError('retry')" type="primary">{{ t("upgrade.cloudBuild") }}（{{ retrySecond }}S）</el-button>
+                <el-button @click="cloudBuildError('rollback')" type="primary">{{ t("upgrade.rollback") }}</el-button>
+            </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>
@@ -249,12 +249,12 @@ import { t } from '@/lang'
 import { getVersions } from '@/app/api/auth'
 import { getFrameworkNewVersion } from '@/app/api/module'
 import {
-  getUpgradeContent,
-  getUpgradeTask,
-  upgradeAddon,
-  executeUpgrade,
-  preUpgradeCheck,
-  clearUpgradeTask, upgradeUserOperate
+    getUpgradeContent,
+    getUpgradeTask,
+    upgradeAddon,
+    executeUpgrade,
+    preUpgradeCheck,
+    clearUpgradeTask, upgradeUserOperate
 } from '@/app/api/upgrade'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
 import 'vue-web-terminal/lib/theme/dark.css'
@@ -282,20 +282,20 @@ const cloudBuildErrorTipsShowDialog = ref<boolean>(false)
 const retrySecond = ref(30)
 let retrySecondInterval: any = null
 const upgradeOption = ref({
-  is_need_backup: true,
-  is_need_cloudbuild: true
+    is_need_backup: true,
+    is_need_cloudbuild: true
 })
 
 // 升级步骤排除，backupCode 备份代码，backupSql 备份数据库
 const excludeSteps: any = ref([
-  {
-    name: '备份源码',
-    code: 'backupCode'
-  },
-  {
-    name: '备份数据库',
-    code: 'backupSql'
-  }
+    {
+        name: '备份源码',
+        code: 'backupCode'
+    },
+    {
+        name: '备份数据库',
+        code: 'backupSql'
+    }
 ])
 /**
  * 查询升级任务
@@ -308,149 +308,149 @@ let upgradeTimer: ReturnType<typeof setInterval> | null = null
 const errorDialog = ref(false)
 const errorMsg = ref('')
 const getUpgradeTaskFn = () => {
-  getUpgradeTask().then(({ data }) => {
-    if (!data) return
+    getUpgradeTask().then(({ data }) => {
+        if (!data) return
 
-    if (!upgradeContent.value) {
-      upgradeContent.value = data.upgrade_content
+        if (!upgradeContent.value) {
+            upgradeContent.value = data.upgrade_content
 
-      if (!data.upgrade_content || !Array.isArray(data.upgrade_content.content)) {
-        return
-      }
+            if (!data.upgrade_content || !Array.isArray(data.upgrade_content.content)) {
+                return
+            }
 
-      let upgradeCount = 0
-      let failUpgradeCount = 0
-      for (let i = 0; i < upgradeContent.value.content.length; i++) {
-        if (upgradeContent.value.content[i].version_list.length) {
-          upgradeCount++
-        } else {
-          failUpgradeCount++
+            let upgradeCount = 0
+            let failUpgradeCount = 0
+            for (let i = 0; i < upgradeContent.value.content.length; i++) {
+                if (upgradeContent.value.content[i].version_list.length) {
+                    upgradeCount++
+                } else {
+                    failUpgradeCount++
+                }
+            }
+            if (upgradeContent.value.content.length == upgradeCount) {
+                isAllowUpgrade.value = true
+            } else if (upgradeContent.value.content.length == failUpgradeCount) {
+                isAllowUpgrade.value = false
+            }
         }
-      }
-      if (upgradeContent.value.content.length == upgradeCount) {
-        isAllowUpgrade.value = true
-      } else if (upgradeContent.value.content.length == failUpgradeCount) {
-        isAllowUpgrade.value = false
-      }
-    }
 
-    // 检测有没有正在进行中的升级任务
-    if (!showDialog.value) {
-      showElNotification()
-      return
-    }
-    if (!upgradeTask.value) {
-      showTerminal.value = true
-      terminalRef.value.execute('clear')
-      terminalRef.value.execute('开始升级')
-      timeloading.value = true
-      upgradeStartTime.value = Date.now()
-      upgradeDuration.value = 0
-      if (upgradeTimer) clearInterval(upgradeTimer)
-      upgradeTimer = setInterval(() => {
-        upgradeDuration.value++
-      }, 1000)
-    }
+        // 检测有没有正在进行中的升级任务
+        if (!showDialog.value) {
+            showElNotification()
+            return
+        }
+        if (!upgradeTask.value) {
+            showTerminal.value = true
+            terminalRef.value.execute('clear')
+            terminalRef.value.execute('开始升级')
+            timeloading.value = true
+            upgradeStartTime.value = Date.now()
+            upgradeDuration.value = 0
+            if (upgradeTimer) clearInterval(upgradeTimer)
+            upgradeTimer = setInterval(() => {
+                upgradeDuration.value++
+            }, 1000)
+        }
 
-    upgradeTask.value = data
+        upgradeTask.value = data
 
-    data.log.forEach((item) => {
-      if (!upgradeLog.includes(item)) {
-        terminalRef.value.pushMessage({ content: `${item}` })
-        upgradeLog.push(item)
-      }
+        data.log.forEach((item) => {
+            if (!upgradeLog.includes(item)) {
+                terminalRef.value.pushMessage({ content: `${item}` })
+                upgradeLog.push(item)
+            }
+        })
+        // 安装失败
+        if (data.error) {
+            data.error.forEach((item) => {
+                if (!errorLog.includes(item)) {
+                    terminalRef.value.pushMessage({ content: item, class: 'error' })
+                    errorLog.push(item)
+                    errorMsg.value = item
+                }
+            })
+            if (upgradeTimer) {
+                clearInterval(upgradeTimer)
+                upgradeTimer = null
+            }
+            timeloading.value = false
+        }
+        // 恢复完毕
+        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'
+            numberOfSteps.value = 4
+            notificationEl && notificationEl.close()
+            emits('complete')
+            if (upgradeTimer) {
+                clearInterval(upgradeTimer)
+                upgradeTimer = null
+            }
+            timeloading.value = false
+            return
+        }
+        numberOfSteps.value = 2
+        active.value = 'upgrade'
+        executeUpgradeFn()
+    }).catch((err) => {
+        console.log(err)
     })
-    // 安装失败
-    if (data.error) {
-      data.error.forEach((item) => {
-        if (!errorLog.includes(item)) {
-          terminalRef.value.pushMessage({ content: item, class: 'error' })
-          errorLog.push(item)
-          errorMsg.value = item
-        }
-      })
-      if (upgradeTimer) {
-        clearInterval(upgradeTimer)
-        upgradeTimer = null
-      }
-      timeloading.value = false
-    }
-    // 恢复完毕
-    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'
-      numberOfSteps.value = 4
-      notificationEl && notificationEl.close()
-      emits('complete')
-      if (upgradeTimer) {
-        clearInterval(upgradeTimer)
-        upgradeTimer = null
-      }
-      timeloading.value = false
-      return
-    }
-    numberOfSteps.value = 2
-    active.value = 'upgrade'
-    executeUpgradeFn()
-  }).catch((err) => {
-    console.log(err)
-  })
 }
 getUpgradeTaskFn()
 
 const upgradePromptConfirm = ()=>{
-  dialogUpgradePrompt.value = false
-  open('niucloud-admin')
+    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
+    active.value = 'upgrade'
+    isBack.value = true
+    showTerminal.value = true
+    errorDialog.value = false // 隐藏错误弹窗
+    step.value = 2
 }
 
 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 executeUpgradeFn = () => {
-  executeUpgrade().then(() => {
-    getUpgradeTaskFn()
-  }).catch((err) => {
-    if (err.message.indexOf('队列') != -1) {
-      retrySecond.value = 30
-      retrySecondInterval = setInterval(() => {
-        retrySecond.value--
-        if (retrySecond.value == 0) {
-          cloudBuildError('retry')
+    executeUpgrade().then(() => {
+        getUpgradeTaskFn()
+    }).catch((err) => {
+        if (err.message.indexOf('队列') != -1) {
+            retrySecond.value = 30
+            retrySecondInterval = setInterval(() => {
+                retrySecond.value--
+                if (retrySecond.value == 0) {
+                    cloudBuildError('retry')
+                }
+            }, 1000)
+            cloudBuildErrorTipsShowDialog.value = true
+        } else {
+            ElMessage({ message: err.message, type: 'error' })
         }
-      }, 1000)
-      cloudBuildErrorTipsShowDialog.value = true
-    } else {
-      ElMessage({ message: err.message, type: 'error' })
-    }
-  })
+    })
 }
 
 let notificationEl: any = null
@@ -458,34 +458,34 @@ let notificationEl: any = null
  * 升级中任务提示
  */
 const showElNotification = () => {
-  notificationEl = ElNotification.success({
-    title: t('warning'),
-    dangerouslyUseHTMLString: true,
-    message: h('div', {}, [t('upgrade.upgradingTips'), h('span', {
-      class: 'text-primary cursor-pointer',
-      onClick: elNotificationClick
-    }, [t('upgrade.clickView')])]),
-    duration: 0,
-    showClose: false
-  })
+    notificationEl = ElNotification.success({
+        title: t('warning'),
+        dangerouslyUseHTMLString: true,
+        message: h('div', {}, [t('upgrade.upgradingTips'), h('span', {
+            class: 'text-primary cursor-pointer',
+            onClick: elNotificationClick
+        }, [t('upgrade.clickView')])]),
+        duration: 0,
+        showClose: false
+    })
 }
 
 const elNotificationClick = () => {
-  showDialog.value = true
-  getUpgradeTaskFn()
-  step.value = 2
-  numberOfSteps.value = 3
-  active.value = 'upgrade'
-  notificationEl && notificationEl.close()
+    showDialog.value = true
+    getUpgradeTaskFn()
+    step.value = 2
+    numberOfSteps.value = 3
+    active.value = 'upgrade'
+    notificationEl && notificationEl.close()
 }
 
 const frameworkVersion = ref('')
 getVersions().then((res) => {
-  frameworkVersion.value = res.data.version.version
+    frameworkVersion.value = res.data.version.version
 })
 const newFrameworkVersion = ref('')
 getFrameworkNewVersion().then(({ data }) => {
-  newFrameworkVersion.value = data.last_version
+    newFrameworkVersion.value = data.last_version
 })
 
 /**
@@ -496,92 +496,92 @@ const repeat = ref(false)
 const readyLoading = ref(false)
 
 const handleUpgrade = async () => {
-  if (repeat.value) return
-  repeat.value = true
-  readyLoading.value = true
+    if (repeat.value) return
+    repeat.value = true
+    readyLoading.value = true
 
-  const appKey = upgradeContent.value?.upgrade_apps.join(',') != 'niucloud-admin' ? upgradeContent.value?.upgrade_apps.join(',') : ''
+    const appKey = upgradeContent.value?.upgrade_apps.join(',') != 'niucloud-admin' ? upgradeContent.value?.upgrade_apps.join(',') : ''
 
-  await preUpgradeCheck(appKey).then(async ({ data }) => {
-    upgradeCheck.value = data
-    is_pass.value = data.is_pass
-    active.value = 'upgrade'
-    !upgradeTask.value ? (numberOfSteps.value = 0) : numberOfSteps.value
-    upgradeTipsShowDialog.value = false
-    showDialog.value = true
-    repeat.value = false
-    readyLoading.value = false
-  }).catch(() => {
-    repeat.value = false
-    readyLoading.value = false
-  })
+    await preUpgradeCheck(appKey).then(async ({ data }) => {
+        upgradeCheck.value = data
+        is_pass.value = data.is_pass
+        active.value = 'upgrade'
+        !upgradeTask.value ? (numberOfSteps.value = 0) : numberOfSteps.value
+        upgradeTipsShowDialog.value = false
+        showDialog.value = true
+        repeat.value = false
+        readyLoading.value = false
+    }).catch(() => {
+        repeat.value = false
+        readyLoading.value = false
+    })
 }
 
 const upgradeAddonFn = () => {
-  if (!is_pass.value) return
-  if (loading.value) return
-  loading.value = true
+    if (!is_pass.value) return
+    if (loading.value) return
+    loading.value = true
 
-  const appKey = upgradeContent.value?.upgrade_apps.join(',') != 'niucloud-admin' ? upgradeContent.value?.upgrade_apps.join(',') : ''
+    const appKey = upgradeContent.value?.upgrade_apps.join(',') != 'niucloud-admin' ? upgradeContent.value?.upgrade_apps.join(',') : ''
 
-  upgradeAddon(appKey, upgradeOption.value).then(() => {
-    getUpgradeTaskFn()
-  }).catch(() => {
-    loading.value = false
-  })
+    upgradeAddon(appKey, upgradeOption.value).then(() => {
+        getUpgradeTaskFn()
+    }).catch(() => {
+        loading.value = false
+    })
 }
 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' })
-    showDialog.value = true
-    step.value = 2
-    numberOfSteps.value = 3
-    active.value = 'upgrade'
-    if (callback) callback()
-  } else {
-    if (addonKey && addonKey.indexOf('niucloud-admin') == -1 && frameworkVersion.value != newFrameworkVersion.value) {
-      applicationVersion.value = otherData.install_info.version
-      newApplicationVersion.value = otherData.version
-      applicationType.value = otherData.type
-      dialogUpgradePrompt.value = true
-      if (callback) callback()
-      return
-    }
-    if (loading.value) return
-    loading.value = true
-    getUpgradeContent(addonKey).then(({ data }) => {
-      loading.value = false
-      upgradeContent.value = data
-      let upgradeCount = 0
-      let failUpgradeCount = 0
-      for (let i = 0; i < upgradeContent.value.content.length; i++) {
-        if (upgradeContent.value.content[i].version_list.length) {
-          upgradeCount++
-        } else {
-          failUpgradeCount++
+    errorDialog.value = false // 隐藏错误弹窗
+    if (upgradeTask.value) {
+        ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
+        showDialog.value = true
+        step.value = 2
+        numberOfSteps.value = 3
+        active.value = 'upgrade'
+        if (callback) callback()
+    } else {
+        if (addonKey && addonKey.indexOf('niucloud-admin') == -1 && frameworkVersion.value != newFrameworkVersion.value) {
+            applicationVersion.value = otherData.install_info.version
+            newApplicationVersion.value = otherData.version
+            applicationType.value = otherData.type
+            dialogUpgradePrompt.value = true
+            if (callback) callback()
+            return
         }
-      }
-      if (upgradeContent.value.content.length == upgradeCount) {
-        isAllowUpgrade.value = true
-      } else if (upgradeContent.value.content.length == failUpgradeCount) {
-        isAllowUpgrade.value = false
-      }
-      if (Storage.get('upgradeTipsLock')) {
-        handleUpgrade()
-      } else {
-        upgradeTipsShowDialog.value = true
-      }
-      if (callback) callback()
-    }).catch(() => {
-      loading.value = false
-      if (callback) callback()
-    })
-  }
+        if (loading.value) return
+        loading.value = true
+        getUpgradeContent(addonKey).then(({ data }) => {
+            loading.value = false
+            upgradeContent.value = data
+            let upgradeCount = 0
+            let failUpgradeCount = 0
+            for (let i = 0; i < upgradeContent.value.content.length; i++) {
+                if (upgradeContent.value.content[i].version_list.length) {
+                    upgradeCount++
+                } else {
+                    failUpgradeCount++
+                }
+            }
+            if (upgradeContent.value.content.length == upgradeCount) {
+                isAllowUpgrade.value = true
+            } else if (upgradeContent.value.content.length == failUpgradeCount) {
+                isAllowUpgrade.value = false
+            }
+            if (Storage.get('upgradeTipsLock')) {
+                handleUpgrade()
+            } else {
+                upgradeTipsShowDialog.value = true
+            }
+            if (callback) callback()
+        }).catch(() => {
+            loading.value = false
+            if (callback) callback()
+        })
+    }
 }
 
 /**
@@ -590,70 +590,70 @@ const open = (addonKey: string = '', callback = null, otherData: any = {}) => {
 let flashInterval: any = 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)
+    }
 }
 
 const makeIterator = (array: string[]) => {
-  let nextIndex = 0
-  return {
-    next () {
-      if (nextIndex + 1 == array.length) {
-        nextIndex = 0
-      }
-      return { value: array[nextIndex++] }
+    let nextIndex = 0
+    return {
+        next () {
+            if (nextIndex + 1 == array.length) {
+                nextIndex = 0
+            }
+            return { value: array[nextIndex++] }
+        }
     }
-  }
 }
 
 const dialogClose = (done: () => {}) => {
-  if (active.value == 'upgrade' && upgradeTask.value && ['upgradeComplete', 'restoreComplete'].includes(upgradeTask.value.step) === false && !isBack.value) {
-    ElMessageBox.confirm(t('upgrade.showDialogCloseTips'), t('warning'), {
-      confirmButtonText: t('confirm'),
-      cancelButtonText: t('cancel'),
-      type: 'warning'
-    }).then(() => {
-      done()
-    })
-  } else {
-    done()
-  }
+    if (active.value == 'upgrade' && upgradeTask.value && ['upgradeComplete', 'restoreComplete'].includes(upgradeTask.value.step) === false && !isBack.value) {
+        ElMessageBox.confirm(t('upgrade.showDialogCloseTips'), t('warning'), {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+            done()
+        })
+    } else {
+        done()
+    }
 }
 
 watch(
     () => showDialog.value,
     () => {
-      if (!showDialog.value) {
-        clearUpgradeTaskFn()
-      }
+        if (!showDialog.value) {
+            clearUpgradeTaskFn()
+        }
     }
 )
 
 const clearUpgradeTaskFn = () => {
-  active.value = 'upgrade'
-  loading.value = false
-  upgradeTask.value = null
-  isBack.value = false
-  errorDialog.value = false
-  errorMsg.value = ''
-  showTerminal.value = false
-  upgradeLog = []
-  errorLog = []
-  numberOfSteps.value = 0
-  flashInterval && clearInterval(flashInterval)
-  retrySecondInterval && clearInterval(retrySecondInterval)
-  upgradeOption.value = {
-    is_need_backup: true,
-    is_need_cloudbuild: true
-  }
-  step.value = 1
-  clearUpgradeTask().then(() => {
-  })
+    active.value = 'upgrade'
+    loading.value = false
+    upgradeTask.value = null
+    isBack.value = false
+    errorDialog.value = false
+    errorMsg.value = ''
+    showTerminal.value = false
+    upgradeLog = []
+    errorLog = []
+    numberOfSteps.value = 0
+    flashInterval && clearInterval(flashInterval)
+    retrySecondInterval && clearInterval(retrySecondInterval)
+    upgradeOption.value = {
+        is_need_backup: true,
+        is_need_cloudbuild: true
+    }
+    step.value = 1
+    clearUpgradeTask().then(() => {
+    })
 }
 
 /**
@@ -661,289 +661,289 @@ const clearUpgradeTaskFn = () => {
  * @param event
  */
 const cloudBuildError = (event: string) => {
-  cloudBuildErrorTipsShowDialog.value = false
-  switch (event) {
-    case 'local':
-      upgradeUserOperate(event).then(() => {
-        getUpgradeTaskFn()
-      })
-      break
-    case 'retry':
-      executeUpgradeFn()
-      retrySecondInterval && clearInterval(retrySecondInterval)
-      break
-    case 'rollback':
-      upgradeUserOperate(event).then(() => {
-        getUpgradeTaskFn()
-      })
-      break
-    case 'cloud_build_error_rollback':
-      upgradeUserOperate(event).then(() => {
-        handleBack()
-        executeUpgradeFn()
-      })
-      break
-  }
+    cloudBuildErrorTipsShowDialog.value = false
+    switch (event) {
+        case 'local':
+            upgradeUserOperate(event).then(() => {
+                getUpgradeTaskFn()
+            })
+            break
+        case 'retry':
+            executeUpgradeFn()
+            retrySecondInterval && clearInterval(retrySecondInterval)
+            break
+        case 'rollback':
+            upgradeUserOperate(event).then(() => {
+                getUpgradeTaskFn()
+            })
+            break
+        case 'cloud_build_error_rollback':
+            upgradeUserOperate(event).then(() => {
+                handleBack()
+                executeUpgradeFn()
+            })
+            break
+    }
 }
 
 const timeSplit = (str: string) => {
-  const [date, time] = str.split(' ')
-  const [hours, minutes] = time.split(':')
-  return [date, `${hours}:${minutes}`]
+    const [date, time] = str.split(' ')
+    const [hours, minutes] = time.split(':')
+    return [date, `${hours}:${minutes}`]
 }
 
 const upgradeTipsConfirm = (isLock: boolean = false) => {
-  isLock && Storage.set({ key: 'upgradeTipsLock', data: isLock })
-  upgradeTipsShowDialog.value = false
-  !isLock && (showDialog.value = true)
+    isLock && Storage.set({ key: 'upgradeTipsLock', data: isLock })
+    upgradeTipsShowDialog.value = false
+    !isLock && (showDialog.value = true)
 }
 const activeName = ref(0)
 const numberOfSteps = ref(0)
 
 const toBackupRecord = () => {
-  const routeUrl = router.resolve({
-    path: '/tools/backup_records'
-  })
-  window.open(routeUrl.href, '_blank')
+    const routeUrl = router.resolve({
+        path: '/tools/backup_records'
+    })
+    window.open(routeUrl.href, '_blank')
 }
 
 defineExpose({
-  open,
-  loading
+    open,
+    loading
 })
 </script>
 
 <style lang="scss" scoped>
 :deep(.el-button){
-  border-radius: 4px !important;
+    border-radius: 4px !important;
 }
 .table-head-bg {
-  background-color: var(--el-table-header-bg-color);
+    background-color: var(--el-table-header-bg-color);
 }
 :deep(.el-checkbox__label){
-  color: var(--el-color-primary);
+    color: var(--el-color-primary);
 }
 
 :deep(.terminal .t-log-box span) {
-  white-space: pre-wrap;
+    white-space: pre-wrap;
 }
 
 :deep(.number-of-steps) {
-  .el-step__line {
-    margin: 0 25px;
-    background: #dddddd;
-  }
-
-  .el-step__head {
-    margin-top: 10px;
-  }
-
-  .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);
-
-      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__icon {
-      background: var(--el-color-primary)!important;
-      color: #fff !important;
-      // box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
-
-      i {
-        color: #fff;
-      }
+        margin: 0 25px;
+        background: #dddddd;
     }
 
-    .el-step__line {
-      margin: 0 25px;
-      background: var(--el-color-primary);
+    .el-step__head {
+        margin-top: 10px;
     }
-  }
 
-  .is-process {
-    color: var(--el-color-primary);
-    font-weight: inherit;
+    .is-success {
+        color: var(--el-color-primary);
+        border-color: 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);
+        .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;
+            }
+        }
+
+        .el-step__line {
+            margin: 0 25px;
+            background: var(--el-color-primary);
+        }
     }
-  }
+    .is-finish {
+        color: var(--el-color-primary);
+        border-color: var(--el-color-primary);
 
-  .is-wait {
-    color: #333;
-  }
+        .el-step__icon {
+            background: var(--el-color-primary)!important;
+            color: #fff !important;
+            // box-shadow: 0 0 0 4px var(--el-color-primary-light-9);
+
+            i {
+                color: #fff;
+            }
+        }
+
+        .el-step__line {
+            margin: 0 25px;
+            background: var(--el-color-primary);
+        }
+    }
+
+    .is-process {
+        color: var(--el-color-primary);
+        font-weight: inherit;
+
+        // 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;
+    }
 }
 :deep(.el-dialog__title){
-  font-size: 20px;
-  font-weight: bold;
+    font-size: 20px;
+    font-weight: bold;
 }
 :deep(.el-result__title p){
-  font-size: 25px;
-  color: #1D1F3A;
-  font-weight: 500;
+    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;
+    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;
 }
 </style>
 
 <style scoped>
 .el-timeline-item {
-  min-height: 100px;
+    min-height: 100px;
 }
 
 .el-timeline-item >>> .el-timeline-item__node--normal {
-  left: 117px;
-  width: 18px;
-  height: 18px;
+    left: 117px;
+    width: 18px;
+    height: 18px;
 
-  background: rgba(25, 103, 249, 0.12) !important;
-  border-radius: 50%;
-  /* 创建圆形 */
-  position: relative;
-  /* 用于定位伪元素 */
+    background: rgba(25, 103, 249, 0.12) !important;
+    border-radius: 50%;
+    /* 创建圆形 */
+    position: relative;
+    /* 用于定位伪元素 */
 }
 
 .el-timeline-item >>> .el-timeline-item__node--normal::before {
-  content: "";
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 8px;
-  /* 中心圆直径 */
-  height: 8px;
-  background-color: var(--el-color-primary);
-  /* 中心圆颜色 */
-  border-radius: 50%;
-  /* 中心圆为圆形 */
-  transform: translate(-50%, -50%);
-  /* 居中显示 */
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 8px;
+    /* 中心圆直径 */
+    height: 8px;
+    background-color: var(--el-color-primary);
+    /* 中心圆颜色 */
+    border-radius: 50%;
+    /* 中心圆为圆形 */
+    transform: translate(-50%, -50%);
+    /* 居中显示 */
 }
 
 .el-timeline-item >>> .el-timeline-item__tail {
-  left: 125px;
-  border-left-color: #dddddd;
-  border-left-style: dashed;
-  margin: 24px 0 12px;
-  height: calc(100% - 24px - 12px);
+    left: 125px;
+    border-left-color: #dddddd;
+    border-left-style: dashed;
+    margin: 24px 0 12px;
+    height: calc(100% - 24px - 12px);
 }
 
 .time-dialog-wrap >>> .el-dialog__header {
-  padding: 10px 20px;
-  height: 25px;
-  line-height: 25px;
-  text-align: left;
-  background: #fff;
-  border-bottom: solid 1px #e4e7ed;
+    padding: 10px 20px;
+    height: 25px;
+    line-height: 25px;
+    text-align: left;
+    background: #fff;
+    border-bottom: solid 1px #e4e7ed;
 }
 
 .time-dialog-wrap >>> .el-card__body {
-  padding: 8px;
+    padding: 8px;
 }
 
 .time-dialog-wrap >>> .el-card.is-always-shadow {
-  box-shadow: none;
+    box-shadow: none;
 }
 
 .time-dialog-wrap >>> .el-dialog__headerbtn .el-dialog__close {
-  color: #666;
+    color: #666;
 }
 
 .time-dialog-wrap >>> .el-dialog__headerbtn:hover .el-dialog__close {
-  color: #666;
+    color: #666;
 }
 
 .time-dialog-wrap >>> .el-dialog__headerbtn {
-  top: 14px;
+    top: 14px;
 }
 
 .time-dialog-wrap >>> .el-collapse {
-  margin-left: 119px;
-  border: none;
-  margin-top: -22px;
+    margin-left: 119px;
+    border: none;
+    margin-top: -22px;
 }
 
 .time-dialog-wrap >>> .el-collapse-item__header {
-  border: none;
-  line-height: 25px;
-  height: 25px;
-  position: relative;
-  z-index: 999;
+    border: none;
+    line-height: 25px;
+    height: 25px;
+    position: relative;
+    z-index: 999;
 }
 
 .time-dialog-wrap >>> .el-collapse-item__wrap {
-  border: none;
+    border: none;
 }
 
 .time-dialog-wrap >>> .el-collapse-item__content {
-  margin-top: 15px;
-  padding-bottom: 0 !important;
+    margin-top: 15px;
+    padding-bottom: 0 !important;
 }
 
 .time-dialog-wrap >>> .el-timeline-item__node--01 {
-  width: 18px !important;
-  height: 18px !important;
-  left: 117px !important;
+    width: 18px !important;
+    height: 18px !important;
+    left: 117px !important;
 }
 </style>
 <style>
 .time-dialog-wrap .el-dialog {
-  margin: 0 auto !important;
-  max-height: 90%;
-  overflow: hidden;
-  top: 5%;
+    margin: 0 auto !important;
+    max-height: 90%;
+    overflow: hidden;
+    top: 5%;
 }
 
 .time-dialog-wrap .el-dialog {
-  margin: 0 auto !important;
-  height: 65%;
-  overflow: hidden;
-  top: 10%;
+    margin: 0 auto !important;
+    height: 65%;
+    overflow: hidden;
+    top: 10%;
 }
 
 .time-dialog-wrap .el-dialog__body {
-  position: absolute;
-  left: 0;
-  top: 46px;
-  bottom: 0;
-  right: 0;
-  z-index: 1;
-  overflow: hidden;
-  overflow-y: auto;
-  padding: 10px 20px 0 0;
+    position: absolute;
+    left: 0;
+    top: 46px;
+    bottom: 0;
+    right: 0;
+    z-index: 1;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: 10px 20px 0 0;
 }
 
 .time-dialog-wrap .el-timeline-item__wrapper {
-  top: -20px !important;
+    top: -20px !important;
 }
 </style>
diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue
index 4cc10efa0..32693e99b 100644
--- a/admin/src/app/views/diy/edit.vue
+++ b/admin/src/app/views/diy/edit.vue
@@ -469,18 +469,21 @@ initPage({
     if (import.meta.env.MODE == 'development') {
 
         // env文件配置过wap域名
-        if (wapDomain.value) {
-            wapUrl.value = wapDomain.value + '/wap'
-            repeat = false
-            setDomain()
-        }
+        // if (wapDomain.value) {
+        //     wapUrl.value = wapDomain.value + '/wap'
+        //     repeat = false
+        //     setDomain()
+        // }
 
-        let wap_domain_storage = storage.get('wap_domain')
-        if (wap_domain_storage) {
-            wapUrl.value = wap_domain_storage
-            repeat = false
-            setDomain()
-        }
+        // let wap_domain_storage = storage.get('wap_domain')
+        // if (wap_domain_storage) {
+        //     wapUrl.value = wap_domain_storage
+        //     repeat = false
+        //     setDomain()
+        // }
+		wapUrl.value = 'http://localhost:5173/wap'
+		repeat = false
+		setDomain()
     }
 
     if (repeat) {
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index afef322e8..423481b8b 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -1,950 +1,950 @@
 <template>
-  <!--应用市场-->
-  <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>
+	<!--应用市场-->
+	<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>
+									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>
+						</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>
 
-      <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>
+				<el-form-item prop="keywords">
+					<el-input v-model.trim="searchParam.keywords" class="!w-[200px]" :placeholder="t('搜索关键词')" clearable />
+				</el-form-item>
 
-        <el-form-item prop="keywords">
-          <el-input v-model.trim="searchParam.keywords" class="!w-[200px]" :placeholder="t('搜索关键词')" clearable />
-        </el-form-item>
+				<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>
 
-        <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 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 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="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="{
+		<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="
+						>
+							<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] rounded-[5px]" :src="row.icon" fit="contain">
+								<template #error>
+									<div class="flex items-center w-full h-full rounded-[5px]">
+										<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>
+									>
+										{{ 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>
 
-        <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="
+				<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>
+								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-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="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-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="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">
+		<!-- 安装弹窗 -->
+		<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>
+										<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">
+									</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>
+										<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-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-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">
+		<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>
+									<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">
+								</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>
+									<span v-else>
 										<el-icon color="red">
 											<CloseBold />
 										</el-icon>
 									</span>
-                </el-col>
-              </el-row>
-            </div>
-          </div>
-        </div>
-      </el-scrollbar>
-    </el-dialog>
+								</el-col>
+							</el-row>
+						</div>
+					</div>
+				</div>
+			</el-scrollbar>
+		</el-dialog>
 
-    <!-- 下载提示 -->
-    <el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
-      <span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
-      <template #footer>
+		<!-- 下载提示 -->
+		<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>
+			</template>
+		</el-dialog>
 
-    <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>
+		<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="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="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]" 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>
+				<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>
+				<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]" 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="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" />
+				<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, getAppVersionList } from '@/app/api/module'
@@ -980,89 +980,89 @@ const upgradeLogRef = ref<any>(null)
 const showType = ref(storage.get('storeShowType') || 'card')
 const frameworkNewVersion = ref('')
 const searchParam = reactive({
-  keywords: '',
-  type: '',
+	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
-  })
+	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()
+	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 == 'recentlyUpdated' && localList.value[activeName.value].length) {
-    batchUpgradeApp.value = localList.value[activeName.value].map((item) => item.key)
-  } else {
-    batchUpgradeApp.value = []
-  }
-  if (isShowDetail.value){
-    closeDetail()
-  }
+	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
+	}
 })
 
 /**
@@ -1072,164 +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) => {
-    if(!item.isHideen){
-      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.isHideen && 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
+	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
-    }
-  })
+	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()
+	if(showType.value != 'card') query()
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  searchParam.keywords = ''
-  searchParam.type = ''
-  searchFn()
+    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('')
@@ -1246,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++] }
-    },
-  }
+	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()
+	})
 }
 
 /**
@@ -1295,93 +1295,93 @@ let upgradeTimer: ReturnType<typeof setInterval> | null = null
 let notificationEl = null
 
 const getInstallTask = (first: boolean = true) => {
-  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' })
-      })
+	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)
@@ -1390,30 +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)
@@ -1422,71 +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 = {}
 })
 
 // 卸载面板弹窗
@@ -1500,13 +1500,13 @@ 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)
+	})
 }
 
 /**
@@ -1514,51 +1514,51 @@ const uninstallAddonFn = (key: string) => {
  * @param key
  */
 const upgradeAddonFn = (data: any) => {
-  upgradeRef.value?.open(data.key,null,data)
+	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')
 }
 
 /**
@@ -1566,40 +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 updateInformationFn = (data: any) => {
-  data.version = frameworkNewVersion.value
-  data.title = '框架'
-  data.install_info = {
-    version: frameworkVersion.value
-  }
-  openDetail(data)
+	data.version = frameworkNewVersion.value
+	data.title = '框架'
+	data.install_info = {
+		version: frameworkVersion.value
+	}
+	openDetail(data)
 }
 // 授权
 const authCodeApproveDialog = ref(false)
@@ -1608,134 +1608,134 @@ 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.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',
-  )
+	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 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({'key': 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))
 })
 
 // 应用详情  ------ start
@@ -1743,13 +1743,13 @@ 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 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 installInfo = detailAddon.value?.install_info
+	if (installInfo && Object.keys(installInfo).length) return installInfo.version || '-'
+	return detailAddon.value?.version || '-'
 })
 
 const detailVersionList = ref<any[]>([])
@@ -1757,516 +1757,516 @@ 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}`]
+	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
-  }
+	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)
+	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 = []
+	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}`)
-  }
+	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;
+	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;
+	background: #f5f7f9;
 }
 
 html.dark .table-head-bg {
-  background: #141414;
+	background: #141414;
 }
 
 .el-alert .el-alert__title {
-  font-size: 16px;
-  line-height: 18px;
+	font-size: 16px;
+	line-height: 18px;
 }
 
 :deep(.terminal .t-log-box span) {
-  white-space: pre-wrap;
+	white-space: pre-wrap;
 }
 
 :deep(.data-loading) {
-  .el-table__body-wrapper {
-    // display: none !important;
-  }
+	.el-table__body-wrapper {
+		// display: none !important;
+	}
 }
 
 :deep(.hide-expand .el-table__expand-icon > .el-icon) {
-  visibility: hidden;
-  pointer-events: none;
+	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;
+	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;
+	box-shadow: none !important;
+	border-radius: 4px !important;
+	border: 1px solid #d1d5db !important;
+	height: 32px !important;
 }
 
 :deep(.el-button) {
-  border-radius: 4px !important;
+	border-radius: 4px !important;
 }
 
 /* 设置 el-select 的 placeholder 颜色 */
 :deep(.search-form .el-select__placeholder.is-transparent) {
-  color: #c4c7da;
-  font-size: 12px;
+	color: #c4c7da;
+	font-size: 12px;
 }
 
 /* 设置 el-select 选中后的颜色 */
 :deep(.search-form .el-select__placeholder) {
-  color: #4f516d;
-  font-size: 12px;
+	color: #4f516d;
+	font-size: 12px;
 }
 
 /* 设置 el-input 的 placeholder 颜色 */
 :deep(.search-form .el-input__inner::placeholder) {
-  color: #c4c7da;
-  font-size: 12px;
+	color: #c4c7da;
+	font-size: 12px;
 }
 
 /* 设置 el-input 输入内容后的颜色 */
 :deep(.search-form .el-input__inner) {
-  color: #4f516d;
-  font-size: 12px;
+	color: #4f516d;
+	font-size: 12px;
 }
 
 /* 设置 el-date-picker 的 placeholder 颜色 */
 :deep(.search-form .el-date-editor .el-range-input::placeholder) {
-  color: #c4c7da;
-  font-size: 12px;
+	color: #c4c7da;
+	font-size: 12px;
 }
 
 /* 设置 el-date-picker 的输入内容颜色 */
 :deep(.search-form .el-date-editor .el-range-input) {
-  color: #4f516d;
-  font-size: 12px;
+	color: #4f516d;
+	font-size: 12px;
 }
 
 :deep(.el-table tr td:first-child) {
-  border-bottom: none;
-  // background-color: inherit !important;
-  height: 100px;
+	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);
+	// border-bottom: 1px solid var(--el-table-border-color);
 }
 
 :deep(.el-table__body tr) {
-  position: relative;
+	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;
+	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;
+	position: relative;
 }
 
 :deep(.el-table__body tr:hover td:first-child::before) {
-  opacity: 1;
+	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;
+	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;
+	opacity: 1;
 }
 
 :deep(.el-table__fixed-body-wrapper .el-table__row .el-table__cell) {
-  overflow: visible;
+	overflow: visible;
 }
 
 :deep(.el-table .el-table__expand-icon) {
-  position: relative;
-  top: 12.5px;
-  left: -13px;
-  z-index: 99;
-  margin: 3px;
-  overflow: hidden;
+	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; /* 从行继承背景色 */
+	background-color: inherit !important; /* 从行继承背景色 */
 }
 
 :deep(.el-table tr td:nth-child(1)::before) {
-  overflow: hidden !important;
+	overflow: hidden !important;
 }
 
 :deep(.tree-child-cell) {
-  position: relative;
-  height: 100%;
+	position: relative;
+	height: 100%;
 }
 
 :deep(.el-table .cell) {
-  overflow: visible !important;
+	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;
+	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;
+	content: '';
+	position: absolute;
+	top: 0;
+	left: -5px;
+	width: 8px;
+	height: 1px;
+	background-color: #f5f5f5;
 }
 
 :deep(.hidden-selection-column .cell) {
-  display: none;
+	display: none;
 }
 
 :deep(.el-dialog__title) {
-  font-size: 20px;
-  font-weight: bold;
+	font-size: 20px;
+	font-weight: bold;
 }
 
 :deep(.el-result__title p) {
-  font-size: 25px;
-  color: #1d1f3a;
-  font-weight: 500;
+	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;
+	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);
-    }
-  }
+		.el-step__line {
+			margin: 0 25px;
+			background: var(--el-color-primary);
+		}
+	}
 
-  .is-finish {
-    color: var(--el-color-primary);
-    border-color: var(--el-color-primary);
+	.is-finish {
+		color: var(--el-color-primary);
+		border-color: 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);
+		.el-step__icon {
+			background: var(--el-color-primary) !important;
+			color: #fff !important;
+			// 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);
-    }
-  }
+		.el-step__line {
+			margin: 0 25px;
+			background: var(--el-color-primary);
+		}
+	}
 
-  .is-process {
-    color: var(--el-color-primary);
-    font-weight: inherit;
+	.is-process {
+		color: var(--el-color-primary);
+		font-weight: inherit;
 
-    // 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);
-    }
-  }
+		// 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;
-  }
+	.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;
-  }
+	&.selected {
+		background-color: #f9f9f9;
+		border-color: #f9f9f9;
+	}
 }
 .product-card-item{
-  border: 1px solid #F1F1F1;
-  &:hover{
-    background-color: #f8f8f8;
-    border-color: #f8f8f8;
-  }
+	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;
+	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;
+	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;
+	display: flex;
+	align-items: center;
+	gap: 20px;
 }
 
 .app-section-title {
-  font-size: 16px;
-  font-weight: 400;
-  line-height: 20px;
-  white-space: nowrap;
-  color: #374151;
+	font-size: 16px;
+	font-weight: 400;
+	line-height: 20px;
+	white-space: nowrap;
+	color: #374151;
 }
 
 .app-section-line {
-  flex: 1;
-  height: 1px;
-  background: #EBEEF5;
+	flex: 1;
+	height: 1px;
+	background: #EBEEF5;
 }
 :deep(.app-detail-static .el-card__body){
-  padding-top: 0 !important;
+	padding-top: 0 !important;
 }
 :deep(.detail-upgrade-log .el-timeline-item) {
-  min-height: 75px;
+	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;
+	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%);
+	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);
+	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;
+	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;
+	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;
+	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;
+	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;
+    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;
+	display: none;
 }
 :deep(.detail-upgrade-log .el-collapse-item .collapse-arrow .expand){
-  display: block;
+	display: block;
 }
 :deep(.detail-upgrade-log .el-collapse-item .collapse-arrow .fold-up){
-  display: none;
+	display: none;
 }
 :deep(.detail-upgrade-log .el-collapse-item.is-active .collapse-arrow .expand){
-  display: none;
+	display: none;
 }
 :deep(.detail-upgrade-log .el-collapse-item.is-active .collapse-arrow .fold-up){
-  display: block;
+	display: block;
 }
 :deep(.app-list-tip .el-tag__content){
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+	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;
-  }
+	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;
+	padding-bottom: 3px !important;
 }
 .el-empty .el-empty__image {
-  width: auto;
+	width: auto;
 }
 </style>
diff --git a/admin/src/app/views/setting/map.vue b/admin/src/app/views/setting/map.vue
index cff3eac9f..f623e59e0 100644
--- a/admin/src/app/views/setting/map.vue
+++ b/admin/src/app/views/setting/map.vue
@@ -7,15 +7,50 @@
             </div>
 
             <el-form class="page-form mt-[20px]" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
-                <el-form-item :label="t('mapKey')" prop="key">
-                    <el-input v-model.trim="formData.key" class="input-width" clearable />
-                    <span class="ml-2 cursor-pointer tutorial-btn" @click="tutorialFn">{{ t('clickTutorial') }}</span>
-                    <span class="ml-2 cursor-pointer secret-btn" @click="secretFn('https://lbs.qq.com/dev/console/key/manage')">{{ t('clickSecretKey') }}</span>
-                </el-form-item>
-                <el-form-item :label="t('aMapKey')" prop="key">
-                    <el-input v-model.trim="formData.amap_key" class="input-width" clearable />
-                    <span class="ml-2 cursor-pointer secret-btn" @click="secretFn('https://lbs.amap.com/')">{{ t('clickSecretKey') }}</span>
+                <el-form-item label="地图类型" prop="map_type">
+                    <div>
+                        <el-radio-group v-model="formData.map_type">
+                            <el-radio label="tianditu">天地图</el-radio>
+                            <el-radio label="tencent">腾讯地图</el-radio>
+                        </el-radio-group>
+                        <div class="text-sm text-gray-400 mt-[10px] leading-none">选择地图服务提供商</div>
+                    </div>
                 </el-form-item>
+
+                <template v-if="formData.map_type === 'tencent'">
+                    <el-form-item :label="t('mapKey')" prop="key">
+                        <div>
+                            <div class="flex items-center">
+                                <el-input v-model.trim="formData.key" class="input-width" clearable />
+                                <span class="ml-2 cursor-pointer tutorial-btn" @click="tutorialFn">{{ t('clickTutorial') }}</span>
+                                <span class="ml-2 cursor-pointer secret-btn" @click="secretFn('https://lbs.qq.com/dev/console/key/manage')">{{ t('clickSecretKey') }}</span>
+                            </div>
+                        </div>
+                    </el-form-item>
+                </template>
+
+                <template v-if="formData.map_type === 'tianditu'">
+                    <el-form-item label="天地图服务端KEY" prop="tianditu_map_key">
+                        <div>
+                            <div class="flex items-center">
+                                <el-input v-model.trim="formData.tianditu_map_key" class="input-width" clearable />
+                                <span class="ml-2 cursor-pointer secret-btn" @click="secretFn('https://cloudcenter.tianditu.gov.cn/center/development/myApp')">获取密钥</span>
+                            </div>
+                            <div class="text-sm text-gray-400 mt-[10px] leading-none">天地图服务器端API密钥，用于后端地理编码等服务，请求从业务服务器发起，不支持前端地图瓦片加载与 JS API 渲染。</div>
+                            <div class="text-sm text-gray-400 mt-[10px] leading-none">使用场景：如地理编码、逆地理编码、坐标转换、批量 POI 查询等。</div>
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="天地图浏览器端KEY" prop="tianditu_map_web_key">
+                        <div>
+                            <div class="flex items-center">
+                                <el-input v-model.trim="formData.tianditu_map_web_key" class="input-width" clearable />
+                                <span class="ml-2 cursor-pointer secret-btn" @click="secretFn('https://cloudcenter.tianditu.gov.cn/center/development/myApp')">获取密钥</span>
+                            </div>
+                            <div class="text-sm text-gray-400 mt-[10px] leading-none">天地图浏览器端API密钥，用于前端加载地图，不可用于后端接口鉴权。</div>
+                            <div class="text-sm text-gray-400 mt-[10px] leading-none">使用场景：展示地图瓦片、实现地图交互（缩放、拖拽、图层切换、标注、可视化展示、地图选位置等）。</div>
+                        </div>
+                    </el-form-item>
+                </template>
                 <el-form-item :label="t('isOpen')" prop="is_open">
                     <el-switch v-model="formData.is_open" :active-value="1" :inactive-value="0" />
                 </el-form-item>
@@ -45,8 +80,10 @@ import { FormInstance } from 'element-plus'
 const loading = ref(true)
 const formRef = ref<FormInstance>()
 const formData = reactive({
+    map_type: 'tencent',
     key: '',
-    amap_key: '',
+    tianditu_map_key: '',
+    tianditu_map_web_key: '',
     is_open: 0,
     valid_time: 0
 })
diff --git a/admin/src/app/views/setting/notice.vue b/admin/src/app/views/setting/notice.vue
index 6fa70e2a5..f6552d5e2 100644
--- a/admin/src/app/views/setting/notice.vue
+++ b/admin/src/app/views/setting/notice.vue
@@ -351,13 +351,12 @@ import {
   getWechatAuthUrl,
   getWeappAuthUrl,
   sendSms,
-  bindSms,
+  bindSms
 } from '@/app/api/notice'
 import Sms from '@/app/views/setting/components/notice-sms.vue'
 import Wechat from '@/app/views/setting/components/notice-wechat.vue'
 import Weapp from '@/app/views/setting/components/notice-weapp.vue'
 import QRCode from 'qrcode'
-import { chain } from 'lodash-es'
 import { img } from '@/utils/common'
 import { SuccessFilled } from '@element-plus/icons-vue'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -436,7 +435,6 @@ const isBind = ref({
 // 查看是否绑定
 const getBindInfoFn = (isFirstQuery = false) => {
   getBindInfo().then((res) => {
-    console.log(res.data)
     if (Object.keys(res.data).length > 0) {
       isBind.value.bind_sms = res.data.mobile ? 1 : 0 // 新增：更新短信绑定状态
       isBind.value.bind_wechat = res.data.wechat_openid ? 1 : 0 // 新增：更新微信绑定状态
diff --git a/admin/src/app/views/setting/system.vue b/admin/src/app/views/setting/system.vue
index 6d7543deb..210d511ef 100644
--- a/admin/src/app/views/setting/system.vue
+++ b/admin/src/app/views/setting/system.vue
@@ -1,79 +1,79 @@
 <template>
-  <div class="main-container">
-    <el-form class="page-form loading-box" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
-      <el-card class="box-card !border-none" shadow="never">
-        <h3 class="text-[16px] text-[#1D1F3A] font-bold mb-4">{{ pageName }}</h3>
-        <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('websiteInfo') }}</h3>
+    <div class="main-container">
+        <el-form class="page-form loading-box" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="text-[16px] text-[#1D1F3A] font-bold mb-4">{{ pageName }}</h3>
+                <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('websiteInfo') }}</h3>
 
-        <el-form-item :label="t('siteName')" prop="site_name">
-          <el-input v-model.trim="formData.site_name" :placeholder="t('siteNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
-        </el-form-item>
-        <el-form-item :label="t('logo')" prop="logo">
-          <div>
-            <upload-image v-model="formData.logo" />
-            <p class="text-[12px] text-[#a9a9a9]">{{ t('logoPlaceholder') }}</p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('icon')" prop="icon">
-          <div>
-            <upload-image v-model="formData.icon" />
-            <p class="text-[12px] text-[#a9a9a9]">{{ t('iconPlaceholder') }}</p>
-          </div>
-        </el-form-item>
-        <el-form-item :label="t('keywords')">
-          <el-input v-model.trim="formData.keywords" :placeholder="t('keywordsPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
-        </el-form-item>
-        <el-form-item :label="t('desc')">
-          <el-input v-model.trim="formData.desc" type="textarea" :rows="4" clearable :placeholder="t('descPlaceholder')" class="input-width" maxlength="100" show-word-limit />
-        </el-form-item>
+                <el-form-item :label="t('siteName')" prop="site_name">
+                    <el-input v-model.trim="formData.site_name" :placeholder="t('siteNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('logo')" prop="logo">
+                    <div>
+                        <upload-image v-model="formData.logo" />
+                        <p class="text-[12px] text-[#a9a9a9]">{{ t('logoPlaceholder') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('icon')" prop="icon">
+                    <div>
+                        <upload-image v-model="formData.icon" />
+                        <p class="text-[12px] text-[#a9a9a9]">{{ t('iconPlaceholder') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('keywords')">
+                    <el-input v-model.trim="formData.keywords" :placeholder="t('keywordsPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('desc')">
+                    <el-input v-model.trim="formData.desc" type="textarea" :rows="4" clearable :placeholder="t('descPlaceholder')" class="input-width" maxlength="100" show-word-limit />
+                </el-form-item>
 
-        <div class="mt-[20px]" v-show="appType == 'site'">
-          <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('frontEndInfo') }}</h3>
-          <el-form-item :label="t('frontEndName')">
-            <el-input v-model.trim="formData.front_end_name" :placeholder="t('frontEndNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
-          </el-form-item>
-          <el-form-item :label="t('phone')">
-            <el-input v-model.trim="formData.phone" :placeholder="t('phonePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
-          </el-form-item>
-          <el-form-item :label="t('logo')">
-            <upload-image v-model="formData.front_end_logo" />
-          </el-form-item>
-          <el-form-item :label="t('icon')">
-            <upload-image v-model="formData.front_end_icon" />
-          </el-form-item>
+                <div class="mt-[20px]" v-show="appType == 'site'">
+                    <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('frontEndInfo') }}</h3>
+                    <el-form-item :label="t('frontEndName')">
+                        <el-input v-model.trim="formData.front_end_name" :placeholder="t('frontEndNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                    </el-form-item>
+                    <el-form-item :label="t('phone')">
+                        <el-input v-model.trim="formData.phone" :placeholder="t('phonePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                    </el-form-item>
+                    <el-form-item :label="t('logo')">
+                        <upload-image v-model="formData.front_end_logo" />
+                    </el-form-item>
+                    <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-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>
+                </div>
+
+                <div class="mt-[20px]" v-if="appType == 'admin'">
+                    <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('serviceInformation') }}</h3>
+                    <el-form-item :label="t('contactsTel')">
+                        <el-input v-model.trim="formData.tel" :placeholder="t('contactsTelPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                    </el-form-item>
+                    <el-form-item :label="t('wechatCode')">
+                        <upload-image v-model="formData.wechat_code" />
+                    </el-form-item>
+                    <el-form-item :label="t('customerServiceCode')">
+                        <upload-image v-model="formData.enterprise_wechat" />
+                    </el-form-item>
+                </div>
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
         </div>
-
-        <div class="mt-[20px]" v-if="appType == 'admin'">
-          <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('serviceInformation') }}</h3>
-          <el-form-item :label="t('contactsTel')">
-            <el-input v-model.trim="formData.tel" :placeholder="t('contactsTelPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
-          </el-form-item>
-          <el-form-item :label="t('wechatCode')">
-            <upload-image v-model="formData.wechat_code" />
-          </el-form-item>
-          <el-form-item :label="t('customerServiceCode')">
-            <upload-image v-model="formData.enterprise_wechat" />
-          </el-form-item>
-        </div>
-      </el-card>
-    </el-form>
-
-    <div class="fixed-footer-wrap">
-      <div class="fixed-footer">
-        <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
-      </div>
     </div>
-  </div>
 </template>
 
 <script lang="ts" setup>
@@ -91,46 +91,46 @@ const pageName = route.meta.title
 const loading = ref(true)
 const appType = ref(getAppType())
 const formData: any = reactive<Record<string, string>>({
-  site_name: '',
-  logo: '',
-  desc: '',
-  latitude: '',
-  keywords: '',
-  longitude: '',
-  province_id: '',
-  city_id: '',
-  district_id: '',
-  address: '',
-  full_address: '',
-  business_hours: '',
-  phone: '',
-  front_end_name: '',
-  front_end_logo: '',
-  front_end_icon: '',
-  icon: '',
-  wechat_code: '',
-  enterprise_wechat: '',
-  tel: '',
-  site_login_logo: '',
-  site_login_bg_img: '',
-  meta_title: '',
-  meta_desc: '',
-  meta_keyword: ''
+    site_name: '',
+    logo: '',
+    desc: '',
+    latitude: '',
+    keywords: '',
+    longitude: '',
+    province_id: '',
+    city_id: '',
+    district_id: '',
+    address: '',
+    full_address: '',
+    business_hours: '',
+    phone: '',
+    front_end_name: '',
+    front_end_logo: '',
+    front_end_icon: '',
+    icon: '',
+    wechat_code: '',
+    enterprise_wechat: '',
+    tel: '',
+    site_login_logo: '',
+    site_login_bg_img: '',
+    meta_title: '',
+    meta_desc: '',
+    meta_keyword: ''
 })
 
 const setFormData = async () => {
-  const data = await (await getWebsite()).data
-  Object.keys(formData).forEach((key: string) => {
-    if (data[key] != undefined) formData[key] = data[key]
-  })
+    const data = await (await getWebsite()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
 
-  const service_data: any = await (await getService()).data
-  formData.wechat_code = service_data.wechat_code
-  formData.enterprise_wechat = service_data.enterprise_wechat
-  formData.tel = service_data.tel
-  formData.site_login_logo = service_data.site_login_logo
-  formData.site_login_bg_img = service_data.site_login_bg_img
-  loading.value = false
+    const service_data: any = await (await getService()).data
+    formData.wechat_code = service_data.wechat_code
+    formData.enterprise_wechat = service_data.enterprise_wechat
+    formData.tel = service_data.tel
+    formData.site_login_logo = service_data.site_login_logo
+    formData.site_login_bg_img = service_data.site_login_bg_img
+    loading.value = false
 }
 setFormData()
 
@@ -138,42 +138,42 @@ const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
-  site_name: [
-    { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' }
-  ],
-  logo: [
-    { required: true, message: t('请选择长方形Logo'), trigger: 'blur' }
-  ],
-  icon: [
-    { required: true, message: t('请选择正方形Logo'), trigger: 'blur' }
-  ],
-  front_end_name: [
-    { required: true, message: t('frontEndNamePlaceholder'), trigger: 'blur' }
-  ]
+    site_name: [
+        { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' }
+    ],
+    logo: [
+        { required: true, message: t('请选择长方形Logo'), trigger: 'blur' }
+    ],
+    icon: [
+        { required: true, message: t('请选择正方形Logo'), trigger: 'blur' }
+    ],
+    front_end_name: [
+        { required: true, message: t('frontEndNamePlaceholder'), trigger: 'blur' }
+    ]
 })
 
 /**
  * 保存
  */
 const save = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
+    if (loading.value || !formEl) return
 
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-      setWebsite(formData).then(() => {
-        loading.value = false
-        appType.value == 'admin' ? useSystemStore().getWebsiteInfo() : useUserStore().getSiteInfo()
-      }).catch(() => {
-        loading.value = false
-      })
-    }
-  })
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setWebsite(formData).then(() => {
+                loading.value = false
+                appType.value == 'admin' ? useSystemStore().getWebsiteInfo() : useUserStore().getSiteInfo()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
 }
 </script>
 
 <style lang="scss" scoped>
 :deep(.loading-box .el-loading-spinner){
-  top: 33%;
+    top: 33%;
 }
 </style>
diff --git a/admin/src/app/views/setting/transfer_scene.vue b/admin/src/app/views/setting/transfer_scene.vue
index b8e075907..cd8ceb154 100644
--- a/admin/src/app/views/setting/transfer_scene.vue
+++ b/admin/src/app/views/setting/transfer_scene.vue
@@ -1,149 +1,200 @@
 <template>
-    <div class="main-container">
-        <el-card class="box-card mt-[15px] !border-none" shadow="never" v-for="(item, key) in screne" :key="key">
-           <div class="flex  items-center mb-[20px]">
-                <h3 class="text-[14px] mr-[20px]">{{ item.name }}</h3>
-                <div class="flex items-center">
-                    <span class="text-[14px] mr-[10px]">{{ t('transferSceneId') }}：</span>
-                    <div class="flex items-center">
-                        <el-input v-model.trim="item.scene_id" maxlength="5" class="!w-[60px]" :disabled="item.disabled" @blur="handleInput($event,key,item)" :ref="(el: any) =>{ if(el) inputRefs[key] = el }" v-show="!item.disabled"/>
-                         <div v-show="item.disabled">{{item.scene_id ? item.scene_id : '--'}}</div>
-                        <div @click="handleDisabled(item, key)" class="w-[40xp] flex items-center ml-[8px]"><el-icon size="20" color="var(--el-color-primary)"><Edit /></el-icon></div>
-                    </div>
-                </div>
-           </div>
-           <div>
-                <div class="flex items-center justify-between p-[10px] table-item-border bg">
-                    <span class="text-base w-[230px]">{{ t('transferType') }}</span>
-                    <span class="text-base w-[230px]">{{ t('recvPerception') }}</span>
-                    <span class="text-base w-[230px]">{{ t('reportInfos') }}</span>
-                    <span class="text-base w-[80px] text-center">{{ t('operation') }}</span>
-                </div>
-                <div v-if="Object.values(item.trade_scene_data).length">
-                    <div class="flex items-center justify-between p-[10px] table-item-border" v-for="(subItem, subKey) in item.trade_scene_data" :key="subKey">
-                        <div class="flex w-[230px] flex-shrink-0 text-base">{{ subItem.name }}</div>
-                        <div class="flex w-[230px] flex-shrink-0 text-base">{{ subItem.perception }}</div>
-                        <div class="w-[230px] flex-shrink-0 text-base">
-                            <div v-for="(childItem,childKey) in subItem.infos" :key="childKey">{{ childKey }}：{{ childItem }}</div>
-                        </div>
-                        <div class="flex items-center justify-center w-[80px] select-none">
-                            <button class="text-base text-primary" @click="configFn(item,subItem,subKey)">{{ t('deploy') }}</button>
-                        </div>
-                    </div>
-                </div>
-                <div v-else class="min-h-[80px] flex items-center justify-center text-base">
-                    {{ t('noData') }}
-                </div>
-           </div>
-        </el-card>
-        <el-dialog v-model="showDialog" :title="curData.name" width="550px" :destroy-on-close="true">
-            <el-form :model="formData" label-width="110px" ref="formRef"  class="page-form">
-                <el-form-item :label="t('recvPerception')" prop="perception" :rules="[{ required: true, message: t('recvPerceptionTips'), trigger: 'blur' }]">
-                    <el-select v-model="formData.perception" :placeholder="t('recvPerceptionTips')" clearable  class="!w-[300px]">
-                        <el-option v-for="(item,index) in curData.user_recv_perception" :key="index" :label="item" :value="item" />
-                    </el-select>
-                </el-form-item>
-                <template v-for="(item, index) in curData.transfer_scene_report_infos" :key="index">
-                    <el-form-item :label="item" :prop="`infos[${item}]`" :rules="[{ required: true, message: `请输入${item}`, trigger: 'blur' }]">
-                        <el-input v-model.trim="formData.infos[item]"  maxlength="40" class="!w-[300px]"/>
-                    </el-form-item>
-                </template>
-            </el-form>
-            <template #footer>
+  <div class="main-container">
+    <el-card class="box-card mt-[15px] !border-none" shadow="never" v-for="(item, key) in screne" :key="key">
+      <div class="flex  items-center mb-[20px]">
+        <h3 class="text-[14px] mr-[20px]">{{ item.name }}</h3>
+        <div class="flex items-center">
+          <span class="text-[14px] mr-[10px]">{{ t('transferSceneId') }}：</span>
+          <div class="flex items-center">
+            <el-input
+                v-model.trim="item.scene_id"
+                maxlength="5"
+                minlength="4"
+                class="!w-[60px]"
+                :class="item.error ? '!border-red-500' : ''"
+                :disabled="item.disabled"
+                @blur="handleInput($event,key,item)"
+                :ref="(el: any) =>{ if(el) inputRefs[key] = el }"
+                v-show="!item.disabled"
+            />
+            <div v-show="item.disabled">{{ item.scene_id ? item.scene_id : '--' }}</div>
+            <div @click="handleDisabled(item, key)" class="w-[40px] flex items-center ml-[8px]">
+              <el-icon size="20" color="var(--el-color-primary)">
+                <Edit/>
+              </el-icon>
+            </div>
+            <span v-if="item.error" class="text-red-500 text-xs ml-2">场景值最少为4位</span>
+          </div>
+        </div>
+      </div>
+      <div>
+        <div class="flex items-center justify-between p-[10px] table-item-border bg">
+          <span class="text-base w-[230px]">{{ t('transferType') }}</span>
+          <span class="text-base w-[230px]">{{ t('recvPerception') }}</span>
+          <span class="text-base w-[230px]">{{ t('reportInfos') }}</span>
+          <span class="text-base w-[80px] text-center">{{ t('operation') }}</span>
+        </div>
+        <div v-if="Object.values(item.trade_scene_data).length">
+          <div class="flex items-center justify-between p-[10px] table-item-border"
+               v-for="(subItem, subKey) in item.trade_scene_data" :key="subKey">
+            <div class="flex w-[230px] flex-shrink-0 text-base">{{ subItem.name }}</div>
+            <div class="flex w-[230px] flex-shrink-0 text-base">{{ subItem.perception }}</div>
+            <div class="w-[230px] flex-shrink-0 text-base">
+              <div v-for="(childItem,childKey) in subItem.infos" :key="childKey">{{ childKey }}：{{ childItem }}</div>
+            </div>
+            <div class="flex items-center justify-center w-[80px] select-none">
+              <button class="text-base text-primary" @click="configFn(item,subItem,subKey)">{{ t('deploy') }}</button>
+            </div>
+          </div>
+        </div>
+        <div v-else class="min-h-[80px] flex items-center justify-center text-base">
+          {{ t('noData') }}
+        </div>
+      </div>
+    </el-card>
+    <el-dialog v-model="showDialog" :title="curData.name" width="550px" :destroy-on-close="true">
+      <el-form :model="formData" label-width="110px" ref="formRef" class="page-form">
+        <el-form-item :label="t('recvPerception')" prop="perception"
+                      :rules="[{ required: true, message: t('recvPerceptionTips'), trigger: 'blur' }]">
+          <el-select v-model="formData.perception" :placeholder="t('recvPerceptionTips')" clearable class="!w-[300px]">
+            <el-option v-for="(item,index) in curData.user_recv_perception" :key="index" :label="item" :value="item"/>
+          </el-select>
+        </el-form-item>
+        <template v-for="(item, index) in curData.transfer_scene_report_infos" :key="index">
+          <el-form-item :label="item" :prop="`infos[${item}]`"
+                        :rules="[{ required: true, message: `请输入${item}`, trigger: 'blur' }]">
+            <el-input v-model.trim="formData.infos[item]" maxlength="40" class="!w-[300px]"/>
+          </el-form-item>
+        </template>
+      </el-form>
+      <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="cancel">{{ t('cancel') }}</el-button>
-                    <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                    <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                        t('confirm')
+                      }}</el-button>
                 </span>
-            </template>
-        </el-dialog>
-    </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, ref } from 'vue'
-import { t } from '@/lang'
-import { getTransferScene, setSceneId, setTradeScene } from '@/app/api/pay'
-import { cloneDeep } from 'lodash-es'
-import { FormInstance } from 'element-plus'
+import {nextTick, ref} from 'vue'
+import {t} from '@/lang'
+import {getTransferScene, setSceneId, setTradeScene} from '@/app/api/pay'
+import {cloneDeep} from 'lodash-es'
+import {FormInstance} from 'element-plus'
 
 const screne = ref<any>({})
 const loading = ref(false)
 const getTransferSceneFn = () => {
-    getTransferScene().then(res => {
-        screne.value = res.data
-        for (const key in screne.value) {
-            screne.value[key].disabled = true
-        }
-    })
+  getTransferScene().then(res => {
+    screne.value = res.data
+    for (const key in screne.value) {
+      screne.value[key].disabled = true
+      screne.value[key].error = false
+    }
+  })
 }
 getTransferSceneFn()
 
-// 更改场景值
+// 更改场景值（最终修复版）
 const handleInput = (e: any, key: any, data: any) => {
-    if (e.target.value) {
-        setSceneId({
-            scene: key,
-            scene_id: e.target.value
-        }).then(() => {
-            data.disabled = true
-            getTransferSceneFn()
-        })
-    } else {
-        data.disabled = true
-    }
-}
-const inputRefs = ref<any>({})
-const handleDisabled = (data: any, key: any) => {
-    data.disabled = false
-    nextTick(() => {
-        inputRefs.value[key].focus()
+  const val = e.target.value?.trim() || ''
+  const originalVal = originalValues.value[key] || ''
+
+  // 有值 → 清空：必须提交接口置空
+  if (val === '' && originalVal !== '') {
+    data.error = false
+    setSceneId({
+      scene: key,
+      scene_id: ''
+    }).then(() => {
+      data.disabled = true
+      getTransferSceneFn()
     })
+    return
+  }
+
+  // 本来就空：不提交
+  if (val === '' && originalVal === '') {
+    data.error = false
+    data.disabled = true
+    return
+  }
+
+  // 有值但长度不够：提示，不提交
+  if (val.length < 4) {
+    data.error = true
+    return
+  }
+
+  // 合法 4-5 位：提交
+  if (val.length >= 4 && val.length <= 5) {
+    data.error = false
+    setSceneId({
+      scene: key,
+      scene_id: val
+    }).then(() => {
+      data.disabled = true
+      getTransferSceneFn()
+    })
+  }
 }
+
+const inputRefs = ref<any>({})
+const originalValues = ref<any>({})
+const handleDisabled = (data: any, key: any) => {
+  originalValues.value[key] = data.scene_id
+  data.disabled = false
+  data.error = false
+  nextTick(() => {
+    inputRefs.value[key]?.focus()
+  })
+}
+
 const showDialog = ref(false)
 const curData = ref<any>({})
 const formData = ref({
-    type: '',
-    scene: '',
-    perception: '',
-    infos: {}
+  type: '',
+  scene: '',
+  perception: '',
+  infos: {}
 })
 const configFn = (data: any, subData: any, type: any) => {
-    curData.value = cloneDeep(data)
-    formData.value.type = type
-    formData.value.scene = subData.scene
-    formData.value.perception = subData.perception
-    formData.value.infos = cloneDeep(subData.infos)
-    showDialog.value = true
+  curData.value = cloneDeep(data)
+  formData.value.type = type
+  formData.value.scene = subData.scene
+  formData.value.perception = subData.perception
+  formData.value.infos = cloneDeep(subData.infos)
+  showDialog.value = true
 }
 const formRef = ref<FormInstance>()
 
-/**
- * 确认
- * @param formEl
- */
 const confirm = async (formEl: FormInstance | undefined) => {
-    if (loading.value || !formEl) return
-    await formEl.validate(async (valid) => {
-        if (valid) {
-            loading.value = true
-            setTradeScene(formData.value).then(() => {
-                loading.value = false
-                showDialog.value = false
-                getTransferSceneFn()
-            }).catch(() => {
-                loading.value = false
-            })
-        }
-    })
+  if (loading.value || !formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      loading.value = true
+      setTradeScene(formData.value).then(() => {
+        loading.value = false
+        showDialog.value = false
+        getTransferSceneFn()
+      }).catch(() => {
+        loading.value = false
+      })
+    }
+  })
 }
 
 const cancel = () => {
-    showDialog.value = false
+  showDialog.value = false
 }
 </script>
 
 <style lang="scss" scoped>
 .table-item-border {
-    @apply border-b border-[var(--el-border-color)];
+  @apply border-b border-[var(--el-border-color)];
 }
 </style>
\ No newline at end of file
diff --git a/admin/src/app/views/tools/attachment.vue b/admin/src/app/views/tools/attachment.vue
index 19d55b78b..ce2520759 100644
--- a/admin/src/app/views/tools/attachment.vue
+++ b/admin/src/app/views/tools/attachment.vue
@@ -1,18 +1,18 @@
 <template>
-  <div class="main-container attachment-container">
-    <el-card class="box-card !border-none full-container" shadow="never">
+    <div class="main-container attachment-container">
+        <el-card class="box-card !border-none full-container" shadow="never">
 
-      <div class="flex justify-between items-center mb-[20px]">
-        <span class="text-page-title">{{ pageName }}</span>
-      </div>
+            <div class="flex justify-between items-center mb-[20px]">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
 
-      <el-tabs v-model="type" tab-position="top">
-        <el-tab-pane :label="t(tab)" v-for="(tab, index) in attachmentType" :name="tab" :key="index">
-          <attachment scene="attachment" :type="tab" />
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-  </div>
+            <el-tabs v-model="type" tab-position="top">
+                <el-tab-pane :label="t(tab)" v-for="(tab, index) in attachmentType" :name="tab" :key="index">
+                    <attachment scene="attachment" :type="tab" />
+                </el-tab-pane>
+            </el-tabs>
+        </el-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
@@ -30,46 +30,46 @@ const type = ref(attachmentType[0])
 
 <style lang="scss">
 .attachment-container {
-  overflow: hidden;
-  min-height: calc(100vh - 94px);
-  background-color: var(--el-bg-color-overlay);
+    overflow: hidden;
+    min-height: calc(100vh - 94px);
+    background-color: var(--el-bg-color-overlay);
 
-  .full-container {
-    height: calc(100vh - 100px);
-  }
-
-  .el-card__body {
-    height: 100%;
-  }
-
-  .el-tabs {
-    display: flex;
-    flex-direction:  column;
-    height: calc(100% - 40px);
-  }
-
-  .el-tabs__content {
-    flex: 1;
-
-    .el-tab-pane {
-      height: 100%;
-    }
-  }
-
-  .el-tabs__nav-wrap::after {
-    height: 1px;
-  }
-
-  .main-wrap {
-    border: none;
-
-    .group-wrap {
-      padding: 0 15px 0 0;
+    .full-container {
+        height: calc(100vh - 100px);
     }
 
-    .attachment-list-wrap {
-      padding: 0 0 0 15px;
+    .el-card__body {
+        height: 100%;
+    }
+
+    .el-tabs {
+        display: flex;
+        flex-direction:  column;
+        height: calc(100% - 40px);
+    }
+
+    .el-tabs__content {
+        flex: 1;
+
+        .el-tab-pane {
+            height: 100%;
+        }
+    }
+
+    .el-tabs__nav-wrap::after {
+        height: 1px;
+    }
+
+    .main-wrap {
+        border: none;
+
+        .group-wrap {
+            padding: 0 15px 0 0;
+        }
+
+        .attachment-list-wrap {
+            padding: 0 0 0 15px;
+        }
     }
-  }
 }
 </style>
diff --git a/admin/src/components/map-selector/index.vue b/admin/src/components/map-selector/index.vue
new file mode 100644
index 000000000..17fc66bb5
--- /dev/null
+++ b/admin/src/components/map-selector/index.vue
@@ -0,0 +1,512 @@
+<template>
+    <div :id="containerId" :class="containerClass" :style="containerStyle" v-loading="loading"></div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, watch, nextTick, onBeforeUnmount } from 'vue'
+import { ElMessage } from 'element-plus'
+import { t } from '@/lang'
+import { getMap } from '@/app/api/sys'
+
+import {
+    createMarker,
+    createCircle,
+    createPolygon,
+    deleteGeometry,
+    selectGeometry,
+    latLngToAddress
+} from '@/utils/qqmap'
+
+// 天地图工具
+import {
+    createCircle as tdCreateCircle,
+    createPolygon as tdCreatePolygon,
+    deleteGeometry as tdDeleteGeometry,
+    selectGeometry as tdSelectGeometry,
+    clearAllGeometry,
+    latLngToAddress as tiandituLatLngToAddress
+} from '@/utils/tianditu'
+
+const MAP_INIT_DELAY = 500
+const MAP_SEARCH_TIMEOUT = 5000
+const MAP_SEARCH_INTERVAL = 100
+const MAP_SEARCH_MAX_ATTEMPTS = 50
+
+interface MapInstance {
+    destroy?: () => void
+    clearOverLays?: () => void
+    on?: (event: string, callback: Function) => void
+    addControl?: (control: any) => void
+    addOverLay?: (overlay: any) => void
+    removeOverLay?: (overlay: any) => void
+    centerAndZoom?: (center: any, zoom: number) => void
+    setZoom?: (zoom: number) => void
+    setCenter?: (center: any) => void
+    addEventListener?: (event: string, callback: Function) => void
+}
+
+interface Props {
+    containerId?: string
+    containerClass?: string
+    containerStyle?: string
+    longitude?: string | number
+    latitude?: string | number
+    zoom?: number
+    selectedKey?: string
+    disabledClickMarker?: any // 是否禁止点击事件添加标注
+}
+
+interface Emits {
+    (e: 'update:longitude', value: string): void
+    (e: 'update:latitude', value: string): void
+    (e: 'locationChange', data: { lat: number, lng: number, address: any }): void
+    (e: 'areaChange', data: { key: string, type: 'circle' | 'polygon', path: any }): void
+    (e: 'selectChange', key: string): void
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    containerId: 'map-container',
+    containerClass: 'w-[800px] h-[500px] relative border border-gray-300',
+    containerStyle: '',
+    longitude: 116.397463,
+    latitude: 39.909187,
+    zoom: 14,
+    selectedKey: '',
+    disabledClickMarker: false
+})
+
+const emit = defineEmits<Emits>()
+
+const loading = ref(true)
+const mapKey = ref('')
+const mapType = ref<'tencent' | 'tianditu'>('tianditu')
+let map: MapInstance | null = null
+let marker: any = null
+const overlays = ref<any[]>([])
+
+// 获取地图配置
+const getMapConfigData = () => {
+    return getMap({
+        need_encrypt: false
+    }).then((res: any) => {
+        mapType.value = res.data.map_type || 'tianditu'
+        mapKey.value = mapType.value === 'tianditu' ? res.data.tianditu_map_web_key : res.data.key
+    }).catch((error) => {
+        loading.value = false
+        ElMessage.error(t('获取地图配置失败'))
+    })
+}
+
+// 初始化腾讯地图
+const initTencentMap = () => {
+    const mapScript = document.createElement('script')
+    mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + mapKey.value
+    document.body.appendChild(mapScript)
+
+    mapScript.onload = () => {
+        setTimeout(() => {
+            const TMap = (window as any).TMap
+            if (TMap) {
+                const lng = props.longitude ? Number(props.longitude) : 116.397463
+                const lat = props.latitude ? Number(props.latitude) : 39.909187
+                const center = new TMap.LatLng(lat, lng)
+                map = new TMap.Map(props.containerId, { center, zoom: props.zoom })
+                map.on('tilesloaded', () => loading.value = false)
+
+                marker = createMarker(map)
+                if(!props.disabledClickMarker) {
+                    map.on('click', (evt: any) => {
+                        const ll = evt?.latLng
+                        if (!ll) return
+                        const lat = typeof ll.getLat === 'function' ? ll.getLat() : ll.lat
+                        const lng = typeof ll.getLng === 'function' ? ll.getLng() : ll.lng
+                        if (lat == null || lng == null || Number.isNaN(lat) || Number.isNaN(lng)) return
+
+                        const newCenter = new TMap.LatLng(lat, lng)
+                        map.setZoom(16)
+                        map.setCenter(newCenter)
+                        marker.updateGeometries({ id: 'center', position: newCenter })
+                        nextTick(() => {
+                            handleLocationChange(lat, lng)
+                        })
+                    })
+                }
+
+                if (props.latitude && props.longitude) {
+                    handleLocationChange(lat, lng)
+                }
+            } else {
+                loading.value = false
+                ElMessage.error(t('腾讯地图加载失败'))
+            }
+        }, MAP_INIT_DELAY)
+    }
+
+    mapScript.onerror = () => {
+        loading.value = false
+        ElMessage.error(t('腾讯地图脚本加载失败'))
+    }
+}
+
+// 初始化天地图
+const initTiandituMap = () => {
+    const mapScript = document.createElement('script')
+    mapScript.src = 'https://api.tianditu.gov.cn/api?v=4.0&tk=' + mapKey.value
+    document.body.appendChild(mapScript)
+
+    mapScript.onload = () => {
+        setTimeout(() => {
+            const T = (window as any).T
+            if (T) {
+                const lng = props.longitude ? Number(props.longitude) : 116.397463
+                const lat = props.latitude ? Number(props.latitude) : 39.909187
+                map = new T.Map(props.containerId)
+                map.centerAndZoom(new T.LngLat(lng, lat), props.zoom)
+
+                const ctrl = new T.Control.Zoom()
+                map.addControl(ctrl)
+
+                marker = new T.Marker(new T.LngLat(lng, lat))
+                map.addOverLay(marker)
+
+                loading.value = false
+
+                if(!props.disabledClickMarker) {
+                    map.addEventListener('click', (evt: any) => {
+                        const lngLat = evt.lnglat
+                        if (!lngLat) return
+                        const lat = lngLat.lat
+                        const lng = lngLat.lng
+                        if (lat == null || lng == null || Number.isNaN(lat) || Number.isNaN(lng)) return
+
+                        map.removeOverLay(marker)
+
+                        marker = new T.Marker(new T.LngLat(lng, lat))
+                        map.addOverLay(marker)
+
+                        map.centerAndZoom(new T.LngLat(lng, lat), 16)
+
+                        nextTick(() => {
+                            handleLocationChange(lat, lng)
+                        })
+                    })
+                }
+
+                if (props.latitude && props.longitude) {
+                    handleLocationChange(lat, lng)
+                }
+            } else {
+                loading.value = false
+                ElMessage.error(t('天地图加载失败'))
+            }
+        }, MAP_INIT_DELAY)
+    }
+
+    mapScript.onerror = () => {
+        loading.value = false
+        ElMessage.error(t('天地图加载失败，请检查密钥配置'))
+    }
+}
+
+// 初始化地图
+const initMap = () => {
+    if (!mapKey.value) {
+        loading.value = false
+        return
+    }
+
+    // 防止重复初始化
+    if (map) {
+        return
+    }
+
+    if (mapType.value === 'tencent') {
+        initTencentMap()
+    } else if (mapType.value === 'tianditu') {
+        initTiandituMap()
+    }
+}
+
+// 处理位置变化
+const handleLocationChange = (lat: number, lng: number) => {
+    emit('update:longitude', String(lng))
+    emit('update:latitude', String(lat))
+
+    if (mapType.value === 'tencent') {
+        latLngToAddress({ mapKey: mapKey.value, lat, lng }).then(({ message, result }) => {
+            if (message == 'query ok' || message == 'Success') {
+                emit('locationChange', { lat, lng, address: result })
+            }
+        })
+    } else if (mapType.value === 'tianditu') {
+        tiandituLatLngToAddress({ mapKey: mapKey.value, lat, lng }).then((addressData: any) => {
+            emit('locationChange', { lat, lng, address: addressData })
+        }).catch((error: any) => {
+            ElMessage.error(error.message || t('地址解析失败'))
+        })
+    }
+}
+
+// 更新地图位置（供外部调用）
+const updateLocation = (lat: number, lng: number) => {
+    if (!map || !marker) return
+
+    if (mapType.value === 'tencent') {
+        const TMap = (window as any).TMap
+        if (!TMap) return
+        const newCenter = new TMap.LatLng(lat, lng)
+        map.setZoom(16)
+        map.setCenter(newCenter)
+        marker.updateGeometries({ id: 'center', position: newCenter })
+    } else if (mapType.value === 'tianditu') {
+        const T = (window as any).T
+        if (!T) return
+        const newCenter = new T.LngLat(lng, lat)
+
+        // 移除旧标记
+        map.removeOverLay(marker)
+
+        // 创建新标记
+        marker = new T.Marker(newCenter)
+        map.addOverLay(marker)
+
+        map.centerAndZoom(newCenter, 16)
+    }
+}
+
+// 地址搜索（供外部调用）
+const searchAddress = (address: string): Promise<{ lat: number, lng: number }> => {
+    return new Promise((resolve, reject) => {
+        if (!mapKey.value) {
+            reject(new Error(t('地图配置未加载')))
+            return
+        }
+
+        const waitForMap = () => {
+            return new Promise<void>((resolveWait, rejectWait) => {
+                if (map) {
+                    resolveWait()
+                    return
+                }
+
+                let attempts = 0
+                const checkInterval = setInterval(() => {
+                    attempts++
+                    if (map) {
+                        clearInterval(checkInterval)
+                        resolveWait()
+                    } else if (attempts > MAP_SEARCH_MAX_ATTEMPTS) {
+                        clearInterval(checkInterval)
+                        rejectWait(new Error(t('地图初始化超时')))
+                    }
+                }, MAP_SEARCH_INTERVAL)
+            })
+        }
+
+        waitForMap().then(() => {
+            if (mapType.value === 'tencent') {
+                const TMap = (window as any).TMap
+                if (!TMap?.service) {
+                    reject(new Error(t('腾讯地图服务未加载')))
+                    return
+                }
+                const geocoder = new TMap.service.Geocoder({ key: mapKey.value })
+                geocoder.getLocation({ address }).then((result: any) => {
+                    if (result.status === 0 && result.result?.location) {
+                        const location = result.result.location
+                        const lat = Number(location.lat)
+                        const lng = Number(location.lng)
+                        updateLocation(lat, lng)
+                        resolve({ lat, lng })
+                    } else {
+                        reject(new Error(result.message || t('未找到该地址')))
+                    }
+                }).catch((error) => {
+                    reject(error)
+                })
+            } else if (mapType.value === 'tianditu') {
+                const T = (window as any).T
+                if (!T) {
+                    reject(new Error(t('天地图服务未加载')))
+                    return
+                }
+                const geocoder = new T.Geocoder()
+                geocoder.getPoint(address, (result: any) => {
+                    if (result && result.status === '0' && result.location) {
+                        const lat = result.location.lat
+                        const lng = result.location.lon || result.location.lng
+                        if (lat && lng) {
+                            updateLocation(lat, lng)
+                            resolve({ lat, lng })
+                        } else {
+                            reject(new Error(t('坐标解析失败')))
+                        }
+                    } else {
+                        reject(new Error(result?.msg || t('未找到该地址')))
+                    }
+                })
+            }
+        }).catch(reject)
+    })
+}
+// 添加圆
+const addCircle = (center?: { lat: number; lng: number }, radius = 1000, options?: any) => {
+    if (!map) return null
+    const key = options?.key || `circle_${Date.now()}`
+    let circle = null
+
+    // 创建geometriesData对象
+    const geometriesData = { key, center, radius, ...options }
+
+    if (mapType.value === 'tencent') {
+        createCircle(map, geometriesData, (selectedKey) => {
+            // 触发selectChange事件
+            emit('selectChange', selectedKey)
+        })
+        // 腾讯地图的createCircle不返回值，创建一个包含key的对象添加到overlays
+        circle = { key, geometriesData }
+    } else {
+        circle = tdCreateCircle(map, geometriesData, (data) => {
+            // 触发areaChange事件，确保path数据干净，不包含循环引用
+            emit('areaChange', {
+                key: data.key,
+                type: 'circle',
+                path: {
+                    key: data.key,
+                    center: data.center,
+                    radius: data.radius
+                }
+            })
+        }, (selectedKey) => {
+            // 触发selectChange事件
+            emit('selectChange', selectedKey)
+        })
+        // 为天地图添加geometriesData引用
+        if (circle) {
+            circle.geometriesData = geometriesData
+        }
+    }
+
+    if (circle) overlays.value.push(circle)
+    return circle
+}
+
+// 添加多边形
+const addPolygon = (paths: any[], options?: any) => {
+    if (!map) return null
+    const key = options?.key || `poly_${Date.now()}`
+    let poly = null
+
+    // 创建geometriesData对象
+    const geometriesData = { key, paths, ...options }
+
+    if (mapType.value === 'tencent') {
+        createPolygon(map, geometriesData, (selectedKey) => {
+            // 触发selectChange事件
+            emit('selectChange', selectedKey)
+        })
+        // 腾讯地图的createPolygon不返回值，创建一个包含key的对象添加到overlays
+        poly = { key, geometriesData }
+    } else {
+        poly = tdCreatePolygon(map, geometriesData, (data) => {
+            // 触发areaChange事件，确保path数据干净，不包含循环引用
+            emit('areaChange', {
+                key: data.key,
+                type: 'polygon',
+                path: {
+                    key: data.key,
+                    paths: data.paths.map((point: any) => ({
+                        lat: point.lat,
+                        lng: point.lng
+                    }))
+                }
+            })
+        }, (selectedKey) => {
+            // 触发selectChange事件
+            emit('selectChange', selectedKey)
+        })
+        // 为天地图添加geometriesData引用
+        if (poly) {
+            poly.geometriesData = geometriesData
+        }
+    }
+
+    if (poly) overlays.value.push(poly)
+    return poly
+}
+
+// 删除覆盖物
+const removeOverlay = (overlay: any) => {
+    if (!map || !overlay) return
+    const key = overlay.key || ''
+    mapType.value === 'tencent' ? deleteGeometry(key) : tdDeleteGeometry(map, key)
+
+    // 通过key查找并删除覆盖物
+    const idx = overlays.value.findIndex(item => item.key === key)
+    if (idx > -1) overlays.value.splice(idx, 1)
+}
+
+// 清空所有覆盖物
+const clearOverlays = () => {
+    if (!map) return
+    mapType.value === 'tencent'
+        ? overlays.value.forEach(o => deleteGeometry(o.key))
+        : clearAllGeometry(map)
+    overlays.value = []
+}
+
+const selectGeo = (key: string) => {
+    mapType.value === 'tencent' ? selectGeometry(key) : tdSelectGeometry(key)
+}
+
+// 监听选中key变化
+watch(() => props.selectedKey, (newKey) => {
+    if (newKey) {
+        selectGeo(newKey)
+    }
+})
+
+// 监听地图key和类型变化
+watch([mapKey, mapType], ([newKey, newType]) => {
+    if (newKey && newType) {
+        initMap()
+    }
+})
+
+onMounted(() => {
+    getMapConfigData()
+})
+
+onBeforeUnmount(() => {
+    if (map) {
+        try {
+            if (mapType.value === 'tencent') {
+                map.destroy && map.destroy()
+            } else if (mapType.value === 'tianditu') {
+                clearOverlays()
+                map.clearOverLays && map.clearOverLays()
+            }
+        } catch (e) {
+        }
+        map = null
+        marker = null
+        overlays.value = []
+    }
+})
+
+defineExpose({
+    updateLocation,
+    searchAddress,
+    addCircle,
+    addPolygon,
+    removeOverlay,
+    clearOverlays,
+    selectGeometry: selectGeo,
+    getMap: () => map,
+    getMarker: () => marker,
+    handleLocationChange
+})
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/admin/src/layout/lightside/components/aside/index.vue b/admin/src/layout/lightside/components/aside/index.vue
index b4759e22d..872e26817 100644
--- a/admin/src/layout/lightside/components/aside/index.vue
+++ b/admin/src/layout/lightside/components/aside/index.vue
@@ -1,37 +1,37 @@
 <template>
-  <div :class="['layout-aside ease-in duration-200 flex box-border', { 'bright': !dark}]">
-    <div class="flex flex-col border-0 border-r-[1px] border-solid border-[var(--el-color-info-light-8)] box-border overflow-hidden">
-      <div :class="['w-[150px] one-menu hide-scrollbar', { 'expanded': systemStore.menuIsCollapse  }]" >
-        <div class="flex flex-col items-center">
-          <template v-for="(item, index) in oneMenuData">
-            <div v-if="item.meta.show" :title="systemStore.menuIsCollapse ? item.meta.title : item.meta.short_title" class="menu-item my-[2px] p-2 flex w-full box-border cursor-pointer relative" :class="{'is-active':oneMenuActive===item.original_name,'hover-left': systemStore.menuIsCollapse, 'vertical': !systemStore.menuIsCollapse , 'horizontal': systemStore.menuIsCollapse }" :style="{ height: (systemStore.menuIsCollapse ) ? '40px' : '55px' }" @click="router.push({ name: item.name })">
-              <div class="w-[20px] h-[20px] flex items-center justify-center menu-icon" :class="{'is-active':oneMenuActive===item.original_name}">
-                <template v-if="item.meta.icon">
-                  <el-image class="w-[20px] h-[20px] overflow-hidden" :src="item.meta.icon" fit="fill" v-if="isUrl(item.meta.icon)"/>
-                  <icon :name="item.meta.icon" size="20px" color="#1D1F3A" v-else />
-                </template>
-                <icon v-else :name="'iconfont iconshezhi1'" color="#1D1F3A" />
-              </div>
-              <div v-if="systemStore.menuIsCollapse" class="text-left text-[14px] mt-[3px] w-[75px] using-hidden ml-[10px]">{{ item.meta.title || item.meta.short_title }}</div>
-              <div v-else class="text-center text-[12px] using-hidden mt-1">{{ item.meta.short_title || item.meta.title }}</div>
+    <div :class="['layout-aside ease-in duration-200 flex box-border', { 'bright': !dark}]">
+        <div class="flex flex-col border-0 border-r-[1px] border-solid border-[var(--el-color-info-light-8)] box-border overflow-hidden">
+            <div :class="['w-[150px] one-menu hide-scrollbar', { 'expanded': systemStore.menuIsCollapse  }]" >
+                <div class="flex flex-col items-center">
+                    <template v-for="(item, index) in oneMenuData">
+                        <div v-if="item.meta.show" :title="systemStore.menuIsCollapse ? item.meta.title : item.meta.short_title" class="menu-item my-[2px] p-2 flex w-full box-border cursor-pointer relative" :class="{'is-active':oneMenuActive===item.original_name,'hover-left': systemStore.menuIsCollapse, 'vertical': !systemStore.menuIsCollapse , 'horizontal': systemStore.menuIsCollapse }" :style="{ height: (systemStore.menuIsCollapse ) ? '40px' : '55px' }" @click="router.push({ name: item.name })">
+                            <div class="w-[20px] h-[20px] flex items-center justify-center menu-icon" :class="{'is-active':oneMenuActive===item.original_name}">
+                                <template v-if="item.meta.icon">
+                                    <el-image class="w-[20px] h-[20px] overflow-hidden" :src="item.meta.icon" fit="fill" v-if="isUrl(item.meta.icon)"/>
+                                    <icon :name="item.meta.icon" size="20px" color="#1D1F3A" v-else />
+                                </template>
+                                <icon v-else :name="'iconfont iconshezhi1'" color="#1D1F3A" />
+                            </div>
+                            <div v-if="systemStore.menuIsCollapse" class="text-left text-[14px] mt-[3px] w-[75px] using-hidden ml-[10px]">{{ item.meta.title || item.meta.short_title }}</div> 
+                            <div v-else class="text-center text-[12px] using-hidden mt-1">{{ item.meta.short_title || item.meta.title }}</div>
+                        </div>
+                    </template>
+                </div>
             </div>
-          </template>
+
+        </div>
+        <div class="flex flex-col two-menu w-[185px] " v-if="twoMenuData.length">
+            <el-scrollbar class="flex-1" >
+                <el-menu :default-active="route.name" :router="true" class="aside-menu">
+                    <menu-item v-for="(route, index) in twoMenuData" :routes="route" :key="index" :isNewVersion="isNewVersion" />
+                </el-menu>
+                <div class="h-[48px]"></div>
+            </el-scrollbar>
         </div>
-      </div>
 
     </div>
-    <div class="flex flex-col two-menu w-[185px] " v-if="twoMenuData.length">
-      <el-scrollbar class="flex-1" >
-        <el-menu :default-active="route.name" :router="true" class="aside-menu">
-          <menu-item v-for="(route, index) in twoMenuData" :routes="route" :key="index" :isNewVersion="isNewVersion" />
-        </el-menu>
-        <div class="h-[48px]"></div>
-      </el-scrollbar>
-    </div>
-
-  </div>
 </template>
-
+ 
 <script lang="ts" setup>
 import { watch, ref, computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -53,203 +53,203 @@ const router = useRouter()
 const addonRouters: Record<string, any> = {}
 const addonIndexRoute = userStore.addonIndexRoute
 const dark = computed(() => {
-  return systemStore.dark
+    return systemStore.dark
 })
 
 const twoMenuData = ref<Record<string, any>[]>([])
 const oneMenuData = ref<Record<string, any>[]>([])
 routers.forEach(item => {
-  item.original_name = item.name
-  if (item.meta.addon == '') {
-    if (item.meta.attr == '') {
-      if (item.children && item.children.length) {
-        item.name = findFirstValidRoute(item.children)
-      }
-      oneMenuData.value.push(item)
-    }
-  } else if (item.meta.addon != '' && siteInfo?.apps.length <= 1 && siteInfo?.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 == '') {
+            if (item.children && item.children.length) {
+                item.name = findFirstValidRoute(item.children)
+            }
+            oneMenuData.value.push(item)
+        }
+    } else if (item.meta.addon != '' && siteInfo?.apps.length <= 1 && siteInfo?.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)
+                }
+            })
+            oneMenuData.value.unshift(...item.children)
+        } else {
+            oneMenuData.value.unshift(item)
         }
-      })
-      oneMenuData.value.unshift(...item.children)
     } else {
-      oneMenuData.value.unshift(item)
+        addonRouters[item.meta.addon] = item
     }
-  } else {
-    addonRouters[item.meta.addon] = item
-  }
 
-  // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
-  oneMenuData.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
-    }
-  })
+    // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
+    oneMenuData.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 (siteInfo?.apps.length > 1) {
-  const routers:Record<string, any>[] = []
-  siteInfo?.apps.forEach((item: Record<string, any>) => {
-    if (addonRouters[item.key]) {
-      addonRouters[item.key].name = addonIndexRoute[item.key]
-      routers.push(addonRouters[item.key])
-    }
-  })
-  oneMenuData.value.unshift(...routers)
+    const routers:Record<string, any>[] = []
+    siteInfo?.apps.forEach((item: Record<string, any>) => {
+        if (addonRouters[item.key]) {
+            addonRouters[item.key].name = addonIndexRoute[item.key]
+            routers.push(addonRouters[item.key])
+        }
+    })
+    oneMenuData.value.unshift(...routers)
 
-  // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
-  oneMenuData.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
-    }
-  })
+    // 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
+    oneMenuData.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
+        }
+    })
 }
 
 const oneMenuActive = ref(route.matched[1].name)
 // 从 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 [];
 };
 watch(route, () => {
-  if (route.meta.attr != '') {
-    oneMenuActive.value = route.matched[1].name
-    twoMenuData.value = route.matched[1].children ?? []
-  } else {
-    // 多应用
-    if (siteInfo?.apps.length > 1) {
-      twoMenuData.value = route.matched[2].children
-      oneMenuActive.value = route.matched[2].name
+    if (route.meta.attr != '') {
+        oneMenuActive.value = route.matched[1].name
+        twoMenuData.value = route.matched[1].children ?? []
     } else {
-      // 单应用
-      const oneMenu = route.matched[2]
-      if (oneMenu.meta.addon == '') {
-        oneMenuActive.value = route.matched[2].name
-        twoMenuData.value = route.matched[2].children ?? []
-      } else {
-        if (oneMenu.meta.addon == siteInfo?.apps[0].key) {
-          oneMenuActive.value = route.matched[3].name
-          twoMenuData.value = route.matched[3].children ?? []
+        // 多应用
+        if (siteInfo?.apps.length > 1) {
+            twoMenuData.value = route.matched[2].children
+            oneMenuActive.value = route.matched[2].name
         } else {
-          oneMenuActive.value = route.matched[2].name
-          twoMenuData.value = route.matched[2].children ?? []
+            // 单应用
+            const oneMenu = route.matched[2]
+            if (oneMenu.meta.addon == '') {
+                oneMenuActive.value = route.matched[2].name
+                twoMenuData.value = route.matched[2].children ?? []
+            } else {
+                if (oneMenu.meta.addon == siteInfo?.apps[0].key) {
+                    oneMenuActive.value = route.matched[3].name
+                    twoMenuData.value = route.matched[3].children ?? []
+                } else {
+                    oneMenuActive.value = route.matched[2].name
+                    twoMenuData.value = route.matched[2].children ?? []
+                }
+            }
         }
-      }
     }
-  }
-  // const addonKeys = storage.get('defaultAppList')
-  // const addonAllKeys = getAddonAllKeys(addonKeys)
-  // twoMenuData.value = twoMenuData.value.filter((child) =>{
-  //     return !child.name || !addonAllKeys.includes(child.name);
-  // })
-  // if(oneMenuActive.value == 'addon'){
-  //     // 处理特殊菜单并插入到 twoMenuData 中（与 addon_list 同级）
-  //     const processedSpecialMenus = handleSpecialMenus();
-  //         if (processedSpecialMenus.length) {
-  //         // 先找到 addon_list 在 twoMenuData 中的索引
-  //         const addonListIndex = twoMenuData.value.findIndex(
-  //             (item) => item.name === 'addon_list'
-  //         );
-  //         if (addonListIndex !== -1) {
-  //             // 将特殊菜单插入到 addon_list 后面（同级）
-  //             twoMenuData.value.splice(
-  //             addonListIndex + 1,
-  //             0,
-  //             ...processedSpecialMenus
-  //             );
-  //         } else {
-  //             // 如果没有 addon_list，直接将特殊菜单添加到 twoMenuData 中
-  //             twoMenuData.value.push(...processedSpecialMenus);
-  //         }
-  //     }
-  // }
+    // const addonKeys = storage.get('defaultAppList')
+    // const addonAllKeys = getAddonAllKeys(addonKeys)
+    // twoMenuData.value = twoMenuData.value.filter((child) =>{
+    //     return !child.name || !addonAllKeys.includes(child.name);
+    // })
+    // if(oneMenuActive.value == 'addon'){
+    //     // 处理特殊菜单并插入到 twoMenuData 中（与 addon_list 同级）
+    //     const processedSpecialMenus = handleSpecialMenus();
+    //         if (processedSpecialMenus.length) {
+    //         // 先找到 addon_list 在 twoMenuData 中的索引
+    //         const addonListIndex = twoMenuData.value.findIndex(
+    //             (item) => item.name === 'addon_list'
+    //         );
+    //         if (addonListIndex !== -1) {
+    //             // 将特殊菜单插入到 addon_list 后面（同级）
+    //             twoMenuData.value.splice(
+    //             addonListIndex + 1,
+    //             0,
+    //             ...processedSpecialMenus
+    //             );
+    //         } else {
+    //             // 如果没有 addon_list，直接将特殊菜单添加到 twoMenuData 中
+    //             twoMenuData.value.push(...processedSpecialMenus);
+    //         }
+    //     }
+    // }
 }, { immediate: true })
 
 const frameworkVersionList = ref([])
 const isNewVersion = computed(() => {
-  if (!newVersion.value || newVersion.value.version_no === version.value) {
-    return false;
-  }
+    if (!newVersion.value || newVersion.value.version_no === version.value) {
+        return false;
+    }
 
-  // 将版本号转为字符串再处理
-  const currentVersionStr = String(version.value);
-  const latestVersionStr = String(newVersion.value.version_no);
-  // 移除点号并转为数字比较
-  const currentVersionNum = parseInt(currentVersionStr.replace(/\./g, ''), 10);
-  const latestVersionNum = parseInt(latestVersionStr.replace(/\./g, ''), 10);
-  return latestVersionNum > currentVersionNum;
+    // 将版本号转为字符串再处理
+    const currentVersionStr = String(version.value);
+    const latestVersionStr = String(newVersion.value.version_no);
+    // 移除点号并转为数字比较
+    const currentVersionNum = parseInt(currentVersionStr.replace(/\./g, ''), 10);
+    const latestVersionNum = parseInt(latestVersionStr.replace(/\./g, ''), 10);
+    return latestVersionNum > currentVersionNum;
 })
 
 const getFrameworkVersionListFn = () => {
-  getFrameworkVersionList().then(({ data }) => {
-    frameworkVersionList.value = data
-  }).catch(() => {
-  })
+    getFrameworkVersionList().then(({ data }) => {
+        frameworkVersionList.value = data
+    }).catch(() => {
+    })
 }
 getFrameworkVersionListFn()
 
 const newVersion: any = computed(() => {
-  return frameworkVersionList.value.length ? frameworkVersionList.value[0] : null
+    return frameworkVersionList.value.length ? frameworkVersionList.value[0] : null
 })
 const version = ref('')
 const getVersionsInfo = () => {
-  getVersions().then((res) => {
-    version.value = res.data.version.version
-  })
+    getVersions().then((res) => {
+        version.value = res.data.version.version
+    })
 }
 getVersionsInfo()
 
@@ -257,148 +257,148 @@ getVersionsInfo()
 
 <style lang="scss">
 .one-menu{
-  padding: 20px 10px 10px;
-  width: 78px;
-  overflow-y: auto;
-  // transition: width 0.1s ease-out;
-  &.expanded {
-    width: 185px;
-    padding: 18px 15px 15px;
-  }
-  .menu-item{
-    border-radius: 2px;
-    justify-content: center;
-    &.vertical {
-      width: 55px;
-      height: 55px;
-      flex-direction: column;
-      align-items: center;
+    padding: 20px 10px 10px;
+    width: 78px;
+    overflow-y: auto;
+    // transition: width 0.1s ease-out;
+    &.expanded {
+        width: 185px;
+        padding: 18px 15px 15px;
     }
+        .menu-item{
+            border-radius: 2px;
+            justify-content: center;
+            &.vertical {
+                width: 55px;
+                height: 55px;
+                flex-direction: column;
+                align-items: center;
+            }
 
-    &.horizontal {
-      flex-direction: row;
-      align-items: center;
-    }
-    .menu-icon {
-      // background-color: transparent; /* 默认无背景色 */
-      color: #1D1F3A;
-    }
+            &.horizontal {
+                flex-direction: row;
+                align-items: center;
+            }
+            .menu-icon {
+                // background-color: transparent; /* 默认无背景色 */
+                color: #1D1F3A;
+            }
 
-    // .menu-icon.is-active {
-    // background-color: var(--el-color-primary); /* 选中时背景色 */
-    // color: white; /* 选中时图标颜色变白 */
-    // border-radius: 4px; /* 可选：使图标背景为圆形 */
-    // }
+            // .menu-icon.is-active {
+                // background-color: var(--el-color-primary); /* 选中时背景色 */
+                // color: white; /* 选中时图标颜色变白 */
+                // border-radius: 4px; /* 可选：使图标背景为圆形 */
+            // }
 
-    &:hover{
-      background-color: #EAEBF0 !important;
-      border-radius: 6px;
-      // background-color: var(--el-color-primary-light-9) !important;
-      // color:var(--el-color-primary);
+            &:hover{
+                background-color: #EAEBF0 !important;
+                border-radius: 6px;
+                // background-color: var(--el-color-primary-light-9) !important;
+                // color:var(--el-color-primary);
+            }
+            &.is-active{
+                background-color: #EAEBF0 !important;
+                border-radius: 6px;
+                // background-color: var(--el-color-primary-light-9) !important;
+                // border: none;
+                // color:var(--el-color-primary);
+            }
+            span{
+                font-size: 14px;
+                margin-left: 8px;
+            }
     }
-    &.is-active{
-      background-color: #EAEBF0 !important;
-      border-radius: 6px;
-      // background-color: var(--el-color-primary-light-9) !important;
-      // border: none;
-      // color:var(--el-color-primary);
+    .menu-item.hover-left {
+        justify-content: flex-start;
+        padding-left: 5px;
     }
-    span{
-      font-size: 14px;
-      margin-left: 8px;
+    &.expanded .menu-item .text-center {
+        opacity: 1;
+    }
+    .el-menu{
+        border: 0;
+    }
+    .el-scrollbar{
+        height: calc(100vh - 65px);
     }
-  }
-  .menu-item.hover-left {
-    justify-content: flex-start;
-    padding-left: 5px;
-  }
-  &.expanded .menu-item .text-center {
-    opacity: 1;
-  }
-  .el-menu{
-    border: 0;
-  }
-  .el-scrollbar{
-    height: calc(100vh - 65px);
-  }
 }
 .two-menu{
-  .aside-menu:not(.el-menu--collapse) {
-    width: 185px;
-    border: 0;
-    padding-top: 15px;
-    .el-menu-item{
-      height: 40px;
-      margin: 4px 15px;
-      padding: 0 8px !important;
-      border-radius: 2px;
-      span{
-        margin-left: 8px;
-        font-size: 14px;
-      }
-      &.is-active{
-        background-color: #EAEBF0 !important;
-        border-radius: 6px;
-        color: inherit;
-        // background-color: var(--el-color-primary-light-9) !important;
-      }
-      &:hover{
-        background-color: #EAEBF0 !important;
-        border-radius: 6px;
-        // background-color: var(--el-color-primary-light-9) !important;
-        // color: var(--el-color-primary);
-      }
+    .aside-menu:not(.el-menu--collapse) {
+        width: 185px;
+        border: 0;
+        padding-top: 15px;
+        .el-menu-item{
+            height: 40px;
+            margin: 4px 15px;
+            padding: 0 8px !important;
+            border-radius: 2px;
+            span{
+                margin-left: 8px;
+                font-size: 14px;
+            }
+            &.is-active{
+                background-color: #EAEBF0 !important;
+                border-radius: 6px;
+                color: inherit;
+                // background-color: var(--el-color-primary-light-9) !important;
+            }
+            &:hover{
+                background-color: #EAEBF0 !important;
+                border-radius: 6px;
+                // background-color: var(--el-color-primary-light-9) !important;
+                // color: var(--el-color-primary);
+            }
+        }
+        .el-sub-menu{
+            width: 185px;
+            margin: 4px 0;
+            // margin-bottom: 8px;
+            .el-sub-menu__title{
+                margin: 0 15px;
+                height: 40px;
+                padding-left: 8px;
+                border-radius: 2px;
+                span{
+                    height: 40px;
+                    display: flex;
+                    align-items: center;
+                    font-size: 14px;
+                }
+                &:hover{
+                    background-color:#EAEBF0 !important;
+                    border-radius: 6px;
+                    // background-color: var(--el-color-primary-light-9) !important;
+                    // color: var(--el-color-primary);
+                }
+                .el-icon.el-sub-menu__icon-arrow{
+                    right: 5px;
+                }
+            }
+            .el-menu-item{
+                padding-left: 25px !important;
+            }
+        }
     }
-    .el-sub-menu{
-      width: 185px;
-      margin: 4px 0;
-      // margin-bottom: 8px;
-      .el-sub-menu__title{
-        margin: 0 15px;
-        height: 40px;
-        padding-left: 8px;
-        border-radius: 2px;
-        span{
-          height: 40px;
-          display: flex;
-          align-items: center;
-          font-size: 14px;
-        }
-        &:hover{
-          background-color:#EAEBF0 !important;
-          border-radius: 6px;
-          // background-color: var(--el-color-primary-light-9) !important;
-          // color: var(--el-color-primary);
-        }
-        .el-icon.el-sub-menu__icon-arrow{
-          right: 5px;
-        }
-      }
-      .el-menu-item{
-        padding-left: 25px !important;
-      }
-    }
-  }
 }
 
 .logo-wrap {
-  padding: 0;
-  display: flex;
-  white-space: nowrap;
-  align-items: center;
+    padding: 0;
+    display: flex;
+    white-space: nowrap;
+    align-items: center;
 
-  .logo {
-    height: 100%;
-    box-sizing: border-box;
-  }
+    .logo {
+        height: 100%;
+        box-sizing: border-box;
+    }
 
-  .logo-title {
-    flex: 1;
-    width: 0;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    font-size: var(--el-font-size-base);
-  }
+    .logo-title {
+        flex: 1;
+        width: 0;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        font-size: var(--el-font-size-base);
+    }
 }
 // :deep(.el-scrollbar__bar){
 //     display: none !important;
@@ -408,15 +408,15 @@ getVersionsInfo()
 // }
 // 隐藏滚动条
 .hide-scrollbar::-webkit-scrollbar {
-  display: none;
-  /* Chrome/Safari/Edge */
+    display: none;
+    /* Chrome/Safari/Edge */
 }
 
 .hide-scrollbar {
-  -ms-overflow-style: none;
-  /* IE/Edge */
-  scrollbar-width: none;
-  /* Firefox */
+    -ms-overflow-style: none;
+    /* IE/Edge */
+    scrollbar-width: none;
+    /* Firefox */
 }
 // .layout-aside .menu-item.is-active{
 //     position: relative;
diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts
index 5302c2076..3a1893b95 100644
--- a/admin/src/utils/common.ts
+++ b/admin/src/utils/common.ts
@@ -9,54 +9,54 @@ import storage from './storage'
  * @param app
  */
 export function useElementIcon(app: App): void {
-    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-        app.component(key, component)
-    }
+	for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+		app.component(key, component)
+	}
 }
 
 /**
  * 设置主题色
  */
 export function setThemeColor(color: string, mode: string = 'light'): void {
-    useCssVar('--el-color-primary', null).value = color
+	useCssVar('--el-color-primary', null).value = color
 
-    const colors: any = {
-        dark: {
-            'light-3': 'shade(20%)',
-            'light-5': 'shade(30%)',
-            'light-7': 'shade(50%)',
-            'light-8': 'shade(60%)',
-            'light-9': 'shade(70%)',
-            'dark-2': 'tint(20%)'
-        },
-        light: {
-            'dark-2': 'shade(20%)',
-            'light-3': 'tint(30%)',
-            'light-5': 'tint(50%)',
-            'light-7': 'tint(70%)',
-            'light-8': 'tint(80%)',
-            'light-9': 'tint(90%)'
-        }
-    }
+	const colors: any = {
+		dark: {
+			'light-3': 'shade(20%)',
+			'light-5': 'shade(30%)',
+			'light-7': 'shade(50%)',
+			'light-8': 'shade(60%)',
+			'light-9': 'shade(70%)',
+			'dark-2': 'tint(20%)'
+		},
+		light: {
+			'dark-2': 'shade(20%)',
+			'light-3': 'tint(30%)',
+			'light-5': 'tint(50%)',
+			'light-7': 'tint(70%)',
+			'light-8': 'tint(80%)',
+			'light-9': 'tint(90%)'
+		}
+	}
 
-    Object.keys(colors[mode]).forEach((key) => {
-        useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${ color } ${ colors[mode][key] })`)
-    })
+	Object.keys(colors[mode]).forEach((key) => {
+		useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${ color } ${ colors[mode][key] })`)
+	})
 }
 
 /**
  * 获取当前访问应用类型
  */
 export function getAppType() {
-    const path = location.pathname.split('/').filter((val) => {
-        return val
-    })
+	const path = location.pathname.split('/').filter((val) => {
+		return val
+	})
 
-    if (!path.length) {
-        return 'admin'
-    } else {
-        return path[0]
-    }
+	if (!path.length) {
+		return 'admin'
+	} else {
+		return path[0]
+	}
 }
 
 /**
@@ -64,8 +64,8 @@ export function getAppType() {
  * @param value
  */
 export function setWindowTitle(value: string = ''): void {
-    const title = useTitle()
-    title.value = value ? value : import.meta.env.VITE_DETAULT_TITLE
+	const title = useTitle()
+	title.value = value ? value : import.meta.env.VITE_DETAULT_TITLE
 }
 
 /**
@@ -73,7 +73,7 @@ export function setWindowTitle(value: string = ''): void {
  * @returns
  */
 export function getToken(): null | string {
-    return storage.get('token')
+	return storage.get('token')
 }
 
 /**
@@ -82,7 +82,7 @@ export function getToken(): null | string {
  * @returns
  */
 export function setToken(token: string): void {
-    storage.set({ key: 'token', data: token })
+	storage.set({ key: 'token', data: token })
 }
 
 /**
@@ -90,7 +90,7 @@ export function setToken(token: string): void {
  * @returns
  */
 export function removeToken(): void {
-    storage.remove('token')
+	storage.remove('token')
 }
 
 /**
@@ -100,16 +100,16 @@ export function removeToken(): void {
  * @returns
  */
 export function debounce(fn: (args?: any) => any, delay: number = 300) {
-    let timer: null | number = null
-    return function (...args) {
-        if (timer != null) {
-            clearTimeout(timer)
-            timer = null
-        }
-        timer = setTimeout(() => {
-            fn.call(this, ...args)
-        }, delay);
-    }
+	let timer: null | number = null
+	return function (...args) {
+		if (timer != null) {
+			clearTimeout(timer)
+			timer = null
+		}
+		timer = setTimeout(() => {
+			fn.call(this, ...args)
+		}, delay);
+	}
 }
 
 /**
@@ -118,7 +118,7 @@ export function debounce(fn: (args?: any) => any, delay: number = 300) {
  * @returns
  */
 export function isUrl(str: string): boolean {
-    return str.indexOf('http://') != -1 || str.indexOf('https://') != -1
+	return str.indexOf('http://') != -1 || str.indexOf('https://') != -1
 }
 
 /**
@@ -127,14 +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 (!path) return ''
 
-    if (path.startsWith('/')) path = path.replace(/^\//, '')
-    if (imgDomain.endsWith('/')) imgDomain = imgDomain.slice(0, -1)
-    
-    return isUrl(path) ? path : `${imgDomain}/${path}`
+	let imgDomain = import.meta.env.VITE_IMG_DOMAIN || location.origin
+
+	if (path.startsWith('/')) path = path.replace(/^\//, '')
+	if (imgDomain.endsWith('/')) imgDomain = imgDomain.slice(0, -1)
+
+	return isUrl(path) ? path : `${imgDomain}/${path}`
 }
 
 /**
@@ -143,7 +143,7 @@ export function img(path: string): string {
  * @returns
  */
 export function assetImg(path: string) {
-    return new URL('@/', import.meta.url) + path
+	return new URL('@/', import.meta.url) + path
 }
 
 /**
@@ -152,15 +152,15 @@ export function assetImg(path: string) {
  * @returns
  */
 export function strByteLength(str: string = ''): number {
-    let len = 0;
-    for (let i = 0; i < str.length; i++) {
-        if (str.charCodeAt(i) > 127 || str.charCodeAt(i) == 94) {
-            len += 2;
-        } else {
-            len++;
-        }
-    }
-    return len;
+	let len = 0;
+	for (let i = 0; i < str.length; i++) {
+		if (str.charCodeAt(i) > 127 || str.charCodeAt(i) == 94) {
+			len += 2;
+		} else {
+			len++;
+		}
+	}
+	return len;
 }
 
 /**
@@ -168,22 +168,22 @@ export function strByteLength(str: string = ''): number {
  * @param url
  */
 export function urlToRouteRaw(url: string) {
-    const query: any = {}
-    const [path, param] = url.split('?')
+	const query: any = {}
+	const [path, param] = url.split('?')
 
-    param && param.split('&').forEach((str: string) => {
-        let [name, value] = str.split('=')
-        query[name] = value
-    })
+	param && param.split('&').forEach((str: string) => {
+		let [name, value] = str.split('=')
+		query[name] = value
+	})
 
-    return { path, query }
+	return { path, query }
 }
 
 const isArray = (value: any) => {
-    if (typeof Array.isArray === 'function') {
-        return Array.isArray(value)
-    }
-    return Object.prototype.toString.call(value) === '[object Array]'
+	if (typeof Array.isArray === 'function') {
+		return Array.isArray(value)
+	}
+	return Object.prototype.toString.call(value) === '[object Array]'
 }
 
 /**
@@ -192,19 +192,19 @@ const isArray = (value: any) => {
  * @returns {*} 克隆后的对象或者原值（不是对象）
  */
 export function deepClone(obj: object) {
-    // 对常见的“非”值，直接返回原来值
-    if ([null, undefined, NaN, false].includes(obj)) return obj
-    if (typeof obj !== 'object' && typeof obj !== 'function') {
-        // 原始类型直接返回
-        return obj
-    }
-    const o = isArray(obj) ? [] : {}
-    for (const i in obj) {
-        if (obj.hasOwnProperty(i)) {
-            o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i]
-        }
-    }
-    return o
+	// 对常见的“非”值，直接返回原来值
+	if ([null, undefined, NaN, false].includes(obj)) return obj
+	if (typeof obj !== 'object' && typeof obj !== 'function') {
+		// 原始类型直接返回
+		return obj
+	}
+	const o = isArray(obj) ? [] : {}
+	for (const i in obj) {
+		if (obj.hasOwnProperty(i)) {
+			o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i]
+		}
+	}
+	return o
 }
 
 /**
@@ -214,91 +214,91 @@ export function deepClone(obj: object) {
  * @param {Number} radix
  */
 export function guid(len = 10, firstU = true, radix: any = null) {
-    const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
-    const uuid = []
-    radix = radix || chars.length
+	const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+	const uuid = []
+	radix = radix || chars.length
 
-    if (len) {
-        // 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
-        for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
-    } else {
-        let r
-        // rfc4122标准要求返回的uuid中,某些位为固定的字符
-        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
-        uuid[14] = '4'
+	if (len) {
+		// 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+		for (let i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]
+	} else {
+		let r
+		// rfc4122标准要求返回的uuid中,某些位为固定的字符
+		uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+		uuid[14] = '4'
 
-        for (let i = 0; i < 36; i++) {
-            if (!uuid[i]) {
-                r = 0 | Math.random() * 16
-                uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]
-            }
-        }
-    }
-    // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
-    if (firstU) {
-        uuid.shift()
-        return `u${ uuid.join('') }`
-    }
-    return uuid.join('')
+		for (let i = 0; i < 36; i++) {
+			if (!uuid[i]) {
+				r = 0 | Math.random() * 16
+				uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]
+			}
+		}
+	}
+	// 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+	if (firstU) {
+		uuid.shift()
+		return `u${ uuid.join('') }`
+	}
+	return uuid.join('')
 }
 
 /**
  * 金额格式化
  */
 export function moneyFormat(money: string): string {
-    return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
+	return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
 }
 
 /**
  * 时间戳转日期格式
  */
 export function timeStampTurnTime(timeStamp: any, type = "") {
-    if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
-        const date = new Date();
-        date.setTime(timeStamp * 1000);
-        const y: any = date.getFullYear();
-        let m: any = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        let d: any = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        let h: any = date.getHours();
-        h = h < 10 ? ('0' + h) : h;
-        let minute: any = date.getMinutes();
-        let second: any = date.getSeconds();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        second = second < 10 ? ('0' + second) : second;
-        if (type) {
-            if (type == 'yearMonthDay') {
-                return y + '年' + m + '月' + d + '日';
-            }
-            return y + '-' + m + '-' + d;
-        } else {
-            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
-        }
+	if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
+		const date = new Date();
+		date.setTime(timeStamp * 1000);
+		const y: any = date.getFullYear();
+		let m: any = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		let d: any = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		let h: any = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		let minute: any = date.getMinutes();
+		let second: any = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+		if (type) {
+			if (type == 'yearMonthDay') {
+				return y + '年' + m + '月' + d + '日';
+			}
+			return y + '-' + m + '-' + d;
+		} else {
+			return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+		}
 
-    } else {
-        return "";
-    }
+	} else {
+		return "";
+	}
 }
 
 /**
  * 获取当前日期时间
  */
 export function getCurrentDataTime(timeStamp: any) {
-    const addZero = (t) => {
-        return t < 10 ? '0' + t : t;
-    }
-    const time = new Date(timeStamp);
-    let Y = time.getFullYear(), // 年
-        M = time.getMonth() + 1, // 月
-        D = time.getDate(), // 日
-        h = time.getHours(), // 时
-        m = time.getMinutes(), // 分
-        s = time.getSeconds(); // 秒
-    if (M > 12) {
-        M = M - 12;
-    }
-    return `${Y}-${addZero(M)}-${addZero(D)} ${addZero(h)}:${addZero(m)}:${addZero(s)}`
+	const addZero = (t) => {
+		return t < 10 ? '0' + t : t;
+	}
+	const time = new Date(timeStamp);
+	let Y = time.getFullYear(), // 年
+		M = time.getMonth() + 1, // 月
+		D = time.getDate(), // 日
+		h = time.getHours(), // 时
+		m = time.getMinutes(), // 分
+		s = time.getSeconds(); // 秒
+	if (M > 12) {
+		M = M - 12;
+	}
+	return `${Y}-${addZero(M)}-${addZero(D)} ${addZero(h)}:${addZero(m)}:${addZero(s)}`
 }
 
 /**
@@ -306,17 +306,17 @@ export function getCurrentDataTime(timeStamp: any) {
  * @param {Object} date
  */
 export function timeTurnTimeStamp(date: string) {
-    const f = date.split(' ', 2);
-    const d = (f[0] ? f[0] : '').split('-', 3);
-    const t = (f[1] ? f[1] : '').split(':', 3);
-    return (new Date(
-        parseInt(d[0], 10) || null,
-        (parseInt(d[1], 10) || 1) - 1,
-        parseInt(d[2], 10) || null,
-        parseInt(t[0], 10) || null,
-        parseInt(t[1], 10) || null,
-        parseInt(t[2], 10) || null
-    )).getTime() / 1000;
+	const f = date.split(' ', 2);
+	const d = (f[0] ? f[0] : '').split('-', 3);
+	const t = (f[1] ? f[1] : '').split(':', 3);
+	return (new Date(
+		parseInt(d[0], 10) || null,
+		(parseInt(d[1], 10) || 1) - 1,
+		parseInt(d[2], 10) || null,
+		parseInt(t[0], 10) || null,
+		parseInt(t[1], 10) || null,
+		parseInt(t[2], 10) || null
+	)).getTime() / 1000;
 }
 
 /**
@@ -324,15 +324,15 @@ export function timeTurnTimeStamp(date: string) {
  * @param event
  */
 export function filterDigit(event: any) {
-    event.target.value = event.target.value.replace(/[^\d\.]/g, '');
-    event.target.value = event.target.value.replace(/^\./g, '');
-    event.target.value = event.target.value.replace(/\.{2,}/g, '.');
-    // 限制最多两位小数
-    const decimalParts = event.target.value.split('.');
-    if (decimalParts.length > 1 && decimalParts[1].length > 2) {
-        // 如果有小数部分且超过两位，则截取前两位
-        event.target.value = `${ decimalParts[0] }.${ decimalParts[1].slice(0, 2) }`;
-    }
+	event.target.value = event.target.value.replace(/[^\d\.]/g, '');
+	event.target.value = event.target.value.replace(/^\./g, '');
+	event.target.value = event.target.value.replace(/\.{2,}/g, '.');
+	// 限制最多两位小数
+	const decimalParts = event.target.value.split('.');
+	if (decimalParts.length > 1 && decimalParts[1].length > 2) {
+		// 如果有小数部分且超过两位，则截取前两位
+		event.target.value = `${ decimalParts[0] }.${ decimalParts[1].slice(0, 2) }`;
+	}
 }
 
 /**
@@ -340,7 +340,7 @@ export function filterDigit(event: any) {
  * @param event
  */
 export function filterNumber(event: any) {
-    event.target.value = event.target.value.replace(/[^\d]/g, '');
+	event.target.value = event.target.value.replace(/[^\d]/g, '');
 }
 
 /**
@@ -348,8 +348,8 @@ export function filterNumber(event: any) {
  * @param event
  */
 export function filterSpecial(event: any) {
-    event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
-    event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+	event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
+	event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
 }
 
 /**
@@ -357,7 +357,7 @@ export function filterSpecial(event: any) {
  * @param event
  */
 export function filterBlank(event: any) {
-    event.target.value = event.target.value.replace(/\s/g, '');
+	event.target.value = event.target.value.replace(/\s/g, '');
 }
 /**
  * 设置表格分页数据的本地存储
@@ -366,23 +366,23 @@ export function filterBlank(event: any) {
  * @param where
  */
 export function setTablePageStorage(page: any = 1, limit: any = 10, where: any = {}) {
-    let data = storage.get('tablePageStorage');
-    if (!data) {
-        data = {};
-    }
+	let data = storage.get('tablePageStorage');
+	if (!data) {
+		data = {};
+	}
 
-    const key = location.pathname + JSON.stringify(where);
-    data[key] = {
-        page,
-        limit
-    };
+	const key = location.pathname + JSON.stringify(where);
+	data[key] = {
+		page,
+		limit
+	};
 
-    const MAX_COUNT = 5; // 最多存储 5 个页面的分页缓存，超出则删除最开始的第一个页面
-    if (Object.keys(data).length > MAX_COUNT) {
-        delete data[Object.keys(data)[0]];
-    }
+	const MAX_COUNT = 5; // 最多存储 5 个页面的分页缓存，超出则删除最开始的第一个页面
+	if (Object.keys(data).length > MAX_COUNT) {
+		delete data[Object.keys(data)[0]];
+	}
 
-    storage.set({ key: 'tablePageStorage', data });
+	storage.set({ key: 'tablePageStorage', data });
 }
 
 /**
@@ -390,49 +390,49 @@ export function setTablePageStorage(page: any = 1, limit: any = 10, where: any =
  * @param where
  */
 export function getTablePageStorage(where: any = {}) {
-    let data = storage.get('tablePageStorage');
-    const key = location.pathname + JSON.stringify(where);
-    if (!data || !data[key]) {
-        data = {
-            page: 1,
-            limit: 10
-        };
-    } else {
-        data = data[key];
-    }
-    return data;
+	let data = storage.get('tablePageStorage');
+	const key = location.pathname + JSON.stringify(where);
+	if (!data || !data[key]) {
+		data = {
+			page: 1,
+			limit: 10
+		};
+	} else {
+		data = data[key];
+	}
+	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'
+	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)
-        }
+	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)
-        }
+		imgObj.onerror = (err) => {
+			// 加载失败
+			resolve(null)
+		}
 
-        // 设置图片源，开始加载
-        // 注意：如果图片跨域且服务器未设置CORS，可能会触发onerror
-        imgObj.src = img(url)
-    })
-}
\ No newline at end of file
+		// 设置图片源，开始加载
+		// 注意：如果图片跨域且服务器未设置CORS，可能会触发onerror
+		imgObj.src = img(url)
+	})
+}
diff --git a/admin/src/utils/qqmap.ts b/admin/src/utils/qqmap.ts
index e1c89ac16..29e8286af 100644
--- a/admin/src/utils/qqmap.ts
+++ b/admin/src/utils/qqmap.ts
@@ -4,8 +4,11 @@ const geometry: any = {}
 
 /**
  * 在地图上创建一个圆形
+ * @param map 地图实例
+ * @param geometriesData 圆形数据
+ * @param onSelect 图形被选中时的回调函数
  */
-export const createCircle = (map: any, geometriesData: any) => {
+export const createCircle = (map: any, geometriesData: any, onSelect?: (key: string) => void) => {
     const TMap = (window as any).TMap
     const LatLng = TMap.LatLng
 
@@ -27,7 +30,11 @@ export const createCircle = (map: any, geometriesData: any) => {
                 showBorder: true,
                 borderColor: `rgb(${color.toString()})`,
                 borderWidth: 2
-            })
+            }),
+             highlight: new TMap.PolygonStyle({
+                                    color: 'rgba(255, 255, 0, 0.6)'
+                                })
+            
         },
         geometries: [
             {
@@ -38,25 +45,84 @@ export const createCircle = (map: any, geometriesData: any) => {
             }
         ]
     })
-    geometry[geometriesData.key] = { graphical: multiCircle }
+    
+    // 如果已存在该图形，先删除
+    if (geometry[geometriesData.key]) {
+        try {
+            geometry[geometriesData.key].graphical.remove(geometriesData.key)
+            geometry[geometriesData.key].editor?.delete()
+        } catch (e) {
+            // 删除旧图形失败
+            // console.warn('删除旧图形失败:', e)
+        }
+    }
 
-    // 创建图形编辑器
-    const editor = new TMap.tools.GeometryEditor({
-        map: map,
-        overlayList: [
-            {
-                overlay: multiCircle,
-                id: geometriesData.key,
-            }
-        ],
-        actionMode: TMap.tools.constants.EDITOR_ACTION.INTERACT,
-        activeOverlayId: geometriesData.key, // 激活图层
-        selectable: true // 开启点选功能
-    })
+    let editor = null
+    // 检查 TMap.tools 是否存在
+    if (TMap.tools) {
+        // 创建图形编辑器 - 支持拖动中心点和调整半径
+        try {
+            editor = new TMap.tools.GeometryEditor({
+                map: map,
+                overlayList: [
+                    {
+                        overlay: multiCircle,
+                        id: geometriesData.key,
+                        selectedStyleId: 'highlight'
+                    }
+                ],
+                actionMode: TMap.tools.constants?.EDITOR_ACTION?.INTERACT || 0, // 交互模式，支持拖动中心点和调整半径
+                activeOverlayId: null, // 初始不激活，等待用户选择
+                selectable: true ,// 开启点选功能
+                snappable: true // 开启吸附
+            })
+            editor.setKeyboardDeleteEnable(false);
 
-    editor.on('adjust_complete', (data: any) => {
-        geometriesData.center = { lat: data.center.lat, lng: data.center.lng }
-        geometriesData.radius = parseInt(data.radius)
+            // 监听调整开始事件 - 禁用地图拖拽
+            editor.on('adjust_start', () => {
+                currentMap?.setDraggable(false)
+            })
+
+            // 监听调整完成事件
+            editor.on('adjust_complete', (data: any) => {
+                if (data?.center && data.radius !== undefined) {
+                    geometriesData.center = { lat: data.center.lat, lng: data.center.lng }
+                    geometriesData.radius = parseInt(data.radius)
+                }
+                setTimeout(() => currentMap?.setDraggable(true), 100)
+            })
+
+            // 监听调整中事件（实时更新）
+            editor.on('adjust', (data: any) => {
+                if (data?.center && data.radius !== undefined) {
+                    geometriesData.center = { lat: data.center.lat, lng: data.center.lng }
+                    geometriesData.radius = parseInt(data.radius)
+                }
+            })
+
+            // 监听选中事件
+            editor.on('select', () => {
+                // 只有在用户点击地图上的图形时才触发，而不是在切换页面时
+                if (onSelect) {
+                    onSelect(geometriesData.key)
+                }
+            })
+        } catch (e) {
+            console.warn('创建编辑器失败:', e)
+        }
+    }
+
+    // 为圆形添加点击事件监听器
+    multiCircle.on('click', () => {
+        // 先选中当前图形，使其高亮显示
+        if (editor) {
+            editor.select([geometriesData.key])
+            editor.setActiveOverlay?.(geometriesData.key)
+        }
+        // 然后触发选中回调
+        if (onSelect) {
+            onSelect(geometriesData.key)
+        }
     })
 
     geometry[geometriesData.key] = { graphical: multiCircle, editor }
@@ -64,10 +130,11 @@ export const createCircle = (map: any, geometriesData: any) => {
 
 /**
  * 在地图上创建一个多边形
- * @param map
- * @param geometriesData
+ * @param map 地图实例
+ * @param geometriesData 多边形数据
+ * @param onSelect 图形被选中时的回调函数
  */
-export const createPolygon = (map: any, geometriesData: any) => {
+export const createPolygon = (map: any, geometriesData: any, onSelect?: (key: string) => void) => {
     const TMap = (window as any).TMap
     const LatLng = TMap.LatLng
 
@@ -86,6 +153,17 @@ export const createPolygon = (map: any, geometriesData: any) => {
         Math.floor(Math.random() * 255)
     ]
 
+    // 如果已存在该图形，先删除
+    if (geometry[geometriesData.key]) {
+        try {
+            geometry[geometriesData.key].graphical.remove(geometriesData.key)
+            geometry[geometriesData.key].editor?.delete()
+        } catch (e) {
+            // 删除旧多边形失败
+            // console.warn('删除旧多边形失败:', e)
+        }
+    }
+
     const multiPolygon = new TMap.MultiPolygon({
         map: map,
         styles: {
@@ -94,7 +172,10 @@ export const createPolygon = (map: any, geometriesData: any) => {
                 showBorder: true,
                 borderColor: `rgb(${color.toString()})`,
                 borderWidth: 2
-            })
+            }),
+             highlight: new TMap.PolygonStyle({
+                                    color: 'rgba(255, 255, 0, 0.6)'
+                                })
         },
         geometries: [
             {
@@ -107,23 +188,70 @@ export const createPolygon = (map: any, geometriesData: any) => {
         ]
     });
 
-    const editor = new TMap.tools.GeometryEditor({
-        map: map,
-        overlayList: [
-            {
-                overlay: multiPolygon,
-                id: geometriesData.key,
-            }
-        ],
-        actionMode: TMap.tools.constants.EDITOR_ACTION.INTERACT,
-        activeOverlayId: geometriesData.key, // 激活图层
-        selectable: true, // 开启点选功能
-    })
+    let editor = null
+    // 检查 TMap.tools 是否存在
+    if (TMap.tools) {
+        // 创建图形编辑器 - 支持拖动边框和调整形状
+        try {
+            editor = new TMap.tools.GeometryEditor({
+                map: map,
+                overlayList: [
+                    {
+                        overlay: multiPolygon,
+                        id: geometriesData.key,
+                        selectedStyleId: 'highlight'
+                    }
+                ],
+                actionMode: TMap.tools.constants?.EDITOR_ACTION?.INTERACT || 0, // 交互模式，支持拖动边框和调整形状
+                activeOverlayId: null, // 初始不激活，等待用户选择
+                selectable: true, // 开启点选功能
+                snappable: true // 开启吸附
+            })
 
-    editor.on('adjust_complete', (data: any) => {
-        geometriesData.paths = data.paths.map(item => {
-            return { lat: item.lat, lng: item.lng}
-        })
+            editor.setKeyboardDeleteEnable(false);
+            // 监听调整开始事件 - 禁用地图拖拽
+            editor.on('adjust_start', () => {
+                currentMap?.setDraggable(false)
+            })
+
+            // 监听调整完成事件
+            editor.on('adjust_complete', (data: any) => {
+                if (data?.paths) {
+                    geometriesData.paths = data.paths.map((item: any) => ({ lat: item.lat, lng: item.lng }))
+                }
+                setTimeout(() => currentMap?.setDraggable(true), 100)
+            })
+
+            // 监听调整中事件（实时更新）
+            editor.on('adjust', (data: any) => {
+                if (data?.paths) {
+                    geometriesData.paths = data.paths.map((item: any) => ({ lat: item.lat, lng: item.lng }))
+                }
+            })
+
+            // 监听选中事件
+            editor.on('select', () => {
+                // 只有在用户点击地图上的图形时才触发，而不是在切换页面时
+                if (onSelect) {
+                    onSelect(geometriesData.key)
+                }
+            })
+        } catch (e) {
+            console.warn('创建编辑器失败:', e)
+        }
+    }
+
+    // 为多边形添加点击事件监听器
+    multiPolygon.on('click', () => {
+        // 先选中当前图形，使其高亮显示
+        if (editor) {
+            editor.select([geometriesData.key])
+            editor.setActiveOverlay?.(geometriesData.key)
+        }
+        // 然后触发选中回调
+        if (onSelect) {
+            onSelect(geometriesData.key)
+        }
     })
 
     geometry[geometriesData.key] = { graphical: multiPolygon, editor }
@@ -131,25 +259,68 @@ export const createPolygon = (map: any, geometriesData: any) => {
 
 /**
  * 删除图形
- * @param key
  */
 export const deleteGeometry = (key: string) => {
-    if (!geometry[key]) {
-        return
+    if (!geometry[key]) return
+    try {
+        geometry[key].graphical?.remove(key)
+        geometry[key].editor?.delete()
+        delete geometry[key]
+    } catch (e) {
+        console.warn('删除图形失败:', e)
     }
-    geometry[key].graphical.remove(key)
-    geometry[key].editor.delete()
+}
+
+/**
+ * 清空所有图形
+ */
+export const clearAllGeometry = () => {
+    Object.keys(geometry).forEach(deleteGeometry)
+}
+
+// 保存地图引用，用于控制地图拖拽
+let currentMap: any = null
+
+/**
+ * 设置地图引用
+ * @param map 地图实例
+ */
+export const setMapInstance = (map: any) => {
+    currentMap = map
 }
 
 /**
  * 选中图形
- * @param key
  */
 export const selectGeometry = (key: string) => {
-    if (!geometry[key] || !geometry[key].editor) {
-        return
+    if (!geometry[key]?.editor) return
+    
+    try {
+        // 取消其他图形的选中状态
+        Object.keys(geometry).forEach(k => {
+            if (k !== key && geometry[k]?.editor) {
+                geometry[k].editor.deselect?.()
+                geometry[k].editor.setActiveOverlay?.(null)
+            }
+        })
+        // 选中当前图形
+        geometry[key].editor.select?.([key])
+        geometry[key].editor.setActiveOverlay?.(key)
+    } catch (e) {
+        // 删除图形失败
+            // console.error('选中图形失败:', e)
     }
-    geometry[key].editor.select([key])
+}
+
+/**
+ * 取消选中所有图形
+ */
+export const deselectAllGeometry = () => {
+    Object.keys(geometry).forEach(k => {
+        geometry[k]?.editor?.deselect?.()
+        geometry[k]?.editor?.setActiveOverlay?.(null)
+    })
+    currentMap?.setDraggable(true)
 }
 
 /**
@@ -185,4 +356,4 @@ export const latLngToAddress = (params: any) => {
  */
 export const addressToLatLng = (params: any) => {
     return jsonp(`https://apis.map.qq.com/ws/geocoder/v1/?key=${params.mapKey}&address=${params.address}&output=jsonp&callback=addressToLatLng`, { callbackName: 'addressToLatLng' })
-}
+}
\ No newline at end of file
diff --git a/admin/src/utils/tianditu.ts b/admin/src/utils/tianditu.ts
new file mode 100644
index 000000000..6dbf86606
--- /dev/null
+++ b/admin/src/utils/tianditu.ts
@@ -0,0 +1,511 @@
+const geometry: any = {}
+
+// 保存地图引用，用于控制地图拖拽
+let currentMap: any = null
+
+/**
+ * 设置地图引用
+ * @param map 地图实例
+ */
+export const setMapInstance = (map: any) => {
+    currentMap = map
+}
+
+/**
+ * 在天地图上创建一个圆形
+ * @param map 天地图实例
+ * @param geometriesData 圆形数据
+ * @param onChange 图形变化时的回调函数
+ * @param onSelect 图形被选中时的回调函数
+ */
+export const createCircle = (map: any, geometriesData: any, onChange?: (data: any) => void, onSelect?: (key: string) => void) => {
+    const T = (window as any).T
+    if (!T) return null
+
+    geometriesData.radius = geometriesData.radius ?? 1000
+    geometriesData.center = geometriesData.center ?? { lat: map.getCenter().lat, lng: map.getCenter().lng }
+
+    const color = [
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255)
+    ]
+    // 保存原始样式
+    const originalStyle = {
+        color: geometriesData.color || `rgba(${color.toString()}, .4)`,
+        weight: geometriesData.weight || 3,
+        opacity: geometriesData.opacity || 0.8,
+        fillColor: geometriesData.fillColor || `rgba(${color.toString()}, .4)`,
+        fillOpacity: geometriesData.fillOpacity || 0.3
+    }
+    const circle = new T.Circle(new T.LngLat(geometriesData.center.lng, geometriesData.center.lat), geometriesData.radius, originalStyle)
+
+    // 如果已存在该图形，先删除
+    if (geometry[geometriesData.key]) {
+        try {
+            if (geometry[geometriesData.key].editTimer) {
+                clearTimeout(geometry[geometriesData.key].editTimer)
+            }
+            map.removeOverLay(geometry[geometriesData.key].graphical)
+        } catch (e) {
+            // 删除旧图形失败
+        }
+    }
+
+    map.addOverLay(circle)
+
+    // 保存几何数据的引用，确保在事件监听器中可用
+    const circleData = { ...geometriesData }
+
+    // 保存上一次的中心点和半径
+    let preCenter = { ...circleData.center }
+    let preRadius = circleData.radius
+
+    // 监听地图触摸结束事件，检测圆形变化
+    const handleTouchEnd = () => {
+        if (!circle.isEditable()) return
+
+        if (geometry[circleData.key]?.editTimer) {
+            clearTimeout(geometry[circleData.key].editTimer)
+        }
+
+        geometry[circleData.key].editTimer = setTimeout(() => {
+            const curCenter = circle.getCenter()
+            const curRadius = circle.getRadius()
+
+            // 中心点改变了
+            if (curCenter.lng !== preCenter.lng || curCenter.lat !== preCenter.lat) {
+                circleData.center = { lat: curCenter.lat, lng: curCenter.lng }
+                preCenter = { ...circleData.center }
+                // console.log('圆形中心点改变了', circleData.center)
+                // 调用回调函数
+                if (onChange) {
+                    onChange(circleData)
+                }
+            }
+
+            // 半径改变了
+            if (curRadius !== preRadius) {
+                circleData.radius = curRadius
+                preRadius = curRadius
+                // console.log('圆形半径改变了', curRadius)
+                // 调用回调函数
+                if (onChange) {
+                    onChange(circleData)
+                }
+            }
+        }, 200)
+    }
+
+    // 监听圆形点击事件
+    const handleClick = () => {
+        // 调用选择回调函数
+        if (onSelect) {
+            onSelect(circleData.key)
+        }
+    }
+
+    // 初始时不启用编辑功能，只有在选中时才启用
+    // circle.enableEdit()
+
+    // 添加事件监听
+    map.addEventListener('touchend', handleTouchEnd)
+    map.addEventListener('mouseup', handleTouchEnd)
+    circle.addEventListener('click', handleClick)
+
+    geometry[circleData.key] = { graphical: circle, handleTouchEnd, handleClick, originalStyle }
+    return circle
+}
+
+/**
+ * 在天地图上创建一个矩形
+ * @param map 天地图实例
+ * @param geometriesData 矩形数据
+ */
+export const createRectangle = (map: any, geometriesData: any) => {
+    const T = (window as any).T
+    if (!T) return null
+
+    const { lat, lng } = map.getCenter()
+
+    geometriesData.bounds = geometriesData.bounds ?? {
+        southwest: { lat: lat - 0.005, lng: lng - 0.005 },
+        northeast: { lat: lat + 0.005, lng: lng + 0.005 }
+    }
+
+    const lngLats = [
+        new T.LngLat(geometriesData.bounds.southwest.lng, geometriesData.bounds.southwest.lat),
+        new T.LngLat(geometriesData.bounds.northeast.lng, geometriesData.bounds.southwest.lat),
+        new T.LngLat(geometriesData.bounds.northeast.lng, geometriesData.bounds.northeast.lat),
+        new T.LngLat(geometriesData.bounds.southwest.lng, geometriesData.bounds.northeast.lat)
+    ]
+     const color = [
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255)
+    ]
+
+    const rectangle = new T.Polygon(lngLats, {
+        color: geometriesData.color || `rgba(${color.toString()}, .4)`,
+        weight: geometriesData.weight || 3,
+        opacity: geometriesData.opacity || 0.8,
+        fillColor: geometriesData.fillColor || `rgba(${color.toString()}, .4)`,
+        fillOpacity: geometriesData.fillOpacity || 0.3
+    })
+
+    map.addOverLay(rectangle)
+    geometry[geometriesData.key] = { graphical: rectangle }
+    return rectangle
+}
+
+/**
+ * 在天地图上创建一个多边形
+ * @param map 天地图实例
+ * @param geometriesData 多边形数据
+ * @param onChange 图形变化时的回调函数
+ * @param onSelect 图形被选中时的回调函数
+ */
+export const createPolygon = (map: any, geometriesData: any, onChange?: (data: any) => void, onSelect?: (key: string) => void) => {
+    const T = (window as any).T
+    if (!T) return null
+
+    const { lat, lng } = map.getCenter()
+
+    geometriesData.paths = geometriesData.paths ?? [
+        { lat: lat + 0.01, lng: lng + 0.01 },
+        { lat: lat - 0.01, lng: lng + 0.01 },
+        { lat: lat - 0.01, lng: lng - 0.01 },
+        { lat: lat + 0.01, lng: lng - 0.01 }
+    ]
+
+    const lngLats = geometriesData.paths.map((item: any) => new T.LngLat(item.lng, item.lat))
+    const color = [
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255),
+        Math.floor(Math.random() * 255)
+    ]
+    // 保存原始样式
+    const originalStyle = {
+        color: geometriesData.color || `rgba(${color.toString()}, .4)`,
+        weight: geometriesData.weight || 3,
+        opacity: geometriesData.opacity || 0.8,
+        fillColor: geometriesData.fillColor || `rgba(${color.toString()}, .4)`,
+        fillOpacity: geometriesData.fillOpacity || 0.3
+    }
+    const polygon = new T.Polygon(lngLats, originalStyle)
+
+    // 如果已存在该图形，先删除
+    if (geometry[geometriesData.key]) {
+        try {
+            if (geometry[geometriesData.key].editTimer) {
+                clearTimeout(geometry[geometriesData.key].editTimer)
+            }
+            map.removeOverLay(geometry[geometriesData.key].graphical)
+        } catch (e) {
+            // 删除旧图形失败
+        }
+    }
+
+    map.addOverLay(polygon)
+
+    // 保存上一次的路径
+    let prePaths = JSON.parse(JSON.stringify(geometriesData.paths))
+
+    // 保存几何数据的引用，确保在事件监听器中可用
+    const polygonData = { ...geometriesData }
+
+    // 监听地图触摸结束事件，检测多边形变化
+    const handleTouchEnd = () => {
+        if (!polygon.isEditable()) return
+
+        if (geometry[polygonData.key]?.editTimer) {
+            clearTimeout(geometry[polygonData.key].editTimer)
+        }
+
+        geometry[polygonData.key].editTimer = setTimeout(() => {
+            try {
+                const curLngLats = polygon.getLngLats()
+                
+                // 确保 curLngLats 是数组
+                if (Array.isArray(curLngLats)) {
+                    // 检查 curLngLats[0] 是否是数组（多边形可能返回嵌套数组）
+                    let pathsArray = curLngLats
+                    if (Array.isArray(curLngLats[0])) {
+                        pathsArray = curLngLats[0]
+                    }
+                    
+                    const curPaths = pathsArray.map((lngLat: any) => {
+                        // 检查 lngLat 是否是数组 [lng, lat]
+                        if (Array.isArray(lngLat)) {
+                            return {
+                                lat: lngLat[1],
+                                lng: lngLat[0]
+                            }
+                        } else {
+                            // 否则，假设是对象 { lat, lng }
+                            return {
+                                lat: lngLat.lat,
+                                lng: lngLat.lng
+                            }
+                        }
+                    })
+
+                    // 检查路径是否改变
+                    const pathsChanged = JSON.stringify(curPaths) !== JSON.stringify(prePaths)
+
+                    if (pathsChanged) {
+                        polygonData.paths = curPaths
+                        prePaths = JSON.parse(JSON.stringify(polygonData.paths))
+                        // 调用回调函数
+                        if (onChange) {
+                            onChange(polygonData)
+                        }
+                    }
+                } else {
+                    console.error('curLngLats 不是数组:', curLngLats)
+                }
+            } catch (error) {
+                console.error('获取多边形路径失败:', error)
+            }
+        }, 200)
+    }
+
+    // 监听多边形点击事件
+    const handleClick = () => {
+        // 调用选择回调函数
+        if (onSelect) {
+            onSelect(polygonData.key)
+        }
+    }
+
+    // 初始时不启用编辑功能，只有在选中时才启用
+    // polygon.enableEdit()
+
+    // 添加事件监听
+    map.addEventListener('touchend', handleTouchEnd)
+    map.addEventListener('mouseup', handleTouchEnd)
+    polygon.addEventListener('click', handleClick)
+
+    geometry[polygonData.key] = { graphical: polygon, handleTouchEnd, handleClick, originalStyle }
+    return polygon
+}
+
+/**
+ * 删除图形
+ * @param map 地图实例
+ * @param key 图形key
+ */
+export const deleteGeometry = (map: any, key: string) => {
+    if (!geometry[key]) return
+    try {
+        const T = (window as any).T
+        if (T && geometry[key].graphical) {
+            // 清除定时器
+            if (geometry[key].editTimer) {
+                clearTimeout(geometry[key].editTimer)
+            }
+            // 移除事件监听器
+            if (geometry[key].handleTouchEnd) {
+                map.removeEventListener('touchend', geometry[key].handleTouchEnd)
+                map.removeEventListener('mouseup', geometry[key].handleTouchEnd)
+            }
+            // 移除点击事件监听器
+            if (geometry[key].handleClick) {
+                geometry[key].graphical.removeEventListener('click', geometry[key].handleClick)
+            }
+            // 移除覆盖物
+            map.removeOverLay(geometry[key].graphical)
+        }
+        delete geometry[key]
+    } catch (e) {
+        console.warn('删除图形失败:', e)
+    }
+}
+
+/**
+ * 清空所有图形
+ * @param map 地图实例
+ */
+export const clearAllGeometry = (map: any) => {
+    const T = (window as any).T
+    if (T) {
+        // 先清除所有图形的事件监听器和定时器
+        Object.keys(geometry).forEach(key => {
+            if (geometry[key].editTimer) {
+                clearTimeout(geometry[key].editTimer)
+            }
+            if (geometry[key].handleTouchEnd) {
+                map.removeEventListener('touchend', geometry[key].handleTouchEnd)
+                map.removeEventListener('mouseup', geometry[key].handleTouchEnd)
+            }
+            if (geometry[key].handleClick) {
+                geometry[key].graphical.removeEventListener('click', geometry[key].handleClick)
+            }
+        })
+        // 一次性清空地图上的所有覆盖物
+        map.clearOverLays()
+    }
+    // 清空几何对象存储
+    Object.keys(geometry).forEach(key => delete geometry[key])
+}
+
+/**
+ * 选中图形
+ * @param key 图形key
+ */
+export const selectGeometry = (key: string) => {
+    if (!geometry[key]?.graphical) return
+    
+    try {
+        // 先取消所有图形的选中状态
+        deselectAllGeometry()
+        
+        // 设置选中状态
+        geometry[key].graphical.setSelected?.(true)
+        
+        // 启用当前图形的编辑功能
+        geometry[key].graphical.enableEdit()
+
+        const color = [
+            Math.floor(Math.random() * 255),
+            Math.floor(Math.random() * 255),
+            Math.floor(Math.random() * 255)
+        ]
+        
+        // 修改样式，使其显示为选中状态
+        geometry[key].graphical.setStyle({
+            color: '#1890ff', // 选中时的边框颜色
+            weight: 2, // 选中时的边框宽度
+            opacity: 1, // 选中时的边框透明度
+            fillColor: `rgba(${color.toString()}, .6)`, // 选中时的填充颜色
+            fillOpacity: 1// 选中时的填充透明度
+        })
+    } catch (e) {
+        console.error('选中图形失败:', e)
+    }
+}
+
+/**
+ * 取消选中所有图形
+ */
+export const deselectAllGeometry = () => {
+    Object.keys(geometry).forEach(key => {
+        try {
+            // 取消选中状态
+            geometry[key]?.graphical?.setSelected?.(false)
+            
+            // 禁用编辑功能
+            geometry[key]?.graphical?.disableEdit?.()
+            
+            // 恢复原始样式
+            if (geometry[key]?.originalStyle) {
+                geometry[key].graphical.setStyle(geometry[key].originalStyle)
+            }
+        } catch (e) {
+            console.warn('取消选中图形失败:', e)
+        }
+    })
+}
+
+/**
+ * 创建点标记
+ * @param map 天地图实例
+ * @returns 标记实例
+ */
+export const createMarker = (map: any) => {
+    const T = (window as any).T
+    if (!T) return null
+
+    const { lat, lng } = map.getCenter()
+    const marker = new T.Marker(new T.LngLat(lng, lat))
+    map.addOverLay(marker)
+    return marker
+}
+
+/**
+ * 逆地址解析
+ * @param params 参数 { mapKey, lat, lng }
+ * @returns Promise
+ */
+export const latLngToAddress = (params: any) => {
+    return new Promise((resolve, reject) => {
+        const T = (window as any).T
+        if (!T) {
+            reject(new Error('天地图服务未加载'))
+            return
+        }
+
+        const geocoder = new T.Geocoder()
+        const lngLat = new T.LngLat(params.lng, params.lat)
+
+        geocoder.getLocation(lngLat, (result: any) => {
+            if (result && result.status === '0') {
+                const addrComp = result.addressComponent || {}
+                let detailAddress = ''
+
+                if (result.formattedAddress) {
+                    detailAddress = result.formattedAddress
+                } else if (result.address) {
+                    detailAddress = result.address
+                } else {
+                    const parts = []
+                    if (addrComp.road) parts.push(addrComp.road)
+                    if (addrComp.address) parts.push(addrComp.address)
+                    if (addrComp.poi) parts.push(addrComp.poi)
+                    detailAddress = parts.join('')
+                }
+
+                const addressData = {
+                    location: { lat: params.lat, lng: params.lng },
+                    address: addrComp ?
+                        `${ addrComp.province || '' }${ addrComp.city || '' }${ addrComp.county || '' }` : '',
+                    formatted_addresses: {
+                        recommend: detailAddress
+                    },
+                    address_component: {
+                        province: addrComp.province || '',
+                        city: addrComp.city || '',
+                        district: addrComp.county || '',
+                        street: addrComp.road || '',
+                        street_number: addrComp.address || ''
+                    },
+                    addressComponent: addrComp,
+                    formatted_address: detailAddress
+                }
+                resolve(addressData)
+            } else {
+                reject(new Error(result?.msg || '地址解析失败'))
+            }
+        })
+    })
+}
+
+/**
+ * 地址解析
+ * @param params 参数 { mapKey, address }
+ * @returns Promise
+ */
+export const addressToLatLng = (params: any) => {
+    return new Promise((resolve, reject) => {
+        const T = (window as any).T
+        if (!T) {
+            reject(new Error('天地图服务未加载'))
+            return
+        }
+
+        const geocoder = new T.Geocoder()
+        geocoder.getPoint(params.address, (result: any) => {
+            if (result && result.status === '0' && result.location) {
+                const lat = result.location.lat
+                const lng = result.location.lon || result.location.lng
+                if (lat && lng) {
+                    resolve({ lat, lng })
+                } else {
+                    reject(new Error('坐标解析失败'))
+                }
+            } else {
+                reject(new Error(result?.msg || '未找到该地址'))
+            }
+        })
+    })
+}