diff --git a/admin/src/api/addon.ts b/admin/src/api/addon.ts
index 6c4b314bf..5981d30f5 100644
--- a/admin/src/api/addon.ts
+++ b/admin/src/api/addon.ts
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @returns 
  */
 export function getAddonLocal(params: Record<string, any>) {
-    return request.get('addon/local', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.get('addon/local', params, { showSuccessMessage: true })
 }
 
 /**
@@ -22,7 +22,7 @@ export function getAddonDetial(id: number) {
  * @returns
  */
 export function installAddon(params: Record<string, any>) {
-    return request.post(`addon/install/${params.addon}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`addon/install/${params.addon}`, params, { showErrorMessage: true })
 }
 
 /**
@@ -31,5 +31,33 @@ export function installAddon(params: Record<string, any>) {
  * @returns
  */
 export function uninstallAddon(params: Record<string, any>) {
-    return request.post(`addon/uninstall/${params.addon}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`addon/uninstall/${params.addon}`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 插件安装前检测
+ * @param addon 
+ * @returns 
+ */
+export function preInstallCheck(addon: string) {
+    return request.get(`addon/install/check/${addon}`, { timeout: 30 * 1000 })
+}
+
+/**
+ * 获取插件安装任务执行状态
+ * @param addon 
+ * @param key 
+ * @returns 
+ */
+export function getAddonInstallTaskState(addon: string, key: string) {
+    return request.get(`addon/install/${addon}/status/${key}`)
+}
+
+/**
+ * 执行安装任务
+ * @param params 
+ * @returns 
+ */
+export function executeInstall(addon: string) {
+    return request.post(`addon/install/execute/${addon}`, {}, { showErrorMessage: true })
 }
\ No newline at end of file
diff --git a/admin/src/api/aliapp.ts b/admin/src/api/aliapp.ts
index c9c6cee2d..07eda4936 100644
--- a/admin/src/api/aliapp.ts
+++ b/admin/src/api/aliapp.ts
@@ -14,7 +14,7 @@ export function getAliappConfig() {
  * @returns 
  */
 export function setAliappConfig(params: Record<string, any>) {
-    return request.put('aliapp/config', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('aliapp/config', params, { showSuccessMessage: true })
 }
 
 /**
diff --git a/admin/src/api/article.ts b/admin/src/api/article.ts
index eb7a40896..614b547d6 100644
--- a/admin/src/api/article.ts
+++ b/admin/src/api/article.ts
@@ -26,7 +26,7 @@ export function getArticleInfo(id: number) {
  * @returns
  */
 export function addArticle(params: Record<string, any>) {
-    return request.post('article/article', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('article/article', params, { showSuccessMessage: true })
 }
 
 /**
@@ -36,7 +36,7 @@ export function addArticle(params: Record<string, any>) {
  * @returns
  */
 export function editArticle(params: Record<string, any>) {
-    return request.put(`article/article/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`article/article/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -45,7 +45,7 @@ export function editArticle(params: Record<string, any>) {
  * @returns
  */
 export function deleteArticle(id: number) {
-    return request.delete(`article/article/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`article/article/${id}`, { showSuccessMessage: true })
 }
 /***************************************************** 文章分类管理 ****************************************************/
 
@@ -83,7 +83,7 @@ export function getArticleCategoryInfo(category_id: number) {
  * @returns 
  */
 export function addArticleCategory(params: Record<string, any>) {
-    return request.post('article/category', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('article/category', params, { showSuccessMessage: true })
 }
 
 /**
@@ -92,7 +92,7 @@ export function addArticleCategory(params: Record<string, any>) {
  * @returns 
  */
 export function editArticleCategory(params: Record<string, any>) {
-    return request.put(`article/category/${params.category_id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`article/category/${params.category_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -101,5 +101,5 @@ export function editArticleCategory(params: Record<string, any>) {
  * @returns 
  */
 export function deleteArticleCategory(category_id: number) {
-    return request.delete(`article/category/${category_id}`, { showErrorMessage: true, showSuccessMessage: true });
+    return request.delete(`article/category/${category_id}`, { showSuccessMessage: true });
 }
\ No newline at end of file
diff --git a/admin/src/api/auth.ts b/admin/src/api/auth.ts
index be02108ac..c308bdcb3 100644
--- a/admin/src/api/auth.ts
+++ b/admin/src/api/auth.ts
@@ -6,7 +6,7 @@ import request from '@/utils/request'
  * @returns 
  */
 export function login(params: Record<string, any>, app_type: string) {
-    return request.get(`login/${app_type}`, { params, showErrorMessage: true })
+    return request.get(`login/${app_type}`, { params })
 }
 
 /**
diff --git a/admin/src/api/diy.ts b/admin/src/api/diy.ts
index 7d7f901cf..313e0bd75 100644
--- a/admin/src/api/diy.ts
+++ b/admin/src/api/diy.ts
@@ -26,7 +26,7 @@ export function getDiyPageInfo(id: number) {
  * @returns
  */
 export function addDiyPage(params: Record<string, any>) {
-    return request.post('diy/diy', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('diy/diy', params, { showSuccessMessage: true })
 }
 
 /**
@@ -34,7 +34,7 @@ export function addDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function editDiyPage(params: Record<string, any>) {
-    return request.put(`diy/diy/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`diy/diy/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -42,7 +42,7 @@ export function editDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function setUseDiyPage(params: Record<string, any>) {
-    return request.put(`diy/use`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`diy/use`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -50,7 +50,7 @@ export function setUseDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function editDiyPageShare(params: Record<string, any>) {
-    return request.put(`diy/diy/share`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`diy/diy/share`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -59,7 +59,7 @@ export function editDiyPageShare(params: Record<string, any>) {
  * @returns
  */
 export function deleteDiyPage(id: number) {
-    return request.delete(`diy/diy/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`diy/diy/${id}`, { showSuccessMessage: true })
 }
 
 /**
@@ -89,14 +89,14 @@ export function getDiyBottom(params: Record<string, any>) {
  * @returns
  */
 export function setDiyBottom(params: Record<string, any>) {
-    return request.post('diy/bottom', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('diy/bottom', params, { showSuccessMessage: true })
 }
 
 /**
- * 获取页面类型
+ * 获取页面模板
  */
-export function getDiyPageType(params: Record<string, any>) {
-    return request.get(`diy/type`, { params })
+export function getDiyTemplate(params: Record<string, any>) {
+    return request.get(`diy/template`, { params })
 }
 
 /**
@@ -121,5 +121,5 @@ export function getDiyRouteInfo(params: Record<string, any>) {
  * @param params
  */
 export function editDiyRouteShare(params: Record<string, any>) {
-    return request.put(`diy/route/share`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`diy/route/share`, params, { showSuccessMessage: true })
 }
\ No newline at end of file
diff --git a/admin/src/api/h5.ts b/admin/src/api/h5.ts
index 1c9f1c53f..bcc88695e 100644
--- a/admin/src/api/h5.ts
+++ b/admin/src/api/h5.ts
@@ -14,5 +14,5 @@ export function getH5Config() {
  * @returns 
  */
 export function setH5Config(params: Record<string, any>) {
-    return request.put('channel/h5/config', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('channel/h5/config', params, { showSuccessMessage: true })
 }
diff --git a/admin/src/api/member.ts b/admin/src/api/member.ts
index 0c1253468..9b2f16316 100644
--- a/admin/src/api/member.ts
+++ b/admin/src/api/member.ts
@@ -21,13 +21,21 @@ export function getMemberInfo(id: number) {
     return request.get(`member/member/${id}`);
 }
 
+/**
+ * 获取会员编码
+ * @returns 
+ */
+export function getMemberNo() {
+    return request.get(`member/memberno`);
+}
+
 /**
  * 添加会员
  * @param params 
  * @returns 
  */
 export function addMember(params: Record<string, any>) {
-    return request.post(`member/member`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`member/member`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -48,6 +56,15 @@ export function getRegisterChannelType(params: Record<string, any>) {
     return request.get(`member/register/channel`, params)
 }
 
+/**
+ * 会员删除
+ * @param params 
+ * @returns 
+ */
+export function deleteMember(member_id: number) {
+    return request.delete(`member/member/${member_id}`, { showSuccessMessage: true })
+}
+
 
 
 /***************************************************** 会员标签 ****************************************************/
@@ -76,7 +93,7 @@ export function getMemberLabelInfo(label_id: number) {
  * @returns
  */
 export function addMemberLabel(params: Record<string, any>) {
-    return request.post('member/label', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('member/label', params, { showSuccessMessage: true })
 }
 
 /**
@@ -86,7 +103,7 @@ export function addMemberLabel(params: Record<string, any>) {
  * @returns
  */
 export function updateMemberLabel(params: Record<string, any>) {
-    return request.put(`member/label/${params.label_id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`member/label/${params.label_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -95,7 +112,7 @@ export function updateMemberLabel(params: Record<string, any>) {
  * @returns
  */
 export function deleteMemberLabel(label_id: number) {
-    return request.delete(`member/label/${label_id}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`member/label/${label_id}`, { showSuccessMessage: true })
 }
 
 /**
@@ -114,7 +131,7 @@ export function getMemberLabelAll() {
  * @returns 
  */
 export function editMemberDetail(params: Record<string, any>) {
-    return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 会员零钱 ****************************************************/
@@ -171,7 +188,7 @@ export function getCommissionList(params: Record<string, any>) {
  * @returns 
  */
 export function adjustPoint(params: Record<string, any>) {
-    return request.post(`member/account/point`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`member/account/point`, params, { showSuccessMessage: true })
 }
 /**
  * 会员余额调整
@@ -179,7 +196,7 @@ export function adjustPoint(params: Record<string, any>) {
  * @returns 
  */
 export function adjustBalance(params: Record<string, any>) {
-    return request.post(`member/account/balance`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`member/account/balance`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 会员相关设置 ****************************************************/
@@ -189,8 +206,8 @@ export function adjustBalance(params: Record<string, any>) {
  * @param params 
  * @returns 
  */
-export function getLoginConfig(params: Record<string, any>) {
-    return request.get(`member/config/login`, params)
+export function getLoginConfig() {
+    return request.get(`member/config/login`)
 }
 /**
  * 注册登录设置
@@ -198,9 +215,29 @@ export function getLoginConfig(params: Record<string, any>) {
  * @returns 
  */
 export function setLoginConfig(params: Record<string, any>) {
-    return request.post(`member/config/login`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`member/config/login`, params, { showSuccessMessage: true })
 }
 
+
+/**
+ * 获取会员设置
+ * @param params 
+ * @returns 
+ */
+export function getMemberConfig() {
+    return request.get(`member/config/member`)
+}
+
+/**
+ * 会员设置
+ * @param params 
+ * @returns 
+ */
+export function setMemberConfig(params: Record<string, any>) {
+    return request.post(`member/config/member`, params, { showSuccessMessage: true })
+}
+
+
 /**
  * 获取会员转账方式
  * @param params 
@@ -210,6 +247,25 @@ export function getTransfertype() {
     return request.get(`member/cash_out/transfertype`)
 }
 
+
+/**
+ * 佣金统计
+ * @param params 
+ * @returns 
+ */
+export function getCommissionSum(params: Record<string, any>) {
+    return request.get(`member/account/sum_commission`, { params })
+}
+
+/**
+ * 积分统计
+ * @param params 
+ * @returns 
+ */
+export function getPointSum(params: Record<string, any>) {
+    return request.get(`member/account/sum_point`, { params })
+}
+
 /**
  * 余额统计
  * @param params 
@@ -243,7 +299,7 @@ export function getAccountType(params: Record<string, any>) {
  * @param params 
  * @returns 
  */
-export function getWithdrawConfig() {
+export function getCashOutConfig() {
     return request.get(`member/config/cash_out`)
 }
 /**
@@ -251,8 +307,8 @@ export function getWithdrawConfig() {
  * @param params 
  * @returns 
  */
-export function setWithdrawConfig(params: Record<string, any>) {
-    return request.post(`member/config/cash_out`, params, { showErrorMessage: true, showSuccessMessage: true })
+export function setCashOutConfig(params: Record<string, any>) {
+    return request.post(`member/config/cash_out`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -260,7 +316,7 @@ export function setWithdrawConfig(params: Record<string, any>) {
  * @param params 
  * @returns 
  */
-export function getWithdrawList(params: Record<string, any>) {
+export function getCashOutList(params: Record<string, any>) {
     return request.get(`member/cash_out`, { params })
 }
 
@@ -269,7 +325,7 @@ export function getWithdrawList(params: Record<string, any>) {
  * @param params 
  * @returns id
  */
-export function getWithdrawDetail(id: number) {
+export function getCashOutDetail(id: number) {
     return request.get(`member/cash_out/${id}`, {})
 }
 
@@ -280,7 +336,7 @@ export function getWithdrawDetail(id: number) {
  * @returns
  */
 export function memberAudit(params: Record<string, any>) {
-    return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`member/cash_out/audit/${params.id}/${params.action}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -290,7 +346,7 @@ export function memberAudit(params: Record<string, any>) {
  * @returns
  */
 export function memberTransfer(params: Record<string, any>) {
-    return request.put(`member/cash_out/transfer/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`member/cash_out/transfer/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -300,7 +356,7 @@ export function memberTransfer(params: Record<string, any>) {
  * @returns 
  */
 export function editMemberStatus(params: Record<string, any>) {
-    return request.put(`member/setstatus/${params.status}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`member/setstatus/${params.status}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -308,6 +364,15 @@ export function editMemberStatus(params: Record<string, any>) {
  * @param params 
  * @returns
  */
-export function getWithdrawStatusList() {
+export function getCashOutStatusList() {
     return request.get(`member/cash_out/status`)
 }
+
+/**
+ * 提现统计
+ * @returns
+ */
+export function getCashOutStat() {
+    return request.get(`member/cash_out/stat`)
+}
+
diff --git a/admin/src/api/notice.ts b/admin/src/api/notice.ts
index 7e8272754..cc7157e72 100644
--- a/admin/src/api/notice.ts
+++ b/admin/src/api/notice.ts
@@ -35,7 +35,7 @@ export function getNoticeLog(params: any) {
  * @returns 
  */
 export function editNoticeStatus(params: Record<string, any>) {
-    return request.post(`notice/notice/editstatus`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`notice/notice/editstatus`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -44,7 +44,7 @@ export function editNoticeStatus(params: Record<string, any>) {
  * @returns 
  */
 export function editNotice(params: Record<string, any>) {
-    return request.post(`notice/notice/edit`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`notice/notice/edit`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -71,7 +71,7 @@ export function getSmsInfo(sms_type: string) {
  * @returns 
  */
 export function editSms(params: Record<string, any>) {
-    return request.put(`notice/notice/sms/${params.sms_type}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`notice/notice/sms/${params.sms_type}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -81,5 +81,5 @@ export function editSms(params: Record<string, any>) {
  * @returns 
  */
 export function getSmsLog(params: Record<string, any>) {
-    return request.put(`notice/sms/log`, params)
+    return request.get(`notice/sms/log`, params)
 }
diff --git a/admin/src/api/order.ts b/admin/src/api/order.ts
index cfb7f0bc5..76eb1350b 100644
--- a/admin/src/api/order.ts
+++ b/admin/src/api/order.ts
@@ -11,6 +11,15 @@ export function getRechargeOrderList(params: Record<string, any>) {
     return request.get(`order/recharge`, { params })
 }
 
+/**
+ * 获取充值订单统计
+ * @param params
+ * @returns
+ */
+export function getRechargeStat(params: Record<string, any>) {
+    return request.get(`order/recharge/stat`, { params })
+}
+
 /**
  * 获取充值订单详情
  * @param order_id
@@ -19,7 +28,7 @@ export function getRechargeOrderList(params: Record<string, any>) {
 export function getRechargeOrderInfo(order_id: number) {
     return request.get(`order/recharge/${order_id}`);
 }
- 
+
 /**
  * 获取充值订单状态列表
  * @returns
@@ -48,6 +57,14 @@ export function getRefundStatus() {
 * 充值订单发起退款
  * @returns
  */
-export function rechargeRefund(id) {
-    return request.get(`order/recharge/refund/${id}`);
+export function rechargeRefund(id: number) {
+    return request.put(`order/recharge/refund/${id}`, {}, { showSuccessMessage: true });
+}
+
+/**
+* 获取退款统计
+ * @returns
+ */
+export function getRefundStat() {
+    return request.get(`refund/stat`);
 }
\ No newline at end of file
diff --git a/admin/src/api/personal.ts b/admin/src/api/personal.ts
index 767615f77..c507a9b66 100644
--- a/admin/src/api/personal.ts
+++ b/admin/src/api/personal.ts
@@ -13,6 +13,6 @@ export function getUserInfo(type: string) {
  * @returns 
  */
 export function setUserInfo(params: Record<string, any>) {
-    return request.put(`auth/edit`, params, { showErrorMessage: true, showSuccessMessage: true });
+    return request.put(`auth/edit`, params, { showSuccessMessage: true });
 }
 
diff --git a/admin/src/api/site.ts b/admin/src/api/site.ts
index fe8cb46e3..8a57eee23 100644
--- a/admin/src/api/site.ts
+++ b/admin/src/api/site.ts
@@ -28,7 +28,7 @@ export function getSiteInfo(site_id: number) {
  * @returns 
  */
 export function addSite(params: Record<string, any>) {
-    return request.post('site/site', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('site/site', params, { showSuccessMessage: true })
 }
 
 /**
@@ -38,7 +38,27 @@ export function addSite(params: Record<string, any>) {
  * @returns 
  */
 export function editSite(params: Record<string, any>) {
-    return request.put(`site/site/${params.site_id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`site/site/${params.site_id}`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 关闭站点
+ * @param id 
+ * @param params 
+ * @returns 
+ */
+export function closeSite(params: Record<string, any>) {
+    return request.put(`site/closesite/${params.site_id}`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 关闭站点
+ * @param id 
+ * @param params 
+ * @returns 
+ */
+export function openSite(params: Record<string, any>) {
+    return request.put(`site/opensite/${params.site_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -77,7 +97,7 @@ export function getSiteGroupInfo(site_id: number) {
  * @returns 
  */
 export function addSiteGroup(params: Record<string, any>) {
-    return request.post('site/group', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('site/group', params, { showSuccessMessage: true })
 }
 
 /**
@@ -87,7 +107,7 @@ export function addSiteGroup(params: Record<string, any>) {
  * @returns 
  */
 export function editSiteGroup(params: Record<string, any>) {
-    return request.put(`site/group/${params.group_id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`site/group/${params.group_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -97,7 +117,7 @@ export function editSiteGroup(params: Record<string, any>) {
  * @returns 
  */
 export function deleteSiteGroup(group_id: number) {
-    return request.delete(`site/group/${group_id}`, { showErrorMessage: true, showSuccessMessage: true });
+    return request.delete(`site/group/${group_id}`, { showSuccessMessage: true });
 }
 
 /**
@@ -135,7 +155,7 @@ export function getUserInfo(uid: number) {
  * @returns 
  */
 export function addUser(params: Record<string, any>) {
-    return request.post('site/user', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('site/user', params, { showSuccessMessage: true })
 }
 
 /**
@@ -145,7 +165,7 @@ export function addUser(params: Record<string, any>) {
  * @returns 
  */
 export function editUser(params: Record<string, any>) {
-    return request.put(`site/user/${params.uid}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`site/user/${params.uid}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -154,7 +174,7 @@ export function editUser(params: Record<string, any>) {
  * @returns 
  */
 export function deleteUser(uid: number) {
-    return request.delete(`site/user/${uid}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`site/user/${uid}`, { showSuccessMessage: true })
 }
 
 
diff --git a/admin/src/api/sys.ts b/admin/src/api/sys.ts
index e9c3dfc7d..d961867d5 100644
--- a/admin/src/api/sys.ts
+++ b/admin/src/api/sys.ts
@@ -42,7 +42,7 @@ export function getRoleInfo(roleId: number) {
  * @returns 
  */
 export function addRole(params: Record<string, any>) {
-    return request.post(`sys/role`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`sys/role`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -52,7 +52,7 @@ export function addRole(params: Record<string, any>) {
  * @returns 
  */
 export function editRole(params: Record<string, any>) {
-    return request.put(`sys/role/${params.role_id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/role/${params.role_id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -61,7 +61,7 @@ export function editRole(params: Record<string, any>) {
  * @returns 
  */
 export function deleteRole(roleId: number) {
-    return request.delete(`sys/role/${roleId}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`sys/role/${roleId}`, { showSuccessMessage: true })
 }
 
 /**
@@ -97,7 +97,7 @@ export function getMenuInfo(menu_key: string) {
  * @returns 
  */
 export function addMenu(params: Record<string, any>) {
-    return request.post('sys/menu', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('sys/menu', params, { showSuccessMessage: true })
 }
 
 /**
@@ -107,7 +107,7 @@ export function addMenu(params: Record<string, any>) {
  * @returns 
  */
 export function editMenu(params: Record<string, any>) {
-    return request.put(`sys/menu/${params.menu_key}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/menu/${params.menu_key}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -116,7 +116,7 @@ export function editMenu(params: Record<string, any>) {
  * @returns 
  */
 export function deleteMenu(menu_key: string) {
-    return request.delete(`sys/menu/${menu_key}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`sys/menu/${menu_key}`, { showSuccessMessage: true })
 }
 
 /***************************************************** 站点菜单 ****************************************************/
@@ -140,13 +140,21 @@ export function getWebsite() {
     return request.get('sys/config/website')
 }
 
+/**
+ * 获取网站设置
+ * @returns 
+ */
+export function getWebConfig() {
+    return request.get('sys/web/website')
+}
+
 /**
  * 更新网站设置
  * @param params 
  * @returns 
  */
 export function setWebsite(params: Record<string, any>) {
-    return request.put(`sys/config/website`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/config/website`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -157,13 +165,21 @@ export function getCopyright() {
     return request.get('sys/config/copyright')
 }
 
+/**
+ * 获服务信息
+ * @returns 
+ */
+export function getService() {
+    return request.get('sys/config/service')
+}
+
 /**
  * 更新版权设置
  * @param params 
  * @returns 
  */
 export function setCopyright(params: Record<string, any>) {
-    return request.put(`sys/config/copyright`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/config/copyright`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -180,7 +196,7 @@ export function getAttachmentCategoryList(params: Record<string, any>) {
  * @param params 
  */
 export function addAttachmentCategory(params: Record<string, any>) {
-    return request.post(`sys/attachment/category`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`sys/attachment/category`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -189,7 +205,7 @@ export function addAttachmentCategory(params: Record<string, any>) {
  * @returns 
  */
 export function editAttachmentCategory(params: Record<string, any>) {
-    return request.put(`sys/attachment/category/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/attachment/category/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -198,7 +214,7 @@ export function editAttachmentCategory(params: Record<string, any>) {
  * @returns 
  */
 export function deleteAttachmentCategory(id: number) {
-    return request.delete(`sys/attachment/category/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`sys/attachment/category/${id}`, { showSuccessMessage: true })
 }
 
 /**
@@ -216,7 +232,7 @@ export function getAttachmentList(params: Record<string, any>) {
  * @returns 
  */
 export function deleteAttachment(params: Record<string, any>) {
-    return request.delete(`sys/attachment/del`, { data: params, showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`sys/attachment/del`, { data: params, showSuccessMessage: true })
 }
 
 /**
@@ -275,7 +291,7 @@ export function getStorageInfo(type: string) {
  * @returns 
  */
 export function editStorage(params: Record<string, any>) {
-    return request.put(`sys/storage/${params.storage_type}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/storage/${params.storage_type}`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 支付设置 ****************************************************/
@@ -293,7 +309,7 @@ export function getPayConfig(type: string) {
  * @returns 
  */
 export function setPayConfig(params: Record<string, any>) {
-    return request.put(`pay/config/${params.type}`, params, { showErrorMessage: true, showSuccessMessage: true });
+    return request.put(`pay/config/${params.type}`, params, { showSuccessMessage: true });
 }
 
 /**
@@ -371,7 +387,7 @@ export function getAgreementInfo(key: string) {
  * @returns 
  */
 export function editAgreement(params: Record<string, any>) {
-    return request.put(`sys/agreement/${params.key}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/agreement/${params.key}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -408,7 +424,7 @@ export function getConfigLogin() {
  * @returns 
  */
 export function setConfigLogin(params: Record<string, any>) {
-    return request.put(`sys/config/login`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`sys/config/login`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -422,7 +438,7 @@ export function getPayConfigList() {
  * 设置支付配置
  */
 export function setPatConfig(params: Record<string, any>) {
-    return request.post(`pay/channel/set/all`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`pay/channel/set/all`, params, { showSuccessMessage: true })
 }
 
 
@@ -431,9 +447,17 @@ export function setPatConfig(params: Record<string, any>) {
  * 刷新菜单
  */
 export function menuRefresh(params: Record<string, any>) {
-    return request.post(`sys/menu/refresh`,{},{ showErrorMessage: true, showSuccessMessage: true })
+    return request.post(`sys/menu/refresh`, {}, { showSuccessMessage: true })
 }
 
+/**
+ * 清理数据字段缓存
+ */
+export function clearSchemaCache(params: Record<string, any>) {
+    return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true })
+}
+
+
 /***************************************************** 获取应用 ****************************************************/
 /**
  * 获取应用
@@ -442,3 +466,5 @@ export function getAppMange() {
     return request.get(`sys/applist`)
 }
 
+
+
diff --git a/admin/src/api/tools.ts b/admin/src/api/tools.ts
index e40c23032..cf55cd1de 100644
--- a/admin/src/api/tools.ts
+++ b/admin/src/api/tools.ts
@@ -26,7 +26,7 @@ export function getGenerateTableInfo(id: number) {
  * @returns
  */
 export function addGenerateTable(params: Record<string, any>) {
-    return request.post('generator/generator', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('generator/generator', params, { showSuccessMessage: true })
 }
 
 /**
@@ -36,7 +36,7 @@ export function addGenerateTable(params: Record<string, any>) {
  * @returns
  */
 export function editGenerateTable(params: Record<string, any>) {
-    return request.put(`generator/generator/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`generator/generator/${params.id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -45,7 +45,7 @@ export function editGenerateTable(params: Record<string, any>) {
  * @returns
  */
 export function deleteGenerateTable(id: number) {
-    return request.delete(`generator/generator/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+    return request.delete(`generator/generator/${id}`, { showSuccessMessage: true })
 }
 
 /**
diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts
index 8a5a57825..306b2ff4e 100644
--- a/admin/src/api/user.ts
+++ b/admin/src/api/user.ts
@@ -28,7 +28,7 @@ export function getUserInfo(uid: number) {
  * @returns 
  */
 export function addUser(params: Record<string, any>) {
-    return request.post('user/user', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.post('user/user', params, { showSuccessMessage: true })
 }
 
 /**
@@ -38,6 +38,6 @@ export function addUser(params: Record<string, any>) {
  * @returns 
  */
 export function editUser(params: Record<string, any>) {
-    return request.put(`user/user/${params.uid}`, params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put(`user/user/${params.uid}`, params, { showSuccessMessage: true })
 }
 
diff --git a/admin/src/api/weapp.ts b/admin/src/api/weapp.ts
index 432b6dfb4..1b0d0cb0a 100644
--- a/admin/src/api/weapp.ts
+++ b/admin/src/api/weapp.ts
@@ -14,7 +14,7 @@ export function getWeappConfig() {
  * @returns 
  */
 export function setWeappConfig(params: Record<string, any>) {
-    return request.put('weapp/config', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('weapp/config', params, { showSuccessMessage: true })
 }
 
 /**
@@ -31,5 +31,5 @@ export function getTemplateList() {
  * @returns 
  */
 export function getBatchAcquisition(params: Record<string, any>) {
-    return request.put('weapp/template/sync', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('weapp/template/sync', params, { showSuccessMessage: true })
 }
diff --git a/admin/src/api/wechat.ts b/admin/src/api/wechat.ts
index d642c7c83..6412b49ba 100644
--- a/admin/src/api/wechat.ts
+++ b/admin/src/api/wechat.ts
@@ -23,7 +23,7 @@ export function getWechatStatic() {
  * @returns 
  */
 export function editWechatConfig(params: Record<string, any>) {
-    return request.put('wechat/config', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('wechat/config', params, { showSuccessMessage: true })
 }
 
 /**
@@ -40,7 +40,7 @@ export function getWechatMenu() {
  * @returns 
  */
 export function editWechatMenu(params: Record<string, any>) {
-    return request.put('wechat/menu', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('wechat/menu', params, { showSuccessMessage: true })
 }
 
 /**
@@ -58,7 +58,7 @@ export function getTemplateList() {
  * @returns 
  */
 export function getBatchAcquisition(params: Record<string, any>) {
-    return request.put('wechat/template/sync', params, { showErrorMessage: true, showSuccessMessage: true })
+    return request.put('wechat/template/sync', params, { showSuccessMessage: true })
 }
 
 
diff --git a/admin/src/assets/images/app_default.png b/admin/src/assets/images/app_default.png
new file mode 100644
index 000000000..513b02134
Binary files /dev/null and b/admin/src/assets/images/app_default.png differ
diff --git a/admin/src/assets/images/app_store/app_store_default.png b/admin/src/assets/images/app_store/app_store_default.png
new file mode 100644
index 000000000..766ecedc7
Binary files /dev/null and b/admin/src/assets/images/app_store/app_store_default.png differ
diff --git a/admin/src/assets/images/app_store/local_icon.png b/admin/src/assets/images/app_store/local_icon.png
new file mode 100644
index 000000000..d3ebb61bb
Binary files /dev/null and b/admin/src/assets/images/app_store/local_icon.png differ
diff --git a/admin/src/assets/images/app_store/local_icon_select.png b/admin/src/assets/images/app_store/local_icon_select.png
new file mode 100644
index 000000000..0af1afe67
Binary files /dev/null and b/admin/src/assets/images/app_store/local_icon_select.png differ
diff --git a/admin/src/assets/images/app_store/market_icon.png b/admin/src/assets/images/app_store/market_icon.png
new file mode 100644
index 000000000..a7d068b85
Binary files /dev/null and b/admin/src/assets/images/app_store/market_icon.png differ
diff --git a/admin/src/assets/images/app_store/market_icon_select.png b/admin/src/assets/images/app_store/market_icon_select.png
new file mode 100644
index 000000000..a7d068b85
Binary files /dev/null and b/admin/src/assets/images/app_store/market_icon_select.png differ
diff --git a/admin/src/assets/images/app_store/switch_icon_1.png b/admin/src/assets/images/app_store/switch_icon_1.png
new file mode 100644
index 000000000..80aa0e3f1
Binary files /dev/null and b/admin/src/assets/images/app_store/switch_icon_1.png differ
diff --git a/admin/src/assets/images/app_store/switch_icon_2.png b/admin/src/assets/images/app_store/switch_icon_2.png
new file mode 100644
index 000000000..001ba311b
Binary files /dev/null and b/admin/src/assets/images/app_store/switch_icon_2.png differ
diff --git a/admin/src/assets/images/channel/preview.png b/admin/src/assets/images/channel/preview.png
index ffbf2b8c2..493050639 100644
Binary files a/admin/src/assets/images/channel/preview.png and b/admin/src/assets/images/channel/preview.png differ
diff --git a/admin/src/assets/images/default_headimg.png b/admin/src/assets/images/default_headimg.png
index f4f8cb31b..bb09f5ec3 100644
Binary files a/admin/src/assets/images/default_headimg.png and b/admin/src/assets/images/default_headimg.png differ
diff --git a/admin/src/assets/images/empty.png b/admin/src/assets/images/empty.png
new file mode 100644
index 000000000..c8421c96c
Binary files /dev/null and b/admin/src/assets/images/empty.png differ
diff --git a/admin/src/assets/images/error.png b/admin/src/assets/images/error.png
new file mode 100644
index 000000000..143d6c633
Binary files /dev/null and b/admin/src/assets/images/error.png differ
diff --git a/admin/src/assets/images/index/app.png b/admin/src/assets/images/index/app.png
new file mode 100644
index 000000000..a305932a3
Binary files /dev/null and b/admin/src/assets/images/index/app.png differ
diff --git a/admin/src/assets/images/index/article.png b/admin/src/assets/images/index/article.png
new file mode 100644
index 000000000..47efeabb2
Binary files /dev/null and b/admin/src/assets/images/index/article.png differ
diff --git a/admin/src/assets/images/index/auth.png b/admin/src/assets/images/index/auth.png
new file mode 100644
index 000000000..208ac2177
Binary files /dev/null and b/admin/src/assets/images/index/auth.png differ
diff --git a/admin/src/assets/images/index/new_site.png b/admin/src/assets/images/index/new_site.png
new file mode 100644
index 000000000..69151dc7d
Binary files /dev/null and b/admin/src/assets/images/index/new_site.png differ
diff --git a/admin/src/assets/images/index/renovation.png b/admin/src/assets/images/index/renovation.png
new file mode 100644
index 000000000..4c90a1860
Binary files /dev/null and b/admin/src/assets/images/index/renovation.png differ
diff --git a/admin/src/assets/images/index/site.png b/admin/src/assets/images/index/site.png
new file mode 100644
index 000000000..bd54d39e6
Binary files /dev/null and b/admin/src/assets/images/index/site.png differ
diff --git a/admin/src/assets/images/index/site_auth.png b/admin/src/assets/images/index/site_auth.png
new file mode 100644
index 000000000..969a993dc
Binary files /dev/null and b/admin/src/assets/images/index/site_auth.png differ
diff --git a/admin/src/assets/images/index/site_balance.png b/admin/src/assets/images/index/site_balance.png
new file mode 100644
index 000000000..a44533729
Binary files /dev/null and b/admin/src/assets/images/index/site_balance.png differ
diff --git a/admin/src/assets/images/index/site_bg.png b/admin/src/assets/images/index/site_bg.png
new file mode 100644
index 000000000..68f163752
Binary files /dev/null and b/admin/src/assets/images/index/site_bg.png differ
diff --git a/admin/src/assets/images/index/site_class.png b/admin/src/assets/images/index/site_class.png
new file mode 100644
index 000000000..573fbb503
Binary files /dev/null and b/admin/src/assets/images/index/site_class.png differ
diff --git a/admin/src/assets/images/index/site_member.png b/admin/src/assets/images/index/site_member.png
new file mode 100644
index 000000000..b1b0cd35c
Binary files /dev/null and b/admin/src/assets/images/index/site_member.png differ
diff --git a/admin/src/assets/images/index/wework_qrcode.png b/admin/src/assets/images/index/wework_qrcode.png
new file mode 100644
index 000000000..384435e0d
Binary files /dev/null and b/admin/src/assets/images/index/wework_qrcode.png differ
diff --git a/admin/src/assets/images/index/wx_qrcode.jpg b/admin/src/assets/images/index/wx_qrcode.jpg
new file mode 100644
index 000000000..54cb4a400
Binary files /dev/null and b/admin/src/assets/images/index/wx_qrcode.jpg differ
diff --git a/admin/src/assets/images/login/login_index_left.png b/admin/src/assets/images/login/login_index_left.png
index 5cc091e21..a585968f7 100644
Binary files a/admin/src/assets/images/login/login_index_left.png and b/admin/src/assets/images/login/login_index_left.png differ
diff --git a/admin/src/assets/images/member_head.png b/admin/src/assets/images/member_head.png
new file mode 100644
index 000000000..bb09f5ec3
Binary files /dev/null and b/admin/src/assets/images/member_head.png differ
diff --git a/admin/src/assets/images/site_logo.png b/admin/src/assets/images/site_logo.png
new file mode 100644
index 000000000..9046ef6c0
Binary files /dev/null and b/admin/src/assets/images/site_logo.png differ
diff --git a/admin/src/components/diy-link/index.vue b/admin/src/components/diy-link/index.vue
index 661ddde59..ab3a0db62 100644
--- a/admin/src/components/diy-link/index.vue
+++ b/admin/src/components/diy-link/index.vue
@@ -117,13 +117,13 @@ import { CollectionTag } from '@element-plus/icons-vue';
 
     getLink({}).then((res: any) => {
         link.value = res.data;
-        
-        childList.value = link.value[0].child_list;
+
+        childList.value = Object.values(link.value)[0].child_list;
         if (value.value.name != '') {
             selectLink.value = cloneDeep(value.value);
         } else {
             selectLink.value = {
-                parent: link.value[0].name
+                parent: Object.values(link.value)[0].name
             };
         }
         parentLinkName.value = selectLink.value.parent;
diff --git a/admin/src/components/select-icon/index.vue b/admin/src/components/select-icon/index.vue
index 90c9716e2..4239dd936 100644
--- a/admin/src/components/select-icon/index.vue
+++ b/admin/src/components/select-icon/index.vue
@@ -47,7 +47,7 @@ const element = computed(() => {
 
 // iconfont 图标
 const iconfont = computed(() => {
-    const iconfile = import.meta.globEager('@/styles/icon/iconfont.css')['/src/styles/iconfont.css'].default
+    const iconfile = import.meta.globEager('@/styles/iconfont.css')['/src/styles/iconfont.css'].default
     const icons = Array.from(iconfile.matchAll(/(icon.*)\:before/g))
 
     return icons.map(item => {
diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue
index 1f951370b..9f77876e6 100644
--- a/admin/src/components/upload-attachment/attachment.vue
+++ b/admin/src/components/upload-attachment/attachment.vue
@@ -2,7 +2,8 @@
     <div class="flex border-t border-b main-wrap border-color w-full" :class="scene == 'select' ? 'h-[40vh]' : 'h-full'">
         <!-- 分组 -->
         <div class="group-wrap w-[180px] p-[15px] h-full border-r border-color flex flex-col">
-            <el-input v-model="categoryParam.name" class="m-0" :placeholder="t('upload.attachmentCategoryPlaceholder')"
+        
+            <el-input v-model="categoryParam.name" class="m-0" :placeholder="t('upload.attachmentCategoryPlaceholder')" clearable 
                 prefix-icon="Search" @input="getAttachmentCategoryList()" />
             <div class="group-list flex-1 my-[10px]">
                 <el-scrollbar>
@@ -40,23 +41,26 @@
                 <el-col :span="12">
                     <div class="flex">
                         <el-upload v-bind="upload" ref="uploadRef">
-                            <el-button type="primary">{{ t('upload.upload' + type) }}</el-button>
+                            <el-button type="primary">{{ t('upload.upload' + type) }} {{ isOpen }}</el-button>
                         </el-upload>
-                        <el-button v-if="operate === false" class="ml-[10px]" type="primary" @click="operate = true">{{
-                            t('edit') }}</el-button>
-                        <el-button v-else class="ml-[10px]" type="primary" @click="operate = false">{{ t('complete')
-                        }}</el-button>
+						<div v-if="scene == 'attachment'">
+							<el-button v-if="operate === false" class="ml-[10px]" type="primary" @click="operate = true">{{
+							    t('edit') }}</el-button>
+							<el-button v-else class="ml-[10px]" type="primary" @click="operate = false">{{ t('complete')
+							}}</el-button>
+						</div>
+                        
                     </div>
                 </el-col>
                 <el-col :span="12" class="text-right">
-                    <el-input v-model="attachmentParam.real_name" class="m-0 w-[200px]"
+                    <el-input v-model="attachmentParam.real_name" class="m-0 w-[200px]" clearable 
                         :placeholder="t('upload.placeholder' + type + 'Name')" prefix-icon="Search"
                         @input="getAttachmentList()" />
                 </el-col>
             </el-row>
             <div class="flex-1 my-[15px] h-0" v-loading="attachment.loading">
                 <el-scrollbar>
-                    <div class="flex flex-wrap" v-if="attachment.data.length && operate === true">
+                    <div class="flex flex-wrap" v-if="attachment.data.length && (operate === true || scene != 'attachment')">
                         <div class="attachment-item mr-[10px]" :class="scene == 'select' ? 'w-[100px]' : 'w-[120px]'"
                             v-for="(item, index) in attachment.data" :key="index">
                             <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center"
@@ -348,7 +352,7 @@ const upload = computed(() => {
         },
         headers,
         onSuccess: (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
-            if (response.code == 200) {
+            if (response.code >= 1) {
                 getAttachmentList()
                 uploadRef.value?.handleRemove(uploadFile)
             } else {
diff --git a/admin/src/components/verifition/Verify/VerifyPoints.vue b/admin/src/components/verifition/Verify/VerifyPoints.vue
index 69f4da929..2bb4ee931 100644
--- a/admin/src/components/verifition/Verify/VerifyPoints.vue
+++ b/admin/src/components/verifition/Verify/VerifyPoints.vue
@@ -156,7 +156,7 @@
                                 "captcha_key":backToken.value
                             }
                             reqCheck(data).then(res=>{
-                                if (res.code == "200") {
+                                if (res.code == 1) {
                                     barAreaColor.value = '#4cae4c'
                                     barAreaBorderColor.value = '#5cb85c'
                                     text.value = '验证成功'
@@ -214,7 +214,7 @@
                         captchaType:captchaType.value
                     }
                     reqGet(data).then(res=>{
-                        if (res.code == "200") {
+                        if (res.code == 1) {
                             pointBackImgBase.value = res.data.originalImageBase64
                             backToken.value = res.data.token
                             secretKey.value = res.data.secretKey
diff --git a/admin/src/components/verifition/Verify/VerifySlide.vue b/admin/src/components/verifition/Verify/VerifySlide.vue
index cbcb0cc7f..97b22add8 100644
--- a/admin/src/components/verifition/Verify/VerifySlide.vue
+++ b/admin/src/components/verifition/Verify/VerifySlide.vue
@@ -248,7 +248,7 @@
                             "captcha_key":backToken.value
                         }
                         reqCheck(data).then(res=>{
-                            if (res.code == "200") {
+                            if (res.code == 1) {
                                 moveBlockBackgroundColor.value = '#5cb85c'
                                 leftBarBorderColor.value = '#5cb85c'
                                 iconColor.value = '#fff'
@@ -319,7 +319,7 @@
                         captchaType:captchaType.value
                     }
                     reqGet(data).then(res=>{
-                        if (res.code == "200") {
+                        if (res.code == 1) {
                             backImgBase.value = res.data.originalImageBase64
                             blockBackImgBase.value = res.data.jigsawImageBase64
                             backToken.value = res.data.token
diff --git a/admin/src/lang/en/login.json b/admin/src/lang/en/login.json
index 2f1074175..1db5f73b3 100644
--- a/admin/src/lang/en/login.json
+++ b/admin/src/lang/en/login.json
@@ -1,5 +1,5 @@
 {
-    "title": "Niushop Vite Management side",
+    "title": "Niucloud Vite Management side",
     "login": "Login",
     "logging": "Logging",
     "userPlaceholder": "Please enter your account number",
diff --git a/admin/src/lang/zh-cn/app_store.json b/admin/src/lang/zh-cn/app_store.json
new file mode 100644
index 000000000..37196b207
--- /dev/null
+++ b/admin/src/lang/zh-cn/app_store.json
@@ -0,0 +1,32 @@
+{
+	"noPlug":"暂无应用",
+	"install":"安装",
+	"unload":"卸载",
+	"installLabel":"已安装",
+	"uninstalledLabel":"未安装",
+	"version":"版本",
+	"title":"名称",
+	"desc":"描述",
+	"plugDetail": "插件信息",
+	"author":  "作者",
+	"addonInstall": "插件安装",
+	"dirPermission": "目录读写权限",
+	"path": "路径",
+	"demand": "要求",
+	"readable": "可读",
+	"write": "可写",
+	"packageManageTool": "包管理工具",
+	"name": "名称",
+	"addonInstallSuccess": "插件安装成功",
+	"envCheck": "环境检查",
+	"installProgress": "安装进度",
+	"installComplete": "安装完成",
+	"localAppText":"本地应用",
+	"marketAppText":"官方市场",
+	"installShowDialogCloseTips": "安装任务尚未完成，关闭任务仍会执行，确定要继续关闭吗？",
+	"marketDevelopMessage":"官方市场正在开发中！",
+	"jobError": "任务队列未启动 请在服务端源码部署目录打开终端执行 php think queue:listen",
+	"conflictFiles": "冲突文件",
+	"process": "启动进程",
+	"open": "开启"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/article.category.json b/admin/src/lang/zh-cn/article.category.json
index cfb1e2349..64d419c5d 100644
--- a/admin/src/lang/zh-cn/article.category.json
+++ b/admin/src/lang/zh-cn/article.category.json
@@ -14,5 +14,6 @@
       "sortNumber":"排序号必须是数字",
       "sortBetween":"排序号不能超过10000",
       "show":"显示",
-      "hide":"不显示"
+      "hide":"不显示",
+	  "articleNumber": "文章数量"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/article.list.json b/admin/src/lang/zh-cn/article.list.json
index 965e78037..b2869c0f1 100644
--- a/admin/src/lang/zh-cn/article.list.json
+++ b/admin/src/lang/zh-cn/article.list.json
@@ -1,12 +1,13 @@
 {
       "categoryName":"栏目",
+      "ID":"ID",
       "title":"标题",
       "intro":"简介",
       "summary":"摘要",
       "image":"封面",
       "author":"作者",
       "content":"文章内容",
-      "visit":"实际浏览量",
+      "visit":"浏览量",
       "visitVirtual":"虚拟浏览量",
       "isShow":"是否显示",
       "sort":"排序",
@@ -17,4 +18,5 @@
       "titlePlaceholder":"请输入文章标题",
       "categoryIdPlaceholder":"请选择文章栏目",
       "articleDeleteTips" : "确定要删除该文章吗？"
+	  
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/auth.role.json b/admin/src/lang/zh-cn/auth.role.json
index 77f7820e2..68de80882 100644
--- a/admin/src/lang/zh-cn/auth.role.json
+++ b/admin/src/lang/zh-cn/auth.role.json
@@ -6,5 +6,6 @@
     "roleNamePlaceholder": "请输入角色名称",
     "rulesPlaceholder": "请选择权限",
     "checkStrictly": "父子级不关联",
-    "permission": "权限"
+    "permission": "权限",
+    "foldText":"展开/折叠"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/auth.user.json b/admin/src/lang/zh-cn/auth.user.json
index 937a3f8bb..86e8d9ed2 100644
--- a/admin/src/lang/zh-cn/auth.user.json
+++ b/admin/src/lang/zh-cn/auth.user.json
@@ -17,6 +17,7 @@
     "status":"用户状态",
     "statusUnlock":"正常",
     "statusLock":"锁定",
+    "adminDisabled":"超级管理员不可编辑",
     "userUnlockTips":"确定要解锁该管理员吗？",
     "userLockTips":"确定要锁定该管理员吗？"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/channel.pc.config.json b/admin/src/lang/zh-cn/channel.pc.config.json
index 2fcf4d7e1..5a7a3317e 100644
--- a/admin/src/lang/zh-cn/channel.pc.config.json
+++ b/admin/src/lang/zh-cn/channel.pc.config.json
@@ -3,5 +3,6 @@
     "preview": "预览图",
     "copy": "复制",
     "clickVisit": "点击访问",
-    "PCDomainName": "pc域名"
+    "PCDomainName": "pc域名",
+    "newInfo": "最新消息"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/common.json b/admin/src/lang/zh-cn/common.json
index 15ec2625b..903e85515 100644
--- a/admin/src/lang/zh-cn/common.json
+++ b/admin/src/lang/zh-cn/common.json
@@ -80,10 +80,11 @@
     "400": "错误的请求",
     "401": "请重新登录",
     "403": "拒绝访问",
-    "404": "请求错误,未找到该资源",
+    "404": "请求错误",
     "405": "请求方法未允许",
     "408": "请求超时",
-    "500": "服务器端出错",
+    "409": "请求跨域",
+    "500": "服务器端出错，错误原因：",
     "501": "网络未实现",
     "502": "网络错误",
     "503": "服务不可用",
@@ -100,5 +101,7 @@
   "diyLinkUrlPlaceholder": "请输入跳转路径",
   "diyLinkUrlNotEmpty": "跳转路径不能为空",
   "returnToPreviousPage": "返回",
-  "preview": "预览"
+  "preview": "预览",
+  "emptyApp": "暂未安装任何应用",
+  "newInfo": "最新消息"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/decorate.edit.json b/admin/src/lang/zh-cn/decorate.edit.json
index 512921482..a3fdf01ec 100644
--- a/admin/src/lang/zh-cn/decorate.edit.json
+++ b/admin/src/lang/zh-cn/decorate.edit.json
@@ -1,9 +1,23 @@
 {
   "pageSet": "页面设置",
+  "tabEditContent": "内容",
+  "tabEditStyle": "样式",
+  "pageStyle": "页面样式",
   "pageContent": "页面内容",
   "pageName": "页面名称",
   "pageNamePlaceholder": "请输入页面名称",
   "pageBgColor": "页面颜色",
+  "bgUrl": "背景图片",
+  "marginSet": "边距设置",
+  "componentStyleTitle": "组件样式",
+  "bottomBgColor": "底部背景",
+  "bottomBgTips": "底部背景包含边距和圆角",
+  "componentBgColor": "组件背景",
+  "marginTop": "上边距",
+  "marginBottom": "下边距",
+  "marginBoth": "左右边距",
+  "topRounded": "上圆角",
+  "bottomRounded": "下圆角",
   "warmPrompt": "温馨提示",
   "leavePageTitleTips": "确定离开此页面？",
   "leavePageContentTips": "系统可能不会保存您所做的更改。",
@@ -28,6 +42,8 @@
   "addImageAd": "添加图片",
   "imageUrlTip": "请上传图片",
   "articleData": "文章数据",
+  "articleStyle": "文章样式",
+  "articleBgColor": "文章背景",
   "dataSources": "数据来源",
   "defaultSources": "默认",
   "manualSelectionSources": "手动选择",
@@ -65,6 +81,7 @@
   "addGraphicNav": "添加导航",
   "blankHeightSet": "高度设置",
   "blankHeight": "空白高度",
+  "styleSet": "风格设置",
   "titleStyle": "标题样式",
   "selectStyle": "风格选择",
   "titleContent": "标题内容",
@@ -73,6 +90,7 @@
   "textAlign": "对齐方式",
   "textAlignLeft": "居左",
   "textAlignCenter": "居中",
+  "textSet": "文字设置",
   "textFontSize": "文字大小",
   "textFontWeight": "文字粗细",
   "fontWeightBold": "加粗",
@@ -84,5 +102,6 @@
   "moreContent": "“更多”按钮内容",
   "more": "文字",
   "morePlaceholder": "请输入文字",
-  "moreIsShow": "是否显示"
+  "moreIsShow": "是否显示",
+  "memberStyle": "会员样式"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/diy.list.json b/admin/src/lang/zh-cn/diy.list.json
index fb7c1f873..e951cb26b 100644
--- a/admin/src/lang/zh-cn/diy.list.json
+++ b/admin/src/lang/zh-cn/diy.list.json
@@ -1,9 +1,11 @@
 {
   "title": "页面名称",
-  "typeName": "页面类型",
+  "typeName": "页面模板",
   "addPageTips": "创建新页面",
-  "pageTypePlaceholder": "请选择页面类型",
+  "pageTemplatePlaceholder": "请选择页面模板",
   "nameMax": "名称不能超过12个字符",
+  "templateName": "模板名称",
+  "empty": "空白",
   "status": "状态",
   "updateTime": "更新时间",
   "use": "使用",
diff --git a/admin/src/lang/zh-cn/diy.member.json b/admin/src/lang/zh-cn/diy.member.json
new file mode 100644
index 000000000..512921482
--- /dev/null
+++ b/admin/src/lang/zh-cn/diy.member.json
@@ -0,0 +1,88 @@
+{
+  "pageSet": "页面设置",
+  "pageContent": "页面内容",
+  "pageName": "页面名称",
+  "pageNamePlaceholder": "请输入页面名称",
+  "pageBgColor": "页面颜色",
+  "warmPrompt": "温馨提示",
+  "leavePageTitleTips": "确定离开此页面？",
+  "leavePageContentTips": "系统可能不会保存您所做的更改。",
+  "decorating": "正在装修",
+  "moveUpComponent": "上移",
+  "moveDownComponent": "下移",
+  "copyComponent": "复制",
+  "delComponent": "删除",
+  "resetComponent": "重置",
+  "tabbar": "底部导航",
+  "tabbarSwitchTips": "此处控制当前页面底部导航菜单是否显示",
+  "link": "链接地址",
+  "delComponentTips": "确定要删除吗？",
+  "notCopy": "无法复制",
+  "componentCanOnlyAdd": "组件只能添加",
+  "piece": "个",
+  "resetComponentTips": "确认要重置组件默认数据吗？",
+  "image": "图片上传",
+  "imageUpload": "图片上传",
+  "imageSet": "图片设置",
+  "imageAdsTips": "建议上传尺寸相同的图片，推荐尺寸750*350",
+  "addImageAd": "添加图片",
+  "imageUrlTip": "请上传图片",
+  "articleData": "文章数据",
+  "dataSources": "数据来源",
+  "defaultSources": "默认",
+  "manualSelectionSources": "手动选择",
+  "articleNum": "文章数量",
+  "selectPlaceholder": "请选择",
+  "selectArticleTips": "文章选择",
+  "articleTitle": "标题",
+  "articleImage": "封面",
+  "articleCategoryName": "栏目",
+  "articleSummary": "摘要",
+  "selected": "已选",
+  "selectArticleTip": "请选择文章",
+  "graphicNavModeTitle": "导航模式",
+  "layoutMode": "排版模式",
+  "layoutModeHorizontal": "横排",
+  "layoutModeVertical": "竖排",
+  "graphicNavSelectMode": "选择模式",
+  "graphicNavModeGraphic": "图文导航",
+  "graphicNavModeImg": "图片导航",
+  "graphicNavModeText": "文字导航",
+  "graphicNavImageSet": "图片设置",
+  "graphicNavImageSize": "图片大小",
+  "graphicNavAroundRadius": "图片圆角",
+  "graphicNavShowStyle": "展示风格",
+  "graphicNavStyleFixed": "固定显示",
+  "graphicNavStyleSingleSlide": "单行滑动",
+  "graphicNavStylePageSlide": "分页滑动",
+  "graphicNavRowCount": "每行数量",
+  "graphicNavPageCount": "每行数量",
+  "graphicNavSetLabel": "导航设置",
+  "line": "行",
+  "graphicNavTips": "建议上传尺寸相同的图片，推荐尺寸60*60",
+  "graphicNavTitle": "标题",
+  "graphicNavTitlePlaceholder": "请输入标题",
+  "addGraphicNav": "添加导航",
+  "blankHeightSet": "高度设置",
+  "blankHeight": "空白高度",
+  "titleStyle": "标题样式",
+  "selectStyle": "风格选择",
+  "titleContent": "标题内容",
+  "title": "标题名称",
+  "titlePlaceholder": "请输入标题",
+  "textAlign": "对齐方式",
+  "textAlignLeft": "居左",
+  "textAlignCenter": "居中",
+  "textFontSize": "文字大小",
+  "textFontWeight": "文字粗细",
+  "fontWeightBold": "加粗",
+  "fontWeightNormal": "常规",
+  "textColor": "文字颜色",
+  "subTitleContent": "标题内容",
+  "subTitle": "副标题",
+  "subTitlePlaceholder": "请输入副标题",
+  "moreContent": "“更多”按钮内容",
+  "more": "文字",
+  "morePlaceholder": "请输入文字",
+  "moreIsShow": "是否显示"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/diy.tabbar.json b/admin/src/lang/zh-cn/diy.tabbar.json
index d99b8493e..548dece0b 100644
--- a/admin/src/lang/zh-cn/diy.tabbar.json
+++ b/admin/src/lang/zh-cn/diy.tabbar.json
@@ -2,14 +2,14 @@
       "siteId":"站点id",
       "title":"页面名称",
       "name":"页面标识",
-      "type":"页面类型",
+      "type":"页面模板",
       "value":"页面数据，json格式",
       "isDefault":"是否默认页面，1：是，0：否",
       "visitCount":"访问量",
       "siteIdPlaceholder":"请输入站点id",
       "titlePlaceholder":"请输入页面名称",
       "namePlaceholder":"请输入页面标识",
-      "typePlaceholder":"请输入页面类型",
+      "typePlaceholder":"请输入页面模板",
       "valuePlaceholder":"请输入页面数据，json格式",
       "isDefaultPlaceholder":"请输入是否默认页面，1：是，0：否",
       "visitCountPlaceholder":"请输入访问量",
diff --git a/admin/src/lang/zh-cn/finance.cash_out.json b/admin/src/lang/zh-cn/finance.cash_out.json
index bd1201af2..fdd439cf4 100644
--- a/admin/src/lang/zh-cn/finance.cash_out.json
+++ b/admin/src/lang/zh-cn/finance.cash_out.json
@@ -4,6 +4,10 @@
       "orderNoPlaceholder":"请输入订单编号",
       "createTime":"创建时间",
       "rechargeMoney":"充值金额",
+      "totalTransfered":"累计提现（元）",
+      "totalCashOuting":"提现中（元）",
+      "transfered":"累计提现",
+      "cashOuting":"提现中",
       "orderMoney":"订单金额",
       "member":"买家",
       "orderFromName":"订单来源",
@@ -34,6 +38,11 @@
       "nickname":"会员名称",
       "headimg":"会员头像",
       "cashOutDetail":"提现详情",
-      "cashOutMoney": "转账金额"
+      "cashOutMoney": "转账金额",
+	"auditTime": "审核时间",
+	"transferTime": "转账时间",
+	"memberInfoPlaceholder":"请输入会员名称/会员昵称/手机号",
+	"cashOutNumber": "提现单号",
+	"cashOutNumberPlaceholder": "请输入提现单号"
       
 }
diff --git a/admin/src/lang/zh-cn/finance.recharge.json b/admin/src/lang/zh-cn/finance.recharge.json
index 3c584b9f3..bb9e49d42 100644
--- a/admin/src/lang/zh-cn/finance.recharge.json
+++ b/admin/src/lang/zh-cn/finance.recharge.json
@@ -1,18 +1,23 @@
 {
-      "orderNo":"订单编号",
-      "orderStatus":"订单状态",
-      "orderNoPlaceholder":"请输入订单编号",
-      "createTime":"创建时间",
-      "rechargeMoney":"充值金额",
-      "orderMoney":"订单金额",
-      "member":"买家",
-      "orderFromName":"订单来源",
-      "payTypeName":"支付方式",
-      "startDate":"开始时间",
-      "endDate":"结束时间",
-      "namePlaceholder":"请选择",
-      "refundBtn":"退款",
-      "refundContent":"是否确认退款"
-      
-
-}
\ No newline at end of file
+	"totalRechargeRefundMoney":"充值退款（元）",
+	"totalRechargeMoney":"充值金额（元）",
+	"rechargeRefundMoney":"充值退款",
+	"rechargeNo":"充值单号",
+	"orderStatus":"订单状态",
+	"rechargeNoPlaceholder":"请输入充值单号",
+	"createTime":"充值时间",
+	"rechargeMoney":"充值金额",
+	"orderMoney":"订单金额",
+	"member":"会员信息",
+	"orderFromName":"订单来源",
+	"payTypeName":"支付方式",
+	"startDate":"开始时间",
+	"endDate":"结束时间",
+	"namePlaceholder":"请选择",
+	"refundBtn":"退款",
+	"refundContent":"是否确认退款",
+	"payTime": "支付时间",
+	"refundStatus": "退款状态",
+	"startMoney": "起始金额",
+	"endMoney": "结束金额"
+} 
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/finance.refund.json b/admin/src/lang/zh-cn/finance.refund.json
index ac624407c..a02a18f78 100644
--- a/admin/src/lang/zh-cn/finance.refund.json
+++ b/admin/src/lang/zh-cn/finance.refund.json
@@ -6,9 +6,19 @@
       "refundTime":"退款时间",
       "detail": "详情",
 	  "statusName": "状态",
-	  "memberInfo": "会员",
+	  "memberInfo": "会员信息",
 	  "refundSource": "退款来源",
 	  "startDate":"开始时间",
 	  "endDate":"结束时间",
-	  "refundStatus": "退款状态"
+	  "refundStatus": "退款状态",
+	  "accumulateRefundMoney": "累计退款金额（元）",
+	  "haveRefundMoney": "退款中金额（元）",
+	  "refundSuccessMonry": "退款成功金额（元）",
+	  "refundFailMoney": "退款失败金额（元）",
+	  "memberInfoPlaceholder":"请输入会员编号/昵称/手机号",
+	  "refundNumberPlaceholder":"请输入退款单号",
+	  "orderNumber": "来源单号",
+	  "orderNumberPlaceholder": "请输入来源单号",
+	  "refundDetail": "退款详情",
+	  "nickname": "会员昵称"
 }
diff --git a/admin/src/lang/zh-cn/index.json b/admin/src/lang/zh-cn/index.json
index 32019fb30..32dedfad2 100644
--- a/admin/src/lang/zh-cn/index.json
+++ b/admin/src/lang/zh-cn/index.json
@@ -1,5 +1,5 @@
 {
-	"dataSummarize": "数据概括",
+	"dataSummarize": "数据概况",
     "todayData": "今日数据",
     "memberNumb": "新增会员数",
     "orderMoney": "订单金额",
@@ -38,8 +38,14 @@
 	"newSite": "新增站点",
 	"appMarketplace": "应用市场",
 	"siteDistribution": "站点分布",
-	"siteSum": "站点数",
-	"memberSum": "用户数",
-	"appSum": "应用数",
-	"installAppSun": "安装应用数"
+	"normalSiteSum": "正常站点（个）",
+	"expireSiteSum": "过期站点（个）",
+	"noInstallAppSun": "未安装应用（个）",
+	"installAppSun": "已安装应用（个）",
+	"officialAccount": "Niucloud官方公众号",
+	"officialAccountDesc": "微信扫码关注",
+	"WeCom": "客服二维码",
+	"WeComDesc": "扫码联系客服",
+	"tel": "服务热线："
+	
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/member.balance.json b/admin/src/lang/zh-cn/member.balance.json
index 6a69fa7a6..a5758e2f5 100644
--- a/admin/src/lang/zh-cn/member.balance.json
+++ b/admin/src/lang/zh-cn/member.balance.json
@@ -1,12 +1,14 @@
 {
-    "accountData":"金额",
+    "memberId":"会员编号",
+    "accountData":"变动金额",
     "fromType":"来源/用途",
     "balanceInfo":"余额变动详情",
+    "memberInfo":"会员信息",
     "memo":"备注",
     "mobile":"手机号码",
     "nickName":"会员昵称",
     "headimg":"会员头像",
-    "createTime":"产生时间",
+    "createTime":"发生时间",
     "startDate":"开始时间",
     "endDate":"结束时间",
     "searchMember":"昵称/手机号",
@@ -21,7 +23,12 @@
     "addMemberAccountLog":"添加会员账单表",
     "updateMemberAccountLog":"编辑会员账单表",
     "memberAccountLogDeleteTips":"确定要删除该会员账单表吗？",
-	"balance": "不可提现余额",
-	"money":"可提现余额",
-	"balanceType":"账户类型"
+	"totalAllBalance": "余额（元）",
+    "totalBalance": "不可提现（元）",
+    "totalMoney": "可提现（元）",
+    "balance": "不可提现",
+	"money":"可提现",
+	"balanceType":"账户类型",
+    "accountSum" : "剩余金额",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/member.commission.json b/admin/src/lang/zh-cn/member.commission.json
index 9a4ae08cb..0399136dd 100644
--- a/admin/src/lang/zh-cn/member.commission.json
+++ b/admin/src/lang/zh-cn/member.commission.json
@@ -1,12 +1,18 @@
 {
-    "accountData":"金额",
+    "totalCommission":"累计佣金（元）",
+    "commission":"未提现佣金（元）",
+    "withdrawnCommission":"已提现佣金（元）",
+    "cashOutingCommission":"提现中佣金（元）",
+    "accountData":"变动金额",
+    "memberId":"会员编号",
+    "accountSum":"剩余金额",
     "fromType":"来源/用途",
     "moneyInfo":"佣金变动详情",
     "memo":"备注",
     "mobile":"手机号码",
     "nickName":"会员信息",
     "headimg":"会员头像",
-    "createTime":"产生时间",
+    "createTime":"发生时间",
     "startDate":"开始时间",
     "endDate":"结束时间",
     "searchMember":"昵称/手机号",
@@ -20,5 +26,8 @@
     "memoPlaceholder":"请输入备注信息",
     "addMemberAccountLog":"添加会员账单表",
     "updateMemberAccountLog":"编辑会员账单表",
-    "member_account_logDeleteTips":"确定要删除该会员账单表吗？"
+    "member_account_logDeleteTips":"确定要删除该会员账单表吗？",
+    "memberInfo":"会员信息",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号"
+
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/member.detail.json b/admin/src/lang/zh-cn/member.detail.json
index 2d4848bc5..89474d170 100644
--- a/admin/src/lang/zh-cn/member.detail.json
+++ b/admin/src/lang/zh-cn/member.detail.json
@@ -5,6 +5,7 @@
     "adjustReducePoint":"减少积分",
     "adjustAddPoint":"增加积分",
     "adjustBalance":"调整余额",
+    "memberNo":"会员编号",
     "currBalance":"当前余额",
     "currPoint":"当前积分",
     "memo":"备注",
diff --git a/admin/src/lang/zh-cn/member.label.json b/admin/src/lang/zh-cn/member.label.json
index 073462e9d..f70bf7350 100644
--- a/admin/src/lang/zh-cn/member.label.json
+++ b/admin/src/lang/zh-cn/member.label.json
@@ -1,5 +1,6 @@
 {
     "labelName":"标签名称",
+    "memberNumber":"会员数量",
     "memo":"备注",
     "sort":"排序",
     "siteIdPlaceholder":"请输入站点id",
diff --git a/admin/src/lang/zh-cn/member.member.json b/admin/src/lang/zh-cn/member.member.json
index 31811d014..5f9176a11 100644
--- a/admin/src/lang/zh-cn/member.member.json
+++ b/admin/src/lang/zh-cn/member.member.json
@@ -1,6 +1,7 @@
 {
     "registerChannel":"注册来源",
     "nickname":"会员名称",
+    "memberNo":"会员编号",
     "mobile":"手机号",
     "createTime":"注册时间",
     "lastVisitTime":"最后访问时间",
@@ -9,9 +10,11 @@
     "nickNamePlaceholder":"请输入会员名称",
     "mobilePlaceholder":"请输入手机号",
     "channelPlaceholder":"请选择注册类型",
+    "memberNoPlaceholder":"请选择会员编号",
     "memberDeleteTips" : "确定要删除该会员吗？",
     "detail": "详情",
     "edit": "编辑",
+    "memberDelete":"删除",
     "adjust":"调整",
     "startDate": "开始时间",
     "endDate": "结束时间",
@@ -37,13 +40,14 @@
     "passwordCopy": "确认密码",
     "passwordPlaceholder": "请输入密码",
     "doubleCipherHint": "输入的两次密码不一致",
+    "memberNoHint":"会员编号只能输入字母和数字",
     "mobileHint": "请输入正确的手机号!",
     "lable": "标签",
     "setLable": "标签",
     "notAvailable": "暂无",
     "memberLabelPlaceholder": "请选择会员标签",
     "memberInfo":"会员信息",
-    "memberInfoPlaceholder":"请输入会员名称/会员昵称/手机号",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号",
 	"lock": "锁定",
-	"scrubLock": "取消锁定"
+	"normal": "正常"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/member.money.json b/admin/src/lang/zh-cn/member.money.json
deleted file mode 100644
index a987ca44e..000000000
--- a/admin/src/lang/zh-cn/member.money.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "accountData":"金额",
-    "fromType":"来源/用途",
-    "moneyInfo":"零钱变动详情",
-    "memo":"备注",
-    "mobile":"手机号码",
-    "nickName":"会员信息",
-    "headimg":"会员头像",
-    "createTime":"产生时间",
-    "startDate":"开始时间",
-    "endDate":"结束时间",
-    "searchMember":"昵称/手机号",
-    "searchMemberPlaceholder":"请输入会员昵称/手机号码",
-    "memberIdPlaceholder":"请输入会员id",
-    "accountTypePlaceholder":"请输入账户类型",
-    "accountDataPlaceholder":"请输入账户数据",
-    "fromTypePlaceholder":"请输入来源类型",
-    "relatedIdPlaceholder":"请输入关联Id",
-    "createTimePlaceholder":"请输入创建时间",
-    "memoPlaceholder":"请输入备注信息",
-    "addMemberAccountLog":"添加会员账单表",
-    "updateMemberAccountLog":"编辑会员账单表",
-    "member_account_logDeleteTips":"确定要删除该会员账单表吗？"
-}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/member.point.json b/admin/src/lang/zh-cn/member.point.json
index 813731e3b..56a576b45 100644
--- a/admin/src/lang/zh-cn/member.point.json
+++ b/admin/src/lang/zh-cn/member.point.json
@@ -1,12 +1,16 @@
 {
-    "accountData":"积分数量",
+    "pointGet":"累计发放积分",
+    "pointUse":"累计使用积分",
+    "accountData":"变动积分",
+    "accountSum":"剩余积分",
     "fromType":"来源/用途",
+    "memberId":"会员编号",
     "pointInfo":"积分变动详情",
     "memo":"备注",
     "mobile":"手机号码",
     "nickName":"会员信息",
     "headimg":"会员头像",
-    "createTime":"产生时间",
+    "createTime":"发生时间",
     "startDate":"开始时间",
     "endDate":"结束时间",
     "searchMember":"昵称/手机号",
@@ -20,5 +24,7 @@
     "memoPlaceholder":"请输入备注信息",
     "addMemberAccountLog":"添加会员账单表",
     "updateMemberAccountLog":"编辑会员账单表",
-    "member_account_logDeleteTips":"确定要删除该会员账单表吗？"
+    "member_account_logDeleteTips":"确定要删除该会员账单表吗？",
+    "memberInfo":"会员信息",
+    "memberInfoPlaceholder":"请输入会员编号/昵称/手机号"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.adminlogin.json b/admin/src/lang/zh-cn/setting.adminlogin.json
index 87c6e94cd..d2d36292f 100644
--- a/admin/src/lang/zh-cn/setting.adminlogin.json
+++ b/admin/src/lang/zh-cn/setting.adminlogin.json
@@ -1,7 +1,8 @@
 {
       "isCaptcha": "是否启用验证码",
-      "bgImg": "背景图片",
+      "bgImg": "登录页广告图",
       "admin": "平台端",
-      "isBgImgTip": "建议上传尺寸为450*400px",
-      "site": "站点端"
+      "adminBgImgTip": "建议上传尺寸为450*400px",
+      "site": "站点端",
+      "siteBgImgTip": "建议上传尺寸为450*400px"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.withdrawal.json b/admin/src/lang/zh-cn/setting.cash_out.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.withdrawal.json
rename to admin/src/lang/zh-cn/setting.cash_out.json
diff --git a/admin/src/lang/zh-cn/setting.login.json b/admin/src/lang/zh-cn/setting.login.json
index fe95ff2ed..d74fd9ac3 100644
--- a/admin/src/lang/zh-cn/setting.login.json
+++ b/admin/src/lang/zh-cn/setting.login.json
@@ -1,11 +1,15 @@
 {
-      "logonMode": "普通注册方式",
-      "isUsername": "账号密码登录",
-      "isMobile": "手机验证码登录",
-      "isAuthRegister": "第三方自动注册",
-      "isBindMobile": "强制绑定手机",
-      "isUsernameTip": "开启之后可以使用账号+密码进行注册和登录",
-      "isMobileTip": "开启之后可以使用手机+验证码进行注册和登录",
-      "isAuthRegisterTip": "开启之后，微信公众号、小程序等等第三方平台可以自动注册会员。方便会员自动登录",
-      "isBindMobileTip": "开启之后，会员通过账号或者第三方注册账户会强制绑定手机号，方便商家进行管理，同时方便会员在不同端口统一账号"
+	"logonMode": "普通注册方式",
+	"isUsername": "账号密码登录",
+	"isMobile": "手机验证码登录",
+	"isAuthRegister": "第三方自动注册",
+	"isBindMobile": "强制绑定手机",
+	"isUsernameTip": "开启之后可以使用账号+密码进行注册和登录",
+	"isMobileTip": "开启之后可以使用手机+验证码进行注册和登录",
+	"isAuthRegisterTip": "开启之后，微信公众号、小程序等等第三方平台可以自动注册会员。方便会员自动登录",
+	"isBindMobileTip": "开启之后，会员通过账号或者第三方注册账户会强制绑定手机号，方便商家进行管理，同时方便会员在不同端口统一账号",
+	"agreement": "政策协议",
+	"agreementTips": "注册时服务协议和隐私协议是否进行展示",
+	"commonSetting": "通用设置",
+	"tripartiteSetting": "第三方设置"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.member.json b/admin/src/lang/zh-cn/setting.member.json
new file mode 100644
index 000000000..3cc0ff619
--- /dev/null
+++ b/admin/src/lang/zh-cn/setting.member.json
@@ -0,0 +1,11 @@
+{
+	"memberNoRule": "会员编号生成规则",
+	"prefix": "编码前缀",
+	"prefixPlaceholder": "请输入编码前缀",
+	"prefixHint":"编码前缀只能为英文字母",
+	"lengthHint":"编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位",
+	"prefixTips": "编码格式如：",
+	"length": "编码长度",
+	"lengthPlaceholder": "请输入编码长度",
+	"lengthTips": "编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.notice.template.json b/admin/src/lang/zh-cn/setting.notice.template.json
index 134e06719..f2f25cd8a 100644
--- a/admin/src/lang/zh-cn/setting.notice.template.json
+++ b/admin/src/lang/zh-cn/setting.notice.template.json
@@ -16,6 +16,7 @@
       "content": "模板内容",
       "weappTempKey" : "模板编号",
       "smsId":"短信模版ID",
-      "smsIdPlaceholder":"短信模版ID"
+      "smsIdPlaceholder":"短信模版ID",
+	  "noticeType":"消息类型"
       
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.oplatform.json b/admin/src/lang/zh-cn/setting.oplatform.json
new file mode 100644
index 000000000..d992cfe3c
--- /dev/null
+++ b/admin/src/lang/zh-cn/setting.oplatform.json
@@ -0,0 +1,19 @@
+{
+	"oplatformSetting": "开放平台设置",
+	"appidPlaceholder": "微信第三方平台AppId",
+	"appsecretPlaceholder": "微信第三方平台AppSecret",
+	"oplatformComm": "开放平台通信",
+	"empowerStartDomain": "授权发起页域名",
+	"empowerReceiveUrl": "授权事件接收URL",
+	"messageValidationToken": "消息校验Token",
+	"messageDecryptKey": "消息加解密Key",
+	"messageReceiveUrl": "消息与事件接收URL",
+	"wechatDomain": "公众号开发域名",
+	"weappDomain": "小程序服务器域名",
+	"weappBusinessDomain": "小程序业务域名",
+	"oplatformBuilder": "开发者设置",
+	"builderEmail": "开发者邮箱",
+	"builderMobile": "开发者手机号",
+	"builderQQ": "开发者QQ",
+	"builderWx": "开发者微信"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.pay.channel.json b/admin/src/lang/zh-cn/setting.pay.channel.json
index 2d2868c81..cdb82c719 100644
--- a/admin/src/lang/zh-cn/setting.pay.channel.json
+++ b/admin/src/lang/zh-cn/setting.pay.channel.json
@@ -46,7 +46,7 @@
     "enablePaymentMode": "请先开启该支付方式",
     "clickConfigure": "点击配置",
     "setConfig": "设置支付配置",
-    "open": "开启",
+    "open": "已开启",
     "notOpen": "未开启",
     "cancel": "取消"
     
diff --git a/admin/src/lang/zh-cn/setting.system.json b/admin/src/lang/zh-cn/setting.system.json
index 713c4a458..280822552 100644
--- a/admin/src/lang/zh-cn/setting.system.json
+++ b/admin/src/lang/zh-cn/setting.system.json
@@ -1,25 +1,34 @@
 {
-      "websiteInfo":"网站设置",
-      "contactAddress":"联系地址",
-      "siteName": "站点名称",
-      "keywords": "网站关键字",
-      "logo": "网站Logo",
-      "desc": "网站简介",
-      "province": "省",
-      "city": "市",
-      "district": "区/县",
-      "selectAddress": "请选择地址",
-      "address": "详细地址",
-      "phone": "客服电话",
-      "businessHours": "营业时间",
-      "contactAddressPlaceholder":"联系地址",
-      "siteNamePlaceholder": "站点名称",
-      "keywordsPlaceholder": "网站关键字",
-      "logoPlaceholder": "网站Logo",
-      "descPlaceholder": "网站简介",
-     
-      "addressPlaceholder": "详细地址",
-      "phonePlaceholder": "客服电话",
-      "businessHoursPlaceholder": "营业时间",
-      "businessHoursTips": "例：上午9:00-12:00，下午2:00-6:00"
+	"websiteInfo":"后台设置",
+	"contactAddress":"联系地址",
+	"siteName": "站点名称",
+	"keywords": "网站关键字",
+	"logo": "网站Logo",
+	"desc": "网站简介",
+	"province": "省",
+	"city": "市",
+	"district": "区/县",
+	"selectAddress": "请选择地址",
+	"address": "详细地址",
+	"phone": "客服电话",
+	"businessHours": "营业时间",
+	"contactAddressPlaceholder":"联系地址",
+	"siteNamePlaceholder": "站点名称",
+	"keywordsPlaceholder": "网站关键字",
+	"logoPlaceholder": "网站Logo",
+	"descPlaceholder": "网站简介",
+	"addressPlaceholder": "详细地址",
+	"phonePlaceholder": "客服电话",
+	"businessHoursPlaceholder": "营业时间",
+	"businessHoursTips": "例：上午9:00-12:00，下午2:00-6:00",
+	"frontEndInfo": "前台设置",
+	"frontEndName": "前台名称",
+	"frontEndNamePlaceholder": "请输入前台名称",
+	"frontEndLogo": "前台Logo",
+	"icon": "网站图标",
+	"serviceInformation": "服务信息",
+	"wechatCode": "公众号二维码",
+	"customerServiceCode": "客服二维码",
+	"contactsTel": "联系电话",
+	"contactsTelPlaceholder": "请输入联系电话"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/site.group.json b/admin/src/lang/zh-cn/site.group.json
index 229965bea..9d90f9e9d 100644
--- a/admin/src/lang/zh-cn/site.group.json
+++ b/admin/src/lang/zh-cn/site.group.json
@@ -16,5 +16,6 @@
     "checkStrictly": "父子级不关联",
     "remark": "套餐说明",
     "reset": "重置",
-    "search": "搜索"
+    "search": "搜索",
+    "foldText":"展开/折叠"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/site.list.json b/admin/src/lang/zh-cn/site.list.json
index 51ca90653..2de21202b 100644
--- a/admin/src/lang/zh-cn/site.list.json
+++ b/admin/src/lang/zh-cn/site.list.json
@@ -25,6 +25,17 @@
       "userRealNamePlaceholder": "请输入名称",
       "expireTimePlaceholder":"请选择到期时间",
       "confirmPasswordError": "两次输入的密码不一致",
-      "operationTip": "温馨提示：站点登录页面"
-      
-}
\ No newline at end of file
+      "operationTip": "温馨提示：站点登录页面",
+      "siteId": "站点ID",
+      "siteInfo": "站点信息",
+      "siteInlet": "站点入口",
+      "enterSite": "访问站点",
+      "siteList": "站点列表",
+	"openClose": "开启/停止",
+      "closeTxt":"停止",
+      "openTxt":"开启",
+      "siteUrlDevelopMessage": "站点域名功能正在开发中",
+      "url": "域名",
+      "startDate":"开始时间",
+      "endDate":"开始时间"
+}	
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/site.user.json b/admin/src/lang/zh-cn/site.user.json
index a7aac1744..f28d74bdb 100644
--- a/admin/src/lang/zh-cn/site.user.json
+++ b/admin/src/lang/zh-cn/site.user.json
@@ -14,6 +14,8 @@
     "userRoleName": "角色",
     "isAdmin":"超级管理员",
     "siteName":"站点名称",
+	"siteId": "站点ID",
+	"enterSite": "访问站点",
     "userRolePlaceholder": "请选择角色",
     "siteNamePlaceholder":"请输入站点名称"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/siteindex.json b/admin/src/lang/zh-cn/siteindex.json
index 73a15fad9..e3058ad30 100644
--- a/admin/src/lang/zh-cn/siteindex.json
+++ b/admin/src/lang/zh-cn/siteindex.json
@@ -1,9 +1,9 @@
 {
-    "todayData": "今日数据",
-    "memberNumb": "新增会员数",
-    "orderMoney": "订单金额",
+    "todayData": "实时概况",
+    "memberNumb": "新增会员数（人）",
+    "orderMoney": "订单金额（元）",
     "numberOfSites": "站点数量",
-    "numberOfVisitors": "今日访客数",
+    "numberOfVisitors": "今日访客数（人）",
     "commonlyUsedFunction": "常用功能",
     "articleList": "文章列表",
     "memberManagement": "会员管理",
@@ -22,11 +22,23 @@
     "channel": "获取渠道",
     "serviceSupport": "服务支持",
     "officialWbsite": "官网",
-    "pageView": "访问量",
+    "pageView": "访客数（人）",
     "siteInfo":"站点信息",
     "siteName":"站点名称",
     "groupName":"站点套餐",
     "expireTime":"过期时间",
     "permanent":"永久",
-    "statusName":"站点状态"
+    "statusName":"站点状态",
+	"orderNumber": "订单数（笔）",
+	"wechatCode": "公众号二维码",
+	"wechatCodeDesc": "微信扫码关注",
+	"enterpriseWechatCode": "客服二维码",
+	"enterpriseWechatCodeDesc": "扫码联系客服",
+	"tel": "服务热线：",
+	"message": "请联系客服",
+	"messageTitle": "提示",
+	"accumulative":"累计",
+	"officialAccount": "Niucloud官方公众号",
+	"officialAccountDesc": "微信扫码关注",
+	"WeCom": "添加企业微信群"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/tools.app_store.json b/admin/src/lang/zh-cn/tools.app_store.json
deleted file mode 100644
index e910ea6b8..000000000
--- a/admin/src/lang/zh-cn/tools.app_store.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-      "noPlug":"暂无插件",
-      "install":"安装",
-      "unload":"卸载",
-      "installLabel":"已安装",
-      "uninstalledLabel":"未安装",
-      "version":"版本",
-      "title":"名称",
-      "desc":"描述",
-      "plugDetail": "插件信息",
-      "author":  "作者"
-}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/tools.detection.json b/admin/src/lang/zh-cn/tools.detection.json
index c7f234209..80c23ab75 100644
--- a/admin/src/lang/zh-cn/tools.detection.json
+++ b/admin/src/lang/zh-cn/tools.detection.json
@@ -1,15 +1,16 @@
 {
-      "title": "名称",
-	  "serverInformation": "服务器信息",
-	  "systemDemand": "系统环境要求",
-	  "authorityStatus": "权限状态",
-      "name": "选项",
-	  "demand": "要求",
-	  "status": "状态",
-	  "environment": "环境",
-	  "version": "版本",
-	  "phpType": "PHP版本",
-	  "phpTypeValue": "大于等于8.0.0",
-	  "mysqlType": "mysql版本",
-	  "mysqlTypeValue": "大于等于5.7"
+	"title": "名称",
+	"serverInformation": "服务器信息",
+	"systemDemand": "系统环境要求",
+	"authorityStatus": "权限状态",
+	"name": "选项",
+	"demand": "要求",
+	"status": "状态",
+	"environment": "环境",
+	"version": "版本",
+	"phpType": "PHP版本",
+	"phpTypeValue": "大于等于8.0.0",
+	"mysqlType": "mysql版本",
+	"mysqlTypeValue": "大于等于5.7",
+	"process": "启动进程"
 }
\ No newline at end of file
diff --git a/admin/src/layout/decorate/index.vue b/admin/src/layout/decorate/index.vue
index d0b519d64..77929b240 100644
--- a/admin/src/layout/decorate/index.vue
+++ b/admin/src/layout/decorate/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-container class="w-screen h-screen">
+	<el-container class="w-screen h-screen min-w-[1200px]">
 		<router-view></router-view>
 	</el-container>
 </template>
diff --git a/admin/src/layout/default/components/aside/index.vue b/admin/src/layout/default/components/aside/index.vue
index b085af8f7..9cc0ceb2c 100644
--- a/admin/src/layout/default/components/aside/index.vue
+++ b/admin/src/layout/default/components/aside/index.vue
@@ -1,10 +1,9 @@
 <template>
-    <el-aside class="h-screen layout-aside w-auto">
+    <el-aside :class="['h-screen layout-aside w-auto',{'bright': !dark}]">
         <side class="hidden-xs-only" />
     </el-aside>
 
-    <el-drawer v-model="systemStore.menuDrawer" direction="ltr" :with-header="false" custom-class="aside-drawer"
-        size="210px">
+    <el-drawer v-model="systemStore.menuDrawer" direction="ltr" :with-header="false" custom-class="aside-drawer" size="210px">
         <template #default>
             <side />
         </template>
@@ -12,15 +11,17 @@
 </template>
 
 <script lang="ts" setup>
-import { watch } from 'vue'
+import { watch,computed } from 'vue'
 import { useRoute } from 'vue-router'
 import side from './side.vue'
 import useSystemStore from '@/stores/modules/system'
 
 const systemStore = useSystemStore()
+const dark = computed(()=>{
+    return systemStore.dark
+})
 
 const route = useRoute()
-
 watch(route, () => {
     systemStore.$patch(state => {
         state.menuDrawer = false
@@ -33,6 +34,26 @@ watch(route, () => {
     background-color: var(--side-dark-color, var(--el-bg-color));
     border-right: 1px solid var(--el-border-color-lighter);
     z-index: 101;
+    &.bright{
+        background-color: #F5F7F9;
+        li{
+            background-color: #F5F7F9;
+            &.is-active:not(.is-opened){
+                position: relative;
+                color: #333;
+                background-color: #fff;
+                &::after{
+                    content: "";
+                    position: absolute;
+                    top: 0;
+                    bottom: 0;
+                    left: 0;
+                    width: 2px;
+                    background-color: var(--el-menu-active-color);
+                }
+            }
+        }
+    }
 }
 
 .aside-drawer {
diff --git a/admin/src/layout/default/components/aside/menu-item.vue b/admin/src/layout/default/components/aside/menu-item.vue
index fd1b251ef..509725d8d 100644
--- a/admin/src/layout/default/components/aside/menu-item.vue
+++ b/admin/src/layout/default/components/aside/menu-item.vue
@@ -2,22 +2,32 @@
     <template v-if="meta.show">
         <el-sub-menu v-if="routes.children" :index="String(routes.name)">
             <template #title>
-                <icon v-if="meta.icon" :name="meta.icon" class="mr-[6px] w-auto" />
-                <span>{{ meta.title }}</span>
+                <div v-if="meta.icon && routes.meta.class == 1" class="w-[16px] h-[16px] relative flex items-center">
+                    <icon v-if="meta.icon" :name="meta.icon" class="absolute !w-auto" />
+                </div>
+                <span :class="['ml-[10px]', {'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}]">{{ meta.title }}</span>
             </template>
             <menu-item v-for="(route, index) in routes.children" :routes="route" :route-path="resolvePath(route.path)"
                 :key="index" />
         </el-sub-menu>
-        <el-menu-item v-else :index="String(routes.name)" :route="routePath">
-            <icon v-if="meta.icon" :name="meta.icon" class="mr-[6px] w-auto" />
+        <el-menu-item v-else-if="routes.meta.class == 1" :index="String(routes.name)" :route="routePath">
+            <div v-if="meta.icon" class="w-[16px] h-[16px] relative flex justify-center">
+                <icon :name="meta.icon" class="absolute top-[50%] -translate-y-[50%]" />
+            </div>
             <template #title>
-                <span>{{ meta.title }}</span>
+                <span :class="['ml-[10px]', {'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}]">{{ meta.title }}</span>
+            </template>
+        </el-menu-item>
+        <el-menu-item v-else :index="String(routes.name)" :route="routePath">
+            <template #title>
+                <span :class="[{'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}, {'ml-[10px]': routes.meta.class == 2, 'ml-[15px]': routes.meta.class == 3}]">{{ meta.title }}</span>
             </template>
         </el-menu-item>
     </template>
 </template>
 
 <script lang="ts" setup>
+import { CollectionTag } from '@element-plus/icons-vue'
 import { computed } from 'vue'
 import menuItem from './menu-item.vue'
 
@@ -38,8 +48,16 @@ const resolvePath = (path: string) => {
 }
 </script>
 
-<style lang="scss" scoped>
-.w-auto {
-    width: auto !important;
+<style lang="scss">
+.el-sub-menu{
+    .el-icon{
+        width: auto;
+    }
+    li{
+        font-size: 15px;
+    }
+}
+.el-alert .el-alert__description{
+    margin-top: 0;
 }
 </style>
diff --git a/admin/src/layout/default/components/aside/side.vue b/admin/src/layout/default/components/aside/side.vue
index ca1ee0f5d..a6d61dd1e 100644
--- a/admin/src/layout/default/components/aside/side.vue
+++ b/admin/src/layout/default/components/aside/side.vue
@@ -14,8 +14,7 @@
             <el-scrollbar>
                 <el-menu :default-active="menuActive" :router="true" class="aside-menu h-full" unique-opened="true"
                     :collapse="systemStore.menuIsCollapse">
-                    <menu-item v-for="(route, index) in userStore.routers" :routes="route" :route-path="route.path"
-                        :key="index" />
+                    <menu-item v-for="(route, index) in userStore.routers" :routes="route" :route-path="route.path" :key="index" />
                 </el-menu>
             </el-scrollbar>
         </el-main>
@@ -38,9 +37,23 @@ const route = useRoute()
 const siteInfo = storage.get('siteInfo') || false
 
 const menuActive = computed(() => String(route.name))
+
+userStore.routers.forEach((item,index) => {
+    item.meta.class = 1;
+    if(item.children){
+        item.children.forEach((subItem,subIndex) => {
+            subItem.meta.class = 2;
+            if(subItem.children){
+                subItem.children.forEach((threeItem,threeIndex) => {
+                    threeItem.meta.class = 3;
+                })
+            }
+        })
+    }
+});
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .aside-menu:not(.el-menu--collapse) {
     width: var(--aside-width);
 }
@@ -66,15 +79,15 @@ const menuActive = computed(() => String(route.name))
 }
 
 .menu-wrap {
-    flex: 1;
-    height: 0;
-    padding: 0;
+    flex: 1 !important;
+    height: 0 !important;
+    padding: 0 !important;
 
-    :deep(.el-menu) {
+    .el-menu {
         border-right: 0 !important;
     }
 }
-::v-deep.sidebar-dark-mode{
+.sidebar-dark-mode{
     background-color: #191a23;
     & > .logo-wrap{
         .logo>i{
@@ -84,23 +97,29 @@ const menuActive = computed(() => String(route.name))
     }
     .el-menu{
         background-color: #191a23;
-        ul.el-menu--inline{
-            background-color: #101117;
+        .el-sub-menu{
+            background: transparent !important;
         }
         .el-sub-menu__title, .el-menu-item{
+            background: transparent !important;
             color: #B7B7ba;
             &:hover{
-                background-color: transparent;
-                color: #fff;
+                background-color: transparent !important;
+                color: #fff !important;
             }
         }
         .el-menu-item.is-active{
-            color: #fff;
-            background-color: var(--el-color-primary);
+            color: #fff !important;
+            background-color: var(--el-color-primary) !important;
+        }
+        li::after{
+            content: "";
+            width: 0;
+            height: 0;
         }
     }
 }
-::v-deep.sidebar-brightness-mode{
+.sidebar-brightness-mode{
     & > .logo-wrap{
         .logo>i{
             font-size: 20px;
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index f57635598..577d00414 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-container class="layout-header h-full border-b border-color px-[10px]">
+    <el-container :class="['h-full px-[10px]',{'layout-header border-b border-color': !dark}]" >
         <el-row class="w-100 h-full w-full">
             <el-col :span="12">
                 <div class="left-panel h-full flex items-center">
@@ -33,8 +33,7 @@
             <el-col :span="12">
                 <div class="right-panel h-full flex items-center justify-end">
                     <!-- 预览 只有站点时展示-->
-                    <img class="w-[16px] h-[16px] mr-1" v-if="appType == 'site'" src="@/assets/images/icon_preview.png"
-                        :alt="t('preview')" :title="t('preview')">
+                    <i class="iconfont iconlingdang-xianxing cursor-pointer px-[8px]" :title="t('newInfo')" v-if="appType == 'site'"></i>
                     <!-- 切换语言 -->
                     <div class="navbar-item flex items-center h-full cursor-pointer">
                         <switch-lang />
@@ -90,6 +89,10 @@ const appStore = useAppStore()
 const route = useRoute()
 const screenWidth = ref(window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth)
 
+const dark = computed(()=>{
+    return systemStore.dark
+})
+
 // 检测登录 start
 const detectionLoginDialog = ref(false)
 const comparisonToken = ref('')
@@ -164,6 +167,11 @@ const backFn = () => {
 </script>
 
 <style lang="scss" scoped>
+.layout-header{
+    position: relative;
+    z-index: 5;
+    box-shadow: 0px 0px 4px 0px rgba(0,145,255,0.1);
+}
 .navbar-item {
     padding: 0 8px;
 
diff --git a/admin/src/layout/default/index.vue b/admin/src/layout/default/index.vue
index c7c98df5f..baafe049c 100644
--- a/admin/src/layout/default/index.vue
+++ b/admin/src/layout/default/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="common-layout">
+    <div class="common-layout min-w-[1200px]" >
         <el-container class="w-100 h-screen">
             <layout-aside></layout-aside>
 
@@ -8,9 +8,9 @@
                     <layout-header></layout-header>
                 </el-header>
 
-                <el-main class="main-wrap h-full bg-page p-0">
+                <el-main :class="['main-wrap h-full p-0',{'bg-page': dark}]">
                     <el-scrollbar>
-                        <div class="p-[16px]">
+                        <div class="p-[10px]">
                             <router-view v-slot="{ Component, route }" v-if="appStore.routeRefrehTag">
                                 <keep-alive :include="tabbarStore.tabNames">
                                     <component :is="Component" :key="route.fullPath" />
@@ -26,13 +26,19 @@
 </template>
 
 <script lang="ts" setup>
+import { computed } from 'vue'
 import layoutHeader from './components/header/index.vue'
 import layoutAside from './components/aside/index.vue'
 import useAppStore from '@/stores/modules/app'
 import useTabbarStore from '@/stores/modules/tabbar'
+import useSystemStore from '@/stores/modules/system'
 
 const appStore = useAppStore()
 const tabbarStore = useTabbarStore()
+const systemStore = useSystemStore()
+const dark = computed(()=>{
+    return systemStore.dark
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index 6198f0a5d..e7b26eef3 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -10,7 +10,7 @@ import storage from '@/utils/storage'
 
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
-    routes: [...STATIC_ROUTES, ADMIN_ROUTE, SITE_ROUTE]
+    routes: [ADMIN_ROUTE, SITE_ROUTE, ...STATIC_ROUTES]
 })
 
 /**
@@ -33,14 +33,23 @@ router.beforeEach(async (to, from, next) => {
 
     const userStore = useUserStore()
     const siteInfo = storage.get('siteInfo') || false
-    let title = (to.meta?.title || '') + (siteInfo.site_name ? ('-' + siteInfo.site_name) : '')
+    let title = (to.meta.title ? (to.meta.title + ' - ') : '') + (siteInfo.site_name ? siteInfo.site_name : '')
 
     // 设置网站标题
     setWindowTitle(title)
+
     // 加载语言包
     await language.loadLocaleMessages(to.path, useSystemStore().lang);
 
-    const loginPath = to.path == '/' ? '/admin/login' : `${to.matched[0].path}/login`
+    let matched: any = to.matched;
+
+    if (matched && matched.length && matched[0].path != '/:pathMatch(.*)*') {
+        matched = matched[0].path;
+    } else {
+        matched = 'site';
+    }
+
+    const loginPath = to.path == '/' ? '/admin/login' : `${matched}/login`
 
     // 判断是否需登录
     if (NO_LOGIN_ROUTES.includes(to.path)) {
diff --git a/admin/src/stores/modules/diy.ts b/admin/src/stores/modules/diy.ts
index 65bb30875..d43819173 100644
--- a/admin/src/stores/modules/diy.ts
+++ b/admin/src/stores/modules/diy.ts
@@ -4,40 +4,91 @@ import {toRaw, watch} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {cloneDeep, range, isEmpty} from 'lodash-es'
 
-interface Diy {
-    // 全局属性
-    id: number
-    load: boolean,
-    currentIndex: number,
-    currentComponent: string, // 当前正在编辑的组件
-    name: string, // 页面标识
-    type: string, // 页面类型
-    typeName: string,  // 页面类型名称
-    components: any[], // 组件集合
-    global: {
-        title: string,
-        pageBgColor: string, // 页面背景颜色
-        tabbarSwitch: boolean, // 底部导航开关
-    },
-    // 组件集合
-    value: any[]
-}
-
 const useDiyStore = defineStore('diy', {
-    state: (): Diy => {
+    state: () => {
         return {
             id: 0,
             load: false, // 加载状态
-            currentIndex: -99,
-            currentComponent: 'edit-page',
-            name: '',
-            type: '',
-            typeName: '',
-            components: [],
+            currentIndex: -99, // 当前正在编辑的组件下标
+            currentComponent: 'edit-page', // 当前正在编辑的组件名称
+            editTab: 'content',// 编辑页面
+            name: '', // 页面标识
+            type: '', // 页面模板
+            typeName: '',  // 页面模板名称
+            isDefault: 0, // 是否默认页面
+            predefineColors: [
+                '#F4391c',
+                '#ff4500',
+                '#ff8c00',
+                '#FFD009',
+                '#ffd700',
+                '#19C650',
+                '#90ee90',
+                '#00ced1',
+                '#1e90ff',
+                '#c71585',
+                '#FF407E',
+                '#CFAF70',
+                '#A253FF',
+                'rgba(255, 69, 0, 0.68)',
+                'rgb(255, 120, 0)',
+                'hsl(181, 100%, 37%)',
+                'hsla(209, 100%, 56%, 0.73)',
+                '#c7158577'
+            ],
+            components: [], // 组件集合
             global: {
-                title: "页面",
+                title: "页面", // 页面标题
+
                 pageBgColor: "", // 页面背景颜色
-                tabbarSwitch: true
+                bgUrl: '', // 页面背景图片
+                imgWidth: '',  // 页面背景图片宽度
+                imgHeight: '', // 页面背景图片高度
+
+                // 顶部状态栏
+                topStatusBar: {
+                    bgColor: "#ffffff", // 背景颜色
+                    isTransparent: false, // 是否透明
+                    isShow: true, // 是否显示
+                    style: 'style-1', // 风格样式
+                    textColor: "#333333", // 文字颜色
+                    textAlign: 'center', // 文字对齐方式
+                },
+
+                bottomTabBarSwitch: true, // 底部导航开关
+
+                // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
+                popWindow: {
+                    imgUrl: "",
+                    imgWidth: '',
+                    imgHeight: '',
+                    count: -1,
+                    show: 0,
+                    link: {
+                        name: ""
+                    },
+                },
+
+                // 公共模板属性，所有组件都继承，无需重复定义，组件内部根据业务自行调用
+                template: {
+                    textColor: "#303133", // 文字颜色
+                    pageBgColor: '', // 底部背景颜色
+
+                    componentBgColor: '', // 组件背景颜色
+                    topRounded: 0, // 组件上圆角
+                    bottomRounded: 0, // 组件下圆角
+
+                    elementBgColor: '', // 元素背景颜色
+                    topElementRounded: 0, // 元素上圆角
+                    bottomElementRounded: 0, // 元素下圆角
+
+                    margin: {
+                        top: 0, // 上边距
+                        bottom: 0, // 下边距
+                        both: 0, // 左右边距
+                    }
+                }
+
             },
             // 组件集合
             value: []
@@ -45,10 +96,71 @@ const useDiyStore = defineStore('diy', {
     },
     getters: {
         editComponent: (state) => {
-            return state.value[state.currentIndex];
+            if (state.currentIndex == -99) {
+                return state.global;
+            } else {
+                return state.value[state.currentIndex];
+            }
         },
     },
     actions: {
+        // 初始化数据
+        init() {
+            this.global = {
+                title: "页面", // 页面标题
+
+                pageBgColor: "", // 页面背景颜色
+                bgUrl: '', // 页面背景图片
+                imgWidth: '',  // 页面背景图片宽度
+                imgHeight: '', // 页面背景图片高度
+
+                // 顶部状态栏
+                topStatusBar: {
+                    bgColor: "#ffffff", // 背景颜色
+                    isTransparent: false, // 是否透明
+                    isShow: true, // 是否显示
+                    style: 'style-1', // 风格样式
+                    textColor: "#333333", // 文字颜色
+                    textAlign: 'center', // 文字对齐方式
+                },
+
+                bottomTabBarSwitch: true, // 底部导航开关
+
+                // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
+                popWindow: {
+                    imgUrl: "",
+                    imgWidth: '',
+                    imgHeight: '',
+                    count: -1,
+                    show: 0,
+                    link: {
+                        name: ""
+                    },
+                },
+
+                // 公共模板属性，所有组件都继承，无需重复定义，组件内部根据业务自行调用
+                template: {
+                    textColor: "#303133", // 文字颜色
+                    pageBgColor: '', // 底部背景颜色
+
+                    componentBgColor: '', // 组件背景颜色
+                    topRounded: 0, // 组件上圆角
+                    bottomRounded: 0, // 组件下圆角
+
+                    elementBgColor: '', // 元素背景颜色
+                    topElementRounded: 0, // 元素上圆角
+                    bottomElementRounded: 0, // 元素下圆角
+
+                    margin: {
+                        top: 0, // 上边距
+                        bottom: 0, // 下边距
+                        both: 0, // 左右边距
+                    }
+                }
+
+            };
+            this.value = [];
+        },
         // 添加组件
         addComponent(key: string, data: any) {
             // 加载完才能添加组件
@@ -60,14 +172,17 @@ const useDiyStore = defineStore('diy', {
             component.id = this.generateRandom();
             component.componentName = key;
             component.componentTitle = component.title;
-            component.maxCount = component.max_count;
+            component.ignore = []; // 忽略公共属性
 
             Object.assign(component, component.value);
             delete component.title;
             delete component.value;
             delete component.type;
             delete component.icon;
-            delete component.max_count;
+
+            // 继承全局属性
+            let template = cloneDeep(this.global.template);
+            Object.assign(component, template);
 
             if (!this.checkComponentIsAdd(component)) return;
 
@@ -180,7 +295,7 @@ const useDiyStore = defineStore('diy', {
             if (!this.checkComponentIsAdd(component)) {
                 ElMessage({
                     type: 'warning',
-                    message: `${t('notCopy')}，${component.componentTitle}${t('componentCanOnlyAdd')}${component.maxCount}${t('piece')}`,
+                    message: `${t('notCopy')}，${component.componentTitle}${t('componentCanOnlyAdd')}${component.uses}${t('piece')}`,
                 });
                 return;
             }
@@ -194,15 +309,15 @@ const useDiyStore = defineStore('diy', {
         // 检测组件是否允许添加，true：允许 false：不允许
         checkComponentIsAdd(component: any) {
 
-            //maxCount为0时不处理
-            if (component.maxCount === 0) return true;
+            //为0时不处理
+            if (component.uses === 0) return true;
 
             var count = 0;
 
             //遍历已添加的自定义组件，检测是否超出数量
             for (var i in this.value) if (this.value[i].componentName === component.componentName) count++;
 
-            if (count >= component.maxCount) return false;
+            if (count >= component.uses) return false;
             else return true;
         },
         // 重置当前组件数据
diff --git a/admin/src/styles/common.scss b/admin/src/styles/common.scss
index 9aef322f6..9ba031cde 100644
--- a/admin/src/styles/common.scss
+++ b/admin/src/styles/common.scss
@@ -1,21 +1,12 @@
 :root {
     --aside-width: 210px;
-    --el-mask-color: rgba(255,255,255,1)
+    --el-mask-color: rgba(255,255,255,1);
 }
 
 .border-color {
     border-color: var(--el-border-color-lighter);
 }
 
-.table-search-wrap {
-    background: #f5f7fa !important;
-    border-radius: 0!important;
-
-    .el-form {
-        margin-bottom: -18px;
-    }
-}
-
 .el-form {
     .form-tip {
         width: 100%;
@@ -96,4 +87,80 @@ html.dark {
 textarea:-webkit-autofill,
 select:-webkit-autofill {
     box-shadow: 0 0 50px 50px white inset;
+}
+
+// 表格
+.el-pager li.is-active{
+    font-weight: normal !important;
+}
+
+// 筛选框
+.table-search-wrap {
+    .el-card__body{
+        padding: 10px 0;
+    }
+    .el-form {
+        margin-bottom: -18px;
+    }
+}
+
+// 背景颜色
+.base-bg{
+    background-color: transparent !important;
+    // background-color: #F5F7F9 !important; 原来的颜色
+}
+
+// 数据展示面板
+.el-statistic {
+    --el-statistic-content-font-size: 28px !important;
+}
+
+.region-input {
+    --region-input-border-color: var(--el-border-color);
+    display: flex;
+    box-shadow: 0 0 0 1px var(--region-input-border-color) inset;
+    border-radius: var(--el-input-border-radius,var(--el-border-radius-base));
+    height: calc(var(--el-input-inner-height) - 2px);
+    line-height: calc(var(--el-input-inner-height) - 2px);
+    transition: var(--el-transition-box-shadow);
+
+    &:hover {
+        --region-input-border-color: var(--el-color-primary);
+    }
+
+    .separator {
+        flex: 1;
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+        height: 100%;
+        padding: 0 5px;
+        margin: 0;
+        font-size: 14px;
+        word-break: keep-all;
+        color: var(--el-text-color-primary);
+    }
+
+    .el-form-item {
+        flex: 1;
+    }
+
+    input {
+        padding: 0 10px;
+        appearance: none;
+        border: none;
+        outline: 0;
+        display: inline-block;
+        height: 30px;
+        line-height: 30px;
+        margin: 0;
+        text-align: center;
+        font-size: var(--el-font-size-base);
+        color: var(--el-text-color-regular);
+        background-color: transparent;
+
+        &::placeholder {
+            color: var(--el-text-color-placeholder);
+        }
+    }
 }
\ No newline at end of file
diff --git a/admin/src/styles/element-plus.css b/admin/src/styles/element-plus.scss
similarity index 73%
rename from admin/src/styles/element-plus.css
rename to admin/src/styles/element-plus.scss
index 46aaa6e9e..2bc94ecd8 100644
--- a/admin/src/styles/element-plus.css
+++ b/admin/src/styles/element-plus.scss
@@ -5,6 +5,21 @@
     --el-header-height: 64px !important;
 }
 
+.el-table {
+    --el-table-header-bg-color: #F5F7F9!important;
+    --el-table-header-text-color:#333!important;
+}
+
+.dark {
+    .el-table {
+        --el-table-header-text-color: var(--el-text-color-secondary)!important;
+    }
+}
+
+.el-table thead, .el-table thead th {
+    font-weight: normal !important;
+}
+
 .el-button {
     background-color: var(--el-button-bg-color, var(--el-color-white));
 }
@@ -13,10 +28,6 @@
     max-width: calc(100vw - 50px);
 }
 
-.el-table {
-    --el-table-header-bg-color: #f5f7fa!important
-}
-
 .el-date-editor--daterange, .el-date-editor--timerange, .el-date-editor.el-input, .el-date-editor .el-input__wrapper {
     --el-date-editor-width: 100%!important;
     width: 100%;
diff --git a/admin/src/styles/iconfont.css b/admin/src/styles/iconfont.css
index 1c4ba1fe7..dd31f8bec 100644
--- a/admin/src/styles/iconfont.css
+++ b/admin/src/styles/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3883393 */
-  src: url('//at.alicdn.com/t/c/font_3883393_4jlgm3tby7.woff2?t=1683947082967') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3883393_4jlgm3tby7.woff?t=1683947082967') format('woff'),
-       url('//at.alicdn.com/t/c/font_3883393_4jlgm3tby7.ttf?t=1683947082967') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3883393_pok9rb5nvbr.woff2?t=1685440441519') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3883393_pok9rb5nvbr.woff?t=1685440441519') format('woff'),
+       url('//at.alicdn.com/t/c/font_3883393_pok9rb5nvbr.ttf?t=1685440441519') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,62 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconyingyongshichang1:before {
+  content: "\e61c";
+}
+
+.iconyingyongshichang2:before {
+  content: "\e60b";
+}
+
+.iconlingdang-xianxing:before {
+  content: "\e8c0";
+}
+
+.icondianhua:before {
+  content: "\e8c3";
+}
+
+.iconic_manage_assignprop:before {
+  content: "\e60c";
+}
+
+.iconchengshi:before {
+  content: "\ec70";
+}
+
+.icontaocanliebiao:before {
+  content: "\e6b2";
+}
+
+.iconweixin:before {
+  content: "\e647";
+}
+
+.iconhuiyuanguanli:before {
+  content: "\e64c";
+}
+
+.iconhuangjinhuiyuan0101-copy:before {
+  content: "\e621";
+}
+
+.iconhuiyuan1:before {
+  content: "\e644";
+}
+
+.iconqianbao:before {
+  content: "\e6ca";
+}
+
+.iconic_description_file24px:before {
+  content: "\e61a";
+}
+
+.iconzhuangxiu1:before {
+  content: "\e66b";
+}
+
 .icontuikuanjilu:before {
   content: "\e8cf";
 }
diff --git a/admin/src/styles/index.scss b/admin/src/styles/index.scss
index ced30655b..7fcc5ef42 100644
--- a/admin/src/styles/index.scss
+++ b/admin/src/styles/index.scss
@@ -2,6 +2,6 @@
 @import 'element-plus/theme-chalk/dark/css-vars.css';
 @import 'element-plus/theme-chalk/display.css';
 @import 'tailwind.css';
-@import 'element-plus.css';
+@import 'element-plus.scss';
 @import 'iconfont.css';
 @import 'common.scss';
\ No newline at end of file
diff --git a/admin/src/types/global.d.ts b/admin/src/types/global.d.ts
index a728e287f..255c9404f 100644
--- a/admin/src/types/global.d.ts
+++ b/admin/src/types/global.d.ts
@@ -13,6 +13,6 @@ declare module '@wangeditor/editor' {
     }
 }
 
-interface AnyObject {
+declare interface AnyObject {
     [key: string]: any;
 }
\ No newline at end of file
diff --git a/admin/src/utils/request.ts b/admin/src/utils/request.ts
index ca266994f..4a33681ab 100644
--- a/admin/src/utils/request.ts
+++ b/admin/src/utils/request.ts
@@ -1,18 +1,16 @@
 import axios, { HttpStatusCode } from 'axios'
 import type { AxiosInstance, InternalAxiosRequestConfig, AxiosResponse, AxiosRequestConfig } from 'axios'
-import { getToken } from './common';
+import { getToken, isUrl } from './common';
 import { ElMessage } from 'element-plus'
 import { t } from '@/lang'
 import useUserStore from '@/stores/modules/user'
 import storage from '@/utils/storage'
 
 interface RequestConfig extends AxiosRequestConfig {
-    showErrorMessage?: boolean
     showSuccessMessage?: boolean
 }
 
 interface InternalRequestConfig extends InternalAxiosRequestConfig {
-    showErrorMessage?: boolean
     showSuccessMessage?: boolean
 }
 
@@ -26,7 +24,7 @@ class Request {
     constructor() {
         this.instance = axios.create({
             baseURL: import.meta.env.VITE_APP_BASE_URL,
-            timeout: 5000,
+            timeout: 30000,
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;',
                 'lang': storage.get('lang') ?? 'zh-cn'
@@ -54,7 +52,7 @@ class Request {
                 const res = response.data
                 if (res.code != 1) {
                     this.handleAuthError(res.code)
-                    if (response.config.showErrorMessage) ElMessage({ message: res.msg, type: 'error' })
+                    if (res.code != 401) ElMessage({ message: res.msg, type: 'error' })
                     return Promise.reject(new Error(res.msg || 'Error'))
                 } else {
                     if (response.config.showSuccessMessage) ElMessage({ message: res.msg, type: 'success' })
@@ -113,7 +111,8 @@ class Request {
      * @param err 
      */
     private handleNetworkError(err: any) {
-        let errMessage = t('axios.unknownError')
+        let errMessage = t('axios.requestError')
+
         if (err.response && err.response.status) {
             const errStatus = err.response.status
             switch (errStatus) {
@@ -127,7 +126,8 @@ class Request {
                     errMessage = t('axios.403')
                     break
                 case 404:
-                    errMessage = t('axios.404')
+                    const baseURL = isUrl(err.response.config.baseURL) ? err.response.config.baseURL : location.origin
+                    errMessage = baseURL + t('axios.404')
                     break
                 case 405:
                     errMessage = t('axios.405')
@@ -135,6 +135,9 @@ class Request {
                 case 408:
                     errMessage = t('axios.408')
                     break
+                case 409:
+                    errMessage = t('axios.409')
+                    break
                 case 500:
                     errMessage = t('axios.500')
                     break
diff --git a/admin/src/views/app/index.vue b/admin/src/views/app/index.vue
index dddca3a2a..db515c90a 100644
--- a/admin/src/views/app/index.vue
+++ b/admin/src/views/app/index.vue
@@ -1,28 +1,24 @@
 <template>
-    <div class="main-container bg-[#fff] min-w-[1000px] min-h-[650px]">
-		<div class="pt-[1px]" v-for="(listItems, listIndex) in appManageList" :key="listIndex">
-			<p class="ml-4 mt-[20px] border-l-[2px] border-[#273de3] pl-4 leading-[1]">{{ listItems.name }}</p>
-			<div class="flex flex-wrap" v-if="isTrue == 0">
-				<div @click="toLink(appItems.url)" class="flex cursor-pointer ml-4 mt-[20px] w-[240px] p-[10px] border-[1px] border-[#eee] border-[solid]" v-for="(appItems, appIndex) in listItems.app_list" :key="appIndex">
-					<div class="flex justify-center items-center mr-[10px] min-w-[50px]">
-						<img v-if="appItems.icon" class="w-[50px] h-[50px]" :src="img(appItems.icon)"/>
+    <div class="main-container bg-[#fff] min-w-[1000px] min-h-[650px]" v-loading="loading">
+		<div class="pt-[1px]" v-for="(listItems, listIndex) in appManageList" :key="listIndex" v-if="appManageList.length > 0" >
+			<p class="ml-4 mt-[20px] border-l-[2px] border-[#273de3] pl-3 leading-[1] font-bold">{{ listItems.name }}</p>
+			<div class="flex flex-wrap">
+				<div @click="toLink(appItems.url)" class="app-item cursor-pointer ml-4 mt-[20px] pb-2 bg-[#f7f7f7]" v-for="(appItems, appIndex) in listItems.app_list" :key="appIndex">
+					<div class="flex justify-center items-center">
+						<img v-if="appItems.cover" class="w-[240px] h-[120px]" :src="img(appItems.cover)"/>
+						<img v-else class="w-[240px] h-[120px]" src="@/assets/images/app_default.png"/>
 					</div>
-					<div class="w-[150px]">
-						<p class="app-text text-[14px] text-[#666]">{{ appItems.title }}</p>
-						<p class="app-text text-[12px] text-[#999]">{{ appItems.desc }}</p>
+					<div class="text-left mt-2 w-[240px]">
+						<p class="app-text text-[14px] text-[#222] pl-2">{{ appItems.title }}</p>
+						<p class="app-text text-[12px] text-[#999] pl-2">{{ appItems.desc }}</p>
 					</div>
 				</div>
 			</div>
-			<div class="flex flex-wrap" v-if="isTrue == 1">
-				<div @click="toLink(appItems.url)" class="cursor-pointer ml-4 mt-[20px] w-[140px] p-[10px] border-[1px] border-[#eee] border-[solid]" v-for="(appItems, appIndex) in listItems.app_list" :key="appIndex">
-					<div class="flex justify-center items-center">
-						<img v-if="appItems.cover" class="w-[110px] h-[110px]" :src="img(appItems.cover)"/>
-					</div>
-					<div class="text-center mt-2">
-						<p class="app-text text-[14px] text-[#666]">{{ appItems.title }}</p>
-						<p class="app-text text-[12px] text-[#999]">{{ appItems.desc }}</p>
-					</div>
-				</div>
+		</div>
+		<div v-else-if="!loading" class="flex justify-center items-center min-w-[1000px] min-h-[650px]">
+			<div>
+				<img src="@/assets/images/empty.png"/>
+				<p class="text-center text-gray-400">{{ t('emptyApp') }}</p>
 			</div>
 		</div>
     </div>
@@ -36,11 +32,15 @@ import { img } from '@/utils/common'
 import { useRouter } from 'vue-router'
 	
 const appManageList = ref([])
-const isTrue = ref(1)
+const loading = ref(true)
 const checkAppMange = () => {
-	getAppMange().then(res=>{
+	getAppMange().then(res => {
+		loading.value = false
 		appManageList.value = res.data;
+	}).catch(() => {
+		loading.value = false
 	})
+
 }
 checkAppMange()
 
@@ -60,4 +60,7 @@ const toLink = (link) => {
 		text-overflow: ellipsis;
 		-o-text-overflow:ellipsis;
 	}
+	.app-item {
+		// box-shadow: 0px 6px 18px 0px rgba(82,129,187,0.1);
+	}
 </style>
diff --git a/admin/src/views/app/store.vue b/admin/src/views/app/store.vue
new file mode 100644
index 000000000..eb7443255
--- /dev/null
+++ b/admin/src/views/app/store.vue
@@ -0,0 +1,548 @@
+<template>
+    <div class="main-container h-[500px] w-full p-5 bg-white" v-loading="loading">
+
+        <div class="flex mb-4">
+            <div class="border rounded-sm switch-btn active px-4 py-1 cursor-pointer flex items-center	">
+                <img src="@/assets/images/app_store/local_icon_select.png" class="mr-1.5 w-3.5 h-3.5 mb-0.5">
+                {{ t('localAppText') }}
+            </div>
+            <div class="border rounded-sm switch-btn px-4 py-1 ml-3 cursor-pointer flex items-center" @click="market()">
+                <img src="@/assets/images/app_store/market_icon.png" class="mr-1.5 w-3.5 h-3.5 mb-0.5">
+                {{ t('marketAppText') }}
+            </div>
+        </div>
+        <div class="relative">
+            <div class="absolute right-0 top-[2px] flex items-center cursor-pointer z-20 border	border-inherit">
+                <div class="flex item-center justify-center px-[6px] py-[4px]"
+                    :class="{ 'bg-slate-200': showType == 'small' }" @click="showType = 'small'">
+                    <img src="@/assets/images/app_store/switch_icon_1.png" class=" w-[16px] h-[16px]">
+                </div>
+                <div class="flex item-center justify-center px-[6px] py-[4px]"
+                    :class="{ 'bg-slate-200': showType == 'large' }" @click="showType = 'large'">
+                    <img src="@/assets/images/app_store/switch_icon_2.png" class="w-[16px] h-[16px] ">
+                </div>
+            </div>
+            <el-tabs v-model="activeName" class="demo-tabs " @tab-click="handleClick">
+
+                <el-tab-pane :label="installLabel" name="installed">
+                    <div class="flex flex-wrap px-2 plug-list pb-10">
+                        <div v-for="(item, index) in localList.installed" :key="index + 'a'"
+                            class="flex items-center cursor-pointer  w-[295px] relative plug-item mr-4 mb-4"
+                            @click="getAddonDetialFn(item)" v-if="showType == 'small'">
+                            <div class="p-3">
+                                <img class="w-[44px] h-[44px] rounded-sm" v-if="item.icon" :src="img(item.icon)" alt="">
+                                <img class="w-[44px] h-[44px] rounded-sm" v-else src="@/assets/images/icon-addon.png"
+                                    alt="">
+                            </div>
+                            <div class="flex items-center w-[220px] border-b py-3 justify-between">
+                                <div class="flex flex-col">
+                                    <span class="text-[14px] truncate w-[160px]">{{ item.title }}</span>
+                                    <span class="text-xs text-gray-400 truncate w-[160px] mt-[4px]">{{ item.desc }}</span>
+                                </div>
+                                <span
+                                    class="w-max flex items-center plug-item-operate border rounded-2xl px-3.5 py-1.5 leading-none "
+                                    @click.stop="uninstallAddonFn(item.key)">{{ t('unload') }}</span>
+                            </div>
+                        </div>
+
+                        <div class="flex flex-wrap plug-list pb-10 plug-large" v-if="showType == 'large'">
+                            <div class="app-item cursor-pointer mr-4 mt-[20px] pb-2 bg-[#f7f7f7]"
+                                v-for="(item, index) in localList.installed" :key="index + 'a'"
+                                @click="getAddonDetialFn(item)">
+                                <div class="flex justify-center items-center">
+                                    <img class="w-[240px] h-[120px]" v-if="item.cover" :src="img(item.cover)" />
+                                    <img v-else class="w-[240px] h-[120px]"
+                                        src="@/assets/images/app_store/app_store_default.png" />
+
+                                </div>
+                                <div class="flex w-[240px] h-[46px]">
+                                    <div class="text-left mt-2 w-[190px]">
+                                        <p class="app-text text-[14px] text-[#222] pl-2">{{ item.title }}</p>
+                                        <p class="app-text text-[12px] text-[#999] pl-2">{{ item.desc }}</p>
+                                    </div>
+                                    <div class="flex items-center pr-2">
+                                        <span
+                                            class="w-max flex items-center plug-item-operate border rounded-2xl px-2 py-1 leading-none mt-[10px]"
+                                            @click.stop="uninstallAddonFn(item.key)">{{ t('unload') }}</span>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <el-empty :description="t('noPlug')" v-if="!localList.installed.length && !loading"
+                            class="mx-auto" />
+                    </div>
+                </el-tab-pane>
+                <el-tab-pane :label="uninstalledLabel" name="uninstalled">
+                    <div class="flex flex-wrap px-2 plug-list pb-10">
+
+                        <div v-for="(item, index) in localList.uninstalled" :key="index + 'a'"
+                            class="flex items-center cursor-pointer  w-[295px] relative plug-item mr-4 mb-4"
+                            @click="getAddonDetialFn(item)" v-if="showType == 'small'">
+                            <div class="p-3">
+                                <!-- <img class="w-[44px] h-[44px] rounded-sm" v-if="item.icon" :src="img(item.icon)" alt=""> -->
+                                <img class="w-[44px] h-[44px] rounded-sm" src="@/assets/images/icon-addon.png" alt="">
+                            </div>
+                            <div class="flex items-center w-[220px] border-b py-3 justify-between">
+                                <div class="flex flex-col">
+                                    <span class="text-[14px] truncate w-[160px]">{{ item.title }}</span>
+                                    <span class="text-xs text-gray-400 truncate w-[160px] mt-[4px]">{{ item.desc }}</span>
+                                </div>
+                                <span
+                                    class="w-max flex items-center plug-item-operate border rounded-2xl px-3.5 py-1.5 leading-none "
+                                    @click.stop="installAddonFn(item.key)">{{ t('install') }}</span>
+                            </div>
+                        </div>
+
+                        <div class="flex flex-wrap plug-list pb-10 plug-large" v-if="showType == 'large'">
+                            <div class="app-item cursor-pointer mr-4 mt-[20px] pb-2 bg-[#f7f7f7]"
+                                v-for="(item, index) in localList.uninstalled" :key="index + 'a'"
+                                @click="getAddonDetialFn(item)">
+                                <div class="flex justify-center items-center">
+                                    <!-- <img class="w-[240px] h-[120px]" v-if="item.cover" :src="img(item.cover)"/> -->
+
+                                    <img class="w-[240px] h-[120px]"
+                                        src="@/assets/images/app_store/app_store_default.png" />
+
+                                </div>
+                                <div class="flex w-[240px] h-[46px]">
+                                    <div class="text-left mt-2 w-[190px]">
+                                        <p class="app-text text-[14px] text-[#222] pl-2">{{ item.title }}</p>
+                                        <p class="app-text text-[12px] text-[#999] pl-2">{{ item.desc }}</p>
+                                    </div>
+                                    <div class="flex items-center pr-2">
+                                        <span
+                                            class="w-max flex items-center plug-item-operate border rounded-2xl	px-2 py-1 leading-none mt-[10px]"
+                                            @click.stop="installAddonFn(item.key)">{{ t('install') }}</span>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <el-empty :description="t('noPlug')" v-if="!localList.uninstalled.length && !loading"
+                            class="mx-auto" />
+                    </div>
+                </el-tab-pane>
+            </el-tabs>
+        </div>
+
+        <!-- 详情 -->
+        <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="60vw" :close-on-click-modal="false"
+            :close-on-press-escape="false" :before-close="installShowDialogClose">
+            <el-steps :space="200" :active="installStep" finish-status="success" align-center>
+                <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="bg-[#fff] my-3" v-if="installCheckResult.dir">
+                            <el-alert :title="t('jobError')" type="error" :closable="false" class="mt-[20px]"
+                                v-if="!installCheckResult.job_normal" />
+                            <p class="pt-[20px] pl-[20px] ">{{ t('dirPermission') }}</p>
+                            <div class="px-[20px] text-[14px]">
+                                <el-row class="py-[10px] items">
+                                    <el-col :span="12">
+                                        <span>{{ t('path') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('demand') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('status') }}</span>
+                                    </el-col>
+                                </el-row>
+                                <el-row class="pb-[10px] items" v-for="item in installCheckResult.dir.is_readable">
+                                    <el-col :span="12">
+                                        <span>{{ item.dir }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('readable') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <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" v-for="item in installCheckResult.dir.is_write">
+                                    <el-col :span="12">
+                                        <span>{{ item.dir }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('write') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                        <span v-else><el-icon color="red">
+                                                <CloseBold />
+                                            </el-icon></span>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                        </div>
+                        <div class="bg-[#fff] my-3" v-if="installCheckResult.dir">
+                            <p class="pl-[20px] ">{{ t('packageManageTool') }}</p>
+                            <div class="px-[20px] text-[14px]">
+                                <el-row class="py-[10px] items">
+                                    <el-col :span="12">
+                                        <span>{{ t('name') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('demand') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('status') }}</span>
+                                    </el-col>
+                                </el-row>
+                                <el-row class="pb-[10px] items" v-for="item in installCheckResult.runtime">
+                                    <el-col :span="12">
+                                        <span>{{ item.name }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('installLabel') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span v-if="item.status"><el-icon color="green"><Select /></el-icon></span>
+                                        <span v-else><el-icon color="red">
+                                                <CloseBold />
+                                            </el-icon></span>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                        </div>
+                        <div class="bg-[#fff] my-3"
+                            v-if="installCheckResult.conflict_files && installCheckResult.conflict_files.length">
+                            <p class="pl-[20px] ">{{ t('conflictFiles') }}</p>
+                            <div class="px-[20px] text-[14px] pt-[10px]">
+                                <el-row class="pb-[10px] items" v-for="item in installCheckResult.conflict_files">
+                                    <el-col :span="24">
+                                        <span>{{ item }}</span>
+                                    </el-col>
+                                </el-row>
+                            </div>
+                        </div>
+                        <div class="bg-[#fff] my-3">
+                            <p class="pl-[20px] ">{{ t('process') }}</p>
+                            <div class="px-[20px] text-[14px]">
+                                <el-row class="py-[10px] items">
+                                    <el-col :span="12">
+                                        <span>{{ t('name') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('demand') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('status') }}</span>
+                                    </el-col>
+                                </el-row>
+                                <el-row class="pb-[10px] items">
+                                    <el-col :span="12">
+                                        <span>php think queue:listen</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span>{{ t('open') }}</span>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <span v-if="installCheckResult.job_normal"><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-button type="primary" :disabled="!installCheckResult.is_pass" @click="handleInstall">{{ t('install')
+                    }}</el-button>
+                </div>
+            </div>
+            <div v-show="installStep == 1" class="h-[50vh] mt-[20px]">
+                <terminal name="my-terminal" :context="currAddon" :init-log="null" :show-header="false"
+                    :show-log-time="true" />
+            </div>
+            <div v-show="installStep > 1" class="h-[50vh] mt-[20px] flex items-center justify-center">
+                <el-result icon="success" :title="t('addonInstallSuccess')"></el-result>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, computed } from 'vue'
+import { t } from '@/lang'
+import { getAddonLocal, uninstallAddon, installAddon, preInstallCheck, getAddonInstallTaskState, executeInstall } from '@/api/addon'
+import { TabsPaneContext, ElMessageBox } from 'element-plus'
+import { img } from '@/utils/common'
+import { Terminal, api as terminalApi } from 'vue-web-terminal'
+
+const activeName = ref('installed')
+
+const loading = ref<Boolean>(false)
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+}
+
+const showType = ref('large')
+
+const installLabel = computed(() => {
+    let text = t('installLabel')
+    localList.value.installed.length && (text += ` (${localList.value.installed.length})`)
+    return text
+})
+
+const uninstalledLabel = computed(() => {
+    let text = t('uninstalledLabel')
+    localList.value.uninstalled.length && (text += ` (${localList.value.uninstalled.length})`)
+    return text
+})
+
+/**
+ * 本地下载的插件列表
+ */
+const localList = ref({
+    installed: [],
+    uninstalled: []
+})
+const localListFn = () => {
+    loading.value = true
+    getAddonLocal({}).then(res => {
+        const data = res.data
+
+        localList.value.installed = []
+        localList.value.uninstalled = []
+
+        data.forEach(element => {
+            if (element.install_info && Object.keys(element.install_info)?.length) {
+                localList.value.installed.push(element)
+            } else {
+                localList.value.uninstalled.push(element)
+            }
+        })
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
+    })
+}
+localListFn()
+
+const currAddon = ref('')
+// 安装面板弹窗
+const installShowDialog = ref(false)
+// 安装任务
+let installTask: AnyObject = {}
+// 当前查询的任务
+let currTask: string = ''
+// 已执行任务
+let executedTask: string[] = []
+// 安装步骤
+const installStep = ref(0)
+// 安装检测结果
+const installCheckResult = ref({})
+// 定时器对象
+let timer: null | any = null
+/**
+ * 安装
+ * @param key
+ */
+const installAddonFn = (key: string) => {
+    currAddon.value = key
+    installAddon({ addon: key }).then(res => {
+        installStep.value = 0
+        executedTask = []
+        installTask = makeIterator(Object.keys(res.data))
+        currTask = installTask.next().value
+        installShowDialog.value = true
+
+        preInstallCheck(key).then(res => {
+            installCheckResult.value = res.data
+        }).catch(() => { })
+    }).catch(() => {
+    })
+}
+
+/**
+ * 创建遍历器
+ * @param arr array
+ */
+const makeIterator = (arr: string[]) => {
+    let nextIndex = 0
+    return {
+        next: function () {
+            return nextIndex < arr.length
+                ? { value: arr[nextIndex++] }
+                : { done: true }
+        }
+    }
+}
+
+const handleInstall = () => {
+    if (!installCheckResult.value.is_pass) return
+    installStep.value += 1
+
+    terminalApi.execute('my-terminal', 'clear')
+
+    executeInstall(currAddon.value)
+        .then(() => {
+            timer = setInterval(() => {
+                getAddonInstallTaskState(currAddon.value, currTask).then(({ data }) => {
+                    if (!executedTask.includes(currTask)) {
+                        terminalApi.execute('my-terminal', data.command)
+                        executedTask.push(currTask)
+                    }
+                    switch (data.state) {
+                        case 'success':
+                            terminalApi.pushMessage('my-terminal', { content: `${data.desc}执行成功`, class: 'success' })
+                            if (data.step == 'installComplete') {
+                                clearInterval(timer)
+                                installStep.value += 2
+                                localListFn()
+                            } else {
+                                currTask = installTask.next().value
+                            }
+                            break
+                        case 'fail':
+                            terminalApi.pushMessage('my-terminal', { content: `${data.desc}执行失败`, class: 'error' })
+                            terminalApi.pushMessage('my-terminal', { content: `失败原因：${data.error}` })
+                            clearInterval(timer)
+                            break
+                    }
+                })
+            }, 2000)
+        })
+        .catch()
+}
+
+// 监听安装弹窗关闭
+watch(installShowDialog, (nval) => {
+    if (!installShowDialog.value) clearInterval(timer)
+})
+
+watch(currAddon, (nval) => {
+    installCheckResult.value = {}
+})
+
+/**
+ * 卸载
+ * @param key
+ */
+const uninstallAddonFn = (key: string) => {
+    uninstallAddon({ addon: key }).then(res => {
+        localListFn()
+        loading.value = false
+    }).catch(() => {
+        loading.value = false
+    })
+}
+
+const market = () => {
+    ElMessage({
+        message: t('marketDevelopMessage'),
+        grouping: true,
+        type: 'success'
+    })
+}
+
+/**
+ * 安装弹窗关闭提示
+ * @param done
+ */
+const installShowDialogClose = (done: () => {}) => {
+    if (installStep.value == 1) {
+        ElMessageBox.confirm(
+            t('installShowDialogCloseTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
+        ).then(() => {
+            done()
+        }).catch(() => { })
+    } else done()
+}
+
+// 插件详情
+const appStoreShowDialog = ref(false)
+const appStoreInfo = ref<AnyObject>({})
+const getAddonDetialFn = (data: AnyObject) => {
+    appStoreShowDialog.value = true
+    appStoreInfo.value = data
+}
+</script>
+
+<style lang="scss" scoped>
+.demo-tabs>.el-tabs__content {
+    padding: 32px;
+    color: #6b778c;
+    font-size: 32px;
+    font-weight: 600;
+}
+
+.plug-item {
+    .plug-item-operate {
+        color: var(--el-color-primary);
+        border-color: var(--el-color-primary);
+        font-size: var(--el-font-size-extra-small);
+    }
+}
+
+:deep(.t-container) {
+    box-shadow: none !important;
+
+    .t-window {
+        padding: 10px 20px !important;
+    }
+}
+
+.switch-btn.active {
+    border-color: var(--el-color-primary);
+    color: #fff;
+    background-color: var(--el-color-primary);
+}
+
+.plug-large {
+    .plug-item-operate {
+        color: var(--el-color-primary);
+        border-color: var(--el-color-primary);
+        font-size: var(--el-font-size-extra-small);
+    }
+}
+
+.app-text {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}
+</style>
diff --git a/admin/src/views/article/category.vue b/admin/src/views/article/category.vue
index 9ebc6654f..5de3d6162 100644
--- a/admin/src/views/article/category.vue
+++ b/admin/src/views/article/category.vue
@@ -1,20 +1,33 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex justify-between">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{ pageName }}</span>
                 <el-button type="primary" @click="addEvent">
                     {{ t('addArticleCategory') }}
                 </el-button>
-                <el-input v-model="seach" :placeholder="t('namePlaceholder')" class="w-[190px]" prefix-icon="Search"
-                    @input="loadCategoryList()" clearable />
             </div>
 
-            <div class="mt-[16px]">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="categoryTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('name')" prop="name">
+                        <el-input v-model="categoryTableData.searchParam.name" :placeholder="t('namePlaceholder')"
+                            class="w-[190px]" prefix-icon="Search" clearable />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadCategoryList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
                 <el-table :data="categoryTableData.data" size="large" v-loading="categoryTableData.loading">
                     <template #empty>
                         <span>{{ !categoryTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
                     <el-table-column prop="name" :label="t('name')" min-width="150" />
+                    <el-table-column prop="article_num" :label="t('articleNumber')" min-width="140" />
                     <el-table-column prop="is_show" :label="t('isShow')" min-width="150">
                         <template #default="{ row }">
                             {{ row.is_show == 1 ? t('show') : t('hide') }}
@@ -48,19 +61,31 @@
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getArticleCategoryList, deleteArticleCategory } from '@/api/article'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, FormInstance } from 'element-plus'
 import EditCategory from '@/views/article/components/edit-category.vue'
 import { debounce } from '@/utils/common'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title
 
 const categoryTableData = reactive({
     page: 1,
     limit: 10,
     total: 0,
     loading: true,
-    data: []
+    data: [],
+    searchParam: {
+        name: ''
+    }
 })
 
-const seach = ref<string>('')
+const searchFormRef = ref<FormInstance>()
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadCategoryList();
+}
 
 /**
  * 获取文章分类列表
@@ -72,7 +97,7 @@ const loadCategoryList = debounce((page: number = 1) => {
     getArticleCategoryList({
         page: categoryTableData.page,
         limit: categoryTableData.limit,
-        name: seach.value
+        ...categoryTableData.searchParam
     }).then(res => {
         categoryTableData.loading = false
         categoryTableData.data = res.data.data
diff --git a/admin/src/views/article/components/edit-category.vue b/admin/src/views/article/components/edit-category.vue
index e8e48f27d..275baddd4 100644
--- a/admin/src/views/article/components/edit-category.vue
+++ b/admin/src/views/article/components/edit-category.vue
@@ -108,7 +108,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/article/edit.vue b/admin/src/views/article/edit.vue
index 3057e26ea..4aeab1315 100644
--- a/admin/src/views/article/edit.vue
+++ b/admin/src/views/article/edit.vue
@@ -128,7 +128,7 @@ if (id) setFormData(id)
 
 const setCategoryList = async () => {
     categoryList.value = await (await getArticleCategoryAll({})).data
-    if (!id && categoryList.value.length > 0) formData.category_id = categoryList.value[0].category_id
+    // if (!id && categoryList.value.length > 0) formData.category_id = categoryList.value[0].category_id
 }
 setCategoryList()
 
diff --git a/admin/src/views/article/list.vue b/admin/src/views/article/list.vue
index c637130d1..94f3c0e8c 100644
--- a/admin/src/views/article/list.vue
+++ b/admin/src/views/article/list.vue
@@ -2,13 +2,14 @@
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
 
-            <div class="flex justify-between">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{ pageName }}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addArticle') }}
                 </el-button>
             </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="articleTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('title')" prop="title">
                         <el-input v-model="articleTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
@@ -22,18 +23,26 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadArticleList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="articleTableData.data" size="large" v-loading="articleTableData.loading">
                     <template #empty>
                         <span>{{ !articleTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
 
-                    <el-table-column prop="title" :show-overflow-tooltip="true" :label="t('title')" width="140" />
+                    <el-table-column prop="id" :show-overflow-tooltip="true" :label="t('ID')" width="100" />
+
+                    <el-table-column prop="category_name" :label="t('categoryName')" width="120" />
+
+                    <el-table-column prop="title" :show-overflow-tooltip="true" :label="t('title')" width="180">
+                        <template #default="{ row }">
+                            <a :href="row.article_url.web_url" target="_blank">{{ row.title }}</a>
+                        </template>
+                    </el-table-column>
 
                     <el-table-column :label="t('image')" min-width="120" align="center">
                         <template #default="{ row }">
@@ -42,9 +51,11 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column prop="category_name" :label="t('categoryName')" align="center" min-width="140" />
-
-                    <el-table-column prop="summary" :label="t('summary')" width="180" :show-overflow-tooltip="true" />
+                    <el-table-column prop="visit" :label="t('visit')" width="120" align="center">
+                        <template #default="{ row }">
+                            <span>{{ parseInt(row.visit + row.visit_virtual) }}</span>
+                        </template>
+                    </el-table-column>
 
                     <el-table-column :label="t('isShow')" min-width="120" align="center">
                         <template #default="{ row }">
@@ -55,6 +66,8 @@
                         </template>
                     </el-table-column>
 
+                    <el-table-column prop="sort" :label="t('sort')" width="100" align="center" />
+
                     <el-table-column :label="t('createTime')" min-width="180" align="center">
                         <template #default="{ row }">
                             {{ row.create_time || '' }}
@@ -81,12 +94,14 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
+import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getArticleList, deleteArticle, getArticleCategoryAll } from '@/api/article'
-import { img, getAppType } from '@/utils/common'
-import { ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { img } from '@/utils/common'
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { useRouter, useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title
 
 const articleTableData = reactive({
     page: 1,
@@ -163,6 +178,12 @@ const deleteEvent = (id: number) => {
         })
     })
 }
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadArticleList()
+}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/admin/src/views/auth/components/edit-menu.vue b/admin/src/views/auth/components/edit-menu.vue
index 6b798f129..3561d7af6 100644
--- a/admin/src/views/auth/components/edit-menu.vue
+++ b/admin/src/views/auth/components/edit-menu.vue
@@ -203,7 +203,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/auth/components/edit-role.vue b/admin/src/views/auth/components/edit-role.vue
index f26b2810e..b661deb1d 100644
--- a/admin/src/views/auth/components/edit-role.vue
+++ b/admin/src/views/auth/components/edit-role.vue
@@ -15,11 +15,15 @@
             </el-form-item>
 
             <el-form-item :label="t('permission')" prop="rules">
-                <div>
-                    <el-checkbox v-model="selectAll" :label="t('selectAll')" />
-                    <el-checkbox v-model="checkStrictly" :label="t('checkStrictly')" />
+                <div class="flex items-center justify-between w-11/12">
+                    <div>
+                        <el-checkbox v-model="selectAll" :label="t('selectAll')" />
+                        <el-checkbox v-model="checkStrictly" :label="t('checkStrictly')" />
+                    </div>
+                    <el-button link type="primary" @click="menuAction()">{{ t('foldText') }}</el-button>
+                    
                 </div>
-                <el-scrollbar max-height="40vh" class="w-full">
+                <el-scrollbar height="35vh" class="w-full">
                     <el-tree :data="menus" :props="{ label: 'menu_name' }" :default-checked-keys="formData.rules"
                         :check-strictly="checkStrictly" show-checkbox default-expand-all @check-change="handleCheckChange"
                         node-key="menu_key" ref="treeRef" />
@@ -47,6 +51,8 @@ import { debounce } from '@/utils/common'
 
 const showDialog = ref(false)
 const loading = ref(false)
+const isOpen = ref(true)
+
 let popTitle: string = '';
 
 // 获取权限数据
@@ -55,6 +61,7 @@ getSiteMenus().then((res) => {
     menus.value = res.data
 })
 
+
 // 全选
 const selectAll = ref(false)
 const checkStrictly = ref(false)
@@ -71,6 +78,31 @@ const handleCheckChange = debounce((e) => {
     formData.rules = treeRef.value.getCheckedKeys()
 })
 
+const menuAction = () => {
+    if(isOpen.value){
+        collapseAll(menus.value);
+        isOpen.value = false;
+    }else{
+        unFoldAll(menus.value);
+        isOpen.value = true;
+    }
+}
+
+// 全部展开
+const unFoldAll = (data:any) => {
+    
+    Object.keys(data).forEach((key:string|any) => {
+        treeRef.value.store.nodesMap[data[key]['menu_key']].expanded = true;
+        if(data[key].children && data[key].children.length > 0) collapseAll(data[key].children);
+    })
+}
+// 全部折叠
+const collapseAll = (data:any) => {
+    Object.keys(data).forEach((key:string|any) => {
+        treeRef.value.store.nodesMap[data[key]['menu_key']].expanded = false;
+        if(data[key].children && data[key].children.length > 0) collapseAll(data[key].children);
+    })
+} 
 /**
  * 表单数据
  */
@@ -116,15 +148,17 @@ const confirm = async (formEl: FormInstance | undefined) => {
         if (valid) {
             loading.value = true
 
-            const data = formData
+            const data = Object.assign({}, formData) 
+            data.rules = data.rules.concat(treeRef.value.getHalfCheckedKeys());
 
             save(data).then(res => {
                 loading.value = false
                 showDialog.value = false
+                
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
@@ -139,12 +173,45 @@ const setFormData = async (row: any = null) => {
         popTitle = t('updateRole')
         const data = await (await getRoleInfo(row.role_id)).data
         Object.keys(formData).forEach((key: string) => {
-            if (data[key] != undefined) formData[key] = data[key]
+
+            if (data[key] != undefined) {
+                if(key == 'rules'){
+                    var arr = data.rules;
+                    var newArr:any = [];
+                    
+                    Object.keys(data.rules).forEach( (i) => {
+                        checked(data.rules[i],menus.value,newArr)
+                    } )
+                    formData[key] = newArr;
+
+                }else{
+                    formData[key] = data[key]
+                }
+            }
+
         })
+        
     }
     loading.value = false
 }
 
+
+function checked(menu_key:string,data:any,newArr:any) {
+    Object.keys(data).forEach( (key:string) =>{
+        let item = data[key]
+        if(item.menu_key == menu_key){
+            if(!item.children || item.children.length == 0){
+                newArr.push(item.menu_key)
+            }
+        }else{
+            if(item.children && item.children.length > 0){
+                checked(menu_key,item.children,newArr)
+            }
+        }
+    } )
+}
+
+
 defineExpose({
     showDialog,
     setFormData
diff --git a/admin/src/views/auth/components/edit-user.vue b/admin/src/views/auth/components/edit-user.vue
index e96f413af..0cf39f496 100644
--- a/admin/src/views/auth/components/edit-user.vue
+++ b/admin/src/views/auth/components/edit-user.vue
@@ -140,7 +140,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/auth/log.vue b/admin/src/views/auth/log.vue
index 425438fb3..76061c5be 100644
--- a/admin/src/views/auth/log.vue
+++ b/admin/src/views/auth/log.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="sysUserLogTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('ip')" prop="ip">
                         <el-input v-model="sysUserLogTableData.searchParam.ip" :placeholder="t('ipPlaceholder')" />
@@ -17,20 +19,20 @@
 
                     <el-form-item>
                         <el-button type="primary" @click="loadSysUserLogList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div>
                 <el-table :data="sysUserLogTableData.data" size="large" v-loading="sysUserLogTableData.loading">
                     <template #empty>
                         <span>{{ !sysUserLogTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
                     <el-table-column prop="username" :label="t('username')" min-width="120" />
-                    <el-table-column prop="ip" :label="t('ip')" min-width="120" />
-                    <el-table-column prop="url" :label="t('url')" min-width="120" />
-                    <el-table-column prop="type" :label="t('type')" min-width="120" align="center"/>
+                    <el-table-column prop="ip" :label="t('ip')" min-width="100" align="left"/>
+                    <el-table-column prop="url" :label="t('url')" min-width="180" />
+                    <el-table-column prop="type" :label="t('type')" min-width="100" align="center"/>
                      <el-table-column :label="t('createTime')" min-width="180" align="center">
                         <template #default="{ row }">
                             {{ row.create_time || '' }}
@@ -59,6 +61,10 @@ import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getLogList } from '@/api/site'
 import UserLogDetail from '@/views/auth/components/user-log-detail.vue'
+import { useRoute } from 'vue-router'
+import { FormInstance } from 'element-plus'
+const route = useRoute()
+const pageName = route.meta.title;
 
 let sysUserLogTableData = reactive({
     page: 1,
@@ -73,7 +79,12 @@ let sysUserLogTableData = reactive({
 })
 
 const searchFormRef = ref<FormInstance>()
-
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadSysUserLogList();
+}
 /**
  * 获取管理员操作记录表列表
  */
diff --git a/admin/src/views/auth/menu.vue b/admin/src/views/auth/menu.vue
index 51de7c5e4..14abc638a 100644
--- a/admin/src/views/auth/menu.vue
+++ b/admin/src/views/auth/menu.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addMenu') }}
                 </el-button>
             </div>
 
-            <div class="mt-[16px]">
+            <div class="mt-[20px]">
                 <el-table :data="menusTableData.data" row-key="menu_key" size="large" v-loading="menusTableData.loading">
                     <template #empty>
                         <span>{{ !menusTableData.loading ? t('emptyData') : '' }}</span>
@@ -57,6 +58,9 @@ import { getMenus, deleteMenu } from '@/api/sys'
 import { t } from '@/lang'
 import { ElMessageBox } from 'element-plus'
 import EditMenu from '@/views/auth/components/edit-menu.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const menusTableData = reactive({
     loading: true,
diff --git a/admin/src/views/auth/role.vue b/admin/src/views/auth/role.vue
index 04c9cd78f..fe2c4a1f5 100644
--- a/admin/src/views/auth/role.vue
+++ b/admin/src/views/auth/role.vue
@@ -1,15 +1,27 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex justify-between">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addRole') }}
                 </el-button>
-                <el-input v-model="seach" :placeholder="t('roleNamePlaceholder')" class="w-[190px]" prefix-icon="Search"
-                    @input="loadRoleList()" clearable />
             </div>
 
-            <div class="mt-[16px]">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="roleTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('roleName')" prop="seach">
+                        <el-input v-model="roleTableData.searchParam.seach" class="w-[240px]"
+                            :placeholder="t('roleNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadRoleList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div>
                 <el-table :data="roleTableData.data" size="large" v-loading="roleTableData.loading">
                     <template #empty>
                         <span>{{ !roleTableData.loading ? t('emptyData') : '' }}</span>
@@ -46,8 +58,11 @@
 import { ref, reactive } from 'vue'
 import { t } from '@/lang'
 import { getRoleList, deleteRole } from '@/api/sys'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, FormInstance } from 'element-plus'
 import EditRole from '@/views/auth/components/edit-role.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const roleTableData = reactive({
     page: 1,
@@ -55,9 +70,18 @@ const roleTableData = reactive({
     total: 0,
     loading: true,
     data: [],
+    searchParam:{
+        seach:''
+    }
 })
 
-const seach = ref<string>('')
+const searchFormRef = ref<FormInstance>()
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadRoleList();
+}
 /**
  * 获取角色列表
  */
@@ -68,7 +92,7 @@ const loadRoleList = (page: number = 1) => {
     getRoleList({
         page: roleTableData.page,
         limit: roleTableData.limit,
-        role_name: seach.value
+        role_name: roleTableData.searchParam.seach
     }).then(res => {
         roleTableData.loading = false
         roleTableData.data = res.data.data
diff --git a/admin/src/views/auth/site_menu.vue b/admin/src/views/auth/site_menu.vue
index 83379c3ac..2f0c0f228 100644
--- a/admin/src/views/auth/site_menu.vue
+++ b/admin/src/views/auth/site_menu.vue
@@ -1,13 +1,15 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex">
-                <el-button type="primary" @click="addEvent">
+            
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addMenu') }}
                 </el-button>
             </div>
 
-            <div class="mt-[16px]">
+            <div class="mt-[20px]">
                 <el-table :data="menusTableData.data" row-key="menu_key" size="large" v-loading="menusTableData.loading">
                     <template #empty>
                         <span>{{ !menusTableData.loading ? t('emptyData') : '' }}</span>
@@ -57,6 +59,9 @@ import { getMenus, deleteMenu } from '@/api/sys'
 import { t } from '@/lang'
 import { ElMessageBox } from 'element-plus'
 import EditMenu from '@/views/auth/components/edit-menu.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const menusTableData = reactive({
     loading: true,
diff --git a/admin/src/views/auth/user.vue b/admin/src/views/auth/user.vue
index 1fe84bf09..4f4403057 100644
--- a/admin/src/views/auth/user.vue
+++ b/admin/src/views/auth/user.vue
@@ -1,16 +1,27 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex justify-between">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addUser') }}
                 </el-button>
-                <el-input v-model="seach" :placeholder="t('accountNumberPlaceholder')" class="w-[190px]" prefix-icon="Search"
-                    @input="loadUserList()" clearable />
             </div>
 
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="userTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('accountNumber')" prop="seach">
+                        <el-input v-model="userTableData.searchParam.seach" class="w-[240px]"
+                            :placeholder="t('accountNumberPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadUserList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
 
-            <div class="mt-[16px]">
+            <div>
                 <el-table :data="userTableData.data" size="large" v-loading="userTableData.loading">
                     <template #empty>
                         <span>{{ !userTableData.loading ? t('emptyData') : '' }}</span>
@@ -18,7 +29,9 @@
                     <el-table-column :label="t('headImg')" width="100" align="left">
                         <template #default="{ row }">
                             <el-avatar v-if="row.head_img" :src="img(row.head_img)" />
-                            <el-avatar v-else icon="UserFilled" />
+							<el-avatar v-else>
+								<img src="@/assets/images/member_head.png"/>
+							</el-avatar>
                         </template>
                     </el-table-column>
                     <el-table-column prop="username" :label="t('accountNumber')" min-width="120" show-overflow-tooltip />
@@ -47,11 +60,16 @@
                             {{ row.last_ip || '' }}
                         </template>
                     </el-table-column>
-                    <el-table-column :label="t('operation')" fixed="right" width="130">
+                    <el-table-column :label="t('operation')" fixed="right" width="160">
                         <template #default="{ row }">
-                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                            <el-button type="danger" link @click="lockEvent(row.uid)" v-if="row.status">{{ t('lock') }}</el-button>
-                            <el-button type="danger" link @click="unlockEvent(row.uid)" v-else>{{ t('unlock') }}</el-button>
+							<div v-if="row.userrole.is_admin != 1">
+								<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+								<el-button type="danger" link @click="lockEvent(row.uid)" v-if="row.status">{{ t('lock') }}</el-button>
+								<el-button type="danger" link @click="unlockEvent(row.uid)" v-else>{{ t('unlock') }}</el-button>
+							</div>
+                            <div v-else>
+                                <el-button link disabled >{{ t('adminDisabled') }}</el-button>
+                            </div>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -76,18 +94,31 @@ import EditUser from '@/views/auth/components/edit-user.vue'
 import { img } from '@/utils/common'
 import { ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const userTableData = reactive({
     page: 1,
     limit: 10,
     total: 0,
     loading: true,
-    data: []
+    data: [],
+    searchParam:{
+        seach: ''
+    }
 })
-const seach = ref<string>('')
 
 const searchFormRef = ref<FormInstance>()
 
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadUserList();
+}
+
 /**
  * 获取用户列表
  */
@@ -98,7 +129,7 @@ const loadUserList = (page: number = 1) => {
     getUserList({
         page: userTableData.page,
         limit: userTableData.limit,
-        username: seach.value
+        username: userTableData.searchParam.seach
 
     }).then(res => {
         userTableData.loading = false
diff --git a/admin/src/views/channel/weapp/config.vue b/admin/src/views/channel/weapp/config.vue
index 6c61e6574..054f258cd 100644
--- a/admin/src/views/channel/weapp/config.vue
+++ b/admin/src/views/channel/weapp/config.vue
@@ -184,7 +184,6 @@ const formRules = reactive<FormRules>({
 getWeappConfig().then(res => {
     Object.assign(formData, res.data)
     loading.value = false
-    console.log('formData',formData)
 })
 
 getWeappConfig().then(res => {
diff --git a/admin/src/views/channel/weapp/template.vue b/admin/src/views/channel/weapp/template.vue
index 52676ad46..999f291f7 100644
--- a/admin/src/views/channel/weapp/template.vue
+++ b/admin/src/views/channel/weapp/template.vue
@@ -1,15 +1,23 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-alert class="warm-prompt" type="info">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="batchAcquisitionFn">{{ t('batchAcquisition') }}</el-button>
+            </div>
+            <el-alert class="warm-prompt !my-[20px]" type="info">
                 <template #default>
-                    <p class="text-base">{{ t('operationTip') }} 1、{{ t('operationTipOne') }}</p>
-                    <p class="text-base">2、{{ t('operationTipTwo') }}</p>
+                     <div class="flex">
+                        <el-icon class="mr-2 mt-[2px]" size="18"><Warning /></el-icon>
+                        <div>
+                            <p class="text-base">{{ t('operationTip') }} 1、{{ t('operationTipOne') }}</p>
+                            <p class="text-base">2、{{ t('operationTipTwo') }}</p>
+                        </div>
+                    </div>
                 </template>
             </el-alert>
 
-            <div class="mt-[16px]">
-                <el-button class="mb-[15px]" @click="batchAcquisitionFn">{{ t('batchAcquisition') }}</el-button>
+            <div>
                 <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
 
                     <template #empty>
@@ -20,7 +28,7 @@
 
                     <el-table-column :label="t('response')" min-width="180">
                         <template #default="{ row }">
-                            <div v-for="(item, index) in row.weapp_json.content" :key="'a' + index" class="text-left">{{
+                            <div v-for="(item, index) in row.weapp.content" :key="'a' + index" class="text-left">{{
                                 item.join(":") }}</div>
                         </template>
                     </el-table-column>
@@ -33,7 +41,7 @@
 
                     <el-table-column prop="weapp_template_id" :label="t('serialNumber')" min-width="180" />
 
-                    <el-table-column :label="t('operation')" fixed="right" width="140">
+                    <el-table-column :label="t('operation')" fixed="right" width="200">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="infoSwitch(row)">{{ row.is_weapp == 1 ? t('close') :
                                 t('open') }}</el-button>
@@ -51,8 +59,12 @@
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getTemplateList, getBatchAcquisition } from '@/api/weapp'
-import { editMessageStatus } from '@/api/notice'
+import { editNoticeStatus } from '@/api/notice'
 import { ElLoading } from 'element-plus'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
+const pageName = route.meta.title;
 
 const cronTableData = reactive({
     loading: true,
@@ -105,7 +117,7 @@ const infoSwitch = (res) => {
     data.value.key = res.key
     data.value.type = 'weapp'
     cronTableData.loading = true
-    editMessageStatus(data.value).then(res => {
+    editNoticeStatus(data.value).then(res => {
         loadCronList()
     }).catch(() => {
         cronTableData.loading = false
@@ -115,15 +127,13 @@ const infoSwitch = (res) => {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .warm-prompt {
-    background-color: var(--el-color-primary-light-9);
-}
-
-::v-deep .warm-prompt .el-icon {
-    color: var(--el-color-primary);
-}
-
-::v-deep .warm-prompt p {
-    color: var(--el-color-primary);
+:deep(.warm-prompt) {
+    background-color: var(--el-color-primary-light-9) !important;
+    .el-icon, p {
+        color: var(--el-color-primary-light-3);
+    }
+    .el-alert__content{
+        padding: 0;
+    }
 }
 </style>
diff --git a/admin/src/views/channel/wechat/template.vue b/admin/src/views/channel/wechat/template.vue
index 1c42aaece..db2c2c235 100644
--- a/admin/src/views/channel/wechat/template.vue
+++ b/admin/src/views/channel/wechat/template.vue
@@ -1,17 +1,24 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-alert class="warm-prompt" type="info">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="batchAcquisitionFn">{{ t('batchAcquisition') }}</el-button>
+            </div>
+            <el-alert class="warm-prompt !my-[20px]" type="info">
                 <template #default>
-                    <p class="text-base">{{ t('operationTip') }} 1、{{ t('operationTipOne') }}</p>
-                    <p class="text-base">2、{{ t('operationTipTwo') }}</p>
-                    <p class="text-base">3、{{ t('operationTipThree') }}</p>
-                    <p class="text-base">4、{{ t('operationTipFour') }}</p>
+                    <div class="flex">
+                        <el-icon class="mr-2 mt-[2px]" size="18"><Warning /></el-icon>
+                        <div>
+                            <p class="text-base">{{ t('operationTip') }} 1、{{ t('operationTipOne') }}</p>
+                            <p class="text-base">2、{{ t('operationTipTwo') }}</p>
+                            <p class="text-base">3、{{ t('operationTipThree') }}</p>
+                            <p class="text-base">4、{{ t('operationTipFour') }}</p>
+                        </div>
+                    </div>
                 </template>
             </el-alert>
-
-            <div class="mt-[16px]">
-                <el-button class="mb-[15px]" @click="batchAcquisitionFn">{{ t('batchAcquisition') }}</el-button>
+            <div class="mt-[10px]">
                 <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
                     <template #empty>
                         <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
@@ -33,14 +40,14 @@
 
                     <el-table-column :label="t('response')" min-width="180">
                         <template #default="{ row }">
-                            <div v-for="(item, index) in row.wechat_json.content" :key="'a' + index" class="text-left">{{
+                            <div v-for="(item, index) in row.wechat.content" :key="'a' + index" class="text-left">{{
                                 item.join(":") }}</div>
                         </template>
                     </el-table-column>
 
                     <el-table-column prop="wechat_template_id" :label="t('serialNumber')" min-width="140" />
 
-                    <el-table-column :label="t('operation')" fixed="right" width="140">
+                    <el-table-column :label="t('operation')" fixed="right" width="200">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="infoSwitch(row)">{{ row.is_wechat == 1 ? t('close') :
                                 t('open') }}</el-button>
@@ -58,10 +65,13 @@
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getTemplateList, getBatchAcquisition } from '@/api/wechat'
-import { editMessageStatus } from '@/api/notice'
+import { editNoticeStatus } from '@/api/notice'
 import { AnyObject } from '@/types/global'
 import { ElLoading } from 'element-plus'
+import { useRoute } from 'vue-router'
 
+const route = useRoute()
+const pageName = route.meta.title;
 const cronTableData = reactive({
     loading: true,
     data: []
@@ -114,7 +124,7 @@ const infoSwitch = (res: AnyObject) => {
     data.value.key = res.key
     data.value.type = 'wechat'
     cronTableData.loading = true
-    editMessageStatus(data.value).then(res => {
+    editNoticeStatus(data.value).then(res => {
         loadCronList()
     }).catch(() => {
         cronTableData.loading = false
@@ -123,15 +133,13 @@ const infoSwitch = (res: AnyObject) => {
 
 </script>
 <style lang="scss" scoped>
-::v-deep .warm-prompt {
-    background-color: var(--el-color-primary-light-9);
-}
-
-::v-deep .warm-prompt .el-icon {
-    color: var(--el-color-primary);
-}
-
-::v-deep .warm-prompt p {
-    color: var(--el-color-primary);
+:deep(.warm-prompt) {
+    background-color: var(--el-color-primary-light-9) !important;
+    .el-icon, p {
+        color: var(--el-color-primary-light-3);
+    }
+    .el-alert__content{
+        padding: 0;
+    }
 }
 </style>
diff --git a/admin/src/views/diy/components/edit-article.vue b/admin/src/views/diy/components/edit-article.vue
index 689aa5bc8..75497604a 100644
--- a/admin/src/views/diy/components/edit-article.vue
+++ b/admin/src/views/diy/components/edit-article.vue
@@ -1,74 +1,90 @@
 <template>
-	<div class="edit-article">
-		<h3 class="mb-[10px]">{{ t('articleData') }}</h3>
-		<el-form label-width="80px" class="px-[10px]">
-			<el-form-item :label="t('dataSources')">
-				<el-radio-group v-model="diyStore.editComponent.sources">
-					<el-radio :label="'initial'">{{t('defaultSources')}}</el-radio>
-					<el-radio :label="'diy'">{{t('manualSelectionSources')}}</el-radio>
-				</el-radio-group>
-			</el-form-item>
-			<el-form-item :label="t('articleNum')" v-show="diyStore.editComponent.sources == 'initial'">
-				<el-slider v-model="diyStore.editComponent.count" show-input size="small"
-				           class="ml-[10px] article-slider"
-				           :min="1" :max="30"/>
-			</el-form-item>
-			<el-form-item :label="t('manualSelectionSources')" v-show="diyStore.editComponent.sources == 'diy'"
-			              class=" flex">
-				<span @click="showArticle" class="cursor-pointer flex-1"
-				      :class="{ 'text-primary' : diyStore.editComponent.articleIds.length > 0 }">{{ diyStore.editComponent.articleIds.length > 0 ? t('selected') + diyStore.editComponent.articleIds.length + t('piece') : t('selectPlaceholder') }}</span>
-				<el-icon>
-					<ArrowRight/>
-				</el-icon>
-			</el-form-item>
-		</el-form>
-	</div>
-
-	<el-dialog v-model="showDialog" :title="t('selectArticleTips')" width="60%" :close-on-press-escape="false"
-	           :close-on-click-modal="false">
-
-		<div>
-			<el-table :data="articleTableData.data" size="large" v-loading="articleTableData.loading"
-			          @selection-change="handleSelectionChange">
-				<template #empty>
-					<span>{{ !articleTableData.loading ? t('emptyData') : '' }}</span>
-				</template>
-
-				<el-table-column type="selection" width="55"/>
-
-				<el-table-column prop="title" :show-overflow-tooltip="true" :label="t('articleTitle')" width="140"/>
-
-				<el-table-column :label="t('articleImage')" min-width="120" align="center">
-					<template #default="{ row }">
-						<el-image class="w-12 h-12" v-if="row.image" :src="img(row.image)" fit="contain"/>
-					</template>
-				</el-table-column>
-
-				<el-table-column prop="category_name" :label="t('articleCategoryName')" align="center" min-width="140"/>
-
-				<el-table-column prop="summary" :label="t('articleSummary')" width="180" :show-overflow-tooltip="true"/>
-
-				<el-table-column :label="t('createTime')" min-width="180" align="center">
-					<template #default="{ row }">
-						{{ row.create_time || '' }}
-					</template>
-				</el-table-column>
-
-			</el-table>
-			<div class="mt-[16px] flex justify-end">
-				<el-pagination v-model:current-page="articleTableData.page" v-model:page-size="articleTableData.limit"
-				               layout="total, sizes, prev, pager, next, jumper" :total="articleTableData.total"
-				               @size-change="loadArticleList()" @current-change="loadArticleList"/>
-			</div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('articleData') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('dataSources')">
+					<el-radio-group v-model="diyStore.editComponent.sources">
+						<el-radio :label="'initial'">{{t('defaultSources')}}</el-radio>
+						<el-radio :label="'diy'">{{t('manualSelectionSources')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('articleNum')" v-show="diyStore.editComponent.sources == 'initial'">
+					<el-slider v-model="diyStore.editComponent.count" show-input size="small" class="ml-[10px] article-slider" :min="1" :max="30"/>
+				</el-form-item>
+				<el-form-item :label="t('manualSelectionSources')" v-show="diyStore.editComponent.sources == 'diy'" class=" flex">
+					<span @click="showArticle" class="cursor-pointer flex-1" :class="{ 'text-primary' : diyStore.editComponent.articleIds.length > 0 }">{{ diyStore.editComponent.articleIds.length > 0 ? t('selected') + diyStore.editComponent.articleIds.length + t('piece') : t('selectPlaceholder') }}</span>
+					<el-icon>
+						<ArrowRight/>
+					</el-icon>
+				</el-form-item>
+			</el-form>
 		</div>
 
-		<template #footer>
-            <span class="dialog-footer">
-	            <el-button @click="showDialog = false">{{ t('cancel')}}</el-button>
-	            <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
-            </span>
-		</template>
-	</el-dialog>
+		<el-dialog v-model="showDialog" :title="t('selectArticleTips')" width="60%" :close-on-press-escape="false" :close-on-click-modal="false">
+
+			<div>
+				<el-table :data="articleTableData.data" size="large" v-loading="articleTableData.loading" @selection-change="handleSelectionChange">
+					<template #empty>
+						<span>{{ !articleTableData.loading ? t('emptyData') : '' }}</span>
+					</template>
+
+					<el-table-column type="selection" width="55"/>
+
+					<el-table-column prop="title" :show-overflow-tooltip="true" :label="t('articleTitle')" width="140"/>
+
+					<el-table-column :label="t('articleImage')" min-width="120" align="center">
+						<template #default="{ row }">
+							<el-image class="w-12 h-12" v-if="row.image" :src="img(row.image)" fit="contain"/>
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="category_name" :label="t('articleCategoryName')" align="center" min-width="140"/>
+
+					<el-table-column prop="summary" :label="t('articleSummary')" width="180" :show-overflow-tooltip="true"/>
+
+					<el-table-column :label="t('createTime')" min-width="180" align="center">
+						<template #default="{ row }">
+							{{ row.create_time || '' }}
+						</template>
+					</el-table-column>
+
+				</el-table>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="articleTableData.page" v-model:page-size="articleTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="articleTableData.total" @size-change="loadArticleList()" @current-change="loadArticleList"/>
+				</div>
+			</div>
+
+			<template #footer>
+	            <span class="dialog-footer">
+		            <el-button @click="showDialog = false">{{ t('cancel')}}</el-button>
+		            <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+	            </span>
+			</template>
+		</el-dialog>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('articleStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('articleBgColor')">
+					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('topRounded')">
+					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] graphic-nav-slider" :max="50"/>
+				</el-form-item>
+				<el-form-item :label="t('bottomRounded')">
+					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] graphic-nav-slider" :max="50"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 
 </template>
 
@@ -81,6 +97,7 @@
     import {ElTable} from 'element-plus'
 
     const diyStore = useDiyStore()
+    diyStore.editComponent.ignore = []; // 忽略公共属性
 
     // 组件验证
     diyStore.editComponent.verify = (index: number) => {
diff --git a/admin/src/views/diy/components/edit-graphic-nav.vue b/admin/src/views/diy/components/edit-graphic-nav.vue
index 40924c26e..1661171dc 100644
--- a/admin/src/views/diy/components/edit-graphic-nav.vue
+++ b/admin/src/views/diy/components/edit-graphic-nav.vue
@@ -1,6 +1,7 @@
 <template>
-	<div class="edit-graphic-nav">
-		<div class="border-solid border-b-4 border-gray-200 mb-[20px]">
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
 			<h3 class="mb-[10px]">{{ t('graphicNavModeTitle') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 
@@ -11,10 +12,8 @@
 					</el-radio-group>
 				</el-form-item>
 
-				<el-form-item v-show="diyStore.editComponent.layout == 'vertical'" :label="t('graphicNavTitle')">
-					<el-input v-model="diyStore.editComponent.navTitle" :placeholder="t('graphicNavTitlePlaceholder')"
-					          clearable
-					          maxlength="20" show-word-limit/>
+				<el-form-item :label="t('graphicNavTitle')">
+					<el-input v-model="diyStore.editComponent.navTitle" :placeholder="t('graphicNavTitlePlaceholder')" clearable maxlength="20" show-word-limit/>
 				</el-form-item>
 
 				<el-form-item :label="t('graphicNavSelectMode')">
@@ -53,44 +52,23 @@
 
 			</el-form>
 		</div>
-		<div class="border-solid border-b-4 border-gray-200 mb-[20px]"
-		     v-show="['graphic','img'].includes(diyStore.editComponent.mode)">
-			<h3 class="mb-[10px]">{{ t('graphicNavImageSet') }}</h3>
-			<el-form label-width="80px" class="px-[10px]">
-				<el-form-item :label="t('graphicNavImageSize')">
-					<el-slider v-model="diyStore.editComponent.imageSize" show-input size="small"
-					           class="ml-[10px] graphic-nav-slider" :min="30" :max="60"/>
-				</el-form-item>
-
-				<el-form-item :label="t('graphicNavAroundRadius')">
-					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small"
-					           class="ml-[10px] graphic-nav-slider" :max="50"/>
-				</el-form-item>
-			</el-form>
-		</div>
-		<div>
+		<div class="edit-attr-item-wrap">
 			<h3 class="mb-[10px]">{{ t('graphicNavSetLabel') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 
 				<p class="text-sm text-gray-400 mb-[10px]">{{ t('graphicNavTips') }}</p>
 
 				<div ref="imageBoxRef">
-					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id"
-					     class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
-						<el-form-item :label="t('image')"
-						              v-show="diyStore.editComponent.mode === 'graphic' || diyStore.editComponent.mode === 'img'">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')" v-show="diyStore.editComponent.mode === 'graphic' || diyStore.editComponent.mode === 'img'">
 							<upload-image v-model="item.imageUrl" :limit="1"/>
 						</el-form-item>
 
-						<el-form-item :label="t('graphicNavTitle')"
-						              v-show="diyStore.editComponent.mode === 'graphic' || diyStore.editComponent.mode === 'text'">
-							<el-input v-model="item.title" :placeholder="t('graphicNavTitlePlaceholder')" clearable
-							          maxlength="20" show-word-limit/>
+						<el-form-item :label="t('graphicNavTitle')" v-show="diyStore.editComponent.mode === 'graphic' || diyStore.editComponent.mode === 'text'">
+							<el-input v-model="item.title" :placeholder="t('graphicNavTitlePlaceholder')" clearable maxlength="20" show-word-limit/>
 						</el-form-item>
 
-						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-						     v-show="diyStore.editComponent.list.length > 1"
-						     @click="diyStore.editComponent.list.splice(index,1)">
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
 							<icon name="element-CircleCloseFilled" color="#bbb" size="20px"/>
 						</div>
 
@@ -100,14 +78,49 @@
 					</div>
 				</div>
 
-				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addGraphicNav">
-					{{t('addGraphicNav')}}
-				</el-button>
+				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addGraphicNav">{{ t('addGraphicNav') }}</el-button>
 
 			</el-form>
 		</div>
 	</div>
 
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap" v-show="['graphic','img'].includes(diyStore.editComponent.mode)">
+			<h3 class="mb-[10px]">{{ t('graphicNavImageSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('graphicNavImageSize')">
+					<el-slider v-model="diyStore.editComponent.imageSize" show-input size="small" class="ml-[10px] graphic-nav-slider" :min="20" :max="60"/>
+				</el-form-item>
+				<el-form-item :label="t('graphicNavAroundRadius')">
+					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small" class="ml-[10px] graphic-nav-slider" :max="50"/>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap" v-show="['graphic','text'].includes(diyStore.editComponent.mode)">
+			<h3 class="mb-[10px]">{{ t('textSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.font.size" show-input size="small" class="ml-[10px] graphic-nav-slider" :min="12" :max="16"/>
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.font.weight">
+						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
+						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.font.color" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -120,17 +133,11 @@
     import useDiyStore from '@/stores/modules/diy'
 
     const diyStore = useDiyStore()
+    diyStore.editComponent.ignore = []; // 忽略公共属性
 
     // 组件验证
     diyStore.editComponent.verify = (index: number) => {
         var res = {code: true, message: ''};
-        if (diyStore.value[index].layout == 'vertical') {
-            if (diyStore.value[index].navTitle == '') {
-                res.code = false;
-                res.message = t('graphicNavTitlePlaceholder');
-                return res;
-            }
-        }
 
         diyStore.value[index].list.forEach((item: any) => {
             if ((diyStore.value[index].mode === 'graphic' || diyStore.value[index].mode === 'img') && item.imageUrl === '') {
@@ -189,22 +196,22 @@
     const imageBoxRef = ref()
 
     onMounted(() => {
-        const sortable = Sortable.create(imageBoxRef.value, {
-            group: 'item-wrap',
-            animation: 200,
-            onEnd: event => {
-                const temp = diyStore.editComponent.list[event.oldIndex!];
-                diyStore.editComponent.list.splice(event.oldIndex!, 1);
-                diyStore.editComponent.list.splice(event.newIndex!, 0, temp);
-                nextTick(() => {
+        nextTick(() => {
+            const sortable = Sortable.create(imageBoxRef.value, {
+                group: 'item-wrap',
+                animation: 200,
+                onEnd: event => {
+                    const temp = diyStore.editComponent.list[event.oldIndex!];
+                    diyStore.editComponent.list.splice(event.oldIndex!, 1);
+                    diyStore.editComponent.list.splice(event.newIndex!, 0, temp);
                     sortable.sort(
                         range(diyStore.editComponent.list.length).map(value => {
                             return value.toString();
                         })
                     );
-                });
-            }
-        })
+                }
+            })
+        });
     })
 
     defineExpose({})
diff --git a/admin/src/views/diy/components/edit-horz-blank.vue b/admin/src/views/diy/components/edit-horz-blank.vue
index 75bf0e953..16e0917f2 100644
--- a/admin/src/views/diy/components/edit-horz-blank.vue
+++ b/admin/src/views/diy/components/edit-horz-blank.vue
@@ -1,12 +1,21 @@
 <template>
-	<div class="edit-horz-blank">
-		<h3 class="mb-[10px]">{{ t('blankHeightSet') }}</h3>
-		<el-form label-width="80px" class="px-[10px]">
-			<el-form-item :label="t('blankHeight')">
-				<el-slider v-model="diyStore.editComponent.height" show-input size="small"
-				           class="ml-[10px] horz-blank-slider"/>
-			</el-form-item>
-		</el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('blankHeightSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('blankHeight')">
+					<el-slider v-model="diyStore.editComponent.height" show-input size="small" class="ml-[10px] horz-blank-slider"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
 	</div>
 
 </template>
@@ -16,6 +25,7 @@
     import useDiyStore from '@/stores/modules/diy'
 
     const diyStore = useDiyStore()
+    diyStore.editComponent.ignore = ['pageBgColor','topRounded','bottomRounded','marginTop','marginBottom','marginBoth']; // 忽略公共属性
 
     defineExpose({})
 
diff --git a/admin/src/views/diy/components/edit-image-ads.vue b/admin/src/views/diy/components/edit-image-ads.vue
index b1ae178f3..4f88e93ff 100644
--- a/admin/src/views/diy/components/edit-image-ads.vue
+++ b/admin/src/views/diy/components/edit-image-ads.vue
@@ -1,34 +1,39 @@
 <template>
-	<div class="edit-image-ads">
-		<h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
-		<el-form label-width="80px" class="px-[10px]">
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
 
-			<p class="text-sm text-gray-400 mb-[10px]">{{ t('imageAdsTips') }}</p>
+				<p class="text-sm text-gray-400 mb-[10px]">{{ t('imageAdsTips') }}</p>
 
-			<div ref="imageBoxRef">
-				<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id"
-				     class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
-					<el-form-item :label="t('image')">
-						<upload-image v-model="item.imageUrl" :limit="1"/>
-					</el-form-item>
+				<div ref="imageBoxRef">
+					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+						<el-form-item :label="t('image')">
+							<upload-image v-model="item.imageUrl" :limit="1"/>
+						</el-form-item>
 
-					<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
-					     v-show="diyStore.editComponent.list.length > 1"
-					     @click="diyStore.editComponent.list.splice(index,1)">
-						<icon name="element-CircleCloseFilled" color="#bbb" size="20px"/>
+						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+							<icon name="element-CircleCloseFilled" color="#bbb" size="20px"/>
+						</div>
+
+						<el-form-item :label="t('link')">
+							<diy-link v-model="item.link"/>
+						</el-form-item>
 					</div>
-
-					<el-form-item :label="t('link')">
-						<diy-link v-model="item.link"/>
-					</el-form-item>
 				</div>
-			</div>
 
-			<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addImageAd">{{
-				t('addImageAd')}}
-			</el-button>
+				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addImageAd">{{ t('addImageAd') }}</el-button>
 
-		</el-form>
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
 	</div>
 
 </template>
@@ -43,6 +48,7 @@
     import useDiyStore from '@/stores/modules/diy'
 
     const diyStore = useDiyStore()
+    diyStore.editComponent.ignore = []; // 忽略公共属性
 
     // 组件验证
     diyStore.editComponent.verify = (index: number) => {
@@ -90,22 +96,22 @@
     const imageBoxRef = ref()
 
     onMounted(() => {
-        const sortable = Sortable.create(imageBoxRef.value, {
-            group: 'item-wrap',
-            animation: 200,
-            onEnd: event => {
-                const temp = diyStore.editComponent.list[event.oldIndex!];
-                diyStore.editComponent.list.splice(event.oldIndex!, 1);
-                diyStore.editComponent.list.splice(event.newIndex!, 0, temp);
-                nextTick(() => {
+        nextTick(() => {
+            const sortable = Sortable.create(imageBoxRef.value, {
+                group: 'item-wrap',
+                animation: 200,
+                onEnd: event => {
+                    const temp = diyStore.editComponent.list[event.oldIndex!];
+                    diyStore.editComponent.list.splice(event.oldIndex!, 1);
+                    diyStore.editComponent.list.splice(event.newIndex!, 0, temp);
                     sortable.sort(
                         range(diyStore.editComponent.list.length).map(value => {
                             return value.toString();
                         })
                     );
-                });
-            }
-        })
+                }
+            })
+        });
     })
 
     defineExpose({})
diff --git a/admin/src/views/diy/components/edit-member-info.vue b/admin/src/views/diy/components/edit-member-info.vue
index 293434a5e..4d635392b 100644
--- a/admin/src/views/diy/components/edit-member-info.vue
+++ b/admin/src/views/diy/components/edit-member-info.vue
@@ -1,5 +1,30 @@
 <template>
-	<div class="edit-member-info"></div>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('bgUrl')">
+					<upload-image v-model="diyStore.editComponent.bgUrl" :limit="1"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
+
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor"/>
+				</el-form-item>
+			</el-form>
+		</div>
+
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -7,6 +32,7 @@
     import useDiyStore from '@/stores/modules/diy'
 
     const diyStore = useDiyStore()
+    diyStore.editComponent.ignore = []; // 忽略公共属性
 
     defineExpose({})
 
diff --git a/admin/src/views/diy/components/edit-page.vue b/admin/src/views/diy/components/edit-page.vue
index d4be42329..8778deabe 100644
--- a/admin/src/views/diy/components/edit-page.vue
+++ b/admin/src/views/diy/components/edit-page.vue
@@ -1,53 +1,65 @@
 <template>
-	<!--	class="border-solid border-b-4 border-gray-200 mb-[20px]"-->
-	<div class="edit-page-set">
-		<h3 class="mb-[10px]">{{ t('pageContent') }}</h3>
-		<el-form label-width="80px" class="px-[10px]">
-			<el-form-item :label="t('pageName')">
-				<el-input v-model="diyStore.global.title" :placeholder="t('pageNamePlaceholder')" clearable
-				          maxlength="12" show-word-limit/>
-			</el-form-item>
-			<el-form-item :label="t('pageBgColor')">
-				<el-color-picker v-model="diyStore.global.pageBgColor" show-alpha :predefine="predefineColors"/>
-			</el-form-item>
-			<el-form-item :label="t('tabbar')">
-				<el-switch v-model="diyStore.global.tabbarSwitch"/>
-				<!--<div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>-->
-			</el-form-item>
-			<el-form-item>
-				<div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>
-			</el-form-item>
-		</el-form>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pageContent') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('pageName')">
+					<el-input v-model="diyStore.global.title" :placeholder="t('pageNamePlaceholder')" clearable maxlength="12" show-word-limit/>
+				</el-form-item>
+				<el-form-item :label="t('tabbar')" class="display-block">
+					<el-switch v-model="diyStore.global.tabbarSwitch"/>
+					<div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>
+				</el-form-item>
+			</el-form>
+		</div>
 	</div>
 
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('pageStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('pageBgColor')">
+					<el-color-picker v-model="diyStore.global.pageBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+				</el-form-item>
+				<el-form-item :label="t('bgUrl')">
+					<upload-image v-model="diyStore.global.bgUrl" :limit="1"/>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('marginSet') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('marginBoth')">
+					<el-slider v-model="diyStore.global.template.margin.both" show-input size="small" class="ml-[10px] horz-blank-slider"/>
+				</el-form-item>
+			</el-form>
+		</div>
+	</div>
 </template>
 
 <script lang="ts" setup>
     import {t} from '@/lang'
-    import {ref} from 'vue'
+    import {ref,watch} from 'vue'
     import useDiyStore from '@/stores/modules/diy'
+    import {img} from '@/utils/common'
 
     const diyStore = useDiyStore()
-    const predefineColors = ref([
-        '#F4391c',
-        '#ff4500',
-        '#ff8c00',
-        '#FFD009',
-        '#ffd700',
-        '#19C650',
-        '#90ee90',
-        '#00ced1',
-        '#1e90ff',
-        '#c71585',
-        '#FF407E',
-        '#CFAF70',
-        '#A253FF',
-        'rgba(255, 69, 0, 0.68)',
-        'rgb(255, 120, 0)',
-        'hsl(181, 100%, 37%)',
-        'hsla(209, 100%, 56%, 0.73)',
-        '#c7158577'
-    ])
+
+    watch(
+        () => diyStore.global.bgUrl,
+        (newValue, oldValue) => {
+            // 设置图片宽高
+            let image = new Image();
+            image.src = img(diyStore.global.bgUrl);
+            image.onload = async () => {
+                diyStore.global.imgWidth = image.width;
+                diyStore.global.imgHeight = image.height;
+            };
+        }
+    )
+
     defineExpose({})
 </script>
 
diff --git a/admin/src/views/diy/components/edit-text.vue b/admin/src/views/diy/components/edit-text.vue
index 5fa19a1d2..bc4a2c2d1 100644
--- a/admin/src/views/diy/components/edit-text.vue
+++ b/admin/src/views/diy/components/edit-text.vue
@@ -1,7 +1,8 @@
 <template>
-	<div class="edit-text">
-		<div class="border-solid border-b-4 border-gray-200 mb-[20px]">
-			<h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
+	<!-- 内容 -->
+	<div class="content-wrap" v-show="diyStore.editTab == 'content'">
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('styleSet') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 				<el-form-item :label="t('selectStyle')" class="flex">
 					<span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{ diyStore.editComponent.styleName }}</span>
@@ -11,13 +12,11 @@
 				</el-form-item>
 			</el-form>
 		</div>
-		<div class="border-solid border-b-4 border-gray-200 mb-[20px]">
+		<div class="edit-attr-item-wrap">
 			<h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 				<el-form-item :label="t('title')">
-					<el-input v-model="diyStore.editComponent.text" :placeholder="t('titlePlaceholder')"
-					          clearable
-					          maxlength="15" show-word-limit/>
+					<el-input v-model="diyStore.editComponent.text" :placeholder="t('titlePlaceholder')" clearable maxlength="15" show-word-limit/>
 				</el-form-item>
 				<el-form-item :label="t('link')">
 					<diy-link v-model="diyStore.editComponent.link"/>
@@ -28,35 +27,17 @@
 						<el-radio :label="'center'">{{t('textAlignCenter')}}</el-radio>
 					</el-radio-group>
 				</el-form-item>
-				<el-form-item :label="t('textFontSize')">
-					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small"
-					           class="ml-[10px] article-slider"
-					           :min="12" :max="20"/>
-				</el-form-item>
-				<el-form-item :label="t('textFontWeight')">
-					<el-radio-group v-model="diyStore.editComponent.fontWeight">
-						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
-						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item :label="t('textColor')">
-					<el-color-picker v-model="diyStore.editComponent.textColor"/>
-				</el-form-item>
 			</el-form>
 		</div>
 
-		<div class="border-solid border-b-4 border-gray-200 mb-[20px]" v-show="diyStore.editComponent.subTitle.control">
+		<div class="edit-attr-item-wrap" v-show="diyStore.editComponent.subTitle.control">
 			<h3 class="mb-[10px]">{{ t('subTitleContent') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 				<el-form-item :label="t('subTitle')">
-					<el-input v-model="diyStore.editComponent.subTitle.text"
-					          :placeholder="t('subTitlePlaceholder')" clearable
-					          maxlength="30" show-word-limit/>
+					<el-input v-model="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="30" show-word-limit/>
 				</el-form-item>
 				<el-form-item :label="t('textFontSize')">
-					<el-slider v-model="diyStore.editComponent.subTitle.fontSize" show-input size="small"
-					           class="ml-[10px] article-slider"
-					           :min="12" :max="16"/>
+					<el-slider v-model="diyStore.editComponent.subTitle.fontSize" show-input size="small" class="ml-[10px] article-slider" :min="12" :max="16"/>
 				</el-form-item>
 				<el-form-item :label="t('textColor')">
 					<el-color-picker v-model="diyStore.editComponent.subTitle.color"/>
@@ -64,13 +45,11 @@
 			</el-form>
 		</div>
 
-		<div class="border-solid border-b-4 border-gray-200 mb-[20px]" v-show="diyStore.editComponent.more.control">
+		<div class="edit-attr-item-wrap" v-show="diyStore.editComponent.more.control">
 			<h3 class="mb-[10px]">{{ t('moreContent') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 				<el-form-item :label="t('more')">
-					<el-input v-model="diyStore.editComponent.more.text" :placeholder="t('morePlaceholder')"
-					          clearable
-					          maxlength="8" show-word-limit/>
+					<el-input v-model="diyStore.editComponent.more.text" :placeholder="t('morePlaceholder')" clearable maxlength="8" show-word-limit/>
 				</el-form-item>
 				<el-form-item :label="t('link')">
 					<diy-link v-model="diyStore.editComponent.more.link"/>
@@ -84,30 +63,52 @@
 			</el-form>
 		</div>
 
+		<el-dialog v-model="showDialog" :title="t('selectStyle')" width="40%">
+
+			<div class="flex flex-wrap">
+				<div class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50" :class="{ 'border-primary' : selectStyle == 'style-1'}" @click="selectStyle = 'style-1'">
+					<img class="max-w-[280px] max-h-[220px]" src="@/assets/images/diy/text/style1.png"/>
+				</div>
+				<div class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50" :class="{ 'border-primary' : selectStyle == 'style-2'}" @click="selectStyle = 'style-2'">
+					<img class="max-w-[280px] max-h-[220px]" src="@/assets/images/diy/text/style2.png"/>
+				</div>
+			</div>
+
+			<template #footer>
+	            <span class="dialog-footer">
+		            <el-button @click="showDialog = false">{{ t('cancel')}}</el-button>
+		            <el-button type="primary" @click="changeStyle">{{ t('confirm') }}</el-button>
+	            </span>
+			</template>
+
+		</el-dialog>
 	</div>
 
-	<el-dialog v-model="showDialog" :title="t('selectStyle')" width="40%">
+	<!-- 样式 -->
+	<div class="style-wrap" v-show="diyStore.editTab == 'style'">
 
-		<div class="flex flex-wrap">
-			<div class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50"
-			     :class="{ 'border-primary' : selectStyle == 'style-1'}"
-			     @click="selectStyle = 'style-1'">
-				<img class="max-w-[280px] max-h-[220px]" src="@/assets/images/diy/text/style1.png"/>
-			</div>
-			<div class="flex items-center justify-center overflow-hidden w-[280px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50"
-			     :class="{ 'border-primary' : selectStyle == 'style-2'}"
-			     @click="selectStyle = 'style-2'">
-				<img class="max-w-[280px] max-h-[220px]" src="@/assets/images/diy/text/style2.png"/>
-			</div>
+		<div class="edit-attr-item-wrap">
+			<h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
+			<el-form label-width="80px" class="px-[10px]">
+				<el-form-item :label="t('textFontSize')">
+					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] article-slider" :min="12" :max="20"/>
+				</el-form-item>
+				<el-form-item :label="t('textFontWeight')">
+					<el-radio-group v-model="diyStore.editComponent.fontWeight">
+						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
+						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+					</el-radio-group>
+				</el-form-item>
+				<el-form-item :label="t('textColor')">
+					<el-color-picker v-model="diyStore.editComponent.textColor"/>
+				</el-form-item>
+			</el-form>
 		</div>
 
-		<template #footer>
-            <span class="dialog-footer">
-	            <el-button @click="showDialog = false">{{ t('cancel')}}</el-button>
-	            <el-button type="primary" @click="changeStyle">{{ t('confirm') }}</el-button>
-            </span>
-		</template>
-	</el-dialog>
+		<!-- 组件样式 -->
+		<slot name="style"></slot>
+
+	</div>
 
 </template>
 
@@ -117,6 +118,7 @@
     import {ref, reactive} from 'vue'
 
     const diyStore = useDiyStore()
+    diyStore.editComponent.ignore = []; // 忽略公共属性
 
     const showDialog = ref(false)
 
diff --git a/admin/src/views/diy/edit.vue b/admin/src/views/diy/edit.vue
index 5ad54e1b0..24f5b96b6 100644
--- a/admin/src/views/diy/edit.vue
+++ b/admin/src/views/diy/edit.vue
@@ -9,7 +9,7 @@
             </div>
             <div class="text-white ml-[10px] flex items-center">
                 <span class="mr-[5px]"> ｜ {{ t('decorating') }}：{{ diyStore.typeName }}</span>
-                <!--				<el-icon class="font-bold"><EditPen /></el-icon>-->
+                <!--<el-icon class="font-bold"><EditPen /></el-icon>-->
             </div>
             <div class="flex-1"></div>
             <el-button @click="save()">{{ t('save') }}</el-button>
@@ -24,9 +24,7 @@
                     <el-collapse v-model="activeNames" @change="handleChange">
                         <el-collapse-item v-for="(item, key) in component" :key="key" :title="item.title" :name="key">
                             <ul class="flex flex-row flex-wrap">
-                                <li v-for="(compItem, compKey) in item.list" :key="compKey"
-                                    class="w-2/6 text-center cursor-pointer h-[75px]" :title="compItem.title"
-                                    @click="diyStore.addComponent(compKey, compItem)">
+                                <li v-for="(compItem, compKey) in item.list" :key="compKey" class="w-2/6 text-center cursor-pointer h-[75px]" :title="compItem.title" @click="diyStore.addComponent(compKey, compItem)">
                                     <icon :name="compItem.icon" size="23px" />
                                     <span class="block text-base truncate">{{ compItem.title }}</span>
                                 </li>
@@ -40,42 +38,33 @@
             <div class="preview-wrap flex-1 relative mt-[20px]">
 
                 <el-scrollbar>
-                    <el-button class="page-btn absolute right-[20px]" @click="diyStore.changeCurrentIndex(-99)">{{
-                        t('pageSet') }}</el-button>
+                    <el-button class="page-btn absolute right-[20px]" @click="diyStore.changeCurrentIndex(-99)">{{ t('pageSet') }}</el-button>
                     <div class="diy-view-wrap w-[375px] shadow-lg mx-auto">
                         <div class="preview-head bg-no-repeat bg-center bg-cover" @click="diyStore.changeCurrentIndex(-99)">
-                            <span class="text-base block text-center truncate cursor-pointer h-[64px] leading-[84px]">{{
-                                diyStore.global.title }}</span>
+                            <span class="text-base block text-center truncate cursor-pointer h-[64px] leading-[84px]">{{ diyStore.global.title }}</span>
                         </div>
                         <div class="preview-block relative">
 
-                            <ul
-                                class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md">
+                            <ul class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md">
                                 <el-tooltip effect="light" :content="t('moveUpComponent')" placement="right">
-                                    <icon name="iconfont-iconjiantoushang" size="20px"
-                                        class="block cursor-pointer leading-[40px]" @click="diyStore.moveUpComponent" />
+                                    <icon name="iconfont-iconjiantoushang" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.moveUpComponent" />
                                 </el-tooltip>
                                 <el-tooltip effect="light" :content="t('moveDownComponent')" placement="right">
-                                    <icon name="iconfont-iconjiantouxia" size="20px"
-                                        class="block cursor-pointer leading-[40px]" @click="diyStore.moveDownComponent" />
+                                    <icon name="iconfont-iconjiantouxia" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.moveDownComponent" />
                                 </el-tooltip>
                                 <el-tooltip effect="light" :content="t('copyComponent')" placement="right">
-                                    <icon name="iconfont-iconcopy-line" size="20px"
-                                        class="block cursor-pointer leading-[40px]" @click="diyStore.copyComponent" />
+                                    <icon name="iconfont-iconcopy-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.copyComponent" />
                                 </el-tooltip>
                                 <el-tooltip effect="light" :content="t('delComponent')" placement="right">
-                                    <icon name="iconfont-icondelete-line" size="20px"
-                                        class="block cursor-pointer leading-[40px]" @click="diyStore.delComponent" />
+                                    <icon name="iconfont-icondelete-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.delComponent" />
                                 </el-tooltip>
                                 <el-tooltip effect="light" :content="t('resetComponent')" placement="right">
-                                    <icon name="iconfont-iconloader-line" size="20px"
-                                        class="block cursor-pointer leading-[40px]" @click="diyStore.resetComponent" />
+                                    <icon name="iconfont-iconloader-line" size="20px" class="block cursor-pointer leading-[40px]" @click="diyStore.resetComponent" />
                                 </el-tooltip>
                             </ul>
 
                             <!-- 组件预览渲染区域 -->
-                            <iframe id="previewIframe" v-show="wapDomain" :src="wapDomain" frameborder="0"
-                                class="preview-iframe w-[375px]"></iframe>
+                            <iframe id="previewIframe" v-show="wapDomain" :src="wapDomain" frameborder="0" class="preview-iframe w-[375px]"></iframe>
 
                         </div>
                     </div>
@@ -90,12 +79,50 @@
                     <el-card class="box-card" shadow="never">
                         <template #header>
                             <div class="card-header flex justify-between items-center">
-                                <span class="title flex-1">{{ diyStore.currentIndex == -99 ? t('pageSet') :
-                                    diyStore.editComponent.componentTitle }}</span>
+                                <span class="title flex-1">{{ diyStore.currentIndex == -99 ? t('pageSet') : diyStore.editComponent.componentTitle }}</span>
+                                <div class="tab-wrap flex rounded-[50px] bg-gray-100 text-[14px]">
+                                    <span class="cursor-pointer rounded-[50px] py-[5px] px-[15px]" :class="{ 'bg-primary text-white': diyStore.editTab == 'content'}" @click="diyStore.editTab = 'content'">{{ t('tabEditContent') }}</span>
+                                    <span class="cursor-pointer rounded-[50px] py-[5px] px-[15px]" :class="{ 'bg-primary text-white': diyStore.editTab == 'style'}" @click="diyStore.editTab = 'style'">{{ t('tabEditStyle') }}</span>
+                                </div>
                             </div>
                         </template>
-                        <component :is="modules[diyStore.currentComponent]"
-                            :value="diyStore.value[diyStore.currentIndex]" />
+
+                        <div class="edit-component-wrap">
+
+                            <component :is="modules[diyStore.currentComponent]" :value="diyStore.value[diyStore.currentIndex]">
+                                <template #style>
+                                    <div class="edit-attr-item-wrap">
+                                        <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
+                                        <el-form label-width="80px" class="px-[10px]">
+                                            <el-form-item :label="t('bottomBgColor')" class="display-block" v-if="diyStore.editComponent.ignore.indexOf('pageBgColor') == -1">
+                                                <el-color-picker v-model="diyStore.editComponent.pageBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+                                                <div class="text-sm text-gray-400">{{ t('bottomBgTips') }}</div>
+                                            </el-form-item>
+                                            <el-form-item :label="t('componentBgColor')" v-if="diyStore.editComponent.ignore.indexOf('componentBgColor') == -1">
+                                                <el-color-picker v-model="diyStore.editComponent.componentBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginTop')" v-if="diyStore.editComponent.ignore.indexOf('marginTop') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.top" show-input size="small" :min="0" class="ml-[10px] horz-blank-slider"/>
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginBottom')" v-if="diyStore.editComponent.ignore.indexOf('marginBottom') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.bottom" show-input size="small" class="ml-[10px] horz-blank-slider"/>
+                                            </el-form-item>
+                                            <el-form-item :label="t('marginBoth')" v-if="diyStore.editComponent.ignore.indexOf('marginBoth') == -1">
+                                                <el-slider v-model="diyStore.editComponent.margin.both" show-input size="small" class="ml-[10px] horz-blank-slider"/>
+                                            </el-form-item>
+                                            <el-form-item :label="t('topRounded')" v-if="diyStore.editComponent.ignore.indexOf('topRounded') == -1">
+                                                <el-slider v-model="diyStore.editComponent.topRounded" show-input size="small" class="ml-[10px] horz-blank-slider" :max="50"/>
+                                            </el-form-item>
+                                            <el-form-item :label="t('bottomRounded')" v-if="diyStore.editComponent.ignore.indexOf('bottomRounded') == -1">
+                                                <el-slider v-model="diyStore.editComponent.bottomRounded" show-input size="small" class="ml-[10px] horz-blank-slider" :max="50"/>
+                                            </el-form-item>
+                                        </el-form>
+                                    </div>
+                                </template>
+                            </component>
+
+                        </div>
+
                     </el-card>
                 </el-scrollbar>
 
@@ -119,7 +146,7 @@ const route = useRoute();
 const router = useRouter()
 
 const wapDomain = ref('')
-
+const backPath = route.query.back || '/diy/list'
 const component = ref([])
 const componentType: string[] = reactive([])
 
@@ -128,7 +155,8 @@ const handleChange = (val: string[]) => { }
 
 route.query.id = route.query.id || 0;
 route.query.name = route.query.name || '';
-route.query.type = route.query.type || ''; // 页面类型，新页面传入
+route.query.template = route.query.template || ''; // 页面模板，新页面传入
+route.query.template_name = route.query.template_name || ''; // 页面模板名称，新页面传入
 route.query.title = route.query.title || '';
 
 // 初始化原数据
@@ -143,10 +171,10 @@ const originData = reactive({
 })
 
 // 返回上一页
-const isChange = ref(true) // 数据是否发生变化，true：没变化，false：变化了
+const isChange = ref(true); // 数据是否发生变化，true：没变化，false：变化了
 const goBack = () => {
     if (isChange.value) {
-        router.push('/diy/list');
+        router.push(backPath);
     } else {
         // 数据发生变化，弹框提示：确定离开此页面
         ElMessageBox.confirm(
@@ -159,7 +187,7 @@ const goBack = () => {
                 autofocus: false
             }
         ).then(() => {
-            router.push('/diy/list');
+            router.push(backPath);
         }).catch(() => {
         })
     }
@@ -198,14 +226,17 @@ watch(
 initPage({
     id: route.query.id,
     name: route.query.name,
-    type: route.query.type,
+    template: route.query.template,
+    template_name: route.query.template_name,
     title: route.query.title
 }).then(res => {
     let data = res.data;
+    diyStore.init(); // 初始化清空数据
     diyStore.id = data.id || 0;
     diyStore.name = data.name;
     diyStore.type = data.type;
     diyStore.typeName = data.type_name;
+    diyStore.isDefault = data.is_default;
     if (data.value) {
         let sources = JSON.parse(data.value);
         diyStore.global = sources.global;
@@ -234,14 +265,12 @@ initPage({
             com.id = diyStore.generateRandom();
             com.componentName = key;
             com.componentTitle = com.title;
-            com.maxCount = com.max_count;
             Object.assign(com, com.value);
             delete com.name;
             delete com.title;
             delete com.value;
             delete com.type;
             delete com.icon;
-            delete com.max_count;
             diyStore.components.push(com)
         }
     }
@@ -296,6 +325,7 @@ const save = () => {
         name: diyStore.name,
         title: diyStore.global.title,
         type: diyStore.type,
+        is_default: diyStore.isDefault,
         value: JSON.stringify({
             global: toRaw(diyStore.global),
             value: toRaw(diyStore.value)
@@ -305,11 +335,11 @@ const save = () => {
     const save = diyStore.id ? editDiyPage : addDiyPage
     save(data).then((res: any) => {
         loading.value = false
-        if (res.code == 200) {
+        if (res.code == 1) {
             if (diyStore.id) {
                 loading.value = false // 不刷新
             } else {
-                router.push('/diy/list');
+                router.push(backPath);
             }
         }
     }).catch(err => {
@@ -331,6 +361,25 @@ const save = () => {
 .el-collapse-item__header {
     font-size: var(--el-font-size-base);
 }
+.display-block{
+    .el-form-item__content{
+        display: block;
+    }
+}
+
+.edit-component-wrap{
+    .content-wrap,.style-wrap{
+        .edit-attr-item-wrap{
+            border-top:4px solid var(--el-color-info-light-8);
+            padding-top: 20px;
+            &:first-of-type{
+                border-top: none;
+                padding-top: 0;
+            }
+        }
+    }
+}
+
 </style>
 <style lang="scss" scoped>
 .full-container {
@@ -371,4 +420,5 @@ const save = () => {
 
 .edit-attribute-wrap .box-card {
     border: none;
-}</style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/admin/src/views/diy/index.vue b/admin/src/views/diy/index.vue
index 924a84928..c48f2bace 100644
--- a/admin/src/views/diy/index.vue
+++ b/admin/src/views/diy/index.vue
@@ -2,7 +2,7 @@
 	<div class="main-container">
 
 		<div class="flex h-[700px] bg-body p-[20px]">
-			<iframe class="w-[375px] shadow" :src="wapDomain" frameborder="0"></iframe>
+			<iframe class="w-[375px] border border-slate-100" :src="wapDomain" frameborder="0"></iframe>
 			<div class="w-[500px] ml-[40px]">
 				<el-button type="primary" @click="toDecorate()">{{ t('decorate') }}</el-button>
 
@@ -77,7 +77,7 @@
      * 获取微信配置
      */
     getWeappConfig().then((res: any) => {
-        if (res.code == 200) {
+        if (res.code == 1) {
             let data = res.data;
             weappConfig.qr_code = data.qr_code;
         }
@@ -89,8 +89,7 @@
     });
 
     const toDecorate = () => {
-        router.push('/decorate/edit?name=DIY_INDEX')
-        // window.open(url.href);
+        router.push('/decorate/edit?name=DIY_INDEX&back=/diy/index')
     }
 
     /**
diff --git a/admin/src/views/diy/list.vue b/admin/src/views/diy/list.vue
index cdbcfd19d..d7765a6da 100644
--- a/admin/src/views/diy/list.vue
+++ b/admin/src/views/diy/list.vue
@@ -1,43 +1,41 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex">
-                <el-button type="primary" @click="dialogVisible = true">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="dialogVisible = true">
                     {{ t('addDiyPage') }}
                 </el-button>
             </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="diyPageTableData.searchParam" ref="searchFormDiyPageRef"
-                    v-if="tabValue == 'diy'">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="diyPageTableData.searchParam" ref="searchFormDiyPageRef" v-if="tabValue == 'diy'">
                     <el-form-item :label="t('title')" prop="title">
                         <el-input v-model="diyPageTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
                     </el-form-item>
                     <el-form-item :label="t('typeName')" prop="type">
-                        <el-select v-model="diyPageTableData.searchParam.type" :placeholder="t('pageTypePlaceholder')">
+                        <el-select v-model="diyPageTableData.searchParam.type" :placeholder="t('pageTemplatePlaceholder')">
                             <el-option :label="t('all')" value="" />
-                            <el-option v-for="(item, key) in pageType" :label="item.title" :value="key" />
+                            <el-option v-for="(item, key) in pageTemplate" :label="item.title" :value="key" />
                         </el-select>
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadDiyPageList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormDiyPageRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyPageRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
-                <el-form :inline="true" :model="diyRouteTableData.searchParam" ref="searchFormDiyRouteRef"
-                    v-if="tabValue == 'route'">
+                <el-form :inline="true" :model="diyRouteTableData.searchParam" ref="searchFormDiyRouteRef" v-if="tabValue == 'route'">
                     <el-form-item :label="t('title')" prop="title">
                         <el-input v-model="diyRouteTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadDiyRouteList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormDiyRouteRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyRouteRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
-
+            <div>
                 <el-tabs v-model="tabValue" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane :label="t('diyPage')" name="diy">
 
@@ -63,22 +61,16 @@
                             <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
                                 <template #default="{ row }">
                                     <el-button type="primary" link @click="promoteEvent(row)">{{ t('promote') }}</el-button>
-                                    <el-button v-if="row.type != 'DIY_PAGE' && row.is_default == 0" type="primary" link
-                                        @click="setUse(row)">{{ t('use') }}</el-button>
-                                    <el-button v-if="row.type == 'DIY_PAGE'" type="primary" link @click="openShare(row)">{{
-                                        t('shareSet') }}</el-button>
+                                    <el-button v-if="row.type != 'DIY_PAGE' && row.is_default == 0" type="primary" link @click="setUse(row)">{{ t('use') }}</el-button>
+                                    <el-button v-if="row.type == 'DIY_PAGE'" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
                                     <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                                    <el-button v-if="row.type == 'DIY_PAGE' || row.is_default == 0" type="danger" link
-                                        @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                                    <el-button v-if="row.type == 'DIY_PAGE' || row.is_default == 0" type="danger" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
                                 </template>
                             </el-table-column>
 
                         </el-table>
                         <div class="mt-[16px] flex justify-end">
-                            <el-pagination v-model:current-page="diyPageTableData.page"
-                                v-model:page-size="diyPageTableData.limit" layout="total, sizes, prev, pager, next, jumper"
-                                :total="diyPageTableData.total" @size-change="loadDiyPageList()"
-                                @current-change="loadDiyPageList" />
+                            <el-pagination v-model:current-page="diyPageTableData.page" v-model:page-size="diyPageTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="diyPageTableData.total" @size-change="loadDiyPageList()" @current-change="loadDiyPageList" />
                         </div>
                     </el-tab-pane>
                     <!-- 基础页面路径 -->
@@ -87,12 +79,11 @@
                             <template #empty>
                                 <span>{{ !diyRouteTableData.loading ? t('emptyData') : '' }}</span>
                             </template>
-                            <el-table-column prop="title" :label="t('title')" min-width="120" />
-                            <el-table-column prop="page" :label="t('wapUrl')" min-width="120">
+                            <el-table-column prop="title" :label="t('title')" min-width="70" />
+                            <el-table-column prop="page" :label="t('wapUrl')" min-width="170">
                                 <template #default="{ row }">
                                     <span class="mr-[10px]">{{ wapDomain + row.page }}</span>
-                                    <el-button type="primary" link @click="copyEvent(wapDomain + row.page)">{{ t('copy')
-                                    }}</el-button>
+                                    <el-button type="primary" link @click="copyEvent(wapDomain + row.page)">{{ t('copy') }}</el-button>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="page" :label="t('weappUrl')" min-width="120">
@@ -103,8 +94,7 @@
                             </el-table-column>
                             <el-table-column :label="t('share')" fixed="right" min-width="80">
                                 <template #default="{ row }">
-                                    <el-button v-if="row.is_share == 1" type="primary" link @click="openShare(row)">{{
-                                        t('shareSet') }}</el-button>
+                                    <el-button v-if="row.is_share == 1" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -117,17 +107,22 @@
         </el-card>
 
         <!--添加页面-->
-        <el-dialog v-model="dialogVisible" :title="t('addPageTips')" width="20%">
+        <el-dialog v-model="dialogVisible" :title="t('addPageTips')" width="25%">
 
             <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules">
-                <el-form-item :label="t('typeName')" prop="type">
-                    <el-select v-model="formData.type" :placeholder="t('pageTypePlaceholder')">
-                        <el-option v-for="(item, key) in pageType" :label="item.title" :value="key" />
+                <el-form-item :label="t('title')" prop="title">
+                    <el-input v-model="formData.title" :placeholder="t('titlePlaceholder')" clearable maxlength="12" show-word-limit class="w-full" />
+                </el-form-item>
+                <el-form-item :label="t('typeName')" prop="template">
+                    <el-select v-model="formData.template" :placeholder="t('pageTemplatePlaceholder')" class="w-full">
+                        <el-option v-for="(item, key) in pageTemplate" :label="item.title" :value="key" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('title')" prop="title">
-                    <el-input v-model="formData.title" :placeholder="t('titlePlaceholder')" clearable maxlength="12"
-                        show-word-limit />
+                <el-form-item :label="t('templateName')" prop="template_name" v-show="pageTemplateData">
+                    <el-radio-group v-model="formData.template_name">
+                        <el-radio label="">{{ t('empty') }}</el-radio>
+                        <el-radio v-for="(item,key) in pageTemplateData" :label="key">{{item.title}}</el-radio>
+                    </el-radio-group>
                 </el-form-item>
             </el-form>
 
@@ -151,12 +146,10 @@
                     <span>{{ sharePage }}</span>
                 </el-form-item>
                 <el-form-item :label="t('shareTitle')" prop="title">
-                    <el-input v-model="shareFormData[tabShareType].title" :placeholder="t('shareTitlePlaceholder')"
-                        clearable maxlength="30" show-word-limit />
+                    <el-input v-model="shareFormData[tabShareType].title" :placeholder="t('shareTitlePlaceholder')" clearable maxlength="30" show-word-limit />
                 </el-form-item>
                 <el-form-item :label="t('shareDesc')" prop="desc" v-if="tabShareType == 'wechat'">
-                    <el-input v-model="shareFormData[tabShareType].desc" :placeholder="t('shareDescPlaceholder')"
-                        type="textarea" rows="4" clearable maxlength="100" show-word-limit />
+                    <el-input v-model="shareFormData[tabShareType].desc" :placeholder="t('shareDescPlaceholder')" type="textarea" rows="4" clearable maxlength="100" show-word-limit />
                 </el-form-item>
                 <el-form-item :label="t('shareImageUrl')" prop="url">
                     <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
@@ -177,8 +170,7 @@
                 <el-form-item :label="t('shareLink')">
                     <el-input readonly :value="promoteWapDomain">
                         <template #append>
-                            <el-button @click="copyEvent(promoteWapDomain)" class="bg-primary copy">{{ t('copy')
-                            }}</el-button>
+                            <el-button @click="copyEvent(promoteWapDomain)" class="bg-primary copy">{{ t('copy') }}</el-button>
                         </template>
                     </el-input>
                 </el-form-item>
@@ -200,28 +192,31 @@
 <script lang="ts" setup>
 import { reactive, ref, watch, computed } from 'vue'
 import { t } from '@/lang'
-import { getDiyPageList, deleteDiyPage, setUseDiyPage, getDiyPageType, getDiyRouteList, getDiyRouteInfo, editDiyPageShare, editDiyRouteShare } from '@/api/diy'
+import { getDiyPageList, deleteDiyPage, setUseDiyPage, getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyPageShare, editDiyRouteShare } from '@/api/diy'
 import { TabsPaneContext, ElMessage, ElMessageBox, FormInstance } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { useClipboard } from '@vueuse/core'
 import QRCode from "qrcode";
 import { getUrl } from '@/api/sys'
 
-const pageType: any = reactive({})
+const pageTemplate: any = reactive({})
 
 const router = useRouter()
+const route = useRoute()
+const pageName = route.meta.title;
 
 // 添加自定义页面
 const formData = reactive({
-    type: '',
-    title: ''
+    title: '',
+    template: '',
+    template_name:''
 })
 
 // 表单验证规则
 const formRules = computed(() => {
     return {
-        type: [
-            { required: true, message: t('pageTypePlaceholder'), trigger: 'blur' },
+        template: [
+            { required: true, message: t('pageTemplatePlaceholder'), trigger: 'blur' },
         ],
         title: [
             { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
@@ -229,6 +224,17 @@ const formRules = computed(() => {
     }
 })
 
+const pageTemplateData = computed(()=>{
+    let data:any = '';
+    formData.template_name = '';
+    if(formData.template){
+        data = pageTemplate[formData.template].template;
+        // 默认选中第一个
+        // if(Object.keys(data).length) formData.template_name =Object.keys(data)[0];
+    }
+    return data;
+})
+
 const formRef = ref<FormInstance>()
 const dialogVisible = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
@@ -237,7 +243,7 @@ const addEvent = async (formEl: FormInstance | undefined) => {
     await formEl.validate(async (valid) => {
         if (valid) {
             dialogVisible.value = false;
-            router.push('/decorate/edit?type=' + formData.type + '&title=' + formData.title);
+            router.push(`/decorate/edit?template=${formData.template}&template_name=${formData.template_name}&title=${formData.title}`);
         }
     })
 }
@@ -247,6 +253,7 @@ let diyRouteTableData = reactive({
     data: [],
     searchParam: {
         "title": "",
+        "type":""
     }
 })
 
@@ -273,10 +280,10 @@ const loadDiyRouteList = () => {
 }
 loadDiyRouteList()
 
-// 获取自定义页面类型
-getDiyPageType({}).then(res => {
+// 获取自定义页面模板
+getDiyTemplate({}).then(res => {
     for (let key in res.data) {
-        pageType[key] = res.data[key]
+        pageTemplate[key] = res.data[key]
     }
 })
 
@@ -288,7 +295,7 @@ let diyPageTableData: any = reactive({
     data: [],
     searchParam: {
         "title": "",
-        "type": '',
+        "template": '',
     }
 })
 
@@ -404,21 +411,7 @@ const shareFormData = reactive({
 })
 const shareDialogVisible = ref(false)
 const shareFormRules = computed(() => {
-    return {
-        // title: [
-        //     { required: true, message: t('shareTitlePlaceholder'), trigger: 'blur' },
-        //     // {
-        //     //     validator: (rule: any, value: string, callback: any) => {
-        //     //         console.log('validator',value,tabShareType)
-        //     //         // let content = value.replace(/<[^<>]+>/g, "").replace(/&nbsp;/gi, "")
-        //     //         // if(!content && value.indexOf('img') === -1){
-        //     //         //     callback(new Error(t('shareTitlePlaceholder')))
-        //     //         // }else callback()
-        //     //     },
-        //     //     trigger: ['blur', 'change']
-        //     // }
-        // ],
-    }
+    return {}
 })
 
 const shareFormRef = ref<FormInstance>()
@@ -496,6 +489,15 @@ const promoteEvent = (data: any) => {
     promoteDialogVisible.value = true;
     console.log('promoteEvent', data)
 }
+
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadDiyPageList();
+}
+
+
 </script>
 
 <style lang="scss">
diff --git a/admin/src/views/diy/tabbar.vue b/admin/src/views/diy/tabbar.vue
index 0f2956c5a..1fa6f402b 100644
--- a/admin/src/views/diy/tabbar.vue
+++ b/admin/src/views/diy/tabbar.vue
@@ -2,8 +2,8 @@
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never" v-loading="loading">
             <div class="flex">
-                <div class="w-[360px] h-[615px] relative mr-[30px] border-2 border-gray-300">
-                    <div class="flex items-center justify-between absolute h-[60px] left-[0px] right-[0px] bottom-[0px] bg-white border-[2px] border-primary"
+                <div class="w-[360px] h-[615px] relative mr-[30px] border-[1px] border-gray-300">
+                    <div class="flex items-center justify-between absolute h-[60px] left-[0px] right-[0px] bottom-[0px] bg-white border-[1px] border-primary"
                         :style="{ 'backgroundColor': diyBottomData.backgroundColor }">
                         <div class="flex flex-1 flex-col items-center justify-center"
                             v-for="(item, index) in diyBottomData.list" :key="'b' + index">
diff --git a/admin/src/views/error/404.vue b/admin/src/views/error/404.vue
index a4a5564b4..13e2b8739 100644
--- a/admin/src/views/error/404.vue
+++ b/admin/src/views/error/404.vue
@@ -1,15 +1,22 @@
 <template>
     <div class="error">
-        <div>
+        <div class="flex items-center">
             <slot name="content">
-                <div class="error-code">404</div>
+				<div>
+					<img class="w-[300px]" src="@/assets/images/error.png"/>
+				</div>
             </slot>
-            <div class="text-lg text-tx-secondary mt-7 mb-7">页面不存在</div>
-            <div>
-                <el-button type="primary" @click="router.go(-1)">
-                    {{ second }} 秒后返回上一页
-                </el-button>
-            </div>
+			<div class="text-left ml-[100px]">
+				<div class="error-text text-[28px] font-bold">404错误！</div>
+				<div class="text-[#222] text-[20px] mt-[15px]">哎呀，出错了！您访问的页面不存在...</div>
+				<div class="text-[#c4c2c2] text-[12px] mt-[5px]">尝试检查URL的错误，然后点击浏览器刷新按钮。</div>
+				<div class="mt-[40px]">
+				    <el-button class="bottom" @click="router.go(-1)">
+				        {{ second }} 秒后返回上一页
+				    </el-button>
+				</div>
+			</div>
+            
         </div>
     </div>
 </template>
@@ -48,9 +55,13 @@ onUnmounted(() => {
         @apply text-primary;
         font-size: 150px;
     }
-
+	.error-text {
+		color:#0e77fd;
+	}
     .el-button {
         width: 176px;
+		background-color: #0e77fd;
+		color:#fff
     }
 }
 </style>
diff --git a/admin/src/views/finance/cash_out.vue b/admin/src/views/finance/cash_out.vue
index b518a398b..fe60f48b7 100644
--- a/admin/src/views/finance/cash_out.vue
+++ b/admin/src/views/finance/cash_out.vue
@@ -1,28 +1,82 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none base-bg !px-[35px]" shadow="never">
+			    <el-row class="flex">
+                    <el-col :span="12">
+						<div class="statistic-card">
+                            <el-statistic :value="statistics.transfered ? Number.parseFloat(statistics.transfered).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalTransfered') }}</span>
+                                </div>
+                            </div>
+                        </div>
+					</el-col>
+					<el-col :span="12">
+						<div class="statistic-card">
+                            <el-statistic :value="statistics.cash_outing ? Number.parseFloat(statistics.cash_outing).toFixed(2) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalCashOuting') }}</span>
+                                </div>
+                            </div>
+                        </div>
+					</el-col>
+			    </el-row>
+			</el-card>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="orderTableData.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('applyTime')" prop="create_time">
+                        <el-date-picker v-model="orderTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+					<el-form-item :label="t('cashOutNumber')" prop="cash_out_no">
+					    <el-input v-model="orderTableData.searchParam.cash_out_no" class="w-[240px]"
+					        :placeholder="t('cashOutNumberPlaceholder')" />
+					</el-form-item>
+					
+					<el-form-item :label="t('memberInfo')" prop="keyword">
+					    <el-input v-model="orderTableData.searchParam.keyword" class="w-[240px]"
+					        :placeholder="t('memberInfoPlaceholder')" />
+					</el-form-item>
+					
+					<el-form-item :label="t('cashOutMethod')" prop="transfer_type">
+					    <el-select v-model="orderTableData.searchParam.transfer_type" clearable class="input-width">
+					        <el-option :label="t('selectPlaceholder')" value="" />
+					        <el-option :label="item.name" :value="key" v-for="(item, key) in Transfertype" />
+					    </el-select>
+					</el-form-item>
+					
 					<el-form-item :label="t('cashOutStatus')" prop="order_from">
 					    <el-select v-model="orderTableData.searchParam.status" clearable class="input-width">
 					        <el-option :label="t('selectPlaceholder')" value="" />
 					        <el-option :label="item" :value="key" v-for="(item, key) in cashOutStatusList" />
 					    </el-select>
 					</el-form-item>
-                    <el-form-item :label="t('createTime')" prop="create_time">
-                        <el-date-picker v-model="orderTableData.searchParam.create_time" type="datetimerange"
-                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
-                            :end-placeholder="t('endDate')" />
-                    </el-form-item>
+					<el-form-item :label="t('auditTime')" prop="audit_time">
+					    <el-date-picker v-model="orderTableData.searchParam.audit_time" type="datetimerange"
+					        value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+					        :end-placeholder="t('endDate')" />
+					</el-form-item>
+					<el-form-item :label="t('transferTime')" prop="transfer_time">
+					    <el-date-picker v-model="orderTableData.searchParam.transfer_time" type="datetimerange"
+					        value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+					        :end-placeholder="t('endDate')" />
+					</el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="orderTableData.data" size="large" v-loading="orderTableData.loading">
                     <template #empty>
                         <span>{{ !orderTableData.loading ? t('emptyData') : '' }}</span>
@@ -30,18 +84,16 @@
 
                     <el-table-column prop="order_no" :show-overflow-tooltip="true" :label="t('memberInfo')" align="center" min-width="140">
                         <template #default="{ row }">
-                            <div class="flex items-center cursor-pointer " @click="toMember(row.member_id)">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.headimg)" alt="" >
+                            <div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="" >
                                 <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
                                 <div class="flex flex flex-col">
-                                    <span class="text-blue-700">{{ row.nickname || '' }}</span>
-                                    <span class="text-blue-700">{{ row.mobile || '' }}</span>
+                                    <span class="">{{ row.member.nickname || '' }}</span>
+                                    <span class="">{{ row.member.mobile || '' }}</span>
                                 </div>
                             </div>
                         </template>
                     </el-table-column>
-
-                    <el-table-column prop="account_type_name" :label="t('cashOutAccountType')" align="center" min-width="140" />
                     <el-table-column :label="t('cashOutMethod')" align="center" min-width="140" >
                         <template #default="{ row }">
                             {{ Transfertype[row.transfer_type].name }}
@@ -49,15 +101,10 @@
                     </el-table-column>
 
                     <el-table-column  prop="apply_money" :label="t('applicationForWithdrawalAmount')" min-width="140" align="center" />
-<!-- 
+
+                    <el-table-column prop="money" :label="t('actualTransferAmount')" min-width="200" align="center"/>
+					
                     <el-table-column prop="service_money" :label="t('cashOutCommission')" align="center" min-width="140" />
- -->
-                    <el-table-column prop="money" :label="t('cashOutMoney')" min-width="200" align="center">
-						<template #default="{ row }">
-							<div>{{ t('actualTransferAmount') }} ：{{ row.money }}</div>
-						    <div>{{ t('cashOutCommission') }} ：{{ row.service_money }}</div>
-						</template>
-					</el-table-column>
 
                     <el-table-column prop="status_name" :label="t('cashOutStatus')" align="center" min-width="100" />
 
@@ -66,6 +113,18 @@
                             {{ row.create_time || '' }}
                         </template>
                     </el-table-column>
+					
+					<el-table-column :label="t('auditTime')" min-width="180" align="center">
+					    <template #default="{ row }">
+					        {{ row.audit_time || '' }}
+					    </template>
+					</el-table-column>
+					
+					<el-table-column :label="t('transferTime')" min-width="180" align="center">
+					    <template #default="{ row }">
+					        {{ row.transfer_time || '' }}
+					    </template>
+					</el-table-column>
 
                     <el-table-column :label="t('operation')" fixed="right" width="230">
                         <template #default="{ row }">
@@ -150,20 +209,21 @@
 <script lang="ts" setup>
 import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
-import { getWithdrawList, getTransfertype, memberTransfer, memberAudit, getWithdrawDetail, getWithdrawStatusList } from '@/api/member'
+import { getCashOutList, getTransfertype, memberTransfer, memberAudit, getCashOutDetail, getCashOutStatusList,getCashOutStat } from '@/api/member'
 import { img } from '@/utils/common'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, FormInstance } from 'element-plus'
 import { data } from 'dom7'
 import { useRouter, useRoute } from 'vue-router'
 
 const cashOutStatusList = ref([])
 const checkStatusList = async () => {
-    cashOutStatusList.value = await (await getWithdrawStatusList({})).data
+    cashOutStatusList.value = await (await getCashOutStatusList({})).data
 }
 checkStatusList()
 
 const route = useRoute()
 const router = useRouter()
+const pageName = route.meta.title;
 const member_id: number = parseInt(route.query.id || 0)
 const operationBtn = ref({
     "1": {
@@ -199,10 +259,24 @@ const orderTableData = reactive({
         order_no: '',
         member_id,
         create_time: [],
-        status: ''
+        status: '',
+		cash_out_no: '',
+		keyword: '',
+		audit_time: '',
+		transfer_time: '',
+		transfer_type: ''
     }
 })
 
+const statistics = ref([])
+const checkStatInfo = () => {
+	getCashOutStat().then(res => {
+		statistics.value = res.data;
+	 })
+}
+checkStatInfo()
+
+
 // 获取会员转账方式
 const Transfertype = ref<Array<Object>>([])
 const getTransfertypeFn = async()=>{
@@ -210,6 +284,15 @@ const getTransfertypeFn = async()=>{
 }
 getTransfertypeFn()
 
+
+const searchFormRef = ref<FormInstance>()
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadOrderList();
+}
+
 /**
  * 获取提现列表
  */
@@ -217,7 +300,7 @@ const loadOrderList = (page: number = 1) => {
     orderTableData.loading = true
     orderTableData.page = page
 
-    getWithdrawList({
+    getCashOutList({
         page: orderTableData.page,
         limit: orderTableData.limit,
         ...orderTableData.searchParam
@@ -279,7 +362,7 @@ let cashOutShowDialog = ref(false);
 let cashOutInfo = ref({});
 let cashOutLoading = ref(true);
 const detailFn = (id)=>{
-    getWithdrawDetail(id).then(res => {
+    getCashOutDetail(id).then(res => {
         cashOutInfo.value = res.data;
         cashOutShowDialog.value = true;
         cashOutLoading.value = false;
diff --git a/admin/src/views/finance/recharge/detail.vue b/admin/src/views/finance/recharge/detail.vue
index 493cc71cd..8d92556ce 100644
--- a/admin/src/views/finance/recharge/detail.vue
+++ b/admin/src/views/finance/recharge/detail.vue
@@ -1,102 +1,100 @@
 <template>
     <div class="main-container">
         <el-form :model="formData" label-width="150px" ref="formRef" class="page-form" v-loading="loading">
-            <el-card class="box-card !border-none relative" shadow="never" >
+            <el-card class="box-card !border-none relative" shadow="never">
                 <h3 class="panel-title">{{ t('orderInfo') }}</h3>
 
-                <el-form-item :label="t('orderNo')" >
+                <el-form-item :label="t('orderNo')">
                     <div class="input-width">{{ formData.order_no }}</div>
                 </el-form-item>
- 
-                <el-form-item :label="t('orderMoney')" >
+
+                <el-form-item :label="t('orderMoney')">
                     <div class="input-width">{{ formData.order_money }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('orderDiscountMoney')" >
+                <el-form-item :label="t('orderDiscountMoney')">
                     <div class="input-width">{{ formData.order_discount_money }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('member')" >
+                <el-form-item :label="t('member')">
                     <div class="input-width">
                         <div class="flex flex flex-col cursor-pointer" @click="toMember(formData.member_id)">
-                            <span class="text-blue-700">{{ formData.member.nickname || '' }}</span>
-                            <span class="text-blue-700">{{ formData.member.mobile || '' }}</span>
+                            <span class="">{{ formData.member.nickname || '' }}</span>
+                            <span class="">{{ formData.member.mobile || '' }}</span>
                         </div>
                     </div>
                 </el-form-item>
-                
-                <el-form-item :label="t('ip')" >
+
+                <el-form-item :label="t('ip')">
                     <div class="input-width">{{ formData.ip }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('orderFromName')" >
+                <el-form-item :label="t('orderFromName')">
                     <div class="input-width">{{ formData.order_from_name }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('orderStatus')" >
+                <el-form-item :label="t('orderStatus')">
                     <div class="input-width">{{ formData.order_status_info.name }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('payTypeName')" >
+                <el-form-item :label="t('payTypeName')">
                     <div class="input-width">{{ formData.pay_type_name }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('createTime')" >
+                <el-form-item :label="t('createTime')">
                     <div class="input-width">{{ formData.create_time || '' }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('payTime')" >
+                <el-form-item :label="t('payTime')">
                     <div class="input-width">{{ formData.pay_time || '' }}</div>
                 </el-form-item>
 
-                <el-form-item :label="t('remark')" >
+                <el-form-item :label="t('remark')">
                     <div class="input-width">{{ formData.remark || '' }}</div>
                 </el-form-item>
-                
-                <el-form-item :label="t('memberMessage')" >
+
+                <el-form-item :label="t('memberMessage')">
                     <div class="input-width">{{ formData.member_message || '' }}</div>
                 </el-form-item>
 
-
             </el-card>
 
-             
         </el-form>
-         <div class="fixed-footer-wrap">
-            <div class="fixed-footer">
-                <el-button type="primary" @click="onSave(formRef)">{{ t('confirm') }}</el-button>
-                <el-button @click="back()">{{ t('cancel') }}</el-button>
-            </div>
-        </div>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, watch } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { img } from '@/utils/common'
-import { getRechargeOrderInfo } from '@/api/order';
-import { useRoute,useRouter } from 'vue-router'
-import { cloneDeep } from 'lodash';
+import { getRechargeOrderInfo } from '@/api/order'
+import { useRoute, useRouter } from 'vue-router'
 import useTabbarStore from '@/stores/modules/tabbar'
+import useAppStore from '@/stores/modules/app'
 
 const tabbarStore = useTabbarStore()
 const route = useRoute()
 const router = useRouter()
-const order_id:number = parseInt(route.query.order_id);
+const orderId: number = parseInt(route.query.order_id)
 const loading = ref(true)
 
+// 页面返回按钮
+const appStore = useAppStore()
+appStore.pageReturn = true
+watch(route, (newX, oldX) => {
+    appStore.pageReturn = false
+})
+
 /**
  * 表单数据
  */
 const initialFormData = {
-    order_id:0,
+    order_id: 0,
     site_id: '',
     order_no: 0,
-    order_from:0,
-    order_type:'',
-    out_trade_no:'',
+    order_from: 0,
+    order_type: '',
+    out_trade_no: '',
     order_status: '',
     pay_status: '',
     refund_status: '',
@@ -104,52 +102,52 @@ const initialFormData = {
     member_id: '',
     ip: '',
     member_message: '',
-    order_item_money:'',
-    order_discount_money:'',
-    order_money:'',
+    order_item_money: '',
+    order_discount_money: '',
+    order_money: '',
     create_time: '',
-    pay_time:'',
+    pay_time: '',
     close_time: '',
-    is_lock:'',
-    remark:'',
-    invoice_id:'',
-    close_reason:'',
-    item:'',
-    member:'',
-    order_status_info:'',
-    order_from_name:''
+    is_lock: '',
+    remark: '',
+    invoice_id: '',
+    close_reason: '',
+    item: '',
+    member: '',
+    order_status_info: '',
+    order_from_name: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
-const setFormData = async (order_id:number = 0) => {
-    loading.value = true;
+const setFormData = async (orderId: number = 0) => {
+    loading.value = true
     Object.assign(formData, initialFormData)
-    const data = await (await getRechargeOrderInfo(order_id)).data
+    const data = await (await getRechargeOrderInfo(orderId)).data
     Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key]
     })
-    loading.value = false;
+    loading.value = false
 }
-if(order_id) setFormData(order_id);
-else loading.value = false;
+if (orderId) setFormData(orderId)
+else loading.value = false
 
 const formRef = ref<FormInstance>()
- 
+
 const onSave = async (formEl: FormInstance | undefined) => {
     back()
 }
 
 const back = () => {
     tabbarStore.removeTab(route.path)
-    router.push({ path: '/order/recharge' })
+    router.push({ path: '/finance/recharge' })
 }
 /**
  * 会员详情
  */
- const toMember = (member_id:number) => {
-    router.push(`/member/detail?id=${member_id}`)
+const toMember = (memberId: number) => {
+    router.push(`/member/detail?id=${memberId}`)
 }
 
 </script>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/admin/src/views/finance/recharge/list.vue b/admin/src/views/finance/recharge/list.vue
index 49b00fb02..0c64edc21 100644
--- a/admin/src/views/finance/recharge/list.vue
+++ b/admin/src/views/finance/recharge/list.vue
@@ -1,12 +1,35 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
 
-            <el-card class="box-card !border-none mb-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none table-search-wra base-bg !px-[35px]" shadow="never">
+			    <el-row class="flex">
+			        <el-col :span="12" class="min-w-[100px]">
+			            <el-statistic :value="rechargeStatistics.recharge_money ? Number.parseFloat(rechargeStatistics.recharge_money).toFixed(2) : '0.00'">
+			                <template #title>
+			                    <div class="text-[14px] mb-[9px]">{{ t('totalRechargeMoney') }}</div>
+			                </template>
+			            </el-statistic>
+			        </el-col>
+					<el-col :span="12" class="min-w-[100px]">
+			            <el-statistic :value="rechargeStatistics.recharge_refund_money ? Number.parseFloat(rechargeStatistics.recharge_refund_money).toFixed(2) : '0.00'">
+			                <template #title>
+			                    <div class="text-[14px] mb-[9px]">{{ t('totalRechargeRefundMoney') }}</div>
+			                </template> 
+			            </el-statistic>
+			        </el-col>
+			      
+			    </el-row>
+			</el-card>
+
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="orderTableData.searchParam" ref="searchFormRef">
-                    <!-- <el-form-item :label="t('orderNo')" prop="order_no">
-                        <el-input v-model="orderTableData.searchParam.order_no" :placeholder="t('orderNoPlaceholder')" />
-                    </el-form-item> -->
+                    <el-form-item :label="t('rechargeNo')" prop="order_no">
+                        <el-input v-model="orderTableData.searchParam.order_no" :placeholder="t('rechargeNoPlaceholder')" />
+                    </el-form-item>
 
                     <el-form-item :label="t('orderFromName')" prop="order_from">
                         <el-select v-model="orderTableData.searchParam.order_from" clearable class="input-width">
@@ -21,11 +44,33 @@
                             <el-option :label="item['name']" :value="item['status']" v-for="item in statusList" />
                         </el-select>
                     </el-form-item>
+
                     <el-form-item :label="t('createTime')" prop="create_time">
                         <el-date-picker v-model="orderTableData.searchParam.create_time" type="datetimerange"
                             value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
                             :end-placeholder="t('endDate')" />
                     </el-form-item>
+
+                    <el-form-item :label="t('rechargeMoney')">
+                        <div class="region-input">
+                            <el-form-item prop="start_money">
+                                <input type="text" :placeholder="t('startMoney')"
+                                    v-model="orderTableData.searchParam.start_money">
+                            </el-form-item>
+                            <span class="separator">-</span>
+                            <el-form-item prop="end_money">
+                                <input type="text" :placeholder="t('endMoney')"
+                                    v-model="orderTableData.searchParam.end_money">
+                            </el-form-item>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item :label="t('payTime')">
+                        <el-date-picker v-model="orderTableData.searchParam.pay_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+
                     <el-form-item>
                         <el-button type="primary" @click="loadOrderList()">{{ t('search') }}</el-button>
                         <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
@@ -39,20 +84,26 @@
                         <span>{{ !orderTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
 
-                    <el-table-column prop="order_no" :show-overflow-tooltip="true" :label="t('orderNo')" align="center"
-                        min-width="140" />
-
-                    <el-table-column prop="order_money" :label="t('orderMoney')" align="center" min-width="140" />
-
-                    <el-table-column :label="t('member')" min-width="120" align="center">
+                    <el-table-column :show-overflow-tooltip="true" :label="t('member')" align="left" min-width="140">
                         <template #default="{ row }">
-                            <div class="flex flex flex-col cursor-pointer" @click="toMember(row.member_id)">
-                                <span class="text-blue-700">{{ row.member.nickname || '' }}</span>
-                                <span class="text-blue-700">{{ row.member.mobile || '' }}</span>
+                            <div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.member.headimg)"
+                                    alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png"
+                                    alt="">
+                                <div class="flex flex flex-col">
+                                    <span class="">{{ row.member.nickname || '' }}</span>
+                                    <span class="">{{ row.member.mobile || '' }}</span>
+                                </div>
                             </div>
                         </template>
                     </el-table-column>
 
+                    <el-table-column prop="order_no" :show-overflow-tooltip="true" :label="t('rechargeNo')" align="center"
+                        min-width="140" />
+
+                    <el-table-column prop="order_money" :label="t('rechargeMoney')" align="center" min-width="140" />
+
                     <el-table-column prop="order_from_name" :label="t('orderFromName')" align="center" min-width="140" />
 
                     <el-table-column :label="t('orderStatus')" min-width="120" align="center">
@@ -69,14 +120,22 @@
                         </template>
                     </el-table-column>
 
+                    <el-table-column :label="t('payTime')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.pay_time || '' }}
+                        </template>
+                    </el-table-column>
                     <el-table-column :label="t('operation')" fixed="right" width="130">
                         <template #default="{ row }">
                             <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
 
-                            <el-button v-if="[1, 10].includes(row.order_status_info.status)" type="primary" link @click="refundBtnFn(row)">{{ t('refundBtn') }}</el-button>
+                            <el-button
+                                v-if="[1, 10].includes(row.order_status_info.status) && row.is_enable_refund && row.refund_status == 0"
+                                type="primary" link @click="refundFn(row)">{{ t('refundBtn') }}</el-button>
 
                             <template v-for="(item, index) in row.order_status_info.action">
-                                <el-button type="danger" link @click="orderEvent(row, item.class)">{{ item.name }}</el-button>
+                                <el-button type="danger" link @click="orderEvent(row, item.class)">{{ item.name
+                                }}</el-button>
                             </template>
                         </template>
                     </el-table-column>
@@ -92,11 +151,11 @@
 
         <!-- 是否退款 -->
         <el-dialog v-model="refundShowDialog" :title="t('refundBtn')" width="500px" :destroy-on-close="true">
-            <p>{{t('refundContent')}}</p>
+            <p>{{ t('refundContent') }}</p>
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="refundShowDialog = false">{{ t('cancel') }}</el-button>
-                    <el-button type="primary" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                    <el-button type="primary" @click="confirmRefund" :loading="refundLoading">{{ t('confirm') }}</el-button>
                 </span>
             </template>
         </el-dialog>
@@ -106,13 +165,15 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getRechargeOrderStatusList, getRechargeOrderList, rechargeRefund } from '@/api/order'
+import { getRechargeOrderStatusList, getRechargeOrderList, rechargeRefund, getRechargeStat } from '@/api/order'
 import { getChannelType } from '@/api/sys'
 import { useRouter, useRoute } from 'vue-router'
+import { AnyObject } from '@/types/global'
 
 const route = useRoute()
 const router = useRouter()
-const member_id: number = parseInt(route.query.id || 0)
+const pageName = route.meta.title;
+const memberId: number = parseInt(route.query.id || 0)
 
 const channelList = ref([])
 const setChannelList = async () => {
@@ -129,11 +190,25 @@ const orderTableData = reactive({
     searchParam: {
         order_no: '',
         order_status: '',
-        member_id,
+        member_id: memberId,
         create_time: [],
-        order_from: ''
+        pay_time:[],
+        order_from: '',
+        start_money: '',
+        end_money: ''
     }
 })
+
+const rechargeStatistics = ref([])
+const checkRechargeInfo = () => {
+    getRechargeStat({
+        member_id: memberId
+    }).then(res => {
+        rechargeStatistics.value = res.data
+    })
+}
+checkRechargeInfo()
+
 const statusList = ref([])
 
 const searchFormRef = ref<FormInstance>()
@@ -178,38 +253,39 @@ const infoEvent = (data: any) => {
 const orderEvent = (data: any, type: string) => {
 
 }
+
 /**
  * 退款操作
  */
-let refundShowDialog = ref(false);
-const refundFn = (data) => {
-    console.log("退款操作",data);
-    refundShowDialog.value = true;
-    rechargeRefund(data.order_id).then(res => {
-        refundShowDialog.value = false;
+const refundShowDialog = ref(false)
+let refundData: AnyObject | null = null
+const refundLoading = ref(false)
+
+const refundFn = (data: AnyObject) => {
+    refundShowDialog.value = true
+    refundData = data
+}
+
+/**
+ * 确认退款
+ */
+const confirmRefund = () => {
+    if (refundLoading.value) return
+    refundLoading.value = true
+
+    rechargeRefund(refundData?.order_id).then(res => {
+        refundShowDialog.value = false
+        refundLoading.value = false
     }).catch(() => {
-
+        refundLoading.value = false
     })
-
-
-    // getRechargeOrderList({
-    //     page: orderTableData.page,
-    //     limit: orderTableData.limit,
-    //     ...orderTableData.searchParam
-    // }).then(res => {
-    //     orderTableData.loading = false
-    //     orderTableData.data = res.data.data
-    //     orderTableData.total = res.data.total
-    // }).catch(() => {
-    //     orderTableData.loading = false
-    // })
 }
 
 /**
  * 会员详情
  */
-const toMember = (member_id: number) => {
-    router.push(`/member/detail?id=${member_id}`)
+const toMember = (memberId: number) => {
+    router.push(`/member/detail?id=${memberId}`)
 }
 
 </script>
diff --git a/admin/src/views/index/index.vue b/admin/src/views/index/index.vue
index 8fe896404..3dadafc70 100644
--- a/admin/src/views/index/index.vue
+++ b/admin/src/views/index/index.vue
@@ -4,29 +4,29 @@
             <el-card class="box-card !border-none" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('dataSummarize')}}</span>
+                        <span class="text-[15px]">{{t('dataSummarize')}}</span>
                     </div>
                 </template>
 				
                 <el-row :gutter="20">
                     <el-col :span="6" >
-                        <el-statistic :value="statInfo.today_data.total_site_count">
+                        <el-statistic :value="statInfo.today_data.norma_site_count">
                             <template #title>
-                                <div class="text-[14px] mb-[9px]">{{t('siteSum')}}</div>
+                                <div class="text-[14px] mb-[9px]">{{t('normalSiteSum')}}</div>
                             </template>
                         </el-statistic>
                     </el-col>
                     <el-col :span="6">
-                        <el-statistic :value="statInfo.today_data.total_member_count">
+                        <el-statistic :value="statInfo.today_data.expire_site_count">
                             <template #title>
-                                <div class="text-[14px] mb-[9px]">{{t('memberSum')}}</div>
+                                <div class="text-[14px] mb-[9px]">{{t('expireSiteSum')}}</div>
                             </template>
                         </el-statistic>
                     </el-col>
 					<el-col :span="6" >
-					    <el-statistic :value="statInfo.app.app_count">
+					    <el-statistic :value="statInfo.app.app_no_installed_count">
 					        <template #title>
-					            <div class="text-[14px] mb-[9px]">{{t('appSum')}}</div>
+					            <div class="text-[14px] mb-[9px]">{{t('noInstallAppSun')}}</div>
 					        </template>
 					    </el-statistic>
 					</el-col>
@@ -41,42 +41,37 @@
             </el-card>
 
             <el-card class="box-card !border-none mt-[15px]" shadow="never">
-                <template #header>
-                    <div class="card-header">
-                        <span class="text-[14px]">{{t('commonlyUsedFunction')}}</span>
-                    </div>
-                </template>
-                <el-row :gutter="20" justify="space-between">
-                    <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/site/list')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/article_list.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('siteList')}}</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/site/group')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/member.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('sitePackage')}}</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/site/list')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/balance.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('newSite')}}</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/auth/user')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/administrator.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('administrator')}}</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/tools/app_store')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/fitment.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('appMarketplace')}}</span>
-                        </div>
-                    </el-col>
+                <el-row justify="space-between">
+					<el-col :span="4">
+					    <div class="w-[120px] 2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('site/list')">
+							<img class="w-[33px]" src="@/assets/images/index/site.png"/>
+					        <span class="ml-[10px] text-[16px] text-[#666]">{{t('siteList')}}</span>
+					    </div>
+					</el-col>
+					<el-col :span="4">
+						<div class="w-[120px] 2xl:w-[200px] py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('site/group')">
+							<img class="w-[33px]" src="@/assets/images/index/site_class.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('sitePackage')}}</span>
+						</div>
+					</el-col>
+					<el-col :span="4">
+						<div class="w-[120px] 2xl:w-[200px] py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('site/list')">
+							<img class="w-[33px]" src="@/assets/images/index/new_site.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('newSite')}}</span>
+						</div>
+					</el-col>
+					<el-col :span="4">
+						<div class="w-[120px] 2xl:w-[200px] py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/auth/user')">
+							<img class="w-[33px]" src="@/assets/images/index/auth.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('administrator')}}</span>
+						</div>
+					</el-col>
+					<el-col :span="4">
+						<div class="w-[120px] 2xl:w-[200px] py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/tools/app_store')">
+							<img class="w-[33px]" src="@/assets/images/index/app.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('appMarketplace')}}</span>
+						</div>
+					</el-col>
                 </el-row>
             </el-card>
             
@@ -84,7 +79,7 @@
                 <el-card class="box-card !border-none flex-1 mr-[15px]" shadow="never">
                     <template #header>
                         <div class="card-header">
-                            <span class="text-[14px]">{{t('newSite')}}</span>
+                            <span class="text-[15px]">{{t('newSite')}}</span>
                         </div>
                     </template>
                     <div ref="newSiteStat" :style="{ width: '100%', height: '300px' }"></div>
@@ -92,7 +87,7 @@
                 <el-card class="box-card !border-none flex-1" shadow="never">
                     <template #header>
                         <div class="card-header">
-                            <span class="text-[14px]">{{t('siteDistribution')}}</span>
+                            <span class="text-[15px]">{{t('siteDistribution')}}</span>
                         </div>
                     </template>
                     <div ref="siteStat" :style="{ width: '100%', height: '300px' }"></div>
@@ -102,7 +97,7 @@
             <el-card class="box-card !border-none mt-[15px]" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('systemInfo')}}</span>
+                        <span class="text-[15px]">{{t('systemInfo')}}</span>
                     </div>
                 </template>
                 <el-descriptions>
@@ -116,31 +111,49 @@
             <el-card class="box-card !border-none" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('versionsInfo')}}</span>
+                        <span class="text-[15px]">{{t('versionsInfo')}}</span>
                     </div>
                 </template>
                 <el-descriptions :column="1">
                     <el-descriptions-item :label="t('versions')">{{statInfo.version.version}}</el-descriptions-item>
                     <el-descriptions-item :label="t('frame')">Thinkphp6,Elementplus,mysql</el-descriptions-item>
                     <el-descriptions-item :label="t('channel')">
-						<el-link class="text-color" href="https://www.niushop.com" target="_blank" :underline="false">{{t('officialWbsite')}}</el-link> 
-						<el-link class="ml-2 text-color" href="" target="_blank" :underline="false">Gitee</el-link>
+						<el-link class="text-color" href="https://www.niucloud.com/" target="_blank" :underline="false">{{t('officialWbsite')}}</el-link> 
+						<el-link class="ml-2 text-color" href="https://gitee.com/niucloud-team/niucloud-admin" target="_blank" :underline="false">Gitee</el-link>
 					</el-descriptions-item>
                 </el-descriptions>
             </el-card>
             <el-card class="box-card !border-none mt-[15px]" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('serviceSupport')}}</span>
+                        <span class="text-[15px]">{{t('serviceSupport')}}</span>
                     </div>
                 </template>
-                <div v-for="(item,index) in statInfo.about" :class="['flex', 'items-center', 'pt-[40px]', 'pb-[40px]',{'border-gray-300 border-b-[1px]': index==0}] ">
-                    <img class="w-[120px] h-[120px] mr-[8px]" :src="img(item.image)" alt="">
-                    <div>
-                        <p class="text-[14px]">{{item.name}}</p>
-                        <p class="text-[12px] mt-[8px] text-gray-400">{{item.desc}}</p>
-                    </div>
-                </div>
+				<div>
+					<div class="flex items-center pt-[10px] pb-[25px]">
+						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wx_qrcode.jpg" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('officialAccount') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('officialAccountDesc') }}</p>
+						</div>
+					</div>
+					<div class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]">
+						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wework_qrcode.png" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('WeCom') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('WeComDesc') }}</p>
+						</div>
+					</div>
+					<div class="flex items-center mt-3">
+						<div class="mr-[30px] flex">
+							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+						</div>
+						<div>
+							<p class="text-[14px]">400-886-7993</p>
+						</div>
+					</div>
+				</div>
             </el-card>
         </div>
     </div>
@@ -167,7 +180,6 @@ const systemStore = useSystemStore()
 let statInfo = ref({'today_data':{},system:{},version:{},about:[],site_stat:{},site_group_stat:{}, app:{}})
 const getStatInfoFn = async (id: number = 0) => {
     statInfo.value = await (await getStatInfo()).data
-	console.log(statInfo.value)
     loading.value = false;
     setTimeout(() => {
         drawChart()
@@ -177,7 +189,7 @@ getStatInfoFn()
 
 // 绘制折线图
 const drawChart = () => {
-    //访问消息
+    //新增站点
     const newSiteStatChart = echarts.init(newSiteStat.value);
     const newSiteStatOption = ref({
         
@@ -201,10 +213,12 @@ const drawChart = () => {
     newSiteStatOption.value.series[0].data = statInfo.value.site_stat.value;
     newSiteStatChart.setOption(newSiteStatOption.value);
 
-    // 会员分布 
+    // 站点分布 
     const siteStatChart = echarts.init(siteStat.value);
     const siteStatOption = ref({
-        legend: {},
+        legend: {
+			bottom:"bottom"
+		},
         tooltip: {},
         series: [
             {
diff --git a/admin/src/views/index/personal.vue b/admin/src/views/index/personal.vue
index 4c0d3945c..5a61fa535 100644
--- a/admin/src/views/index/personal.vue
+++ b/admin/src/views/index/personal.vue
@@ -5,6 +5,9 @@
                 <el-form-item :label="t('headImg')">
                     <upload-image v-model="saveInfo.head_img" :limit="1" />
                 </el-form-item>
+				<el-form-item :label="t('userName')">
+				    <el-input v-model="saveInfo.username" clearable class="input-width" :readonly="true"/>
+				</el-form-item>
                 <el-form-item :label="t('realName')">
                     <el-input v-model="saveInfo.real_name" :placeholder="t('realNamePlaceholder')" clearable class="input-width" />
                 </el-form-item>
@@ -42,7 +45,8 @@ let saveInfo = reactive({
         real_name: '',
         original_password: '',
         password: '',
-        password_copy: ''
+        password_copy: '',
+		username: ''
     });
 
 const formRef = ref<FormInstance>();
@@ -62,6 +66,7 @@ const getUserInfoFn = () => {
         saveInfo.original_password = data.original_password;
         saveInfo.password = data.password;
         saveInfo.password_copy = data.password;
+		saveInfo.username = data.username;
     }).catch(() => {
         loading.value = false;  
     })
@@ -104,7 +109,7 @@ const submitForm = (formEl: FormInstance | undefined) => {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .personal-body{
+:deep(.personal-body){
     background-color: #fff;
     .el-form-item__content{
         .el-input{
diff --git a/admin/src/views/index/site_index.vue b/admin/src/views/index/site_index.vue
index 3628c92ca..ddc4975dd 100644
--- a/admin/src/views/index/site_index.vue
+++ b/admin/src/views/index/site_index.vue
@@ -4,70 +4,104 @@
             <el-card class="box-card !border-none" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('todayData')}}</span>
+                        <span class="text-[15px]">{{t('todayData')}}</span>
                     </div>
                 </template>
                 <el-row>
-                    <el-col :span="8">
+                    <el-col :span="6">
                         <el-statistic :value="statInfo.today_data.total_member_count">
                             <template #title>
                                 <div class="text-[14px] mb-[9px]">{{t('memberNumb')}}</div>
                             </template> 
                         </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_member_count }}
+						        </span>
+						    </div>
+						</div>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="6">
                         <el-statistic :value="statInfo.today_data.total_order_money" :precision="2">
                             <template #title>
                                 <div class="text-[14px] mb-[9px]">{{t('orderMoney')}}</div>
                             </template>
                         </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_order_money }}
+						        </span>
+						    </div>
+						</div>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="6">
                         <el-statistic :value="statInfo.today_data.total_visit_count">
                             <template #title>
                                 <div class="text-[14px] mb-[9px]">{{t('numberOfVisitors')}}</div>
                             </template>
                         </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_visit_count }}
+						        </span>
+						    </div>
+						</div>
                     </el-col>
+					<el-col :span="6">
+					    <el-statistic :value="statInfo.today_data.total_order_count">
+					        <template #title>
+					            <div class="text-[14px] mb-[9px]">{{t('orderNumber')}}</div>
+					        </template>
+					    </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_order_count }}
+						        </span>
+						    </div>
+						</div>
+					</el-col>
                 </el-row>
             </el-card>
 
             <el-card class="box-card !border-none mt-[15px]" shadow="never">
-                <template #header>
-                    <div class="card-header">
-                        <span class="text-[14px]">{{t('commonlyUsedFunction')}}</span>
-                    </div>
-                </template>
-                <el-row :gutter="20" justify="space-between">
+                <el-row justify="space-between">
                     <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/article/list')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/article_list.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('articleList')}}</span>
+                        <div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/article/list')">
+							<img class="w-[33px]" src="@/assets/images/index/article.png"/>
+                            <span class="ml-[10px] text-[16px] text-[#666]">{{t('articleList')}}</span>
                         </div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/member/member')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/member.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('memberManagement')}}</span>
-                        </div>
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/member')">
+							<img class="w-[33px]" src="@/assets/images/index/site_member.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('memberManagement')}}</span>
+						</div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer" @click="toLink('/member/balance')">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/balance.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('balanceAccount')}}</span>
-                        </div>
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/balance')">
+							<img class="w-[33px]" src="@/assets/images/index/site_balance.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('balanceAccount')}}</span>
+						</div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/administrator.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('administrator')}}</span>
-                        </div>
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/member')">
+							<img class="w-[33px]" src="@/assets/images/index/site_auth.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('administrator')}}</span>
+						</div>
                     </el-col>
                     <el-col :span="4">
-                        <div class="flex justify-center flex-col items-center cursor-pointer">
-                            <img class="w-[40px] h-[40px]" src="@/assets/images/index/fitment.png" alt="">
-                            <span class="mt-[10px] text-[14px]">{{t('WebDecoration')}}</span>
-                        </div>
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/diy/index')">
+							<img class="w-[33px]" src="@/assets/images/index/renovation.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('WebDecoration')}}</span>
+						</div>
                     </el-col>
                 </el-row>
             </el-card>
@@ -76,7 +110,7 @@
                 <el-card class="box-card !border-none flex-1 mr-[15px]" shadow="never">
                     <template #header>
                         <div class="card-header">
-                            <span class="text-[14px]">{{t('accessMessage')}}</span>
+                            <span class="text-[15px]">{{t('pageView')}}</span>
                         </div>
                     </template>
                     <div ref="visitStat" :style="{ width: '100%', height: '300px' }"></div>
@@ -84,7 +118,7 @@
                 <el-card class="box-card !border-none flex-1" shadow="never">
                     <template #header>
                         <div class="card-header">
-                            <span class="text-[14px]">{{t('memberDistribution')}}</span>
+                            <span class="text-[15px]">{{t('memberDistribution')}}</span>
                         </div>
                     </template>
                     <div ref="memberStat" :style="{ width: '100%', height: '300px' }"></div>
@@ -95,34 +129,99 @@
             <el-card class="box-card !border-none" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('siteInfo')}}</span>
+                        <span class="text-[15px]">{{t('siteInfo')}}</span>
                     </div>
                 </template>
-                <el-descriptions :column="1">
-                    <el-descriptions-item :label="t('siteName')">{{statInfo.site_info.site_name}}</el-descriptions-item>
-                    <el-descriptions-item :label="t('groupName')">{{ statInfo.site_info.group_name }}</el-descriptions-item>
-                    <el-descriptions-item :label="t('statusName')">{{ statInfo.site_info.status_name }}</el-descriptions-item>
-                    
-                    <el-descriptions-item :label="t('expireTime')">{{ statInfo.site_info.expire_time ? statInfo.site_info.expire_time : t('permanent')}}</el-descriptions-item>
-                </el-descriptions>
+				<div class="site-info w-[260px] h-[150px] pl-[20px] pt-[20px] pb-[10px] pr-[15px]">
+					<div class="flex items-end justify-between">
+						<div>
+							<div class="flex"><icon name="iconfont-iconhuangjinhuiyuan0101-copy" class="leading-[1] mr-[5px]" size="22px" color="#2934DD"></icon><span class="text-[#2934DD] text-[16px] font-bold ">{{ statInfo.site_info.group_name }}</span></div>
+							<div><span class="text-[#3C45A5] text-[12px]">{{ t('siteName') }}：{{ statInfo.site_info.site_name }}</span></div>
+						</div>
+						<span @click="renew" class="cursor-pointer w-[70px] h-[30px] text-center leading-[30px] bg-[#2C3EEF] text-[#fff] text-[14px] rounded-[5px]">续费</span>
+					</div>
+					<i class="block w-[30px] h-[4px] bg-[#2934DD] mt-[6px] mb-[18px]"></i>
+					<div>
+						<div><span class="text-[#3C45A5] text-[12px]">{{ t('statusName') }}：{{ statInfo.site_info.status_name }}</span></div>
+						<div><span class="text-[#3C45A5] text-[12px]">{{ t('expireTime') }}：{{ statInfo.site_info.expire_time ? statInfo.site_info.expire_time : t('permanent')}}</span></div>
+					</div>
+				</div>
             </el-card>
             
             <el-card class="box-card !border-none mt-[15px]" shadow="never">
                 <template #header>
                     <div class="card-header">
-                        <span class="text-[14px]">{{t('serviceSupport')}}</span>
+                        <span class="text-[15px]">{{t('serviceSupport')}}</span>
                     </div>
                 </template>
-                <div v-for="(item,index) in statInfo.about" :class="['flex', 'items-center', 'pt-[40px]', 'pb-[40px]',{'border-gray-300 border-b-[1px]': index==0}] ">
-                    <img class="w-[120px] h-[120px] mr-[8px]" :src="img(item.image)" alt="">
-                    <div>
-                        <p class="text-[14px]">{{item.name}}</p>
-                        <p class="text-[12px] mt-[8px] text-gray-400">{{item.desc}}</p>
-                    </div>
-                </div>
+				<div>
+					<div class="flex items-center pt-[10px] pb-[25px]" v-if="serviceData.wechat_code">
+						<img class="w-[120px] h-[120px] mr-[8px]" :src="img(serviceData.wechat_code)" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('wechatCode') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('wechatCodeDesc') }}</p>
+						</div>
+					</div>
+					<div v-else class="flex items-center pt-[10px] pb-[25px]">
+						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wx_qrcode.jpg" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('officialAccount') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('wechatCodeDesc') }}</p>
+						</div>
+					</div>
+					
+					<div class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]" v-if="serviceData.enterprise_wechat">
+						<img class="w-[120px] h-[120px] mr-[8px]" :src="img(serviceData.enterprise_wechat)" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('enterpriseWechatCode') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('enterpriseWechatCodeDesc') }}</p>
+						</div>
+					</div>
+					<div v-else class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]">
+						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wework_qrcode.png" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('WeCom') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('enterpriseWechatCodeDesc') }}</p>
+						</div>
+					</div>
+					
+					<div class="flex items-center mt-3" v-if="serviceData.tel">
+						<div class="mr-[30px] flex">
+							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+						</div>
+						<div>
+							<p class="text-[14px]">{{ serviceData.tel }}</p>
+						</div>
+					</div>
+					<div v-else class="flex items-center mt-3">
+						<div class="mr-[30px] flex">
+							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+						</div>
+						<div>
+							<p class="text-[14px]">400-886-7993</p>
+						</div>
+					</div>
+				</div>
             </el-card>
         </div>
-
+		<el-dialog v-model="renewDialog" :title="t('message')" width="500px" :destroy-on-close="true">
+			<div class="flex mt-1">
+				<div class="mr-[30px] flex">
+					<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+					<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+				</div>
+				<div>
+				    <p class="text-[14px]">{{ serviceData.tel }}</p>
+				</div>
+			</div>
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="renewDialog = false">{{t('confirm')}}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
     </div>
 </template>
 
@@ -130,18 +229,37 @@
 import { reactive, ref,onMounted } from 'vue'
 import { t } from '@/lang'
 import { getSiteStatInfo } from '@/api/stat'
-import { ElMessage, FormRules } from 'element-plus'
+import { getService } from '@/api/sys'
+import { ElMessage, FormRules, ElMessageBox } from 'element-plus'
 import * as echarts from 'echarts'
 import { img } from '@/utils/common'
 import { useRouter } from 'vue-router'
+
+const renewDialog = ref(false)
+const renew = () => {
+  renewDialog.value = true
+}
+
 const loading = ref(true)
 const visitStat = ref<any>(null)
 const memberStat = ref<any>(null)
 
+const serviceData = reactive<Record<string, string>>({
+	wechat_code: '',
+	enterprise_wechat: '',
+	tel: ''
+})
 
-let statInfo = ref({'today_data':{},system:{},version:{},about:[],visit_stat:{},member_stat:{},site_info:{}})
+let statInfo = ref({'today_data':{},system:{},version:{},about:[],visit_stat:{},member_stat:{},site_info:{},total_data:{}})
 const getStatInfoFn = async (id: number = 0) => {
     statInfo.value = await (await getSiteStatInfo()).data
+	
+	const data = await (await getService()).data
+
+	serviceData['wechat_code'] = data.wechat_code;
+	serviceData['enterprise_wechat'] = data.enterprise_wechat;
+	serviceData['tel'] = data.tel;
+	
     loading.value = false;
     setTimeout(() => {
         drawChart()
@@ -215,4 +333,8 @@ const toLink = (link) => {
 .card-header > span{
     line-height: 21px;
 }
+.site-info {
+	background-image: url('data:image/png;base64,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');
+	background-size: 100% 100%;
+}
 </style>
diff --git a/admin/src/views/login/index.vue b/admin/src/views/login/index.vue
index ddc397d5e..13f722629 100644
--- a/admin/src/views/login/index.vue
+++ b/admin/src/views/login/index.vue
@@ -47,12 +47,14 @@
         <!-- 站点端登录 -->
         <el-main class="login-main items-center justify-evenly" v-else-if="!imgLoading && loginType == 'site'">
             <div>
-                <el-row class="items-end mb-[20px]">
+                <el-row class="items-end mb-[20px] h-[40px] w-[360px]">
                     <el-col :span="8">
-                        <img src="@/assets/images/site_login.png" alt="">
+						<img class="max-h-[40px]" :src="img(webSite.logo)" alt="" v-if="webSite.logo">
+                        <img src="@/assets/images/site_login.png" alt="" v-else>
                     </el-col>
-                    <el-col :span="8" class="ml-[20px]">
-                        <div>{{ t('manageAdminFramework') }}</div>
+                    <el-col :span="12" class="ml-[20px] text-[18px]">
+                        <div class="admin_name" v-if="webSite.site_name">{{ webSite.site_name }}</div>
+						<div class="admin_name" v-else>{{ t('manageAdminFramework') }}</div>
                     </el-col>
                 </el-row>
                 <div class="login flex flex-col w-[360px] p-[40px] rounded-md rounded-[10px]">
@@ -104,6 +106,7 @@ import storage from '@/utils/storage'
 import { getLoginConfig } from '@/api/auth'
 import useUserStore from '@/stores/modules/user'
 import { setWindowTitle, img, getAppType } from '@/utils/common'
+import { getWebConfig } from '@/api/sys'
 
 const loading = ref(false)
 const imgLoading = ref(false)
@@ -111,6 +114,14 @@ const userStore = useUserStore()
 const route = useRoute()
 const router = useRouter()
 
+route.redirectedFrom && (route.query.redirect = route.redirectedFrom.path)
+
+const webSite = ref([])
+const setFormData = async (id: number = 0) => {
+    webSite.value = await (await getWebConfig()).data
+}
+setFormData()
+
 // 判断登录页面[平台或者站点]
 const loginType = ref(getAppType())
 
@@ -203,6 +214,13 @@ const loginFn = (data = {}) => {
     background: var(--el-bg-color);
 }
 
+.admin_name{
+	overflow:hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow:ellipsis;
+}
+
 @media only screen and (max-width: 750px) {
     .login-main-left {
         display: none;
diff --git a/admin/src/views/member/balance.vue b/admin/src/views/member/balance.vue
index af1ffd779..22850dd6b 100644
--- a/admin/src/views/member/balance.vue
+++ b/admin/src/views/member/balance.vue
@@ -1,26 +1,51 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-			<el-card class="box-card !border-none table-search-wrap" shadow="never">
+			<div class="flex justify-between items-center mb-[5px]">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+			<el-card class="box-card !border-none base-bg !px-[35px]" shadow="never">
 			    <el-row class="flex">
-			        <el-col :span="12" class="min-w-[100px]">
-			            <el-statistic :value="balanceStatistics.money">
-			                <template #title>
-			                    <div class="text-[14px] mb-[9px]">{{ t('money') }}</div>
-			                </template> 
-			            </el-statistic>
+			        <el-col :span="8" class="min-w-[100px]">
+						<div class="statistic-card">
+                            <el-statistic :value="balanceStatistics.money ? Number.parseFloat(balanceStatistics.money+balanceStatistics.balance).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalAllBalance') }}</span>
+                                </div>
+                            </div>
+                        </div>
 			        </el-col>
-			        <el-col :span="12" class="min-w-[100px]">
-			            <el-statistic :precision="2" :value="balanceStatistics.balance">
-			                <template #title>
-			                    <div class="text-[14px] mb-[9px]">{{ t('balance') }}</div>
-			                </template>
-			            </el-statistic>
+					<el-col :span="8" class="min-w-[100px]">
+						<div class="statistic-card">
+                            <el-statistic :value="balanceStatistics.money"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalMoney') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+			        <el-col :span="8" class="min-w-[100px]">
+						<div class="statistic-card">
+                            <el-statistic :value="balanceStatistics.balance"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalBalance') }}</span>
+                                </div>
+                            </div>
+                        </div>
 			        </el-col>
 			    </el-row>
 			</el-card>
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
+
+					<el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model="memberAccountLogTableData.searchParam.keywords" class="w-[240px]"
+                            :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
+
 					<el-form-item :label="t('balanceType')" prop="from_type">
 					    <el-select v-model="memberAccountLogTableData.balance_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width" @change="checkAccountType">
 					        <el-option :label="t('selectPlaceholder')" value="" />
@@ -45,37 +70,49 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
 				
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
 
                     <template #empty>
                         <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
-
-                    <el-table-column  :label="t('nickName')" min-width="140" :show-overflow-tooltip="true">
+					<el-table-column prop="member_id" :label="t('memberId')" min-width="80" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('memberInfo')" min-width="140" :show-overflow-tooltip="true">
                         <template #default="{ row }">
                             <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.headimg)" alt="" >
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="" >
                                 <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
                                 <div class="flex flex flex-col">
-                                    <span class="text-blue-700">{{ row.nickname || '' }}</span>
-                                    <span class="text-blue-700">{{ row.mobile || '' }}</span>
+                                    <span class="">{{ row.member.nickname || '' }}</span>
                                 </div>
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="account_data" :label="t('accountData')" min-width="120" />
-					<el-table-column prop="account_type_name" :label="t('balanceType')" min-width="120" />
-                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="120" />
+					<el-table-column prop="mobile" :label="t('mobile')" min-width="90">
+						<template #default="{ row }">
+							{{ row.member.mobile || '' }}
+                        </template>
+					</el-table-column>
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="70" align="right">
+						<template #default="{ row }">
+							<span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+							<span v-else>{{ row.account_data }}</span>
+                        </template>
+					</el-table-column>
+					<el-table-column prop="account_sum" :label="t('accountSum')" min-width="110" align="right"/>
+					<el-table-column prop="account_type_name" :label="t('balanceType')" min-width="150" align="center" />
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="120" align=""/>
                     <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
-                    <el-table-column prop="memo" :label="t('memo')" min-width="120" />
-
                     <el-table-column :label="t('operation')" fixed="right" width="100">
                        <template #default="{ row }">
                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
@@ -105,11 +142,13 @@ import {
 	getMoneyList,
 	getAccountType,
 } from '@/api/member'
+import { FormInstance } from 'element-plus'
 import { img } from '@/utils/common'
 import balanceInfo from '@/views/member/components/member-balance-info.vue'
 import { useRoute,useRouter } from 'vue-router'
 const route = useRoute()
 const member_id: number = parseInt(route.query.id || 0)
+const pageName = route.meta.title;
 
 let memberAccountLogTableData = reactive({
     page: 1,
@@ -118,6 +157,7 @@ let memberAccountLogTableData = reactive({
     loading: true,
     data: [],
     searchParam:{
+	  keywords:"",
       from_type:"",
       create_time:"",
       mobile:"",
@@ -131,13 +171,19 @@ let fromTypeList = ref([])
 
 const setFromTypeList = async () => {
     fromTypeList.value = await (await getChangeTypeList('balance')).data
-	console.log(fromTypeList.value)
 }
 
 setFromTypeList();
 
 const searchFormRef = ref<FormInstance>()
 
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadMemberAccountLogList();
+}
+
 /**
  * 获取会员账单表列表
  */
@@ -153,7 +199,6 @@ const loadMemberAccountLogList = (page: number = 1) => {
 		    memberAccountLogTableData.loading = false
 		    memberAccountLogTableData.data = res.data.data
 		    memberAccountLogTableData.total = res.data.total
-			console.log(memberAccountLogTableData.data)
 		}).catch(() => {
 		    memberAccountLogTableData.loading = false
 		})
@@ -209,8 +254,7 @@ checkBalanceInfo()
 //获取余额类型
 const balanceStatus = ref([])
 const checkBalanceStatus = () => {
-	 getBalanceStatus({
-	 }).then(res => {
+	 getBalanceStatus().then(res => {
 		for (var i in res.data) {
 			if(i == 'balance' || i == 'money'){
 				 balanceStatus.value.push({"name" : res.data[i], "type" : i})
diff --git a/admin/src/views/member/commission.vue b/admin/src/views/member/commission.vue
index c10058ade..9803c7cbc 100644
--- a/admin/src/views/member/commission.vue
+++ b/admin/src/views/member/commission.vue
@@ -1,9 +1,60 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none base-bg !px-[35px]" shadow="never">
+			    <el-row class="flex">
+			        <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.total_commission ? Number.parseFloat(commissionStatistics.total_commission).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalCommission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+					<el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.commission ? Number.parseFloat(commissionStatistics.commission).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('commission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+			        <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.withdrawn_commission ? Number.parseFloat(commissionStatistics.withdrawn_commission).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('withdrawnCommission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+                    <el-col :span="6" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="commissionStatistics.commission_cash_outing ? Number.parseFloat(commissionStatistics.commission_cash_outing).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('cashOutingCommission') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+			    </el-row>
+			</el-card>
+            
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
-                     
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model="memberAccountLogTableData.searchParam.keywords" class="w-[240px]"
+                            :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
                     <el-form-item :label="t('fromType')" prop="from_type">
                         <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
                             <el-option :label="t('selectPlaceholder')" value="" />
@@ -21,34 +72,51 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
 
                     <template #empty>
                         <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
 
-                    <el-table-column  :label="t('nickName')" min-width="140" :show-overflow-tooltip="true">
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="80" :show-overflow-tooltip="true">
                         <template #default="{ row }">
-                            <div class="flex items-center cursor-pointer " @click="toMember(row.member_id)">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.headimg)" alt="" >
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column  :label="t('memberInfo')" min-width="150" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="" >
                                 <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
                                 <div class="flex flex flex-col">
-                                    <span class="text-blue-700">{{ row.nickname || '' }}</span>
-                                    <span class="text-blue-700">{{ row.mobile || '' }}</span>
+                                    <span class="">{{ row.member.nickname || '' }}</span>
                                 </div>
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="account_data" :label="t('accountData')" min-width="120" />
-                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="120" />
+					<el-table-column prop="mobile" :label="t('mobile')" min-width="100">
+						<template #default="{ row }">
+							{{ row.member.mobile || '' }}
+                        </template>
+					</el-table-column>
+
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="80" align="right">
+						<template #default="{ row }">
+							<span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+							<span v-else>{{ row.account_data }}</span>
+                        </template>
+					</el-table-column>
+
+                    <el-table-column prop="account_sum" :label="t('accountSum')" min-width="120" align="right"/>
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="180" align="center"/>
                     <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
-                    <el-table-column prop="memo" :label="t('memo')" min-width="120" />
 
                     <el-table-column :label="t('operation')" fixed="right" width="100">
                        <template #default="{ row }">
@@ -71,12 +139,14 @@
 <script lang="ts" setup>
 import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
-import { getChangeTypeList,getCommissionList } from '@/api/member'
+import { FormInstance } from 'element-plus'
+import { getChangeTypeList,getCommissionList,getCommissionSum } from '@/api/member'
 import { img } from '@/utils/common'
 import moneyInfo from '@/views/member/components/member-commission-info.vue'
 import { useRouter,useRoute } from 'vue-router'
 const route = useRoute()
 const member_id: number = parseInt(route.query.id || 0)
+const pageName = route.meta.title;
 
 let memberAccountLogTableData = reactive({
     page: 1,
@@ -85,6 +155,7 @@ let memberAccountLogTableData = reactive({
     loading: true,
     data: [],
     searchParam:{
+      keywords:"",
       from_type:"",
       create_time:"",
       mobile:"",
@@ -101,9 +172,29 @@ const setFromTypeList = async () => {
 
 setFromTypeList();
 
+/**
+ * 获取佣金总计
+ */
+ const commissionStatistics = ref([])
+const checkCommissionInfo = () => {
+	getCommissionSum({
+		member_id
+	 }).then(res => {
+		commissionStatistics.value = res.data;
+	 })
+}
+checkCommissionInfo()
+
 const searchFormRef = ref<FormInstance>()
 
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadMemberAccountLogList();
+}
+
 /**
+ * 
  * 获取会员账单表列表
  */
 const loadMemberAccountLogList = (page: number = 1) => {
diff --git a/admin/src/views/member/components/add-member.vue b/admin/src/views/member/components/add-member.vue
index ed05e2428..78415a2f3 100644
--- a/admin/src/views/member/components/add-member.vue
+++ b/admin/src/views/member/components/add-member.vue
@@ -1,22 +1,31 @@
 <template>
-    <el-dialog v-model="showDialog" :title="popTitle" width="500px"
-        :destroy-on-close="true">
-        <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
-                <el-form-item :label="t('nickname')" prop="nickname">
-                    <el-input v-model="formData.nickname" clearable :placeholder="t('nickNamePlaceholder')" class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('username')" prop="username">
-                    <el-input v-model="formData.username" clearable :placeholder="t('usernamePlaceholder')" class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('mobile')" prop="mobile">
-                    <el-input v-model="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" type="number" class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('password')" prop="password">
-                    <el-input v-model="formData.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
-                </el-form-item>
-                <el-form-item :label="t('passwordCopy')" prop="password_copy">
-                    <el-input v-model="formData.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
-                </el-form-item>
+    <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form"
+            v-loading="loading">
+
+            <el-form-item :label="t('memberNo')" prop="member_no">
+                <el-input v-model="formData.member_no" clearable maxlength="20" :placeholder="t('memberNoPlaceholder')"
+                    class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('mobile')" prop="mobile">
+                <el-input v-model="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" type="number"
+                    class="input-width" />
+            </el-form-item>
+
+            <el-form-item :label="t('nickname')">
+                <el-input v-model="formData.nickname" clearable :placeholder="t('nickNamePlaceholder')"
+                    class="input-width" />
+            </el-form-item>
+            
+            <el-form-item :label="t('password')" prop="password">
+                <el-input v-model="formData.password" type="password" :placeholder="t('passwordPlaceholder')" clearable
+                    class="input-width" />
+            </el-form-item>
+            <el-form-item :label="t('passwordCopy')" prop="password_copy">
+                <el-input v-model="formData.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable
+                    class="input-width" />
+            </el-form-item>
 
         </el-form>
 
@@ -32,14 +41,15 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed, watch } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { addMember,getMemberList } from '@/api/member'
+import { addMember, getMemberList, getMemberNo } from '@/api/member'
 
-let showDialog = ref(false)
+const showDialog = ref(false)
 const loading = ref(false)
-let popTitle:string = '';
+let popTitle: string = ''
+let memberNo: string = ''
 
 /**
  * 表单数据
@@ -47,6 +57,8 @@ let popTitle:string = '';
 const initialFormData = {
     member_id: '',
     nickname: '',
+    member_no: '',
+    init_member_no: '',
     mobile: '',
     password: '',
     password_copy: ''
@@ -55,44 +67,58 @@ const formData: Record<string, any> = reactive({ ...initialFormData })
 
 const formRef = ref<FormInstance>()
 
-
-
 // 表单验证规则
 const formRules = computed(() => {
     return {
-    nickname: [
-        { required: true, message: t('nickNamePlaceholder'), trigger: 'blur' }
-    ],
-    username: [
-        { required: true, message: t('usernamePlaceholder'), trigger: 'blur' }
-    ],
-    mobile: [
-        { validator: mobileVerify, trigger: 'blur' }
-    ],
-    password: [
-        { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
-    ],
-    password_copy: [
-        { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
-        { validator: doubleCipher, trigger: 'blur' }
-    ],
+        member_no: [
+            { required: true, message: t('memberNoPlaceholder'), trigger: 'blur' },
+            { validator: memberNoVerify, trigger: 'blur' }
+        ],
+
+        mobile: [
+            { required: true, message: t('mobilePlaceholder'), trigger: 'blur' },
+            { validator: mobileVerify, trigger: 'blur' }
+        ],
+        password: [
+            { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
+        ],
+        password_copy: [
+            { required: true, message: t('passwordPlaceholder'), trigger: 'blur' },
+            { validator: doubleCipher, trigger: 'blur' }
+        ]
     }
 })
 // 验证手机号格式
 const mobileVerify = (rule: any, value: any, callback: any) => {
     if (value && !/^1[3-9]\d{9}$/.test(value)) {
         callback(new Error(t('mobileHint')))
-    }else {
+    } else {
         callback()
     }
 }
 // 验证两次密码
 const doubleCipher = (rule: any, value: any, callback: any) => {
-  if (value != formData.password) {
-    callback(t('doubleCipherHint'));
-  } else {
-    callback()
-  }
+    if (value != formData.password) {
+        callback(t('doubleCipherHint'))
+    } else {
+        callback()
+    }
+}
+// 验证会员编号
+const memberNoVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[0-9a-zA-Z]*$/g.test(value)) {
+        callback(new Error(t('memberNoHint')))
+    } else {
+        callback()
+    }
+}
+
+const memberNoInit = async () => {
+    await getMemberNo().then(res => {
+        memberNo = res.data
+    }).catch(() => {
+
+    })
 }
 
 const emit = defineEmits(['complete'])
@@ -103,21 +129,20 @@ const emit = defineEmits(['complete'])
  */
 const confirm = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
-    let save =  addMember
+    const save = addMember
 
     await formEl.validate(async (valid) => {
         if (valid) {
             loading.value = true
 
-            let data = formData
+            const data = formData
 
             save(data).then(res => {
                 loading.value = false
                 showDialog.value = false
                 emit('complete')
-            }).catch(err => {
+            }).catch(() => {
                 loading.value = false
-                showDialog.value = false
             })
         }
     })
@@ -127,15 +152,20 @@ const setFormData = async (row: any = null) => {
     loading.value = true
     Object.assign(formData, initialFormData)
     popTitle = t('addMember')
-    if(row){
+    if (row) {
         popTitle = t('updateMember')
         const data = await (await getMemberList(row.member_id)).data
-        if (data) Object.keys(formData).forEach((key: string) => {
-            if (data[key] != undefined) formData[key] = data[key]
-        })
+        if (data) {
+            Object.keys(formData).forEach((key: string) => {
+                if (data[key] != undefined) formData[key] = data[key]
+            })
+        }
+    } else {
+        await memberNoInit()
+        formData.member_no = memberNo
+        formData.init_member_no = memberNo
     }
     loading.value = false
-
 }
 
 defineExpose({
@@ -144,4 +174,4 @@ defineExpose({
 })
 </script>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/admin/src/views/member/components/edit-label.vue b/admin/src/views/member/components/edit-label.vue
index f76d39eb5..e6720bb20 100644
--- a/admin/src/views/member/components/edit-label.vue
+++ b/admin/src/views/member/components/edit-label.vue
@@ -62,7 +62,6 @@ const formRules = computed(() => {
 })
 
 const sortVerify = (rule: any, value: any, callback: any) => {
-    console.log("sortVerify",value.toString());
     if (value < 0) {
         callback(new Error(t('sortVerifyOne')))
     } else if (value.toString().indexOf(".") != -1) {
@@ -94,7 +93,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/member/components/edit-member.vue b/admin/src/views/member/components/edit-member.vue
index f91550b03..aa02cefab 100644
--- a/admin/src/views/member/components/edit-member.vue
+++ b/admin/src/views/member/components/edit-member.vue
@@ -106,7 +106,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
         emit('complete')
     }).catch(err => {
         loading.value = false
-        showDialog.value = false
+        // showDialog.value = false
     })
 }
 
diff --git a/admin/src/views/member/components/member-balance-edit.vue b/admin/src/views/member/components/member-balance-edit.vue
index 9fa19dfd5..f5e852cf5 100644
--- a/admin/src/views/member/components/member-balance-edit.vue
+++ b/admin/src/views/member/components/member-balance-edit.vue
@@ -104,7 +104,7 @@ const formRules = computed(() => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/member/components/member-balance-info.vue b/admin/src/views/member/components/member-balance-info.vue
index 4a1eaa892..28c0b2b34 100644
--- a/admin/src/views/member/components/member-balance-info.vue
+++ b/admin/src/views/member/components/member-balance-info.vue
@@ -5,19 +5,22 @@
  
             <el-form-item :label="t('headimg')" >
                 <div class="flex items-center">
-                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.headimg" :src="img(formData.headimg)" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" >
                     <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
                 </div>
             </el-form-item>
 
+			<el-form-item :label="t('memberId')" >
+                <div class="input-width"> {{ formData.member.member_no }} </div>
+            </el-form-item>
 
             <el-form-item :label="t('nickName')" >
-                <div class="input-width"> {{ formData.nickname }} </div>
+                <div class="input-width"> {{ formData.member.nickname }} </div>
             </el-form-item>
 
 
             <el-form-item :label="t('mobile')" >
-                <div class="input-width"> {{ formData.mobile }} </div>
+                <div class="input-width"> {{ formData.member.mobile }} </div>
             </el-form-item>
 
             <el-form-item :label="t('accountData')" >
@@ -64,14 +67,16 @@ const initialFormData = {
     create_time:'',
     from_type:'',
     from_type_name:'',
-    headimg:'',
     member_id:'',
     memo:'',
-    mobile:'',
-    nickname:'',
     related_id:'',
-    username:''
-
+	member: {
+		headimg:'',
+		mobile:'',
+		member_no: '',
+		username:'',
+		nickname:'',
+	}
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
diff --git a/admin/src/views/member/components/member-commission-info.vue b/admin/src/views/member/components/member-commission-info.vue
index 6a76ad98e..f8540526d 100644
--- a/admin/src/views/member/components/member-commission-info.vue
+++ b/admin/src/views/member/components/member-commission-info.vue
@@ -5,22 +5,22 @@
  
             <el-form-item :label="t('headimg')" >
                 <div class="flex items-center">
-                    
-
-                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.headimg" :src="img(formData.headimg)" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" >
                     <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
-
                 </div>
             </el-form-item>
 
-
+			<el-form-item :label="t('memberId')" >
+			    <div class="input-width"> {{ formData.member.member_no }} </div>
+			</el-form-item>
+			
             <el-form-item :label="t('nickName')" >
-                <div class="input-width"> {{ formData.nickname }} </div>
+                <div class="input-width"> {{ formData.member.nickname }} </div>
             </el-form-item>
 
 
             <el-form-item :label="t('mobile')" >
-                <div class="input-width"> {{ formData.mobile }} </div>
+                <div class="input-width"> {{ formData.member.mobile }} </div>
             </el-form-item>
 
             <el-form-item :label="t('accountData')" >
@@ -67,14 +67,16 @@ const initialFormData = {
     create_time:'',
     from_type:'',
     from_type_name:"",
-    headimg:'',
     member_id:'',
     memo:'',
-    mobile:'',
-    nickname:'',
     related_id:'',
-    username:''
-
+	member: {
+		headimg:'',
+		mobile:'',
+		member_no: '',
+		username:'',
+		nickname:'',
+	}
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
diff --git a/admin/src/views/member/components/member-point-edit.vue b/admin/src/views/member/components/member-point-edit.vue
index 520d7a478..f591a9ed2 100644
--- a/admin/src/views/member/components/member-point-edit.vue
+++ b/admin/src/views/member/components/member-point-edit.vue
@@ -106,7 +106,7 @@ const formRules = computed(() => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/member/components/member-point-info.vue b/admin/src/views/member/components/member-point-info.vue
index 8aff940b8..09ca41697 100644
--- a/admin/src/views/member/components/member-point-info.vue
+++ b/admin/src/views/member/components/member-point-info.vue
@@ -7,20 +7,23 @@
                 <div class="flex items-center">
                     
 
-                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.headimg" :src="img(formData.headimg)" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" >
                     <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
 
                 </div>
             </el-form-item>
 
+			<el-form-item :label="t('memberId')" >
+                <div class="input-width"> {{ formData.member.member_no }} </div>
+            </el-form-item>
 
             <el-form-item :label="t('nickName')" >
-                <div class="input-width"> {{ formData.nickname }} </div>
+                <div class="input-width"> {{ formData.member.nickname }} </div>
             </el-form-item>
 
 
             <el-form-item :label="t('mobile')" >
-                <div class="input-width"> {{ formData.mobile }} </div>
+                <div class="input-width"> {{ formData.member.mobile }} </div>
             </el-form-item>
 
             <el-form-item :label="t('accountData')" >
@@ -67,14 +70,16 @@ const initialFormData = {
     create_time:'',
     from_type:'',
     from_type_name:"",
-    headimg:'',
     member_id:'',
     memo:'',
-    mobile:'',
-    nickname:'',
     related_id:'',
-    username:''
-
+	member: {
+		headimg:'',
+		mobile:'',
+		member_no: '',
+		username:'',
+		nickname:'',
+	}
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -92,7 +97,6 @@ const emit = defineEmits(['complete'])
 const setFormData = async (row: any = null) => {
     loading.value = true;
     Object.assign(formData, initialFormData)
-    
     if (row) {
         Object.keys(formData).forEach((key: string) => {
             if (row[key] != undefined) formData[key] = row[key]
diff --git a/admin/src/views/member/label.vue b/admin/src/views/member/label.vue
index 050787120..8bee923a0 100644
--- a/admin/src/views/member/label.vue
+++ b/admin/src/views/member/label.vue
@@ -1,25 +1,26 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
                 <el-button type="primary" @click="addEvent">
                     {{ t('addMemberLabel') }}
                 </el-button>
             </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberLabelTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('labelName')" prop="label_name">
                         <el-input v-model="memberLabelTableData.searchParam.label_name" :placeholder="t('labelNamePlaceholder')" />
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadMemberLabelList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="memberLabelTableData.data" size="large" v-loading="memberLabelTableData.loading">
 
                     <template #empty>
@@ -27,6 +28,7 @@
                     </template>
 
                     <el-table-column prop="label_name" :label="t('labelName')" min-width="120" />
+                    <el-table-column prop="member_num" :label="t('memberNumber')" min-width="120" />
                     <el-table-column prop="memo" :label="t('memo')" min-width="120" />
                     <el-table-column prop="sort" :label="t('sort')" min-width="120" />
 
@@ -54,8 +56,11 @@
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getMemberLabelList, deleteMemberLabel } from '@/api/member'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, FormInstance } from 'element-plus'
 import EditMemberLabel from '@/views/member/components/edit-label.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 let memberLabelTableData = reactive({
     page: 1,
@@ -70,6 +75,14 @@ let memberLabelTableData = reactive({
 
 const searchFormRef = ref<FormInstance>()
 
+
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadMemberLabelList();
+}
+
 /**
  * 获取会员标签列表
  */
diff --git a/admin/src/views/member/member.vue b/admin/src/views/member/member.vue
index 54de12394..a50ff46c4 100644
--- a/admin/src/views/member/member.vue
+++ b/admin/src/views/member/member.vue
@@ -2,18 +2,20 @@
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
 
-            <div class="flex justify-between">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
                 <el-button type="primary" @click="addEvent">
                     {{ t('addMember') }}
                 </el-button>
             </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('memberInfo')" prop="keyword">
                         <el-input v-model="memberTableData.searchParam.keyword" class="w-[240px]"
                             :placeholder="t('memberInfoPlaceholder')" />
                     </el-form-item>
+                    
                     <el-form-item :label="t('registerChannel')" prop="register_channel">
                         <el-select v-model="memberTableData.searchParam.register_channel" clearable
                             :placeholder="t('channelPlaceholder')" class="input-width">
@@ -21,9 +23,11 @@
                             <el-option :label="item" :value="key" v-for="(item, key) in channelList" />
                         </el-select>
                     </el-form-item>
+                    
                     <el-form-item :label="t('memberLabel')" prop="member_label">
-                        <el-select v-model="memberTableData.searchParam.member_label" collapse-tags
+                        <el-select v-model="memberTableData.searchParam.member_label" collapse-tags clearable 
                             :placeholder="t('memberLabelPlaceholder')" class="input-width">
+                            <el-option :label="t('selectPlaceholder')"  value=""/>
                             <el-option :label="item['label_name']" :value="item['label_id']"
                                 v-for="item in labelSelectData" />
                         </el-select>
@@ -35,17 +39,17 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadMemberList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="memberTableData.data" size="large" v-loading="memberTableData.loading">
 
                     <template #empty>
                         <span>{{ !memberTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
-
+                    <el-table-column prop="member_no" :label="t('memberNo')" min-width="120" />
                     <el-table-column prop="nickname" :show-overflow-tooltip="true" :label="t('nickname')" min-width="170">
                         <template #default="{ row }">
                             <div class="flex items-center">
@@ -58,39 +62,48 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="mobile" :label="t('mobile')" min-width="100" />
-                    <el-table-column prop="point" :label="t('point')" min-width="70">
+                    <el-table-column prop="mobile" :label="t('mobile')" min-width="120" />
+                    <el-table-column prop="point" :label="t('point')" min-width="80" align="right">
                         <template #default="{ row }">
                             {{ Number.parseInt(row.point) }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="balance" :label="t('balance')" min-width="70" />
-                    <el-table-column prop="member_label" :label="t('lable')" min-width="120">
+                    <el-table-column prop="balance" :label="t('balance')" min-width="130" align="right" />
+                    <el-table-column prop="member_label" :label="t('lable')" min-width="120" align="center">
                         <template #default="{ row }">
-                            {{ memberLable(row) }}
+                            <div class="flex flex-col items-start">
+                                <div v-for="(item, key) in row.member_label_array" class="my-[3px]">
+                                    <el-tag class="ml-[13px]" type="info">{{item.label_name}}</el-tag>
+                                </div>
+                            </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="register_channel_name" :label="t('registerChannel')" min-width="120" />
-                    <el-table-column :label="t('createTime')" min-width="140" align="center">
+					
+                    <el-table-column prop="register_channel_name" :label="t('registerChannel')" min-width="110" align="center"/>
+
+					<el-table-column prop="member_label" :label="t('status')" min-width="120" align="center">
+					    <template #default="{ row }">
+                            <el-tag type="success" v-if="row.status == 1" @click="lockMember(row, 0)" class="cursor-pointer">{{t('normal')}}</el-tag>
+                            <el-tag type="error" v-else @click="lockMember(row, 1)" class="cursor-pointer">{{t('lock')}}</el-tag>
+					    </template>
+					</el-table-column>
+                    <el-table-column :label="t('createTime')" min-width="150" align="center">
                         <template #default="{ row }">
                             {{ row.create_time || '' }}
                         </template>
                     </el-table-column>
-                    <el-table-column :label="t('lastVisitTime')" min-width="140" align="center">
+                    <el-table-column :label="t('lastVisitTime')" min-width="150" align="center">
                         <template #default="{ row }">
                             {{ row.last_visit_time || '' }}
                         </template>
                     </el-table-column>
 
-                    <el-table-column :label="t('operation')" fixed="right" width="200">
+                    <el-table-column :label="t('operation')" fixed="right" width="180">
                         <template #default="{ row }">
                             <div class="flex items-center">
-                                <el-button v-if="row.status == 1" type="primary" link @click="lockMember(row, 0)">{{
-                                    t('lock') }}</el-button>
-                                <el-button v-else type="primary" link @click="lockMember(row, 1)">{{ t('scrubLock')
-                                }}</el-button>
                                 <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
                                 <el-button type="primary" link @click="setMemberLable(row)">{{ t('setLable') }}</el-button>
+                                <el-button type="primary" link @click="deleteEvent(row)">{{ t('memberDelete') }}</el-button>
                             </div>
                         </template>
                     </el-table-column>
@@ -114,12 +127,14 @@
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
-import { addMember, getRegisterChannelType, getMemberList, getMemberLabelAll, editMemberStatus } from '@/api/member'
+import { addMember, getRegisterChannelType, getMemberList, getMemberLabelAll, editMemberStatus,deleteMember } from '@/api/member'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter } from 'vue-router'
 import AddMember from '@/views/member/components/add-member.vue'
 import EditMember from '@/views/member/components/edit-member.vue'
-
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 const memberTableData = reactive({
     page: 1,
     limit: 10,
@@ -130,6 +145,7 @@ const memberTableData = reactive({
         keyword: '',
         register_type: '',
         member_label: '',
+        register_channel:'',
         create_time: []
     }
 })
@@ -145,12 +161,19 @@ setChannelList();
 
 
 // 获取全部标签
-let labelSelectData = ref(null)
+let labelSelectData = ref([])
 const getMemberLabelAllFn = async () => {
     labelSelectData.value = await (await getMemberLabelAll()).data
 }
 getMemberLabelAllFn();
 
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadMemberList();
+}
+
 // 获取会员列表
 const loadMemberList = (page: number = 1) => {
     memberTableData.loading = true
@@ -202,6 +225,26 @@ function setMemberLable(res: any) {
     editMemberDialog.value.showDialog = true
 }
 
+/**
+ * 删除
+ */
+function deleteEvent(res: any) {
+
+    ElMessageBox.confirm(t('memberDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        deleteMember(res.member_id).then(() => {
+            loadMemberList();
+        }).catch(() => {
+        })
+    })
+
+}
+
 
 /**
  * 添加会员
diff --git a/admin/src/views/member/member_detail.vue b/admin/src/views/member/member_detail.vue
index 2a200f538..bed1a7e2d 100644
--- a/admin/src/views/member/member_detail.vue
+++ b/admin/src/views/member/member_detail.vue
@@ -1,152 +1,234 @@
 <template>
     <div class="main-container" v-loading="loading">
-        <el-card class="box-card !border-none" shadow="never">
-            <el-descriptions :title="t('essentialInfo')">
-                <el-descriptions-item :label="t('headimg')">
-                    <img class="w-[50px] h-[50px] mr-[10px] inline-block" v-if="formData.headimg" :src="img(formData.headimg)" alt="">
-                    <img class="w-[50px] h-[50px] mr-[10px] inline-block" v-else src="@/assets/images/default_headimg.png" alt="">
-                    <el-icon @click="editMemberInfo('headimg')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen /></el-icon>
-                </el-descriptions-item>
-                <el-descriptions-item :label="t('urserName')">{{formData.username || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('nickname')" class="flex align-center">{{formData.nickname || t('notAvailable')}}<el-icon @click="editMemberInfo('nickname')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen /></el-icon></el-descriptions-item>
-                <el-descriptions-item :label="t('mobile')">{{formData.mobile || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('memberLabel')">{{formData.member_label_name.toString() || t('notAvailable')}}<el-icon @click="editMemberInfo('member_label')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen /></el-icon></el-descriptions-item>
-                <el-descriptions-item :label="t('birthday')">{{formData.birthday || t('notAvailable')}}<el-icon @click="editMemberInfo('birthday')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen /></el-icon></el-descriptions-item>
-                <el-descriptions-item :label="t('sex')">{{formData.sex == 1 && t('manSex') || formData.sex == 2 && t('girlSex') || t('secrecySex')}}<el-icon @click="editMemberInfo('sex')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen /></el-icon></el-descriptions-item>
-                <el-descriptions-item :label="t('wxUnionid')">{{formData.wx_unionid || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('weappOpenid')">{{formData.weapp_openid || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('wxOpenid')">{{formData.wx_openid || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('registeredSource')">{{formData.register_channel_name || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('createTime')">{{formData.create_time || t('notAvailable')}}</el-descriptions-item>
-                <el-descriptions-item :label="t('lastVisitTime')">{{formData.last_visit_time || t('notAvailable')}}</el-descriptions-item>
-            </el-descriptions>
-        </el-card>
-
         <el-card class="box-card !border-none mt-[16px]" shadow="never">
-            <div class="card-header mb-2">
-                <span class="font-bold">{{t('accountInfo')}}</span>
+            <div class="card-header mb-5 pb-[10px] border-b-[1px] border-[#EDEDED]">
+                <span class="font-bold text-[18px] text-[#333333]">{{t('essentialInfo')}}</span>
             </div>
-            <el-row :gutter="16">
-                <el-col :span="6">
-                    <div class="statistic-card">
-                        <el-statistic :value="formData.point">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                    {{t('point')}}
-                                    <el-tooltip
-                                        effect="dark"
-                                        :content="t('adjust')"
-                                        placement="top"
-                                    >
-                                        <el-icon @click="adjustPoint(formData)" class="ml-2" :size="12"><EditPen /></el-icon>
-                                    </el-tooltip>
-                                    <el-tooltip
-                                        effect="dark"
-                                        :content="t('detail')"
-                                        placement="top"
-                                    >
-                                        <el-icon @click="infoPoint(formData)" class="ml-2" :size="12"><View /></el-icon>
-                                    </el-tooltip>
-                                </div>
-                            </template>
-                        </el-statistic>
-                        <div class="statistic-footer">
-                            <div class="footer-item">
-                                <span>{{t('accumulative')}}</span>
-                                <span class="green ml-1">
-                                {{formData.point_get}}
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :span="6">
-                    <div class="statistic-card">
-                        <el-statistic :value="formData.balance">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                    {{t('balance')}}
-                                    <el-tooltip
-                                        effect="dark"
-                                        :content="t('adjust')"
-                                        placement="top"
-                                    >
-                                        <el-icon @click="adjustBalance(formData)" class="ml-2" :size="12"><EditPen /></el-icon>
-                                    </el-tooltip>
-                                    <el-tooltip
-                                        effect="dark"
-                                        :content="t('detail')"
-                                        placement="top"
-                                    >
-                                        <el-icon @click="infoBalance(formData)" class="ml-2" :size="12"><View /></el-icon>
-                                    </el-tooltip>
-                                </div>
-                            </template>
-                        </el-statistic>
-                        <div class="statistic-footer">
-                            <div class="footer-item">
-                                <span>{{t('accumulative')}}</span>
-                                <span class="red ml-1">
-                                {{formData.balance_get}}
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :span="6">
-                    <div class="statistic-card">
-                        <el-statistic :value="formData.money" title="New transactions today">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                {{t("money")}}
-                                <el-tooltip
-                                        effect="dark"
-                                        :content="t('detail')"
-                                        placement="top"
-                                    >
-                                        <el-icon @click="infoBalance(formData)" class="ml-2" :size="12"><View /></el-icon>
-                                </el-tooltip>
-                                </div>
-                            </template>
-                        </el-statistic>
-                        <div class="statistic-footer">
-                            <div class="footer-item">
-                                <span>{{t('accumulative')}}</span>
-                                <span class="green ml-1">
-                                    {{formData.money_get}}
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </el-col>
-                <el-col :span="6">
-                    <div class="statistic-card">
-                        <el-statistic :value="formData.commission" title="New transactions today">
-                            <template #title>
-                                <div style="display: inline-flex; align-items: center">
-                                {{t("commission")}}
-                                <el-tooltip
-                                        effect="dark"
-                                        :content="t('detail')"
-                                        placement="top"
-                                    >
-                                        <el-icon @click="infoCommission(formData)" class="ml-2" :size="12"><View /></el-icon>
-                                </el-tooltip>
-                                </div>
-                            </template>
-                        </el-statistic>
-                        <div class="statistic-footer">
-                            <div class="footer-item">
-                                <span>{{t('accumulative')}}</span>
-                                <span class="green ml-1">
-                                    {{formData.commission_get}}
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </el-col>
-            </el-row>
+			<div class="bg-[#FAFAFD] py-[20px] pr-[80px] pl-[280px] relative">
+				<div class="member-info absolute w-[250px]">
+					<div class="flex items-center">
+						<span class="text-[14px] min-w-[110px] text-right mr-[20px]">{{ t('headimg') }}</span>
+						<span class="flex items-end text-[14px]">
+							<img class="w-[50px] h-[50px] inline-block" v-if="formData.headimg" :src="img(formData.headimg)" alt="">
+							<img class="w-[50px] h-[50px] inline-block" v-else src="@/assets/images/default_headimg.png" alt="">
+							<el-icon @click="editMemberInfo('headimg')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen color="#273CE2"/></el-icon>
+						</span>
+					</div>
+					<div class="flex items-center mt-[20px]">
+						<span class="text-[14px] min-w-[110px] text-right mr-[20px]">UID</span>
+						<span class="member-info-item text-[14px] text-[#666666] font-bold w-[150px]">
+							{{formData.member_no || t('notAvailable')}}
+						</span>
+					</div>
+				</div>
+				<div>
+					<el-row justify="space-evenly" class="flex">
+					    <el-col :span="5">
+					        <div class="statistic-card">
+					           <el-statistic :value="formData.point">
+					                <template #title>
+					                    <div style="display: inline-flex; align-items: center">
+											<span class="text-[14px]">
+												{{t('point')}}
+											</span>
+					                        <el-tooltip
+					                            effect="dark"
+					                            :content="t('adjust')"
+					                            placement="top"
+												
+					                        >
+					                            <el-icon @click="adjustPoint(formData)" class="ml-2 cursor-pointer" :size="12"><EditPen color="#273CE2"/></el-icon>
+					                        </el-tooltip>
+					                        <el-tooltip
+					                            effect="dark"
+					                            :content="t('detail')"
+					                            placement="top"
+					                        >
+					                            <el-icon @click="infoPoint(formData)" class="ml-2 cursor-pointer" :size="12"><View /></el-icon>
+					                        </el-tooltip>
+					                    </div>
+					                </template>
+					            </el-statistic>
+					            <div class="statistic-footer">
+					                <div class="footer-item text-[14px] text-[#333333]">
+					                    <span>{{t('accumulative')}}</span>
+					                    <span class="green ml-1">
+					                    {{formData.point_get}}
+					                    </span>
+					                </div>
+					            </div>
+					        </div>
+					    </el-col>
+					    <el-col :span="5">
+					        <div class="statistic-card">
+					            <el-statistic :value="formData.balance">
+					                <template #title>
+					                    <div style="display: inline-flex; align-items: center">
+											<span class="text-[14px]">
+												{{t('balance')}}
+											</span>
+					                        <el-tooltip
+					                            effect="dark"
+					                            :content="t('adjust')"
+					                            placement="top"
+					                        >
+					                            <el-icon @click="adjustBalance(formData)" class="ml-2 cursor-pointer" :size="12"><EditPen color="#273CE2"/></el-icon>
+					                        </el-tooltip>
+					                        <el-tooltip
+					                            effect="dark"
+					                            :content="t('detail')"
+					                            placement="top"
+					                        >
+					                            <el-icon @click="infoBalance(formData)" class="ml-2 cursor-pointer" :size="12"><View /></el-icon>
+					                        </el-tooltip>
+					                    </div>
+					                </template>
+					            </el-statistic>
+					            <div class="statistic-footer">
+					                <div class="footer-item text-[14px] text-[#333333]">
+					                    <span>{{t('accumulative')}}</span>
+					                    <span class="red ml-1">
+					                    {{formData.balance_get}}
+					                    </span>
+					                </div>
+					            </div>
+					        </div>
+					    </el-col>
+					    <el-col :span="5">
+					        <div class="statistic-card">
+					            <el-statistic :value="formData.money" title="New transactions today ">
+					                <template #title>
+					                    <div style="display: inline-flex; align-items: center">
+										<span class="text-[14px]">
+											{{t("money")}}
+										</span>
+					                    <el-tooltip
+					                            effect="dark"
+					                            :content="t('detail')"
+					                            placement="top"
+					                        >
+					                            <el-icon @click="infoBalance(formData)" class="ml-2 cursor-pointer" :size="12"><View/></el-icon>
+					                    </el-tooltip>
+					                    </div>
+					                </template>
+					            </el-statistic>
+					            <div class="statistic-footer">
+					                <div class="footer-item text-[14px] text-[#333333]">
+					                    <span>{{t('accumulative')}}</span>
+					                    <span class="green ml-1">
+					                        {{formData.money_get}}
+					                    </span>
+					                </div>
+					            </div>
+					        </div>
+					    </el-col>
+					    <el-col :span="5">
+					        <div class="statistic-card">
+					            <el-statistic :value="formData.commission" title="New transactions today">
+					                <template #title>
+					                    <div style="display: inline-flex; align-items: center ">
+										<span class="text-[14px]">
+											{{t("commission")}}
+										</span>
+					                    <el-tooltip
+					                            effect="dark"
+					                            :content="t('detail')"
+					                            placement="top"
+					                        >
+					                            <el-icon @click="infoCommission(formData)" class="ml-2 cursor-pointer" :size="12"><View/></el-icon>
+					                    </el-tooltip>
+					                    </div>
+					                </template>
+					            </el-statistic>
+					            <div class="statistic-footer">
+					                <div class="footer-item text-[14px] text-[#333333]">
+					                    <span>{{t('accumulative')}}</span>
+					                    <span class="green ml-1">
+					                        {{formData.commission_get}}
+					                    </span>
+					                </div>
+					            </div>
+					        </div>
+					    </el-col>
+					</el-row>
+				</div>
+			</div>
         </el-card>
+		<el-card class="box-card !border-none" shadow="never">
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('urserName') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.username || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('nickname') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.nickname || t('notAvailable')}}
+				</span>
+			</div>
+			
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('mobile') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.mobile || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('memberLabel') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.member_label_name.toString() || t('notAvailable')}}<el-icon @click="editMemberInfo('member_label')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen color="#273CE2"/></el-icon>
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('birthday') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.birthday || t('notAvailable')}}<el-icon @click="editMemberInfo('birthday')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen color="#273CE2"/></el-icon>
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('sex') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.sex == 1 && t('manSex') || formData.sex == 2 && t('girlSex') || t('secrecySex')}}<el-icon @click="editMemberInfo('sex')" class="-bottom-[2px] -right-[4px] cursor-pointer"><EditPen color="#273CE2"/></el-icon>
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('wxUnionid') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.wx_unionid || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('weappOpenid') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.weapp_openid || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('wxOpenid') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.wx_openid || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('registeredSource') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.register_channel_name || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('createTime') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.create_time || t('notAvailable')}}
+				</span>
+			</div>
+			<div class="flex items-center mt-[15px]">
+				<span class="text-[14px] w-[110px] text-right mr-[20px]">{{ t('lastVisitTime') }}</span>
+				<span class="text-[14px] text-[#666666]">
+					{{formData.last_visit_time || t('notAvailable')}}
+				</span>
+			</div>
+		</el-card>
 
         <point-edit ref="pointDialog" @complete="getMemberInfoFn" />
         <balance-edit ref="balanceDialog" @complete="getMemberInfoFn" />
@@ -275,4 +357,17 @@ const infoPoint = () => {
 
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+	.el-col {
+	  background-color: #FAFAFD;
+	}
+	.member-info {
+		left:0px
+	}
+	.member-info-item {
+		overflow:hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow:ellipsis;
+	}
+</style> 
diff --git a/admin/src/views/member/money.vue b/admin/src/views/member/money.vue
deleted file mode 100644
index 41e7ee959..000000000
--- a/admin/src/views/member/money.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-    <div class="main-container">
-        <el-card class="box-card !border-none" shadow="never">
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
-                     
-                    <el-form-item :label="t('fromType')" prop="from_type">
-                        <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
-                            <el-option :label="t('selectPlaceholder')" value="" />
-                            <el-option :label="item.name" :value="key" v-for="(item,key) in fromTypeList" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item :label="t('createTime')" prop="create_time">
-                        <el-date-picker
-                            v-model="memberAccountLogTableData.searchParam.create_time"
-                            type="datetimerange"
-                            value-format="YYYY-MM-DD HH:mm:ss"
-                            :start-placeholder="t('startDate')"
-                            :end-placeholder="t('endDate')"
-                        />
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-card>
-
-            <div class="mt-[16px]">
-                <el-table :data="memberAccountLogTableData.data" size="large" v-loading="memberAccountLogTableData.loading">
-
-                    <template #empty>
-                        <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
-                    </template>
-
-                    <el-table-column  :label="t('nickName')" min-width="140" :show-overflow-tooltip="true">
-                        <template #default="{ row }">
-                            <div class="flex items-center cursor-pointer " @click="toMember(row.member_id)">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.headimg)" alt="" >
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
-                                <div class="flex flex flex-col">
-                                    <span class="text-blue-700">{{ row.nickname || '' }}</span>
-                                    <span class="text-blue-700">{{ row.mobile || '' }}</span>
-                                </div>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="account_data" :label="t('accountData')" min-width="120" />
-                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="120" />
-                    <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
-                    <el-table-column prop="memo" :label="t('memo')" min-width="120" />
-
-                    <el-table-column :label="t('operation')" fixed="right" width="100">
-                       <template #default="{ row }">
-                           <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
-                       </template>
-                    </el-table-column>
-
-                </el-table>
-                <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="memberAccountLogTableData.page" v-model:page-size="memberAccountLogTableData.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="memberAccountLogTableData.total"
-                        @size-change="loadMemberAccountLogList()" @current-change="loadMemberAccountLogList" />
-                </div>
-            </div>
-        </el-card>
-        <money-info ref="moneyDialog" @complete="loadMemberAccountLogList" />
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
-import { t } from '@/lang'
-import { getChangeTypeList,getMoneyList } from '@/api/member'
-import { img } from '@/utils/common'
-import moneyInfo from '@/views/member/components/member-money-info.vue'
-import { useRouter,useRoute } from 'vue-router'
-const route = useRoute()
-const member_id: number = parseInt(route.query.id || 0)
-
-let memberAccountLogTableData = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: true,
-    data: [],
-    searchParam:{
-      from_type:"",
-      create_time:"",
-      mobile:"",
-      member_id:member_id
-    }
-})
-
-
-let fromTypeList = ref([])
-
-const setFromTypeList = async () => {
-    fromTypeList.value = await (await getChangeTypeList('money')).data
-}
-
-setFromTypeList();
-
-const searchFormRef = ref<FormInstance>()
-
-/**
- * 获取会员账单表列表
- */
-const loadMemberAccountLogList = (page: number = 1) => {
-    memberAccountLogTableData.loading = true
-    memberAccountLogTableData.page = page
-
-    getMoneyList({
-        page: memberAccountLogTableData.page,
-        limit: memberAccountLogTableData.limit,
-         ...memberAccountLogTableData.searchParam
-    }).then(res => {
-        memberAccountLogTableData.loading = false
-        memberAccountLogTableData.data = res.data.data
-        memberAccountLogTableData.total = res.data.total
-    }).catch(() => {
-        memberAccountLogTableData.loading = false
-    })
-}
-loadMemberAccountLogList()
-
-const moneyDialog: Record<string, any> | null = ref(null)
-
-/**
- * 查看详情
- * @param data
- */
- const infoEvent = (data: any) => {
-    moneyDialog.value.setFormData(data)
-    moneyDialog.value.showDialog = true
-}
-
-const router = useRouter()
-
-/**
- * 会员详情
- */
-const toMember = (member_id:number) => {
-    router.push(`/member/detail?id=${member_id}`)
-}
- 
- 
-</script>
-
-<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/admin/src/views/member/point.vue b/admin/src/views/member/point.vue
index 9947c4aef..26528bd63 100644
--- a/admin/src/views/member/point.vue
+++ b/admin/src/views/member/point.vue
@@ -1,9 +1,40 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <div class="flex justify-between items-center mb-[5px]">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none base-bg !px-[35px]" shadow="never">
+			    <el-row class="flex">
+			        <el-col :span="12" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="pointStatistics.point_get ? Number.parseInt(pointStatistics.point_get) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('pointGet') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+					<el-col :span="12" class="min-w-[100px]">
+                        <div class="statistic-card">
+                            <el-statistic :value="pointStatistics.point_use ? Number.parseInt(pointStatistics.point_use) : '0'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('pointUse') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+			      
+			    </el-row>
+			</el-card>
+            <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
-                     
+                    <el-form-item :label="t('memberInfo')" prop="keywords">
+                        <el-input v-model="memberAccountLogTableData.searchParam.keywords" class="w-[240px]"
+                            :placeholder="t('memberInfoPlaceholder')" />
+                    </el-form-item>
                     <el-form-item :label="t('fromType')" prop="from_type">
                         <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
                             <el-option :label="t('selectPlaceholder')" value="" />
@@ -21,7 +52,7 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadMemberAccountLogList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
@@ -33,22 +64,39 @@
                         <span>{{ !memberAccountLogTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
 
-                    <el-table-column  :label="t('nickName')" min-width="140" :show-overflow-tooltip="true">
+                    <el-table-column prop="member_id" :label="t('memberId')" min-width="80" :show-overflow-tooltip="true">
                         <template #default="{ row }">
-                            <div class="flex items-center cursor-pointer " @click="toMember(row.member_id)">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.headimg)" alt="" >
+                            {{ row.member.member_no }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column  :label="t('memberInfo')" min-width="150" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div class="flex items-center cursor-pointer" @click="toMember(row.member_id)">
+                                <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.member.headimg" :src="img(row.member.headimg)" alt="" >
                                 <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
                                 <div class="flex flex flex-col">
-                                    <span class="text-blue-700">{{ row.nickname || '' }}</span>
-                                    <span class="text-blue-700">{{ row.mobile || '' }}</span>
+                                    <span class="">{{ row.member.nickname || '' }}</span>
                                 </div>
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="account_data" :label="t('accountData')" min-width="120" />
-                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="120" />
+					<el-table-column prop="mobile" :label="t('mobile')" min-width="100">
+						<template #default="{ row }">
+							{{ row.member.mobile || '' }}
+                        </template>
+					</el-table-column>
+
+                    <el-table-column prop="account_data" :label="t('accountData')" min-width="80" align="right">
+						<template #default="{ row }">
+							<span v-if="row.account_data >= 0">+{{ row.account_data }}</span>
+							<span v-else>{{ row.account_data }}</span>
+                        </template>
+					</el-table-column>
+
+                    <el-table-column prop="account_sum" :label="t('accountSum')" min-width="120" align="right"/>
+ 
+                    <el-table-column prop="from_type_name" :label="t('fromType')" min-width="180" align="center"/>
                     <el-table-column prop="create_time" :show-overflow-tooltip="true" :label="t('createTime')" min-width="150" />
-                    <el-table-column prop="memo" :label="t('memo')" min-width="120" />
 
                     <el-table-column :label="t('operation')" fixed="right" width="100">
                        <template #default="{ row }">
@@ -71,12 +119,14 @@
 <script lang="ts" setup>
 import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
-import { getChangeTypeList,getPointList } from '@/api/member'
+import { getChangeTypeList,getPointList,getPointSum } from '@/api/member'
+import { ElMessageBox, FormInstance } from 'element-plus'
 import { img } from '@/utils/common'
 import pointInfo from '@/views/member/components/member-point-info.vue'
 import { useRouter,useRoute } from 'vue-router'
 const route = useRoute()
 const member_id: number = parseInt(route.query.id || 0)
+const pageName = route.meta.title;
 
 let memberAccountLogTableData = reactive({
     page: 1,
@@ -85,6 +135,7 @@ let memberAccountLogTableData = reactive({
     loading: true,
     data: [],
     searchParam:{
+      keywords:"",
       from_type:"",
       create_time:"",
       mobile:"",
@@ -92,6 +143,18 @@ let memberAccountLogTableData = reactive({
     }
 })
 
+/**
+ * 获取积分总计
+ */
+ const pointStatistics = ref([])
+const checkPointInfo = () => {
+	getPointSum({
+		member_id
+	 }).then(res => {
+		pointStatistics.value = res.data;
+	 })
+}
+checkPointInfo()
 
 let fromTypeList = ref([])
 
@@ -103,7 +166,17 @@ setFromTypeList();
 
 const searchFormRef = ref<FormInstance>()
 
+
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadMemberAccountLogList();
+}
+
+
 /**
+ * 
  * 获取会员账单表列表
  */
 const loadMemberAccountLogList = (page: number = 1) => {
diff --git a/admin/src/views/order/refund.vue b/admin/src/views/order/refund.vue
index 6b5666d09..3d5cf3f7c 100644
--- a/admin/src/views/order/refund.vue
+++ b/admin/src/views/order/refund.vue
@@ -1,75 +1,149 @@
 <template>
-    <div class="main-container">
-        <el-card class="box-card !border-none" shadow="never">
-       
-		   <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
-			   <el-form :inline="true" :model="refundTableData.searchParam" ref="searchFormRef">
-				<el-form-item :label="t('refundStatus')" prop="order_from">
-					<el-select v-model="refundTableData.searchParam.status" clearable class="input-width">
-						<el-option :label="t('selectPlaceholder')" value="" />
-						<el-option :label="item.name" :value="key" v-for="(item, key) in refundList" />
-					</el-select>
-				</el-form-item>
-				   <el-form-item :label="t('createTime')" prop="create_time">
-					   <el-date-picker v-model="refundTableData.searchParam.create_time" type="datetimerange"
-						   value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
-						   :end-placeholder="t('endDate')" />
-				   </el-form-item>
-				   <el-form-item>
-					   <el-button type="primary" @click="loadRefundList()">{{ t('search') }}</el-button>
-					   <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
-				   </el-form-item>
-			   </el-form>
-		   </el-card>
+	<div class="main-container">
+		<el-card class="box-card !border-none" shadow="never">
+			<div class="flex justify-between items-center mb-[5px]">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
 
-		   <div class="mt-[16px]">
-			   <el-table :data="refundTableData.data" size="large" v-loading="refundTableData.loading">
-				   <template #empty>
-					   <span>{{ !refundTableData.loading ? t('emptyData') : '' }}</span>
-				   </template>
-
-				    <el-table-column prop="order_no" :show-overflow-tooltip="true" :label="t('memberInfo')" align="left" min-width="140">
-					   <template #default="{ row }">
-						   <div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)">
-							   <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.member.headimg)" alt="" >
-							   <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png" alt="" >
-							   <div class="flex flex flex-col">
-								   <span class="text-blue-700">{{ row.member.nickname || '' }}</span>
-								   <span class="text-blue-700">{{ row.member.mobile || '' }}</span>
-							   </div>
-						   </div>
-					   </template>
-				    </el-table-column>
-					<el-table-column prop="refund_no" :label="t('refundNumber')" align="center" min-width="200" />
-				    <el-table-column prop="item.item_name" :label="t('refundSource')" align="center" min-width="140" />
-				    <el-table-column prop="money" :label="t('refundAmount')" align="center" min-width="140" />
-				    <el-table-column :label="t('refundTime')" min-width="180" align="center">
-					    <template #default="{ row }">
-							{{ row.create_time || '' }}
-					    </template>
-				    </el-table-column>
-				    <el-table-column :label="t('statusName')" min-width="180" align="center">
-					    <template #default="{ row }">
-						    {{ row.status_name || '' }}
-					    </template>
-				    </el-table-column>
-
-				    <!--  <el-table-column :label="t('operation')" fixed="right" width="230">
-					   <template #default="{ row }">
-						 <el-button v-for="(item,index) in operationBtn[row.status.toString()].value" :key="index+'a'" @click="fnProcessing(operationBtn[row.status.toString()].clickArr[index],row)" type="primary" link>{{ item }}</el-button> 
-					   </template>
-				   </el-table-column>-->
+			<el-card class="box-card !border-none table-search-wra base-bg !px-[35px]" shadow="never">
+			    <el-row class="flex">
+			        <el-col :span="12">
+						<div class="statistic-card">
+                            <el-statistic :value="refundStat.refund_all_money"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('accumulateRefundMoney') }}</span>
+                                </div>
+                            </div>
+                        </div>
+					</el-col>
+					<el-col :span="12">
+						<div class="statistic-card">
+                            <el-statistic :value="refundStat.refund_have_money"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('haveRefundMoney') }}</span>
+                                </div>
+                            </div>
+                        </div>
+					</el-col>
+			    </el-row>
+			</el-card>
  
-			    </el-table>
-			    <div class="mt-[16px] flex justify-end">
-				    <el-pagination v-model:current-page="refundTableData.page" v-model:page-size="refundTableData.limit"
-					   layout="total, sizes, prev, pager, next, jumper" :total="refundTableData.total"
-					   @size-change="loadRefundList()" @current-change="loadRefundList" />
-			    </div>
-		   </div>
+			<el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
+				<el-form :inline="true" :model="refundTableData.searchParam" ref="searchFormRef">
+					<el-form-item :label="t('memberInfo')" prop="keywords">
+						<el-input v-model="refundTableData.searchParam.keywords" class="w-[240px]"
+							:placeholder="t('memberInfoPlaceholder')" />
+					</el-form-item>
+					<el-form-item :label="t('refundNumber')" prop="refund_no">
+						<el-input v-model="refundTableData.searchParam.refund_no" class="w-[240px]"
+							:placeholder="t('refundNumberPlaceholder')" />
+					</el-form-item>
+					<el-form-item :label="t('orderNumber')" prop="order_no">
+						<el-input v-model="refundTableData.searchParam.order_no" class="w-[240px]"
+							:placeholder="t('orderNumberPlaceholder')" />
+					</el-form-item>
 
-	   </el-card>
-    </div>
+					<el-form-item :label="t('refundStatus')" prop="status">
+						<el-select v-model="refundTableData.searchParam.status" clearable class="input-width">
+							<el-option :label="t('selectPlaceholder')" value="" />
+							<el-option :label="item.name" :value="key" v-for="(item, key) in refundList" />
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="t('refundTime')" prop="create_time">
+						<el-date-picker v-model="refundTableData.searchParam.create_time" type="datetimerange"
+							value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+							:end-placeholder="t('endDate')" />
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="loadRefundList()">{{ t('search') }}</el-button>
+						<el-button  @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-card>
+
+			<div>
+				<el-table :data="refundTableData.data" size="large" v-loading="refundTableData.loading">
+					<template #empty>
+						<span>{{ !refundTableData.loading ? t('emptyData') : '' }}</span>
+					</template>
+
+					<el-table-column :show-overflow-tooltip="true" :label="t('memberInfo')" align="left" min-width="140">
+						<template #default="{ row }">
+							<div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)">
+								<img class="w-[50px] h-[50px] mr-[10px]" v-if="row.headimg" :src="img(row.member.headimg)"
+									alt="">
+								<img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/default_headimg.png"
+									alt="">
+								<div class="flex flex flex-col">
+									<span class="">{{ row.member.nickname || '' }}</span>
+									<span class="">{{ row.member.mobile || '' }}</span>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="refund_no" :label="t('refundNumber')" align="center" min-width="200" />
+					<el-table-column prop="item.item_name" :label="t('refundSource')" align="center" min-width="140" />
+					<el-table-column prop="money" :label="t('refundAmount')" align="center" min-width="140" />
+					<el-table-column :label="t('refundTime')" min-width="180" align="center">
+						<template #default="{ row }">
+							{{ row.create_time || '' }}
+						</template>
+					</el-table-column>
+					<el-table-column :label="t('statusName')" min-width="180" align="center">
+						<template #default="{ row }">
+							{{ row.status_name || '' }}
+						</template>
+					</el-table-column>
+					
+					<el-table-column :label="t('operation')" fixed="right" width="130">
+					    <template #default="{ row }">
+					        <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+					    </template>
+					</el-table-column>
+
+				</el-table>
+				<div class="mt-[16px] flex justify-end">
+					<el-pagination v-model:current-page="refundTableData.page" v-model:page-size="refundTableData.limit"
+						layout="total, sizes, prev, pager, next, jumper" :total="refundTableData.total"
+						@size-change="loadRefundList()" @current-change="loadRefundList" />
+				</div>
+			</div>
+
+		</el-card>
+		
+		<el-dialog v-model="refundInfoShowDialog" :title="t('refundDetail')" width="500px" :destroy-on-close="true">
+		    <el-form :model="refundInfo" label-width="120px" ref="formRef" :rules="formRules" class="page-form" >
+				<el-form-item :label="t('nickname')">
+				    <div class="input-width"> {{ refundInfo.member.nickname }} </div>
+				</el-form-item>
+				<el-form-item :label="t('refundSource')">
+				    <div class="input-width"> {{ refundInfo.item.item_name }} </div>
+				</el-form-item>
+				<el-form-item :label="t('refundAmount')">
+				    <div class="input-width"> {{ refundInfo.money }} </div>
+				</el-form-item>
+				<el-form-item :label="t('orderNumber')">
+				    <div class="input-width"> {{ refundInfo.item.order_no }} </div>
+				</el-form-item>
+				<el-form-item :label="t('refundNumber')">
+				    <div class="input-width"> {{ refundInfo.refund_no }} </div>
+				</el-form-item>
+				<el-form-item :label="t('refundTime')">
+				    <div class="input-width"> {{ refundInfo.create_time }} </div>
+				</el-form-item>
+				<el-form-item :label="t('statusName')">
+				    <div class="input-width"> {{ refundInfo.status_name }} </div>
+				</el-form-item>
+		    </el-form>
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="refundInfoShowDialog = false">{{t('confirm')}}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -77,63 +151,96 @@ import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import { useRouter, useRoute } from 'vue-router'
-import { getRefund, getRefundStatus } from '@/api/order'
+import { getRefund, getRefundStatus, getRefundStat } from '@/api/order'
+import { FormInstance } from 'element-plus'
 
 const router = useRouter()
+const route = useRoute()
+const pageName = route.meta.title;
+const searchFormRef = ref<FormInstance>()
 const refundTableData = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: true,
-    data: [],
-    searchParam: {
-        // order_no: '',
-        // member_id,
-        create_time: [],
-        status: ''
-    }
+	page: 1,
+	limit: 10,
+	total: 0,
+	loading: true,
+	data: [],
+	searchParam: {
+		refund_no: '',
+		// member_id,
+		create_time: [],
+		status: '',
+		keywords: '',
+		order_no:''
+	}
 })
 
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadRefundList();
+}
 /**
  * 获取退款列表
  */
 const loadRefundList = (page: number = 1) => {
-    refundTableData.loading = true
-    refundTableData.page = page
+	refundTableData.loading = true
+	refundTableData.page = page
 
-    getRefund({
-        page: refundTableData.page,
-        limit: refundTableData.limit,
-        ...refundTableData.searchParam
-    }).then(res => {
-		console.log(res)
-        refundTableData.loading = false
-        refundTableData.data = res.data.data
-        refundTableData.total = res.data.total
-    }).catch(() => {
-        refundTableData.loading = false
-    })
+	getRefund({
+		page: refundTableData.page,
+		limit: refundTableData.limit,
+		...refundTableData.searchParam
+	}).then(res => {
+		refundTableData.loading = false
+		refundTableData.data = res.data.data
+		refundTableData.total = res.data.total
+	}).catch(() => {
+		refundTableData.loading = false
+	})
 }
 loadRefundList()
 
 const refundList = ref([])
 const checkRefundList = () => {
-	getRefundStatus().then(res=>{
-		console.log(res.data)
+	getRefundStatus().then(res => {
 		refundList.value = res.data
-		console.log(res.data)
 	})
-} 
+}
 checkRefundList()
+
+const refundStat = reactive({
+	refund_all_money: 0.00,
+	refund_have_money: 0.00,
+	refund_Success_money: 0.00,
+	refund_fail_moey: 0.00
+})
+const checkRefundStat = () =>{
+	getRefundStat().then(res=>{
+		refundStat.refund_all_money = res.data['all'].money;
+		refundStat.refund_have_money = res.data['have'].money;
+		refundStat.refund_Success_money = res.data['3'].money;
+		refundStat.refund_fail_moey = res.data['-1'].money;
+	})
+}
+checkRefundStat()
+
+const refundInfoShowDialog = ref(false)
+const refundInfo = ref({});
+// const refundInfoLoading = ref(true);
+const infoEvent = (info) => {
+	refundInfo.value = info;
+	refundInfoShowDialog.value = true
+}
+
 /**
  * 会员详情
  */
 const toMember = (member_id: number) => {
-    router.push(`/member/detail?id=${member_id}`)
+	router.push(`/member/detail?id=${member_id}`)
 }
 
 </script>
 
-
-
 <style lang="scss" scoped></style>
diff --git a/admin/src/views/setting/adminlogin.vue b/admin/src/views/setting/adminlogin.vue
index e86c9d3f6..bd86a2b0c 100644
--- a/admin/src/views/setting/adminlogin.vue
+++ b/admin/src/views/setting/adminlogin.vue
@@ -12,7 +12,7 @@
 
                 <el-form-item :label="t('bgImg')">
                     <upload-image v-model="formData.bg" />
-                    <div class="form-tip">{{t('isBgImgTip')}}</div>
+                    <div class="form-tip">{{t('adminBgImgTip')}}</div>
                 </el-form-item>
 
             </el-card>
@@ -26,6 +26,7 @@
 
                 <el-form-item :label="t('bgImg')">
                     <upload-image v-model="formData.site_bg" />
+                    <div class="form-tip">{{t('siteBgImgTip')}}</div>
                 </el-form-item>
                 
             </el-card>
diff --git a/admin/src/views/setting/agreement.vue b/admin/src/views/setting/agreement.vue
index 1beae2e9f..02ab3c0a3 100644
--- a/admin/src/views/setting/agreement.vue
+++ b/admin/src/views/setting/agreement.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-           
-            <div class="mt-[16px]">
+           <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <div class="mt-[20px]">
                 <el-table :data="agreementTableData.data" size="large" v-loading="agreementTableData.loading">
 
                     <template #empty>
@@ -36,7 +38,9 @@
 import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
 import { getAgreementList } from '@/api/sys'
-import { useRouter } from 'vue-router'
+import { useRouter,useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
  
 let agreementTableData = reactive({
     loading: true,
diff --git a/admin/src/views/setting/withdrawal.vue b/admin/src/views/setting/cash_out.vue
similarity index 95%
rename from admin/src/views/setting/withdrawal.vue
rename to admin/src/views/setting/cash_out.vue
index ec25d8438..38bc8573d 100644
--- a/admin/src/views/setting/withdrawal.vue
+++ b/admin/src/views/setting/cash_out.vue
@@ -48,7 +48,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang' 
-import { getWithdrawConfig, setWithdrawConfig, getTransfertype } from '@/api/member'
+import { getCashOutConfig, setCashOutConfig, getTransfertype } from '@/api/member'
 import { ElMessage, FormRules, FormInstance } from 'element-plus'
 
 const loading = ref(true),
@@ -72,7 +72,7 @@ getTransfertypeFn()
 
 // 获取会员的配置信息
 const setFormData = async (id: number = 0) => {
-    const data = await (await getWithdrawConfig()).data
+    const data = await (await getCashOutConfig()).data
     Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key];
     })
@@ -117,7 +117,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
             let save = {...formData};
             save.is_open = Number(save.is_open).toString();
 
-            setWithdrawConfig(save).then(() => {
+            setCashOutConfig(save).then(() => {
                 loading.value = false
             }).catch(() => {
                 loading.value = false
diff --git a/admin/src/views/setting/components/notice-sms.vue b/admin/src/views/setting/components/notice-sms.vue
index 71d0130d2..c0aff376e 100644
--- a/admin/src/views/setting/components/notice-sms.vue
+++ b/admin/src/views/setting/components/notice-sms.vue
@@ -58,7 +58,8 @@ const initialFormData = {
     sms_default_content: '',
     title: '',
     type: '',
-    sms_id: ''
+    sms_id: '',
+	content: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -87,6 +88,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
             loading.value = true
 
             const data = formData
+			data.status = data.is_sms;
 
             editNotice(data).then(res => {
                 loading.value = false
@@ -94,7 +96,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
@@ -106,7 +108,8 @@ const setFormData = async (row: any = null) => {
 
     if (row) {
         Object.keys(formData).forEach((key: string) => {
-            if (row[key] != undefined) formData[key] = row[key]
+            if (row[key] != undefined) formData[key] = row[key];
+			if (row.sms && row.sms[key] != undefined) formData[key] = row.sms[key]
         })
     }
 
diff --git a/admin/src/views/setting/components/notice-weapp.vue b/admin/src/views/setting/components/notice-weapp.vue
index 9ca45fce7..0443d13a0 100644
--- a/admin/src/views/setting/components/notice-weapp.vue
+++ b/admin/src/views/setting/components/notice-weapp.vue
@@ -84,14 +84,15 @@ const confirm = async (formEl: FormInstance | undefined) => {
             loading.value = true
 
             const data = formData
-
+			data.status = data.is_weapp;
+			
             editNoticeStatus(data).then(res => {
                 loading.value = false
                 showDialog.value = false
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/notice-wechat.vue b/admin/src/views/setting/components/notice-wechat.vue
index 2fcba8b70..fd3efb40a 100644
--- a/admin/src/views/setting/components/notice-wechat.vue
+++ b/admin/src/views/setting/components/notice-wechat.vue
@@ -96,14 +96,14 @@ const confirm = async (formEl: FormInstance | undefined) => {
             loading.value = true
 
             const data = formData
-
+			data.status = data.is_wechat;
             editNotice(data).then(res => {
                 loading.value = false
                 showDialog.value = false
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/pay-offlinepay.vue b/admin/src/views/setting/components/pay-offlinepay.vue
index 0652908d2..92541da25 100644
--- a/admin/src/views/setting/components/pay-offlinepay.vue
+++ b/admin/src/views/setting/components/pay-offlinepay.vue
@@ -70,7 +70,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/sms-ali.vue b/admin/src/views/setting/components/sms-ali.vue
index f65f2cf10..75d7b1d57 100644
--- a/admin/src/views/setting/components/sms-ali.vue
+++ b/admin/src/views/setting/components/sms-ali.vue
@@ -96,7 +96,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/sms-tencent.vue b/admin/src/views/setting/components/sms-tencent.vue
index 3d21308de..8fbab83ff 100644
--- a/admin/src/views/setting/components/sms-tencent.vue
+++ b/admin/src/views/setting/components/sms-tencent.vue
@@ -104,7 +104,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/storage-ali.vue b/admin/src/views/setting/components/storage-ali.vue
index e4334ca16..8476d552c 100644
--- a/admin/src/views/setting/components/storage-ali.vue
+++ b/admin/src/views/setting/components/storage-ali.vue
@@ -115,7 +115,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/storage-local.vue b/admin/src/views/setting/components/storage-local.vue
index 10ebb1f8e..4ffd3e735 100644
--- a/admin/src/views/setting/components/storage-local.vue
+++ b/admin/src/views/setting/components/storage-local.vue
@@ -71,7 +71,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/storage-qiniu.vue b/admin/src/views/setting/components/storage-qiniu.vue
index 40ed91fbc..4ab6fb916 100644
--- a/admin/src/views/setting/components/storage-qiniu.vue
+++ b/admin/src/views/setting/components/storage-qiniu.vue
@@ -109,7 +109,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/components/storage-tencent.vue b/admin/src/views/setting/components/storage-tencent.vue
index 1dd19d124..08d57cd7a 100644
--- a/admin/src/views/setting/components/storage-tencent.vue
+++ b/admin/src/views/setting/components/storage-tencent.vue
@@ -113,7 +113,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/setting/login.vue b/admin/src/views/setting/login.vue
index 939e3ff88..f3e960b3e 100644
--- a/admin/src/views/setting/login.vue
+++ b/admin/src/views/setting/login.vue
@@ -2,24 +2,33 @@
     <div class="main-container">
         <el-form :model="formData" label-width="150px" ref="ruleFormRef" class="page-form" v-loading="loading">
             <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title">{{ t('commonSetting') }}</h3>
 
                 <el-form-item :label="t('logonMode')">
-                    <el-checkbox v-model="formData.is_username" :label="t('isUsername')" @change="switchChange($event,'is_username')"/>
-                    <div class="form-tip">{{t('isUsernameTip')}}</div>
-                    <el-checkbox v-model="formData.is_mobile" :label="t('isMobile')" @change="switchChange($event,'is_mobile')"/>
-                    <div class="form-tip">{{t('isMobileTip')}}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('isAuthRegister')" prop="formData.is_auth_register">
-                    <el-switch v-model="formData.is_auth_register" @change="switchChange($event,'is_auth_register')" />
-                    <div class="form-tip">{{t('isAuthRegisterTip')}}</div>
+                    <el-checkbox v-model="formData.is_username" :label="t('isUsername')"
+                        @change="switchChange($event, 'is_username')" />
+                    <div class="form-tip">{{ t('isUsernameTip') }}</div>
+                    <el-checkbox v-model="formData.is_mobile" :label="t('isMobile')"
+                        @change="switchChange($event, 'is_mobile')" />
+                    <div class="form-tip">{{ t('isMobileTip') }}</div>
                 </el-form-item>
 
                 <el-form-item :label="t('isBindMobile')" prop="formData.is_bind_mobile">
-                    <el-switch v-model="formData.is_bind_mobile" @change="switchChange($event,'is_bind_mobile')" />
-                    <div class="form-tip">{{t('isBindMobileTip')}}</div>
+                    <el-switch v-model="formData.is_bind_mobile" @change="switchChange($event, 'is_bind_mobile')" />
+                    <div class="form-tip">{{ t('isBindMobileTip') }}</div>
+                </el-form-item>
+
+                <el-form-item :label="t('agreement')" prop="formData.agreement_show">
+                    <el-switch v-model="formData.agreement_show" @change="switchChange($event, 'agreement_show')" />
+                    <div class="form-tip">{{ t('agreementTips') }}</div>
+                </el-form-item>
+
+                <h3 class="panel-title">{{ t('tripartiteSetting') }}</h3>
+
+                <el-form-item :label="t('isAuthRegister')" prop="formData.is_auth_register">
+                    <el-switch v-model="formData.is_auth_register" @change="switchChange($event, 'is_auth_register')" />
+                    <div class="form-tip">{{ t('isAuthRegisterTip') }}</div>
                 </el-form-item>
-                
             </el-card>
         </el-form>
         <div class="fixed-footer-wrap">
@@ -34,40 +43,38 @@
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getLoginConfig, setLoginConfig } from '@/api/member'
-import { ElMessage, FormRules, FormInstance } from 'element-plus'
-
-const loading = ref(true),
-      ruleFormRef = ref<FormInstance>(),
-      formData = reactive<Record<string, number | boolean>>({
-        is_username: 0,
-        is_mobile: 0,
-        is_auth_register: 0,
-        is_bind_mobile: 0
-      });
+import { FormInstance } from 'element-plus'
 
+const loading = ref(true)
+const ruleFormRef = ref<FormInstance>()
+const formData = reactive<Record<string, number | boolean>>({
+    is_username: 0,
+    is_mobile: 0,
+    is_auth_register: 0,
+    is_bind_mobile: 0,
+    agreement_show: 0
+})
 
 const setFormData = async (id: number = 0) => {
     const data = await (await getLoginConfig()).data
     Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = Boolean(Number(data[key]));
+        if (data[key] != undefined) formData[key] = Boolean(Number(data[key]))
     })
-    loading.value = false;
+    loading.value = false
 }
 setFormData()
 
-
-
-const switchChange = (val,key)=>{
-    formData[key] = val;
+const switchChange = (val, key) => {
+    formData[key] = val
 }
 
 const onSave = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
     await formEl.validate((valid) => {
         if (valid) {
-            let save = JSON.parse(JSON.stringify(formData));
-            Object.keys(save).forEach((key)=>{
-                save[key] = Number(save[key]);
+            const save = JSON.parse(JSON.stringify(formData))
+            Object.keys(save).forEach((key) => {
+                save[key] = Number(save[key])
             })
 
             setLoginConfig(save).then(() => {
@@ -81,7 +88,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
 </script>
 
 <style lang="scss" scoped>
-.el-form .form-tip{
+.el-form .form-tip {
     line-height: 1.5;
     margin-top: 5px;
 }
diff --git a/admin/src/views/setting/member.vue b/admin/src/views/setting/member.vue
new file mode 100644
index 000000000..00abb9685
--- /dev/null
+++ b/admin/src/views/setting/member.vue
@@ -0,0 +1,123 @@
+<template>
+    <div class="main-container">
+        <el-form :model="formData" label-width="150px" ref="ruleFormRef" :rules="formRules" class="page-form"
+            v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title">{{ t('memberNoRule') }}</h3>
+
+                <el-form-item :label="t('prefix')" prop="prefix">
+                    <el-input v-model="formData.prefix" :placeholder="t('prefixPlaceholder')" class="input-width" clearable
+                        maxlength="20" @change="getMemberNo(ruleFormRef)"/>
+                    
+                </el-form-item>
+
+                <el-form-item :label="t('length')" prop="length">
+                    <el-input v-model="formData.length" :placeholder="t('lengthPlaceholder')" class="input-width" clearable
+                        type="number" @change="getMemberNo(ruleFormRef)"/>
+                    <div class="form-tip">{{ t('lengthTips') }}</div>
+                </el-form-item>
+
+                <el-form-item  >
+                    <div class="text-lg">{{ memberNo }}</div>
+                </el-form-item>
+            </el-card>
+        </el-form>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(ruleFormRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { getMemberConfig, setMemberConfig } from '@/api/member'
+import { FormInstance, FormRules } from 'element-plus'
+
+const loading = ref(true)
+const ruleFormRef = ref<FormInstance>({})
+let memberNo = ref('');
+
+//验证会员编号
+const prefixVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[a-zA-Z]*$/g.test(value)) {
+        callback(new Error(t('prefixHint')))
+    }else {
+        callback()
+    }
+}
+
+// 表单验证规则
+const formRules = reactive<FormRules>({
+    prefix: [
+         { validator: prefixVerify, trigger: 'blur' }
+    ],
+    length: [
+        { required: true, message: t('lengthPlaceholder'), trigger: 'blur' },
+        { validator: (rule: any, value: any, callback: any) => {
+            if (parseInt(value) > 30 || parseInt(value) - formData.prefix.length < 4) {
+                callback(new Error(t('lengthHint')))
+            }else {
+                callback()
+            }
+        }, trigger: 'blur' }
+    ]
+})
+
+
+
+const formData = reactive<Record<string, number | string>>({
+    prefix: '',
+    length: 10
+})
+
+const setFormData = async () => {
+    const data = await (await getMemberConfig()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+    getMemberNo(ruleFormRef.value);
+    loading.value = false
+}
+setFormData()
+
+
+
+const getMemberNo = async (formEl: FormInstance | undefined) => {
+    await formEl.validate((valid) => {
+        if (valid) {
+            let no = '';
+            let length = formData.length - formData.prefix.length - 1;
+            for(let i = 1; i <= length;i++) no += '0';
+            memberNo.value = formData.prefix + no + '1';
+        }
+    })
+}
+
+
+const onSave = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    await formEl.validate((valid) => {
+        if (valid) {
+            setMemberConfig(formData).then(() => {
+                loading.value = false
+                getMemberNo();
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+
+
+</script>
+
+<style lang="scss" scoped>
+.el-form .form-tip {
+    line-height: 1.5;
+    margin-top: 5px;
+}
+</style>
diff --git a/admin/src/views/setting/notice.vue b/admin/src/views/setting/notice.vue
index c15840ad9..b3e097b50 100644
--- a/admin/src/views/setting/notice.vue
+++ b/admin/src/views/setting/notice.vue
@@ -3,72 +3,54 @@
         <el-card class="box-card !border-none" shadow="never">
             <h3 class="panel-title">{{ t('buyerNotice') }}</h3>
             <div class="flex flex-row flex-wrap m-[-4px]">
-               
-                <div class="sm:w-1/2 md:w-1/3 lg:w-1/3 xl:w-1/4 2xl:w-1/4 p-1" v-for="item in noticeTableData.buyer" >
-                    <div class="border rounded-sm	" >
-                        <div class="card-header flex items-center p-4 pb-3 pt-3 border-b text-base">
-                            <span class="mr-1">{{ item.name }}</span>
-                            <el-tooltip
-                                class="box-item"
-                                effect="dark"
-                                :content="item.title"
-                                placement="top"
-                            >
-                                <el-icon class="cursor-pointer"><Warning /></el-icon>
-                            </el-tooltip>
-                        </div>
-                        <div class="flex justify-around notice-type p-4 pb-6 pt-6 ">
-                            <div class="text-sm mr-1 flex items-center cursor-pointer" v-if="item.sms_type == 1" @click="setNotice(item, 'sms')">
-                                <el-icon :class="item.is_sms ? 'open' : ''"><CircleCheck /></el-icon>
-                                <span class="ml-0.5">{{ t('sms') }}</span>
-                            </div>
-                            <div class="text-sm  flex items-center cursor-pointer" v-if="item.wechat_type" @click="setNotice(item, 'wechat')">
-                                <el-icon :class="item.is_wechat ? 'open' : ''"><CircleCheck /></el-icon>
-                                <span class="ml-0.5">{{ t('wechat') }}</span>
-                            </div>
-                            <div class="text-sm  flex items-center cursor-pointer" v-if="item.weapp_type" @click="setNotice(item, 'weapp')">
-                                <el-icon :class="item.is_weapp ? 'open' : ''"><CircleCheck /></el-icon>
-                                <span class="ml-0.5">{{ t('weapp') }}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                 
+				<el-table :data="noticeTableData.seller" size="large">
+				    <el-table-column prop="name" :label="t('noticeType')" min-width="120" />
+				    <el-table-column :label="t('operation')" fixed="right" min-width="300">
+				        <template #default="{ row }">
+				            <div class="flex">
+								<div class="text-sm mr-1 flex items-center cursor-pointer" v-if="row.sms_type == 1" @click="setNotice(row, 'sms')">
+								    <el-icon class="text-[15px] mr-[3px]" :class="row.is_sms ? 'open' : ''"><SuccessFilled /></el-icon>
+								    <span class="ml-0.5">{{ t('sms') }}</span>
+								</div>
+								<div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.wechat_type" @click="setNotice(row, 'wechat')">
+								    <el-icon class="text-[15px] mr-[3px]" :class="row.is_wechat ? 'open' : ''"><SuccessFilled /></el-icon>
+								    <span class="ml-0.5">{{ t('wechat') }}</span>
+								</div>
+								<div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.weapp_type" @click="setNotice(row, 'weapp')">
+								    <el-icon class="text-[15px] mr-[3px]" :class="row.is_weapp ? 'open' : ''"><SuccessFilled /></el-icon>
+								    <span class="ml-0.5">{{ t('weapp') }}</span>
+								</div>
+				            </div>
+				        </template>
+				    </el-table-column>
+				</el-table>	
             </div>
         </el-card>
         
         <el-card class="box-card !border-none mt-[16px]" shadow="never">
             <h3 class="panel-title">{{ t('sellerNotice') }}</h3>
             <div class="flex flex-row flex-wrap m-[-4px]">
-                <div class="sm:w-1/2 md:w-1/3 lg:w-1/3 xl:w-1/4 2xl:w-1/4 p-1" v-for="item in noticeTableData.seller">
-                    <div class="border rounded-sm	" >
-                        <div class="card-header flex items-center p-4 pb-3 pt-3 border-b text-base">
-                            <span class="mr-1">{{ item.name }}</span>
-                            <el-tooltip
-                                class="box-item"
-                                effect="dark"
-                                :content="item.title"
-                                placement="top"
-                            >
-                                <el-icon class="cursor-pointer"><Warning /></el-icon>
-                            </el-tooltip>
-                        </div>
-                        <div class="flex justify-around notice-type p-4 pb-6 pt-6 ">
-                            <div class="text-sm mr-1 flex items-center cursor-pointer" v-if="item.sms_type == 1" @click="setNotice(item, 'sms')">
-                                <el-icon :class="item.is_sms ? 'open' : ''"><CircleCheck /></el-icon>
-                                <span class="ml-0.5">{{ t('sms') }}</span>
-                            </div>
-                            <div class="text-sm  flex items-center cursor-pointer" v-if="item.wechat_type" @click="setNotice(item, 'wechat')">
-                                <el-icon :class="item.is_wechat ? 'open' : ''"><CircleCheck /></el-icon>
-                                <span class="ml-0.5">{{ t('wechat') }}</span>
-                            </div>
-                            <div class="text-sm  flex items-center cursor-pointer" v-if="item.weapp_type" @click="setNotice(item, 'weapp')">
-                                <el-icon :class="item.is_weapp ? 'open' : ''"><CircleCheck /></el-icon>
-                                <span class="ml-0.5">{{ t('weapp') }}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+				<el-table :data="noticeTableData.buyer" size="large">
+				    <el-table-column prop="name" :label="t('noticeType')" min-width="120" />
+				    <el-table-column :label="t('operation')" fixed="right" min-width="300">
+				        <template #default="{ row }">
+				            <div class="flex">
+								<div class="text-sm mr-1 flex items-center cursor-pointer" v-if="row.sms_type == 1" @click="setNotice(row, 'sms')">
+								    <el-icon class="text-[15px] mr-[3px]" :class="row.is_sms ? 'open' : ''"><SuccessFilled /></el-icon>
+								    <span class="ml-0.5">{{ t('sms') }}</span>
+								</div>
+								<div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.wechat_type" @click="setNotice(row, 'wechat')">
+								    <el-icon class="text-[15px] mr-[3px]" :class="row.is_wechat ? 'open' : ''"><SuccessFilled /></el-icon>
+								    <span class="ml-0.5">{{ t('wechat') }}</span>
+								</div>
+								<div class="text-sm  flex items-center cursor-pointer ml-[20px]" v-if="row.weapp_type" @click="setNotice(row, 'weapp')">
+								    <el-icon class="text-[15px] mr-[3px]" :class="row.is_weapp ? 'open' : ''"><SuccessFilled /></el-icon>
+								    <span class="ml-0.5">{{ t('weapp') }}</span>
+								</div>
+				            </div>
+				        </template>
+				    </el-table-column>
+				</el-table>	
             </div>
         </el-card>
 
@@ -131,9 +113,7 @@ const loadNoticeList = () => {
 loadNoticeList()
  
 const setNotice = (data: any, type: string) => {
-	
     data.type = type;
-	console.log(data)
     eval('data.status=data.is_'+type);
     eval(type+'Dialog.value.setFormData(data)');
     eval(type+'Dialog.value.showDialog = true;');
diff --git a/admin/src/views/setting/notice_records.vue b/admin/src/views/setting/notice_records.vue
index 0cc43680c..dabef3bbc 100644
--- a/admin/src/views/setting/notice_records.vue
+++ b/admin/src/views/setting/notice_records.vue
@@ -1,8 +1,11 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="recordsTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('searchReceiver')" prop="receiver">
                         <el-input v-model="recordsTableData.searchParam.receiver" :placeholder="t('receiverPlaceholder')" />
@@ -32,7 +35,7 @@
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="recordsTableData.data" size="large" v-loading="recordsTableData.loading">
 
                     <template #empty>
@@ -77,6 +80,9 @@ import { t } from '@/lang'
 import { getNoticeLog, getNoticeList } from '@/api/notice'
 import RecordsInfo from '@/views/setting/components/notice-records-info.vue'
 import { FormInstance } from 'element-plus'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const recordsTableData = reactive({
     page: 1,
diff --git a/admin/src/views/setting/pay.vue b/admin/src/views/setting/pay.vue
index 07611e73c..f1d6209bc 100644
--- a/admin/src/views/setting/pay.vue
+++ b/admin/src/views/setting/pay.vue
@@ -1,21 +1,22 @@
 <template>
-    <div class="main-container" v-loading="payLoading">
+    <el-card class="box-card !border-none" shadow="never"  v-loading="payLoading">
 		<!-- 设置支付配置 -->
-		<div class="flex justify-between" v-if="!payLoading">
+		<div class="flex justify-between items-center" v-if="!payLoading">
+			<span class="text-[24px]">{{pageName}}</span>
 			<el-button type="primary" @click="isEdit = true" ref="setConfigBtn">
 				{{ t('setConfig') }}
 			</el-button>
 		</div>
-        <el-card class="box-card !border-none mt-3" shadow="never" v-for="(payItems, payKey) in payConfigData" :key="payKey">
+        <el-card class="box-card box-pay-card !border-none mt-[20px]" shadow="never" v-for="(payItems, payKey) in payConfigData" :key="payKey">
 			<div class="flex mb-3">
 				<span class="text-base">{{payItems.name }}</span>
 			</div>
 			<div class="pay-table">
-				<div class="flex items-center pay-table-head bg-[#f5f7fa] table-item-pd table-item-border justify-between">
-					<span class="text-base font-bold text-[#999] w-[150px]">{{t('payType')}}</span>
+				<div class="flex items-center pay-table-head bg-[#fbfbfb] table-item-pd table-item-border justify-between">
+					<span class="text-base text-[#999] w-[150px]">{{t('payType')}}</span>
 					<!-- <span class="text-base font-bold text-[#999] w-[110px]">{{t('settingDefaultPay')}}</span> -->
-					<span class="text-base font-bold text-[#999] w-[110px] text-center">{{t('onState')}}</span>
-					<span class="text-base font-bold text-[#999] w-[80px] text-center" v-if="isEdit">{{t('templateName')}}</span>
+					<span class="text-base text-[#999] w-[110px] text-center">{{t('onState')}}</span>
+					<span class="text-base text-[#999] w-[80px] text-center" v-if="isEdit">{{t('templateName')}}</span>
 				</div>
 				<div ref="fieldBoxRefs" :data-key="payKey">
 					<div v-for="(childrenItem,childrenIndex) in payItems.pay_type" :key="childrenItem.redio_key" class="flex table-item-border table-item-pd justify-between" :id="payKey+'_'+childrenIndex">
@@ -31,7 +32,10 @@
 						</div> -->
 						<div class="table-item-flex w-[110px] justify-center select-none">
 							<el-switch v-if="isEdit" v-model="childrenItem.status" :active-text="t('isEnable')" @change="enablePaymentMode(childrenItem)"/>
-							<span class="text-base text-[#666]" v-else>{{childrenItem.status ? t('open') : t('notOpen')}}</span>
+							<div v-else>
+								<el-tag v-if="childrenItem.status" class="ml-2" type="success">{{t('open')}}</el-tag>
+  								<el-tag v-else class="ml-2" type="info">{{t('notOpen')}}</el-tag>
+							</div>
 						</div>
 						<div class="table-item-flex w-[80px]  justify-center select-none" v-if="isEdit">
 							<button @click="configPayFn(childrenItem)" class="text-base" v-if="childrenItem.key !='balancepay'">{{t('clickConfigure')}}</button>
@@ -49,7 +53,7 @@
         </div>
 		<wechatpay ref="wechatpayDialog" @complete="setConfigInfo" />
 		<alipay ref="alipayDialog" @complete="setConfigInfo" />
-    </div>
+    </el-card>
 </template>
 
 <script lang="ts" setup>
@@ -65,6 +69,9 @@ import Sortable, { SortableEvent } from 'sortablejs'
 import { cloneDeep, range, isEmpty } from 'lodash-es'
 import { set } from '@vueuse/core'
 import { CollectionTag } from '@element-plus/icons-vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const wechatpayDialog: Record<string, any> | null = ref(null)        
 const alipayDialog: Record<string, any> | null = ref(null)
@@ -209,4 +216,8 @@ const cancelFn = ()=>{
 	display: flex;
     align-items: center;
 }
+
+:deep(.box-pay-card) .el-card__body{
+	padding: 0;
+}
 </style>
\ No newline at end of file
diff --git a/admin/src/views/setting/sms.vue b/admin/src/views/setting/sms.vue
index b311c57cc..e1768e1b4 100644
--- a/admin/src/views/setting/sms.vue
+++ b/admin/src/views/setting/sms.vue
@@ -1,7 +1,10 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="mt-[16px]">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <div class="mt-[20px]">
                 <el-table :data="smsTableData.data" size="large" v-loading="smsTableData.loading">
                     <template #empty>
                         <span>{{ !smsTableData.loading ? t('emptyData') : '' }}</span>
@@ -37,6 +40,9 @@ import { t } from '@/lang'
 import { getSmsList,getSmsInfo } from '@/api/notice'
 import Ali from '@/views/setting/components/sms-ali.vue'
 import Tencent from '@/views/setting/components/sms-tencent.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const aliDialog: Record<string, any> | null = ref(null)
 const tencentDialog: Record<string, any> | null = ref(null)
diff --git a/admin/src/views/setting/sms_records.vue b/admin/src/views/setting/sms_records.vue
index 818a4518a..61e44c086 100644
--- a/admin/src/views/setting/sms_records.vue
+++ b/admin/src/views/setting/sms_records.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="recordsTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('searchReceiver')" prop="receiver">
                         <el-input v-model="recordsTableData.searchParam.receiver" :placeholder="t('receiverPlaceholder')" />
@@ -32,7 +34,7 @@
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div class="mt-[10px]">
                 <el-table :data="recordsTableData.data" size="large" v-loading="recordsTableData.loading">
 
                     <template #empty>
@@ -77,6 +79,9 @@ import { t } from '@/lang'
 import { getNoticeList, getSmsLog } from '@/api/notice'
 import RecordsInfo from '@/views/setting/components/notice-records-info.vue'
 import { FormInstance } from 'element-plus'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const recordsTableData = reactive({
     page: 1,
diff --git a/admin/src/views/setting/storage.vue b/admin/src/views/setting/storage.vue
index 26b697e69..4569a3fe0 100644
--- a/admin/src/views/setting/storage.vue
+++ b/admin/src/views/setting/storage.vue
@@ -1,7 +1,9 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-           
+           <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
             <div class="mt-[16px]">
                 <el-table :data="storageTableData.data" size="large" v-loading="loading">
 
@@ -45,6 +47,9 @@ import storageLocal from '@/views/setting/components/storage-local.vue'
 import storageQiniu from '@/views/setting/components/storage-qiniu.vue'
 import storageAli from '@/views/setting/components/storage-ali.vue'
 import storageTencent from '@/views/setting/components/storage-tencent.vue'
+import { useRouter,useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const localDialog: Record<string, any> | null = ref(null)        
 const qiniuDialog: Record<string, any> | null = ref(null)
diff --git a/admin/src/views/setting/system.vue b/admin/src/views/setting/system.vue
index a05ad79eb..b0d2779a4 100644
--- a/admin/src/views/setting/system.vue
+++ b/admin/src/views/setting/system.vue
@@ -1,29 +1,57 @@
 <template>
     <div class="main-container">
-        <el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+        <el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form"
+            v-loading="loading">
             <el-card class="box-card !border-none" shadow="never">
                 <h3 class="panel-title">{{ t('websiteInfo') }}</h3>
 
                 <el-form-item :label="t('siteName')" prop="site_name">
                     <el-input v-model="formData.site_name" :placeholder="t('siteNamePlaceholder')" class="input-width"
-                        clearable maxlength="20"/>
+                        clearable maxlength="20" />
                 </el-form-item>
 
                 <el-form-item :label="t('logo')">
                     <upload-image v-model="formData.logo" />
                 </el-form-item>
-                
-                <el-form-item :label="t('keywords')" >
-                    <el-input v-model="formData.keywords" :placeholder="t('keywordsPlaceholder')" class="input-width" clearable maxlength="20"/>
+
+                <el-form-item :label="t('icon')">
+                    <upload-image v-model="formData.icon" />
                 </el-form-item>
 
-                <el-form-item :label="t('desc')" >
-                    <el-input v-model="formData.desc" type="textarea" rows="4" clearable
-                        :placeholder="t('descPlaceholder')" class="input-width" maxlength="100" />
+                <el-form-item :label="t('keywords')">
+                    <el-input v-model="formData.keywords" :placeholder="t('keywordsPlaceholder')" class="input-width"
+                        clearable maxlength="20" />
+                </el-form-item>
+
+                <el-form-item :label="t('desc')">
+                    <el-input v-model="formData.desc" type="textarea" rows="4" clearable :placeholder="t('descPlaceholder')"
+                        class="input-width" maxlength="100" />
                 </el-form-item>
-                
-                
             </el-card>
+            <el-card class="box-card !border-none" shadow="never">
+                <h3 class="panel-title">{{ t('frontEndInfo') }}</h3>
+				<el-form-item :label="t('frontEndName')">
+				    <el-input v-model="formData.front_end_name" :placeholder="t('frontEndNamePlaceholder')"
+				        class="input-width" clearable maxlength="20" />
+				</el-form-item>
+
+                <el-form-item :label="t('frontEndLogo')">
+                    <upload-image v-model="formData.front_end_logo" />
+                </el-form-item>
+            </el-card>
+			<el-card class="box-card !border-none" shadow="never" v-if="app_type == 'admin' ">
+			    <h3 class="panel-title">{{ t('serviceInformation') }}</h3>
+				<el-form-item :label="t('contactsTel')">
+				    <el-input v-model="formData.tel" :placeholder="t('contactsTelPlaceholder')"
+				        class="input-width" clearable maxlength="20" />
+				</el-form-item>
+			    <el-form-item :label="t('wechatCode')">
+			        <upload-image v-model="formData.wechat_code" />
+			    </el-form-item>
+				<el-form-item :label="t('customerServiceCode')">
+				    <upload-image v-model="formData.enterprise_wechat" />
+				</el-form-item>
+			</el-card>
         </el-form>
 
         <div class="fixed-footer-wrap">
@@ -37,48 +65,66 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { setWebsite,getWebsite } from '@/api/sys'
-import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { setWebsite, getWebsite, getService } from '@/api/sys'
+import { FormInstance, FormRules } from 'element-plus'
 import storage from '@/utils/storage'
+import { getAppType } from '@/utils/common'
 
 const loading = ref(true)
-
+const app_type = ref()
 const formData = reactive<Record<string, string>>({
     site_name: '',
     logo: '',
     desc: '',
     latitude: '',
-    keywords:'',
+    keywords: '',
     longitude: '',
     province_id: '',
     city_id: '',
     district_id: '',
-    address:'',
-    full_address:'',
-    business_hours:'',
-    phone:''
+    address: '',
+    full_address: '',
+    business_hours: '',
+    phone: '',
+    front_end_name: '',
+    front_end_logo: '',
+    icon: '',
+	wechat_code: '',
+	enterprise_wechat: '',
+	tel: ''
 })
- 
 
 const setFormData = async (id: number = 0) => {
     const data = await (await getWebsite()).data
     Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key]
     })
-  
-    loading.value = false;
+	
+	const service_data = await (await getService()).data
+	formData['wechat_code'] = service_data.wechat_code;
+	formData['enterprise_wechat'] = service_data.enterprise_wechat;
+	formData['tel'] = service_data.tel;
+	
+	app_type.value = getAppType();
+    loading.value = false
 }
 setFormData()
 
+
+
+
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
 const formRules = reactive<FormRules>({
     site_name: [
         { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' }
+    ],
+    front_end_name: [
+        { required: true, message: t('frontEndNamePlaceholder'), trigger: 'blur' }
     ]
 })
- 
+
 /**
  * 保存
  */
@@ -88,10 +134,10 @@ const save = async (formEl: FormInstance | undefined) => {
     await formEl.validate(async (valid) => {
         if (valid) {
             loading.value = true
-            
+
             setWebsite(formData).then(() => {
                 loading.value = false
-                setStore();
+                setStore()
             }).catch(() => {
                 loading.value = false
             })
@@ -99,10 +145,9 @@ const save = async (formEl: FormInstance | undefined) => {
     })
 }
 
-
 const setStore = async () => {
     const data = await (await getWebsite()).data
-    storage.set({ key: 'siteInfo', data: data })
+    storage.set({ key: 'siteInfo', data })
 }
 
 </script>
diff --git a/admin/src/views/setting/transfer.vue b/admin/src/views/setting/transfer.vue
index 032d1bd15..02c738815 100644
--- a/admin/src/views/setting/transfer.vue
+++ b/admin/src/views/setting/transfer.vue
@@ -2,7 +2,10 @@
     <div class="main-container">
         <el-alert class="warm-prompt" type="info">
             <template #default>
-                <p class="text-base">{{t('operationTip')}}</p>
+                <div class="flex items-center">
+                    <el-icon class="mr-2" size="18"><Warning /></el-icon>
+                    <p class="text-base">{{t('operationTip')}}</p>
+                </div>
             </template>
         </el-alert>
         <el-form :model="formData" label-width="200px" ref="formRef" :rules="formRules" class="page-form mt-2" v-loading="loading">
@@ -179,13 +182,16 @@ const save = async (formEl: FormInstance | undefined) => {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .warm-prompt{
-        background-color: var(--el-color-primary-light-9);
+:deep(.warm-prompt) {
+    background-color: var(--el-color-primary-light-9) !important;
+    .el-icon, p {
+        color: var(--el-color-primary-light-3);
     }
-    ::v-deep .warm-prompt .el-icon{
-        color: var(--el-color-primary);
-    }
-    ::v-deep .warm-prompt p{
-        color: var(--el-color-primary);
+    .el-alert__content{
+        padding: 0;
+        .el-alert__description{
+            margin: 0;
+        }
     }
+}
 </style>
diff --git a/admin/src/views/setting/wxoplatform.vue b/admin/src/views/setting/wxoplatform.vue
new file mode 100644
index 000000000..b4e428217
--- /dev/null
+++ b/admin/src/views/setting/wxoplatform.vue
@@ -0,0 +1,138 @@
+<template>
+    <div class="main-container">
+        <el-form :model="formData" label-width="200px" ref="formRef" class="page-form" v-loading="loading">
+            <el-card class="box-card !border-none mt-[16px]" shadow="never">
+                <h3 class="panel-title">{{ t('oplatformSetting') }}</h3>
+
+                <el-form-item label="APPID">
+                    <el-input v-model="formData.appid" :placeholder="t('appidPlaceholder')" class="input-width" clearable/>
+                </el-form-item>
+
+                <el-form-item label="APPSECRET" >
+                    <el-input v-model="formData.appsecret" :placeholder="t('appsecretPlaceholder')" class="input-width" clearable/>
+                </el-form-item>
+				
+				<h3 class="panel-title">{{ t('oplatformComm') }}</h3>
+				<el-form-item :label="t('empowerStartDomain')">
+					<span>{{ formData.start_domain }}</span>
+				</el-form-item>
+					
+				<el-form-item :label="t('empowerReceiveUrl')" >
+					<span>{{ formData.receive_url }}</span>
+				</el-form-item>
+							
+				<el-form-item :label="t('messageValidationToken')" >
+				    <el-input v-model="formData.token" class="input-width" clearable/>
+				</el-form-item>
+				
+				<el-form-item :label="t('messageDecryptKey')" >
+				    <el-input v-model="formData.key" class="input-width" clearable/>
+				</el-form-item>
+				
+				<el-form-item :label="t('messageReceiveUrl')" >
+					<span>{{ formData.message_receive }}</span>
+				</el-form-item>
+				
+				<el-form-item :label="t('wechatDomain')" >
+					<span>{{ formData.host }}</span>
+				</el-form-item>	
+				
+				<el-form-item :label="t('weappDomain')" >
+					<span>{{ formData.host }}</span>
+				</el-form-item>	
+				
+				<el-form-item :label="t('weappBusinessDomain')" > 
+					<span>{{ formData.host }}</span>
+				</el-form-item>	
+				
+				<h3 class="panel-title">{{ t('oplatformBuilder') }}</h3>
+				<el-form-item :label="t('builderEmail')" >
+				    <el-input v-model="formData.email" class="input-width" clearable/>
+				</el-form-item>
+				
+				<el-form-item :label="t('builderMobile')" >
+				    <el-input v-model="formData.mobile" class="input-width" clearable/>
+				</el-form-item>
+				
+				<el-form-item :label="t('builderQQ')" >
+				    <el-input v-model="formData.qq" class="input-width" clearable/>
+				</el-form-item>
+				
+				<el-form-item :label="t('builderWx')" >
+				    <el-input v-model="formData.wx" class="input-width" clearable/>
+				</el-form-item>
+				
+            </el-card>
+        </el-form>
+
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { setCopyright,getCopyright } from '@/api/sys'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+
+const loading = ref(true)
+const formData = reactive<Record<string, string>>({
+    appid: '',
+    appsecret: '',
+	token: '',
+	key: '',
+	email: '',
+	mobile: '',
+	qq: '',
+	wx: '',
+	start_domain: '',
+	receive_url: '',
+	message_receive: '',
+	host: ''
+})
+
+
+const setFormData = async (id: number = 0) => {
+    const data = await (await getCopyright()).data
+    Object.keys(formData).forEach((key: string) => {
+        if (data[key] != undefined) formData[key] = data[key]
+    })
+  
+    loading.value = false;
+}
+setFormData()
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = reactive<FormRules>({
+    site_name: [
+        { required: true, message: t('siteNamePlaceholder'), trigger: 'blur' }
+    ]
+})
+ 
+/**
+ * 保存
+ */
+const save = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setCopyright(formData).then(() => {
+                loading.value = false
+
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/admin/src/views/site/components/edit-group.vue b/admin/src/views/site/components/edit-group.vue
index a0eac8ec9..5a97139d3 100644
--- a/admin/src/views/site/components/edit-group.vue
+++ b/admin/src/views/site/components/edit-group.vue
@@ -12,11 +12,16 @@
             </el-form-item>
 
             <el-form-item :label="t('permission')" prop="group_roles">
-                <div>
-                    <el-checkbox v-model="selectAll" :label="t('selectAll')" />
-                    <el-checkbox v-model="checkStrictly" :label="t('checkStrictly')" />
+                <div class="flex items-center justify-between w-11/12">
+                     
+                    <div>
+                        <el-checkbox v-model="selectAll" :label="t('selectAll')" />
+                        <el-checkbox v-model="checkStrictly" :label="t('checkStrictly')" />
+                    </div>
+                    <el-button link type="primary" @click="menuAction()">{{ t('foldText') }}</el-button>
+
                 </div>
-                <el-scrollbar max-height="40vh" class="w-full">
+                <el-scrollbar height="35vh" class="w-full">
                     <el-tree :data="menus" :props="{ label: 'menu_name' }" :default-checked-keys="formData.group_roles"
                         :check-strictly="checkStrictly" show-checkbox default-expand-all @check-change="handleCheckChange"
                         node-key="menu_key" ref="treeRef" />
@@ -46,6 +51,7 @@ import { debounce } from '@/utils/common'
 const showDialog = ref(false)
 const loading = ref(false)
 let popTitle: string = '';
+const isOpen = ref(true)
 
 // 获取权限数据
 const menus = ref<Record<string, any>[]>([])
@@ -69,6 +75,32 @@ const handleCheckChange = debounce((e) => {
     formData.group_roles = treeRef.value.getCheckedKeys()
 })
 
+const menuAction = () => {
+    if(isOpen.value){
+        collapseAll(menus.value);
+        isOpen.value = false;
+    }else{
+        unFoldAll(menus.value);
+        isOpen.value = true;
+    }
+}
+
+// 全部展开
+const unFoldAll = (data:any) => {
+    
+    Object.keys(data).forEach((key:string|any) => {
+        treeRef.value.store.nodesMap[data[key]['menu_key']].expanded = true;
+        if(data[key].children && data[key].children.length > 0) collapseAll(data[key].children);
+    })
+}
+// 全部折叠
+const collapseAll = (data:any) => {
+    Object.keys(data).forEach((key:string|any) => {
+        treeRef.value.store.nodesMap[data[key]['menu_key']].expanded = false;
+        if(data[key].children && data[key].children.length > 0) collapseAll(data[key].children);
+    })
+} 
+
 /**
  * 表单数据
  */
@@ -110,20 +142,19 @@ const emit = defineEmits(['complete'])
 const confirm = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
     const save = formData.group_id ? editSiteGroup : addSiteGroup
-
     await formEl.validate(async (valid) => {
         if (valid) {
             loading.value = true
-
-            const data = formData
-
+            const data = Object.assign({}, formData) 
+            data.group_roles = data.group_roles.concat(treeRef.value.getHalfCheckedKeys());
             save(data).then(res => {
                 loading.value = false
                 showDialog.value = false
+                selectAll.value = false
                 emit('complete')
             }).catch(() => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
@@ -138,12 +169,44 @@ const setFormData = async (row: any = null) => {
         popTitle = t('updateGroup')
         const data = await (await getSiteGroupInfo(row.group_id)).data
         Object.keys(formData).forEach((key: string) => {
-            if (data[key] != undefined) formData[key] = data[key]
+            if (data[key] != undefined) {
+                if(key == 'group_roles'){
+                    var arr = data.group_roles;
+                    var newArr:any = [];
+                    
+                    Object.keys(data.group_roles).forEach( (i) => {
+                        checked(data.group_roles[i],menus.value,newArr)
+                    } )
+                    formData[key] = newArr;
+
+                }else{
+                    formData[key] = data[key]
+                }
+            }
         })
+
+
+
     }
     loading.value = false
 }
 
+function checked(menu_key:string,data:any,newArr:any) {
+    Object.keys(data).forEach( (key:string) =>{
+        let item = data[key]
+        if(item.menu_key == menu_key){
+            if(!item.children || item.children.length == 0){
+                newArr.push(item.menu_key)
+            }
+        }else{
+            if(item.children && item.children.length > 0){
+                checked(menu_key,item.children,newArr)
+            }
+        }
+    } )
+}
+
+
 defineExpose({
     showDialog,
     setFormData
diff --git a/admin/src/views/site/components/edit-site.vue b/admin/src/views/site/components/edit-site.vue
index 79702e67f..784bdcd4f 100644
--- a/admin/src/views/site/components/edit-site.vue
+++ b/admin/src/views/site/components/edit-site.vue
@@ -158,7 +158,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
                 emit('complete')
             }).catch(err => {
                 loading.value = false
-                showDialog.value = false
+                // showDialog.value = false
             })
         }
     })
diff --git a/admin/src/views/site/components/user-info.vue b/admin/src/views/site/components/user-info.vue
index 171db61ea..96185be3d 100644
--- a/admin/src/views/site/components/user-info.vue
+++ b/admin/src/views/site/components/user-info.vue
@@ -6,7 +6,9 @@
             <el-form-item :label="t('headimg')" >
                 <div class="flex items-center">
                     <el-avatar v-if="formData.head_img" :src="img(formData.head_img)" />
-                    <el-avatar v-else icon="UserFilled" />
+                    <el-avatar v-else>
+                    	<img src="@/assets/images/member_head.png"/>
+                    </el-avatar>
                 </div>
             </el-form-item>
             
@@ -17,8 +19,16 @@
                 <div class="input-width"> {{ formData.username }} </div>
             </el-form-item>
 
+			<el-form-item :label="t('siteId')" >
+			    <div class="input-width"> {{ formData.roles[0].site_id }} </div>
+			</el-form-item>
+
             <el-form-item :label="t('siteName')" >
-                <div class="input-width"> {{ formData.roles[0].site_name }} </div>
+				<div class="flex">
+					<div class="max-w-[260px]"> {{ formData.roles[0].site_name }} </div>
+					<el-link class="ml-10 text-blue-700" href="/site/login" target="_blank" :underline="false">{{ t('enterSite') }}</el-link>
+				</div>
+                
             </el-form-item>
 
             <el-form-item :label="t('isAdmin')" >
@@ -38,12 +48,12 @@
                 <div class="input-width"> {{ formData.last_ip }} </div>
             </el-form-item>
             
-            <el-form-item :label="t('lastTime')" >
+            <el-form-item :label="t('lastTime')" v-if="parseFloat(formData.last_time)" >
                 <div class="input-width"> {{ formData.last_time }} </div>
             </el-form-item>
 
             
-            <el-form-item :label="t('createTime')" >
+            <el-form-item :label="t('createTime')"  v-if="parseFloat(formData.create_time)">
                 <div class="input-width"> {{ formData.create_time }} </div>
             </el-form-item>
 
diff --git a/admin/src/views/site/group.vue b/admin/src/views/site/group.vue
index 8a0bbdd97..16fd198bf 100644
--- a/admin/src/views/site/group.vue
+++ b/admin/src/views/site/group.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addSiteGroup') }}
                 </el-button>
             </div>
-
-             <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+             <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="siteGroupTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('groupName')" prop="keywords">
                         <el-input v-model="siteGroupTableData.searchParam.keywords" :placeholder="t('groupNamePlaceholder')" />
@@ -15,12 +15,12 @@
 
                     <el-form-item> 
                         <el-button type="primary" @click="loadSiteGroupList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div>
                 <el-table :data="siteGroupTableData.data" size="large" v-loading="siteGroupTableData.loading">
 
                     <template #empty>
@@ -57,6 +57,9 @@ import { t } from '@/lang'
 import { getSiteGroupList,deleteSiteGroup } from '@/api/site'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import EditGroup from '@/views/site/components/edit-group.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 
 const searchFormRef = ref<FormInstance>();
@@ -72,6 +75,14 @@ const siteGroupTableData = reactive({
     }
 })
 
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadSiteGroupList();
+}
+
 /**
  * 获取分组列表
  */
diff --git a/admin/src/views/site/list.vue b/admin/src/views/site/list.vue
index 9b166ba64..e15e5e364 100644
--- a/admin/src/views/site/list.vue
+++ b/admin/src/views/site/list.vue
@@ -1,22 +1,17 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-alert class="warm-prompt" type="info">
-                <template #default>
-                    <p class="text-base">{{ t('operationTip') }} <span class="cursor-pointer" @click="toSiteLink">{{
-                        siteLink }}</span> </p>
-                </template>
-            </el-alert>
 
-            <div class="flex justify-between mt-3">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addSite') }}
                 </el-button>
             </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="siteTableData.searchParam" ref="searchFormRef">
-                    <el-form-item :label="t('siteName')" prop="site_name">
+                    <el-form-item :label="t('siteName')" prop="keywords">
                         <el-input v-model="siteTableData.searchParam.keywords" :placeholder="t('siteNamePlaceholder')" />
                     </el-form-item>
 
@@ -36,31 +31,66 @@
                         </el-select>
                     </el-form-item>
 
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="siteTableData.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('expireTime')" prop="expire_time">
+                        <el-date-picker v-model="siteTableData.searchParam.expire_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+
                     <el-form-item>
                         <el-button type="primary" @click="loadSiteList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <el-alert class="warm-prompt" type="info">
+                <template #default>
+                    <div class="flex items-center">
+                        <el-icon class="mr-2" size="18"><Warning /></el-icon>
+                        <p class="text-base">{{ t('operationTip') }} <span class="cursor-pointer" @click="toSiteLink">{{siteLink }}</span> </p>
+                    </div>
+                </template>
+            </el-alert>
+
+            <div class="mt-[20px]">
                 <el-table :data="siteTableData.data" size="large" v-loading="siteTableData.loading">
 
                     <template #empty>
                         <span>{{ !siteTableData.loading ? t('emptyData') : '' }}</span>
                     </template>
+					<el-table-column prop="site_id" :label="t('siteId')" min-width="80"
+                        :show-overflow-tooltip="true" />
 
-                    <el-table-column prop="site_name" :label="t('siteName')" min-width="120"
+					<el-table-column :label="t('siteInfo')" min-width="180" align="left">
+					    <template #default="{ row }">
+						   <div class="flex items-center">
+							   <img class="w-[50px] h-[50px] mr-[10px]" v-if="row.logo" :src="img(row.logo)" alt="" >
+							   <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/assets/images/site_logo.png" alt="" >
+							   <div class="flex flex flex-col">
+								   <span>{{ row.site_name || '' }}</span>
+							   </div>
+						   </div>
+					    </template>
+					</el-table-column>
+							
+                    <el-table-column prop="group_name" :label="t('groupId')" min-width="80"
                         :show-overflow-tooltip="true" />
-                    <el-table-column prop="group_name" :label="t('groupId')" min-width="120"
-                        :show-overflow-tooltip="true" />
-                    <el-table-column :label="t('status')" min-width="120" align="center">
+                    <el-table-column :label="t('status')" min-width="80" align="center">
                         <template #default="{ row }">
                             <el-tag class="ml-2" type="success" v-if="row.status == 1">{{ row.status_name }}</el-tag>
-                            <el-tag class="ml-2" type="error" v-else>
+                            <el-tag class="ml-2" type="error" v-else-if="row.status == 3">
                                 {{ row.status_name }}
                             </el-tag>
-
+							<el-tag class="ml-2" type="error" v-else>
+							    {{ row.status_name }}
+							</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column prop="create_time" :label="t('createTime')" min-width="140"
@@ -73,12 +103,14 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column :label="t('operation')" fixed="right" width="100">
+                    <el-table-column :label="t('operation')" fixed="right" width="200">
                         <template #default="{ row }">
+                            <el-button type="primary" link @click="urlEvent(row)">{{ t('url') }}</el-button>
                             <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
+							<el-button type="primary" link @click="openClose(row.status, row.site_id)" v-if="row.status == 1 || row.status == 3">{{ row.status == 1 ? t('closeTxt') : t('openTxt') }}</el-button>
                         </template>
                     </el-table-column>
-
+					
                 </el-table>
                 <div class="mt-[16px] flex justify-end">
                     <el-pagination v-model:current-page="siteTableData.page" v-model:page-size="siteTableData.limit"
@@ -95,10 +127,12 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getSiteList, getSiteGroupAll, getStatusList } from '@/api/site'
+import { getSiteList, getSiteGroupAll, getStatusList, closeSite, openSite } from '@/api/site'
 import { FormInstance } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import EditSite from '@/views/site/components/edit-site.vue'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const siteLink = location.origin + '/site/login'
 
@@ -115,7 +149,10 @@ const siteTableData = reactive({
     searchParam: {
         keywords: '',
         group_id: '',
-        status: ''
+        status: '',
+        create_time: [],
+        expire_time: []
+
     }
 })
 
@@ -132,6 +169,13 @@ setStatusList()
 
 const searchFormRef = ref<FormInstance>()
 
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadSiteList();
+}
+
 /**
  * 获取站点列表
  */
@@ -172,6 +216,23 @@ const infoEvent = (data: any) => {
     router.push('/admin/site/info?id=' + data.site_id)
 }
 
+
+/**
+ * 站点域名
+ * @param data
+ */
+ const urlEvent = (data: any) => {
+    ElMessage({
+    message:  t('siteUrlDevelopMessage') ,
+    grouping: true,
+    type: 'success',
+  })
+}
+
+const toLink = (link) => {
+    router.push(link)
+}
+
 /**
  * 站点登录
  * @param data
@@ -180,18 +241,32 @@ const toSiteLink = () => {
     window.open(siteLink)
 }
 
+const openClose = (i, site_id) => {
+	if(i == 1) {
+		closeSite({site_id}).then(res=>{
+			loadSiteList()
+		})
+	}
+	if(i == 3) {
+		openSite({site_id}).then(res=>{
+			loadSiteList()
+		})
+	}
+}
+
 </script>
 
 <style lang="scss" scoped>
-::v-deep .warm-prompt {
+:deep(.warm-prompt) {
     background-color: var(--el-color-primary-light-9) !important;
-}
-
-::v-deep .warm-prompt .el-icon {
-    color: var(--el-color-primary);
-}
-
-::v-deep .warm-prompt p {
-    color: var(--el-color-primary);
+    .el-icon, p {
+        color: var(--el-color-primary-light-3);
+    }
+    .el-alert__content{
+        padding: 0;
+        .el-alert__description{
+            margin: 0;
+        }
+    }
 }
 </style>
diff --git a/admin/src/views/site/user.vue b/admin/src/views/site/user.vue
index 9b97a7364..4dc12f929 100644
--- a/admin/src/views/site/user.vue
+++ b/admin/src/views/site/user.vue
@@ -1,7 +1,10 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="userTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('userName')" prop="username">
                         <el-input v-model="userTableData.searchParam.username" :placeholder="t('userNamePlaceholder')" />
@@ -9,11 +12,11 @@
 
                     <el-form-item>
                         <el-button type="primary" @click="loadUserList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
-            <div class="mt-[16px]">
+            <div>
                 <el-table :data="userTableData.data" size="large" v-loading="userTableData.loading">
                     <template #empty>
                         <span>{{ !userTableData.loading ? t('emptyData') : '' }}</span>
@@ -21,7 +24,9 @@
                     <el-table-column :label="t('headImg')" width="100" align="left">
                         <template #default="{ row }">
                             <el-avatar v-if="row.head_img" :src="img(row.head_img)" />
-                            <el-avatar v-else icon="UserFilled" />
+                            <el-avatar v-else>
+								<img src="@/assets/images/member_head.png"/>
+							</el-avatar>
                         </template>
                     </el-table-column>
                     <el-table-column prop="username" :label="t('accountNumber')" min-width="120" show-overflow-tooltip />
@@ -74,6 +79,10 @@ import { getUserList } from '@/api/user'
 import { img } from '@/utils/common'
 import type { FormInstance } from 'element-plus'
 import userInfo from '@/views/site/components/user-info.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
 
 const userTableData = reactive({
     page: 1,
@@ -89,6 +98,13 @@ const userTableData = reactive({
 
 const searchFormRef = ref<FormInstance>()
 
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadUserList();
+}
+
 /**
  * 获取用户列表
  */
diff --git a/admin/src/views/tools/app/index.vue b/admin/src/views/tools/app/index.vue
deleted file mode 100644
index 005efab2e..000000000
--- a/admin/src/views/tools/app/index.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-    <div class="main-container h-[500px] w-full p-5 bg-white" v-loading="loading">
-        <el-tabs
-            v-model="activeName"
-            type="card"
-            class="demo-tabs"
-            @tab-click="handleClick"
-        >
-            <el-tab-pane :label="t('installLabel')" name="installed">
-                <div class="flex flex-wrap px-2 plug-list pb-10">
-                    <div v-for="(item,index) in localList.installed" :key="index+'a'" class="flex items-center bg-[#F7F8FA] cursor-pointer p-3 w-[295px] relative plug-item mr-4 mb-4"  @click="getAddonDetialFn(item)">
-                        <img class="w-[40px] h-[40px] rounded-sm" v-if="item.icon" :src="img(item.icon)" alt="">
-                        <img class="w-[40px] h-[40px] rounded-sm" v-else src="@/assets/images/icon-addon.png" alt="">
-                        <div class="flex flex-col ml-2">
-                            <span class="text-sm truncate w-[190px]">{{item.title}}</span>
-                            <span class="text-xs text-gray-400 truncate w-[190px]">{{item.desc}}</span>
-                        </div>
-                        <span class="plug-item-operate" @click.stop="uninstallAddonFn(item.key)">{{t('unload')}}</span>
-                    </div>
-                    
-                    <el-empty :description="t('noPlug')" v-if="!localList.installed.length" class="mx-auto" />
-                </div>
-            </el-tab-pane>
-            <el-tab-pane :label="t('uninstalledLabel')" name="uninstalled">
-                <div class="flex flex-wrap px-2 plug-list pb-10">
-                    <div v-for="(item,index) in localList.uninstalled" :key="index+'a'" class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4"  @click="getAddonDetialFn(item)">
-                        <img class="w-[40px] h-[40px] rounded-sm" v-if="item.icon" :src="img(item.icon)" alt="">
-                        <img class="w-[40px] h-[40px] rounded-sm" v-else src="@/assets/images/icon-addon.png" alt="">
-                        <div class="flex flex-col ml-2">
-                            <span class="text-sm truncate w-[190px]">{{item.title}}</span>
-                            <span class="text-xs text-gray-400 truncate w-[190px]">{{item.desc}}</span>
-                        </div>
-                        <span class="plug-item-operate" @click.stop="installAddonFn(item.key)">{{t('install')}}</span>
-                    </div>
-                    
-                    <el-empty :description="t('noPlug')" v-if="!localList.uninstalled.length" class="mx-auto" />
-                </div>
-            </el-tab-pane>
-        </el-tabs>
-
-        <!-- 详情 -->
-        <el-dialog v-model="appStoreShowDialog" :title="t('plugDetail')" width="500px" :destroy-on-close="true">
-            <el-form :model="appStoreInfo" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="cashOutLoading">
-                <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>
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue'
-import { t } from '@/lang'
-import {  getAddonLocal, uninstallAddon, installAddon, getAddonDetial } from '@/api/addon'
-import { useClipboard } from '@vueuse/core'
-import type { TabsPaneContext } from 'element-plus'
-import { img } from '@/utils/common'
-const activeName = ref('installed')
-
-let loading = ref<Boolean>(false);
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-  console.log(tab, event)
-}
-
-/**
- * 本地下载的插件列表 
- */
-let localList = ref({
-    "installed": [],
-    "uninstalled": []
-})
-const localListFn = () => {
-    loading.value = true;
-    getAddonLocal({}).then(res => {
-        let data = res.data
-        data.forEach(element => {
-            if(element.install_info && Object.keys(element.install_info)?.length){
-                localList.value.installed.push(element)
-            }else{
-                localList.value.uninstalled.push(element)
-            }
-        });
-        loading.value = false;
-    }).catch(() => {
-        loading.value = false;
-    })
-}
-localListFn()
-
-// 安装
-const installAddonFn = (key) => {
-    loading.value = true;
-    installAddon({addon:key}).then(res => {
-        localListFn()
-        loading.value = false;
-    }).catch(() => {
-        loading.value = false;
-    })
-}
-
-// 卸载 
-const uninstallAddonFn = (key) => {
-    uninstallAddon({addon:key}).then(res => {
-        localListFn()
-        loading.value = false;
-    }).catch(() => {
-        loading.value = false;
-    })
-}
-
-// 插件详情
-let appStoreShowDialog = ref(false); 
-let appStoreInfo = ref({}); 
-const getAddonDetialFn = (data)=>{
-    appStoreShowDialog.value = true;
-    appStoreInfo.value = data;
-    console.log("插件详情",data);
-    
-}
-</script>
-
-<style lang="scss" scoped>
-.demo-tabs > .el-tabs__content {
-  padding: 32px;
-  color: #6b778c;
-  font-size: 32px;
-  font-weight: 600;
-}
-.plug-item{
-    .plug-item-operate{
-        @apply text-xs absolute right-3 cursor-pointer;
-        color: var(--el-color-primary);
-    }
-}
-</style>
diff --git a/admin/src/views/tools/code/components/add-table.vue b/admin/src/views/tools/code/components/add-table.vue
index 0d23161aa..41e1a4265 100644
--- a/admin/src/views/tools/code/components/add-table.vue
+++ b/admin/src/views/tools/code/components/add-table.vue
@@ -95,7 +95,7 @@ const emit = defineEmits(['complete'])
             showDialog.value = false
             emit('complete')
         }).catch(err => {
-            
+            loading.value = false
         })
 
     })
diff --git a/admin/src/views/tools/code/index.vue b/admin/src/views/tools/code/index.vue
index 2f9682400..f3b41c3dd 100644
--- a/admin/src/views/tools/code/index.vue
+++ b/admin/src/views/tools/code/index.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <div class="flex">
-                <el-button type="primary" @click="addEvent">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+                <el-button type="primary" class="w-[100px]" @click="addEvent">
                     {{ t('addCode') }}
                 </el-button>
             </div>
 
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="codeTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('tableName')" prop="table_name">
                         <el-input v-model="codeTableData.searchParam.table_name" :placeholder="t('tableNamePlaceholder')" />
@@ -17,12 +18,12 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadGenerateTableList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
  
-            <div class="mt-[16px]">
+            <div>
                 <el-table :data="codeTableData.data" size="large" v-loading="codeTableData.loading">
 
                     <template #empty>
@@ -73,7 +74,9 @@ import { img } from '@/utils/common'
 import { ElMessageBox } from 'element-plus'
 import AddTable from '@/views/tools/code/components/add-table.vue'
 import type { FormInstance } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { useRouter,useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const router = useRouter()
 
@@ -91,6 +94,12 @@ let codeTableData = reactive({
 
 const searchFormRef = ref<FormInstance>()
 
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadGenerateTableList();
+}
 /**
  * 获取代码生成列表
  */
diff --git a/admin/src/views/tools/cron.vue b/admin/src/views/tools/cron.vue
index bb4decc42..eeedb02d9 100644
--- a/admin/src/views/tools/cron.vue
+++ b/admin/src/views/tools/cron.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-
-            <el-card class="box-card !border-none my-[16px] table-search-wrap" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="cronTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('title')" prop="title">
                         <el-input v-model="cronTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
@@ -24,12 +26,12 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadCronList()">{{ t('search') }}</el-button>
-                        <el-button @click="searchFormRef?.resetFields()">{{ t('reset') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
             </el-card>
 
-            <div class="mt-[16px]">
+            <div>
                 <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
 
                     <template #empty>
@@ -84,9 +86,12 @@ import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
 import { getCronList,getCronType } from '@/api/sys'
 import { img } from '@/utils/common'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter } from 'vue-router'
 import CronInfo from '@/views/setting/components/cron-info.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
 
 const cronTableData = reactive({
     page: 1,
@@ -109,6 +114,14 @@ const setTypeList = async () => {
 }
 setTypeList()
 
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    
+    formEl.resetFields();
+    loadCronList();
+}
+
 /**
  * 获取任务列表
  */
diff --git a/admin/src/views/tools/detection.vue b/admin/src/views/tools/detection.vue
index 8f189317d..bb32262e9 100644
--- a/admin/src/views/tools/detection.vue
+++ b/admin/src/views/tools/detection.vue
@@ -1,97 +1,93 @@
 <template>
-    <div class="main-container attachment-container" v-if="systemService">
-		<div class="bg-[#fff] pb-[20px] mb-3">
-			<p class="pt-[20px] pb-[10px] pl-[20px] ">{{ t('serverInformation') }}</p>
-			<div class="px-[20px] text-[14px]">
-				<el-row class="py-[10px] items" v-for="(serverItems, serverIndex) in systemService.server">
-				    <el-col :span="12" class="pl-[10px]">
-						<span > {{ serverItems.name }}</span>
-					</el-col>
-					<el-col :span="12" class="pl-[10px]">
-						<span>{{ serverItems.server }}</span>
-					</el-col>
-				</el-row>
+	<div class="main-container attachment-container" v-if="systemService">
+		<el-card class="box-card !border-none" shadow="never">
+			<div class="flex justify-between items-center">
+				<span class="text-[24px]">{{ pageName }}</span>
 			</div>
-		</div>
-		<div class="bg-[#fff] pb-[20px] mb-3">
-			<p class="py-[20px] pl-[20px] ">{{ t('systemDemand') }}</p>
-			<div class="px-[20px] text-[14px]">
-				<el-row class="pb-[10px] items">
-				    <el-col :span="8" class="pl-[10px]">
-						<span >{{ t('environment') }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span>{{ t('demand') }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span>{{ t('version') }}</span>
-					</el-col>
-				</el-row>
-				<el-row class="pb-[10px] items" v-for="(versionItems, versionIndex) in systemService.server_version">
-				    <el-col :span="8" class="pl-[10px]">
-						<span >{{ versionItems.name }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span >{{ versionItems.demand }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span >{{ versionItems.server }}</span>
-					</el-col>
-				</el-row>
+			<div class="bg-[#fff] pb-[20px] mb-3">
+				<p class="pt-[20px] pb-[10px]">{{ t('serverInformation') }}</p>
+				<div class="text-[14px]">
+					<el-table :data="systemService.server" size="large" v-loading="loadingArr.server_load">
+						<el-table-column prop="name" :label="t('environment')" align="left" min-width="200" />
+						<el-table-column prop="server" :label="t('version')" align="left" min-width="140" />
+					</el-table>
+				</div>
 			</div>
-		</div>
-		<div class="bg-[#fff] pb-[20px] mb-3">
-			<p class="py-[20px] pl-[20px] ">{{ t('authorityStatus') }}</p>
-			<div class="px-[20px] text-[14px]">
-				<el-row class="py-[10px] items" >
-				    <el-col :span="8" class="pl-[10px]">
-						<span>{{ t('name') }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span>{{ t('demand') }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span>{{ t('status') }}</span>
-					</el-col>
-				</el-row>
-				<el-row class="py-[10px] items" v-for="(variablesItems, variablesIndex) in systemService.system_variables">
-				    <el-col :span="8" class="pl-[10px]">
-						<span >{{ variablesItems.name }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span >{{ variablesItems.need }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span v-if="variablesItems.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="py-[10px] items" v-for="(dirsItems, dirsIndex) in systemService.dirs_list">
-				    <el-col :span="8" class="pl-[10px]">
-						<span>{{ dirsItems.name }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span>{{ dirsItems.demand }}</span>
-					</el-col>
-					<el-col :span="8" class="pl-[10px]">
-						<span v-if="dirsItems.is_readable && dirsItems.is_write"><el-icon color="green"><Select /></el-icon></span>
-						<span v-else><el-icon color="red"><CloseBold /></el-icon></span>
-					</el-col>
-				</el-row>
+			<div class="bg-[#fff] pb-[20px] mb-3">
+				<p class="py-[20px]">{{ t('systemDemand') }}</p>
+				<div class="text-[14px]">
+					<el-table :data="systemService.server_version" size="large" v-loading="loadingArr.server_version_load">
+						<el-table-column prop="name" :label="t('environment')" align="left" min-width="200" />
+						<el-table-column prop="demand" :label="t('demand')" align="left" min-width="140" />
+						<el-table-column prop="server" :label="t('version')" align="left" min-width="140" />
+					</el-table>
+				</div>
 			</div>
-		</div>
-    </div>
+			<div class="bg-[#fff] pb-[20px] mb-3">
+				<p class="py-[20px]">{{ t('authorityStatus') }}</p>
+				<div class="text-[14px]">
+					<el-table :data="systemService.system_variables" size="large" v-loading="loadingArr.system_variables_load">
+						<el-table-column prop="name" :label="t('name')" align="left" min-width="200" />
+						<el-table-column prop="need" :label="t('demand')" align="left" min-width="140" />
+						<el-table-column :label="t('status')" align="left" min-width="140">
+							<template #default="{ row }">
+								<span v-if="row.status"><el-icon color="green"><Select /></el-icon></span>
+								<span v-else><el-icon color="red">
+										<CloseBold />
+									</el-icon></span>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</div>
+
+			<div class="bg-[#fff] pb-[20px] mb-3">
+				<p class="py-[20px]">{{ t('process') }}</p>
+				<div class="text-[14px]">
+					<el-table :data="systemService.process" size="large" v-loading="loadingArr.process_load">
+						<el-table-column prop="name" :label="t('name')" align="left" min-width="200" />
+						<el-table-column prop="need" :label="t('demand')" align="left" min-width="140" />
+						<el-table-column :label="t('status')" align="left" min-width="140">
+							<template #default="{ row }">
+								<span v-if="row.status"><el-icon color="green"><Select /></el-icon></span>
+								<span v-else><el-icon color="red">
+										<CloseBold />
+									</el-icon></span>
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+			</div>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref, reactive } from 'vue'
 import { t } from '@/lang'
 import { getSystem } from '@/api/tools'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title
 
 const systemService = ref([])
+let loadingArr = reactive({
+	"server_load": true,
+	"server_version_load": true,
+	"system_variables_load": true,
+	"process_load": true
+})
 const getSystemService = () => {
-	getSystem().then(res=>{
-		systemService.value = res.data;
+	loadingArr.server_load = true;
+	loadingArr.server_version_load = true;
+	loadingArr.system_variables_load = true;
+	loadingArr.process_load = true;
+	getSystem().then(res => {
+		systemService.value = res.data
+		loadingArr.server_load = false;
+		loadingArr.server_version_load = false;
+		loadingArr.system_variables_load = false;
+		loadingArr.process_load = false;
 	})
 }
 getSystemService()
diff --git a/admin/src/views/tools/updatecache.vue b/admin/src/views/tools/updatecache.vue
index 6f50e276f..53860354e 100644
--- a/admin/src/views/tools/updatecache.vue
+++ b/admin/src/views/tools/updatecache.vue
@@ -1,20 +1,20 @@
 <template>
     <div class="main-container h-[500px] w-full p-5 bg-white" v-loading="loading">
         <div class="flex flex-wrap px-2 plug-list pb-10">
-            <div class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4">
+            <div class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4 cursor-pointer">
                 <div class="flex flex-col ml-2">
                     <span class="text-sm truncate w-[190px]">{{t('refreshMenu')}}</span>
-                    <span class="text-xs text-gray-400 mt-1 truncate w-[190px]">{{t('refreshMenuDesc')}}</span>
+                    <span class="text-xs text-gray-400 mt-1 truncate w-[190px]" :title="t('refreshMenuDesc')">{{t('refreshMenuDesc')}}</span>
                 </div>
-                <span class="plug-item-operate" @click="installAddonFn(item.key)">{{t('refresh')}}</span>
+                <span class="plug-item-operate" @click="refreshMenu()">{{t('refresh')}}</span>
             </div>
 
-            <div class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4">
+            <div class="flex items-center bg-[#F7F8FA] p-3 w-[295px] relative plug-item mr-4 mb-4 cursor-pointer">
                 <div class="flex flex-col ml-2">
                     <span class="text-sm truncate w-[190px]">{{t('dataCache')}}</span>
-                    <span class="text-xs text-gray-400 mt-1 truncate w-[190px]">{{t('dataCacheDesc')}}</span>
+                    <span class="text-xs text-gray-400 mt-1 truncate w-[190px]" :title="t('dataCacheDesc')">{{t('dataCacheDesc')}}</span>
                 </div>
-                <span class="plug-item-operate" @click="installAddonFn(item.key)">{{t('refresh')}}</span>
+                <span class="plug-item-operate" @click="schemaCache()">{{t('refresh')}}</span>
             </div>
         </div>
     </div>
@@ -23,27 +23,29 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { t } from '@/lang'
-import {  getAddonLocal, uninstallAddon, installAddon } from '@/api/addon'
-import { useClipboard } from '@vueuse/core'
-import type { TabsPaneContext } from 'element-plus'
-import { img } from '@/utils/common'
-
+import {  clearSchemaCache, menuRefresh } from '@/api/sys'
 let loading = ref<Boolean>(false);
 
 // 数据缓存
-const installAddonFn = (key) => {
+const schemaCache = () => {
     loading.value = true;
-    installAddon({addon:key}).then(res => {
+    clearSchemaCache({}).then(res => {
         loading.value = false;
     }).catch(() => {
         loading.value = false;
     })
 }
-
-// 刷新菜单
-const uninstallAddonFn = (key) => {
-
+// 更新菜单
+const refreshMenu = ()=> {
+	loading.value = true;
+	menuRefresh({}).then(res => {
+	    loading.value = false;
+	}).catch(() => {
+	    loading.value = false;
+	})
 }
+
+
 </script>
 
 <style lang="scss" scoped>