diff --git a/admin/DEVELOPMENT_GUIDE.md b/admin/DEVELOPMENT_GUIDE.md
new file mode 100644
index 000000000..d35c9a99e
--- /dev/null
+++ b/admin/DEVELOPMENT_GUIDE.md
@@ -0,0 +1,143 @@
+# NiuCloud Admin 开发规范
+
+## 技术栈区分
+
+本项目采用前后端分离架构，包含两个主要前端部分：
+
+1. **PC端后台管理系统**
+   - 框架: Vue 3 + TypeScript + Vite
+   - UI组件库: Element Plus
+   - 状态管理: Pinia
+   - 样式处理: SCSS + Tailwind CSS
+
+2. **移动端应用**
+   - 框架: uni-app + Vue 3 + TypeScript
+   - UI组件库: uview-plus
+   - 状态管理: Pinia
+   - 样式处理: SCSS + Windi CSS
+
+## 关键组件使用规范
+
+### 消息提示组件
+
+**重要注意事项：请根据开发平台选择正确的消息提示组件！**
+
+#### PC端 (admin目录)
+- **必须使用Element Plus的消息提示组件**，而不是uni-app的方法
+- 主要组件包括：`ElMessage`、`ElMessageBox`、`ElNotification`等
+- 导入方式：`import { ElMessage, ElMessageBox } from 'element-plus'`
+- 使用示例：
+  ```typescript
+  import { ElMessage } from 'element-plus'
+  
+  // 成功消息
+  ElMessage.success('操作成功')
+  
+  // 错误消息
+  ElMessage.error('操作失败')
+  
+  // 确认对话框
+  ElMessageBox.confirm('确定要执行此操作吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 用户点击确认后的逻辑
+  }).catch(() => {
+    // 用户点击取消后的逻辑
+  })
+  ```
+
+#### 移动端 (uni-app目录)
+- **使用uni-app提供的API**进行消息提示
+- 主要方法包括：`uni.showToast`、`uni.showModal`、`uni.showLoading`等
+- 使用示例：
+  ```typescript
+  // 成功提示
+  uni.showToast({
+    title: '操作成功',
+    icon: 'success',
+    duration: 2000
+  })
+  
+  // 模态对话框
+  uni.showModal({
+    title: '提示',
+    content: '确定要执行此操作吗？',
+    success: (res) => {
+      if (res.confirm) {
+        // 用户点击确认后的逻辑
+      }
+    }
+  })
+  ```
+
+## API请求规范
+
+### PC端API请求
+- 使用`@/utils/request.ts`封装的请求工具
+- 支持`showSuccessMessage`和`showErrorMessage`选项控制消息显示
+- 示例：
+  ```typescript
+  import request from '@/utils/request'
+  
+  // GET请求
+  export function getOrderList(params: Record<string, any>) {
+    return request.get('order/list', params)
+  }
+  
+  // POST请求（带成功消息）
+  export function createOrder(params: Record<string, any>) {
+    return request.post('order/create', params, { showSuccessMessage: true })
+  }
+  ```
+
+### 移动端API请求
+- 使用uni-app的`uni.request`或封装的请求工具
+- 示例：
+  ```typescript
+  // 发送请求
+  uni.request({
+    url: 'https://example.com/api/order/list',
+    method: 'GET',
+    data: {
+      page: 1,
+      limit: 10
+    },
+    success: (res) => {
+      // 处理成功响应
+    },
+    fail: (err) => {
+      // 处理请求失败
+    }
+  })
+  ```
+
+## 代码风格规范
+
+1. **文件命名**
+   - 组件文件：PascalCase，如 `OrderList.vue`
+   - 普通文件：kebab-case 或 camelCase，如 `api-service.ts` 或 `commonUtils.ts`
+
+2. **TypeScript规范**
+   - 为函数参数、返回值和重要变量添加明确的类型注解
+   - 使用接口 (interface) 定义复杂数据结构
+   - 避免 `any` 类型的滥用
+
+3. **Vue组件规范**
+   - 使用 Vue 3 Composition API 和 `<script setup lang="ts">` 语法
+   - 组件样式建议使用 scoped 属性或 CSS Modules
+
+## 国际化规范
+
+- PC端使用Vue I18n进行国际化，语言文件位于`src/lang`目录
+- 移动端同样使用Vue I18n，语言文件位于`src/app/locale`目录
+- 使用`t('key')`函数获取翻译文本
+
+## 其他重要规范
+
+- 严格遵循RESTful API设计规范
+- 统一处理API响应数据和错误情况
+- 代码提交前确保通过TypeScript类型检查
+- 组件开发遵循高内聚低耦合原则
+- 优先复用现有组件和工具函数
\ No newline at end of file
diff --git a/admin/package-lock.json b/admin/package-lock.json
index 64fda158d..d8760d42d 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -9,12 +9,18 @@
             "version": "1.0.0",
             "dependencies": {
                 "@element-plus/icons-vue": "2.0.10",
+                "@fullcalendar/core": "^6.1.19",
+                "@fullcalendar/daygrid": "^6.1.19",
+                "@fullcalendar/interaction": "^6.1.19",
+                "@fullcalendar/vue3": "^6.1.19",
+                "@heroicons/vue": "^2.2.0",
                 "@highlightjs/vue-plugin": "2.1.0",
                 "@types/lodash-es": "4.17.6",
                 "@vueuse/core": "9.12.0",
                 "axios": "1.4.0",
                 "crypto-js": "4.1.1",
                 "css-color-function": "1.3.3",
+                "date-fns": "^4.1.0",
                 "day": "^0.0.2",
                 "echarts": "5.4.1",
                 "element-plus": "^2.7.4",
@@ -963,6 +969,47 @@
             "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz",
             "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
         },
+        "node_modules/@fullcalendar/core": {
+            "version": "6.1.19",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/core/-/core-6.1.19.tgz",
+            "integrity": "sha512-z0aVlO5e4Wah6p6mouM0UEqtRf1MZZPt4mwzEyU6kusaNL+dlWQgAasF2cK23hwT4cmxkEmr4inULXgpyeExdQ==",
+            "dependencies": {
+                "preact": "~10.12.1"
+            }
+        },
+        "node_modules/@fullcalendar/daygrid": {
+            "version": "6.1.19",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/daygrid/-/daygrid-6.1.19.tgz",
+            "integrity": "sha512-IAAfnMICnVWPjpT4zi87i3FEw0xxSza0avqY/HedKEz+l5MTBYvCDPOWDATpzXoLut3aACsjktIyw9thvIcRYQ==",
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.19"
+            }
+        },
+        "node_modules/@fullcalendar/interaction": {
+            "version": "6.1.19",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/interaction/-/interaction-6.1.19.tgz",
+            "integrity": "sha512-GOciy79xe8JMVp+1evAU3ytdwN/7tv35t5i1vFkifiuWcQMLC/JnLg/RA2s4sYmQwoYhTw/p4GLcP0gO5B3X5w==",
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.19"
+            }
+        },
+        "node_modules/@fullcalendar/vue3": {
+            "version": "6.1.19",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/vue3/-/vue3-6.1.19.tgz",
+            "integrity": "sha512-j5eUSxx0xIy3ADljo0f5B9PhjqXnCQ+7nUMPfsslc2eGVjp4F74YvY3dyd6OBbg13IvpsjowkjncGipYMQWmTA==",
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.19",
+                "vue": "^3.0.11"
+            }
+        },
+        "node_modules/@heroicons/vue": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/@heroicons/vue/-/vue-2.2.0.tgz",
+            "integrity": "sha512-G3dbSxoeEKqbi/DFalhRxJU4mTXJn7GwZ7ae8NuEQzd1bqdd0jAbdaBZlHPcvPD2xI1iGzNVB4k20Un2AguYPw==",
+            "peerDependencies": {
+                "vue": ">= 3"
+            }
+        },
         "node_modules/@highlightjs/vue-plugin": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz",
@@ -2624,6 +2671,15 @@
             "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
             "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
         },
+        "node_modules/date-fns": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-4.1.0.tgz",
+            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/kossnocorp"
+            }
+        },
         "node_modules/day": {
             "version": "0.0.2",
             "resolved": "https://registry.npmmirror.com/day/-/day-0.0.2.tgz",
@@ -5003,6 +5059,15 @@
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
             "dev": true
         },
+        "node_modules/preact": {
+            "version": "10.12.1",
+            "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.1.tgz",
+            "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/preact"
+            }
+        },
         "node_modules/prelude-ls": {
             "version": "1.2.1",
             "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",
diff --git a/admin/package.json b/admin/package.json
index 8ba77be16..b956c880f 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -10,12 +10,18 @@
     },
     "dependencies": {
         "@element-plus/icons-vue": "2.0.10",
+        "@fullcalendar/core": "^6.1.19",
+        "@fullcalendar/daygrid": "^6.1.19",
+        "@fullcalendar/interaction": "^6.1.19",
+        "@fullcalendar/vue3": "^6.1.19",
+        "@heroicons/vue": "^2.2.0",
         "@highlightjs/vue-plugin": "2.1.0",
         "@types/lodash-es": "4.17.6",
         "@vueuse/core": "9.12.0",
         "axios": "1.4.0",
         "crypto-js": "4.1.1",
         "css-color-function": "1.3.3",
+        "date-fns": "^4.1.0",
         "day": "^0.0.2",
         "echarts": "5.4.1",
         "element-plus": "^2.7.4",
diff --git a/admin/src/app/api/member.ts b/admin/src/app/api/member.ts
index 4a03299ea..a97ff721c 100644
--- a/admin/src/app/api/member.ts
+++ b/admin/src/app/api/member.ts
@@ -18,7 +18,7 @@ export function getMemberList(params: Record<string, any>) {
  * @returns
  */
 export function getMemberInfo(id: number) {
-    return request.get(`member/member/${id}`);
+    return request.get(`member/member/${ id }`);
 }
 
 /**
@@ -61,7 +61,7 @@ export function getRegisterChannelType(params: Record<string, any>) {
  * @param member_id
  */
 export function deleteMember(member_id: number) {
-    return request.delete(`member/member/${member_id}`, { showSuccessMessage: true })
+    return request.delete(`member/member/${ member_id }`, { showSuccessMessage: true })
 }
 
 /***************************************************** 会员标签 ****************************************************/
@@ -81,7 +81,7 @@ export function getMemberLabelList(params: Record<string, any>) {
  * @returns
  */
 export function getMemberLabelInfo(label_id: number) {
-    return request.get(`member/label/${label_id}`);
+    return request.get(`member/label/${ label_id }`);
 }
 
 /**
@@ -98,7 +98,7 @@ export function addMemberLabel(params: Record<string, any>) {
  * @param params
  */
 export function updateMemberLabel(params: Record<string, any>) {
-    return request.put(`member/label/${params.label_id}`, params, { showSuccessMessage: true })
+    return request.put(`member/label/${ params.label_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -107,7 +107,7 @@ export function updateMemberLabel(params: Record<string, any>) {
  * @returns
  */
 export function deleteMemberLabel(label_id: number) {
-    return request.delete(`member/label/${label_id}`, { showSuccessMessage: true })
+    return request.delete(`member/label/${ label_id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -122,7 +122,7 @@ export function getMemberLabelAll() {
  * @param params
  */
 export function editMemberDetail(params: Record<string, any>) {
-    return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showSuccessMessage: true })
+    return request.put(`member/member/modify/${ params.member_id }/${ params.field }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -143,7 +143,7 @@ export function memberBatchModify(params: Record<string, any>) {
  * @param change_type
  */
 export function getChangeTypeList(change_type: string) {
-    return request.get(`member/account/change_type/${change_type}`)
+    return request.get(`member/account/change_type/${ change_type }`)
 }
 
 /**
@@ -321,7 +321,7 @@ export function getBalanceStatus() {
  * 获取余额变动类型
  */
 export function getAccountType(params: Record<string, any>) {
-    return request.get(`member/account/change_type/${params.account_type}`)
+    return request.get(`member/account/change_type/${ params.account_type }`)
 }
 
 
@@ -357,7 +357,7 @@ export function getCashOutList(params: Record<string, any>) {
  * @param id
  */
 export function getCashOutDetail(id: number) {
-    return request.get(`member/cash_out/${id}`, {})
+    return request.get(`member/cash_out/${ id }`, {})
 }
 
 /**
@@ -365,14 +365,18 @@ export function getCashOutDetail(id: number) {
  * @param params
  */
 export function memberAudit(params: Record<string, any>) {
-    return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, { showSuccessMessage: true })
+    return request.put(`member/cash_out/audit/${ params.id }/${ params.action }`, params, { showSuccessMessage: true })
 }
+
 /**
  * 会员取消提现
  * @param params
  */
 export function memberCancel(params: Record<string, any>) {
-    return request.put(`member/cash_out/cancel/${params.id}`, params, { showSuccessMessage: true,showErrorMessage: true })
+    return request.put(`member/cash_out/cancel/${ params.id }`, params, {
+        showSuccessMessage: true,
+        showErrorMessage: true
+    })
 }
 
 
@@ -381,7 +385,7 @@ export function memberCancel(params: Record<string, any>) {
  * @param params
  */
 export function memberTransfer(params: Record<string, any>) {
-    return request.put(`member/cash_out/transfer/${params.id}`, params, { showSuccessMessage: true })
+    return request.put(`member/cash_out/transfer/${ params.id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -389,14 +393,15 @@ export function memberTransfer(params: Record<string, any>) {
  * @param params
  */
 export function memberRemark(params: Record<string, any>) {
-    return request.put(`member/cash_out/remark/${params.id}`, params, { showSuccessMessage: true })
+    return request.put(`member/cash_out/remark/${ params.id }`, params, { showSuccessMessage: true })
 }
+
 /**
  * 检查打款进度
  * @param id
  */
 export function memberCheck(id: number) {
-    return request.put(`member/cash_out/check/${id}`, {}, { showSuccessMessage: true })
+    return request.put(`member/cash_out/check/${ id }`, {}, { showSuccessMessage: true })
 }
 
 /**
@@ -404,7 +409,7 @@ export function memberCheck(id: number) {
  * @param params
  */
 export function editMemberStatus(params: Record<string, any>) {
-    return request.put(`member/setstatus/${params.status}`, params, { showSuccessMessage: true })
+    return request.put(`member/setstatus/${ params.status }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -453,6 +458,7 @@ export function getGrowthRuleDict() {
 export function getPointRuleDict() {
     return request.get(`member/dict/point_rule`)
 }
+
 /***************************************************** 会员等级 ****************************************************/
 
 /**
@@ -470,7 +476,7 @@ export function getMemberLevelPageList(params: Record<string, any>) {
  * @returns
  */
 export function getMemberLevelInfo(level_id: number) {
-    return request.get(`member/level/${level_id}`);
+    return request.get(`member/level/${ level_id }`);
 }
 
 /**
@@ -487,7 +493,7 @@ export function addMemberLevel(params: Record<string, any>) {
  * @param params
  */
 export function updateMemberLevel(params: Record<string, any>) {
-    return request.put(`member/level/${params.level_id}`, params, { showSuccessMessage: true })
+    return request.put(`member/level/${ params.level_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -496,7 +502,7 @@ export function updateMemberLevel(params: Record<string, any>) {
  * @returns
  */
 export function deleteMemberLevel(level_id: number) {
-    return request.delete(`member/level/${level_id}`, { showSuccessMessage: true })
+    return request.delete(`member/level/${ level_id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -512,14 +518,14 @@ export function getMemberLevelAll() {
  * 获取会员权益内容
  */
 export function getMemberBenefitsContent() {
-    return request.get(`member/benefits/content`);
+    return request.post(`member/benefits/content`);
 }
 
 /**
  * 获取会员礼包内容
  */
 export function getMemberGiftsContent(params: Record<string, any>) {
-    return request.get(`member/gifts/content`, { params });
+    return request.post(`member/gifts/content`, params);
 }
 
 /**
@@ -555,7 +561,7 @@ export function getMemberAddress(params: Record<string, any>) {
 }
 
 /**
- * 添加收货地址 
+ * 添加收货地址
  */
 export function addMemberAddress(params: Record<string, any>) {
     return request.post(`member/address`, params);
diff --git a/admin/src/app/assets/images/app_store/app_manage.png b/admin/src/app/assets/images/app_store/app_manage.png
new file mode 100644
index 000000000..b858a8f0a
Binary files /dev/null and b/admin/src/app/assets/images/app_store/app_manage.png differ
diff --git a/admin/src/app/assets/images/app_store/app_type_addon.png b/admin/src/app/assets/images/app_store/app_type_addon.png
new file mode 100644
index 000000000..071073e5a
Binary files /dev/null and b/admin/src/app/assets/images/app_store/app_type_addon.png differ
diff --git a/admin/src/app/assets/images/app_store/app_type_app.png b/admin/src/app/assets/images/app_store/app_type_app.png
new file mode 100644
index 000000000..385b275b5
Binary files /dev/null and b/admin/src/app/assets/images/app_store/app_type_app.png differ
diff --git a/admin/src/app/assets/images/app_store/system_version.png b/admin/src/app/assets/images/app_store/system_version.png
new file mode 100644
index 000000000..762b2ad77
Binary files /dev/null and b/admin/src/app/assets/images/app_store/system_version.png differ
diff --git a/admin/src/app/lang/zh-cn/channel.wechat.config.json b/admin/src/app/lang/zh-cn/channel.wechat.config.json
index a86663f97..73e8a1b72 100644
--- a/admin/src/app/lang/zh-cn/channel.wechat.config.json
+++ b/admin/src/app/lang/zh-cn/channel.wechat.config.json
@@ -29,5 +29,8 @@
     "encodingAesKeyPlaceholder": "请输入EncodingAESKey",
     "cleartextModeTips": "明文模式下，不使用消息体加解密功能，安全系数较低",
     "compatibleModeTips": "兼容模式下，明文、密文将共存，方便开发者调试和维护",
-    "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高"
-}
\ No newline at end of file
+    "safeModeTips": "安全模式下，消息包为纯密文，需要开发者加密和解密，安全系数高",
+    "wechatBaseUri": "借权域名",
+    "wechatBaseUriPlaceholder": "",
+    "wechatBaseUriTips": "默认留空，填写后将替换https://open.weixin.gg.com/获取授权!"
+}
diff --git a/admin/src/app/views/app/marketing.vue b/admin/src/app/views/app/marketing.vue
index 880a7ddde..49a2be068 100644
--- a/admin/src/app/views/app/marketing.vue
+++ b/admin/src/app/views/app/marketing.vue
@@ -61,7 +61,7 @@ const getMarketingList = async () => {
     // marketingList.value = res.data
     loading.value = false
 }
-getMarketingList()
+// getMarketingList()
 
 const toLink = (item: any) => {
     if (item.url) {
diff --git a/admin/src/app/views/channel/wechat/config.vue b/admin/src/app/views/channel/wechat/config.vue
index b5874951c..d24f6678e 100644
--- a/admin/src/app/views/channel/wechat/config.vue
+++ b/admin/src/app/views/channel/wechat/config.vue
@@ -36,6 +36,11 @@
                     <el-input v-model.trim="formData.app_secret" :placeholder="t('appSecretPlaceholder')" class="input-width" clearable />
                     <div class="form-tip">{{ t('wechatAppsecretTips') }}</div>
                 </el-form-item>
+
+                <el-form-item :label="t('wechatBaseUri')" prop="base_uri" v-if="!formData.is_authorization">
+                    <el-input v-model.trim="formData.base_uri" :placeholder="t('wechatBaseUriPlaceholder')" class="input-width" clearable />
+                    <div class="form-tip">{{ t('wechatBaseUriTips') }}</div>
+                </el-form-item>
             </el-card>
 
             <el-card class="box-card !border-none mt-[15px]" shadow="never">
@@ -140,7 +145,8 @@ const formData = reactive<Record<string, any>>({
     token: '',
     encoding_aes_key: '',
     encryption_type: 'not_encrypt',
-    is_authorization: 0
+    is_authorization: 0,
+    base_uri: ''
 })
 
 const formRef = ref<FormInstance>()
diff --git a/admin/src/app/views/diy/components/edit-page.vue b/admin/src/app/views/diy/components/edit-page.vue
index 45ea4f172..1234d177e 100644
--- a/admin/src/app/views/diy/components/edit-page.vue
+++ b/admin/src/app/views/diy/components/edit-page.vue
@@ -77,6 +77,9 @@
                     <el-switch v-model="diyStore.global.copyright.isShow" />
                     <div class="text-sm text-gray-400">{{ t('此处控制当前页面版权信息是否显示') }}</div>
                 </el-form-item>
+                <el-form-item :label="t('文字颜色')" class="display-block">
+                    <el-color-picker v-model="diyStore.global.copyright.textColor" show-alpha />
+                </el-form-item>
             </el-form>
         </div>
         <div class="edit-attr-item-wrap">
diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue
index d501aac18..4cc10efa0 100644
--- a/admin/src/app/views/diy/edit.vue
+++ b/admin/src/app/views/diy/edit.vue
@@ -455,7 +455,7 @@ initPage({
             diyStore.components.push(com)
         }
     }
-
+	console.log( component.value )
     loadDiyTemplatePages(data.type)
 
     // 加载预览
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index 710c49069..7252b1d54 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -1,273 +1,359 @@
 <template>
     <!--应用市场-->
-    <div class="main-container">
-        <el-card class="box-card !border-none" shadow="never">
-            <div class="flex justify-between items-center">
-                <span class="text-page-title">{{ t("localAppText") }}</span>
+    <div class="main-container bg-body min-h-[70vh]" v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never" v-if="!loading">
+            <div class="flex items-center mb-4">
+                <div class="flex items-center flex-1">
+                    <h2 class="text-lg font-semibold mr-[20px]">应用列表</h2>
+                    <button class="text-gray-500 text-sm mr-[20px]" @click="activeNameTabFn('installed')" :class="{'!text-primary': activeName == 'installed'}">已安装</button>
+                    <button class="text-gray-500 text-sm mr-[20px]" @click="activeNameTabFn('uninstalled')" :class="{'!text-primary': activeName == 'uninstalled'}">未安装</button>
+                    <button class="text-gray-500 text-sm mr-[20px]" @click="activeNameTabFn('all')" :class="{'!text-primary': activeName == 'all'}">已购买</button>
+                    <button class="text-gray-500 text-sm relative" @click="activeNameTabFn('recentlyUpdated')" :class="{'!text-primary': activeName == 'recentlyUpdated'}">
+                        可更新
+                        <div v-if="localList.recentlyUpdated.length" class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]"></div>
+                    </button>
+                </div>
+                <i class="iconfont cursor-pointer" @click="switchShowType" :class="showType == 'card' ? 'iconliebiao' : 'iconliebiaoqiehuan'"></i>
             </div>
 
-            <el-tabs v-model="activeName" class="mt-[10px]">
-                <el-tab-pane :label="t('installLabel')" name="installed"></el-tab-pane>
-                <el-tab-pane :label="t('uninstalledLabel')" name="uninstalled"></el-tab-pane>
-                <el-tab-pane :label="t('buyLabel')" name="all"></el-tab-pane>
-                <el-tab-pane :label="t('recentlyUpdated')" name="recentlyUpdated">
-                    <template #label>
-                        <span class="custom-tabs-label">
-                            <span>{{ t('recentlyUpdated') }}</span>
-                            <span v-if="localList['recentlyUpdated'].length > 0" class="w-[15px] h-[15px] bg-[#DA203E] absolute text-[#fff] text-[11px] flex items-center justify-center rounded-full top-[3px] right-[-12px]">{{ localList['recentlyUpdated'].length }}</span>
-                        </span>
-                    </template>
-                </el-tab-pane>
-            </el-tabs>
-            <div class="flex justify-between my-[10px]">
-                <div class="flex items-center search-form">
-                    <el-input class="!w-[192px] !h-[32px] rounded-[4px]" :placeholder="t('search')" v-model.trim="search_name" @keyup.enter="query">
-                        <template #suffix>
-                            <el-icon class="el-input__icon cursor-pointer" size="14px" @click="query">
-                                <search />
-                            </el-icon>
-                        </template>
-                    </el-input>
-                    <el-select v-model="search_type" placeholder="请选择类型" class="!w-[192px] !h-[32px] rounded-[4px] ml-[20px] " >
-                        <el-option :label="t('全部')" value="" />
-                        <el-option  v-for="(label, value) in typeList"  :key="value"  :label="label" :value="value"></el-option>
-                    </el-select>
-                    <el-button type="primary" @click="query" class="ml-[20px]">{{ t("搜索") }}</el-button>
-                </div>
-                <div>
-                    <el-button type="primary" v-show="activeName === 'recentlyUpdated'" @click="batchUpgrade" :loading="upgradeRef?.loading" :disabled="authLoading">{{ t("batchUpgrade") }}</el-button>
-                    <!-- <el-button type="primary" @click="handleCloudBuild" :loading="cloudBuildRef?.loading" :disabled="authLoading">{{ t("cloudBuild") }}</el-button> -->
-                </div>
-
-            </div>
-            <div class="relative">
-                <el-table v-if="localList[activeName].length && !loading"  :tree-props="{ children: 'children' }" :default-expand-all="true" :data="info[activeName]" row-key="key" size="large"  @selection-change="handleSelectionChange">
-                    <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 class="flex items-center justify-between bg-body p-4 rounded-md border rounded border-solid border-[var(--el-color-info-light-8)]">
+                <div class="flex">
+                    <div class="flex items-center">
+                        <div class="w-[40px] h-[40px] bg-purple-100 rounded flex items-center justify-center mr-2 relative">
+                            <img class="max-w-full max-h-full" src="@/app/assets/images/app_store/system_version.png" alt="" />
+                            <div v-if="frameworkVersion != frameworkNewVersion" class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]"></div>
+                        </div>
+                        <div>
+                            <p class="text-sm font-bold">系统版本:
+                                <span v-if="frameworkVersion">V{{frameworkVersion}} ({{frameworkVersionCode}})</span>
+                            </p>
+                            <p class="text-xs text-gray-500">最新版本: V{{ frameworkNewVersion }}</p>
+                        </div>
+                        <el-button class="ml-[25px]" @click="updateInformationFn({key: 'niucloud-admin'})"><el-icon class="mr-[5px]"><DocumentCopy /></el-icon>更新记录</el-button>
+                    </div>
+                    <div class="border-r mx-[25px] border-solid border-[var(--el-color-info-light-8)] hidden xl:inline-block"></div>
+                    <div class="items-center hidden xl:flex">
+                        <div class="flex items-center mr-4">
+                            <div class="w-[40px] h-[40px] bg-green-100 rounded flex items-center justify-center mr-2">
+                                <img class="max-w-full max-h-full" src="@/app/assets/images/app_store/app_manage.png" alt="" />
                             </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column type="selection" v-if="activeName === 'recentlyUpdated'" />
-                    <el-table-column :label="t('appName')" align="left" width="500">
-                        <template #default="{ row }">
-                            <div class="flex items-center cursor-pointer relative left-[-10px]">
-                                <el-image class="w-[54px] h-[54px]" :src="row.icon" fit="contain">
+                            <div>
+                                <p class="text-sm font-bold">应用管理</p>
+                                <p class="text-xs text-gray-500">
+                                    <span class="mr-[15px] text-success">已安装: {{ localList.installed.length }}</span>
+                                    <span class="mr-[15px] text-warning">可更新: {{ localList.recentlyUpdated.length }}</span>
+                                    <span class="mr-[15px] text-primary">未安装: {{ localList.uninstalled.length }}</span>
+                                    <span class="mr-[15px] text-error">已购买: {{ localList.all.length }}</span>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="flex items-center flex-1 w-0 justify-end">
+                    <el-button @click="oneClickRepair"><i class="iconfont iconyijianxiufu mr-[5px]" ></i>一键修复</el-button>
+                    <el-button type="primary" v-show="activeName == 'uninstalled'" @click="batchInstall"><i class="iconfont iconanzhuang1 mr-[5px]"></i>安装<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span></el-button>
+                    <el-button type="primary" v-show="activeName == 'recentlyUpdated'" @click="batchUpgrade"><i class="iconfont iconyijianshengji mr-[5px]"></i>一键升级<span v-if="batchUpgradeApp.length">({{ batchUpgradeApp.length }})</span></el-button>
+                    <el-checkbox label="全选" :model-value="localList[activeName].length && localList[activeName].length == batchUpgradeApp.length" @change="appKeyAllSelect" v-show="activeName == 'uninstalled' || activeName == 'recentlyUpdated'" value="Value A" class="ml-[12px]"/>
+                </div>
+            </div>
+        </el-card>
+
+        <div class="flex mb-4 flex-wrap" v-show="showType == 'card'" v-if="localList[activeName].length && !loading">
+            <div class="rounded-md border p-[16px] pr-[20px] app-card mb-[20px] ml-[20px] cursor-pointer"
+                 @click="appKeySingleSelect($event, row.key)"
+                 :class="{'border-primary': batchUpgradeApp.includes(row.key)}" v-for="row in localList[activeName]" :key="row.key">
+
+                <div class="flex justify-between mb-2">
+                    <div class="flex items-center flex-1 w-0">
+                        <div class="w-[48px] h-[48px] bg-purple-100 rounded flex items-center justify-center mr-2 relative">
+                            <div class="w-full h-full overflow-hidden rounded">
+                                <el-image class="w-full h-full overflow-hidden rounded" :src="row.icon" fit="contain">
                                     <template #error>
                                         <div class="flex items-center w-full h-full">
-                                        <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
+                                            <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
                                         </div>
                                     </template>
                                 </el-image>
-                                <div class="flex-1 w-0 flex flex-col justify-center pl-[20px] font-500 text-[13px]">
-                                    <div class="w-[236px] truncate leading-[18px]">{{ row.title }}</div>
-                                    <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-if="row.install_info && Object.keys(row.install_info)?.length">{{ row.install_info.version }}</div>
-                                    <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-else>{{ row.version }}</div>
-                                    <div class="mt-[3px] flex flex-nowrap">
-                                        <el-tag type="danger" size="small" v-if="activeName == 'recentlyUpdated' && row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version">{{ t("newVersion") }}{{ row.version }}</el-tag>
-                                        <el-tooltip v-if="versionJudge(row)" effect="dark" :content="`该插件适配框架版本为${ row.support_version }，与已安装框架版本${frameworkVersion}不完全兼容`" placement="top-start">
-                                            <el-tag type="warning" size="small" class="ml-[3px]">该插件适配框架版本为{{ row.support_version }}，与已安装框架版本{{frameworkVersion}}不完全兼容</el-tag>
-                                        </el-tooltip>
-                                    </div>
-                                </div>
+                                <img src="@/app/assets/images/app_store/app_type_addon.png" alt="" class="absolute z-1 right-0 bottom-0" v-if="row.type == 'addon'">
+                                <img src="@/app/assets/images/app_store/app_type_app.png" alt="" class="absolute z-1 right-0 bottom-0" v-else>
                             </div>
-                        </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('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('operation')" fixed="right" align="right" width="250">
-                        <template #default="{ row }">
-                            <el-button class="!text-[13px]" v-if="activeName == 'recentlyUpdated' && row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version" type="primary" link @click="upgradeAddonFn(row.key)">{{ t("upgrade") }}</el-button>
-                            <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length" type="primary" link @click="uninstallAddonFn(row.key)">{{ t("unload") }}</el-button>
-                            <template v-if="row.is_download && (!row.install_info || !Object.keys(row.install_info).length)">
-                                <el-button class="!text-[13px]" type="primary" link @click="installAddonFn(row.key)">{{ t("install") }}</el-button>
-                                <el-button class="!text-[13px]" type="primary" link @click="deleteAddonFn(row.key)">{{ t("delete") }}</el-button>
-                            </template>
-                            <el-button class="!text-[13px]" v-if="!row.is_download" :loading="downloading == row.key" :disabled="downloading != ''" type="primary" link @click.stop="downEvent(row)">
-                                <span>{{ t("down") }}</span>
-                            </el-button>
-                            <el-button class="!text-[13px]" type="primary" link @click="getAddonDetailFn(row)">{{ t("detail") }}</el-button>
-                            <el-button class="!text-[13px]" type="primary" link @click="updateInformationFn(row)">更新信息</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <div class="data-loading" v-if="loading || !localList[activeName].length">
-                    <el-table :data="[]" size="large" class="pt-[5px]">
-                        <el-table-column :label="t('appName')" align="left" width="320" />
-                        <el-table-column align="left" min-width="120" />
-                        <el-table-column :label="t('introduction')" align="left" min-width="200" />
-                        <el-table-column :label="t('type')" align="left" min-width="100" />
-                        <el-table-column :label="t('author')" align="left" min-width="100" />
-                        <el-table-column :label="t('operation')" fixed="right" align="right" width="150" />
-                        <template #empty>
-                            <span></span>
-                        </template>
-                    </el-table>
-                    <div class="h-[100px]" v-loading="loading" v-if="loading"></div>
-                </div>
-                <el-empty class="mx-auto overview-empty" v-if="!localList.installed.length && !loading && activeName == 'installed' && !authLoading">
-                    <template #image>
-                        <div class="w-[230px] mx-auto">
-                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+                            <div class="w-[8px] h-[8px] bg-[red] rounded-[8px] z-1 absolute top-[-2px] right-[-2px]" v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version"></div>
                         </div>
-                    </template>
-                    <template #description>
-                        <p class="flex items-center">{{ t("installed-empty") }}</p>
-                    </template>
-                </el-empty>
-                <el-empty class="mx-auto overview-empty" v-if="!localList.uninstalled.length && !loading && activeName == 'uninstalled' && !authLoading">
-                    <template #image>
-                        <div class="w-[230px] mx-auto">
-                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+                        <div class="flex-1 w-0">
+                            <p class="text-sm font-medium truncate" :title="row.title">{{ row.title }}</p>
+                            <p class="text-xs text-gray-500 truncate"  :title="row.key">{{ row.key }}</p>
                         </div>
-                    </template>
-                    <template #description>
-                        <p class="flex items-center">
-                            <span>{{ t("descriptionLeft") }}</span>
-                            <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t("link") }}</el-link>
-                            <span>{{ t("descriptionRight") }}</span>
-                        </p>
-                    </template>
-                </el-empty>
-                <div v-if="!localList.all.length && !loading && !authinfo && activeName == 'all' && !authLoading" class="mx-auto overview-empty flex flex-col items-center pt-14 pb-6">
-                    <div class="mb-[20px] text-sm text-[#888]">检测到当前账号尚未绑定授权，请先绑定授权！</div>
-                    <div class="flex flex-1 flex-wrap justify-center relative">
-                        <el-button class="w-[154px] !h-[48px] mt-[8px]" type="primary" @click="authCodeApproveFn">授权码认证</el-button>
-                        <el-popover ref="getAuthCodeDialog" placement="bottom" :width="478" trigger="click" class="mt-[8px]">
-                            <div class="px-[18px] py-[8px]">
-                                <p class="leading-[32px] text-[14px]">您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务</p>
-                                <div class="flex justify-end mt-[36px]">
-                                    <el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
-                                    <el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
-                                </div>
-                            </div>
-                            <template #reference>
-                                <el-button class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent" plain type="primary">如何获取授权码?</el-button>
-                            </template>
-                        </el-popover>
                     </div>
+                    <el-checkbox @click.stop :model-value="batchUpgradeApp.includes(row.key)" :value="row.key" @change="appKeySingleSelect($event, row.key)" class="!w-[14px] !h-[14px]" v-if="activeName == 'recentlyUpdated' || activeName == 'uninstalled'"></el-checkbox>
                 </div>
-                <el-empty class="mx-auto overview-empty" v-if="!localList.all.length && !loading && authinfo && activeName == 'all' && !authLoading">
-                    <template #image>
-                        <div class="w-[230px] mx-auto">
-                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
-                        </div>
+                <div class="flex justify-between">
+                    <div class="text-base">
+                        <span>版本: </span>
+                        <span>{{ row.install_info && Object.keys(row.install_info)?.length ? row.install_info.version : row.version }}</span>
+                        <template v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version">
+                            <i class="iconfont iconyoujiantou text-warning mx-[2px]"></i>
+                            <span class="text-warning">{{ row.version }}</span>
+                        </template>
+                    </div>
+                    <el-button type="primary" link @click.stop="updateInformationFn(row)">更新记录</el-button>
+                </div>
+
+                <div class="flex mt-[20px]">
+                    <template v-if="!row.is_download">
+                        <el-button type="primary" class="flex-1" :loading="downloading == row.key" :disabled="downloading != ''" @click.stop="downEvent(row)"><i class="iconfont iconanzhuang1 mr-[5px]"></i>立即下载</el-button>
                     </template>
-                    <template #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 v-else-if="!row.install_info || Object.keys(row.install_info).length == 0">
+                        <el-button type="primary" class="flex-1" @click.stop="installAddonFn(row.key)"><i class="iconfont iconanzhuang1 mr-[5px]"></i>立即安装</el-button>
+                        <el-button plain @click.stop="deleteAddonFn(row.key)">删除</el-button>
                     </template>
-                </el-empty>
-                <el-empty class="mx-auto overview-empty" v-if="!localList.recentlyUpdated.length && !loading && authinfo && activeName == 'recentlyUpdated' && !authLoading">
-                    <template #image>
-                        <div class="w-[230px] mx-auto">
-                            <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
-                        </div>
+                    <template v-else>
+                        <el-button type="warning" class="flex-1" @click.stop="upgradeAddonFn(row.key)" v-if="row.install_info.version != row.version">
+                            <i class="iconfont icongengxin mr-[5px]"></i>立即更新
+                        </el-button>
+                        <el-button class="flex-1" :disabled="true" v-else>
+                            <el-icon class="mr-[5px]"><Check /></el-icon>已是最新
+                        </el-button>
+                        <el-button plain @click.stop="uninstallAddonFn(row.key)">卸载</el-button>
                     </template>
-                    <template #description>
-                        <p class="flex items-center">{{ t("recentlyUpdatedEmpty") }}</p>
-                    </template>
-                </el-empty>
+                </div>
             </div>
+        </div>
 
-            <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" />
+        <div class="relative px-[20px] pb-[20px]" v-show="showType == 'list'">
+            <el-table v-if="localList[activeName].length && !loading" ref="tableRef" :tree-props="{ children: 'children' }" :default-expand-all="true" :data="info[activeName]" row-key="key" size="large">
+                <el-table-column width="24">
+                    <template #default="{ row }">
+                        <div class="tree-child-cell" :class="{ 'is-tree-parent': row.children?.length, 'is-tree-child': typeof row.support_app === 'string' && row.support_app !== '' && visibleRowKeys.has(row.support_app)}">
+                        <span style="opacity: 0;">.</span>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column v-if="activeName === 'recentlyUpdated' || activeName === 'uninstalled'" width="60px">
+                    <template #default="{ row }">
+                        <el-checkbox @click.stop :model-value="batchUpgradeApp.includes(row.key)" :value="row.key" @change="appKeySingleSelect($event, row.key)"></el-checkbox>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('appName')" align="left" width="500">
+                    <template #default="{ row }">
+                        <div class="flex items-center cursor-pointer relative left-[-10px]">
+                            <el-image class="w-[54px] h-[54px]" :src="row.icon" fit="contain">
+                                <template #error>
+                                    <div class="flex items-center w-full h-full">
+                                    <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
+                                    </div>
+                                </template>
+                            </el-image>
+                            <div class="flex-1 w-0 flex flex-col justify-center pl-[20px] font-500 text-[13px]">
+                                <div class="w-[236px] truncate leading-[18px]">{{ row.title }}</div>
+                                <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-if="row.install_info && Object.keys(row.install_info)?.length">{{ row.install_info.version }}</div>
+                                <div class="w-[236px] truncate leading-[18px] mt-[6px]" v-else>{{ row.version }}</div>
+                                <div class="mt-[3px] flex flex-nowrap">
+                                    <el-tag type="danger" size="small" v-if="activeName == 'recentlyUpdated' && row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version">{{ t("newVersion") }}{{ row.version }}</el-tag>
+                                    <el-tooltip v-if="versionJudge(row)" effect="dark" :content="`该插件适配框架版本为${ row.support_version }，与已安装框架版本${frameworkVersion}不完全兼容`" placement="top-start">
+                                        <el-tag type="warning" size="small" class="ml-[3px]">该插件适配框架版本为{{ row.support_version }}，与已安装框架版本{{frameworkVersion}}不完全兼容</el-tag>
+                                    </el-tooltip>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
+
+                <el-table-column align="left" min-width="150">
+                    <template #header>
+                        <div class="flex items-center">
+                            <span class="font-500 text-[13px] mr-[5px]">{{ t("appIdentification") }}</span>
+                            <el-tooltip class="box-item" effect="light" :content="t('tipText')" placement="bottom">
+                            <el-icon class="cursor-pointer text-[16px] text-[#a9a9a9]">
+                                <QuestionFilled />
+                            </el-icon>
+                            </el-tooltip>
+                        </div>
+                    </template>
+                    <template #default="{ row }">
+                        <span class="font-500 text-[13px]">{{ row.key }}</span>
+                    </template>
+                </el-table-column>
+
+                <el-table-column :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('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" width="250">
+                    <template #default="{ row }">
+                        <el-button class="!text-[13px]" v-if="activeName == 'recentlyUpdated' && row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version" type="primary" link @click="upgradeAddonFn(row.key)">{{ t("upgrade") }}</el-button>
+                        <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length" type="primary" link @click="uninstallAddonFn(row.key)">{{ t("unload") }}</el-button>
+                        <template v-if="row.is_download && (!row.install_info || !Object.keys(row.install_info).length)">
+                            <el-button class="!text-[13px]" type="primary" link @click="installAddonFn(row.key)">{{ t("install") }}</el-button>
+                            <el-button class="!text-[13px]" type="primary" link @click="deleteAddonFn(row.key)">{{ t("delete") }}</el-button>
+                        </template>
+                        <el-button class="!text-[13px]" v-if="!row.is_download" :loading="downloading == row.key" :disabled="downloading != ''" type="primary" link @click.stop="downEvent(row)">
+                            <span>{{ t("down") }}</span>
+                        </el-button>
+                        <el-button class="!text-[13px]" type="primary" link @click="getAddonDetailFn(row)">{{ t("detail") }}</el-button>
+                        <el-button class="!text-[13px]" type="primary" link @click="updateInformationFn(row)">更新信息</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="data-loading" v-if="loading || !localList[activeName].length">
+                <el-table :data="[]" size="large" class="pt-[5px]">
+                    <el-table-column :label="t('appName')" align="left" width="320" />
+                    <el-table-column align="left" min-width="120" />
+                    <el-table-column :label="t('introduction')" align="left" min-width="200" />
+                    <el-table-column :label="t('type')" align="left" min-width="100" />
+                    <el-table-column :label="t('author')" align="left" min-width="100" />
+                    <el-table-column :label="t('operation')" fixed="right" align="right" width="150" />
+                    <template #empty>
+                        <span></span>
+                    </template>
+                </el-table>
+                <div class="h-[100px]" v-loading="loading" v-if="loading"></div>
+            </div>
+        </div>
+
+        <el-empty class="mx-auto overview-empty" v-if="!localList.installed.length && !loading && activeName == 'installed' && !authLoading">
+            <template #image>
+                <div class="w-[230px] mx-auto">
+                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+                </div>
+            </template>
+            <template #description>
+                <p class="flex items-center">{{ t("installed-empty") }}</p>
+            </template>
+        </el-empty>
+        <el-empty class="mx-auto overview-empty" v-if="!localList.uninstalled.length && !loading && activeName == 'uninstalled' && !authLoading">
+            <template #image>
+                <div class="w-[230px] mx-auto">
+                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+                </div>
+            </template>
+            <template #description>
+                <p class="flex items-center">
+                    <span>{{ t("descriptionLeft") }}</span>
+                    <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t("link") }}</el-link>
+                    <span>{{ t("descriptionRight") }}</span>
+                </p>
+            </template>
+        </el-empty>
+        <div v-if="!localList.all.length && !loading && !authinfo && activeName == 'all' && !authLoading" class="mx-auto overview-empty flex flex-col items-center pt-14 pb-6">
+            <div class="mb-[20px] text-sm text-[#888]">检测到当前账号尚未绑定授权，请先绑定授权！</div>
+            <div class="flex flex-1 flex-wrap justify-center relative">
+                <el-button class="w-[154px] !h-[48px] mt-[8px]" type="primary" @click="authCodeApproveFn">授权码认证</el-button>
+                <el-popover ref="getAuthCodeDialog" placement="bottom" :width="478" trigger="click" class="mt-[8px]">
+                    <div class="px-[18px] py-[8px]">
+                        <p class="leading-[32px] text-[14px]">您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务</p>
+                        <div class="flex justify-end mt-[36px]">
+                            <el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
+                            <el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
+                        </div>
+                    </div>
+                    <template #reference>
+                        <el-button class="w-[154px] !h-[48px] mt-[8px] !text-[var(--el-color-primary)] hover:!text-[var(--el-color-primary)] !bg-transparent" plain type="primary">如何获取授权码?</el-button>
+                    </template>
+                </el-popover>
+            </div>
+        </div>
+        <el-empty class="mx-auto overview-empty" v-if="!localList.all.length && !loading && authinfo && activeName == 'all' && !authLoading">
+            <template #image>
+                <div class="w-[230px] mx-auto">
+                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+                </div>
+            </template>
+            <template #description>
+                <p class="flex items-center">
+                    <span>{{ t("buyDescriptionLeft") }}</span>
+                    <el-link type="primary" @click="goRouter" class="mx-[5px]">{{ t("link") }}</el-link>
+                    <span>{{ t("descriptionRight") }}</span>
+                </p>
+            </template>
+        </el-empty>
+        <el-empty class="mx-auto overview-empty" v-if="!localList.recentlyUpdated.length && !loading && activeName == 'recentlyUpdated'">
+            <template #image>
+                <div class="w-[230px] mx-auto">
+                    <img src="@/app/assets/images/index/apply_empty.png" class="max-w-full" alt="" />
+                </div>
+            </template>
+            <template #description>
+                <p class="flex items-center">{{ t("recentlyUpdatedEmpty") }}</p>
+            </template>
+        </el-empty>
+
+        <el-dialog v-model="authCodeApproveDialog" title="授权码认证" width="400px">
+            <el-form :model="formData" label-width="0" ref="formRef" :rules="formRules" class="page-form">
+                <el-card class="box-card !border-none" shadow="never">
+                    <el-form-item prop="auth_code">
+                        <el-input v-model.trim="formData.auth_code" :placeholder="t('authCodePlaceholder')" class="input-width" clearable size="large" />
+                    </el-form-item>
+
+                    <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>
+        <!-- 详情 -->
+        <el-dialog v-model="appStoreShowDialog" :title="t('plugDetail')" width="500px" :destroy-on-close="true">
+            <el-form :model="appStoreInfo" label-width="120px" ref="formRef" class="page-form">
+                <el-form-item :label="t('title')">
+                    <div class="input-width">{{ appStoreInfo.title }}</div>
+                </el-form-item>
+                <el-form-item :label="t('desc')">
+                    <div class="input-width">{{ appStoreInfo.desc }}</div>
+                </el-form-item>
+                <el-form-item :label="t('author')">
+                    <div class="input-width">{{ appStoreInfo.author }}</div>
+                </el-form-item>
+                <el-form-item :label="t('version')">
+                    <div class="input-width">{{ appStoreInfo.version }}</div>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="appStoreShowDialog = false">{{ t("confirm") }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
 
-                        <div class="mt-[20px]">
-                            <el-button type="primary" class="w-full" size="large" :loading="saveLoading" @click="save(formRef)">{{ t("confirm") }}
-                            </el-button>
-                        </div>
-                        <div class="mt-[10px] text-right">
-                            <el-button type="primary" link @click="market">{{ t("notHaveAuth") }}</el-button>
-                        </div>
-                    </el-card>
-                </el-form>
-            </el-dialog>
-            <!-- 详情 -->
-            <el-dialog v-model="appStoreShowDialog" :title="t('plugDetail')" width="500px" :destroy-on-close="true">
-                <el-form :model="appStoreInfo" label-width="120px" ref="formRef" class="page-form">
-                    <el-form-item :label="t('title')">
-                        <div class="input-width">{{ appStoreInfo.title }}</div>
-                    </el-form-item>
-                    <el-form-item :label="t('desc')">
-                        <div class="input-width">{{ appStoreInfo.desc }}</div>
-                    </el-form-item>
-                    <el-form-item :label="t('author')">
-                        <div class="input-width">{{ appStoreInfo.author }}</div>
-                    </el-form-item>
-                    <el-form-item :label="t('version')">
-                        <div class="input-width">{{ appStoreInfo.version }}</div>
-                    </el-form-item>
-                </el-form>
-                <template #footer>
-                    <span class="dialog-footer">
-                        <el-button type="primary" @click="appStoreShowDialog = false">{{ t("confirm") }}</el-button>
-                    </span>
-                </template>
-            </el-dialog>
-
-            <!-- 安装弹窗 -->
-            <el-dialog v-model="installShowDialog" :title="t('addonInstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="installShowDialogClose">
-                <el-steps :space="200" :active="installStep" class="number-of-steps" process-status="process" align-center v-if="installStep != 2 && !errorDialog ">
-                    <el-step :title="t('envCheck')" class="flex-1" />
-                    <el-step :title="t('installProgress')" class="flex-1" />
-                    <el-step :title="t('installComplete')" class="flex-1" />
-                </el-steps>
-                <div v-show="installStep == 0" v-loading="!installCheckResult.dir">
-                    <!-- <el-scrollbar max-height="50vh"> -->
-                        <div class="min-h-[150px]">
-                            <div class="my-3" v-if="installCheckResult.dir">
+        <!-- 安装弹窗 -->
+        <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.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 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>
@@ -285,187 +371,193 @@
                                             <span>{{ t("status") }}</span>
                                         </el-col>
                                     </el-row>
-                                    <el-scrollbar style="height: calc(300px); overflow: auto">
-                                        <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_readable" :key="index">
-                                            <el-col :span="18">
-                                                <span>{{ item.dir }}</span>
-                                            </el-col>
-                                            <el-col :span="3">
-                                                <span>{{ t("readable") }}</span>
-                                            </el-col>
-                                            <el-col :span="3" >
-                                                <span v-if="item.status">
-                                                    <el-icon color="green">
-                                                        <Select />
-                                                    </el-icon>
-                                                </span>
-                                                <span v-else>
-                                                    <el-icon color="red">
-                                                        <CloseBold />
-                                                    </el-icon>
-                                                </span>
-                                            </el-col>
-                                        </el-row>
-                                        <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_write" :key="index">
-                                            <el-col :span="18">
-                                                <span>{{ item.dir }}</span>
-                                            </el-col>
-                                            <el-col :span="3">
-                                                <span>{{ t("write") }}</span>
-                                            </el-col>
-                                            <el-col :span="3">
-                                                <span v-if="item.status" class="text-right">
-                                                    <el-icon color="green">
-                                                        <Select />
-                                                    </el-icon>
-                                                </span>
-                                                <span v-else>
-                                                    <el-icon color="red">
-                                                        <CloseBold />
-                                                    </el-icon>
-                                                </span>
-                                            </el-col>
-                                        </el-row>
-                                    </el-scrollbar>
+                                    <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_readable" :key="index">
+                                        <el-col :span="18">
+                                            <span>{{ item.dir }}</span>
+                                        </el-col>
+                                        <el-col :span="3">
+                                            <span>{{ t("readable") }}</span>
+                                        </el-col>
+                                        <el-col :span="3" >
+                                            <span v-if="item.status">
+                                                <el-icon color="green">
+                                                    <Select />
+                                                </el-icon>
+                                            </span>
+                                            <span v-else>
+                                                <el-icon color="red">
+                                                    <CloseBold />
+                                                </el-icon>
+                                            </span>
+                                        </el-col>
+                                    </el-row>
+                                    <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in installCheckResult.dir.is_write" :key="index">
+                                        <el-col :span="18">
+                                            <span>{{ item.dir }}</span>
+                                        </el-col>
+                                        <el-col :span="3">
+                                            <span>{{ t("write") }}</span>
+                                        </el-col>
+                                        <el-col :span="3">
+                                            <span v-if="item.status" class="text-right">
+                                                <el-icon color="green">
+                                                    <Select />
+                                                </el-icon>
+                                            </span>
+                                            <span v-else>
+                                                <el-icon color="red">
+                                                    <CloseBold />
+                                                </el-icon>
+                                            </span>
+                                        </el-col>
+                                    </el-row>
                                 </div>
                             </div>
-                        </div>
-                    <!-- </el-scrollbar> -->
-                    <div class="flex justify-end">
-                        <el-tooltip effect="dark" placement="top">
-                            <template #content>
-                                <div class="w-[400px]">
-                                    {{t("installTips")}}
+                            <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>
-                            </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>
+                        </el-scrollbar>
                     </div>
-                </div>
-                <div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]">
-                    <terminal ref="terminalRef" :name="`install-${terminalId}`" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
-                </div>
-                <div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col">
-                    <!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> -->
-                    <!-- 提示信息 -->
-                    <!-- <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
-                        <el-alert :title="item" type="error" :closable="false" />
-                    </div> -->
-                    <el-result icon="success" :title="t('addonInstallSuccess')">
-                        <template #icon>
-                            <img src="@/app/assets/images/success_icon.png" alt="">
-                        </template>
-                        <template #extra>
-                            <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
-                                <div class="text-[16px] text-[#4F516D] mt-[5px]">{{ item }}</div>
-                            </div>
-                            <div class="text-[16px] text-[#9699B6] mt-[10px]" v-if="upgradeDuration>0">本次安装用时{{ formatUpgradeDuration }}</div>
-                            <div class="mt-[20px]">
-                                <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">返回</el-button>
-                                <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
+                <!-- </el-scrollbar> -->
+                <div class="flex justify-end">
+                    <el-tooltip effect="dark" placement="top">
+                        <template #content>
+                            <div class="w-[400px]">
+                                {{t("installTips")}}
                             </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="">
+                        <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>
-                        <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 type="primary" :disabled="!installCheckResult.is_pass || localInstalling" :loading="cloudInstalling" @click="handleCloudInstall">{{ t("cloudInstall") }}</el-button>
+                    </el-tooltip>
+                </div>
+            </div>
+            <div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]">
+                <terminal ref="terminalRef" :name="`install-${terminalId}`" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
+            </div>
+            <div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col">
+                <!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> -->
+                <!-- 提示信息 -->
+                <!-- <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
+                    <el-alert :title="item" type="error" :closable="false" />
+                </div> -->
+                <el-result icon="success" :title="t('addonInstallSuccess')">
+                    <template #icon>
+                        <img src="@/app/assets/images/success_icon.png" alt="">
+                    </template>
+                    <template #extra>
+                        <div v-for="(item, index) in installAfterTips" class="mb-[10px]" :key="index">
+                            <div class="text-[16px] text-[#4F516D] mt-[5px]">{{ item }}</div>
+                        </div>
+                        <div class="text-[16px] text-[#9699B6] mt-[10px]" v-if="upgradeDuration>0">本次安装用时{{ formatUpgradeDuration }}</div>
+                        <div class="mt-[20px]">
+                            <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">返回</el-button>
                             <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
-                        </template>
-                    </el-result>
-                </div>
-            </el-dialog>
+                        </div>
+                    </template>
+                </el-result>
+            </div>
+            <div class="h-[50vh] mt-[20px] flex flex-col" v-show="errorDialog">
+                <el-result icon="error" :title="t('安装失败')">
+                    <template #icon>
+                        <img src="@/app/assets/images/error_icon.png" alt="">
+                    </template>
+                    <template #extra>
+                        <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+                            {{errorMsg}}
+                        </el-scrollbar>
+                        <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">错误信息</el-button>
+                        <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
+                    </template>
+                </el-result>
+            </div>
+        </el-dialog>
 
-            <el-dialog v-model="uninstallShowDialog" :title="t('addonUninstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false">
-                <el-scrollbar max-height="50vh">
-                    <div class="min-h-[150px]">
-                        <div class="bg-[#fff] my-3" v-if="uninstallCheckResult.dir">
-                            <p class="pt-[20px] pl-[20px]">{{ t("dirPermission") }}</p>
-                            <div class="px-[20px] pt-[10px] text-[14px]">
-                                <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
-                                    <el-col :span="18">
-                                        <span>{{ t("path") }}</span>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <span>{{ t("demand") }}</span>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <span>{{ t("status") }}</span>
-                                    </el-col>
-                                </el-row>
-                                <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_readable" :key="index">
-                                    <el-col :span="18">
-                                        <span>{{ item.dir }}</span>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <span>{{ t("readable") }}</span>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <span v-if="item.status">
-                                            <el-icon color="green">
-                                                <Select />
-                                            </el-icon>
-                                        </span>
-                                        <span v-else>
-                                            <el-icon color="red">
-                                                <CloseBold />
-                                            </el-icon>
-                                        </span>
-                                    </el-col>
-                                </el-row>
-                                <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_write" :key="index">
-                                    <el-col :span="18">
-                                        <span>{{ item.dir }}</span>
-                                    </el-col>
-                                    <el-col :span="3">
-                                        <span>{{ t("write") }}</span>
-                                    </el-col>
-                                    <el-col :span="3" >
-                                        <span v-if="item.status">
-                                            <el-icon color="green">
-                                                <Select />
-                                            </el-icon>
-                                        </span>
-                                        <span v-else>
-                                            <el-icon color="red">
-                                                <CloseBold />
-                                            </el-icon>
-                                        </span>
-                                    </el-col>
-                                </el-row>
-                            </div>
+        <el-dialog v-model="uninstallShowDialog" :title="t('addonUninstall')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false">
+            <el-scrollbar max-height="50vh">
+                <div class="min-h-[150px]">
+                    <div class="bg-[#fff] my-3" v-if="uninstallCheckResult.dir">
+                        <p class="pt-[20px] pl-[20px]">{{ t("dirPermission") }}</p>
+                        <div class="px-[20px] pt-[10px] text-[14px]">
+                            <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
+                                <el-col :span="18">
+                                    <span>{{ t("path") }}</span>
+                                </el-col>
+                                <el-col :span="3">
+                                    <span>{{ t("demand") }}</span>
+                                </el-col>
+                                <el-col :span="3">
+                                    <span>{{ t("status") }}</span>
+                                </el-col>
+                            </el-row>
+                            <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_readable" :key="index">
+                                <el-col :span="18">
+                                    <span>{{ item.dir }}</span>
+                                </el-col>
+                                <el-col :span="3">
+                                    <span>{{ t("readable") }}</span>
+                                </el-col>
+                                <el-col :span="3">
+                                    <span v-if="item.status">
+                                        <el-icon color="green">
+                                            <Select />
+                                        </el-icon>
+                                    </span>
+                                    <span v-else>
+                                        <el-icon color="red">
+                                            <CloseBold />
+                                        </el-icon>
+                                    </span>
+                                </el-col>
+                            </el-row>
+                            <el-row class="pb-[10px] items pl-[15px]" v-for="(item, index) in uninstallCheckResult.dir.is_write" :key="index">
+                                <el-col :span="18">
+                                    <span>{{ item.dir }}</span>
+                                </el-col>
+                                <el-col :span="3">
+                                    <span>{{ t("write") }}</span>
+                                </el-col>
+                                <el-col :span="3" >
+                                    <span v-if="item.status">
+                                        <el-icon color="green">
+                                            <Select />
+                                        </el-icon>
+                                    </span>
+                                    <span v-else>
+                                        <el-icon color="red">
+                                            <CloseBold />
+                                        </el-icon>
+                                    </span>
+                                </el-col>
+                            </el-row>
                         </div>
                     </div>
-                </el-scrollbar>
-            </el-dialog>
+                </div>
+            </el-scrollbar>
+        </el-dialog>
 
-            <!-- 下载提示 -->
-            <el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
-                <span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
-                <template #footer>
-                    <span class="dialog-footer">
-                        <el-button @click="unloadHintDialog = false">取消</el-button>
-                        <el-button type="primary" @click="downEventHintFn">确定</el-button>
-                    </span>
-                </template>
-            </el-dialog>
-            <!-- 更新信息 -->
-        </el-card>
+        <!-- 下载提示 -->
+        <el-dialog v-model="unloadHintDialog" title="下载提示" width="30%">
+            <span>本地已经存在该插件/应用，再次下载会覆盖该插件/应用。</span>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="unloadHintDialog = false">取消</el-button>
+                    <el-button type="primary" @click="downEventHintFn">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
+        <!-- 更新信息 -->
     </div>
     <upgrade-log :upgradeKey="upgradeKey" ref="upgradeLogRef" />
     <upgrade ref="upgradeRef" @complete="localListFn" @cloudbuild="handleCloudBuild" />
@@ -473,7 +565,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, watch, h ,computed } from 'vue'
+import { ref, reactive, watch, h, computed, nextTick } from 'vue'
 import { t } from '@/lang'
 import {
     getAddonLocal,
@@ -488,7 +580,7 @@ import {
     getAddonInit
 } from '@/app/api/addon'
 import { deleteAddonDevelop } from '@/app/api/tools'
-import { downloadVersion, getAuthInfo, setAuthInfo } from '@/app/api/module'
+import { downloadVersion, getAuthInfo, setAuthInfo, getFrameworkNewVersion } from '@/app/api/module'
 import { getVersions } from '@/app/api/auth'
 import { ElMessage, ElMessageBox, ElNotification, FormInstance, FormRules } from 'element-plus'
 import 'vue-web-terminal/lib/theme/dark.css'
@@ -501,9 +593,10 @@ import Upgrade from '@/app/components/upgrade/index.vue'
 import CloudBuild from '@/app/components/cloud-build/index.vue'
 import UpgradeLog from '@/app/components/upgrade-log/index.vue'
 
+const tableRef = ref(null)
 const router = useRouter()
 const route = useRoute()
-const terminalId = ref(Date.now());
+const terminalId = ref(Date.now())
 const activeName = ref(storage.get('storeActiveName') || 'installed')
 const upgradeRef = ref(null)
 const cloudBuildRef = ref(null)
@@ -514,10 +607,22 @@ const userStore = useUserStore()
 const unloadHintDialog = ref(false)
 const terminalRef = ref(null)
 const frameworkVersion = ref('')
+const frameworkVersionCode = ref('')
 const upgradeLogRef = ref<any>(null)
+const showType = ref(storage.get('storeShowType') || 'card')
+const frameworkNewVersion = ref('')
 getVersions().then((res) => {
     frameworkVersion.value = res.data.version.version
+    frameworkVersionCode.value = res.data.version.code
 })
+getFrameworkNewVersion().then(({ data }) => {
+    frameworkNewVersion.value = data.last_version
+})
+
+const switchShowType = () => {
+    showType.value = showType.value == 'card' ? 'list' : 'card'
+    storage.set({key: 'storeShowType', data: showType.value})
+}
 
 const typeList = ref({})
 const getAddonInitFn = () => {
@@ -534,6 +639,12 @@ const downEventHintFn = () => {
 const activeNameTabFn = (data: any) => {
     activeName.value = data
     storage.set({ key: 'storeActiveName', data })
+
+    if ((data == 'uninstalled' || data == 'recentlyUpdated') && localList.value[activeName.value].length) {
+        batchUpgradeApp.value = localList.value[activeName.value].map(item => item.key)
+    } else {
+        batchUpgradeApp.value = []
+    }
 }
 if (route.query.id) {
     activeNameTabFn(route.query.id)
@@ -603,26 +714,7 @@ const buildInfo = (list: any[]) => {
 
     return result
 }
-// const query = () => {
-//     if (search_name.value == '' || search_name.value == 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 false
-//     }
 
-//     const filteredInstalled = localList.value.installed.filter((el: any) => el.title.indexOf(search_name.value) != -1)
-//     const filteredUninstalled = localList.value.uninstalled.filter((el: any) => el.title.indexOf(search_name.value) != -1)
-//     const filteredAll = localList.value.all.filter((el: any) => el.title.indexOf(search_name.value) != -1)
-//     const filteredRecentlyUpdated = localList.value.recentlyUpdated.filter((el: any) => el.title.indexOf(search_name.value) != -1)
-
-//     // 构建父子关系
-//     info.value.installed = buildInfo(filteredInstalled)
-//     info.value.uninstalled = buildInfo(filteredUninstalled)
-//     info.value.all = buildInfo(filteredAll)
-//     info.value.recentlyUpdated = buildInfo(filteredRecentlyUpdated)
-// }
 const query = () => {
     const name = search_name.value
     const type = search_type.value
@@ -689,6 +781,7 @@ const localListFn = () => {
                 appLink.value[item.meta.app] = item.name
             }
         })
+        activeNameTabFn(activeName.value)
         loading.value = false
     }).catch(() => {
         loading.value = false
@@ -909,6 +1002,7 @@ const handleCloudInstall = () => {
         installStep.value = 1
         terminalRef.value.execute('clear')
         terminalRef.value.execute('开始安装插件')
+        if (res.data.length) installAfterTips.value = res.data
         getInstallTask()
         cloudInstalling.value = false
     }).catch((res) => {
@@ -1155,23 +1249,55 @@ const versionJudge = (row: any) => {
     return false
 }
 
-let batchUpgradeApp = []
-const handleSelectionChange = (e: any) => {
-    batchUpgradeApp = e.map(item => item.key)
+const batchUpgradeApp = ref<String[]>([])
+
+const appKeyAllSelect = () => {
+    if (localList.value[activeName.value].length) {
+        if (localList.value[activeName.value].length == batchUpgradeApp.value.length) {
+            batchUpgradeApp.value = []
+        } else {
+            batchUpgradeApp.value = localList.value[activeName.value].map(item => item.key)
+        }
+    }
+}
+
+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)
+    }
 }
 
 const batchUpgrade = () => {
-    if (!batchUpgradeApp.length) {
-        ElMessage({ message: '请先勾选要升级的插件', type: 'error', duration: 5000 })
+    const appKeys = batchUpgradeApp.value
+    if (frameworkVersion.value != frameworkNewVersion.value) {
+        appKeys.unshift('niucloud-admin')
+    }
+    if (!appKeys.length) {
+        ElMessage({ message: localList.recentlyUpdated.length ? '请先勾选要升级的插件' : '当前已是最新版', type: 'error', duration: 5000 })
         return
     }
+    upgradeAddonFn(appKeys.toString())
+}
 
-    upgradeAddonFn(batchUpgradeApp.toString())
+const batchInstall = () => {
+    const appKeys = batchUpgradeApp.value
+    if (!appKeys.length) {
+        ElMessage({ message: '请先勾选要安装的插件', type: 'error', duration: 5000 })
+        return
+    }
+    installAddonFn(appKeys.toString())
 }
 
 const visibleRowKeys = computed(() => {
-    return new Set((info.value[activeName.value] || []).map(row => row.key));
-});
+    return new Set((info.value[activeName.value] || []).map(row => row.key))
+})
+
+const oneClickRepair = () => {
+    ElMessage({ message: '即将上线敬请期待', duration: 5000 })
+}
 </script>
 
 <style lang="scss" scoped>
@@ -1451,6 +1577,11 @@ html.dark .table-head-bg {
     }
 }
 
+.app-card {
+    width: calc((100% - 120px) / 5);
+    min-width: 260px;
+}
+
 </style>
 
 <style>
diff --git a/admin/src/components/diy-link/index.vue b/admin/src/components/diy-link/index.vue
index c59b49a87..9499b075d 100644
--- a/admin/src/components/diy-link/index.vue
+++ b/admin/src/components/diy-link/index.vue
@@ -126,7 +126,9 @@ const prop = defineProps({
     },
     ignore: {
         type: Array,
-        default: []
+        default: () => {
+            return [] // 指定需要忽略的自定义链接，例如：['DIY_MAKE_PHONE_CALL']，表示隐藏拨打电话
+        }
     }
 })
 
diff --git a/admin/src/components/spread-popup/index.vue b/admin/src/components/spread-popup/index.vue
index e9b82cda8..fde4baad7 100644
--- a/admin/src/components/spread-popup/index.vue
+++ b/admin/src/components/spread-popup/index.vue
@@ -82,6 +82,7 @@ getUrl().then((res: any) => {
 
 // 生成H5二维码（支持多参数）
 const generateH5QRCode = () => {
+	console.log( params.value)
     // 处理参数为URL格式
     const queryStr = params.value
         .map(item => `${encodeURIComponent(item.name)}=${encodeURIComponent(item.value)}`)
diff --git a/admin/src/lang/zh-cn/common.json b/admin/src/lang/zh-cn/common.json
index dd8272e2a..396aad02d 100644
--- a/admin/src/lang/zh-cn/common.json
+++ b/admin/src/lang/zh-cn/common.json
@@ -1,223 +1,228 @@
 {
-  "edit": "编辑",
-  "delete": "删除",
-  "info": "详情",
-  "createTime": "创建时间",
-  "sort": "排序",
-  "status": "状态",
-  "operation": "操作",
-  "more": "更多",
-  "statusNormal": "正常",
-  "statusDeactivate": "停用",
-  "startUsing": "启用",
-  "confirm": "确认",
-  "save": "保存",
-  "back": "返回",
-  "cancel": "取消",
-  "search": "搜索",
-  "reset": "重置",
-  "refresh": "刷新",
-  "refreshSuccess": "刷新成功",
-  "select": "选择",
-  "export": "导出列表",
-  "exportPlaceholder": "确定要导出数据吗？",
-  "exportTip": "批量导出数据",
-  "exportConfirm": "确定并导出",
-  "warning": "提示",
-  "isShow": "是否显示",
-  "show": "显示",
-  "hidden": "隐藏",
-  "icon": "图标",
-  "userName": "用户名",
-  "headImg": "头像",
-  "accountNumber": "账号",
-  "accountSettings": "账号设置",
-  "realName": "名称",
-  "realNamePlaceholder": "请输入用户名称",
-  "password": "密码",
-  "confirmPassword": "确认密码",
-  "image": "图片",
-  "video": "视频",
-  "rename": "重命名",
-  "lookOver": "查看",
-  "selectAll": "全选",
-  "yes": "是",
-  "no": "否",
-  "copy": "复制",
-  "complete": "完成",
-  "copySuccess": "复制成功",
-  "notSupportCopy": "浏览器不支持一键复制，请手动进行复制",
-  "selectPlaceholder": "全部",
-  "provincePlaceholder": "请选择省",
-  "cityPlaceholder": "请选择市",
-  "districtPlaceholder": "请选择区/县",
-  "emptyData": "暂无数据",
-  "emptyQrCode": "暂无二维码",
-  "fileErr": "无法显示",
-  "upload": {
-    "root": "上传",
-    "selectimage": "选择图片",
-    "selectvideo": "选择视频",
-    "selecticon": "选择图标",
-    "selectnews": "选择图文",
-    "uploadimage": "上传图片",
-    "uploadvideo": "上传视频",
-    "addAttachmentCategory": "添加分组",
-    "attachmentCategoryPlaceholder": "请输入分组名称",
-    "attachmentEmpty": "暂无附件，请点击上传按钮上传",
-    "iconEmpty": "暂无图标",
-    "deleteCategoryTips": "确定要删除该分组吗？",
-    "deleteAttachmentTips": "确定要删除所选附件吗？如所选附件已被使用删除将会受到影响，请谨慎操作！",
-    "move": "移动",
-    "moveCategory": "移动分组",
-    "moveTo": "移动至",
-    "placeholderimageName": "请输入图片名称",
-    "placeholdervideoName": "请输入视频名称",
-    "placeholdericonName": "请输入图标名称",
-    "success": "上传成功",
-    "triggerUpperLimit": "可选数量已达上限",
-    "mediaEmpty": "暂无素材，请点击上传按钮上传"
-  },
-  "tabs": {
-    "closeLeft": "关闭左侧",
-    "closeRight": "关闭右侧",
-    "closeOther": "关闭其他"
-  },
-  "layout": {
-    "layoutSetting": "主题设置",
-    "darkMode": "黑暗模式",
-    "sidebarMode": "主题风格",
-    "themeColor": "主题颜色",
-    "detectionLoginOperation": "确定",
-    "detectionLoginContent": "已检测到有其他账号登录，需要刷新后才能继续操作。",
-    "detectionLoginTip": "提示",
-    "layoutStyle": "布局风格",
-    "tab": "开启标签栏"
-  },
-  "axios": {
-    "unknownError": "未知错误",
-    "400": "错误的请求",
-    "401": "请重新登录",
-    "403": "拒绝访问",
-    "404": "请求错误",
-    "405": "请求方法未允许",
-    "408": "请求超时",
-    "409": "请求跨域",
-    "500": "服务器内部错误",
-    "501": "网络未实现",
-    "502": "网络错误",
-    "503": "服务不可用",
-    "504": "网络超时",
-    "505": "http版本不支持该请求",
-    "timeout": "网络请求超时！",
-    "requestError": "请求错误",
-    "errNetwork": "网络请求错误",
-    "baseUrlError": " 接口请求错误,请检查VITE_APP_BASE_URL参数配置或者伪静态配置, <a style='text-decoration: underline;' href='https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213750' target='blank'>点击查看相关手册</a>"
-  },
-  "linkPlaceholder": "请选择跳转链接",
-  "selectLinkTips": "链接选择",
-  "diyLinkName": "链接名称",
-  "diyLinkNamePlaceholder": "请输入链接名称",
-  "diyLinkNameNotEmpty": "链接名称不能为空",
-  "diyLinkUrl": "跳转路径",
-  "diyLinkUrlPlaceholder": "请输入跳转路径",
-  "diyLinkUrlNotEmpty": "跳转路径不能为空",
-  "diyAppletId": "小程序AppID",
-  "diyAppletIdPlaceholder": "请输入要打开的小程序的appid",
-  "diyAppletIdNotEmpty": "小程序AppID不能为空",
-  "diyAppletPage": "小程序路径",
-  "diyAppletPagePlaceholder": "请输入要打开的小程序路径",
-  "diyAppletPageNotEmpty": "小程序路径不能为空",
-  "diyMakePhone": "电话号码",
-  "diyMakePhonePlaceholder": "请输入电话号码",
-  "diyMakePhoneNotEmpty": "电话号码不能为空",
-  "returnToPreviousPage": "返回",
-  "preview": "预览",
-  "emptyApp": "暂未安装任何应用",
-  "newInfo": "最新消息",
-  "visitWap": "访问店铺",
-  "mapSetting": "地图设置",
-  "mapKey": "腾讯地图KEY",
-  "indexTemplate": "首页模版",
-  "indexSwitch": "切换首页",
-  "indexWarning": "你确定要切换首页吗？",
-  "originalPassword": "原始密码",
-  "newPassword": "新密码",
-  "passwordCopy": "确认密码",
-  "passwordTip": "修改密码时必填.不修改密码时留空",
-  "originalPasswordPlaceholder": "请输入原始密码",
-  "passwordPlaceholder": "请输入新密码",
-  "originalPasswordHint": "原始密码不能为空",
-  "newPasswordHint": "请输入确认密码",
-  "doubleCipherHint": "两次新密码不同",
-  "confirmPasswordError": "两次新密码不同",
-  "upgrade": {
-    "upgradeButton": "立即升级",
-    "title": "升级",
-    "upgradingTips": "有正在执行的升级任务，",
-    "clickView": "点击查看",
-    "dirPermission": "目录读写权限",
-    "path": "路径",
-    "demand": "要求",
-    "readable": "可读",
-    "write": "可写",
-    "upgradeSuccess": "升级成功",
-    "localBuild": "本地编译",
-    "cloudBuild": "重试",
-    "rollback": "回滚",
-    "showDialogCloseTips": "升级任务尚未完成，关闭将取消升级，是否要继续关闭？",
-    "upgradeCompleteTips": "升级完成后还必须要重新编译admin wap web端，以免影响到程序正常运行。",
-    "upgradeTips": "应用和插件升级时，系统会自动备份当前程序及数据库。升级功能不会造成您当前程序的损坏或者数据的丢失，请放心使用，但是升级过程可能会因为兼容性等各种原因出现意外的升级错误，当出现错误时，系统将会自动回退上一版本！若回退失败，请参考链接<a href='https://www.kancloud.cn/niushop/niushop_v6/3228611' target='_blank' class='text-primary'> https://www.kancloud.cn/niushop/niushop_v6/3228611 </a>手动回退上一版本!",
-    "knownToKnow": "我已知晓，不需要再次提示",
-    "cloudBuildErrorTips": "一键云编译队列任务过多，请等待几分钟后重试！",
-    "isNeedBackup": "是否需要备份",
-    "isNeedBackupTips": "检测到已存在备份，此次升级是否需要备份，不需要备份在升级出现异常时将会恢复最近的一次备份。",
-    "isNeedBackupBtn": "查看备份记录",
-    "option": "选项",
-    "isNeedCloudbuild": "是否需要云编译",
-    "cloudbuildTips": "此次升级的同时是否需要进行云编译"
-  },
-  "cloudbuild": {
-    "title": "云编译",
-    "executingTips": "有正在执行的编译任务，",
-    "clickView": "点击查看",
-    "dirPermission": "目录读写权限",
-    "path": "路径",
-    "demand": "要求",
-    "readable": "可读",
-    "write": "可写",
-    "cloudbuildSuccess": "编译完成",
-    "showDialogCloseTips": "编译任务尚未完成，关闭将取消编译，是否要继续关闭？"
-  },
-  "formSelectContentTitle": "表单名称",
-  "formSelectContentTitlePlaceholder": "请输入表单名称",
-  "formSelectContentTypeName": "表单类型",
-  "formSelectContentTypeNamePlaceholder": "请选择表单类型",
-  "formSelectContentTypeAll": "全部",
-  "formSelectContentTips": "请选择表单",
-  "appName": "应用名/版本信息",
-  "appIdentification": "应用标识",
-  "introduction": "简介",
-  "type": "类型",
-  "localAppText": "插件管理",
-  "upgrade2": "升级",
-  "installLabel": "已安装",
-  "uninstalledLabel": "未安装",
-  "buyLabel": "已购买",
-  "cloudBuild": "云编译",
-  "newVersion": "最新版本",
-  "tipText": "标识指开发应用或插件的文件夹名称",
-  "gxx": "更新信息",
-  "return": "返回",
-  "nextStep": "下一步",
-  "prev": "上一步",
-  "viewUpgradeContent": "查看升级内容",
-  "testDirectoryPermissions": "检测目录权限",
-  "backupFiles": "备份文件",
-  "startUpgrade": "开始升级",
-  "upgradeEnd": "升级完成",
-  "cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
-  "promoteUrl": "推广链接",
-  "downLoadQRCode": "下载二维码",
-  "configureFailed": "配置失败"
-}
+	"edit": "编辑",
+	"delete": "删除",
+	"info": "详情",
+	"createTime": "创建时间",
+	"sort": "排序",
+	"status": "状态",
+	"operation": "操作",
+	"more": "更多",
+	"statusNormal": "正常",
+	"statusDeactivate": "停用",
+	"startUsing": "启用",
+	"confirm": "确认",
+	"save": "保存",
+	"back": "返回",
+	"cancel": "取消",
+	"search": "搜索",
+	"reset": "重置",
+	"refresh": "刷新",
+	"refreshSuccess": "刷新成功",
+	"select": "选择",
+	"export": "导出列表",
+	"exportPlaceholder": "确定要导出数据吗？",
+	"exportTip": "批量导出数据",
+	"exportConfirm": "确定并导出",
+	"warning": "提示",
+	"isShow": "是否显示",
+	"show": "显示",
+	"hidden": "隐藏",
+	"icon": "图标",
+	"userName": "用户名",
+	"headImg": "头像",
+	"accountNumber": "账号",
+	"accountSettings": "账号设置",
+	"realName": "名称",
+	"realNamePlaceholder": "请输入用户名称",
+	"password": "密码",
+	"confirmPassword": "确认密码",
+	"image": "图片",
+	"video": "视频",
+	"rename": "重命名",
+	"lookOver": "查看",
+	"selectAll": "全选",
+	"yes": "是",
+	"no": "否",
+	"copy": "复制",
+	"complete": "完成",
+	"copySuccess": "复制成功",
+	"notSupportCopy": "浏览器不支持一键复制，请手动进行复制",
+	"selectPlaceholder": "全部",
+	"provincePlaceholder": "请选择省",
+	"cityPlaceholder": "请选择市",
+	"districtPlaceholder": "请选择区/县",
+	"emptyData": "暂无数据",
+	"emptyQrCode": "暂无二维码",
+	"fileErr": "无法显示",
+	"upload": {
+		"root": "上传",
+		"selectimage": "选择图片",
+		"selectvideo": "选择视频",
+		"selecticon": "选择图标",
+		"selectnews": "选择图文",
+		"uploadimage": "上传图片",
+		"uploadvideo": "上传视频",
+		"addAttachmentCategory": "添加分组",
+		"attachmentCategoryPlaceholder": "请输入分组名称",
+		"attachmentEmpty": "暂无附件，请点击上传按钮上传",
+		"iconEmpty": "暂无图标",
+		"deleteCategoryTips": "确定要删除该分组吗？",
+		"deleteAttachmentTips": "确定要删除所选附件吗？如所选附件已被使用删除将会受到影响，请谨慎操作！",
+		"move": "移动",
+		"moveCategory": "移动分组",
+		"moveTo": "移动至",
+		"placeholderimageName": "请输入图片名称",
+		"placeholdervideoName": "请输入视频名称",
+		"placeholdericonName": "请输入图标名称",
+		"success": "上传成功",
+		"triggerUpperLimit": "可选数量已达上限",
+		"mediaEmpty": "暂无素材，请点击上传按钮上传"
+	},
+	"tabs": {
+		"closeLeft": "关闭左侧",
+		"closeRight": "关闭右侧",
+		"closeOther": "关闭其他"
+	},
+	"layout": {
+		"layoutSetting": "主题设置",
+		"darkMode": "黑暗模式",
+		"sidebarMode": "主题风格",
+		"themeColor": "主题颜色",
+		"detectionLoginOperation": "确定",
+		"detectionLoginContent": "已检测到有其他账号登录，需要刷新后才能继续操作。",
+		"detectionLoginTip": "提示",
+		"layoutStyle": "布局风格",
+		"tab": "开启标签栏"
+	},
+	"axios": {
+		"unknownError": "未知错误",
+		"400": "错误的请求",
+		"401": "请重新登录",
+		"403": "拒绝访问",
+		"404": "请求错误",
+		"405": "请求方法未允许",
+		"408": "请求超时",
+		"409": "请求跨域",
+		"500": "服务器内部错误",
+		"501": "网络未实现",
+		"502": "网络错误",
+		"503": "服务不可用",
+		"504": "网络超时",
+		"505": "http版本不支持该请求",
+		"timeout": "网络请求超时！",
+		"requestError": "请求错误",
+		"errNetwork": "网络请求错误",
+		"baseUrlError": " 接口请求错误,请检查VITE_APP_BASE_URL参数配置或者伪静态配置, <a style='text-decoration: underline;' href='https://www.kancloud.cn/niucloud/niucloud-admin-develop/3213750' target='blank'>点击查看相关手册</a>"
+	},
+	"linkPlaceholder": "请选择跳转链接",
+	"selectLinkTips": "链接选择",
+	"diyLinkName": "链接名称",
+	"diyLinkNamePlaceholder": "请输入链接名称",
+	"diyLinkNameNotEmpty": "链接名称不能为空",
+	"diyLinkUrl": "跳转路径",
+	"diyLinkUrlPlaceholder": "请输入跳转路径",
+	"diyLinkUrlNotEmpty": "跳转路径不能为空",
+	"diyAppletId": "小程序AppID",
+	"diyAppletIdPlaceholder": "请输入要打开的小程序的appid",
+	"diyAppletIdNotEmpty": "小程序AppID不能为空",
+	"diyAppletPage": "小程序路径",
+	"diyAppletPagePlaceholder": "请输入要打开的小程序路径",
+	"diyAppletPageNotEmpty": "小程序路径不能为空",
+	"diyMakePhone": "电话号码",
+	"diyMakePhonePlaceholder": "请输入电话号码",
+	"diyMakePhoneNotEmpty": "电话号码不能为空",
+	"returnToPreviousPage": "返回",
+	"preview": "预览",
+	"emptyApp": "暂未安装任何应用",
+	"newInfo": "最新消息",
+	"visitWap": "访问店铺",
+	"mapSetting": "地图设置",
+	"mapKey": "腾讯地图KEY",
+	"indexTemplate": "首页模版",
+	"indexSwitch": "切换首页",
+	"indexWarning": "你确定要切换首页吗？",
+	"originalPassword": "原始密码",
+	"newPassword": "新密码",
+	"passwordCopy": "确认密码",
+	"passwordTip": "修改密码时必填.不修改密码时留空",
+	"originalPasswordPlaceholder": "请输入原始密码",
+	"passwordPlaceholder": "请输入新密码",
+	"originalPasswordHint": "原始密码不能为空",
+	"newPasswordHint": "请输入确认密码",
+	"doubleCipherHint": "两次新密码不同",
+	"confirmPasswordError": "两次新密码不同",
+	"upgrade": {
+		"upgradeButton": "立即升级",
+		"title": "升级",
+		"upgradingTips": "有正在执行的升级任务，",
+		"clickView": "点击查看",
+		"dirPermission": "目录读写权限",
+		"path": "路径",
+		"demand": "要求",
+		"readable": "可读",
+		"write": "可写",
+		"upgradeSuccess": "升级成功",
+		"localBuild": "本地编译",
+		"cloudBuild": "重试",
+		"rollback": "回滚",
+		"showDialogCloseTips": "升级任务尚未完成，关闭将取消升级，是否要继续关闭？",
+		"upgradeCompleteTips": "升级完成后还必须要重新编译admin wap web端，以免影响到程序正常运行。",
+		"upgradeTips": "应用和插件升级时，系统会自动备份当前程序及数据库。升级功能不会造成您当前程序的损坏或者数据的丢失，请放心使用，但是升级过程可能会因为兼容性等各种原因出现意外的升级错误，当出现错误时，系统将会自动回退上一版本！若回退失败，请参考链接<a href='https://www.kancloud.cn/niushop/niushop_v6/3228611' target='_blank' class='text-primary'> https://www.kancloud.cn/niushop/niushop_v6/3228611 </a>手动回退上一版本!",
+		"knownToKnow": "我已知晓，不需要再次提示",
+		"cloudBuildErrorTips": "一键云编译队列任务过多，请等待几分钟后重试！",
+		"isNeedBackup": "是否需要备份",
+		"isNeedBackupTips": "检测到已存在备份，此次升级是否需要备份，不需要备份在升级出现异常时将会恢复最近的一次备份。",
+		"isNeedBackupBtn": "查看备份记录",
+		"option": "选项",
+		"isNeedCloudbuild": "是否需要云编译",
+		"cloudbuildTips": "此次升级的同时是否需要进行云编译"
+	},
+	"cloudbuild": {
+		"title": "云编译",
+		"executingTips": "有正在执行的编译任务，",
+		"clickView": "点击查看",
+		"dirPermission": "目录读写权限",
+		"path": "路径",
+		"demand": "要求",
+		"readable": "可读",
+		"write": "可写",
+		"cloudbuildSuccess": "编译完成",
+		"showDialogCloseTips": "编译任务尚未完成，关闭将取消编译，是否要继续关闭？"
+	},
+	"formSelectContentTitle": "表单名称",
+	"formSelectContentTitlePlaceholder": "请输入表单名称",
+	"formSelectContentTypeName": "表单类型",
+	"formSelectContentTypeNamePlaceholder": "请选择表单类型",
+	"formSelectContentTypeAll": "全部",
+	"formSelectContentTips": "请选择表单",
+	"appName": "应用名/版本信息",
+	"appIdentification": "应用标识",
+	"introduction": "简介",
+	"type": "类型",
+	"localAppText": "插件管理",
+	"upgrade2": "升级",
+	"installLabel": "已安装",
+	"uninstalledLabel": "未安装",
+	"buyLabel": "已购买",
+	"cloudBuild": "云编译",
+	"newVersion": "最新版本",
+	"tipText": "标识指开发应用或插件的文件夹名称",
+	"gxx": "更新信息",
+	"return": "返回",
+	"nextStep": "下一步",
+	"prev": "上一步",
+	"viewUpgradeContent": "查看升级内容",
+	"testDirectoryPermissions": "检测目录权限",
+	"backupFiles": "备份文件",
+	"startUpgrade": "开始升级",
+	"upgradeEnd": "升级完成",
+	"cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
+	"promoteUrl": "推广链接",
+	"downLoadQRCode": "下载二维码",
+	"configureFailed": "配置失败",
+	"lefttitle": "左侧标题",
+	"righttitle": "右侧标题",
+	"leftDesc": "左侧简介",
+	"rightDesc": "右侧简介",
+	"descPlaceholder": "请输入简介内容"
+}
\ No newline at end of file
diff --git a/admin/src/layout/admin/components/aside/index.vue b/admin/src/layout/admin/components/aside/index.vue
index 13d95b055..0124c3e65 100644
--- a/admin/src/layout/admin/components/aside/index.vue
+++ b/admin/src/layout/admin/components/aside/index.vue
@@ -17,10 +17,10 @@
                             
                             <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 v-if="systemStore.menuIsCollapse && item.name=='app_store' && recentlyUpdated.length>0" class="text-[11px] bg-[#DA203E] px-[10px] rounded-[12px] text-[#fff] absolute right-[6px]">更新</div>
-                            <div v-if="!systemStore.menuIsCollapse && item.name=='app_store' && recentlyUpdated.length>0" class="w-[7px] h-[7px] bg-[#DA203E] absolute flex items-center justify-center rounded-full top-[4px] right-[14px]"></div>
-                            <div v-if="systemStore.menuIsCollapse && item.original_name=='tool' && isNewVersion" class="text-[11px] bg-[#DA203E] px-[10px] rounded-[12px] text-[#fff] absolute right-[6px]">更新</div>
-                            <div v-if="!systemStore.menuIsCollapse && item.original_name=='tool' && isNewVersion" class="w-[7px] h-[7px] bg-[#DA203E] absolute flex items-center justify-center rounded-full top-[4px] right-[14px]"></div>
+                            <div v-if="systemStore.menuIsCollapse && item.name=='app_store' && (recentlyUpdated.length>0 || isNewVersion)" class="text-[11px] bg-[#DA203E] px-[10px] rounded-[12px] text-[#fff] absolute right-[6px]">更新</div>
+                            <div v-if="!systemStore.menuIsCollapse && item.name=='app_store' && (recentlyUpdated.length>0 || isNewVersion)" class="w-[7px] h-[7px] bg-[#DA203E] absolute flex items-center justify-center rounded-full top-[4px] right-[14px]"></div>
+                            <!-- <div v-if="systemStore.menuIsCollapse && item.original_name=='tool' && isNewVersion" class="text-[11px] bg-[#DA203E] px-[10px] rounded-[12px] text-[#fff] absolute right-[6px]">更新</div>
+                            <div v-if="!systemStore.menuIsCollapse && item.original_name=='tool' && isNewVersion" class="w-[7px] h-[7px] bg-[#DA203E] absolute flex items-center justify-center rounded-full top-[4px] right-[14px]"></div> -->
                         
                         </div>
                     </template>
diff --git a/admin/src/stores/modules/diy.ts b/admin/src/stores/modules/diy.ts
index 7e9cdf066..2642eeee6 100644
--- a/admin/src/stores/modules/diy.ts
+++ b/admin/src/stores/modules/diy.ts
@@ -87,6 +87,7 @@ const useDiyStore = defineStore('diy', {
                 copyright: {
                     control: true, // 是否允许展示编辑
                     isShow: false, // 是否显示
+                    textColor : "#ccc", // 文字颜色
                 },
                 // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
                 popWindow: {
@@ -190,6 +191,7 @@ const useDiyStore = defineStore('diy', {
                 copyright: {
                     control: true, // 是否允许展示编辑
                     isShow: true, // 是否显示
+                    textColor : "#ccc", // 文字颜色
                 },
 
                 // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
diff --git a/admin/src/styles/icon/iconfont.css b/admin/src/styles/icon/iconfont.css
index 2651bc05c..f718a72c0 100644
--- a/admin/src/styles/icon/iconfont.css
+++ b/admin/src/styles/icon/iconfont.css
@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont";
   /* Project id 3883393 */
-  src: url('//at.alicdn.com/t/c/font_3883393_6d60cyygl4.woff2?t=1755603992297') format('woff2'),
-    url('//at.alicdn.com/t/c/font_3883393_6d60cyygl4.woff?t=1755603992297') format('woff'),
-    url('//at.alicdn.com/t/c/font_3883393_6d60cyygl4.ttf?t=1755603992297') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3883393_0604cbkh5j03.woff2?t=1762651161569') format('woff2'),
+    url('//at.alicdn.com/t/c/font_3883393_0604cbkh5j03.woff?t=1762651161569') format('woff'),
+    url('//at.alicdn.com/t/c/font_3883393_0604cbkh5j03.ttf?t=1762651161569') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,78 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icona-zhulixiangqingpc30:before {
+  content: "\e914";
+}
+
+.icona-zuidijiapc30:before {
+  content: "\e915";
+}
+
+.icona-zhulipc30:before {
+  content: "\e916";
+}
+
+.icona-zhulijiapc30:before {
+  content: "\e917";
+}
+
+.icona-kanhoujiapc30:before {
+  content: "\e918";
+}
+
+.icona-jiagepc30:before {
+  content: "\e919";
+}
+
+.icona-zhuliwanfapc30:before {
+  content: "\e91a";
+}
+
+.icona-zhulipc301:before {
+  content: "\e91b";
+}
+
+.icona-zhulilunbopc30:before {
+  content: "\e91c";
+}
+
+.icona-canyuxinxipc30:before {
+  content: "\e91d";
+}
+
+.icona-zhulixiangqingpc301:before {
+  content: "\e91e";
+}
+
+.iconyoujiantou:before {
+  content: "\e913";
+}
+
+.iconanzhuang1:before {
+  content: "\e90d";
+}
+
+.icongengxin:before {
+  content: "\e90e";
+}
+
+.iconliebiao:before {
+  content: "\e90f";
+}
+
+.iconyijianshengji:before {
+  content: "\e910";
+}
+
+.iconliebiaoqiehuan:before {
+  content: "\e911";
+}
+
+.iconyijianxiufu:before {
+  content: "\e912";
+}
+
 .icona-bijiPC30:before {
   content: "\e90b";
 }
diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts
index dc000c910..42c66c060 100644
--- a/admin/src/utils/common.ts
+++ b/admin/src/utils/common.ts
@@ -131,8 +131,9 @@ export function img(path: string): string {
 
     if (typeof path == 'string' && path.startsWith('/')) path = path.replace(/^\//, '')
     if (typeof imgDomain == 'string' && imgDomain.endsWith('/')) imgDomain = imgDomain.slice(0, -1)
-
-    return isUrl(path) ? path : `${imgDomain}/${path}`
+	if(path){
+		return isUrl(path) ? path : `${imgDomain}/${path}`
+	}
 }
 
 /**