diff --git a/admin/src/app/api/apply.ts b/admin/src/app/api/apply.ts
deleted file mode 100644
index 0fc6800e7..000000000
--- a/admin/src/app/api/apply.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 应用列表
- * @returns
- */
-export function getApply(params: Record<string, any>) {
-    return request.get(`auth/authaddon`, {params})
-}
-
-export function getAppManage(params: Record<string, any>) {
-    return request.get(`auth/app_manage`, {params})
-}
diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts
index 76ae0e79f..84274b1c0 100644
--- a/admin/src/app/api/diy.ts
+++ b/admin/src/app/api/diy.ts
@@ -60,7 +60,7 @@ export function editDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function setUseDiyPage(params: Record<string, any>) {
-	return request.put(`diy/use`, params, {showSuccessMessage: true})
+	return request.put(`diy/use/${params.id}`, params, {showSuccessMessage: true})
 }
 
 /**
diff --git a/admin/src/app/api/member.ts b/admin/src/app/api/member.ts
index e9701c99b..1cf6b16e7 100644
--- a/admin/src/app/api/member.ts
+++ b/admin/src/app/api/member.ts
@@ -433,15 +433,6 @@ export function getMemberLevelPageList(params: Record<string, any>) {
     return request.get(`member/level`, { params })
 }
 
-/**
- * 获取会员等级列表
- * @param params
- * @returns
- */
-export function getMemberLevelList(params: Record<string, any>) {
-    return request.get(`member/level/list`, { params })
-}
-
 /**
  * 获取会员等级详情
  * @param level_id 会员等级level_id
@@ -521,4 +512,4 @@ export function setSignConfig(params: Record<string, any>) {
  */
 export function getMemberSignList(params: Record<string, any>) {
     return request.get(`member/sign`, { params });
-}
\ No newline at end of file
+}
diff --git a/admin/src/app/api/module.ts b/admin/src/app/api/module.ts
index d6bf62cba..26b13b73d 100644
--- a/admin/src/app/api/module.ts
+++ b/admin/src/app/api/module.ts
@@ -3,26 +3,24 @@ import request from '@/utils/request'
 /**
  * 获取授权信息
  */
-export function getAuthinfo() {
+export function getAuthInfo() {
     return request.get('niucloud/authinfo', { showErrorMessage: false })
 }
 
 /**
  * 设置 授权配置
  */
-export function setAuthinfo(params: Record<string, any>) {
+export function setAuthInfo(params: Record<string, any>) {
     return request.post('niucloud/authinfo', params, {showSuccessMessage: true})
 }
 
 /**
  * 获取 授权配置
  */
-export function getAdminAuthinfo() {
+export function getAdminAuthInfo() {
     return request.get('niucloud/admin/authinfo')
 }
 
-
-
 /**
  * 获取授权插件列表
  * @returns
diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts
index 0682d5d84..db267b3b4 100644
--- a/admin/src/app/api/notice.ts
+++ b/admin/src/app/api/notice.ts
@@ -19,16 +19,6 @@ export function getNoticeInfo(key: string) {
     return request.get(`notice/notice/${key}`)
 }
 
-/**
- * 消息发送记录
- * @param params
- * @returns
- */
-export function getNoticeLog(params: any) {
-    return request.get(`notice/log`, {params})
-}
-
-
 /**
  * 消息启动与关闭
  * @param params
diff --git a/admin/src/app/api/order.ts b/admin/src/app/api/order.ts
deleted file mode 100644
index 7fdf586e5..000000000
--- a/admin/src/app/api/order.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import request from '@/utils/request'
-
-/***************************************************** 充值订单 ****************************************************/
-
-/**
- * 获取充值订单列表
- * @param params
- * @returns
- */
-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
- * @returns
- */
-export function getRechargeOrderInfo(order_id: number) {
-    return request.get(`order/recharge/${order_id}`);
-}
-
-/**
- * 获取充值订单状态列表
- * @returns
- */
-export function getRechargeOrderStatusList() {
-    return request.get(`order/recharge/status`)
-}
-
-/**
- * 获取退款记录
- * @returns
- */
-export function getRechargeRefund(params: Record<string, any>) {
-    return request.get(`order/recharge/refund`, {params})
-}
-
-/**
- * 获取退款状态
- * @returns
- */
-export function getRechargeRefundStatus() {
-    return request.get(`order/recharge/refund/status`)
-}
-
-/**
- * 充值订单发起退款
- * @returns
- */
-export function rechargeRefund(id: number) {
-    return request.put(`order/recharge/refund/${id}`, {}, {showSuccessMessage: true});
-}
-
-/**
- * 获取退款统计
- * @returns
- */
-export function getRechargeRefundStat() {
-    return request.get(`order/recharge/refund/stat`);
-}
\ No newline at end of file
diff --git a/admin/src/app/api/printer.ts b/admin/src/app/api/printer.ts
new file mode 100644
index 000000000..eccf6213c
--- /dev/null
+++ b/admin/src/app/api/printer.ts
@@ -0,0 +1,184 @@
+import request from '@/utils/request'
+
+/**
+ * 获取小票打印机分页列表
+ * @param params
+ * @returns
+ */
+export function getPrinterPageList(params: Record<string, any>) {
+    return request.get(`sys/printer`, { params })
+}
+
+/**
+ * 获取小票打印机列表
+ * @param params
+ * @returns
+ */
+export function getPrinterList(params: Record<string, any>) {
+    return request.get(`sys/printer/list`, { params })
+}
+
+/**
+ * 获取小票打印机详情
+ * @param printer_id 小票打印机printer_id
+ * @returns
+ */
+export function getPrinterInfo(printer_id: number) {
+    return request.get(`sys/printer/${ printer_id }`);
+}
+
+/**
+ * 添加小票打印机
+ * @param params
+ * @returns
+ */
+export function addPrinter(params: Record<string, any>) {
+    return request.post('sys/printer', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑小票打印机
+ * @param params
+ * @returns
+ */
+export function editPrinter(params: Record<string, any>) {
+    return request.put(`sys/printer/${ params.printer_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
+
+/**
+ * 修改小票打印机状态
+ * @param params
+ * @returns
+ */
+export function modifyPrinterStatus(params: Record<string, any>) {
+    return request.put(`sys/printer/status`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
+
+/**
+ * 删除小票打印机
+ * @param printer_id
+ * @returns
+ */
+export function deletePrinter(printer_id: number) {
+    return request.delete(`sys/printer/${ printer_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
+
+/**
+ * 获取小票打印模板分页列表
+ * @param params
+ * @returns
+ */
+export function getPrinterTemplatePageList(params: Record<string, any>) {
+    return request.get(`sys/printer/template`, { params })
+}
+
+/**
+ * 获取小票打印模板列表
+ * @param params
+ * @returns
+ */
+export function getPrinterTemplateList(params: Record<string, any>) {
+    return request.get(`sys/printer/template/list`, { params })
+}
+
+/**
+ * 获取小票打印模板详情
+ * @param template_id 小票打印模板template_id
+ * @returns
+ */
+export function getPrinterTemplateInfo(template_id: number) {
+    return request.get(`sys/printer/template/${ template_id }`);
+}
+
+/**
+ * 添加小票打印模板
+ * @param params
+ * @returns
+ */
+export function addPrinterTemplate(params: Record<string, any>) {
+    return request.post('sys/printer/template', params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
+
+/**
+ * 编辑小票打印模板
+ * @param params
+ * @returns
+ */
+export function editPrinterTemplate(params: Record<string, any>) {
+    return request.put(`sys/printer/template/${ params.template_id }`, params, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
+
+/**
+ * 删除小票打印模板
+ * @param template_id
+ * @returns
+ */
+export function deletePrinterTemplate(template_id: number) {
+    return request.delete(`sys/printer/template/${ template_id }`, {
+        showErrorMessage: true,
+        showSuccessMessage: true
+    })
+}
+
+/**
+ * 获取小票打印模板类型
+ * @param params
+ * @returns
+ */
+export function getPrinterType(params: Record<string, any>) {
+    return request.get(`sys/printer/type`, { params })
+}
+
+/**
+ * 获取小票打印机设备品牌
+ * @param params
+ * @returns
+ */
+export function getPrinterBrand(params: Record<string, any>) {
+    return request.get(`sys/printer/brand`, { params })
+}
+
+/**
+ * 刷新打印机token
+ * @param printer_id 小票打印机printer_id
+ * @returns
+ */
+export function refreshPrinterToken(printer_id: number) {
+    return request.put(`sys/printer/refreshtoken/${ printer_id }`,{},{
+        showErrorMessage: true,
+        showSuccessMessage: true
+    });
+}
+
+/**
+ * 测试打印
+ * @param printer_id 小票打印机printer_id
+ * @returns
+ */
+export function testPrint(printer_id: number) {
+    return request.put(`sys/printer/testprint/${ printer_id }`, {},{ showErrorMessage: true, showSuccessMessage: true });
+}
+
+/**
+ * 打印小票内容
+ * @param params
+ * @returns
+ */
+export function printTicket(params: Record<string, any>) {
+    return request.post('sys/printer/printticket', params, { showErrorMessage: true, showSuccessMessage: true })
+}
\ No newline at end of file
diff --git a/admin/src/app/api/stat.ts b/admin/src/app/api/stat.ts
deleted file mode 100644
index 02f5f8551..000000000
--- a/admin/src/app/api/stat.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import request from '@/utils/request'
-
-/***************************************************** 统计信息 **************************************************/
-/**
- * 获取统计信息
- */
-export function getStatInfo() {
-    return request.get(`stat/index`)
-}
-
-/**
- * 获取站点统计信息
- */
-export function getSiteStatInfo() {
-    return request.get(`stat/siteindex`)
-}
-
diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts
index b6d12bb16..da005841b 100644
--- a/admin/src/app/api/sys.ts
+++ b/admin/src/app/api/sys.ts
@@ -33,7 +33,7 @@ export function getRoleList(params: Record<string, any>) {
  * @param roleId
  */
 export function getRoleInfo(roleId: number) {
-    return request.get(`sys/role/${roleId}`)
+    return request.get(`sys/role/${ roleId }`)
 }
 
 /**
@@ -50,7 +50,7 @@ export function addRole(params: Record<string, any>) {
  * @param params
  */
 export function editRole(params: Record<string, any>) {
-    return request.put(`sys/role/${params.role_id}`, params, { showSuccessMessage: true })
+    return request.put(`sys/role/${ params.role_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -58,15 +58,7 @@ export function editRole(params: Record<string, any>) {
  * @param roleId
  */
 export function deleteRole(roleId: number) {
-    return request.delete(`sys/role/${roleId}`, { showSuccessMessage: true })
-}
-
-/**
- * 编辑用户组
- * @param params
- */
-export function setRoleStatus(params: Record<string, any>) {
-    return request.put(`sys/role/status/${params.role_id}`, params, { showSuccessMessage: true })
+    return request.delete(`sys/role/${ roleId }`, { showSuccessMessage: true })
 }
 
 /**
@@ -92,7 +84,7 @@ export function getMenus() {
  * @param menu_key
  */
 export function getMenuInfo(menu_key: string) {
-    return request.get(`sys/menu/info/${menu_key}`);
+    return request.get(`sys/menu/info/${ menu_key }`);
 }
 
 /**
@@ -109,7 +101,7 @@ export function addMenu(params: Record<string, any>) {
  * @param params
  */
 export function editMenu(params: Record<string, any>) {
-    return request.put(`sys/menu/${params.menu_key}`, params, { showSuccessMessage: true })
+    return request.put(`sys/menu/${ params.menu_key }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -117,7 +109,7 @@ export function editMenu(params: Record<string, any>) {
  * @param menu_key
  */
 export function deleteMenu(menu_key: string) {
-    return request.delete(`sys/menu/${menu_key}`, { showSuccessMessage: true })
+    return request.delete(`sys/menu/${ menu_key }`, { showSuccessMessage: true })
 }
 
 /**
@@ -128,20 +120,12 @@ export function getSystemMenu(params: Record<string, any> = {}) {
     return request.get(`sys/menu/system_menu`, { params })
 }
 
-/**
- * 获取应用菜单
- *
- */
-export function getAllAddonMenu() {
-    return request.get(`sys/menu/addon_menu/all`)
-}
-
 /**
  * 获取应用菜单
  *
  */
 export function getAddonMenu(key: any) {
-    return request.get(`sys/menu/addon_menu/${key}`)
+    return request.get(`sys/menu/addon_menu/${ key }`)
 }
 
 /**
@@ -149,7 +133,7 @@ export function getAddonMenu(key: any) {
  * @param key
  */
 export function getMenuByTypeDir(key: any = 'system') {
-    return request.get(`sys/menu/dir/${key}`)
+    return request.get(`sys/menu/dir/${ key }`)
 }
 
 /***************************************************** 设置 ****************************************************/
@@ -235,7 +219,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, { showSuccessMessage: true })
+    return request.put(`sys/attachment/category/${ params.id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -244,7 +228,7 @@ export function editAttachmentCategory(params: Record<string, any>) {
  * @returns
  */
 export function deleteAttachmentCategory(id: number) {
-    return request.delete(`sys/attachment/category/${id}`, { showSuccessMessage: true })
+    return request.delete(`sys/attachment/category/${ id }`, { showSuccessMessage: true })
 }
 
 /**
@@ -299,6 +283,7 @@ export function getIconList(params: Record<string, any>) {
 export function getEnv() {
     return request.get(`sys/env`)
 }
+
 /***************************************************** 地址管理 ****************************************************/
 
 /**
@@ -306,7 +291,7 @@ export function getEnv() {
  * @param pid
  */
 export function getAreaListByPid(pid: number = 0) {
-    return request.get(`sys/area/list_by_pid/${pid}`)
+    return request.get(`sys/area/list_by_pid/${ pid }`)
 }
 
 /**
@@ -314,10 +299,9 @@ export function getAreaListByPid(pid: number = 0) {
  * @param level
  */
 export function getAreatree(level: number = 1) {
-    return request.get(`sys/area/tree/${level}`)
+    return request.get(`sys/area/tree/${ level }`)
 }
 
-
 /**
  * 获取地址信息
  */
@@ -337,8 +321,9 @@ export function getContraryAddress(params: any) {
  * @param code
  */
 export function getAreaByCode(code: number | string) {
-    return request.get(`sys/area/code/${code}`)
+    return request.get(`sys/area/code/${ code }`)
 }
+
 /***************************************************** 存储设置 ****************************************************/
 
 /**
@@ -353,7 +338,7 @@ export function getStorageList() {
  * @param type
  */
 export function getStorageInfo(type: string) {
-    return request.get(`sys/storage/${type}`)
+    return request.get(`sys/storage/${ type }`)
 }
 
 /**
@@ -362,7 +347,7 @@ export function getStorageInfo(type: string) {
  * @returns
  */
 export function editStorage(params: Record<string, any>) {
-    return request.put(`sys/storage/${params.storage_type}`, params, { showSuccessMessage: true })
+    return request.put(`sys/storage/${ params.storage_type }`, params, { showSuccessMessage: true })
 }
 
 /***************************************************** 支付设置 ****************************************************/
@@ -372,7 +357,7 @@ export function editStorage(params: Record<string, any>) {
  * @returns
  */
 export function getPayConfig(type: string) {
-    return request.get(`pay/config/${type}`)
+    return request.get(`pay/config/${ type }`)
 }
 
 /**
@@ -380,7 +365,7 @@ export function getPayConfig(type: string) {
  * @returns
  */
 export function setPayConfig(params: Record<string, any>) {
-    return request.put(`pay/config/${params.type}`, params, { showSuccessMessage: true });
+    return request.put(`pay/config/${ params.type }`, params, { showSuccessMessage: true });
 }
 
 /**
@@ -397,7 +382,7 @@ export function getPayList() {
  * @param channel
  */
 export function getTransferInfo(channel: string) {
-    return request.get(`pay/channel/lists/${channel}`)
+    return request.get(`pay/channel/lists/${ channel }`)
 }
 
 /**
@@ -424,7 +409,7 @@ export function getCronList(params: any) {
  * @returns
  */
 export function getCronInfo(id: string) {
-    return request.get(`sys/cron/${id}`);
+    return request.get(`sys/cron/${ id }`);
 }
 
 /**
@@ -464,7 +449,7 @@ export function addCron(params: Record<string, any>) {
  * @returns
  */
 export function editCron(params: Record<string, any>) {
-    return request.put(`sys/schedule/${params.id}`, params, { showSuccessMessage: true })
+    return request.put(`sys/schedule/${ params.id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -472,7 +457,7 @@ export function editCron(params: Record<string, any>) {
  * @returns
  */
 export function deleteCron(id: string) {
-    return request.delete(`sys/schedule/${id}`, { showSuccessMessage: true })
+    return request.delete(`sys/schedule/${ id }`, { showSuccessMessage: true })
 }
 
 /***************************************************** 协议管理 ****************************************************/
@@ -490,7 +475,7 @@ export function getAgreementList() {
  * @returns
  */
 export function getAgreementInfo(key: string) {
-    return request.get(`sys/agreement/${key}`);
+    return request.get(`sys/agreement/${ key }`);
 }
 
 /**
@@ -498,7 +483,7 @@ export function getAgreementInfo(key: string) {
  * @returns
  */
 export function editAgreement(params: Record<string, any>) {
-    return request.put(`sys/agreement/${params.key}`, params, { showSuccessMessage: true })
+    return request.put(`sys/agreement/${ params.key }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -509,7 +494,6 @@ export function getChannelType() {
     return request.get(`sys/channel`);
 }
 
-
 /**
  * 获取渠道域名
  * @returns
@@ -556,7 +540,7 @@ export function setPatConfig(params: Record<string, any>) {
  * 刷新菜单
  */
 export function menuRefresh(params: Record<string, any>) {
-    return request.post(`sys/menu/refresh`, {}, { showSuccessMessage: true })
+    return request.post(`sys/menu/refresh`, {})
 }
 
 /**
@@ -566,7 +550,6 @@ export function clearSchemaCache(params: Record<string, any>) {
     return request.post(`sys/schema/clear`, {}, { showSuccessMessage: true })
 }
 
-
 /***************************************************** 获取应用 ****************************************************/
 /**
  * 获取应用
@@ -592,19 +575,6 @@ export function getMap() {
 }
 
 /***************************************************** 首页 ****************************************************/
-/**
- * 获取首页列表
- */
-export function getIndexList() {
-    return request.get(`sys/config/site_index`)
-}
-
-/**
- * 设置首页模版
- */
-export function setIndexList(params: Record<string, any>) {
-    return request.put(`sys/config/site_index`, params, { showSuccessMessage: true })
-}
 
 /**
  * 获取支付待审核记录
@@ -618,7 +588,7 @@ export function getPayAuditList(params: Record<string, any>) {
  * @returns
  */
 export function payAuditPass(outTradeNo: string) {
-    return request.put(`pay/pass/${outTradeNo}`, {}, { showSuccessMessage: true })
+    return request.put(`pay/pass/${ outTradeNo }`, {}, { showSuccessMessage: true })
 }
 
 /**
@@ -626,14 +596,14 @@ export function payAuditPass(outTradeNo: string) {
  * @returns
  */
 export function payAuditRefuse(params: Record<string, any>) {
-    return request.put(`pay/refuse/${params.out_trade_no}`, params, { showSuccessMessage: true })
+    return request.put(`pay/refuse/${ params.out_trade_no }`, params, { showSuccessMessage: true })
 }
 
 /**
  * 获取支付单据详情
  */
 export function getPayDetail(id: number) {
-    return request.get(`pay/detail/${id}`)
+    return request.get(`pay/detail/${ id }`)
 }
 
 /**
@@ -643,13 +613,6 @@ export function getAddonList() {
     return request.get(`app/getAddonList`)
 }
 
-/**
- * 获取手机端首页列表
- */
-export function getWapIndexList(params: Record<string, any>) {
-    return request.get('sys/config/wap_index', { params })
-}
-
 /**
  * 获取开发者key
  * @returns
@@ -667,7 +630,6 @@ export function setDeveloperToken(params: Record<string, any>) {
     return request.put(`sys/config/developer_token`, params, { showSuccessMessage: true })
 }
 
-
 /**
  * 获取布局设置
  * @returns
@@ -707,7 +669,7 @@ export function getExportKeyList() {
  * @returns
  */
 export function exportData(type: string, params: Record<string, any>) {
-    return request.get(`sys/export/${type}`, { params })
+    return request.get(`sys/export/${ type }`, { params })
 }
 
 /**
@@ -715,7 +677,7 @@ export function exportData(type: string, params: Record<string, any>) {
  * @returns
  */
 export function exportDataCheck(type: string, params: Record<string, any>) {
-    return request.get(`sys/export/check/${type}`, { params })
+    return request.get(`sys/export/check/${ type }`, { params })
 }
 
 /**
@@ -723,7 +685,7 @@ export function exportDataCheck(type: string, params: Record<string, any>) {
  * @param id
  */
 export function deleteExport(id: number) {
-    return request.delete(`sys/export/${id}`, { showSuccessMessage: true })
+    return request.delete(`sys/export/${ id }`, { showSuccessMessage: true })
 }
 
 /**
diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts
index 033b4f45e..1fc36a534 100644
--- a/admin/src/app/api/user.ts
+++ b/admin/src/app/api/user.ts
@@ -19,7 +19,7 @@ export function getUserList(params: Record<string, any>) {
  * @returns
  */
 export function getUserInfo(uid: number) {
-    return request.get(`user/${uid}`);
+    return request.get(`user/${ uid }`);
 }
 
 /**
@@ -31,26 +31,35 @@ export function addUser(params: Record<string, any>) {
     return request.post('user', params, { showSuccessMessage: true })
 }
 
+/**
+ * 获取所有用户列表
+ * @param params
+ * @returns
+ */
+export function getAllUserList(params: Record<string, any>) {
+    return request.get(`user/user_all`, { params })
+}
+
 /**
  * 更新用户
  * @param params
  */
 export function editUser(params: Record<string, any>) {
-    return request.put(`user/${params.uid}`, params, { showSuccessMessage: true })
+    return request.put(`user/${ params.uid }`, params, { showSuccessMessage: true })
 }
 
 /**
  * 锁定用户
  */
 export function lockUser(uid: number) {
-    return request.put(`user/lock/${uid}`, {}, { showSuccessMessage: true })
+    return request.put(`user/lock/${ uid }`, {}, { showSuccessMessage: true })
 }
 
 /**
  * 解除用户锁定
  */
 export function unlockUser(uid: number) {
-    return request.put(`user/unlock/${uid}`, {}, { showSuccessMessage: true })
+    return request.put(`user/unlock/${ uid }`, {}, { showSuccessMessage: true })
 }
 
 /***************************************************** 操作日志 **************************************************/
@@ -69,5 +78,5 @@ export function getLogList(params: Record<string, any>) {
  * @param id
  */
 export function getLogInfo(id: number) {
-    return request.get(`user/userlog/${id}`)
+    return request.get(`user/userlog/${ id }`)
 }
diff --git a/admin/src/app/api/verify.ts b/admin/src/app/api/verify.ts
index 1aa0a98a6..16af87419 100644
--- a/admin/src/app/api/verify.ts
+++ b/admin/src/app/api/verify.ts
@@ -34,7 +34,6 @@ export function getVerifierList(params: Record<string, any>) {
 
 /**
  * 获取核销员列表
- * @param params
  * @returns
  */
 export function getVerifierSelect() {
diff --git a/admin/src/app/api/wechat.ts b/admin/src/app/api/wechat.ts
index 8a4d3b680..336476650 100644
--- a/admin/src/app/api/wechat.ts
+++ b/admin/src/app/api/wechat.ts
@@ -49,7 +49,6 @@ export function getTemplateList() {
     return request.get('wechat/template')
 }
 
-
 /**
  * 获取同步
  * @param params
@@ -131,7 +130,6 @@ export function getMediaList(params: Record<string, any>) {
     return request.get('wechat/media', { params })
 }
 
-
 /**
  * 同步素材库
  */
diff --git a/admin/src/app/assets/images/default_headimg_square.jpg b/admin/src/app/assets/images/default_headimg_square.jpg
new file mode 100644
index 000000000..1be72280a
Binary files /dev/null and b/admin/src/app/assets/images/default_headimg_square.jpg differ
diff --git a/admin/src/app/assets/images/diy/notice/style_01.png b/admin/src/app/assets/images/diy/notice/style_01.png
deleted file mode 100644
index 81d4ceac0..000000000
Binary files a/admin/src/app/assets/images/diy/notice/style_01.png and /dev/null differ
diff --git a/admin/src/app/assets/images/empty.png b/admin/src/app/assets/images/empty.png
deleted file mode 100644
index c8421c96c..000000000
Binary files a/admin/src/app/assets/images/empty.png and /dev/null differ
diff --git a/admin/src/app/assets/images/member_head.png b/admin/src/app/assets/images/member_head.png
index bb09f5ec3..3c4876017 100644
Binary files a/admin/src/app/assets/images/member_head.png and b/admin/src/app/assets/images/member_head.png differ
diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue
index ed8385d60..14a65fcf7 100644
--- a/admin/src/app/components/upgrade/index.vue
+++ b/admin/src/app/components/upgrade/index.vue
@@ -1,6 +1,5 @@
 <template>
-    <el-dialog v-model="showDialog" :title="t('upgrade.title')" width="850px" :close-on-click-modal="false"
-               :close-on-press-escape="false" :before-close="dialogClose">
+    <el-dialog v-model="showDialog" :title="t('upgrade.title')" width="850px" :close-on-click-modal="false" :close-on-press-escape="false" :before-close="dialogClose">
 
         <div v-show="active == 'content'">
 
@@ -117,6 +116,8 @@
 <script lang="ts" setup>
 import { ref, h, watch } from 'vue'
 import { t } from '@/lang'
+import { getVersions } from '@/app/api/auth'
+import { getFrameworkVersionList } from '@/app/api/module'
 import { getUpgradeContent, getUpgradeTask, upgradeAddon, executeUpgrade, preUpgradeCheck, clearUpgradeTask } from '@/app/api/upgrade'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
 import 'vue-web-terminal/lib/theme/dark.css'
@@ -209,6 +210,14 @@ const elNotificationClick = () => {
     notificationEl && notificationEl.close()
 }
 
+const versions = ref('')
+const getVersionsInfo = () => {
+    getVersions().then(res => {
+        versions.value = res.data.version.version
+    })
+}
+getVersionsInfo()
+
 /**
  * 执行升级
  */
@@ -218,19 +227,17 @@ const handleUpgrade = async () => {
 
     const appKey = upgradeContent.value?.app.app_key != 'niucloud-admin' ? upgradeContent.value?.app.app_key : ''
 
-    await preUpgradeCheck(appKey)
-        .then(async ({ data }) => {
-            if (data.is_pass) {
-                await upgradeAddon(appKey).then(() => {
-                    getUpgradeTaskFn()
-                }).catch(() => {
-                    uploading.value = false
-                })
-            } else {
-                upgradeCheck.value = data
-            }
-        })
-        .catch()
+    await preUpgradeCheck(appKey).then(async({ data }) => {
+        if (data.is_pass) {
+            await upgradeAddon(appKey).then(() => {
+                getUpgradeTaskFn()
+            }).catch(() => {
+                uploading.value = false
+            })
+        } else {
+            upgradeCheck.value = data
+        }
+    }).catch()
 
     if (uploading.value) active.value = 'upgrade'
 }
@@ -240,18 +247,26 @@ const open = (addonKey: string = '') => {
         ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
         showDialog.value = true
     } else {
-        getUpgradeContent(addonKey).then(({ data }) => {
-            upgradeContent.value = data
-            if (!data.version_list.length) {
-                ElMessage({ message: '已经是最新版本了', type: 'error' })
+        getFrameworkVersionList().then(({ data }) => {
+            const newVersion = data.length ? data[0] : null
+            if (addonKey && newVersion && newVersion.version_no !== versions.value) {
+                ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
                 return
-            }
-            if (Storage.get('upgradeTipsLock')) {
-                showDialog.value = true
             } else {
-                upgradeTipsShowDialog.value = true
+                getUpgradeContent(addonKey).then(({ data }) => {
+                    upgradeContent.value = data
+                    if (!data.version_list.length) {
+                        ElMessage({ message: '已经是最新版本了', type: 'error' })
+                        return
+                    }
+                    if (Storage.get('upgradeTipsLock')) {
+                        showDialog.value = true
+                    } else {
+                        upgradeTipsShowDialog.value = true
+                    }
+                }).catch()
             }
-        }).catch()
+        })
     }
 }
 
diff --git a/admin/src/app/components/user-info-edit/index.vue b/admin/src/app/components/user-info-edit/index.vue
index f6769fa04..65603fbfe 100644
--- a/admin/src/app/components/user-info-edit/index.vue
+++ b/admin/src/app/components/user-info-edit/index.vue
@@ -2,7 +2,7 @@
     <el-dialog v-model="dialogVisible" :title="t('accountSettings')" width="500">
         <el-form :model="saveInfo" label-width="90px" ref="formRef" class="page-form">
             <el-form-item :label="t('headImg')">
-                <upload-image v-model="saveInfo.head_img" :limit="1" :type="'avatar'" />
+                <upload-image v-model="saveInfo.head_img" :limit="1" :type="'avatar'" imageFit="cover" />
             </el-form-item>
             <el-form-item :label="t('userName')">
                 <span>{{saveInfo.username}}</span>
@@ -77,5 +77,4 @@ defineExpose({
 })
 </script>
 <style lang="scss" scoped>
-
 </style>
diff --git a/admin/src/app/lang/zh-cn/app.authorize.json b/admin/src/app/lang/zh-cn/app.authorize.json
index faddbbec7..5337560cb 100644
--- a/admin/src/app/lang/zh-cn/app.authorize.json
+++ b/admin/src/app/lang/zh-cn/app.authorize.json
@@ -14,5 +14,6 @@
 	"updateCode": "重新绑定",
 	"notHaveAuth": "还没有授权？去购买",
 	"authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看",
-	"cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？"
+	"cloudBuildTips": "是否要进行云编译该操作可能会影响到正在访问的客户是否要继续操作？",
+	"versionTips":"已经升级到最新版本"
 }
diff --git a/admin/src/app/lang/zh-cn/auth.menu.json b/admin/src/app/lang/zh-cn/auth.menu.json
index 3d29028f8..c87e8cb51 100644
--- a/admin/src/app/lang/zh-cn/auth.menu.json
+++ b/admin/src/app/lang/zh-cn/auth.menu.json
@@ -30,4 +30,4 @@
     "addon":"选择应用",
     "system":"系统菜单",
     "application":"应用菜单"
-}
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/auth.role_edit.json b/admin/src/app/lang/zh-cn/auth.role_edit.json
deleted file mode 100644
index 916b4300a..000000000
--- a/admin/src/app/lang/zh-cn/auth.role_edit.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "addRole": "新增角色",
-    "updateRole": "编辑角色",
-    "roleName": "角色名称",
-    "roleDeleteTips": "确定要删除该角色吗？",
-    "roleNamePlaceholder": "请输入角色名称",
-    "rulesPlaceholder": "请选择权限",
-    "checkStrictly": "父子级不关联",
-    "permission": "权限",
-    "foldText":"展开/折叠",
-    "system": "系统菜单",
-    "application": "应用菜单"
-}
diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json
index c2b5dc799..df6b002e9 100644
--- a/admin/src/app/lang/zh-cn/diy.edit.json
+++ b/admin/src/app/lang/zh-cn/diy.edit.json
@@ -12,6 +12,7 @@
   "pageContent": "页面内容",
   "statusBarContent": "导航栏内容",
   "statusBarStyle": "导航栏样式",
+  "statusBarSwitchTips": "此处控制当前页面导航栏是否显示",
   "bottomNavContent": "底部导航内容",
   "diyPageTitle": "页面名称",
   "diyPageTitlePlaceholder": "请输入页面名称",
@@ -104,8 +105,7 @@
   "titleStyle": "标题样式",
   "selectStyle": "风格选择",
   "styleLabel": "风格",
-  "styleShowTips": "风格 1 2 3 5 6，仅在小程序中展示",
-  "topStatusBarBgColorTips": "当导航栏样式为风格5且页面滚动时，背景颜色会跟随顶部颜色的设置而改变",
+  "styleShowTips": "风格 1 2 3，仅在小程序中展示",
   "titleContent": "标题内容",
   "title": "标题名称",
   "titlePlaceholder": "请输入标题",
@@ -206,6 +206,7 @@
   "carouselSearchHotWordTextPlaceholder": "请输入热词",
   "carouselSearchAddHotWordItem": "添加一个热词",
   "carouselSearchLogoTips": "建议尺寸，70px * 30px",
+  "carouselSearchTextTips": "搜索内容是默认展示数据，当添加搜索热词时，搜索内容隐藏; 当没有搜索热词时，搜索内容展示",
   "carouselSearchPlaceholder": "请输入搜索内容",
   "carouselSearchTabSet": "选项卡设置",
   "carouselSearchTabControl": "展示开关",
@@ -249,9 +250,10 @@
   "topStatusBarNav": "导航栏",
   "topStatusBarNavTips": "此处控制当前页面导航栏是否显示",
   "topStatusBarImgTips": "宽度自适应（最大150px），高度28px",
-  "topStatusBarIsTransparent": "顶部透明",
   "topStatusBarTextColor": "标题颜色",
-  "topStatusBarBgColor": "顶部颜色",
+  "topStatusBarBgColor": "头部颜色",
+  "rollTopStatusBarBgColor": "滚动后头部颜色",
+  "rollTopStatusBarTextColor": "滚动后标题颜色",
   "topStatusBarSearchName": "搜索内容",
   "topStatusBarSearchNamePlaceholder": "请输入搜索关键词",
   "settingTips": "点击查看如何配置"
diff --git a/admin/src/app/lang/zh-cn/poster.edit.json b/admin/src/app/lang/zh-cn/poster.edit.json
index 78f6d9c15..58cfc82c4 100644
--- a/admin/src/app/lang/zh-cn/poster.edit.json
+++ b/admin/src/app/lang/zh-cn/poster.edit.json
@@ -47,5 +47,15 @@
   "polygon": "多边形",
   "angle": "旋转角度",
   "nickName": "昵称",
-  "needLoginTips": "前台需要登录才会展示"
+  "needLoginTips": "前台需要登录才会展示",
+  "horizontalAlignment": "水平对齐方式",
+  "verticalAlignment": "垂直对齐方式",
+  "AlignTips": "当设置文本水平对齐方式时，其内容也会随之改变",
+  "lineHeight": "行高",
+  "textAlign": "文字居中方式",
+  "space": "字间距",
+  "weight": "文字加粗",
+  "imgShape": "图片形状"
+  
+  
 }
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.edit.json b/admin/src/app/lang/zh-cn/printer.edit.json
new file mode 100644
index 000000000..c71632488
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/printer.edit.json
@@ -0,0 +1,26 @@
+{
+  "printerSet": "打印机设置",
+  "printerName": "打印机名称",
+  "printerNamePlaceholder": "请输入打印机名称",
+  "brand": "设备品牌",
+  "brandPlaceholder": "请选择设备品牌",
+  "printerCode": "打印机编号",
+  "printerCodePlaceholder": "请输入打印机编号",
+  "printerCodeTips": "易联云打印机背面的终端号",
+  "printerKey": "打印机秘钥",
+  "printerKeyPlaceholder": "请输入打印机秘钥",
+  "printerKeyTips": "易联云打印机背面的密钥",
+  "openId": "开发者id",
+  "openIdPlaceholder": "请输入开发者id",
+  "openIdTips": "应用ID（易联云-开发者中心后台应用中心里获取）",
+  "apikey": "开发者密钥",
+  "apikeyPlaceholder": "请输入开发者密钥",
+  "apikeyTips": "应用密钥（易联云-开发者中心后台应用中心里获取）",
+  "printWidth": "纸张宽度",
+  "printWidthPlaceholder": "请输入纸张宽度",
+  "status": "状态",
+  "printTrigger": "打印时机",
+  "usePrintTemplate": "选择模板",
+  "printNum": "打印联数",
+  "printTypeEmpty": "缺少打印模板类型"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.list.json b/admin/src/app/lang/zh-cn/printer.list.json
new file mode 100644
index 000000000..f4b66a64a
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/printer.list.json
@@ -0,0 +1,19 @@
+{
+  "tabPrinterManager": "打印机管理",
+  "tabPrinterTemplate": "打印模板",
+  "printerName": "打印机名称",
+  "printerNamePlaceholder": "请输入打印机名称",
+  "brand": "设备品牌",
+  "printWidth": "纸张宽度",
+  "status": "状态",
+  "statusOn": "启用",
+  "statusOff": "禁用",
+  "createTime": "创建时间",
+  "addPrinter": "添加打印机",
+  "updatePrinter": "编辑打印机",
+  "printerDeleteTips": "确定要删除该数据吗？",
+  "testPrint": "测试打印",
+  "testPrintTips": "确定测试打印吗",
+  "refreshToken": "授权",
+  "refreshTokenTips": "若易联云打印机在 [测试打印] 时提示 access_token过期或错误，请重新授权，是否重新授权"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.template_edit.json b/admin/src/app/lang/zh-cn/printer.template_edit.json
new file mode 100644
index 000000000..a4972eab4
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/printer.template_edit.json
@@ -0,0 +1,11 @@
+{
+  "templateInfoLabel": "模板信息",
+  "templateName": "模板名称",
+  "templateNamePlaceholder": "请输入模板名称",
+  "templateType": "模板类型",
+  "printTypeEmpty": "缺少打印模板类型",
+  "templateTypePlaceholder": "请选择模板类型",
+  "templateEditLabel": "模板编辑",
+  "preview": "预览图",
+  "printTemplateEmpty": "打印模板不存在"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/printer.template_list.json b/admin/src/app/lang/zh-cn/printer.template_list.json
new file mode 100644
index 000000000..bc65e6cfa
--- /dev/null
+++ b/admin/src/app/lang/zh-cn/printer.template_list.json
@@ -0,0 +1,11 @@
+{
+  "tabPrinterManager": "打印机管理",
+  "tabPrinterTemplate": "打印模板",
+  "templateName": "模板名称",
+  "templateNamePlaceholder": "请输入模板名称",
+  "templateType": "模板类型",
+  "templateTypePlaceholder": "请选择模板类型",
+  "createTime": "创建时间",
+  "addPrinterTemplate": "添加小票打印模板",
+  "printerTemplateDeleteTips": "确定要删除该数据吗？"
+}
\ No newline at end of file
diff --git a/admin/src/app/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json
index 42a758961..b0ae95bf5 100644
--- a/admin/src/app/lang/zh-cn/setting.login.json
+++ b/admin/src/app/lang/zh-cn/setting.login.json
@@ -6,8 +6,8 @@
 	"isBindMobile": "强制绑定手机",
 	"isUsernameTip": "开启之后可以使用账号+密码进行注册和登录",
 	"isMobileTip": "开启之后可以使用手机+验证码进行注册和登录",
-	"isAuthRegisterTip": "开启之后，微信公众号、小程序等等第三方平台可以自动注册会员。方便会员自动登录",
-	"isBindMobileTip": "开启之后，会员通过账号或者第三方注册账户会强制绑定手机号，方便商家进行管理，同时方便会员在不同端口统一账号",
+	"isAuthRegisterTip": "开启之后，微信公众号、小程序等第三方平台可以自动注册会员。方便会员自动登录",
+	"isBindMobileTip": "开启之后，会员通过普通注册方式会强制绑定手机号，同时在相关页面也会引导会员强制绑定手机账号，否则影响功能正常使用，也方便商家进行管理，同时方便会员在不同端口统一账号",
 	"agreement": "政策协议",
 	"agreementTips": "注册时服务协议和隐私协议是否进行展示",
 	"mobileOrUsernameNoEmpty":"普通注册方式至少需启用一种",
diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue
index fb5464c96..778936a62 100644
--- a/admin/src/app/views/app/authorize.vue
+++ b/admin/src/app/views/app/authorize.vue
@@ -109,10 +109,11 @@ import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { getVersions } from '@/app/api/auth'
 import { getInstallConfig } from "@/app/api/sys"
-import { getAuthinfo, setAuthinfo, getFrameworkVersionList } from '@/app/api/module'
-import { ElMessageBox, FormInstance, FormRules } from 'element-plus'
+import { getAuthInfo, setAuthInfo, getFrameworkVersionList } from '@/app/api/module'
+import { ElMessageBox, FormInstance, FormRules,ElMessage  } from 'element-plus'
 import Upgrade from '@/app/components/upgrade/index.vue'
 import CloudBuild from '@/app/components/cloud-build/index.vue'
+import { cloneDeep } from 'lodash-es'
 
 const upgradeRef = ref<any>(null)
 const cloudBuildRef = ref<any>(null)
@@ -128,9 +129,20 @@ getInstallConfig().then(({ data }) => {
     installPhpConfig.value = data
 }).catch()
 
+const checkVersion = ref(false)
 const getFrameworkVersionListFn = () => {
     getFrameworkVersionList().then(({ data }) => {
         frameworkVersionList.value = data
+        if (checkVersion.value) {
+            if (!newVersion.value || (newVersion.value && newVersion.value.version_no == versions.value)) {
+                ElMessage({
+                    message: t('versionTips'),
+                    type: 'success'
+                })
+            }
+        } else {
+            checkVersion.value = true
+        }
     })
 }
 getFrameworkVersionListFn()
@@ -140,7 +152,7 @@ const newVersion:any = computed(() => {
 })
 
 const hideAuthCode = (res:any) => {
-    const authCode = JSON.parse(JSON.stringify(res))
+    const authCode = cloneDeep(res)
     const data = authCode.slice(0, authCode.length / 2) + authCode.slice(authCode.length / 2, authCode.length - 1).replace(/./g, '*')
     return data
 }
@@ -163,7 +175,7 @@ const authinfo = ref<AuthInfo>({
 const loading = ref(true)
 const saveLoading = ref(false)
 const checkAppMange = () => {
-    getAuthinfo().then((res) => {
+    getAuthInfo().then((res) => {
         loading.value = false
         if (res.data.data && res.data.data.length != 0) {
             authinfo.value = res.data.data
@@ -200,7 +212,7 @@ const save = async (formEl: FormInstance | undefined) => {
         if (valid) {
             saveLoading.value = true
 
-            setAuthinfo(formData).then(() => {
+            setAuthInfo(formData).then(() => {
                 saveLoading.value = false
                 checkAppMange()
             }).catch(() => {
@@ -227,7 +239,7 @@ getVersionsInfo()
  * 升级
  */
 const handleUpgrade = () => {
-    if (!authinfo.value) {
+    if (!authinfo.value.auth_code) {
         authCodeApproveFn()
         return
     }
@@ -235,7 +247,7 @@ const handleUpgrade = () => {
 }
 
 const handleCloudBuild = () => {
-    if (!authinfo.value) {
+    if (!authinfo.value.auth_code) {
         authCodeApproveFn()
         return
     }
diff --git a/admin/src/app/views/auth/components/addon-role.vue b/admin/src/app/views/auth/components/addon-role.vue
deleted file mode 100644
index 4caba26bb..000000000
--- a/admin/src/app/views/auth/components/addon-role.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-    <el-tree :data="data" :props="{ label: 'menu_name' }" show-checkbox :expand-on-click-node="false"
-        @check-change="handleCheckChange" node-key="menu_key" ref="treeRef" />
-</template>
-<script lang="ts" setup>
-import { debounce } from '@/utils/common'
-import { ref, computed, onMounted, nextTick } from 'vue'
-
-const prop = defineProps({
-    data: {
-        type: Object,
-        default: () => { }
-    },
-    modelValue: {
-        type: Array,
-        default: () => []
-    }
-})
-const data = ref([])
-data.value.push(prop.data)
-
-const emit = defineEmits(['update:modelValue', 'change'])
-const value = computed({
-    get() {
-        return prop.modelValue
-    },
-    set(value) {
-        emit('update:modelValue', value)
-    }
-})
-const treeRef = ref(null)
-
-//选择控制
-onMounted(() => {
-    nextTick(() => {
-        const newArr: any = []
-        prop.modelValue.forEach(el => checked(el, data.value, newArr))
-        treeRef.value.setCheckedKeys(newArr)
-    })
-})
-const checked = (key: string, data: any, newArr: any) => {
-    data.forEach((el: any) => {
-        if (key == el.menu_key) {
-            if (!el.children || el.children.length == 0) {
-                newArr.push(key)
-            }
-        } else {
-            if (el.children && el.children.length > 0) {
-                checked(key, el.children, newArr)
-            }
-        }
-    })
-}
-const handleCheckChange = debounce((e) => {
-    value.value = treeRef.value.getCheckedNodes(false, true).map(el => el.menu_key)
-})
-</script>
diff --git a/admin/src/app/views/auth/components/edit-menu.vue b/admin/src/app/views/auth/components/edit-menu.vue
index 0aff257af..31c90171d 100644
--- a/admin/src/app/views/auth/components/edit-menu.vue
+++ b/admin/src/app/views/auth/components/edit-menu.vue
@@ -2,10 +2,10 @@
     <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
         <el-form :model="formData" label-width="90px" class="page-form" ref="formRef" :rules="formRules" v-loading="loading">
             <el-form-item :label="t('menuName')" prop="menu_name">
-                <el-input v-model="formData.menu_name" :placeholder="t('menuNamePlaceholder')" class="input-width" />
+                <el-input v-model.trim="formData.menu_name" maxlength="10" show-word-limit :placeholder="t('menuNamePlaceholder')" class="input-width" />
             </el-form-item>
             <el-form-item :label="t('menuKey')" prop="menu_key" v-if="!formData.id">
-                <el-input v-model="formData.menu_key" :placeholder="t('menuKeyPlaceholder')" class="input-width" />
+                <el-input v-model.trim="formData.menu_key" maxlength="50" show-word-limit :placeholder="t('menuKeyPlaceholder')" class="input-width" />
             </el-form-item>
 
             <el-form-item :label="t('menuType')">
@@ -17,8 +17,8 @@
             </el-form-item>
 
             <el-form-item :label="t('addon')" prop="addon">
-                <el-select v-model="formData.addon" placeholder="Select" class="input-width" @change="addonChange">
-                    <el-option v-for="(item, index) in addonLst" :label="item.title" :value="item.key" :key="index" />
+                <el-select v-model="formData.addon" :placeholder="t('addon')" class="input-width" @change="addonChange">
+                    <el-option v-for="(item, index) in addonList" :label="item.title" :value="item.key" :key="index" />
                 </el-select>
             </el-form-item>
 
@@ -77,7 +77,7 @@
             </el-form-item>
 
             <el-form-item :label="t('sort')">
-                <el-input-number v-model="formData.sort" :min="0" />
+                <el-input-number v-model="formData.sort" :min="0" max="99999999" />
             </el-form-item>
         </el-form>
 
@@ -118,13 +118,12 @@ const initialFormData = {
     status: 1,
     is_show: 1,
     menu_key: '',
-    app_type: '',
     addon: '',
     menu_short_name: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
-const addonLst = ref<Array<any>>([])
+const addonList = ref<Array<any>>([])
 const sysMenuList = ref<Array<any>>([])
 const addonMenuList = ref<Array<any>>([])
 const formRef = ref<FormInstance>()
@@ -167,8 +166,8 @@ const formRules = computed(() => {
 // 获取插件列表
 const getAddonDevelopFn = async () => {
     const { data } = await getAddonDevelop({})
-    addonLst.value = [{ title: '系统', key: '' }]
-    addonLst.value.push(...data)
+    addonList.value = [{ title: '系统', key: '' }]
+    addonList.value.push(...data)
 }
 
 // 获取系统菜单列表
diff --git a/admin/src/app/views/auth/components/edit-role.vue b/admin/src/app/views/auth/components/edit-role.vue
index 1dc66b12e..faefe0db6 100644
--- a/admin/src/app/views/auth/components/edit-role.vue
+++ b/admin/src/app/views/auth/components/edit-role.vue
@@ -2,7 +2,7 @@
     <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('roleName')" prop="role_name">
-                <el-input v-model="formData.role_name" :placeholder="t('roleNamePlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="10" :show-word-limit="true" />
+                <el-input v-model.trim="formData.role_name" :placeholder="t('roleNamePlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="10" :show-word-limit="true" />
             </el-form-item>
 
             <el-form-item :label="t('status')">
diff --git a/admin/src/app/views/auth/components/edit-user.vue b/admin/src/app/views/auth/components/edit-user.vue
index d7c66357b..9a77a8f7a 100644
--- a/admin/src/app/views/auth/components/edit-user.vue
+++ b/admin/src/app/views/auth/components/edit-user.vue
@@ -55,7 +55,6 @@ import { allRole } from '@/app/api/sys'
 import { img, deepClone } from '@/utils/common'
 import { AnyObject } from '@/types/global'
 
-const userList = ref<AnyObject>([])
 const uid = ref<number | string>('')
 
 const real_name_input = ref(true)
diff --git a/admin/src/app/views/auth/components/select-menu-item.vue b/admin/src/app/views/auth/components/select-menu-item.vue
index 10c675141..96601d6f6 100644
--- a/admin/src/app/views/auth/components/select-menu-item.vue
+++ b/admin/src/app/views/auth/components/select-menu-item.vue
@@ -30,5 +30,4 @@ const menuLevel = computed(() => {
 </script>
 
 <style lang="scss" scoped>
-
 </style>
diff --git a/admin/src/app/views/auth/menu.vue b/admin/src/app/views/auth/menu.vue
index c3c463a92..e21ef7df3 100644
--- a/admin/src/app/views/auth/menu.vue
+++ b/admin/src/app/views/auth/menu.vue
@@ -5,7 +5,6 @@
 
             <div class="flex justify-between items-center">
                 <span class="text-page-title">{{ pageName }}</span>
-
                 <div class="flex items-center">
                     <el-button type="primary" class="w-[100px]" @click="addEvent">
                         {{ t('addMenu') }}
diff --git a/admin/src/app/views/auth/user.vue b/admin/src/app/views/auth/user.vue
index b7e53c006..274624207 100644
--- a/admin/src/app/views/auth/user.vue
+++ b/admin/src/app/views/auth/user.vue
@@ -9,8 +9,8 @@
 
             <div class="flex justify-between items-center mt-[20px]">
                 <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="input-width" :placeholder="t('accountNumberPlaceholder')" />
+                    <el-form-item :label="t('accountNumber')" prop="search">
+                        <el-input v-model="userTableData.searchParam.search" class="input-width" :placeholder="t('accountNumberPlaceholder')" />
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="loadUserList()">{{ t('search') }}</el-button>
@@ -107,7 +107,7 @@ const userTableData = reactive({
     loading: true,
     data: [],
     searchParam: {
-        seach: '',
+        search: '',
         user_type: ''
     }
 })
@@ -131,7 +131,7 @@ const loadUserList = (page: number = 1) => {
     getUserList({
         page: userTableData.page,
         limit: userTableData.limit,
-        username: userTableData.searchParam.seach,
+        username: userTableData.searchParam.search,
         user_type: userTableData.searchParam.user_type
     }).then(res => {
         userTableData.loading = false
diff --git a/admin/src/app/views/channel/weapp/code.vue b/admin/src/app/views/channel/weapp/code.vue
index 5e0641210..6d15697d6 100644
--- a/admin/src/app/views/channel/weapp/code.vue
+++ b/admin/src/app/views/channel/weapp/code.vue
@@ -74,7 +74,7 @@
 
         <el-dialog v-model="failReasonDialogVisible" :title="t('failReason')" width="60%">
             <el-scrollbar class="h-[60vh] w-full whitespace-pre p-[20px]">
-                {{ failReason }}
+                <div v-html="failReason"></div>
             </el-scrollbar>
         </el-dialog>
 
@@ -96,7 +96,7 @@ import { getInstallConfig } from '@/app/api/sys'
 import { setWeappVersion, getWeappPreview, getWeappVersionList, getWeappUploadLog, getWeappConfig } from '@/app/api/weapp'
 import { t } from '@/lang'
 import { useRoute, useRouter } from 'vue-router'
-import { getAuthinfo } from '@/app/api/module'
+import { getAuthInfo } from '@/app/api/module'
 import { getAppType } from '@/utils/common'
 import { ElMessageBox } from 'element-plus'
 import { AnyObject } from '@/types/global'
@@ -134,7 +134,7 @@ getInstallConfig().then(({ data }) => {
     installPhpConfig.value = data
 }).catch()
 
-getAuthinfo().then(res => {
+getAuthInfo().then(res => {
     if (res.data.data && res.data.data.auth_code) {
         authCode.value = res.data.data.auth_code
         getWeappPreviewImage()
diff --git a/admin/src/app/views/channel/weapp/config.vue b/admin/src/app/views/channel/weapp/config.vue
index b8fde5d1a..8fbf472ad 100644
--- a/admin/src/app/views/channel/weapp/config.vue
+++ b/admin/src/app/views/channel/weapp/config.vue
@@ -132,7 +132,7 @@ import { reactive, ref, watch, computed } from 'vue'
 import { t } from '@/lang'
 import { getWeappConfig, setWeappConfig } from '@/app/api/weapp'
 import { useClipboard } from '@vueuse/core'
-import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { ElMessage, FormInstance } from 'element-plus'
 import { ArrowLeft } from '@element-plus/icons-vue'
 import { useRoute, useRouter } from 'vue-router'
 
diff --git a/admin/src/app/views/channel/wechat/components/select-wechat-media.vue b/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
index 3665a24d1..343aa83e7 100644
--- a/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
+++ b/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
@@ -24,8 +24,7 @@
                         <div v-if="attachment.data.length">
                             <div class="flex flex-wrap" v-if="prop.type != 'news'">
                                 <div class="attachment-item mr-[10px] mb-[10px] w-[120px]" v-for="(item, index) in attachment.data" :key="index" @click="selectedFile = item">
-                                    <div
-                                        class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]">
+                                    <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]">
                                         <el-image :src="img(item.value)" fit="contain" v-if="type == 'image'" :preview-src-list="item.image_list" />
                                         <video :src="img(item.value)" v-else-if="type == 'video'"></video>
                                         <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60" v-show="selectedFile.id == item.id">
diff --git a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
index 8e2063a17..c8bba825f 100644
--- a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
+++ b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
@@ -17,7 +17,7 @@
                 <el-form-item :label="t('keyword')" prop="keyword">
                     <el-input v-model.trim="formData.keyword" :placeholder="t('keywordPlaceholder')" class="input-width" clearable >
                         <template #prepend>
-                            <el-select v-model="formData.matching_type" placeholder="Select" style="width: 115px">
+                            <el-select v-model="formData.matching_type" style="width: 115px">
                                 <el-option :label="t('allMatching')" value="full" />
                                 <el-option :label="t('fuzzyMatching')" value="like" />
                             </el-select>
diff --git a/admin/src/app/views/dict/components/edit.vue b/admin/src/app/views/dict/components/edit.vue
index cc48783a0..b7d3e05ef 100644
--- a/admin/src/app/views/dict/components/edit.vue
+++ b/admin/src/app/views/dict/components/edit.vue
@@ -2,10 +2,10 @@
     <el-dialog v-model="showDialog" :title="formData.id ? t('updateDict') : t('addDict')" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
         <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
             <el-form-item :label="t('name')" prop="name">
-                <el-input v-model="formData.name" clearable :placeholder="t('namePlaceholder')" class="input-width" />
+                <el-input v-model.trim="formData.name" clearable maxlength="40" show-word-limit :placeholder="t('namePlaceholder')" class="input-width" />
             </el-form-item>
             <el-form-item :label="t('key')" prop="key">
-                <el-input v-model="formData.key" clearable :placeholder="t('keyPlaceholder')" class="input-width" />
+                <el-input v-model.trim="formData.key" clearable  maxlength="40" show-word-limit :placeholder="t('keyPlaceholder')" class="input-width" />
             </el-form-item>
             <el-form-item :label="t('memo')">
                 <el-input v-model="formData.memo" type="textarea" clearable :placeholder="t('memoPlaceholder')" class="input-width" />
diff --git a/admin/src/app/views/diy/components/edit-active-cube.vue b/admin/src/app/views/diy/components/edit-active-cube.vue
index 8f23e14d1..911a60325 100644
--- a/admin/src/app/views/diy/components/edit-active-cube.vue
+++ b/admin/src/app/views/diy/components/edit-active-cube.vue
@@ -242,6 +242,8 @@ diyStore.editComponent.list.forEach((item: any) => {
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
+	selectTitleStyle.title = diyStore.editComponent.titleStyle.title;
+	selectTitleStyle.value = diyStore.editComponent.titleStyle.value;
     showTitleDialog.value = true
 }
 
diff --git a/admin/src/app/views/diy/components/edit-carousel-search.vue b/admin/src/app/views/diy/components/edit-carousel-search.vue
index d52d57adf..d28df3a16 100644
--- a/admin/src/app/views/diy/components/edit-carousel-search.vue
+++ b/admin/src/app/views/diy/components/edit-carousel-search.vue
@@ -31,7 +31,10 @@
 					<upload-image v-model="diyStore.editComponent.search.logo" :limit="1" />
 				</el-form-item>
 				<el-form-item :label="t('carouselSearchText')">
-					<el-input v-model.trim="diyStore.editComponent.search.text" :placeholder="t('carouselSearchPlaceholder')" clearable maxlength="20" show-word-limit />
+					<div>
+                        <el-input v-model.trim="diyStore.editComponent.search.text" :placeholder="t('carouselSearchPlaceholder')" clearable maxlength="20" show-word-limit />
+                        <p class="text-sm text-gray-400 mt-[10px] leading-[1.5]">{{t('carouselSearchTextTips')}}</p>
+                    </div>
 				</el-form-item>
 				<el-form-item :label="t('link')">
 					<diy-link v-model="diyStore.editComponent.search.link"/>
diff --git a/admin/src/app/views/diy/components/edit-float-btn.vue b/admin/src/app/views/diy/components/edit-float-btn.vue
index 736aceb68..9848e2612 100644
--- a/admin/src/app/views/diy/components/edit-float-btn.vue
+++ b/admin/src/app/views/diy/components/edit-float-btn.vue
@@ -3,14 +3,41 @@
 	<div class="content-wrap float-btn" v-show="diyStore.editTab == 'content'">
 
 		<div class="edit-attr-item-wrap">
+            <!-- <h3 class="mb-[10px]">{{ t('selectStyle') }}</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="showCouponStyle">{{ diyStore.editComponent.styleName }}</span>
+					<el-icon>
+						<ArrowRight />
+					</el-icon>
+				</el-form-item>
+			</el-form>
+            <el-dialog v-model="showCouponDialog" :title="t('selectStyle')" width="500px">
+                <div class="flex flex-wrap">
+                    <template v-for="(item,index) in couponStyleList" :key="index">
+                        <div :class="{ 'border-primary': selectCouponStyle.value == item.value }" @click="changeCouponStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50">
+                            <img :src="img(item.url)" />
+                        </div>
+                    </template>
+                </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="showCouponDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" @click="confirmCouponStyle">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+
+            </el-dialog> -->
 			<h3 class="mb-[10px]">{{ t('floatBtnBtton') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
 				<el-form-item :label="t('floatBtnBtton')">
 					<span>{{ selectTemplate.name }}</span>
                     <ul class="ml-[10px] flex items-center">
-                        <li v-for="(item,i) in templateList" :key="i" :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': templateList.length != (i+1)}, (item.className == diyStore.editComponent.bottomPosition) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="changeTemplateList(item)">
-                            <span :class="['iconfont !text-[20px]', item.src]"></span>
-                        </li>
+                        <template v-for="(item,i) in templateList" :key="i">
+                            <li v-if="diyStore.editComponent.style==='style-1'||(diyStore.editComponent.style==='style-2'&&i>1)" :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': templateList.length != (i+1)}, (item.className == diyStore.editComponent.bottomPosition) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="changeTemplateList(item)">
+                                <span :class="['iconfont !text-[20px]', item.src]"></span>
+                            </li>
+                        </template>
                     </ul>
 				</el-form-item>
                 <el-form-item :label="t('floatBtnOffset')">
@@ -22,7 +49,7 @@
 			<h3 class="mb-[10px]">{{ t('floatBtnImageSet') }}</h3>
 			<el-form label-width="80px" class="px-[10px]">
                 <el-form-item :label="t('floatBtnImageSize')">
-					<el-slider v-model="diyStore.editComponent.imageSize" show-input size="small" class="ml-[10px] horz-blank-slider" :min="40" :max="100"/>
+					<el-slider v-model="diyStore.editComponent.imageSize" show-input size="small" class="ml-[10px] horz-blank-slider" :min="30" :max="100"/>
 				</el-form-item>
 				<el-form-item :label="t('floatBtnAroundRadius')">
 					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small" class="ml-[10px] graphic-nav-slider" :max="50"/>
@@ -59,7 +86,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick } from 'vue'
 import { t } from '@/lang'
 import Sortable from 'sortablejs'
 import useDiyStore from '@/stores/modules/diy'
@@ -67,7 +94,7 @@ import { img } from '@/utils/common'
 import { range } from 'lodash-es'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = [] // 忽略公共属性
+diyStore.editComponent.ignore = ['pageBgColor','marginTop','marginBottom','marginBoth'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
@@ -82,6 +109,48 @@ diyStore.editComponent.verify = (index: number) => {
     return res
 }
 
+/*********** 风格样式 **********/
+
+const showCouponDialog = ref(false)
+const selectCouponStyle = reactive({
+    title: diyStore.editComponent.styleName,
+    value: diyStore.editComponent.style
+})
+const showCouponStyle = () => {
+    showCouponDialog.value = true
+    selectCouponStyle.title = diyStore.editComponent.styleName;
+    selectCouponStyle.value = diyStore.editComponent.style;
+}
+// const couponStyleList = reactive([
+//     {
+//         url: 'addon/shop/diy/goods_coupon/style-1.png',
+//         title: '风格1',
+//         value: 'style-1'
+//     },
+//     {
+//         url: 'addon/shop/diy/goods_coupon/style-2.png',
+//         title: '风格2',
+//         value: 'style-2'
+//     }
+// ])
+//风格点击
+const changeCouponStyle = (item:any) => {
+    selectCouponStyle.title = item.title;
+    selectCouponStyle.value = item.value;
+}
+//确认风格
+const confirmCouponStyle = () => {
+    diyStore.editComponent.styleName = selectCouponStyle.title;
+    diyStore.editComponent.style = selectCouponStyle.value;
+    showCouponDialog.value = false
+    selectTemplate.value = {
+        name: '右下',
+        src: 'iconyouxiajiao',
+        className: 'lowerRight'
+    };
+    diyStore.editComponent.bottomPosition = 'lowerRight'
+}
+/******** end *******/
 const templateList = ref([
     {
         name: '左上',
@@ -105,7 +174,7 @@ const templateList = ref([
     }
 ])
 
-let selectTemplate = ref({})
+const selectTemplate = ref({})
 templateList.value.forEach((item) => {
     if (item.className == diyStore.editComponent.bottomPosition) {
         selectTemplate.value = item
diff --git a/admin/src/app/views/diy/components/edit-graphic-nav.vue b/admin/src/app/views/diy/components/edit-graphic-nav.vue
index 1565904fa..716203840 100644
--- a/admin/src/app/views/diy/components/edit-graphic-nav.vue
+++ b/admin/src/app/views/diy/components/edit-graphic-nav.vue
@@ -74,7 +74,7 @@
 					</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 < 50" class="w-full" @click="addGraphicNav">{{ t('addGraphicNav') }}</el-button>
 
 			</el-form>
 		</div>
diff --git a/admin/src/app/views/diy/components/edit-image-ads.vue b/admin/src/app/views/diy/components/edit-image-ads.vue
index 39ffe3626..acece2eaf 100644
--- a/admin/src/app/views/diy/components/edit-image-ads.vue
+++ b/admin/src/app/views/diy/components/edit-image-ads.vue
@@ -124,7 +124,7 @@ const handleHeight = (isCalcHeight:boolean = false)=> {
 }
 
 const blurImageHeight = () => {
-    diyStore.editComponent.imageHeight = parseInt(diyStore.editComponent.imageHeight)
+    diyStore.editComponent.imageHeight = diyStore.editComponent.imageHeight ? parseInt(diyStore.editComponent.imageHeight) : 0
 }
 
 const imageBoxRef = ref()
diff --git a/admin/src/app/views/diy/components/edit-notice.vue b/admin/src/app/views/diy/components/edit-notice.vue
index aa92c673d..03abc3cc5 100644
--- a/admin/src/app/views/diy/components/edit-notice.vue
+++ b/admin/src/app/views/diy/components/edit-notice.vue
@@ -18,7 +18,7 @@
 					<div :class="['mr-[10px] rounded cursor-pointer w-[100px]', {'border-[1px] border-solid border-[var(--el-color-primary)]': diyStore.editComponent.systemUrl == 'style_2' && diyStore.editComponent.imgType == 'system'}]">
 						<img src="@/app/assets/images/diy/notice/style_2.png" class="px-[10px] py-[5px]" @click="changeStyle('style_2')"/>
 					</div>
-					<div @click="diyStore.editComponent.imgType = 'diy'" :class="['mr-[10px] rounded cursor-pointer diy-upload-img', {'border-[1px] border-solid border-[var(--el-color-primary)]': (diyStore.editComponent.imageUrl && diyStore.editComponent.imgType == 'diy') }]">
+					<div @click.stop="diyStore.editComponent.imgType = 'diy'" :class="['mr-[10px] rounded cursor-pointer diy-upload-img', {'border-[1px] border-solid border-[var(--el-color-primary)]': (diyStore.editComponent.imageUrl && diyStore.editComponent.imgType == 'diy') }]">
 						<upload-image v-model="diyStore.editComponent.imageUrl" :limit="1"/>
 					</div>
 				</div>
@@ -105,7 +105,6 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, watch, onMounted, nextTick } from 'vue'
 import { range } from 'lodash-es'
 import Sortable from 'sortablejs'
-
 const diyStore = useDiyStore()
 diyStore.editComponent.ignore = [] // 忽略公共属性
 
@@ -148,7 +147,7 @@ watch(
 	    if(newValue){
             diyStore.editComponent.imgType = 'diy';
 	    }else{
-            diyStore.editComponent.imgType = 'system';
+			changeStyle('style_1');
 	    }
     }
 )
@@ -204,9 +203,7 @@ defineExpose({})
 					display: none;
 				}
 			}
-			.operation{
-				display: none !important;
-			}
+			
 		}
 	}
 </style>
diff --git a/admin/src/app/views/diy/components/edit-page.vue b/admin/src/app/views/diy/components/edit-page.vue
index 97a1944c2..0a45822de 100644
--- a/admin/src/app/views/diy/components/edit-page.vue
+++ b/admin/src/app/views/diy/components/edit-page.vue
@@ -13,35 +13,41 @@
         <div class="edit-attr-item-wrap">
 			<h3 class="mb-[10px]">{{ t('statusBarContent') }}</h3>
             <el-form label-width="80px" class="px-[10px]">
-				<el-form-item :label="t('diyTitle')">
-					<el-input v-model.trim="diyStore.global.title" :placeholder="t('diyTitlePlaceholder')" clearable maxlength="12" show-word-limit/>
-					<div class="text-sm text-gray-400">{{ t('titleTips') }}</div>
-				</el-form-item>
-                <el-form-item :label="t('selectStyle')" class="display-block">
-	                <div class="flex">
-						<span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{diyStore.global.topStatusBar.styleName}}</span>
-						<el-icon>
-							<ArrowRight />
-						</el-icon>
-	                </div>
-	                <div class="text-sm text-gray-400 leading-[1.5]">{{ t('styleShowTips') }}</div>
-				</el-form-item>
-				<el-form-item :label="t('topStatusBarImg')" v-if="['style-2','style-3'].indexOf(diyStore.global.topStatusBar.style) > -1">
-					<upload-image v-model="diyStore.global.topStatusBar.imgUrl" :limit="1" />
-                    <div class="text-sm text-gray-400 mt-[10px]">{{ t('topStatusBarImgTips') }}</div>
-				</el-form-item>
-                <el-form-item :label="t('topStatusBarSearchName')" v-if="'style-3' == diyStore.global.topStatusBar.style">
-					<el-input v-model.trim="diyStore.global.topStatusBar.inputPlaceholder" :placeholder="t('topStatusBarSearchNamePlaceholder')" clearable maxlength="12" show-word-limit/>
-				</el-form-item>
-                <el-form-item :label="t('textAlign')" v-show="diyStore.global.topStatusBar.style == 'style-1'">
-					<el-radio-group v-model="diyStore.global.topStatusBar.textAlign">
-						<el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
-						<el-radio :label="'center'">{{ t('textAlignCenter') }}</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item :label="t('link')" v-if="['style-2','style-3'].indexOf(diyStore.global.topStatusBar.style) > -1">
-					<diy-link v-model="diyStore.global.topStatusBar.link" />
+                <el-form-item :label="t('topStatusBarNav')" class="display-block">
+					<el-switch v-model="diyStore.global.topStatusBar.isShow"/>
+					<div class="text-sm text-gray-400">{{ t('statusBarSwitchTips') }}</div>
 				</el-form-item>
+                <template v-if="diyStore.global.topStatusBar.isShow">
+                    <el-form-item :label="t('diyTitle')">
+                        <el-input v-model.trim="diyStore.global.title" :placeholder="t('diyTitlePlaceholder')" clearable maxlength="12" show-word-limit/>
+                        <div class="text-sm text-gray-400">{{ t('titleTips') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('selectStyle')" class="display-block">
+                        <div class="flex">
+                            <span class="text-primary flex-1 cursor-pointer" @click="showStyle">{{diyStore.global.topStatusBar.styleName}}</span>
+                            <el-icon>
+                                <ArrowRight />
+                            </el-icon>
+                        </div>
+                        <div class="text-sm text-gray-400 leading-[1.5]">{{ t('styleShowTips') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('topStatusBarImg')" v-if="['style-2','style-3'].indexOf(diyStore.global.topStatusBar.style) > -1">
+                        <upload-image v-model="diyStore.global.topStatusBar.imgUrl" :limit="1" />
+                        <div class="text-sm text-gray-400 mt-[10px]">{{ t('topStatusBarImgTips') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('topStatusBarSearchName')" v-if="'style-3' == diyStore.global.topStatusBar.style">
+                        <el-input v-model.trim="diyStore.global.topStatusBar.inputPlaceholder" :placeholder="t('topStatusBarSearchNamePlaceholder')" clearable maxlength="12" show-word-limit/>
+                    </el-form-item>
+                    <el-form-item :label="t('textAlign')" v-show="diyStore.global.topStatusBar.style == 'style-1'">
+                        <el-radio-group v-model="diyStore.global.topStatusBar.textAlign">
+                            <el-radio :label="'left'">{{ t('textAlignLeft') }}</el-radio>
+                            <el-radio :label="'center'">{{ t('textAlignCenter') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item :label="t('link')" v-if="['style-2','style-3'].indexOf(diyStore.global.topStatusBar.style) > -1">
+                        <diy-link v-model="diyStore.global.topStatusBar.link" />
+                    </el-form-item>
+                </template>
 			</el-form>
 		</div>
         <div class="edit-attr-item-wrap">
@@ -69,12 +75,6 @@
                 <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px]  mr-[2%] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-4' }" @click="selectStyle = 'style-4'">
                     <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style4.jpg" />
                 </div>
-                <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px]  mr-[2%] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-5' }" @click="selectStyle = 'style-5'">
-                    <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style5.png" />
-                </div>
-                <div class="flex items-center justify-center overflow-hidden w-[32%] h-[100px] cursor-pointer border bg-gray-50" :class="{ 'border-primary': selectStyle == 'style-6' }" @click="selectStyle = 'style-6'">
-                    <img class="max-w-[100%] max-h-[100%]" src="@/app/assets/images/diy/head/nav_style6.jpg" />
-                </div>
             </div>
 
             <template #footer>
@@ -91,7 +91,7 @@
 	<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 label-width="115px" class="px-[10px]">
 				<el-form-item :label="t('pageBgColor')">
 					<el-color-picker v-model="diyStore.editComponent.pageStartBgColor" show-alpha :predefine="diyStore.predefineColors" />
 					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
@@ -114,19 +114,24 @@
 		</div>
         <div class="edit-attr-item-wrap">
 			<h3 class="mb-[10px]">{{ t('statusBarStyle') }}</h3>
-			<el-form label-width="80px" class="px-[10px]">
-				<el-form-item :label="t('topStatusBarBgColor')" class="display-block" v-if="selectStyle == 'style-5'">
+			<el-form label-width="115px" class="px-[10px]">
+                <el-form-item :label="t('topStatusBarBgColor')" class="display-block">
 					<el-color-picker v-model="diyStore.global.topStatusBar.bgColor" show-alpha />
-	                <div class="text-sm text-gray-400 leading-[1.5]">{{ t('topStatusBarBgColorTips') }}</div>
+				</el-form-item>
+				<el-form-item :label="t('rollTopStatusBarBgColor')" class="display-block">
+					<el-color-picker v-model="diyStore.global.topStatusBar.rollBgColor" show-alpha />
 				</el-form-item>
 				<el-form-item :label="t('topStatusBarTextColor')" class="display-block">
 					<el-color-picker v-model="diyStore.global.topStatusBar.textColor" show-alpha />
 				</el-form-item>
+				<el-form-item :label="t('rollTopStatusBarTextColor')" class="display-block">
+					<el-color-picker v-model="diyStore.global.topStatusBar.rollTextColor" show-alpha />
+				</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 label-width="115px" class="px-[10px]">
 				<el-form-item :label="t('marginBoth')">
 					<el-slider v-model="diyStore.global.template.margin.both" show-input size="small" @input="inputBoth" class="ml-[10px] horz-blank-slider"/>
 				</el-form-item>
@@ -167,6 +172,7 @@ const inputBoth = (value:any)=>{
     })
 
 }
+
 watch(
     () => diyStore.global,
     (newValue, oldValue) => {
@@ -176,14 +182,11 @@ watch(
 
 const showDialog = ref(false)
 const showStyle = () => {
-    selectStyle.value = diyStore.global.topStatusBar.style
     showDialog.value = true
 }
 
 const selectStyle = ref("style-1")
 const changeStyle = () => {
-    diyStore.global.topStatusBar.isShow = true;
-    diyStore.global.topStatusBar.isTransparent = false;
      switch (selectStyle.value) {
         case 'style-1':
             diyStore.global.topStatusBar.styleName = '风格1'
@@ -197,14 +200,6 @@ const changeStyle = () => {
         case 'style-4':
             diyStore.global.topStatusBar.styleName = '风格4'
             break
-        case 'style-5':
-            diyStore.global.topStatusBar.isTransparent = true;
-            diyStore.global.topStatusBar.styleName = '风格5'
-            break
-        case 'style-6':
-            diyStore.global.topStatusBar.isShow = false;
-            diyStore.global.topStatusBar.styleName = '风格6'
-            break
     }
     diyStore.global.topStatusBar.style = selectStyle.value
     showDialog.value = false
diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue
index 18ab76879..8cb24b01f 100644
--- a/admin/src/app/views/diy/edit.vue
+++ b/admin/src/app/views/diy/edit.vue
@@ -191,10 +191,10 @@
                                                 <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-slider v-model="diyStore.editComponent.topRounded" show-input size="small" class="ml-[10px] horz-blank-slider" :max="100" />
                                             </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-slider v-model="diyStore.editComponent.bottomRounded" show-input size="small" class="ml-[10px] horz-blank-slider" :max="100" />
                                             </el-form-item>
                                         </el-form>
                                     </div>
diff --git a/admin/src/app/views/diy/index.vue b/admin/src/app/views/diy/index.vue
index 8ae32a24c..975e9f266 100644
--- a/admin/src/app/views/diy/index.vue
+++ b/admin/src/app/views/diy/index.vue
@@ -31,7 +31,7 @@
 
                 <div class="w-[700px]">
                     <div class="flex flex-wrap">
-                        <diy-link v-model="link" :ignore="['DIY_LINK']" @success="changePage">
+                        <diy-link v-model="link" :ignore="['DIY_LINK','DIY_JUMP_OTHER_APPLET','DIY_MAKE_PHONE_CALL']" @success="changePage">
                             <el-button type="primary">{{ t('changePage') }}</el-button>
                         </diy-link>
                         <el-button type="primary" @click="toDecorate()" v-show="page.use_template.action == 'decorate'" class="ml-[12px]">{{ t('decorate') }}</el-button>
diff --git a/admin/src/app/views/diy/member.vue b/admin/src/app/views/diy/member.vue
index 726173143..c962662c8 100644
--- a/admin/src/app/views/diy/member.vue
+++ b/admin/src/app/views/diy/member.vue
@@ -89,7 +89,7 @@ import { t } from '@/lang'
 import { img } from '@/utils/common'
 import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
-import { getDecoratePage, changeTemplate, getDiyTemplate } from '@/app/api/diy'
+import { getDecoratePage, changeTemplate,getDiyTemplate } from '@/app/api/diy'
 import storage from '@/utils/storage'
 import QRCode from 'qrcode'
 import { useClipboard } from '@vueuse/core'
@@ -100,7 +100,7 @@ const siteApps = computed(() => {
     return systemStore?.apps
 })
 
-const type: any = ref('DIY_MEMBER_INDEX')
+const type: any = ref('DIY_MEMBER_INDEX');
 const page: any = reactive({})
 const router = useRouter()
 const wapDomain = ref('')
diff --git a/admin/src/app/views/diy/route.vue b/admin/src/app/views/diy/route.vue
index d70aa5ac3..60c42d8c8 100644
--- a/admin/src/app/views/diy/route.vue
+++ b/admin/src/app/views/diy/route.vue
@@ -54,7 +54,7 @@
                 </el-table-column>
             </el-table>
             <div class="mt-[16px] flex justify-end">
-                <el-pagination v-model:current-page="diyRouteTableData.page" v-model:page-size="diyRouteTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="diyRouteTableData.total" @size-change="loadDiyRouteList()" @current-change="loadDiyRouteList" />
+                <el-pagination v-model:current-page="diyRouteTableData.page" v-model:page-size="diyRouteTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="diyRouteTableData.total" @size-change="getDiyRouteListFn" @current-change="loadDiyRouteList" />
             </div>
         </el-card>
 
@@ -99,6 +99,7 @@ import { ElMessage, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { useClipboard } from '@vueuse/core'
 import { getUrl } from '@/app/api/sys'
+import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const router = useRouter()
@@ -121,6 +122,8 @@ const diyRouteTableData = reactive({
     }
 })
 
+const diyRouteList: any = ref([])
+
 const wapDomain = ref('')
 const getDomain = async () => {
     wapDomain.value = (await getUrl()).data.wap_url
@@ -130,42 +133,60 @@ getDomain()
 
 const apps: any = reactive({}) // 应用插件列表
 
-getDiyRouteAppList().then(res=>{
-    if(res.data){
+getDiyRouteAppList().then(res=> {
+    if (res.data) {
         for (const key in res.data) {
             apps[key] = res.data[key];
         }
     }
 });
 
+const getDiyRouteListFn = () => {
+    getDiyRouteList({}).then(res => {
+        diyRouteTableData.loading = false
+        diyRouteList.value = cloneDeep(res.data)
+        loadDiyRouteList(diyRouteTableData.page)
+    }).catch(() => {
+        diyRouteTableData.loading = false
+    });
+}
+
+getDiyRouteListFn();
+
 /**
  * 获取自定义路由列表
  */
 const loadDiyRouteList = (page: number = 1) => {
-    diyRouteTableData.loading = true
     diyRouteTableData.page = page
 
-    getDiyRouteList({
-        page: diyRouteTableData.page,
-        limit: diyRouteTableData.limit,
-        ...diyRouteTableData.searchParam
-    }).then(res => {
-        diyRouteTableData.loading = false
+    const tempData = cloneDeep(diyRouteList.value)
+    const data: any = [];
 
-        const len = Math.ceil(res.data.length / diyRouteTableData.limit)
-        const data = JSON.parse(JSON.stringify(res.data))
-        const dataGather = []
-        for (let i = 0; i < len; i++) {
-            dataGather[i] = data.splice(0, diyRouteTableData.limit)
+    // 筛选条件
+    for (let i = 0; i < tempData.length; i++) {
+        let isAdd = true;
+        if (diyRouteTableData.searchParam.title && tempData[i].title.indexOf(diyRouteTableData.searchParam.title) == -1) {
+            isAdd = false;
         }
-        diyRouteTableData.data = dataGather[diyRouteTableData.page - 1]
 
-        diyRouteTableData.total = res.data.length
-    }).catch(() => {
-        diyRouteTableData.loading = false
-    })
+        if (diyRouteTableData.searchParam.addon_name && tempData[i].addon_info && tempData[i].addon_info.key != diyRouteTableData.searchParam.addon_name) {
+            isAdd = false;
+        }
+
+        if (isAdd) {
+            data.push(tempData[i]);
+        }
+    }
+
+    diyRouteTableData.total = data.length
+    const len = Math.ceil(data.length / diyRouteTableData.limit)
+    const dataGather = []
+
+    for (let i = 0; i < len; i++) {
+        dataGather[i] = data.splice(0, diyRouteTableData.limit)
+    }
+    diyRouteTableData.data = dataGather[diyRouteTableData.page - 1]
 }
-loadDiyRouteList()
 
 // 获取自定义页面模板
 getDiyTemplate({}).then(res => {
@@ -273,7 +294,7 @@ const shareEvent = async (formEl: FormInstance | undefined) => {
                 share: JSON.stringify(shareFormData),
                 ...diyRouteData
             }).then(() => {
-                loadDiyRouteList()
+                getDiyRouteListFn()
                 shareDialogVisible.value = false
             }).catch(() => {
             })
@@ -284,7 +305,7 @@ const shareEvent = async (formEl: FormInstance | undefined) => {
 const resetForm = (formEl: FormInstance | undefined) => {
     if (!formEl) return
     formEl.resetFields()
-    loadDiyRouteList()
+    getDiyRouteListFn()
 }
 </script>
 
diff --git a/admin/src/app/views/diy/tabbar.vue b/admin/src/app/views/diy/tabbar.vue
index edd089291..e1a35ce8a 100644
--- a/admin/src/app/views/diy/tabbar.vue
+++ b/admin/src/app/views/diy/tabbar.vue
@@ -42,6 +42,7 @@
     import { t } from '@/lang'
     import { getDiyBottomList } from '@/app/api/diy'
     import { useRoute, useRouter } from 'vue-router'
+    import { cloneDeep } from 'lodash-es'
 
     const route = useRoute()
     const router = useRouter()
@@ -64,7 +65,7 @@
             bottomNavTableData.loading = false
 
             const len = Math.ceil(res.data.length / bottomNavTableData.limit)
-            const data = JSON.parse(JSON.stringify(res.data))
+            const data = cloneDeep(res.data)
             const dataGather = []
             for (let i = 0; i < len; i++) {
                 dataGather[i] = data.splice(0, bottomNavTableData.limit)
diff --git a/admin/src/app/views/diy/tabbar_edit.vue b/admin/src/app/views/diy/tabbar_edit.vue
index 5d218c4bc..b919840e1 100644
--- a/admin/src/app/views/diy/tabbar_edit.vue
+++ b/admin/src/app/views/diy/tabbar_edit.vue
@@ -31,7 +31,7 @@
                         <el-tabs v-model="activeName" class="demo-tabs mt-[15px]">
                             <el-tab-pane :label="t('navImage')" name="navPicture">
                                 <div ref="navItemRef">
-                                    <div v-for="(item,index) in diyBottomData.value.list" :key="'a'+index" :data-id="index"  class="item-wrap border-2 border-dashed pt-[18px] m-[10px] mb-[15px] relative list-item">
+                                    <div v-for="(item,index) in diyBottomData.value.list" :key="'a'+index" :data-id="index"  class="item-wrap border-2 border-dashed pt-[18px] m-[10px] mb-[15px] relative list-item" :class="{ 'not-sort': useDrag }">
                                         <el-form-item :label="t('navIconOne')">
                                             <div class="flex align-center">
                                                 <div class="flex flex-col justify-center items-center">
@@ -48,7 +48,7 @@
                                             <el-input class="!w-[215px]" v-model="item.text" :placeholder="t('titleContent')" maxlength="5" show-word-limit />
                                         </el-form-item>
                                         <el-form-item :label="t('navLinkOne')">
-                                            <diy-link v-model="item.link"/>
+                                            <diy-link v-model="item.link" @confirm="diyLinkFn" />
                                         </el-form-item>
                                         <el-icon class="close-icon cursor-pointer -top-[11px] -right-[8px]" @click="deleteNav(index)">
                                             <CircleCloseFilled />
@@ -238,6 +238,7 @@ onMounted(() => {
     const sortable = Sortable.create(navItemRef.value, {
         group: 'item-wrap',
         animation: 200,
+        filter: '.not-sort', // 过滤.not-sort的元素
         onEnd: event => {
             const temp = diyBottomData.value.list[event.oldIndex!]
             diyBottomData.value.list.splice(event.oldIndex!, 1)
@@ -253,6 +254,10 @@ onMounted(() => {
     })
 })
 
+const useDrag = ref(false)
+const diyLinkFn = (val) => {
+    useDrag.value = val
+}
 </script>
 <style lang="scss" scoped>
 .close-icon {
diff --git a/admin/src/app/views/finance/cash_out.vue b/admin/src/app/views/finance/cash_out.vue
index 0c268ad97..a8db996bc 100644
--- a/admin/src/app/views/finance/cash_out.vue
+++ b/admin/src/app/views/finance/cash_out.vue
@@ -89,7 +89,7 @@
                         <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.member.headimg" :src="img(row.member.headimg)" alt="">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                     <span>{{ row.member.mobile || '' }}</span>
@@ -99,7 +99,7 @@
                     </el-table-column>
                     <el-table-column :label="t('cashOutMethod')" align="center" min-width="140">
                         <template #default="{ row }">
-                            {{ Transfertype[row.transfer_type].name }}
+                            {{ row.transfer_type_name }}
                         </template>
                     </el-table-column>
 
@@ -183,7 +183,7 @@
         <el-dialog v-model="auditShowDialog" :title="t('rejectionAudit')" width="500px" :destroy-on-close="true">
             <el-form :model="auditFailure" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
                 <el-form-item :label="t('reasonsRefusal')" prop="label_name">
-                    <el-input v-model="auditFailure.refuse_reason" clearable :placeholder="t('reasonsRefusalPlaceholder')" class="input-width" type="textarea" />
+                    <el-input v-model="auditFailure.refuse_reason" clearable maxlength="200" :show-word-limit="true" :placeholder="t('reasonsRefusalPlaceholder')" :rows="4" class="input-width" type="textarea" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -334,10 +334,9 @@ const fnProcessing = (type: string, data: any) => {
         }
     } else if (type == 'transferFn') {
         obj.id = data.id
-        ElMessageBox.confirm(`${t('isTransfer')}`, `${t('transfer')}`)
-            .then(() => {
-                transferFn(obj)
-            })
+        ElMessageBox.confirm(`${ t('isTransfer') }`, `${ t('transfer') }`).then(() => {
+            transferFn(obj)
+        })
     } else {
         detailFn(data.id)
     }
@@ -349,7 +348,9 @@ const fnProcessing = (type: string, data: any) => {
  */
 const transferFn = (data:any) => {
     memberTransfer({ ...data }).then(res => {
+        auditFailure.value = { refuse_reason: '', id: 0, action: 0 }
         loadOrderList()
+
     }).catch(() => {
         loadOrderList()
     })
@@ -389,6 +390,7 @@ const cashOutAuditFn = (data:any) => {
         ...data
     }).then(res => {
         loadOrderList()
+
     }).catch(() => {
         loadOrderList()
     })
diff --git a/admin/src/app/views/finance/offlinepay.vue b/admin/src/app/views/finance/offlinepay.vue
index 9a54a411c..b6fb64a21 100644
--- a/admin/src/app/views/finance/offlinepay.vue
+++ b/admin/src/app/views/finance/offlinepay.vue
@@ -9,8 +9,7 @@
             <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="payListTable.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('outTradeNo')" prop="trade_no">
-                        <el-input v-model="payListTable.searchParam.out_trade_no"
-                            :placeholder="t('outTradeNoPlaceholder')" />
+                        <el-input v-model="payListTable.searchParam.out_trade_no" :placeholder="t('outTradeNoPlaceholder')" />
                     </el-form-item>
                     <el-form-item :label="t('createTime')" prop="create_time">
                         <el-date-picker v-model="payListTable.searchParam.create_time" type="datetimerange"
@@ -18,7 +17,7 @@
                             :end-placeholder="t('endDate')" />
                     </el-form-item>
                     <el-form-item :label="t('status')" prop="status">
-                        <el-select v-model="payListTable.searchParam.status" placeholder="Select">
+                        <el-select v-model="payListTable.searchParam.status" :placeholder="t('status')">
                             <el-option :label="t('all')" value="" />
                             <el-option :label="t('waitAudit')" value="3" />
                             <el-option :label="t('passed')" value="2" />
@@ -137,21 +136,17 @@ loadPayList()
 
 const passEvent = (row: AnyObject) => {
     ElMessageBox.confirm(
-        t('passTips'),
-        t('warning'),
-        {
-            confirmButtonText: t('confirm'),
-            cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
+            t('passTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
     ).then(({ value }) => {
-        payAuditPass(row.out_trade_no)
-            .then(() => {
-                loadPayList()
-            })
-            .catch()
-    }).catch(() => {
-
+        payAuditPass(row.out_trade_no).then(() => {
+            loadPayList()
+        })
     })
 }
 
@@ -163,13 +158,9 @@ const refuseEvent = (row: AnyObject) => {
         inputPattern: /\S/,
         inputType: 'textarea'
     }).then(({ value }) => {
-        payAuditRefuse({ out_trade_no: row.out_trade_no, reason: value })
-            .then(() => {
-                loadPayList()
-            })
-            .catch()
-    }).catch(() => {
-
+        payAuditRefuse({ out_trade_no: row.out_trade_no, reason: value }).then(() => {
+            loadPayList()
+        })
     })
 }
 
diff --git a/admin/src/app/views/finance/pay_detail.vue b/admin/src/app/views/finance/pay_detail.vue
index 870b3e990..194e31a68 100644
--- a/admin/src/app/views/finance/pay_detail.vue
+++ b/admin/src/app/views/finance/pay_detail.vue
@@ -72,34 +72,26 @@ const formData: Record<string, any> | null = ref(null)
 const setFormData = async () => {
     loading.value = true
     formData.value = null
-    await getPayDetail(id)
-        .then(({ data }) => {
-            formData.value = data
-        })
-        .catch(() => {
-
-        })
+    await getPayDetail(id).then(({ data }) => {
+        formData.value = data
+    })
     loading.value = false
 }
 setFormData()
 
 const passEvent = () => {
     ElMessageBox.confirm(
-        t('passTips'),
-        t('warning'),
-        {
-            confirmButtonText: t('confirm'),
-            cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
+            t('passTips'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning'
+            }
     ).then(({ value }) => {
-        payAuditPass(formData.value.out_trade_no)
-            .then(() => {
-                setFormData()
-            })
-            .catch()
-    }).catch(() => {
-
+        payAuditPass(formData.value.out_trade_no).then(() => {
+            setFormData()
+        })
     })
 }
 
@@ -113,9 +105,7 @@ const refuseEvent = () => {
     }).then(({ value }) => {
         payAuditRefuse({ out_trade_no: formData.value.out_trade_no, reason: value }).then(() => {
             setFormData()
-        }).catch()
-    }).catch(() => {
-
+        })
     })
 }
 
diff --git a/admin/src/app/views/finance/refund_detail.vue b/admin/src/app/views/finance/refund_detail.vue
index 42bb1072e..00ee5be62 100644
--- a/admin/src/app/views/finance/refund_detail.vue
+++ b/admin/src/app/views/finance/refund_detail.vue
@@ -67,7 +67,7 @@ const route = useRoute()
 const router = useRouter()
 const pageName = route.meta.title
 
-const refundNo: string = route.query.refund_no
+const refundNo: any = route.query.refund_no
 const loading = ref(true)
 
 const refundList = ref([])
@@ -76,15 +76,10 @@ const formData: Record<string, any> | null = ref(null)
 const setFormData = async (refundNo: string = '') => {
     loading.value = true
     formData.value = null
-    await getPayRefundInfo(refundNo)
-        .then(({ data }) => {
-            formData.value = data
-            refundList.value.push(data)
-        })
-
-        .catch(() => {
-
-        })
+    await getPayRefundInfo(refundNo).then(({ data }) => {
+        formData.value = data
+        refundList.value.push(data)
+    })
     loading.value = false
 }
 if (refundNo) setFormData(refundNo)
diff --git a/admin/src/app/views/index/preview.vue b/admin/src/app/views/index/preview.vue
index 9cf9a4606..874b9ebc5 100644
--- a/admin/src/app/views/index/preview.vue
+++ b/admin/src/app/views/index/preview.vue
@@ -22,8 +22,7 @@
                         <el-form-item :label="t('link')" v-show="wapPreview">
                             <el-input readonly :value="wapPreview">
                                 <template #append>
-                                    <el-button @click="copyEvent(wapPreview)" class="bg-primary copy">{{ t('copy') }}
-                                    </el-button>
+                                    <el-button @click="copyEvent(wapPreview)" class="bg-primary copy">{{ t('copy') }}</el-button>
                                 </template>
                             </el-input>
                         </el-form-item>
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index 09973bffd..f1b774b68 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -87,7 +87,7 @@
                         <template #default="{ row }">
                             <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length && row.install_info.version != row.version" type="primary" link @click="upgradeAddonFn(row.key)">{{ t('upgrade') }}</el-button>
                             <el-button class="!text-[13px]" v-if="row.install_info && Object.keys(row.install_info)?.length" type="primary" link @click="uninstallAddonFn(row.key)">{{ t('unload') }}</el-button>
-                            <template v-if="row.is_download && Object.keys(row.install_info) <= 0">
+                            <template v-if="row.is_download && (!row.install_info || !Object.keys(row.install_info).length)">
                                 <el-button class="!text-[13px]" type="primary" link @click="installAddonFn(row.key)">{{ t('install') }}</el-button>
                                 <el-button class="!text-[13px]" type="primary" link @click="deleteAddonFn(row.key)">{{ t('delete') }}</el-button>
                             </template>
@@ -145,8 +145,7 @@
                                     您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务</p>
                                 <div class="flex justify-end mt-[36px]">
                                     <el-button class="w-[182px] !h-[48px]" plain @click="market">去应用市场逛逛</el-button>
-                                    <el-button class="w-[100px] !h-[48px]" plain
-                                        @click="getAuthCodeDialog.hide()">关闭</el-button>
+                                    <el-button class="w-[100px] !h-[48px]" plain @click="getAuthCodeDialog.hide()">关闭</el-button>
                                 </div>
                             </div>
                             <template #reference>
@@ -377,7 +376,7 @@ import { t } from '@/lang'
 import { getAddonLocal, uninstallAddon, installAddon, preInstallCheck, cloudInstallAddon, getAddonInstalltask, getAddonCloudInstallLog, preUninstallCheck, cancelInstall } from '@/app/api/addon'
 import { deleteAddonDevelop } from '@/app/api/tools'
 import { getInstallConfig } from '@/app/api/sys'
-import { downloadVersion, getAuthinfo, setAuthinfo } from '@/app/api/module'
+import { downloadVersion, getAuthInfo, setAuthInfo } from '@/app/api/module'
 import { ElMessage, ElMessageBox, ElNotification, FormInstance, FormRules } from 'element-plus'
 import 'vue-web-terminal/lib/theme/dark.css'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
@@ -438,7 +437,7 @@ const downEvent = (param: Record<string, any>, isDown = false) => {
 }
 
 const authCode = ref('')
-getAuthinfo().then(res => {
+getAuthInfo().then(res => {
     if (res.data.data && res.data.data.auth_code) {
         authCode.value = res.data.data.auth_code
     }
@@ -837,7 +836,7 @@ const saveLoading = ref(false)
 const authLoading = ref(true)
 const checkAppMange = () => {
     authLoading.value = true
-    getAuthinfo()
+    getAuthInfo()
         .then((res) => {
             authLoading.value = false
             if (res.data.data && res.data.data.length != 0) {
@@ -877,7 +876,7 @@ const save = async (formEl: FormInstance | undefined) => {
         if (valid) {
             saveLoading.value = true
 
-            setAuthinfo(formData)
+            setAuthInfo(formData)
                 .then(() => {
                     saveLoading.value = false
                     setTimeout(() => {
diff --git a/admin/src/app/views/login/index.vue b/admin/src/app/views/login/index.vue
index dd55f6a13..2569f6fbe 100644
--- a/admin/src/app/views/login/index.vue
+++ b/admin/src/app/views/login/index.vue
@@ -33,8 +33,7 @@
                         </el-form-item>
 
                         <el-form-item>
-                            <el-button type="primary" class="mt-[30px] h-[40px] w-full" @click="handleLogin(formRef)"
-                                       :loading="loading">{{ loading ? t('logging') : t('login') }}</el-button>
+                            <el-button type="primary" class="mt-[30px] h-[40px] w-full" @click="handleLogin(formRef)" :loading="loading">{{ loading ? t('logging') : t('login') }}</el-button>
                         </el-form-item>
 
                     </el-form>
@@ -110,7 +109,7 @@ const form = reactive({
 
 // 获取登录配置信息
 const loginConfig = ref({})
-const getLoginConfigFn = async (id: number = 0) => {
+const getLoginConfigFn = async () => {
   imgLoading.value = true
   const data = await (await getLoginConfig()).data
   loginConfig.value = data
diff --git a/admin/src/app/views/marketing/sign_config.vue b/admin/src/app/views/marketing/sign_config.vue
index 9d706f343..96bf41d20 100644
--- a/admin/src/app/views/marketing/sign_config.vue
+++ b/admin/src/app/views/marketing/sign_config.vue
@@ -116,6 +116,7 @@ import signDay from '@/app/views/marketing/components/sign-day.vue'
 import signContinue from '@/app/views/marketing/components/sign-continue.vue'
 import { FormInstance, FormRules } from 'element-plus'
 import { useRoute } from 'vue-router'
+import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const pageName = route.meta.title
@@ -188,11 +189,11 @@ const setFormData = async () => {
     if (formData.continue_award) {
         formData.continue_award.forEach((item: any, index: number) => {
 
-            continueSignAwardTableData.data.push(JSON.parse(JSON.stringify(item)))
+            continueSignAwardTableData.data.push(cloneDeep(item))
 
             contentData.gifts = [];
 
-            const val = JSON.parse(JSON.stringify(item))
+            const val = cloneDeep(item)
 
             delete val['continue_sign'];
             delete val['continue_tag'];
@@ -242,12 +243,12 @@ const setMemberBenefitsContents = async (content: any, item: any, index: number
 
     if (!isEdit) {
         if (tag == 0) {
-            continueSignAwardTableData.data.splice(index, 1, JSON.parse(JSON.stringify(newArr)))
+            continueSignAwardTableData.data.splice(index, 1, cloneDeep(newArr))
         } else {
-            continueSignAwardTableData.data.push(JSON.parse(JSON.stringify(newArr)))
+            continueSignAwardTableData.data.push(cloneDeep(newArr))
         }
     } else {
-        continueSignAwardTableData.data.splice(editIndex, 1, JSON.parse(JSON.stringify(newArr)))
+        continueSignAwardTableData.data.splice(editIndex, 1, cloneDeep(newArr))
     }
 
     isEdit = false
@@ -262,7 +263,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
     await formEl.validate((valid) => {
         if (valid) {
-            const save = JSON.parse(JSON.stringify(formData))
+            const save = cloneDeep(formData)
             setSignConfig(save).then(() => {
                 loading.value = false
             }).catch(() => {
@@ -334,7 +335,7 @@ const setContinueSignAward = async () => {
     }
 
     if (Object.keys(continue_award.value).length > 0) {
-        const val = JSON.parse(JSON.stringify(continue_award.value))
+        const val = cloneDeep(continue_award.value)
 
         delete val['continue_sign'];
         delete val['continue_tag'];
@@ -350,11 +351,10 @@ const setContinueSignAward = async () => {
 
         setMemberBenefitsContents(contentData, continue_award.value, 0, 1)
 
-
         if (!isEdit) {
-            formData.continue_award.push(JSON.parse(JSON.stringify(continue_award.value)))
+            formData.continue_award.push(cloneDeep(continue_award.value))
         } else {
-            formData.continue_award.splice(editIndex, 1, JSON.parse(JSON.stringify(continue_award.value)))
+            formData.continue_award.splice(editIndex, 1, cloneDeep(continue_award.value))
         }
     }
 }
diff --git a/admin/src/app/views/marketing/sign_list.vue b/admin/src/app/views/marketing/sign_list.vue
index 5542c98f6..69c99d5b9 100644
--- a/admin/src/app/views/marketing/sign_list.vue
+++ b/admin/src/app/views/marketing/sign_list.vue
@@ -37,7 +37,7 @@
                         <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                 </div>
diff --git a/admin/src/app/views/marketing/verifier.vue b/admin/src/app/views/marketing/verifier.vue
index 950bc7c8f..dc90f4fba 100644
--- a/admin/src/app/views/marketing/verifier.vue
+++ b/admin/src/app/views/marketing/verifier.vue
@@ -18,7 +18,7 @@
                         <template #default="{ row }">
                             <div class="flex items-center cursor-pointer " @click="toMember(row.member.member_id)" v-if="row.member">
                                 <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                     <span>{{ row.member.mobile || '' }}</span>
@@ -157,7 +157,6 @@ const deleteEvent = (id: number) => {
     ).then(() => {
         deleteVerifier(id).then(() => {
             loadVerifierList()
-        }).catch(() => {
         })
     })
 }
diff --git a/admin/src/app/views/member/balance.vue b/admin/src/app/views/member/balance.vue
index c468828c7..6ba7a2ad2 100644
--- a/admin/src/app/views/member/balance.vue
+++ b/admin/src/app/views/member/balance.vue
@@ -89,7 +89,7 @@
                         <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                 </div>
diff --git a/admin/src/app/views/member/commission.vue b/admin/src/app/views/member/commission.vue
index 22112252b..bb17bd1be 100644
--- a/admin/src/app/views/member/commission.vue
+++ b/admin/src/app/views/member/commission.vue
@@ -92,7 +92,7 @@
                         <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                 </div>
diff --git a/admin/src/app/views/member/components/member-balance-info.vue b/admin/src/app/views/member/components/member-balance-info.vue
index b2c0b77f3..01ab8a2b1 100644
--- a/admin/src/app/views/member/components/member-balance-info.vue
+++ b/admin/src/app/views/member/components/member-balance-info.vue
@@ -5,7 +5,7 @@
             <el-form-item :label="t('headimg')" >
                 <div class="flex items-center">
                     <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="@/app/assets/images/default_headimg.png" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                 </div>
             </el-form-item>
 
diff --git a/admin/src/app/views/member/components/member-commission-info.vue b/admin/src/app/views/member/components/member-commission-info.vue
index 9cdb91a41..6b4c26eed 100644
--- a/admin/src/app/views/member/components/member-commission-info.vue
+++ b/admin/src/app/views/member/components/member-commission-info.vue
@@ -5,7 +5,7 @@
             <el-form-item :label="t('headimg')">
                 <div class="flex items-center">
                     <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="@/app/assets/images/default_headimg.png" alt="">
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                 </div>
             </el-form-item>
 
diff --git a/admin/src/app/views/member/components/member-money-info.vue b/admin/src/app/views/member/components/member-money-info.vue
index 3ad541e51..bc8805883 100644
--- a/admin/src/app/views/member/components/member-money-info.vue
+++ b/admin/src/app/views/member/components/member-money-info.vue
@@ -5,7 +5,7 @@
             <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-else src="@/app/assets/images/default_headimg.png" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                 </div>
             </el-form-item>
 
diff --git a/admin/src/app/views/member/components/member-point-info.vue b/admin/src/app/views/member/components/member-point-info.vue
index 94f88bdaf..1a8cbb84a 100644
--- a/admin/src/app/views/member/components/member-point-info.vue
+++ b/admin/src/app/views/member/components/member-point-info.vue
@@ -5,7 +5,7 @@
             <el-form-item :label="t('headimg')" >
                 <div class="flex items-center">
                     <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="@/app/assets/images/default_headimg.png" alt="" >
+                    <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                 </div>
             </el-form-item>
 
diff --git a/admin/src/app/views/member/growth.vue b/admin/src/app/views/member/growth.vue
index 8f8c2304b..2ac140f95 100644
--- a/admin/src/app/views/member/growth.vue
+++ b/admin/src/app/views/member/growth.vue
@@ -43,7 +43,7 @@
                         <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                 </div>
diff --git a/admin/src/app/views/member/member.vue b/admin/src/app/views/member/member.vue
index 273ee0ad0..df0fe98dc 100644
--- a/admin/src/app/views/member/member.vue
+++ b/admin/src/app/views/member/member.vue
@@ -57,7 +57,7 @@
                         <template #default="{ row }">
                             <div class="flex items-center">
                                 <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.nickname || '' }}</span>
                                 </div>
@@ -205,19 +205,6 @@ const router = useRouter()
 const addMemberDialog: Record<string, any> | null = ref(null)
 const editMemberDialog: Record<string, any> | null = ref(null)
 
-/**
- * 获取标签
- */
-function memberLablel(res: any) {
-    let data
-    if (!res.member_label_array) return ''
-    data = res.member_label_array.map((item: any) => {
-        return item.label_name
-    })
-    data = data.toString()
-    return data
-}
-
 /**
  * 设置标签
  */
diff --git a/admin/src/app/views/member/member_detail.vue b/admin/src/app/views/member/member_detail.vue
index f0376ca88..42f6081fd 100644
--- a/admin/src/app/views/member/member_detail.vue
+++ b/admin/src/app/views/member/member_detail.vue
@@ -13,7 +13,7 @@
                         <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="@/app/assets/images/default_headimg.png" alt="">
+                            <img class="w-[50px] h-[50px] inline-block rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                             <el-icon @click="editMemberInfo('headimg')" class="-bottom-[2px] -right-[4px] cursor-pointer">
                                 <EditPen color="#273CE2" />
                             </el-icon>
diff --git a/admin/src/app/views/member/point.vue b/admin/src/app/views/member/point.vue
index da3fd11f0..8d77c5898 100644
--- a/admin/src/app/views/member/point.vue
+++ b/admin/src/app/views/member/point.vue
@@ -71,7 +71,7 @@
                         <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="@/app/assets/images/default_headimg.png" alt="">
+                                <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
                                 <div class="flex flex flex-col">
                                     <span>{{ row.member.nickname || '' }}</span>
                                 </div>
diff --git a/admin/src/app/views/order/recharge/detail.vue b/admin/src/app/views/order/recharge/detail.vue
deleted file mode 100644
index 0fe753f9f..000000000
--- a/admin/src/app/views/order/recharge/detail.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<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" v-if="formData">
-                <h3 class="panel-title">{{ t('orderInfo') }}</h3>
-
-                <el-form-item :label="t('orderNo')">
-                    <div class="input-width">{{ formData.order_no }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('orderMoney')">
-                    <div class="input-width">{{ formData.order_money }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('orderDiscountMoney')">
-                    <div class="input-width">{{ formData.order_discount_money }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('member')">
-                    <div class="input-width">
-                        <div class="flex flex flex-col cursor-pointer" @click="toMember(formData.member_id)">
-                            <span>{{ formData.member.nickname || '' }}</span>
-                            <span>{{ formData.member.mobile || '' }}</span>
-                        </div>
-                    </div>
-                </el-form-item>
-
-                <el-form-item :label="t('ip')">
-                    <div class="input-width">{{ formData.ip }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('orderFromName')">
-                    <div class="input-width">{{ formData.order_from_name }}</div>
-                </el-form-item>
-
-                <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')">
-                    <div class="input-width">{{ formData.pay_type_name }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('createTime')">
-                    <div class="input-width">{{ formData.create_time || '' }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('payTime')">
-                    <div class="input-width">{{ formData.pay_time || '' }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('remark')">
-                    <div class="input-width">{{ formData.remark || '' }}</div>
-                </el-form-item>
-
-                <el-form-item :label="t('memberMessage')">
-                    <div class="input-width">{{ formData.member_message || '' }}</div>
-                </el-form-item>
-
-            </el-card>
-
-        </el-form>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import { getRechargeOrderInfo } from '@/app/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 orderId: number = parseInt(route.query.order_id)
-const loading = ref(true)
-
-const formData: Record<string, any> | null = ref(null)
-
-const setFormData = async (orderId: number = 0) => {
-    loading.value = true
-    formData.value = null
-    await getRechargeOrderInfo(orderId).then(({data}) => {
-        formData.value = data
-    }).catch(() => {
-
-    })
-    loading.value = false
-}
-if (orderId) setFormData(orderId)
-else loading.value = false
-
-const formRef = ref<FormInstance>()
-
-const back = () => {
-    tabbarStore.removeTab(route.path)
-    router.push({ path: '/finance/recharge' })
-}
-/**
- * 会员详情
- */
-const toMember = (memberId: number) => {
-    router.push(`/member/detail?id=${memberId}`)
-}
-
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/order/recharge/list.vue b/admin/src/app/views/order/recharge/list.vue
deleted file mode 100644
index 3dac33dc2..000000000
--- a/admin/src/app/views/order/recharge/list.vue
+++ /dev/null
@@ -1,290 +0,0 @@
-<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-page-title">{{ pageName }}</span>
-            </div>
-
-            <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('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">
-                            <el-option :label="t('selectPlaceholder')" value="" />
-                            <el-option :label="item" :value="key" v-for="(item, key) in channelList"  :key="key"/>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item :label="t('orderStatus')" prop="order_status">
-                        <el-select v-model="orderTableData.searchParam.order_status" clearable class="input-width">
-                            <el-option :label="t('selectPlaceholder')" value="" />
-                            <el-option :label="item['name']" :value="item['status']" v-for="(item,index) in statusList" :key="index"/>
-                        </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>
-                    </el-form-item>
-                </el-form>
-            </el-card>
-
-            <div class="mt-[16px]">
-                <el-table :data="orderTableData.data" size="large" v-loading="orderTableData.loading">
-                    <template #empty>
-                        <span>{{ !orderTableData.loading ? t('emptyData') : '' }}</span>
-                    </template>
-
-                    <el-table-column :show-overflow-tooltip="true" :label="t('member')" 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.member.headimg" :src="img(row.member.headimg)" alt="">
-                                <img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/app/assets/images/default_headimg.png" alt="">
-                                <div class="flex flex flex-col">
-                                    <span>{{ row.member.nickname || '' }}</span>
-                                    <span>{{ 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">
-                        <template #default="{ row }">
-                            {{ row.order_status_info.name }}
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column prop="pay_type_name" :label="t('payTypeName')" align="center" min-width="140" />
-
-                    <el-table-column :label="t('createTime')" min-width="180" align="center">
-                        <template #default="{ row }">
-                            {{ row.create_time || '' }}
-                        </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')" align="right" 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) && 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" :key="index">
-                                <el-button type="primary" link @click="orderEvent(row, item.class)">{{ item.name }}</el-button>
-                            </template>
-                        </template>
-                    </el-table-column>
-
-                </el-table>
-                <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="orderTableData.page" v-model:page-size="orderTableData.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="orderTableData.total"
-                        @size-change="loadOrderList()" @current-change="loadOrderList" />
-                </div>
-            </div>
-        </el-card>
-
-        <!-- 是否退款 -->
-        <el-dialog v-model="refundShowDialog" :title="t('refundBtn')" width="500px" :destroy-on-close="true">
-            <p>{{ t('refundContent') }}</p>
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button @click="refundShowDialog = false">{{ t('cancel') }}</el-button>
-                    <el-button type="primary" @click="confirmRefund" :loading="refundLoading">{{ t('confirm') }}</el-button>
-                </span>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref } from 'vue'
-import { t } from '@/lang'
-import { getRechargeOrderStatusList, getRechargeOrderList, rechargeRefund, getRechargeStat } from '@/app/api/order'
-import { getChannelType } from '@/app/api/sys'
-import { useRouter, useRoute } from 'vue-router'
-import { AnyObject } from '@/types/global'
-import type { FormInstance } from 'element-plus'
-import { img } from '@/utils/common'
-const route = useRoute()
-const router = useRouter()
-const pageName = route.meta.title
-const memberId: number = parseInt(route.query.id || 0)
-
-const channelList = ref([])
-const setChannelList = async () => {
-    channelList.value = await (await getChannelType({})).data
-}
-setChannelList()
-
-const orderTableData = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: true,
-    data: [],
-    searchParam: {
-        order_no: '',
-        order_status: '',
-        member_id: memberId,
-        create_time: [],
-        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>()
-
-const setCategoryList = async () => {
-    statusList.value = await (await getRechargeOrderStatusList()).data
-}
-setCategoryList()
-
-/**
- * 获取文章列表
- */
-const loadOrderList = (page: number = 1) => {
-    orderTableData.loading = true
-    orderTableData.page = page
-
-    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
-    })
-}
-loadOrderList()
-
-/**
- * 订单详情
- * @param data
- */
-const infoEvent = (data: any) => {
-    router.push(`/order/recharge/detail?order_id=${data.order_id}`)
-}
-
-/**
- * 订单操作
- */
-const orderEvent = (data: any, type: string) => {
-
-}
-
-/**
- * 退款操作
- */
-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
-    })
-}
-
-/**
- * 会员详情
- */
-const toMember = (memberId: number) => {
-    router.push(`/member/detail?id=${memberId}`)
-}
-
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/order/recharge/refund.vue b/admin/src/app/views/order/recharge/refund.vue
deleted file mode 100644
index c3e07c17f..000000000
--- a/admin/src/app/views/order/recharge/refund.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<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-page-title">{{ pageName }}</span>
-			</div>
-
-			<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-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-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" :key="key" />
-						</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.member.headimg" :src="img(row.member.headimg)" alt="">
-								<img class="w-[50px] h-[50px] mr-[10px]" v-else src="@/app/assets/images/default_headimg.png" alt="">
-								<div class="flex flex flex-col">
-									<span>{{ row.member.nickname || '' }}</span>
-									<span>{{ 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')" align="right" 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>
-import { reactive, ref } from 'vue'
-import { t } from '@/lang'
-import { img } from '@/utils/common'
-import { useRouter, useRoute } from 'vue-router'
-import { getRechargeRefund, getRechargeRefundStatus, getRechargeRefundStat } from '@/app/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: {
-        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
-
-    getRechargeRefund({
-        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 = () => {
-    getRechargeRefundStatus().then(res => {
-        refundList.value = 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 = () => {
-    getRechargeRefundStat().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 infoEvent = (info:any) => {
-    refundInfo.value = info
-    refundInfoShowDialog.value = true
-}
-
-/**
- * 会员详情
- */
-const toMember = (memberId: number) => {
-    router.push(`/member/detail?id=${memberId}`)
-}
-
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/poster/components/edit-headimg.vue b/admin/src/app/views/poster/components/edit-headimg.vue
index 34317f8ba..b733dab33 100644
--- a/admin/src/app/views/poster/components/edit-headimg.vue
+++ b/admin/src/app/views/poster/components/edit-headimg.vue
@@ -7,8 +7,15 @@
 		</div>
 
 		<!-- 组件公共属性 -->
-		<slot name="common"></slot>
-
+		<slot name="common"></slot>    
+        <el-form label-width="80px" class="px-[10px]">
+            <el-form-item :label="t('imgShape')">
+                <div class="flex items-center">
+                    <div class="bg-[#DFDFDF] cursor-pointer w-[50px] h-[50px] border-solid border-[1px] border-transparent rounded-[50%]" :class="{'border-[var(--el-color-primary)]': posterStore.editComponent.shape == 'circle'}" @click="imgShapeChangeFn('circle')"></div>
+                    <div class="bg-[#DFDFDF] cursor-pointer w-[50px] h-[50px] ml-[25px] border-solid border-[1px] border-transparent" :class="{'border-[var(--el-color-primary)]': posterStore.editComponent.shape == 'normal'}" @click="imgShapeChangeFn('normal')"></div>
+                </div>
+            </el-form-item>
+        </el-form>
 	</div>
 </template>
 
@@ -19,6 +26,11 @@ import usePosterStore from '@/stores/modules/poster'
 
 const posterStore = usePosterStore()
 
+// 图片形状改变
+const imgShapeChangeFn = (data)=>{
+    posterStore.editComponent.shape = data;
+}
+
 defineExpose({})
 
 </script>
diff --git a/admin/src/app/views/poster/components/edit-page.vue b/admin/src/app/views/poster/components/edit-page.vue
index a017870d3..c4be3ebae 100644
--- a/admin/src/app/views/poster/components/edit-page.vue
+++ b/admin/src/app/views/poster/components/edit-page.vue
@@ -18,7 +18,7 @@
 					<div class="text-sm text-gray-400 mt-[10px]">{{ t('bgUrlTips') }}</div>
 				</el-form-item>
 				<el-form-item :label="t('bgColor')" v-show="posterStore.global.bgType == 'color'">
-					<el-color-picker v-model="posterStore.editComponent.bgColor" show-alpha :predefine="posterStore.predefineColors" />
+					<el-color-picker v-model="posterStore.editComponent.bgColor" :predefine="posterStore.predefineColors" />
 				</el-form-item>
 				<el-form-item :label="t('statusLabel')" class="display-block">
 					<el-switch v-model="posterStore.status" :active-value="1" :inactive-value="0"/>
diff --git a/admin/src/app/views/poster/components/preview-headimg.vue b/admin/src/app/views/poster/components/preview-headimg.vue
index 062af93b8..fc9d39729 100644
--- a/admin/src/app/views/poster/components/preview-headimg.vue
+++ b/admin/src/app/views/poster/components/preview-headimg.vue
@@ -1,6 +1,6 @@
 <template>
-	<div class="pointer-events-none max-w-[360px]" :style="componentStyle">
-		<img src="@/app/assets/images/default_headimg.png" class="w-full h-full" />
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
+		<img src="@/app/assets/images/default_headimg_square.jpg" class="w-full h-full" />
 	</div>
 </template>
 
@@ -22,6 +22,9 @@ const data = computed(()=> {
 const componentStyle = computed(()=> {
     var style = '';
     style += `width: ${prop.value.width}px;`;
+    if(prop.value.shape == 'circle'){
+        style += `border-radius: 50%; overflow: hidden;`;
+    }
     return style;
 })
 
diff --git a/admin/src/app/views/poster/components/preview-image.vue b/admin/src/app/views/poster/components/preview-image.vue
index c5fa04e6a..41ecf4f61 100644
--- a/admin/src/app/views/poster/components/preview-image.vue
+++ b/admin/src/app/views/poster/components/preview-image.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="pointer-events-none max-w-[360px]" :style="componentStyle">
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
 		<img v-if="data.value" :src="img(data.value)" class="w-full h-full" />
 		<img v-else :src="img('static/resource/images/diy/crack_figure.png')" class="w-full h-full" />
 	</div>
diff --git a/admin/src/app/views/poster/components/preview-nickname.vue b/admin/src/app/views/poster/components/preview-nickname.vue
index 787fccf2b..1fa2dad8f 100644
--- a/admin/src/app/views/poster/components/preview-nickname.vue
+++ b/admin/src/app/views/poster/components/preview-nickname.vue
@@ -4,6 +4,9 @@
 
 <script lang="ts" setup>
 import { ref,computed } from 'vue'
+import usePosterStore from '@/stores/modules/poster'
+
+const posterStore = usePosterStore()
 
 const prop = defineProps({
     value: {
@@ -18,7 +21,22 @@ const data = computed(()=> {
 
 const componentStyle = computed(()=> {
     var style = '';
-    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};`;
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
+    let box: any = document.getElementById(prop.value.id)
+    if (box) {
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
+    }
     return style;
 })
 
diff --git a/admin/src/app/views/poster/components/preview-qrcode.vue b/admin/src/app/views/poster/components/preview-qrcode.vue
index b4c0bb389..b50fba8bb 100644
--- a/admin/src/app/views/poster/components/preview-qrcode.vue
+++ b/admin/src/app/views/poster/components/preview-qrcode.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="pointer-events-none max-w-[360px]" :style="componentStyle">
+	<div class="pointer-events-none max-w-[720px]" :style="componentStyle">
 		<img :src="img('static/resource/images/diy/qrcode.png')" class="w-full h-full" />
 	</div>
 </template>
diff --git a/admin/src/app/views/poster/components/preview-text.vue b/admin/src/app/views/poster/components/preview-text.vue
index 73a293757..7de4d79bb 100644
--- a/admin/src/app/views/poster/components/preview-text.vue
+++ b/admin/src/app/views/poster/components/preview-text.vue
@@ -4,6 +4,9 @@
 
 <script lang="ts" setup>
 import { ref,computed } from 'vue'
+import usePosterStore from '@/stores/modules/poster'
+
+const posterStore = usePosterStore()
 
 const prop = defineProps({
     value: {
@@ -18,10 +21,21 @@ const data = computed(()=> {
 
 const componentStyle = computed(()=> {
     var style = '';
-    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};`;
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`;
+    if(prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right'){
+        style += `text-align: ${prop.value.x};`;
+    }
+    if(prop.value.weight){
+        style += `font-weight: bold;`;
+    }
+    if(!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf'){
+        style += `font-family: poster_default_font;`;
+    }
     let box: any = document.getElementById(prop.value.id)
     if (box) {
         style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`;
+    }else{
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`;
     }
     return style;
 })
diff --git a/admin/src/app/views/poster/edit.vue b/admin/src/app/views/poster/edit.vue
index a1a6b775b..b2ffd64e1 100644
--- a/admin/src/app/views/poster/edit.vue
+++ b/admin/src/app/views/poster/edit.vue
@@ -12,12 +12,14 @@
                 <span class="mr-[5px] text-[14px]">{{ t('decorating') }}：{{ posterStore.typeName }}</span>
             </div>
 
-            <div>
+            <div class="flex items-center">
                 <span class="text-white mr-[10px] text-base">{{ t('templatePosterPlaceholder') }}</span>
-                <el-select size="small" v-model="template" class="w-[180px]" :placeholder="t('templatePosterPlaceholder')" @change="changeTemplatePoster">
-                    <el-option :label="t('templatePosterEmpty')" value="" />
-                    <el-option v-for="(item, index) in templatePoster" :label="item.name" :value="index" :key="index"/>
-                </el-select>
+                <div class="w-[180px]">
+                    <el-select size="small" v-model="template" :placeholder="t('templatePosterPlaceholder')" @change="changeTemplatePoster">
+                        <el-option :label="t('templatePosterEmpty')" value="" />
+                        <el-option v-for="(item, index) in templatePoster" :label="item.name" :value="index" :key="index"/>
+                    </el-select>
+                </div>
             </div>
             <div class="flex-1"></div>
             <el-button @click="preview()" v-if="posterStore.id">{{ t('preview') }}</el-button>
@@ -55,7 +57,7 @@
                                 <div class="title-wrap text-center text-[14px]">{{ posterStore.name }}</div>
                             </div>
                         </div>
-                        <div class="preview-block relative">
+                        <div class="preview-block relative max-h-[640px]">
                             <ul class="quick-action absolute text-center -right-[70px] top-[20px] w-[42px] rounded shadow-md">
                                 <el-tooltip effect="light" :content="t('moveUpComponentZIndex')" placement="right">
                                     <icon name="iconfont iconjiantoushang" size="20px" class="block cursor-pointer leading-[40px]" @click="posterStore.moveUpComponent" />
@@ -76,8 +78,8 @@
 
                             <!-- 组件预览渲染区域 -->
                             <div class="preview-iframe" :style="posterStore.getGlobalStyle()" @click="posterStore.changeCurrentIndex(-99)">
-                                <div class="item-wrap area-box select-none max-w-[360px] cursor-move" v-for="(item,index) in posterStore.value" :id="item.id" :key="item.id"
-                                     :style="{ top: item.y + 'px', left: item.x + 'px', zIndex: item.zIndex, transform : 'rotate(' + item.angle +  'deg)' }"
+                                <div class="item-wrap area-box select-none max-w-[720px] cursor-move" v-for="(item,index) in posterStore.value" :id="item.id" :key="item.id"
+                                     :style="previewIframeStyle(item)"
                                      :class="{ 'selected' : posterStore.currentIndex == index }"
                                      @mousedown="posterStore.mouseDown($event,item.id,index)"
                                      @click.stop="posterStore.changeCurrentIndex(index,item)"
@@ -104,7 +106,7 @@
                     <el-card class="box-card" shadow="never">
                         <template #header>
                             <div class="card-header flex justify-between items-center">
-                                <span class="title flex-1">{{ posterStore.currentIndex == -99 ? t('posterSet') : posterStore.editComponent.componentTitle }}</span>
+                                <span class="title flex-1">{{ posterStore.currentIndex == -99 ? t('posterSet') : posterStore.editComponent?.componentTitle }}</span>
                             </div>
                         </template>
 
@@ -114,7 +116,7 @@
                                 <template #common>
                                     <div class="edit-attr-item-wrap">
                                         <h3 class="mb-[10px]">{{ t('componentStyleTitle') }}</h3>
-                                        <el-form label-width="80px" class="px-[10px]">
+                                        <el-form label-width="100px" class="px-[10px]">
 
                                             <!-- 角度旋转、这里根据类型展示 文本、图片、绘画的编辑属性 -->
 
@@ -122,22 +124,30 @@
                                                 <span>{{ posterStore.editComponent.zIndex }}</span>
                                             </el-form-item>
 
-                                            <el-form-item :label="t('coordinate')">
+                                            <!-- <el-form-item :label="t('coordinate')">
                                                 <el-slider v-model="posterStore.editComponent.x" show-input size="small" class="ml-[10px]" :min="0" :max="posterStore.getMaxX()" />
                                                 <div class="my-[10px]"></div>
                                                 <el-slider v-model="posterStore.editComponent.y" show-input size="small" class="ml-[10px]" :min="0" :max="posterStore.getMaxY()" />
                                             </el-form-item>
-
-                                            <div class="ml-[92px] mb-[18px] text-sm text-gray-400">{{ t('coordinateTips') }}</div>
+                                            <div class="ml-[92px] mb-[18px] text-sm text-gray-400">{{ t('coordinateTips') }}</div> -->
 
                                             <!-- 文本 -->
                                             <template v-if="posterStore.editComponent.type == 'text'">
                                                 <el-form-item :label="t('textFontSize')">
-                                                    <el-slider v-model="posterStore.editComponent.fontSize" show-input size="small" class="ml-[10px]" :min="14" :max="36" />
+                                                    <el-slider v-model="posterStore.editComponent.fontSize" show-input size="small" class="ml-[10px]" :min="14" :max="50" />
                                                 </el-form-item>
                                                 <el-form-item :label="t('textColor')">
                                                     <el-color-picker v-model="posterStore.editComponent.fontColor" />
                                                 </el-form-item>
+                                                <el-form-item :label="t('weight')">
+                                                    <el-switch v-model="posterStore.editComponent.weight" />
+                                                </el-form-item>
+                                                <!-- <el-form-item :label="t('space')">
+                                                    <el-slider v-model="posterStore.editComponent.space" show-input size="small" class="ml-[10px]" :min="0" :max="20" />
+                                                </el-form-item> -->
+                                                <el-form-item :label="t('lineHeight')">
+                                                    <el-slider v-model="posterStore.editComponent.lineHeight" show-input size="small" class="ml-[10px]" :min="0" :max="50" />
+                                                </el-form-item>
                                             </template>
 
                                             <!-- 图片 -->
@@ -160,6 +170,31 @@
                                                 </el-form-item>
                                             </template>
 
+                                            <!-- 对齐方式 -->
+                                            <template v-if="posterStore.editComponent.type != 'draw' && posterStore.editComponent.type != 'image' && posterStore.editComponent.type != 'qrcode'">
+                                                <el-form-item :label="t('horizontalAlignment')">
+                                                    <ul class="flex items-center">
+                                                        <template v-for="(item,i) in xAlignList">
+                                                            <li :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': xAlignList.length != (i+1)}, (item.className == posterStore.editComponent.x) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="alignChangeFn('x',item)">
+                                                                <span :class="['iconfont !text-[20px]', item.src]" :title="item.name"></span>
+                                                            </li>
+                                                        </template>
+                                                    </ul>
+                                                    <div class="text-sm mt-[10px] leading-[1.4] text-gray-400">{{ t('AlignTips') }}</div>
+                                                </el-form-item>
+
+                                                <el-form-item :label="t('verticalAlignment')">
+                                                    <ul class="flex items-center">
+                                                        <template v-for="(item,i) in yAlignList">
+                                                            <li :class="['w-[50px] h-[32px] flex items-center justify-center border-solid  border-[1px] border-[#eee] cursor-pointer', {'border-r-transparent': yAlignList.length != (i+1)}, (item.className == posterStore.editComponent.y) ?  '!border-[var(--el-color-primary)]' : '' ]" @click="alignChangeFn('y',item)">
+                                                                <span :class="['iconfont !text-[20px]', item.src]" :title="item.name"></span>
+                                                            </li>
+                                                        </template>
+                                                    </ul>
+                                                </el-form-item>
+                                            </template>
+
+
 <!--                                            <el-form-item :label="t('旋转角度')">-->
 <!--                                                <el-slider v-model="posterStore.editComponent.angle" show-input size="small" class="ml-[10px]" :min="0" :max="360" />-->
 <!--                                            </el-form-item>-->
@@ -207,10 +242,13 @@ const posterStore = usePosterStore()
 const route = useRoute()
 const router = useRouter()
 
-route.query.id = route.query.id || 0
-route.query.type = route.query.type || '' // 海报类型
-route.query.name = route.query.name || ''
-route.query.back = route.query.back || '/admin/poster/list'
+if(route && route.query){
+    route.query.id = route.query.id || 0
+    route.query.type = route.query.type || '' // 海报类型
+    route.query.name = route.query.name || ''
+    route.query.back = route.query.back || '/admin/poster/list'
+}
+
 
 const backPath:any = route.query.back
 const template = ref('');
@@ -224,6 +262,90 @@ const activeNames = ref(componentType)
 const handleChange = (val: string[]) => {
 }
 
+const previewIframeStyle = (data)=>{
+    let style = {
+        transform: '',
+        zIndex: '',
+        top: '',
+        left: '',
+        right: '',
+        bottom: ''
+    };
+    style.transform =  `rotate(${data.angle}deg)`;
+    style.zIndex =  `${data.zIndex}`;
+    switch(data.y) {
+        case 'top':
+            style.top = 0;
+            break;
+        case 'center':
+            style.top = '50%';
+            style.transform = style.transform + ' translateY(-50%)';
+            break;
+        case 'bottom':
+            style.bottom = 0;
+            break;
+        default:
+            style.top = data.y + 'px';
+    } 
+    switch(data.x) {
+        case 'left':
+            style.left = 0;
+            break;
+        case 'center':
+            style.left = '50%';
+            style.transform = style.transform + ' translateX(-50%)';
+            break;
+        case 'right':
+            style.right = 0;
+            break;
+        default:
+            style.left = data.x + 'px';
+    }
+    // console.log(data.x,data.y)
+    return style;
+}
+
+// 水平方向对齐
+const xAlignList = ref([
+    {
+        name: '左',
+        src: 'iconzuoduiqi1',
+        className: 'left'
+    },
+    {
+        name: '中',
+        src: 'iconshuipingjuzhong1',
+        className: 'center'
+    },
+    {
+        name: '右',
+        src: 'iconyouduiqi1',
+        className: 'right'
+    }
+])
+// 水平方向对齐
+const yAlignList = ref([
+    {
+        name: '上',
+        src: 'icondingduiqi1',
+        className: 'top'
+    },
+    {
+        name: '中',
+        src: 'iconchuizhijuzhong1',
+        className: 'center'
+    },
+    {
+        name: '下',
+        src: 'icondiduiqi1',
+        className: 'bottom'
+    },
+])
+const alignChangeFn = (type,data)=>{
+    posterStore.editComponent[type] = data.className;
+    
+}
+
 // 返回上一页
 const isChange = ref(true) // 数据是否发生变化，true：没变化，false：变化了
 const goBack = () => {
@@ -374,17 +496,17 @@ const save = (callback: any) => {
     if (isRepeat.value) return
     isRepeat.value = true
 
-    posterStore.value.forEach((item:any,index:any)=> {
+    posterStore.value.forEach((item:any,index:any, originalArr:any)=> {
         const box: any = document.getElementById(item.id)
         if (box) {
             item.width = box.offsetWidth;
             item.height = box.offsetHeight;
             if (item.type == 'draw') {
                 // [x,y]：左上，右上，右下，左下
-                let leftTop = [item.x * 2, item.y * 2]; // 左上
-                let rightTop = [(item.x + item.width) * 2, item.y * 2]; // 右上
-                let rightBottom = [(item.x + item.width) * 2, (item.y + item.height) * 2]; // 右下
-                let leftBottom = [item.x * 2, (item.y + item.height) * 2]; // 左下
+                let leftTop = [item.x * 1, item.y * 1]; // 左上
+                let rightTop = [(item.x + item.width) * 1, item.y * 1]; // 右上
+                let rightBottom = [(item.x + item.width) * 1, (item.y + item.height) * 1]; // 右下
+                let leftBottom = [item.x * 1, (item.y + item.height) * 1]; // 左下
                 item.points = [leftTop, rightTop, rightBottom, leftBottom];
             }
         }
@@ -479,12 +601,14 @@ const preview = () => {
 }
 
 .preview-iframe {
+    transform: scale(0.5);
 	margin: 0 auto;
-	width: 360px;
-	height: 640px;
-	background-size: 100% 640px;
+	width: 720px;
+	height: 1280px;
+	background-size: 100% 1280px;
 	background-repeat: no-repeat;
 	position: relative;
+    transform-origin: left top;
 
 	.item-wrap {
 		position: absolute;
@@ -522,8 +646,8 @@ const preview = () => {
 			.box2,
 			.box3,
 			.box4 {
-				width: 10px;
-				height: 10px;
+				width: 20px;
+				height: 20px;
 				background-color: #fff;
 				position: absolute;
 				border-radius: 50%;
@@ -532,26 +656,26 @@ const preview = () => {
 			}
 
 			.box1 {
-				top: -4px;
-				left: -4px;
+				top: -8px;
+				left: -8px;
 				cursor: nw-resize;
 			}
 
 			.box2 {
-				top: -4px;
-				right: -4px;
+				top: -8px;
+				right: -8px;
 				cursor: ne-resize;
 			}
 
 			.box3 {
-				left: -4px;
-				bottom: -4px;
+				left: -8px;
+				bottom: -8px;
 				cursor: sw-resize;
 			}
 
 			.box4 {
-				bottom: -4px;
-				right: -4px;
+				bottom: -8px;
+				right: -8px;
 				cursor: se-resize;
 			}
 		}
diff --git a/admin/src/app/views/printer/edit.vue b/admin/src/app/views/printer/edit.vue
new file mode 100644
index 000000000..1c73d724b
--- /dev/null
+++ b/admin/src/app/views/printer/edit.vue
@@ -0,0 +1,363 @@
+<template>
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+
+		<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+			<el-card class="box-card !border-none" shadow="never">
+
+				<h3 class="panel-title !text-sm">{{ t('printerSet') }}</h3>
+
+				<el-form-item :label="t('printerName')" prop="printer_name">
+					<el-input v-model.trim="formData.printer_name" clearable :placeholder="t('printerNamePlaceholder')" class="input-width" maxlength="20" />
+				</el-form-item>
+
+				<el-form-item :label="t('brand')" prop="brand">
+					<el-select v-model="formData.brand" :placeholder="t('brandPlaceholder')" clearable>
+						<el-option v-for="(item,key) in brandList" :key="key" :label="item" :value="key" />
+					</el-select>
+				</el-form-item>
+
+				<el-form-item :label="t('printerCode')" prop="printer_code">
+					<div>
+						<el-input v-model.trim="formData.printer_code" clearable :placeholder="t('printerCodePlaceholder')" class="input-width" maxlength="30" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('printerCodeTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('printerKey')" prop="printer_key">
+					<div>
+						<el-input v-model.trim="formData.printer_key" clearable :placeholder="t('printerKeyPlaceholder')" class="input-width" maxlength="30" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('printerKeyTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('openId')" prop="open_id">
+					<div>
+						<el-input v-model.trim="formData.open_id" clearable :placeholder="t('openIdPlaceholder')" class="input-width" maxlength="30" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('openIdTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('apikey')" prop="apikey">
+					<div>
+						<el-input v-model.trim="formData.apikey" clearable :placeholder="t('apikeyPlaceholder')" class="input-width" maxlength="60" />
+						<p class="text-[12px] text-[#b2b2b2]">{{ t('apikeyTips') }}</p>
+					</div>
+				</el-form-item>
+
+				<el-form-item :label="t('printWidth')" prop="print_width">
+					<el-radio-group v-model="formData.print_width">
+						<el-radio value="58mm">58mm</el-radio>
+					</el-radio-group>
+				</el-form-item>
+
+				<el-form-item :label="t('status')">
+					<el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+				</el-form-item>
+
+			</el-card>
+			<el-card v-for="(item,index) in printerType" :key="item.key" class="box-card !border-none" shadow="never">
+				<h3 class="panel-title !text-sm">{{ item.title }}</h3>
+
+				<div class="flex mb-[10px] py-[8px] bg-[#F5F7F9] text-[14px]">
+					<div class="px-[12px] w-[200px]">{{ t('printTrigger') }}</div>
+					<div class="px-[12px] w-[100px]">{{ t('status') }}</div>
+					<div class="px-[12px] w-[250px]">{{ t('usePrintTemplate') }}</div>
+					<div class="px-[12px] w-[300px] flex-1" v-for="childItem in item.condition" :key="childItem.key">{{ childItem.title }}</div>
+					<div class="px-[12px] w-[200px]">{{ t('printNum') }}</div>
+				</div>
+
+				<template v-if="item.trigger">
+					<div class="flex bg-[#f8f8f9] mb-[10px] py-[20px]" v-for="(triggerItem,triggerKey) in item.trigger" :key="triggerKey">
+						<template v-if="formData.value[item.key]['trigger_' + triggerKey]">
+							<div class="font-bold w-[200px] px-[12px]">{{ triggerItem }}</div>
+							<div class="w-[100px] px-[12px]">
+								<el-switch v-model="formData.value[item.key]['trigger_' + triggerKey].status" :active-value="1" :inactive-value="0" />
+							</div>
+							<div class="w-[250px] px-[12px]">
+								<el-select v-model="formData.value[item.key]['trigger_' + triggerKey].template_id" :placeholder="t('请选择小票打印模板')" clearable>
+									<el-option v-for="templateItem in templateList[item.key]" :key="templateItem.template_id" :label="templateItem.template_name" :value="templateItem.template_id" />
+								</el-select>
+							</div>
+							<template v-for="childItem in item.condition">
+								<div class="w-[300px] px-[12px] flex-1" v-if="childItem.type == 'checkbox'">
+									<el-checkbox-group v-model="formData.value[item.key]['trigger_' + triggerKey][childItem.key]">
+										<el-checkbox v-for="(checkboxItem, index) in childItem.list" :label="checkboxItem.value" :key="index">{{ checkboxItem.name }}</el-checkbox>
+									</el-checkbox-group>
+								</div>
+							</template>
+							<div class="w-[200px] px-[12px]">
+								<el-select v-model="formData.value[item.key]['trigger_' + triggerKey].print_num">
+									<el-option label="1联" :value="1" />
+									<el-option label="2联" :value="2" />
+									<el-option label="3联" :value="3" />
+									<el-option label="4联" :value="4" />
+								</el-select>
+							</div>
+						</template>
+					</div>
+				</template>
+
+			</el-card>
+		</el-form>
+
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('save') }}</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 { t } from '@/lang'
+    import { FormInstance, ElMessage } from 'element-plus'
+    import { useRoute, useRouter } from 'vue-router'
+    import { deepClone } from '@/utils/common';
+    import { addPrinter, editPrinter,getPrinterInfo,getPrinterType,getPrinterBrand,getPrinterTemplateList } from '@/app/api/printer'
+
+    const route = useRoute()
+    const router = useRouter()
+    const repeat = ref(false)
+    const loading = ref(true)
+
+    const pageName = route.meta.title
+
+    /**
+     * 表单数据
+     */
+    const initialFormData:any = {
+        printer_id: route.query.printer_id || 0,
+        brand: '',
+        printer_name: '',
+        printer_code: '',
+        printer_key: '',
+        open_id: '',
+        apikey: '',
+        template_type: [],
+        trigger: [],
+        value: {},
+        print_width: '58mm',
+        status: 1,
+    }
+
+    const formData: Record<string, any> = reactive({ ...initialFormData })
+
+    const formRef = ref<FormInstance>()
+
+    // 表单验证规则
+    const formRules = computed(() => {
+        return {
+            printer_name: [
+                { required: true, message: t('printerNamePlaceholder'), trigger: 'blur' },
+            ],
+            brand: [
+                { required: true, message: t('brandPlaceholder'), trigger: 'blur' },
+            ],
+            printer_code: [
+                { required: true, message: t('printerCodePlaceholder'), trigger: 'blur' },
+            ],
+            printer_key: [
+                { required: true, message: t('printerKeyPlaceholder'), trigger: 'blur' },
+            ],
+            open_id: [
+                { required: true, message: t('openIdPlaceholder'), trigger: 'blur' },
+            ],
+            apikey: [
+                { required: true, message: t('apikeyPlaceholder'), trigger: 'blur' },
+            ]
+        }
+    })
+
+    const printerType = ref([])
+
+    const init = async ()=> {
+        await getPrinterType({}).then((res: any) => {
+            if (res.data) {
+                printerType.value = res.data;
+
+                for (let i = 0; i < printerType.value.length; i++) {
+                    let item: any = printerType.value[i];
+
+                    formData.value[item.key] = {};
+
+                    let extendData: any = {};
+                    for (let ci = 0; ci < item.condition.length; ci++) {
+                        let condition = item.condition[ci];
+                        extendData[condition.key] = [];
+                        if (condition.type == 'checkbox') {
+                            extendData[condition.key] = []; // 默认全选
+                            for (let k = 0; k < condition.list.length; k++) {
+                                extendData[condition.key].push(condition.list[k].value);
+                            }
+                        }
+                    }
+
+                    for (let key in item.trigger) {
+                        formData.value[item.key]['trigger_' + key] = {
+                            status: 1,
+                            template_id: '',
+                            print_num: 1,
+                        };
+                        Object.assign(formData.value[item.key]['trigger_' + key], deepClone(extendData));
+                    }
+                }
+
+            }
+            if (!formData.printer_id) {
+                loading.value = false
+            }
+        })
+
+        if (formData.printer_id) {
+            getPrinterInfo(formData.printer_id).then((res: any) => {
+                let data = res.data;
+                if (data) Object.keys(formData).forEach((key: string) => {
+                    if (data[key] != undefined) {
+                        if (key == 'value') {
+                            for (let ck in formData[key]){
+                                Object.assign(formData[key][ck],data[key][ck])
+                            }
+                        } else {
+                            formData[key] = data[key]
+                        }
+                    }
+                })
+                loading.value = false
+            })
+        }
+    }
+
+    init()
+
+    const brandList = ref([])
+    getPrinterBrand({}).then((res: any) => {
+        brandList.value = res.data;
+    })
+
+    const templateList:any = ref({}) // 小票打印模板列表
+    getPrinterTemplateList({}).then((res:any)=> {
+        if (res.data) {
+            let data = res.data;
+            for (let i = 0; i < data.length; i++) {
+                let item = data[i];
+                if (templateList.value[item.template_type] == undefined) {
+                    templateList.value[item.template_type] = []
+                }
+                templateList.value[item.template_type].push({
+                    template_id: item.template_id,
+                    template_name: item.template_name,
+                })
+            }
+        }
+    })
+
+    /**
+     * 确认
+     * @param formEl
+     */
+    const confirm = async(formEl: FormInstance | undefined) => {
+        if (loading.value || !formEl) return
+
+        if (printerType.value.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: t('printTypeEmpty')
+            })
+            return;
+        }
+
+        let save = formData.printer_id ? editPrinter : addPrinter
+
+        await formEl.validate(async(valid) => {
+            if (valid) {
+
+                let validateFlag = false;
+                let validateMessage = '';
+
+                for (let i = 0; i < printerType.value.length; i++) {
+                    let item: any = printerType.value[i];
+
+                    for (let k = 0; k < Object.keys(item.trigger).length; k++) {
+                        let triggerItem = Object.keys(item.trigger)[k];
+                        if (formData.value[item.key]['trigger_' + triggerItem].status == 0) {
+                            continue;
+                        }
+
+                        if (!formData.value[item.key]['trigger_' + triggerItem].template_id) {
+                            validateFlag = true;
+                            validateMessage = `请设置${ item.title }[${ item.trigger[triggerItem] }]的小票打印模板`
+                            break;
+                        }
+
+                        let isFail = false;
+                        for (let ck = 0; ck < item.condition.length; ck++) {
+                            let condition = item.condition[ck];
+                            if (condition.type == 'checkbox') {
+                                if (formData.value[item.key]['trigger_' + triggerItem][condition.key].length == 0) {
+                                    validateFlag = true;
+                                    validateMessage = `请设置${ item.title }[${ item.trigger[triggerItem] }]的${ condition.title }`
+                                    isFail = true;
+                                    break;
+                                }
+                            }
+                        }
+
+                        // 防止重复循环
+                        if (isFail) {
+                            break;
+                        }
+
+                    }
+
+                    // 防止重复循环
+                    if (validateFlag) {
+                        break;
+                    }
+                }
+
+                if (validateFlag) {
+                    ElMessage({
+                        type: 'warning',
+                        message: validateMessage
+                    })
+                    return;
+                }
+
+                formData.template_type = [];
+                formData.trigger = [];
+
+                for (let key in formData.value) {
+                    for (let childKey in formData.value[key]) {
+                        formData.trigger.push(key + '_' + childKey);
+                    }
+                    formData.template_type.push(key)
+                }
+
+                if (repeat.value) return
+                repeat.value = true
+
+                let data = formData
+
+                save(data).then(res => {
+                    repeat.value = false
+                    if (!formData.printer_id) {
+                        router.push('/printer/list')
+                    }
+                }).catch(err => {
+                    repeat.value = false
+                })
+            }
+        })
+    }
+
+    const back = () => {
+        router.push('/printer/list')
+    }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/printer/list.vue b/admin/src/app/views/printer/list.vue
new file mode 100644
index 000000000..055e5d599
--- /dev/null
+++ b/admin/src/app/views/printer/list.vue
@@ -0,0 +1,227 @@
+<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-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addPrinter') }}
+                </el-button>
+            </div>
+
+            <el-tabs class="demo-tabs" model-value="/printer/list" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabPrinterManager')" name="/printer/list" />
+                <el-tab-pane :label="t('tabPrinterTemplate')" name="/printer/template/list" />
+            </el-tabs>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="printerTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('printerName')" prop="printer_name">
+                        <el-input v-model.trim="printerTable.searchParam.printer_name" :placeholder="t('printerNamePlaceholder')" maxlength="20" />
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPrinterList()">{{ 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="printerTable.data" size="large" v-loading="printerTable.loading">
+                    <template #empty>
+                        <span>{{ !printerTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="printer_name" :label="t('printerName')" min-width="220" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="brand_name" :label="t('brand')" min-width="120" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="print_width" :label="t('printWidth')" min-width="120" :show-overflow-tooltip="true"/>
+
+                    <el-table-column prop="status" :label="t('status')" min-width="80" :show-overflow-tooltip="true" >
+                        <template #default="{ row }">
+	                        <el-tag type="success" v-if="row.status == 1" @click="modifyPrinterStatusEvent(row.printer_id, 0)" class="cursor-pointer">{{ t('statusOn') }}</el-tag>
+	                        <el-tag type="info" v-else @click="modifyPrinterStatusEvent(row.printer_id, 1)" class="cursor-pointer">{{ t('statusOff') }}</el-tag>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="testPrintEvent(row.printer_id)">{{ t('testPrint') }}</el-button>
+                           <el-button type="primary" link @click="refreshTokenEvent(row.printer_id)">{{ t('refreshToken') }}</el-button>
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.printer_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="printerTable.page" v-model:page-size="printerTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="printerTable.total"
+                        @size-change="loadPrinterList()" @current-change="loadPrinterList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { getPrinterPageList, modifyPrinterStatus, deletePrinter,refreshPrinterToken,testPrint } from '@/app/api/printer'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import { useRoute,useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
+const pageName = route.meta.title;
+const repeat = ref(false)
+
+const handleClick = (path: string) => {
+    router.push({ path })
+}
+
+const printerTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      printer_name:''
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+/**
+ * 获取小票打印机列表
+ */
+const loadPrinterList = (page: number = 1) => {
+    printerTable.loading = true
+    printerTable.page = page
+
+    getPrinterPageList({
+        page: printerTable.page,
+        limit: printerTable.limit,
+         ...printerTable.searchParam
+    }).then(res => {
+        printerTable.loading = false
+        printerTable.data = res.data.data
+        printerTable.total = res.data.total
+    }).catch(() => {
+        printerTable.loading = false
+    })
+}
+
+loadPrinterList()
+
+const isRepeat = ref(false)
+
+// 修改小票打印机状态
+const modifyPrinterStatusEvent = (printer_id: any, status: any) => {
+    if (isRepeat.value) return
+    isRepeat.value = true
+
+    modifyPrinterStatus({
+        printer_id,
+        status
+    }).then((res) => {
+        loadPrinterList()
+        isRepeat.value = false
+    })
+}
+
+/**
+ * 添加小票打印机
+ */
+const addEvent = () => {
+    router.push('/printer/add')
+}
+
+/**
+ * 编辑小票打印机
+ * @param data
+ */
+const editEvent = (data: any) => {
+    router.push('/printer/edit?printer_id=' + data.printer_id)
+}
+
+/**
+ * 删除小票打印机
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('printerDeleteTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+            }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        deletePrinter(id).then(() => {
+            loadPrinterList()
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
+}
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadPrinterList()
+}
+
+/**
+ * 测试打印
+ * @param printer_id
+ */
+const testPrintEvent = (printer_id: any) => {
+    ElMessageBox.confirm(t('testPrintTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+            }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        testPrint(printer_id).then((res: any) => {
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
+}
+
+/**
+ * 授权（重新获取token）
+ * @param printer_id
+ */
+const refreshTokenEvent = (printer_id: any) => {
+    ElMessageBox.confirm(t('refreshTokenTips'), t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel'),
+                type: 'warning',
+            }
+    ).then(() => {
+        if (repeat.value) return
+        repeat.value = true
+        refreshPrinterToken(printer_id).then((res: any) => {
+            loadPrinterList()
+            repeat.value = false
+        }).catch(() => {
+            repeat.value = false
+        })
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/admin/src/app/views/printer/template_edit.vue b/admin/src/app/views/printer/template_edit.vue
new file mode 100644
index 000000000..f92ca2032
--- /dev/null
+++ b/admin/src/app/views/printer/template_edit.vue
@@ -0,0 +1,350 @@
+<template>
+	<div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+
+		<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+
+			<div class="flex">
+
+				<div class="flex-1 mr-[20px] bg-[#fff]">
+
+					<el-card class="box-card !border-none" shadow="never">
+
+						<h3 class="panel-title !text-sm">{{ t('templateInfoLabel') }}</h3>
+
+						<el-form-item :label="t('templateName')" prop="template_name">
+							<el-input v-model.trim="formData.template_name" clearable :placeholder="t('templateNamePlaceholder')" class="input-width" maxlength="20" />
+						</el-form-item>
+
+						<el-form-item :label="t('templateType')" prop="template_type" v-if="printerType.length">
+							<el-radio-group v-model="formData.template_type">
+								<el-radio v-for="item in printerType" :key="item.key" :label="item.key" @change="handlePrintType">{{ item.title }}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+
+					</el-card>
+					<el-card class="box-card !border-none" shadow="never" v-if="printerType.length">
+
+						<h3 class="panel-title !text-sm">{{ t('templateEditLabel') }}</h3>
+
+						<div v-for="item in template" :key="item.key" class="bg-[#f8f8f9] mb-[20px] py-[20px] px-[40px] text-[14px]">
+							<h4 class="panel-title !text-sm">{{ item.title }}</h4>
+							<div v-for="(childItem,index) in item.list" :key="childItem.key" class="ml-[30px]" :style="{ 'margin-bottom' : item.list.length == (index + 1) ? '0' : '20px' }">
+								<div class="flex">
+									<el-checkbox v-model="formData.value[item.key][childItem.key].status" v-if="childItem.label" :label="childItem.label" :value="childItem.status" :true-value="1" :false-value="0" class="w-[180px] mr-[10px]" :disabled="childItem.disabled" />
+
+									<template v-if="childItem.type == 'input'">
+										<el-input v-model.trim="formData.value[item.key][childItem.key].value" clearable :placeholder="'请输入' + (childItem.placeholder ? childItem.placeholder : childItem.label)" class="input-width mr-[30px]" maxlength="32" />
+									</template>
+
+									<template v-if="childItem.type == 'checkbox'">
+										<el-checkbox-group v-model="formData.value[item.key][childItem.key].value" class="mr-[30px]">
+											<el-checkbox v-for="(checkboxItem, key) in childItem.list" :label="key" :key="key" :disabled="childItem.disabled">{{ checkboxItem }}</el-checkbox>
+										</el-checkbox-group>
+									</template>
+
+									<template v-if="childItem.type == 'select'">
+
+										<div class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]">{{ childItem.text }}</div>
+										<el-select v-model="formData.value[item.key][childItem.key].value" class="!w-[130px] mr-[30px]">
+											<el-option v-for="(item,key) in childItem.list" :key="key" :label="item" :value="key" />
+										</el-select>
+
+									</template>
+
+									<template v-if="childItem.fontSize">
+										<div class="flex mr-[30px]">
+											<div class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]">字号</div>
+											<el-select v-model="formData.value[item.key][childItem.key].fontSize" class="!w-[130px]">
+												<el-option label="小" value="normal" />
+<!--												<el-option label="小" value="small" />-->
+												<el-option label="大" value="big" />
+											</el-select>
+										</div>
+
+									</template>
+
+									<template v-if="childItem.fontWeight">
+
+										<div class="flex mr-[30px]">
+											<div class="leading-[30px] w-[50px] text-center text-[#707070] bg-[#d7d7d7] border-1 border-solid border-[#ededed]">粗细</div>
+											<el-select v-model="formData.value[item.key][childItem.key].fontWeight" class="!w-[130px]">
+												<el-option label="正常" value="normal" />
+												<el-option label="加粗" value="bold" />
+											</el-select>
+										</div>
+									</template>
+
+								</div>
+
+								<div v-if="childItem.remark" class="text-[12px] text-[#b2b2b2] mt-[10px]">{{ childItem.remark }}</div>
+
+							</div>
+
+						</div>
+
+					</el-card>
+				</div>
+
+				<el-card class="box-card !border-none w-[450px]" shadow="never">
+
+					<h3 class="panel-title !text-sm">{{ t('preview') }}</h3>
+
+					<!-- 动态加载组件 -->
+					<component :is="modules[previewPath]" :value="formData.value"/>
+
+				</el-card>
+
+			</div>
+
+		</el-form>
+
+		<div class="fixed-footer-wrap">
+			<div class="fixed-footer">
+				<el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('save') }}</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 { t } from '@/lang'
+    import { FormInstance, ElMessage } from 'element-plus'
+    import { useRoute, useRouter } from 'vue-router'
+    import { getPrinterType, addPrinterTemplate, editPrinterTemplate, getPrinterTemplateInfo } from '@/app/api/printer'
+
+    const route = useRoute()
+    const router = useRouter()
+    const pageName = route.meta.title
+    const repeat = ref(false)
+    const loading = ref(true)
+
+    /**
+     * 表单数据
+     */
+    const initialFormData:any = {
+        template_id: route.query.template_id || 0,
+        template_type: '',
+        template_name: '',
+        value: {},
+    }
+
+    const formData: Record<string, any> = reactive({ ...initialFormData })
+
+    const formRef = ref<FormInstance>()
+
+    // 表单验证规则
+    const formRules = computed(() => {
+        return {
+            template_name: [
+                { required: true, message: t('templateNamePlaceholder'), trigger: 'blur' },
+            ],
+            template_type: [
+                { required: true, message: t('templateTypePlaceholder'), trigger: 'blur' },
+            ]
+        }
+    })
+
+    // 动态加载组件
+    const modulesFiles = import.meta.glob('./components/*.vue', { eager: true })
+    const addonModulesFiles = import.meta.glob('@/addon/**/views/printer/components/*.vue', { eager: true })
+    addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
+
+    const modules:any = {}
+    for (const [key, value] of Object.entries(modulesFiles)) {
+        const moduleName:any = key.split('/').pop()
+        const name = moduleName.split('.')[0]
+        modules[name] = value.default
+    }
+
+    const previewPath = ref('')
+    const printerType:any = ref([])
+    const template:any = ref([])
+
+    const init = async ()=> {
+        await getPrinterType({}).then((res: any) => {
+            if (res.data && res.data.length) {
+                printerType.value = res.data;
+                handlePrintType(printerType.value[0].key, Boolean(parseInt(formData.template_id)));
+            }
+            if (!formData.template_id) {
+                loading.value = false
+            }
+        })
+
+        if(formData.template_id) {
+            getPrinterTemplateInfo(formData.template_id).then((res:any)=>{
+                let data = res.data;
+                if (data && Object.keys(data).length) {
+                    Object.keys(formData).forEach((key: string) => {
+                        if (key == 'value') {
+                            for (let ck in formData[key]){
+                                Object.assign(formData[key][ck],data[key][ck])
+                            }
+                        } else {
+                            formData[key] = data[key]
+                        }
+                    })
+                    loading.value = false
+                }else {
+                    ElMessage({
+                        type: 'warning',
+                        duration: 1500,
+                        message: t('printTemplateEmpty')
+                    })
+                    setTimeout(()=>{
+                        back();
+                        loading.value = false
+                    }, 2000);
+                }
+            })
+        }
+    };
+
+    init();
+
+    // 切换模板类型
+    const handlePrintType = (value: any, load: boolean = false) => {
+        for (let i = 0; i < printerType.value.length; i++) {
+            if (printerType.value[i].key == value) {
+                formData.template_type = printerType.value[i].key;
+                previewPath.value = printerType.value[i].path;
+                template.value = printerType.value[i].template;
+                break;
+            }
+        }
+
+        // 清空模板内容数据
+        for (let key in formData.value) {
+            delete formData.value[key];
+        }
+
+        refreshTemplateData();
+    }
+
+    // 刷新模板内容数据
+    const refreshTemplateData = ()=> {
+        for (let i = 0; i < template.value.length; i++) {
+            let item: any = template.value[i];
+            formData.value[item.key] = {};
+            for (let k = 0; k < item.list.length; k++) {
+                let childItem = item.list[k];
+                formData.value[item.key][childItem.key] = {
+                    type: childItem.type,
+                    value: childItem.value,
+                    status: childItem.status,
+                    fontSize: childItem.fontSize,
+                    fontWeight: childItem.fontWeight,
+                };
+            }
+        }
+    }
+
+    /**
+     * 确认
+     * @param formEl
+     */
+    const confirm = async(formEl: FormInstance | undefined) => {
+        if (loading.value || !formEl) return
+
+        if (printerType.value.length == 0) {
+            ElMessage({
+                type: 'warning',
+                message: t('printTypeEmpty')
+            })
+            return;
+        }
+
+        let save = formData.template_id ? editPrinterTemplate : addPrinterTemplate
+
+        await formEl.validate(async(valid) => {
+            if (valid) {
+
+                let validateFlag = false;
+                let validateMessage = '';
+
+                for (let i = 0; i < template.value.length; i++) {
+
+                    let item: any = template.value[i];
+                    let isFail = false;
+
+                    for (let k = 0; k < item.list.length; k++) {
+                        let childItem = item.list[k];
+                        if (formData.value[item.key][childItem.key].status == 0) {
+                            continue;
+                        }
+                        if (childItem.type == 'input') {
+                            if (formData.value[item.key][childItem.key].value == '') {
+                                validateFlag = true;
+                                validateMessage = `请输入${ childItem.label }`;
+                                isFail = true;
+                                break;
+                            }
+                        } else if (childItem.type == 'select') {
+                            if (formData.value[item.key][childItem.key].value == '') {
+                                validateFlag = true;
+                                validateMessage = `${ childItem.label }未设置[${ childItem.text }]`;
+                                isFail = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    // 防止重复循环
+                    if (isFail) {
+                        break;
+                    }
+                }
+
+                if (validateFlag) {
+                    ElMessage({
+                        type: 'warning',
+                        message: validateMessage
+                    })
+                    return;
+                }
+
+                for (let i = 0; i < template.value.length; i++) {
+
+                    let item: any = template.value[i];
+
+                    for (let k = 0; k < item.list.length; k++) {
+                        let childItem = item.list[k];
+                        if (childItem.type == 'checkbox') {
+                            if (formData.value[item.key][childItem.key].value.length) {
+                                formData.value[item.key][childItem.key].status = 1;
+                            } else {
+                                formData.value[item.key][childItem.key].status = 0;
+                            }
+                        }
+                    }
+                }
+
+                if (repeat.value) return
+                repeat.value = true
+
+                let data = formData
+
+                save(data).then(res => {
+                    repeat.value = false
+                    if (!formData.template_id) {
+                        back()
+                    }
+                }).catch(err => {
+                    repeat.value = false
+                })
+            }
+        })
+    }
+
+    const back = () => {
+        router.push('/printer/template/list')
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/printer/template_list.vue b/admin/src/app/views/printer/template_list.vue
new file mode 100644
index 000000000..5a979e2bb
--- /dev/null
+++ b/admin/src/app/views/printer/template_list.vue
@@ -0,0 +1,162 @@
+<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-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addPrinterTemplate') }}
+                </el-button>
+            </div>
+
+            <el-tabs class="demo-tabs" model-value="/printer/template/list" @tab-change="handleClick">
+                <el-tab-pane :label="t('tabPrinterManager')" name="/printer/list" />
+                <el-tab-pane :label="t('tabPrinterTemplate')" name="/printer/template/list" />
+            </el-tabs>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="printerTemplateTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('templateName')" prop="template_name">
+                        <el-input v-model="printerTemplateTable.searchParam.template_name" :placeholder="t('templateNamePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('templateType')" prop="template_type">
+                        <el-select v-model="printerTemplateTable.searchParam.template_type" :placeholder="t('templateTypePlaceholder')" clearable>
+                            <el-option v-for="(item,key) in printerType" :key="itemkey" :label="item.title" :value="item.key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadPrinterTemplateList()">{{ 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="printerTemplateTable.data" size="large" v-loading="printerTemplateTable.loading">
+                    <template #empty>
+                        <span>{{ !printerTemplateTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="template_name" :label="t('templateName')" min-width="220" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="template_type_name" :label="t('templateType')" min-width="180" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.template_id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="printerTemplateTable.page" v-model:page-size="printerTemplateTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="printerTemplateTable.total"
+                        @size-change="loadPrinterTemplateList()" @current-change="loadPrinterTemplateList" />
+                </div>
+            </div>
+
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { getPrinterTemplatePageList, deletePrinterTemplate,getPrinterType } from '@/app/api/printer'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import { useRoute,useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
+const pageName = route.meta.title;
+
+const handleClick = (path: string) => {
+    router.push({ path })
+}
+
+const printerTemplateTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        template_name: '',
+        template_type: '',
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+const printerType = ref([])
+getPrinterType({}).then((res: any) => {
+    if (res.data) {
+        printerType.value = res.data;
+    }
+})
+
+/**
+ * 获取小票打印模板列表
+ */
+const loadPrinterTemplateList = (page: number = 1) => {
+    printerTemplateTable.loading = true
+    printerTemplateTable.page = page
+
+    getPrinterTemplatePageList({
+        page: printerTemplateTable.page,
+        limit: printerTemplateTable.limit,
+         ...printerTemplateTable.searchParam
+    }).then(res => {
+        printerTemplateTable.loading = false
+        printerTemplateTable.data = res.data.data
+        printerTemplateTable.total = res.data.total
+    }).catch(() => {
+        printerTemplateTable.loading = false
+    })
+}
+loadPrinterTemplateList()
+
+/**
+ * 添加小票打印模板
+ */
+const addEvent = () => {
+    router.push('/printer/template/add')
+}
+
+/**
+ * 编辑小票打印模板
+ * @param data
+ */
+const editEvent = (data: any) => {
+    router.push('/printer/template/edit?template_id=' + data.template_id)
+}
+
+/**
+ * 删除小票打印模板
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('printerTemplateDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deletePrinterTemplate(id).then(() => {
+            loadPrinterTemplateList()
+        })
+    })
+}
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadPrinterTemplateList()
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/admin/src/app/views/setting/adminlogin.vue b/admin/src/app/views/setting/adminlogin.vue
index 7f8ca1f07..db562f8aa 100644
--- a/admin/src/app/views/setting/adminlogin.vue
+++ b/admin/src/app/views/setting/adminlogin.vue
@@ -6,7 +6,7 @@
                 <h3 class="panel-title !text-sm">{{ t('admin') }}</h3>
 
                 <el-form-item :label="t('isCaptcha')" prop="formData.is_auth_register">
-                    <el-switch v-model="formData.is_captcha"/>
+                    <el-switch v-model="formData.is_captcha" :active-value="1" :inactive-value="0" />
                 </el-form-item>
                 <el-form-item :label="t('bgImg')">
                     <upload-image v-model="formData.bg" />
@@ -30,6 +30,7 @@ import { t } from '@/lang'
 import { getConfigLogin, setConfigLogin } from '@/app/api/sys'
 import { FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
+import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const pageName = route.meta.title
@@ -38,16 +39,14 @@ const loading = ref(true)
 const ruleFormRef = ref<FormInstance>()
 const formData = reactive<Record<string, number | string>>({
     is_captcha: 0,
-    is_site_captcha: 0,
     bg: '',
     site_bg: ''
 })
 
-const getFormData = async (id: number = 0) => {
+const getFormData = async () => {
     const data = await (await getConfigLogin()).data
     Object.keys(formData).forEach((key: string) => {
-        if (['is_captcha', 'is_site_captcha'].includes(key)) formData[key] = Boolean(Number(data[key]))
-        else formData[key] = data[key]
+        formData[key] = data[key]
     })
     loading.value = false
 }
@@ -57,10 +56,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
     await formEl.validate((valid) => {
         if (valid) {
-            const save = JSON.parse(JSON.stringify(formData))
-            Object.keys(save).forEach((key) => {
-                if (['is_captcha', 'is_site_captcha'].includes(key)) save[key] = Number(save[key])
-            })
+            const save = cloneDeep(formData)
 
             setConfigLogin(save).then(() => {
                 loading.value = false
diff --git a/admin/src/app/views/setting/cash_out.vue b/admin/src/app/views/setting/cash_out.vue
index 40011e60b..adadf127d 100644
--- a/admin/src/app/views/setting/cash_out.vue
+++ b/admin/src/app/views/setting/cash_out.vue
@@ -11,7 +11,7 @@
                 <el-card class="box-card !border-none" shadow="never">
 
                     <el-form-item :label="t('isOpen')">
-                        <el-switch v-model="formData.is_open" />
+                        <el-switch v-model="formData.is_open" active-value="1" inactive-value="0" />
                     </el-form-item>
 
                     <el-form-item :label="t('cashWithdrawalAmount')" v-if="formData.is_open" prop="min">
@@ -67,7 +67,7 @@ const pageName = route.meta.title
 
 const loading = ref(true)
 const ruleFormRef = ref<FormInstance>()
-const formData = reactive<Record<string, string | boolean | Array<string> >>({
+const formData = reactive({
     is_auto_transfer: '0',
     is_auto_verify: '0',
     is_open: '0',
@@ -84,12 +84,11 @@ const getTransfertypeFn = async () => {
 getTransfertypeFn()
 
 // 获取会员的配置信息
-const setFormData = async (id: number = 0) => {
+const setFormData = async () => {
     const data = await (await getCashOutConfig()).data
     Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key]
     })
-    formData.is_open = Boolean(Number(formData.is_open))
     loading.value = false
 }
 setFormData()
@@ -124,7 +123,6 @@ const onSave = async (formEl: FormInstance | undefined) => {
     await formEl.validate((valid) => {
         if (valid) {
             const save = { ...formData }
-            save.is_open = Number(save.is_open).toString()
 
             setCashOutConfig(save).then(() => {
                 loading.value = false
diff --git a/admin/src/app/views/setting/components/cron-info.vue b/admin/src/app/views/setting/components/cron-info.vue
index f843b409a..e43eef95d 100644
--- a/admin/src/app/views/setting/components/cron-info.vue
+++ b/admin/src/app/views/setting/components/cron-info.vue
@@ -91,8 +91,6 @@ const formRules = computed(() => {
     }
 })
 
-// const emit = defineEmits(['complete'])
-
 const setFormData = async (row: any = null) => {
     loading.value = true
     Object.assign(formData, initialFormData)
diff --git a/admin/src/app/views/setting/components/notice-records-info.vue b/admin/src/app/views/setting/components/notice-records-info.vue
index ee579cacd..a724e95d7 100644
--- a/admin/src/app/views/setting/components/notice-records-info.vue
+++ b/admin/src/app/views/setting/components/notice-records-info.vue
@@ -40,7 +40,6 @@
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-// import { editNoticeStatus } from '@/app/api/notice'
 
 const showDialog = ref(false)
 const loading = ref(true)
diff --git a/admin/src/app/views/setting/components/notice-weapp.vue b/admin/src/app/views/setting/components/notice-weapp.vue
index 70172cfa4..2d5ac6c99 100644
--- a/admin/src/app/views/setting/components/notice-weapp.vue
+++ b/admin/src/app/views/setting/components/notice-weapp.vue
@@ -13,7 +13,7 @@
             </el-form-item>
 
             <el-form-item :label="t('weappTempKey')">
-                <div class="input-width"> {{ formData.temp_key }} </div>
+                <div class="input-width"> {{ formData.tid }} </div>
             </el-form-item>
 
             <el-form-item :label="t('content')">
@@ -54,7 +54,7 @@ const initialFormData = {
     content: [],
     first: '',
     remark: '',
-    temp_key: ''
+    tid: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
diff --git a/admin/src/app/views/setting/components/sms-ali.vue b/admin/src/app/views/setting/components/sms-ali.vue
index 89120c5e5..207495969 100644
--- a/admin/src/app/views/setting/components/sms-ali.vue
+++ b/admin/src/app/views/setting/components/sms-ali.vue
@@ -9,15 +9,15 @@
             </el-form-item>
 
             <el-form-item :label="t('aliSign')" prop="sign">
-                <el-input v-model="formData.sign" :placeholder="t('aliSignPlaceholder')" class="input-width" show-word-limit clearable />
+                <el-input v-model.trim="formData.sign" :placeholder="t('aliSignPlaceholder')" class="input-width" show-word-limit clearable />
             </el-form-item>
 
             <el-form-item :label="t('aliAppKey')" prop="app_key">
-                <el-input v-model="formData.app_key" :placeholder="t('aliAppKeyPlaceholder')" class="input-width" clearable />
+                <el-input v-model.trim="formData.app_key" :placeholder="t('aliAppKeyPlaceholder')" class="input-width" clearable />
             </el-form-item>
 
             <el-form-item :label="t('aliSecretKey')" prop="secret_key">
-                <el-input v-model="formData.secret_key" :placeholder="t('aliSecretKeyPlaceholder')" class="input-width" clearable />
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('aliSecretKeyPlaceholder')" class="input-width" clearable />
             </el-form-item>
 
         </el-form>
diff --git a/admin/src/app/views/setting/components/sms-tencent.vue b/admin/src/app/views/setting/components/sms-tencent.vue
index d95ef58bc..5247a48b2 100644
--- a/admin/src/app/views/setting/components/sms-tencent.vue
+++ b/admin/src/app/views/setting/components/sms-tencent.vue
@@ -9,19 +9,19 @@
             </el-form-item>
 
             <el-form-item :label="t('tencentSign')" prop="sign">
-                <el-input v-model="formData.sign" :placeholder="t('tencentSignPlaceholder')" class="input-width" show-word-limit clearable />
+                <el-input v-model.trim="formData.sign" :placeholder="t('tencentSignPlaceholder')" class="input-width" show-word-limit clearable />
             </el-form-item>
 
             <el-form-item :label="t('tencentAppId')" prop="app_id">
-                <el-input v-model="formData.app_id" :placeholder="t('tencentAppIdPlaceholder')" class="input-width" show-word-limit clearable />
+                <el-input v-model.trim="formData.app_id" :placeholder="t('tencentAppIdPlaceholder')" class="input-width" show-word-limit clearable />
             </el-form-item>
 
             <el-form-item :label="t('tencentSecretId')" prop="secret_id">
-                <el-input v-model="formData.secret_id" :placeholder="t('tencentSecretIdPlaceholder')" class="input-width" clearable />
+                <el-input v-model.trim="formData.secret_id" :placeholder="t('tencentSecretIdPlaceholder')" class="input-width" clearable />
             </el-form-item>
 
             <el-form-item :label="t('tencentSecretKey')" prop="secret_key">
-                <el-input v-model="formData.secret_key" :placeholder="t('tencentSecretKeyPlaceholder')" class="input-width" clearable />
+                <el-input v-model.trim="formData.secret_key" :placeholder="t('tencentSecretKeyPlaceholder')" class="input-width" clearable />
             </el-form-item>
 
         </el-form>
diff --git a/admin/src/app/views/setting/copyright.vue b/admin/src/app/views/setting/copyright.vue
index 11895fe72..f8003e51b 100644
--- a/admin/src/app/views/setting/copyright.vue
+++ b/admin/src/app/views/setting/copyright.vue
@@ -68,7 +68,7 @@ const formData = reactive<Record<string, string>>({
     copyright_desc: ''
 })
 
-const setFormData = async (id: number = 0) => {
+const setFormData = async () => {
     const data = await (await getCopyright()).data
     Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key]
diff --git a/admin/src/app/views/setting/login.vue b/admin/src/app/views/setting/login.vue
index 37bf3bc3f..0568f8cff 100644
--- a/admin/src/app/views/setting/login.vue
+++ b/admin/src/app/views/setting/login.vue
@@ -6,19 +6,19 @@
                 <h3 class="panel-title !text-sm">{{ t('commonSetting') }}</h3>
 
                 <el-form-item :label="t('logonMode')" prop="type">
-                    <el-checkbox v-model="formData.is_username" :label="t('isUsername')" @change="switchChange($event, 'is_username')" />
+                    <el-checkbox v-model="formData.is_username" :label="t('isUsername')" :true-value="1" :false-value="0" @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')" />
+                    <el-checkbox v-model="formData.is_mobile" :label="t('isMobile')" :true-value="1" :false-value="0" @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')" />
+                    <el-switch v-model="formData.is_bind_mobile" :active-value="1" :inactive-value="0" @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')" />
+                    <el-switch v-model="formData.agreement_show" :active-value="1" :inactive-value="0" @change="switchChange($event, 'agreement_show')" />
                     <div class="form-tip">{{ t('agreementTips') }}</div>
                 </el-form-item>
             </el-card>
@@ -27,7 +27,7 @@
                 <h3 class="panel-title !text-sm">{{ 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')" />
+                    <el-switch v-model="formData.is_auth_register" :active-value="1" :inactive-value="0" @change="switchChange($event, 'is_auth_register')" />
                     <div class="form-tip">{{ t('isAuthRegisterTip') }}</div>
                 </el-form-item>
             </el-card>
@@ -47,6 +47,7 @@ import { t } from '@/lang'
 import { getLoginConfig, setLoginConfig } from '@/app/api/member'
 import { FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
+import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const pageName = route.meta.title
@@ -63,26 +64,26 @@ const formData = reactive<Record<string, number | boolean>>({
 
 const formRules = computed(() => {
     return {
-        type: [
-            {
-                required: true,
-                trigger: 'change',
-                validator: (rule: any, value: any, callback: any) => {
-                    if (!formData.is_mobile && !formData.is_username) {
-                        callback(new Error(t('mobileOrUsernameNoEmpty')))
-                    } else {
-                        callback()
-                    }
-                }
-            }
-        ]
+        // type: [
+        //     {
+        //         required: true,
+        //         trigger: 'change',
+        //         validator: (rule: any, value: any, callback: any) => {
+        //             if (!formData.is_mobile && !formData.is_username) {
+        //                 callback(new Error(t('mobileOrUsernameNoEmpty')))
+        //             } else {
+        //                 callback()
+        //             }
+        //         }
+        //     }
+        // ]
     }
 })
 
-const setFormData = async (id: number = 0) => {
+const setFormData = async () => {
     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] = Number(data[key])
     })
     loading.value = false
 }
@@ -96,7 +97,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
     await formEl.validate((valid) => {
         if (valid) {
-            const save = JSON.parse(JSON.stringify(formData))
+            const save = cloneDeep(formData)
             Object.keys(save).forEach((key) => {
                 save[key] = Number(save[key])
             })
diff --git a/admin/src/app/views/setting/notice_records.vue b/admin/src/app/views/setting/notice_records.vue
index 85f71dc92..e4f017526 100644
--- a/admin/src/app/views/setting/notice_records.vue
+++ b/admin/src/app/views/setting/notice_records.vue
@@ -14,7 +14,7 @@
                     </el-form-item>
 
                     <el-form-item :label="t('noticeKey')" prop="key">
-                        <el-select v-model="recordsTableData.searchParam.key" clearable :placeholder="t('noticeKeyPlaceholder')" class="input-width">
+                        <el-select v-model="recordsTableData.searchParam.key" clearable :placeholder="t('noticeKeyPlaceholder')" class="input-width" popper-class="notice">
                             <el-option :label="t('selectPlaceholder')" value="" />
                             <el-option-group v-for="(group, gindex) in templateList" :key="gindex" :label="group.label">
                                 <el-option :label="item.name" :value="item.value" :disabled="item.disabled ?? false" v-for="(item, index) in group.list" :key="index" />
@@ -172,4 +172,9 @@ const infoEvent = (data: any) => {
 
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss">
+.notice .el-select-group__title{
+    font-size: 14px;;
+}
+
+</style>
diff --git a/admin/src/app/views/setting/pay.vue b/admin/src/app/views/setting/pay.vue
index da70ea8c8..6d1acb2fb 100644
--- a/admin/src/app/views/setting/pay.vue
+++ b/admin/src/app/views/setting/pay.vue
@@ -31,7 +31,7 @@
                             </div>
                         </div>
                         <div class="flex items-center justify-center w-[110px] select-none">
-                            <el-switch v-if="isEdit" v-model="childrenItem.status" :active-text="t('isEnable')" @change="enablePaymentMode(childrenItem)" />
+                            <el-switch v-if="isEdit" v-model="childrenItem.status" :active-value="1" :inactive-value="0" :active-text="t('isEnable')" @change="enablePaymentMode(childrenItem)" />
                             <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>
@@ -69,6 +69,7 @@ import { img } from '@/utils/common'
 import { ElMessage } from 'element-plus'
 import Sortable, { SortableEvent } from 'sortablejs'
 import { useRoute } from 'vue-router'
+import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const pageName = route.meta.title
@@ -109,8 +110,6 @@ const checkPayConfigList = () => {
                 if (item.is_default == 1) {
                     default_key = item.redio_key
                 }
-
-                item.status = Boolean(item.status)
                 pay_type.push(item)
             })
 
@@ -124,8 +123,6 @@ const checkPayConfigList = () => {
                 sortableFn(item, index)
             })
         })
-    }).catch(() => {
-
     })
 }
 checkPayConfigList()
@@ -146,13 +143,13 @@ const configPayFn = (data:any) => {
 }
 
 // 开启支付方式
-const enablePaymentMode = async (data: object) => {
+const enablePaymentMode = async (data: any) => {
     if (payTypeRefs.value[data.key] && typeof payTypeRefs.value[data.key].enableVerify == 'function') {
         payTypeRefs.value[data.key].setFormData(data)
 
         const verify = payTypeRefs.value[data.key].enableVerify()
         if (!verify) {
-            data.status = false
+            data.status = 0
             ElMessage(t('configurePaymentMethod'))
             return false
         }
@@ -195,11 +192,10 @@ const sortableFn = (item, index) => {
 // 保存
 const saveFn = () => {
     payLoading.value = true
-    const data = JSON.parse(JSON.stringify(payConfigData.value))
+    const data = cloneDeep(payConfigData.value)
     Object.values(data).forEach((item, index) => {
         item.pay_type.forEach((subItem:any, subIndex:any) => {
             subItem.sort = subIndex
-            subItem.status = Number(subItem.status)
         })
     })
 
diff --git a/admin/src/app/views/setting/storage.vue b/admin/src/app/views/setting/storage.vue
index 7861bb01c..2067f88de 100644
--- a/admin/src/app/views/setting/storage.vue
+++ b/admin/src/app/views/setting/storage.vue
@@ -18,7 +18,6 @@
                         <template #default="{ row }">
                             <el-tag class="ml-2" type="success" v-if="row.is_use == 1">{{ t('statusNormal') }}</el-tag>
                             <el-tag class="ml-2" type="error" v-if="row.is_use == 0">{{t('statusDeactivate') }}</el-tag>
-
                         </template>
                     </el-table-column>
 
diff --git a/admin/src/app/views/setting/system.vue b/admin/src/app/views/setting/system.vue
index 67e89922a..9db81f97d 100644
--- a/admin/src/app/views/setting/system.vue
+++ b/admin/src/app/views/setting/system.vue
@@ -33,6 +33,9 @@
                 <el-form-item :label="t('frontEndName')">
                     <el-input v-model="formData.front_end_name" :placeholder="t('frontEndNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
                 </el-form-item>
+                <el-form-item :label="t('phone')">
+                    <el-input v-model="formData.phone" :placeholder="t('phonePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
+                </el-form-item>
                 <el-form-item :label="t('logo')">
                     <upload-image v-model="formData.front_end_logo" />
                 </el-form-item>
@@ -101,7 +104,7 @@ const formData = reactive<Record<string, string>>({
     tel: ''
 })
 
-const setFormData = async (id: number = 0) => {
+const setFormData = async () => {
     const data = await (await getWebsite()).data
     Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key]
diff --git a/admin/src/app/views/setting/transfer.vue b/admin/src/app/views/setting/transfer.vue
index e4cd2c049..15edf6bd4 100644
--- a/admin/src/app/views/setting/transfer.vue
+++ b/admin/src/app/views/setting/transfer.vue
@@ -78,7 +78,6 @@
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { getTransferInfo, setTransferInfo } from '@/app/api/sys'
-// import { useClipboard } from '@vueuse/core'
 import { FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
 
diff --git a/admin/src/app/views/setting/wxoplatform.vue b/admin/src/app/views/setting/wxoplatform.vue
deleted file mode 100644
index 542c87e79..000000000
--- a/admin/src/app/views/setting/wxoplatform.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-	<div class="main-container">
-		<div class="flex ml-[18px] justify-between items-center mt-[20px]">
-			<span class="text-page-title">{{ pageName }}</span>
-		</div>
-		<el-form :model="formData" label-width="150px" ref="formRef" class="page-form" v-loading="loading">
-			<el-card class="box-card !border-none mt-[5px]" shadow="never">
-				<h3 class="panel-title !text-sm">{{ 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 !text-sm">{{ 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 !text-sm">{{ 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 '@/app/api/sys'
-import { FormInstance, FormRules } from 'element-plus'
-import { useRoute } from 'vue-router'
-
-const route = useRoute()
-const pageName = route.meta.title
-
-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/app/views/tools/addon/edit.vue b/admin/src/app/views/tools/addon/edit.vue
index e206f211d..c7c82f52e 100644
--- a/admin/src/app/views/tools/addon/edit.vue
+++ b/admin/src/app/views/tools/addon/edit.vue
@@ -8,7 +8,7 @@
         <el-card class="box-card mt-[15px] !border-none" shadow="never">
             <el-form :model="form" label-width="90px" ref="formRef" :rules="rules" class="page-form">
                 <el-form-item :label="t('title')" prop="title">
-                    <el-input v-model="form.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
+                    <el-input v-model.trim="form.title" clearable :placeholder="t('titlePlaceholder')" class="input-width" />
                 </el-form-item>
                 <el-form-item :label="t('icon')" prop="icon">
                     <div>
@@ -31,7 +31,7 @@
                     <el-input type="textarea" v-model="form.desc" clearable :placeholder="t('descPlaceholder')" class="input-width" />
                 </el-form-item>
                 <el-form-item :label="t('author')" prop="author">
-                    <el-input v-model="form.author" clearable :placeholder="t('authorPlaceholder')" class="input-width" />
+                    <el-input v-model.trim="form.author" clearable :placeholder="t('authorPlaceholder')" class="input-width" />
                 </el-form-item>
                 <el-form-item :label="t('version')" prop="version">
                     <div>
@@ -132,7 +132,7 @@ const validVersion = (rule:any, value:any, callback:any) => {
         if (!reg.test(value)) {
             return callback(new Error(t('versionPlaceholderErr')))
         } else {
-            return callback() // *验证成功的地方必须callback()
+            return callback() // 验证成功的地方必须callback()
         }
     } else {
         return callback(new Error(t('versionPlaceholder')))
@@ -190,7 +190,7 @@ const getAddonDevelopInfoFn = (key: any) => {
 // 获取app列表
 const AppLst = ref<Array<any>>([])
 const getAddonListFn = async () => {
-    const { data } = await getAddonList({})
+    const { data } = await getAddonList()
     AppLst.value = data
 }
 getAddonListFn()
diff --git a/admin/src/app/views/tools/code/components/edit-associated.vue b/admin/src/app/views/tools/code/components/edit-associated.vue
index f036304cb..9810506f8 100644
--- a/admin/src/app/views/tools/code/components/edit-associated.vue
+++ b/admin/src/app/views/tools/code/components/edit-associated.vue
@@ -8,11 +8,11 @@
                 </el-select>
             </el-form-item>
             <el-form-item :label="t('associatedName')" prop="name">
-                <el-input v-model="formData.name" :placeholder="t('associatedNamePlaceholder')" class="input-width" />
+                <el-input v-model.trim="formData.name" :placeholder="t('associatedNamePlaceholder')" class="input-width" />
             </el-form-item>
             <el-form-item :label="t('addons')" prop="addon">
                 <el-select v-model="formData.addon" :placeholder="t('addonsPlaceholder')" class="input-width" @change="addonChange">
-                    <el-option v-for="(item, index) in addonLst" :label="item.title" :value="item.key" :key="index" />
+                    <el-option v-for="(item, index) in addonList" :label="item.title" :value="item.key" :key="index" />
                 </el-select>
             </el-form-item>
             <el-form-item :label="t('associatedModel')" prop="model">
@@ -26,7 +26,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item :label="t('foreignKey')" prop="foreign_key">
-                <el-input v-model="formData.foreign_key" :placeholder="t('foreignKeyPlaceholder')" class="input-width" />
+                <el-input v-model.trim="formData.foreign_key" :placeholder="t('foreignKeyPlaceholder')" class="input-width" />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -112,11 +112,11 @@ const getGeneratorTableColumnFn = (key: any) => {
     })
 }
 // 获取插件列表
-const addonLst = ref<Array<any>>([])
+const addonList = ref<Array<any>>([])
 const getAddonDevelopFn = async () => {
     const { data } = await getAddonDevelop({})
-    addonLst.value = [{ title: '系统', key: 'system' }]
-    addonLst.value.push(...data)
+    addonList.value = [{ title: '系统', key: 'system' }]
+    addonList.value.push(...data)
     getGeneratorAllModelFn({ addon: 'system' })
 }
 getAddonDevelopFn()
diff --git a/admin/src/app/views/tools/code/components/edit-view-type.vue b/admin/src/app/views/tools/code/components/edit-view-type.vue
index 6e0fe4a8c..730117dec 100644
--- a/admin/src/app/views/tools/code/components/edit-view-type.vue
+++ b/admin/src/app/views/tools/code/components/edit-view-type.vue
@@ -16,7 +16,7 @@
                
             <el-form-item :label="t('addons')" prop="addon" v-if="formData.select_type == 2">
                 <el-select v-model="formData.addon" :placeholder="t('addonsPlaceholder')" class="input-width" @change="addonChange">
-                    <el-option v-for="(item, index) in addonLst" :label="item.title" :value="item.key" :key="index" />
+                    <el-option v-for="(item, index) in addonList" :label="item.title" :value="item.key" :key="index" />
                 </el-select>
             </el-form-item>
 
@@ -53,7 +53,7 @@ import { t } from '@/lang'
 import { getDictAll } from '@/app/api/dict'
 import type { FormInstance } from 'element-plus'
 import { cloneDeep } from 'lodash-es'
-import { getGeneratorAllModel, getGeneratorTableColumn,getAddonDevelop,getGeneratorModelTableColumn } from '@/app/api/tools'
+import { getGeneratorAllModel, getAddonDevelop,getGeneratorModelTableColumn } from '@/app/api/tools'
 
 const showDialog = ref(false)
 const title = ref('')
@@ -84,11 +84,11 @@ const getGeneratorAllModelFn = (params:any) => {
 }
 
 //获取插件列表
-const addonLst = ref<Array<any>>([])
+const addonList = ref<Array<any>>([])
 const getAddonDevelopFn = async () => {
     let { data } = await getAddonDevelop({})
-    addonLst.value = [{ title: "系统", key: "system" }]
-    addonLst.value.push(...data)
+    addonList.value = [{ title: "系统", key: "system" }]
+    addonList.value.push(...data)
     getGeneratorAllModelFn({addon:'system'})
 }
 getAddonDevelopFn()
diff --git a/admin/src/app/views/tools/code/edit.vue b/admin/src/app/views/tools/code/edit.vue
index fd7d87f96..be399cc6d 100644
--- a/admin/src/app/views/tools/code/edit.vue
+++ b/admin/src/app/views/tools/code/edit.vue
@@ -10,10 +10,10 @@
                 <el-tab-pane :label="t('basicSettings')" name="basicSettings">
                     <el-form :model="formData" label-width="70px" class="page-form">
                         <el-form-item :label="t('tableName')">
-                            <el-input v-model="formData.table_name" disabled :placeholder="t('tableNamePlaceholder')" class="input-width" maxlength="64" />
+                            <el-input v-model.trim="formData.table_name" disabled :placeholder="t('tableNamePlaceholder')" class="input-width" maxlength="64" />
                         </el-form-item>
                         <el-form-item :label="t('tableContent')">
-                            <el-input v-model="formData.table_content" clearable :placeholder="t('tableContentPlaceholder')" class="input-width" maxlength="64" />
+                            <el-input v-model.trim="formData.table_content" clearable :placeholder="t('tableContentPlaceholder')" class="input-width" maxlength="64" />
                         </el-form-item>
                         <el-form-item :label="t('addon')">
                             <el-select class="input-width" :placeholder="t('addonPlaceholder1')" v-model="formData.addon_name" filterable remote clearable :remote-method="getAddonDevelopFn" @change="addonChange">
@@ -22,7 +22,7 @@
                         </el-form-item>
                         <el-form-item :label="t('moduleName')">
                             <div>
-                                <el-input v-model="formData.module_name" clearable :placeholder="t('moduleNamePlaceholder')" class="input-width" />
+                                <el-input v-model.trim="formData.module_name" clearable :placeholder="t('moduleNamePlaceholder')" class="input-width" />
                                 <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">生成代码所属功能模块，对应路由名称，例如会员模块，充值模块，订单模块等</p>
                                 <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">命名规范，小写，多个单词使用下划线连接,例如: member，article_category</p>
                             </div>
@@ -30,7 +30,7 @@
                         </el-form-item>
                         <el-form-item :label="t('className')">
                             <div>
-                                <el-input v-model="formData.class_name" clearable :placeholder="t('classNamePlaceholder')" class="input-width" />
+                                <el-input v-model.trim="formData.class_name" clearable :placeholder="t('classNamePlaceholder')" class="input-width" />
                                 <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">生成代码所属文件名称，controller，model，service，等类型文件名</p>
                                 <p class="text-[12px] text-[#a9a9a9] leading-normal mt-[5px]">命名规范，小写，多个单词使用下划线连接,例如: article_category</p>
                             </div>
@@ -47,7 +47,7 @@
                         <el-table-column :label="t('columnName')" prop="column_name" min-width="130px" />
                         <el-table-column :label="t('columnComment')" prop="" min-width="220px">
                             <template #default="{ row }">
-                                <el-input v-model="row.column_comment" :placeholder="t('columnCommentPlaceholder')" />
+                                <el-input v-model.trim="row.column_comment" :placeholder="t('columnCommentPlaceholder')" />
                             </template>
                         </el-table-column>
                         <el-table-column :label="t('columnType')" prop="column_type" width="100px" />
@@ -514,10 +514,6 @@ const onSave = async (code: number) => {
             generateCreateFn(code)
         } else {
             loading.value = false
-            ElMessage({
-                type: 'success',
-                message: '操作成功'
-            })
             setTimeout(() => {
                 window.codeActiveName = 'codeList'
                 back()
diff --git a/admin/src/app/views/tools/code/index.vue b/admin/src/app/views/tools/code/index.vue
index 12924f694..6f1d2c499 100644
--- a/admin/src/app/views/tools/code/index.vue
+++ b/admin/src/app/views/tools/code/index.vue
@@ -77,7 +77,7 @@
                     <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('addonName')" prop="addon_name">
-                                <el-select v-model="codeTableData.searchParam.addon_name" placeholder="Select" filterable remote clearable :remote-method="getAddonDevelopFn">
+                                <el-select v-model="codeTableData.searchParam.addon_name" placeholder="全部" filterable remote clearable :remote-method="getAddonDevelopFn">
                                     <el-option label="全部" value="" />
                                     <el-option label="系统" value="2" />
                                     <el-option :label="item.title" :value="item.key" v-for="item in addonList" :key="item.key" />
@@ -281,20 +281,19 @@ const editEvent = (data: any) => {
  * 同步校验
  */
 const generatorCheckFileFn = ((id: any) => {
-    generatorCheckFile({ id }).then((res:any) => {
+    generatorCheckFile({ id }).then((res: any) => {
         codeTableData.loading = false
         ElMessageBox.confirm(
-            res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
-            t('warning'),
-            {
-                confirmButtonText: t('confirm'),
-                cancelButtonText: t('cancel')
-            }
-        )
-            .then(() => {
-                generateCreateFn(id, 3)
-            })
-            .catch(() => { })
+                res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
+                t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel')
+                }
+        ).then(() => {
+            generateCreateFn(id, 3)
+        }).catch(() => {
+        })
     }).catch(() => {
         codeTableData.loading = false
     })
diff --git a/admin/src/app/views/tools/detection.vue b/admin/src/app/views/tools/detection.vue
index bf5b693d9..aa2d6d872 100644
--- a/admin/src/app/views/tools/detection.vue
+++ b/admin/src/app/views/tools/detection.vue
@@ -81,7 +81,7 @@ const route = useRoute()
 const pageName = route.meta.title
 
 const systemService = ref({})
-let loading = ref(true);
+const loading = ref(true);
 const getSystemService = () => {
     getSystem().then(res => {
         systemService.value = res.data
diff --git a/admin/src/app/views/tools/form.vue b/admin/src/app/views/tools/form.vue
deleted file mode 100644
index 52d946561..000000000
--- a/admin/src/app/views/tools/form.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-    <div class="main-container">
-        <el-card class="box-card !border-none" shadow="never">
-            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
-                <el-form-item label="文本" prop="text">
-                    <el-input v-model="formData.text" placeholder="请输入用户名" clearable class="input-width" />
-                    <div class="form-tip">管理员账号登录时使用</div>
-                </el-form-item>
-                <el-form-item label="单选" prop="radio">
-                    <el-radio-group v-model="formData.radio">
-                        <el-radio :label="1">男</el-radio>
-                        <el-radio :label="0">女</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="图片上传" prop="img">
-                    <upload-image v-model="formData.img" :limit="1" />
-                </el-form-item>
-                <el-form-item label="视频上传" prop="video">
-                    <upload-video v-model="formData.video" :limit="1" />
-                </el-form-item>
-                <el-form-item label="文件上传" prop="video">
-                    <div class="input-width">
-                        <upload-file v-model="formData.file" />
-                    </div>
-                </el-form-item>
-                <el-form-item label="文本域" prop="textarea">
-                    <el-input v-model="formData.textarea" type="textarea" rows="5" class="input-width" />
-                </el-form-item>
-                <el-form-item label="下拉选择" prop="select">
-                    <el-select v-model="formData.select" placeholder="请选择角色" class="input-width">
-                        <el-option label="管理员" value="shanghai" />
-                        <el-option label="收银员" value="beijing" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="日期选择" prop="date">
-                    <div class="input-width">
-                        <el-date-picker v-model="formData.date" type="date" placeholder="Pick a date" />
-                    </div>
-                </el-form-item>
-                <el-form-item label="日期区间" prop="date_range">
-                    <div class="input-width">
-                        <el-date-picker v-model="formData.date_range" type="daterange" placeholder="Pick a date" />
-                    </div>
-                </el-form-item>
-                <el-form-item label="富文本" prop="editor">
-                    <editor v-model="formData.editor" />
-                </el-form-item>
-
-                <el-form-item label="排序" prop="editor">
-                    <el-input-number v-model="formData.sort" :min="0" />
-                </el-form-item>
-
-                <el-form-item label="">
-                    <el-button type="primary" :loading="loading" @click="onSave(formRef)">保存</el-button>
-                    <el-button>返回</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-
-        <div class="fixed-footer-wrap">
-            <div class="fixed-footer">
-                <el-button type="primary">{{ t('save') }}</el-button>
-                <el-button>{{ t('cancel') }}</el-button>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-    text: '',
-    radio: 1,
-    textarea: '',
-    img: '',
-    video: '',
-    file: '',
-    select: '',
-    date: '',
-    editor: '',
-    date_range: '',
-    sort: 0
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-    return {
-        // username: [
-        //     { required: formData.uid == 0, message: t('accountNumberPlaceholder'), trigger: 'blur' }
-        // ],
-        // password: [
-        //     { required: true, message: t('passwordPlaceholder'), trigger: 'blur' }
-        // ],
-        // confirm_password: [
-        //     { required: true, message: t('confirmPasswordPlaceholder'), trigger: 'blur' },
-        //     {
-        //         validator: (rule: any, value: string, callback: any) => {
-        //             if (value != formData.password) callback(new Error(t('confirmPasswordError')))
-        //             else callback()
-        //         },
-        //         trigger: 'blur'
-        //     }
-        // ]
-    }
-})
-
-const onSave = async (formEl: FormInstance | undefined) => {
-    if (loading.value || !formEl) return
-    await formEl.validate(async (valid) => {
-        if (valid) {
-            // loading.value = true
-
-            const data = formData
-            console.log(data)
-
-            // save(data).then(res => {
-            //     loading.value = false
-            //     showDialog.value = false
-            //     emit('complete')
-            // }).catch(err => {
-            //     loading.value = false
-            //     showDialog.value = false
-            // })
-        }
-    })
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/admin/src/components/diy-link/index.vue b/admin/src/components/diy-link/index.vue
index d34a116e9..dc69f3173 100644
--- a/admin/src/components/diy-link/index.vue
+++ b/admin/src/components/diy-link/index.vue
@@ -16,7 +16,7 @@
                 </el-input>
             </slot>
         </div>
-        <el-dialog v-model="showDialog" :title="t('selectLinkTips')" width="40%" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+        <el-dialog v-model="showDialog" :title="t('selectLinkTips')" width="40%" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false" @close="cancel">
 
             <div class="flex items-start">
                 <el-scrollbar class="w-[140px] border-r h-[350px]">
@@ -44,7 +44,7 @@
                                 <div class="text-sm text-gray-400 select-text">路径必须以“/”开头，例：/app/pages/index/index</div>
                             </el-form-item>
                             <el-form-item label=" ">
-                                <div class="text-sm text-gray-400 select-text">跳转外部链接“/”开头，例：https://baidu.com</div>
+                                <div class="text-sm text-gray-400 select-text">跳转外部链接“http”或“https”开头，例：https://baidu.com</div>
                             </el-form-item>
                         </template>
                         <template v-if="parentLinkName == 'DIY_JUMP_OTHER_APPLET'">
@@ -88,7 +88,7 @@
 
             <template #footer>
                 <span class="dialog-footer">
-                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button @click="cancel">{{ t('cancel') }}</el-button>
                     <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
                 </span>
             </template>
@@ -114,7 +114,7 @@ const prop = defineProps({
     }
 })
 
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'confirm','success'])
 
 const value: any = computed({
     get () {
@@ -127,6 +127,8 @@ const value: any = computed({
 
 const showDialog = ref(false)
 
+const isDrag = ref(false)
+
 const link: any = ref([])
 
 const parentLinkName = ref('')
@@ -136,19 +138,20 @@ const childList: any = ref([])
 const selectLink: any = ref([])
 
 const show = () => {
-    getLinkFn(()=>{
-
+    getLinkFn(() => {
         // 每次打开时赋值
         if (value.value.name != '') {
             selectLink.value = cloneDeep(value.value)
             parentLinkName.value = selectLink.value.parent
-            for (let key in link.value){
-                if(link.value[key].name == parentLinkName.value){
-                    changeParentLink(link.value[key]);
+            for (let key in link.value) {
+                if (link.value[key].name == parentLinkName.value) {
+                    changeParentLink(link.value[key])
                 }
             }
         }
         showDialog.value = true
+        isDrag.value = true
+        emit('confirm', isDrag.value)
     })
 }
 
@@ -165,6 +168,7 @@ const getLinkFn = (callback:any=null)=> {
                 }
             }
         }
+        console.log('link',link.value)
 
         childList.value = Object.values(link.value)[0].child_list
         if (value.value.name != '') {
@@ -287,10 +291,16 @@ const save = () => {
 
     value.value = cloneDeep(selectLink.value)
     showDialog.value = false
-
+    isDrag.value = false
+    emit('confirm', isDrag.value)
     emit('success')
 }
 
+const cancel = () => {
+    showDialog.value = false
+    isDrag.value = false
+    emit('confirm', isDrag.value)
+}
 defineExpose({
     showDialog
 })
diff --git a/admin/src/components/export-sure/index.vue b/admin/src/components/export-sure/index.vue
index 03c4fb89f..e8ce70c8c 100644
--- a/admin/src/components/export-sure/index.vue
+++ b/admin/src/components/export-sure/index.vue
@@ -4,7 +4,7 @@
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="close">{{ t('cancel') }}</el-button>
-                <el-button type="primary" @click="detectionExportFn">{{ t('exportConfirm') }}</el-button>
+                <el-button type="primary" @click="detectionExportFn" :loading="loading">{{ t('exportConfirm') }}</el-button>
             </span>
         </template>
     </el-dialog>
@@ -34,6 +34,7 @@ const prop = defineProps({
     }
 })
 
+const loading = ref(false)
 
 const status = computed({
     get() {
@@ -51,12 +52,14 @@ const router = useRouter()
  * 导出报表并跳转到下载页
  */
 const detectionExportFn = () => {
+	loading.value = true
     const url = router.resolve({
         path: '/admin/setting/export'
     })
     exportDataCheck(prop.type, { page: 1, limit: 1, ...prop.searchParam }).then((res: any) => {
         if (res.data) {
             exportData(prop.type, prop.searchParam).then(() => {
+				loading.value = false
                 emit('close', false)
                 setTimeout(() => {
                     window.open(url.href)
diff --git a/admin/src/components/heat-map/index.vue b/admin/src/components/heat-map/index.vue
index 645b36a56..919d198d4 100644
--- a/admin/src/components/heat-map/index.vue
+++ b/admin/src/components/heat-map/index.vue
@@ -96,7 +96,7 @@ const dragBoxArr: any = reactive([])
 const imgRatio = ref(1); // 图片比例
 
 // 热区尺寸
-const areaRadio = ref(0.25) // 占位她比例
+const areaRadio = ref(0.25) // 占位图比例
 const areaWidth = ref(100)
 const areaHeight = ref(100)
 const areaNum = ref(4); // 每行显示的数量
diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue
index 2a5f0bb93..dbdf9b657 100644
--- a/admin/src/components/upload-attachment/attachment.vue
+++ b/admin/src/components/upload-attachment/attachment.vue
@@ -390,7 +390,10 @@ watch(selectAll, () => {
     if (selectAll.value) {
         const keys = Object.keys(toRaw(selectedFile))
         attachment.data.forEach((item: Record<string, any>) => {
-            if (!keys.includes(item.att_id)) selectedFile[item.att_id] = toRaw(item)
+            if (!keys.includes(item.att_id)) {
+                selectedFile[item.att_id] = toRaw(item)
+                selectedFileIndex.push(item.att_id)
+            }
         })
     } else {
         clearSelected()
@@ -405,6 +408,7 @@ const clearSelected = () => {
     if (keys.length) {
         keys.forEach((key) => {
             delete selectedFile[key]
+            selectedFileIndex.splice(selectedFileIndex.indexOf(key), 1)
         })
         selectAll.value = false
     }
diff --git a/admin/src/components/upload-file/index.vue b/admin/src/components/upload-file/index.vue
index eb44c2f95..c05190cf3 100644
--- a/admin/src/components/upload-file/index.vue
+++ b/admin/src/components/upload-file/index.vue
@@ -41,7 +41,7 @@ const upload: Record<string, any> = {
     action: `${import.meta.env.VITE_APP_BASE_URL}/${prop.api}`,
     showFileList: false,
     headers: {},
-    accept: '.doc,.docx,.xml,.txt,.pem,.zip,.rar,.7z,.crt,.key',
+    accept: '.doc,.docx,.xml,.txt,.pem,.zip,.rar,.7z,.crt,.key,.xls,.xlsx',
     onSuccess: (response: any, uploadFile: UploadFile) => {
         if (response.code != undefined && response.code != 1) {
             ElMessage({ message: response.msg, type: 'error' })
diff --git a/admin/src/components/upload-image/index.vue b/admin/src/components/upload-image/index.vue
index 609e6d6e4..b6dc43b44 100644
--- a/admin/src/components/upload-image/index.vue
+++ b/admin/src/components/upload-image/index.vue
@@ -4,11 +4,11 @@
             <div class="rounded cursor-pointer overflow-hidden relative border border-solid border-color image-wrap mr-[10px]" :class="{'rounded-full': type=='avatar'}" :style="style">
                 <div class="w-full h-full relative" v-if="images.data.length">
                     <div class="w-full h-full flex items-center justify-center">
-                        <el-image :src="images.data[0].indexOf('data:image') != -1 ? images.data[0] : img(images.data[0])" :fit=" type=='avatar'?'none':'contain'"></el-image>
+                        <el-image class="w-full h-full" :src="images.data[0].indexOf('data:image') != -1 ? images.data[0] : img(images.data[0])" :fit="imageFit"></el-image>
                     </div>
                     <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60 operation">
                         <icon name="element ZoomIn" color="#fff" size="18px" class="mr-[10px]" @click="previewImage()" />
-                        <icon name="element Delete" color="#fff" size="18px" @click="removeImage" />
+                        <icon name="element Delete" color="#fff" size="18px" @click.stop="removeImage" />
                     </div>
                 </div>
                 <upload-attachment :limit="limit" @confirm="confirmSelect" v-else>
@@ -58,6 +58,10 @@ const prop = defineProps({
         type: String,
         default: 'image'
     },
+    imageFit : {
+        type: String,
+        default: 'contain'
+    },
     modelValue: {
         type: String,
         default: ''
@@ -119,7 +123,7 @@ const style = computed(() => {
         width: prop.width,
         height: prop.height
     }
-})
+}) 
 
 /**
  * 选择图片
@@ -137,7 +141,10 @@ const confirmSelect = (data: Record<string, any>) => {
         })
     }
     setValue()
-    emit('change', value.value)
+     
+    nextTick(() => {
+        emit('change', value.value)
+    })
 }
 
 /**
@@ -170,7 +177,9 @@ onMounted(()=>{
         rowDrop()
     })
 })
+
 const activeRows = ref<any[]>([])
+
 // 拖拽排序
 const rowDrop = () => {
     if (prop.limit == 1) return;
diff --git a/admin/src/components/upload-video/index.vue b/admin/src/components/upload-video/index.vue
index 95134e2df..02e6e0df4 100644
--- a/admin/src/components/upload-video/index.vue
+++ b/admin/src/components/upload-video/index.vue
@@ -87,6 +87,10 @@ const videos: Record<string, any> = reactive({
     data: []
 })
 
+const setValue = () => {
+	value.value = toRaw(videos.data).toString()
+}
+
 watch(() => value.value, () => {
     videos.data = [
         ...value.value.split(',').filter((item: string) => {
@@ -94,7 +98,7 @@ watch(() => value.value, () => {
         })
     ]
     setValue()
-})
+}, { immediate: true })
 
 const style = computed(() => {
     return {
@@ -104,8 +108,8 @@ const style = computed(() => {
 })
 
 /**
-     * 选择视频
-     */
+ * 选择视频
+ */
 const confirmSelect = (data: Record<string, any>) => {
     if (prop.limit == 1) {
         videos.data.splice(0, 1)
@@ -127,10 +131,6 @@ const removeVideo = (index: number = 0) => {
     setValue()
 }
 
-const setValue = () => {
-    value.value = toRaw(videos.data).toString()
-}
-
 /**
  * 查看视频
  */
diff --git a/admin/src/components/verifition/Verify.vue b/admin/src/components/verifition/Verify.vue
index eab10941c..f37ca196e 100644
--- a/admin/src/components/verifition/Verify.vue
+++ b/admin/src/components/verifition/Verify.vue
@@ -1,430 +1,441 @@
 <template>
-<div :class="mode=='pop'?'mask':''"  v-show="showBox">
-    <div :class="mode=='pop'?'verifybox':''" :style="{'max-width':parseInt(imgSize.width)+30+'px'}">
-        <div class="verifybox-top"  v-if="mode=='pop'">
-            请完成安全验证
-            <span class="verifybox-close" @click="closeBox">
+	<div :class="mode=='pop'?'mask':''" v-show="showBox">
+		<div :class="mode=='pop'?'verifybox':''" :style="{'max-width':parseInt(imgSize.width)+30+'px'}">
+			<div class="verifybox-top" v-if="mode=='pop'">
+				请完成安全验证
+				<span class="verifybox-close" @click="closeBox">
                 <i class="iconfont icon-close"></i>
             </span>
-        </div>
-        <div class="verifybox-bottom" :style="{padding:mode=='pop'?'15px':'0'}">
-            <!-- 验证码容器 -->
-            <component v-if="componentType"
-                        :is="componentType"
-                        :captchaType="captchaType"
-                        :type="verifyType"
-                        :figure="figure"
-                        :arith="arith"
-                        :mode="mode"
-                        :vSpace="vSpace"
-                        :explain="explain"
-                        :imgSize="imgSize"
-                        :blockSize="blockSize"
-                        :barSize="barSize"
-                        ref="instance"></component>
-        </div>
-    </div>
-</div>
+			</div>
+			<div class="verifybox-bottom" :style="{padding:mode=='pop'?'15px':'0'}">
+				<!-- 验证码容器 -->
+				<component v-if="componentType"
+				           :is="componentType"
+				           :captchaType="captchaType"
+				           :type="verifyType"
+				           :figure="figure"
+				           :arith="arith"
+				           :mode="mode"
+				           :vSpace="vSpace"
+				           :explain="explain"
+				           :imgSize="imgSize"
+				           :blockSize="blockSize"
+				           :barSize="barSize"
+				           ref="instance"></component>
+			</div>
+		</div>
+	</div>
 </template>
 <script type="text/babel">
-/**
- * Verify 验证码组件
- * @description 分发验证码使用
- * */
-import VerifySlide from './Verify/VerifySlide.vue'
-import VerifyPoints from './Verify/VerifyPoints.vue'
-import { computed, ref, toRefs, watchEffect } from 'vue'
+    /**
+     * Verify 验证码组件
+     * @description 分发验证码使用
+     * */
+    import VerifySlide from './Verify/VerifySlide.vue'
+    import VerifyPoints from './Verify/VerifyPoints.vue'
+    import { computed, ref, toRefs, watchEffect } from 'vue'
 
-export default {
-    name: 'Vue2Verify',
-    components: {
-        VerifySlide,
-        VerifyPoints
-    },
-    props: {
-        captchaType: {
-            type: String,
-            required: true
+    export default {
+        name: 'Vue2Verify',
+        components: {
+            VerifySlide,
+            VerifyPoints
         },
-        figure: {
-            type: Number
+        props: {
+            captchaType: {
+                type: String,
+                required: true
+            },
+            figure: {
+                type: Number
+            },
+            arith: {
+                type: Number
+            },
+            mode: {
+                type: String,
+                default: 'pop'
+            },
+            vSpace: {
+                type: Number
+            },
+            explain: {
+                type: String
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
+                    }
+                }
+            },
+            blockSize: {
+                type: Object
+            },
+            barSize: {
+                type: Object
+            }
         },
-        arith: {
-            type: Number
-        },
-        mode: {
-            type: String,
-            default: 'pop'
-        },
-        vSpace: {
-            type: Number
-        },
-        explain: {
-            type: String
-        },
-        imgSize: {
-            type: Object,
-            default () {
-                return {
-                    width: '310px',
-                    height: '155px'
+        setup(props) {
+            const { captchaType, figure, arith, mode, vSpace, explain, imgSize, blockSize, barSize } = toRefs(props)
+            const clickShow = ref(false)
+            const verifyType = ref(undefined)
+            const componentType = ref(undefined)
+            const instance = ref({})
+
+            const showBox = computed(() => {
+                if (mode.value == 'pop') {
+                    return clickShow.value
+                } else {
+                    return true
+                }
+            })
+            /**
+             * refresh
+             * @description 刷新
+             * */
+            const refresh = () => {
+                if (instance.value.refresh) {
+                    instance.value.refresh()
                 }
             }
-        },
-        blockSize: {
-            type: Object
-        },
-        barSize: {
-            type: Object
-        }
-    },
-    setup (props) {
-        const { captchaType,figure, arith, mode, vSpace, explain, imgSize, blockSize, barSize } = toRefs(props)
-        const clickShow = ref(false)
-        const verifyType = ref(undefined)
-        const componentType = ref(undefined)
-        const instance = ref({})
+            const closeBox = () => {
+                clickShow.value = false
+                refresh()
+            }
+            const show = () => {
+                if (mode.value == 'pop') {
+                    clickShow.value = true
+                }
+            }
+            watchEffect(() => {
+                switch (captchaType.value) {
+                    case 'blockPuzzle':
+                        verifyType.value = '2'
+                        componentType.value = 'VerifySlide'
+                        break
+                    case 'clickWord':
+                        verifyType.value = ''
+                        componentType.value = 'VerifyPoints'
+                        break
+                }
+            })
 
-        const showBox = computed(() => {
-            if (mode.value == 'pop') {
-                return clickShow.value
-            } else {
-                return true
+            return {
+                clickShow,
+                verifyType,
+                componentType,
+                instance,
+                showBox,
+                closeBox,
+                show
             }
-        })
-        /**
-         * refresh
-         * @description 刷新
-         * */
-        const refresh = () => {
-            if (instance.value.refresh) {
-                instance.value.refresh()
-            }
-        }
-        const closeBox = () => {
-            clickShow.value = false
-            refresh()
-        }
-        const show = () => {
-            if (mode.value == 'pop') {
-                clickShow.value = true
-            }
-        }
-        watchEffect(() => {
-            switch (captchaType.value) {
-                case 'blockPuzzle':
-                    verifyType.value = '2'
-                    componentType.value = 'VerifySlide'
-                    break
-                case 'clickWord':
-                    verifyType.value = ''
-                    componentType.value = 'VerifyPoints'
-                    break
-            }
-        })
-
-        return {
-            clickShow,
-            verifyType,
-            componentType,
-            instance,
-            showBox,
-            closeBox,
-            show
         }
     }
-}
 </script>
 <style>
-    .verifybox{
-        position: relative;
-        box-sizing: border-box;
-        border-radius: 2px;
-        border: 1px solid #e4e7eb;
-        background-color: #fff;
-        box-shadow: 0 0 10px rgba(0,0,0,.3);
-        left: 50%;
-        top:50%;
-        transform: translate(-50%,-50%);
-    }
-    .verifybox-top{
-        padding: 0 15px;
-        height: 50px;
-        line-height: 50px;
-        text-align: left;
-        font-size: 16px;
-        color: #45494c;
-        border-bottom: 1px solid #e4e7eb;
-        box-sizing: border-box;
-    }
-    .verifybox-bottom{
-        padding: 15px;
-        box-sizing: border-box;
-    }
-    .verifybox-close{
-        position: absolute;
-        top: 13px;
-        right: 9px;
-        width: 24px;
-        height: 24px;
-        text-align: center;
-        cursor: pointer;
-    }
-    .mask{
-        position: fixed;
-        top: 0;
-        left:0;
-        z-index: 1001;
-        width: 100%;
-        height: 100vh;
-        background: rgba(0,0,0,.3);
-        /* display: none; */
-        transition: all .5s;
-    }
-    .verify-tips{
-        position: absolute;
-        left: 0px;
-        bottom:0px;
-        width: 100%;
-        height: 30px;
-        line-height:30px;
-        color: #fff;
-    }
-    .suc-bg{
-       background-color:rgba(92, 184, 92,.5);
-       filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
-    }
-    .err-bg{
-       background-color:rgba(217, 83, 79,.5);
-       filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
-    }
-    .tips-enter,.tips-leave-to{
-        bottom: -30px;
-    }
-    .tips-enter-active,.tips-leave-active{
-        transition: bottom .5s;
-    }
-    /* ---------------------------- */
-    /*常规验证码*/
-    .verify-code {
-        font-size: 20px;
-        text-align: center;
-        cursor: pointer;
-        margin-bottom: 5px;
-        border: 1px solid #ddd;
-    }
+	.verifybox {
+		position: relative;
+		box-sizing: border-box;
+		border-radius: 2px;
+		border: 1px solid #e4e7eb;
+		background-color: #fff;
+		box-shadow: 0 0 10px rgba(0, 0, 0, .3);
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+	}
 
-    .cerify-code-panel {
-        height: 100%;
-        overflow: hidden;
-    }
+	.verifybox-top {
+		padding: 0 15px;
+		height: 50px;
+		line-height: 50px;
+		text-align: left;
+		font-size: 16px;
+		color: #45494c;
+		border-bottom: 1px solid #e4e7eb;
+		box-sizing: border-box;
+	}
 
-    .verify-code-area {
-        float: left;
-    }
+	.verifybox-bottom {
+		padding: 15px;
+		box-sizing: border-box;
+	}
 
-    .verify-input-area {
-        float: left;
-        width: 60%;
-        padding-right: 10px;
+	.verifybox-close {
+		position: absolute;
+		top: 13px;
+		right: 9px;
+		width: 24px;
+		height: 24px;
+		text-align: center;
+		cursor: pointer;
+	}
 
-    }
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1001;
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, .3);
+		/* display: none; */
+		transition: all .5s;
+	}
 
-    .verify-change-area {
-        line-height: 30px;
-        float: left;
-    }
+	.verify-tips {
+		position: absolute;
+		left: 0px;
+		bottom: 0px;
+		width: 100%;
+		height: 30px;
+		line-height: 30px;
+		color: #fff;
+	}
 
-    .varify-input-code {
-        display: inline-block;
-        width: 100%;
-        height: 25px;
-    }
+	.suc-bg {
+		background-color: rgba(92, 184, 92, .5);
+		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
+	}
 
-    .verify-change-code {
-        color: #337AB7;
-        cursor: pointer;
-    }
+	.err-bg {
+		background-color: rgba(217, 83, 79, .5);
+		filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
+	}
 
-    .verify-btn {
-        width: 200px;
-        height: 30px;
-        background-color: #337AB7;
-        color: #FFFFFF;
-        border: none;
-        margin-top: 10px;
-    }
-    /*滑动验证码*/
-    .verify-bar-area {
-        position: relative;
-        background: #FFFFFF;
-        text-align: center;
-        -webkit-box-sizing: content-box;
-        -moz-box-sizing: content-box;
-        box-sizing: content-box;
-        border: 1px solid #ddd;
-        -webkit-border-radius: 4px;
-    }
+	.tips-enter, .tips-leave-to {
+		bottom: -30px;
+	}
 
-    .verify-bar-area .verify-move-block {
-        position: absolute;
-        top: 0px;
-        left: 0;
-        background: #fff;
-        cursor: pointer;
-        -webkit-box-sizing: content-box;
-        -moz-box-sizing: content-box;
-        box-sizing: content-box;
-        box-shadow: 0 0 2px #888888;
-        -webkit-border-radius: 1px;
-    }
+	.tips-enter-active, .tips-leave-active {
+		transition: bottom .5s;
+	}
 
-    .verify-bar-area .verify-move-block:hover {
-        background-color: #337ab7;
-        color: #FFFFFF;
-    }
+	/* ---------------------------- */
+	/*常规验证码*/
+	.verify-code {
+		font-size: 20px;
+		text-align: center;
+		cursor: pointer;
+		margin-bottom: 5px;
+		border: 1px solid #ddd;
+	}
 
-    .verify-bar-area .verify-left-bar {
-        position: absolute;
-        top: -1px;
-        left: -1px;
-        background: #f0fff0;
-        cursor: pointer;
-        -webkit-box-sizing: content-box;
-        -moz-box-sizing: content-box;
-        box-sizing: content-box;
-        border: 1px solid #ddd;
-    }
+	.cerify-code-panel {
+		height: 100%;
+		overflow: hidden;
+	}
 
-    .verify-img-panel {
-        margin: 0;
-        -webkit-box-sizing: content-box;
-        -moz-box-sizing: content-box;
-        box-sizing: content-box;
-        border-top: 1px solid #ddd;
-        border-bottom: 1px solid #ddd;
-        border-radius: 3px;
-        position: relative;
-    }
+	.verify-code-area {
+		float: left;
+	}
 
-    .verify-img-panel .verify-refresh {
-        width: 25px;
-        height: 25px;
-        text-align: center;
-        padding: 5px;
-        cursor: pointer;
-        position: absolute;
-        top: 0;
-        right: 0;
-        z-index: 2;
-    }
+	.verify-input-area {
+		float: left;
+		width: 60%;
+		padding-right: 10px;
 
-    .verify-img-panel .icon-refresh {
-        font-size: 20px;
-        color: #fff;
-    }
+	}
 
-    .verify-img-panel .verify-gap {
-        background-color: #fff;
-        position: relative;
-        z-index: 2;
-        border: 1px solid #fff;
-    }
+	.verify-change-area {
+		line-height: 30px;
+		float: left;
+	}
 
-    .verify-bar-area .verify-move-block .verify-sub-block {
-        position: absolute;
-        text-align: center;
-        z-index: 3;
-        /* border: 1px solid #fff; */
-    }
+	.varify-input-code {
+		display: inline-block;
+		width: 100%;
+		height: 25px;
+	}
 
-    .verify-bar-area .verify-move-block .verify-icon {
-        font-size: 18px;
-    }
+	.verify-change-code {
+		color: #337AB7;
+		cursor: pointer;
+	}
 
-    .verify-bar-area .verify-msg {
-        z-index: 3;
-    }
+	.verify-btn {
+		width: 200px;
+		height: 30px;
+		background-color: #337AB7;
+		color: #FFFFFF;
+		border: none;
+		margin-top: 10px;
+	}
 
-    /*字体图标的css*/
-    /*@font-face {font-family: "iconfont";*/
-    /*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
-    /*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
-    /*url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),*/
-    /*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
-    /*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
-    /*}*/
+	/*滑动验证码*/
+	.verify-bar-area {
+		position: relative;
+		background: #FFFFFF;
+		text-align: center;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+		-webkit-border-radius: 4px;
+	}
 
-    .iconfont {
-        font-family: "iconfont" !important;
-        font-size: 16px;
-        font-style: normal;
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-    }
+	.verify-bar-area .verify-move-block {
+		position: absolute;
+		top: 0px;
+		left: 0;
+		background: #fff;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		box-shadow: 0 0 2px #888888;
+		-webkit-border-radius: 1px;
+	}
 
-    .icon-check:before {
-        content: " ";
-        display: block;
-        width: 16px;
-        height: 16px;
-        position: absolute;
-        margin: auto;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        z-index: 9999;
-        background-image: url("data:image/png;base64,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");
-        background-size: contain;
-    }
+	.verify-bar-area .verify-move-block:hover {
+		background-color: #337ab7;
+		color: #FFFFFF;
+	}
 
-    .icon-close:before {
-        content: " ";
-        display: block;
-        width: 16px;
-        height: 16px;
-        position: absolute;
-        margin: auto;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        z-index: 9999;
-        background-image: url("data:image/png;base64,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");
-        background-size: contain;
-    }
+	.verify-bar-area .verify-left-bar {
+		position: absolute;
+		top: -1px;
+		left: -1px;
+		background: #f0fff0;
+		cursor: pointer;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border: 1px solid #ddd;
+	}
 
-    .icon-right:before {
-        content: " ";
-        display: block;
-        width: 16px;
-        height: 16px;
-        position: absolute;
-        margin: auto;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        background-size: cover;
-        z-index: 9999;
-        background-image: url("data:image/png;base64,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");
-        background-size: contain;
-    }
+	.verify-img-panel {
+		margin: 0;
+		-webkit-box-sizing: content-box;
+		-moz-box-sizing: content-box;
+		box-sizing: content-box;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		border-radius: 3px;
+		position: relative;
+	}
 
-    .icon-refresh:before {
-        content: " ";
-        display: block;
-        width: 16px;
-        height: 16px;
-        position: absolute;
-        margin: auto;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        z-index: 9999;
-        background-image: url("data:image/png;base64,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");
-        background-size: contain;
-    }
+	.verify-img-panel .verify-refresh {
+		width: 25px;
+		height: 25px;
+		text-align: center;
+		padding: 5px;
+		cursor: pointer;
+		position: absolute;
+		top: 0;
+		right: 0;
+		z-index: 2;
+	}
+
+	.verify-img-panel .icon-refresh {
+		font-size: 20px;
+		color: #fff;
+	}
+
+	.verify-img-panel .verify-gap {
+		background-color: #fff;
+		position: relative;
+		z-index: 2;
+		border: 1px solid #fff;
+	}
+
+	.verify-bar-area .verify-move-block .verify-sub-block {
+		position: absolute;
+		text-align: center;
+		z-index: 3;
+		/* border: 1px solid #fff; */
+	}
+
+	.verify-bar-area .verify-move-block .verify-icon {
+		font-size: 18px;
+	}
+
+	.verify-bar-area .verify-msg {
+		z-index: 3;
+	}
+
+	/*字体图标的css*/
+	/*@font-face {font-family: "iconfont";*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188'); !* IE9*!*/
+	/*src: url('../fonts/iconfont.eot?t=1508229193188#iefix') format('embedded-opentype'), !* IE6-IE8 *!*/
+	/*url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),*/
+	/*url('../fonts/iconfont.ttf?t=1508229193188') format('truetype'), !* chrome, firefox, opera, Safari, Android, iOS 4.2+*!*/
+	/*url('../fonts/iconfont.svg?t=1508229193188#iconfont') format('svg'); !* iOS 4.1- *!*/
+	/*}*/
+
+	.iconfont {
+		font-family: "iconfont" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-check:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-close:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-right:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		background-size: cover;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
+
+	.icon-refresh:before {
+		content: " ";
+		display: block;
+		width: 16px;
+		height: 16px;
+		position: absolute;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-image: url("data:image/png;base64,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");
+		background-size: contain;
+	}
 </style>
diff --git a/admin/src/components/verifition/Verify/VerifyPoints.vue b/admin/src/components/verifition/Verify/VerifyPoints.vue
index d2bb8c2e3..da201f8aa 100644
--- a/admin/src/components/verifition/Verify/VerifyPoints.vue
+++ b/admin/src/components/verifition/Verify/VerifyPoints.vue
@@ -1,21 +1,21 @@
 <template>
-    <div style="position: relative">
-        <div class="verify-img-out">
-            <div class="verify-img-panel" :style="{'width': setSize.imgWidth,
+	<div style="position: relative">
+		<div class="verify-img-out">
+			<div class="verify-img-panel" :style="{'width': setSize.imgWidth,
                                                    'height': setSize.imgHeight,
                                                    'background-size' : setSize.imgWidth + ' '+ setSize.imgHeight,
                                                    'margin-bottom': vSpace + 'px'}"
-                                                    >
-                <div class="verify-refresh" style="z-index:3" @click="refresh" v-show="showRefresh">
-                    <i class="iconfont icon-refresh"></i>
-                </div>
-                <img :src="'data:image/png;base64,'+pointBackImgBase"
-                ref="canvas"
-                alt=""  style="width:100%;height:100%;display:block"
-                @click="bindingClick?canvasClick($event):undefined">
+			>
+				<div class="verify-refresh" style="z-index:3" @click="refresh" v-show="showRefresh">
+					<i class="iconfont icon-refresh"></i>
+				</div>
+				<img :src="'data:image/png;base64,'+pointBackImgBase"
+				     ref="canvas"
+				     alt="" style="width:100%;height:100%;display:block"
+				     @click="bindingClick?canvasClick($event):undefined">
 
-                <div v-for="(tempPoint, index) in tempPoints" :key="index" class="point-area"
-                     :style="{
+				<div v-for="(tempPoint, index) in tempPoints" :key="index" class="point-area"
+				     :style="{
                         'background-color':'#1abd6c',
                         color:'#fff',
                         'z-index':9999,
@@ -28,233 +28,234 @@
                         top:parseInt(tempPoint.y-10) + 'px',
                         left:parseInt(tempPoint.x-10) + 'px'
                      }">
-                    {{index + 1}}
-                </div>
-            </div>
-        </div>
-        <!-- 'height': this.barSize.height, -->
-        <div class="verify-bar-area"
-             :style="{'width': setSize.imgWidth,
+					{{index + 1}}
+				</div>
+			</div>
+		</div>
+		<!-- 'height': this.barSize.height, -->
+		<div class="verify-bar-area"
+		     :style="{'width': setSize.imgWidth,
                       'color': this.barAreaColor,
                       'border-color': this.barAreaBorderColor,
                       'line-height':this.barSize.height}">
-            <span class="verify-msg">{{text}}</span>
-        </div>
-    </div>
+			<span class="verify-msg">{{text}}</span>
+		</div>
+	</div>
 </template>
 <script type="text/babel">
-/**
- * VerifyPoints
- * @description 点选
- * */
-import { resetSize } from './../utils/util'
-import { aesEncrypt } from './../utils/ase'
-import { reqGet, reqCheck } from './../api/index'
-import { onMounted, reactive, ref, nextTick, toRefs, getCurrentInstance } from 'vue'
+    /**
+     * VerifyPoints
+     * @description 点选
+     * */
+    import { resetSize } from './../utils/util'
+    import { aesEncrypt } from './../utils/ase'
+    import { reqGet, reqCheck } from './../api/index'
+    import { onMounted, reactive, ref, nextTick, toRefs, getCurrentInstance } from 'vue'
 
-export default {
-    name: 'VerifyPoints',
-    props: {
-        // 弹出式pop，固定fixed
-        mode: {
-            type: String,
-            default: 'fixed'
-        },
-        captchaType: {
-            type: String
-        },
-        // 间隔
-        vSpace: {
-            type: Number,
-            default: 5
-        },
-        imgSize: {
-            type: Object,
-            default () {
-                return {
-                    width: '310px',
-                    height: '155px'
-                }
-            }
-        },
-        barSize: {
-            type: Object,
-            default () {
-                return {
-                    width: '310px',
-                    height: '40px'
-                }
-            }
-        }
-    },
-    setup (props, context) {
-        const { mode, captchaType, vSpace, imgSize, barSize } = toRefs(props)
-        const { proxy } = getCurrentInstance()
-        const secretKey = ref('') // 后端返回的ase加密秘钥
-        const checkNum = ref(3) // 默认需要点击的字数
-        const fontPos = reactive([]) // 选中的坐标信息
-        const checkPosArr = reactive([]) // 用户点击的坐标
-        const num = ref(1) // 点击的记数
-        const pointBackImgBase = ref('') // 后端获取到的背景图片
-        const poinTextList = reactive([]) // 后端返回的点击字体顺序
-        const backToken = ref('') // 后端返回的token值
-        const setSize = reactive({
-            imgHeight: 0,
-            imgWidth: 0,
-            barHeight: 0,
-            barWidth: 0
-        })
-        const tempPoints = reactive([])
-        const text = ref('')
-        const barAreaColor = ref(undefined)
-        const barAreaBorderColor = ref(undefined)
-        const showRefresh = ref(true)
-        const bindingClick = ref(true)
-        const init = () => {
-            // 加载页面
-            fontPos.splice(0, fontPos.length)
-            checkPosArr.splice(0, checkPosArr.length)
-            num.value = 1
-            getPictrue()
-            nextTick(() => {
-                const { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
-                setSize.imgHeight = imgHeight
-                setSize.imgWidth = imgWidth
-                setSize.barHeight = barHeight
-                setSize.barWidth = barWidth
-                proxy.$parent.$emit('ready', proxy)
-            })
-        }
-        onMounted(() => {
-            // 禁止拖拽
-            init()
-            proxy.$el.onselectstart = function () {
-                return false
-            }
-        })
-        const canvas = ref(null)
-        const canvasClick = (e) => {
-            checkPosArr.push(getMousePos(canvas, e))
-            if (num.value == checkNum.value) {
-                num.value = createPoint(getMousePos(canvas, e))
-                // 按比例转换坐标值
-                const arr = pointTransfrom(checkPosArr, setSize)
-                checkPosArr.length = 0
-                checkPosArr.push(...arr)
-                // 等创建坐标执行完
-                setTimeout(() => {
-                    // var flag = this.comparePos(this.fontPos, this.checkPosArr);
-                    // 发送后端请求
-                    const captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify(checkPosArr), secretKey.value) : backToken.value + '---' + JSON.stringify(checkPosArr)
-                    const data = {
-                        captchaType: captchaType.value,
-                        'captcha_code': secretKey.value ? aesEncrypt(JSON.stringify(checkPosArr),secretKey.value):JSON.stringify(checkPosArr),
-                        'captcha_key': backToken.value
+    export default {
+        name: 'VerifyPoints',
+        props: {
+            // 弹出式pop，固定fixed
+            mode: {
+                type: String,
+                default: 'fixed'
+            },
+            captchaType: {
+                type: String
+            },
+            // 间隔
+            vSpace: {
+                type: Number,
+                default: 5
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
                     }
-                    reqCheck(data).then(res => {
-                        if (res.code == 1) {
-                            barAreaColor.value = '#4cae4c'
-                            barAreaBorderColor.value = '#5cb85c'
-                            text.value = '验证成功'
-                            bindingClick.value = false
-                            if (mode.value == 'pop') {
-                                setTimeout(() => {
-                                    proxy.$parent.clickShow = false
-                                    refresh()
-                                }, 1500)
-                            }
-                            proxy.$parent.$emit('success', { captchaVerification })
-                        } else {
-                            proxy.$parent.$emit('error', proxy)
-                            barAreaColor.value = '#d9534f'
-                            barAreaBorderColor.value = '#d9534f'
-                            text.value = '验证失败'
-                            setTimeout(() => {
-                                refresh()
-                            }, 700)
-                        }
-                    })
-                }, 400)
+                }
+            },
+            barSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '40px'
+                    }
+                }
             }
-            if (num.value < checkNum.value) {
-                num.value = createPoint(getMousePos(canvas, e))
+        },
+        setup(props, context) {
+            const { mode, captchaType, vSpace, imgSize, barSize } = toRefs(props)
+            const { proxy } = getCurrentInstance()
+            const secretKey = ref('') // 后端返回的ase加密秘钥
+            const checkNum = ref(3) // 默认需要点击的字数
+            const fontPos = reactive([]) // 选中的坐标信息
+            const checkPosArr = reactive([]) // 用户点击的坐标
+            const num = ref(1) // 点击的记数
+            const pointBackImgBase = ref('') // 后端获取到的背景图片
+            const pointTextList = reactive([]) // 后端返回的点击字体顺序
+            const backToken = ref('') // 后端返回的token值
+            const setSize = reactive({
+                imgHeight: 0,
+                imgWidth: 0,
+                barHeight: 0,
+                barWidth: 0
+            })
+            const tempPoints = reactive([])
+            const text = ref('')
+            const barAreaColor = ref(undefined)
+            const barAreaBorderColor = ref(undefined)
+            const showRefresh = ref(true)
+            const bindingClick = ref(true)
+            const init = () => {
+                // 加载页面
+                fontPos.splice(0, fontPos.length)
+                checkPosArr.splice(0, checkPosArr.length)
+                num.value = 1
+                getPictrue()
+                nextTick(() => {
+                    const { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+                    setSize.imgHeight = imgHeight
+                    setSize.imgWidth = imgWidth
+                    setSize.barHeight = barHeight
+                    setSize.barWidth = barWidth
+                    proxy.$parent.$emit('ready', proxy)
+                })
             }
-        }
-        // 获取坐标
-        const getMousePos = function (obj, e) {
-            const x = e.offsetX
-            const y = e.offsetY
-            return { x, y }
-        }
-        // 创建坐标点
-        const createPoint = function (pos) {
-            tempPoints.push(Object.assign({}, pos))
-            return num.value + 1
-        }
-        const refresh = function () {
-            tempPoints.splice(0, tempPoints.length)
-            barAreaColor.value = '#000'
-            barAreaBorderColor.value = '#ddd'
-            bindingClick.value = true
-            fontPos.splice(0, fontPos.length)
-            checkPosArr.splice(0, checkPosArr.length)
-            num.value = 1
-            getPictrue()
-            text.value = '验证失败'
-            showRefresh.value = true
-        }
-
-        // 请求背景图片和验证图片
-        function getPictrue () {
-            const data = {
-                captchaType: captchaType.value
-            }
-            reqGet(data).then(res => {
-                if (res.code == 1) {
-                    pointBackImgBase.value = res.data.originalImageBase64
-                    backToken.value = res.data.token
-                    secretKey.value = res.data.secretKey
-                    poinTextList.value = res.data.wordList
-                    text.value = '请依次点击【' + poinTextList.value.join(',') + '】'
-                } else {
-                    text.value = res.msg
+            onMounted(() => {
+                // 禁止拖拽
+                init()
+                proxy.$el.onselectstart = function () {
+                    return false
                 }
             })
-        }
-        // 坐标转换函数
-        const pointTransfrom = function (pointArr, imgSize) {
-            const newPointArr = pointArr.map(p => {
-                const x = Math.round(310 * p.x / parseInt(imgSize.imgWidth))
-                const y = Math.round(155 * p.y / parseInt(imgSize.imgHeight))
+            const canvas = ref(null)
+            const canvasClick = (e) => {
+                checkPosArr.push(getMousePos(canvas, e))
+                if (num.value == checkNum.value) {
+                    num.value = createPoint(getMousePos(canvas, e))
+                    // 按比例转换坐标值
+                    const arr = pointTransfrom(checkPosArr, setSize)
+                    checkPosArr.length = 0
+                    checkPosArr.push(...arr)
+                    // 等创建坐标执行完
+                    setTimeout(() => {
+                        // var flag = this.comparePos(this.fontPos, this.checkPosArr);
+                        // 发送后端请求
+                        const captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify(checkPosArr), secretKey.value) : backToken.value + '---' + JSON.stringify(checkPosArr)
+                        const data = {
+                            captchaType: captchaType.value,
+                            'captcha_code': secretKey.value ? aesEncrypt(JSON.stringify(checkPosArr), secretKey.value) : JSON.stringify(checkPosArr),
+                            'captcha_key': backToken.value
+                        }
+                        reqCheck(data).then(res => {
+                            if (res.code == 1) {
+                                barAreaColor.value = '#4cae4c'
+                                barAreaBorderColor.value = '#5cb85c'
+                                text.value = '验证成功'
+                                bindingClick.value = false
+                                if (mode.value == 'pop') {
+                                    setTimeout(() => {
+                                        proxy.$parent.clickShow = false
+                                        refresh()
+                                    }, 1500)
+                                }
+                                proxy.$parent.$emit('success', { captchaVerification })
+                            } else {
+                                proxy.$parent.$emit('error', proxy)
+                                barAreaColor.value = '#d9534f'
+                                barAreaBorderColor.value = '#d9534f'
+                                text.value = '验证失败'
+                                setTimeout(() => {
+                                    refresh()
+                                }, 700)
+                            }
+                        })
+                    }, 400)
+                }
+                if (num.value < checkNum.value) {
+                    num.value = createPoint(getMousePos(canvas, e))
+                }
+            }
+            // 获取坐标
+            const getMousePos = function (obj, e) {
+                const x = e.offsetX
+                const y = e.offsetY
                 return { x, y }
-            })
-            return newPointArr
-        }
-        return {
-            secretKey,
-            checkNum,
-            fontPos,
-            checkPosArr,
-            num,
-            pointBackImgBase,
-            poinTextList,
-            backToken,
-            setSize,
-            tempPoints,
-            text,
-            barAreaColor,
-            barAreaBorderColor,
-            showRefresh,
-            bindingClick,
-            init,
-            canvas,
-            canvasClick,
-            getMousePos,
-            createPoint,
-            refresh,
-            getPictrue,
-            pointTransfrom
+            }
+            // 创建坐标点
+            const createPoint = function (pos) {
+                tempPoints.push(Object.assign({}, pos))
+                return num.value + 1
+            }
+            const refresh = function () {
+                tempPoints.splice(0, tempPoints.length)
+                barAreaColor.value = '#000'
+                barAreaBorderColor.value = '#ddd'
+                bindingClick.value = true
+                fontPos.splice(0, fontPos.length)
+                checkPosArr.splice(0, checkPosArr.length)
+                num.value = 1
+                getPictrue()
+                text.value = '验证失败'
+                showRefresh.value = true
+            }
+
+            // 请求背景图片和验证图片
+            function getPictrue() {
+                const data = {
+                    captchaType: captchaType.value
+                }
+                reqGet(data).then(res => {
+                    if (res.code == 1) {
+                        pointBackImgBase.value = res.data.originalImageBase64
+                        backToken.value = res.data.token
+                        secretKey.value = res.data.secretKey
+                        pointTextList.value = res.data.wordList
+                        text.value = '请依次点击【' + pointTextList.value.join(',') + '】'
+                    } else {
+                        text.value = res.msg
+                    }
+                })
+            }
+
+            // 坐标转换函数
+            const pointTransfrom = function (pointArr, imgSize) {
+                const newPointArr = pointArr.map(p => {
+                    const x = Math.round(310 * p.x / parseInt(imgSize.imgWidth))
+                    const y = Math.round(155 * p.y / parseInt(imgSize.imgHeight))
+                    return { x, y }
+                })
+                return newPointArr
+            }
+            return {
+                secretKey,
+                checkNum,
+                fontPos,
+                checkPosArr,
+                num,
+                pointBackImgBase,
+                pointTextList,
+                backToken,
+                setSize,
+                tempPoints,
+                text,
+                barAreaColor,
+                barAreaBorderColor,
+                showRefresh,
+                bindingClick,
+                init,
+                canvas,
+                canvasClick,
+                getMousePos,
+                createPoint,
+                refresh,
+                getPictrue,
+                pointTransfrom
+            }
         }
     }
-}
 </script>
diff --git a/admin/src/components/verifition/Verify/VerifySlide.vue b/admin/src/components/verifition/Verify/VerifySlide.vue
index c77aef438..261ac40ee 100644
--- a/admin/src/components/verifition/Verify/VerifySlide.vue
+++ b/admin/src/components/verifition/Verify/VerifySlide.vue
@@ -1,364 +1,379 @@
 <template>
-    <div style="position: relative;">
-        <div v-if="type === '2'" class="verify-img-out"
-             :style="{height: (parseInt(setSize.imgHeight) + vSpace) + 'px'}"
-            >
-            <div class="verify-img-panel" :style="{width: setSize.imgWidth,
+	<div style="position: relative;">
+		<div v-if="type === '2'" class="verify-img-out"
+		     :style="{height: (parseInt(setSize.imgHeight) + vSpace) + 'px'}"
+		>
+			<div class="verify-img-panel" :style="{width: setSize.imgWidth,
                                                    height: setSize.imgHeight,}">
-                <img :src="'data:image/png;base64,'+backImgBase" alt="" style="width:100%;height:100%;display:block">
-                <div class="verify-refresh" @click="refresh" v-show="showRefresh"><i class="iconfont icon-refresh"></i>
-                </div>
-                <transition name="tips">
-                    <span class="verify-tips" v-if="tipWords" :class="passFlag ?'suc-bg':'err-bg'">{{tipWords}}</span>
-                </transition>
-            </div>
-        </div>
-        <!-- 公共部分 -->
-        <div class="verify-bar-area" :style="{width: setSize.imgWidth,
+				<img :src="'data:image/png;base64,'+backImgBase" alt="" style="width:100%;height:100%;display:block">
+				<div class="verify-refresh" @click="refresh" v-show="showRefresh"><i class="iconfont icon-refresh"></i>
+				</div>
+				<transition name="tips">
+					<span class="verify-tips" v-if="tipWords" :class="passFlag ?'suc-bg':'err-bg'">{{tipWords}}</span>
+				</transition>
+			</div>
+		</div>
+		<!-- 公共部分 -->
+		<div class="verify-bar-area" :style="{width: setSize.imgWidth,
                                               height: barSize.height,
                                               'line-height':barSize.height}">
-            <span class="verify-msg" v-text="text"></span>
-            <div class="verify-left-bar"
-                 :style="{width: (leftBarWidth!==undefined)?leftBarWidth: barSize.height, height: barSize.height, 'border-color': leftBarBorderColor, transaction: transitionWidth}">
-                <span class="verify-msg" v-text="finishText"></span>
-                <div class="verify-move-block"
-                     @touchstart="start"
-                     @mousedown="start"
-                     :style="{width: barSize.height, height: barSize.height, 'background-color': moveBlockBackgroundColor, left: moveBlockLeft, transition: transitionLeft}">
-                    <i :class="['verify-icon iconfont', iconClass]"
-                       :style="{color: iconColor}"></i>
-                    <div v-if="type === '2'" class="verify-sub-block"
-                        :style="{'width':Math.floor(parseInt(setSize.imgWidth)*47/310)+ 'px',
+			<span class="verify-msg" v-text="text"></span>
+			<div class="verify-left-bar"
+			     :style="{width: (leftBarWidth!==undefined)?leftBarWidth: barSize.height, height: barSize.height, 'border-color': leftBarBorderColor, transaction: transitionWidth}">
+				<span class="verify-msg" v-text="finishText"></span>
+				<div class="verify-move-block"
+				     @touchstart="start"
+				     @mousedown="start"
+				     :style="{width: barSize.height, height: barSize.height, 'background-color': moveBlockBackgroundColor, left: moveBlockLeft, transition: transitionLeft}">
+					<i :class="['verify-icon iconfont', iconClass]"
+					   :style="{color: iconColor}"></i>
+					<div v-if="type === '2'" class="verify-sub-block"
+					     :style="{'width':Math.floor(parseInt(setSize.imgWidth)*47/310)+ 'px',
                                   'height': setSize.imgHeight,
                                   'top':'-' + (parseInt(setSize.imgHeight) + vSpace) + 'px',
                                   'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
                                   }">
-                        <img :src="'data:image/png;base64,'+blockBackImgBase" alt=""  style="width:100%;height:100%;display:block;-webkit-user-drag:none;">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+						<img :src="'data:image/png;base64,'+blockBackImgBase" alt=""
+						     style="width:100%;height:100%;display:block;-webkit-user-drag:none;">
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 <script type="text/babel">
-/**
- * VerifySlide
- * @description 滑块
- * */
-import { aesEncrypt } from './../utils/ase'
-import { resetSize } from './../utils/util'
-import { reqGet, reqCheck } from './../api/index'
-import { computed, onMounted, reactive, ref, watch, nextTick, toRefs, getCurrentInstance } from 'vue'
-//  "captchaType":"blockPuzzle",
-export default {
-    name: 'VerifySlide',
-    props: {
-        captchaType: {
-            type: String
-        },
-        type: {
-            type: String,
-            default: '1'
-        },
-        // 弹出式pop，固定fixed
-        mode: {
-            type: String,
-            default: 'fixed'
-        },
-        vSpace: {
-            type: Number,
-            default: 5
-        },
-        explain: {
-            type: String,
-            default: '向右滑动完成验证'
-        },
-        imgSize: {
-            type: Object,
-            default () {
-                return {
-                    width: '310px',
-                    height: '155px'
+    /**
+     * VerifySlide
+     * @description 滑块
+     * */
+    import { aesEncrypt } from './../utils/ase'
+    import { resetSize } from './../utils/util'
+    import { reqGet, reqCheck } from './../api/index'
+    import { computed, onMounted, reactive, ref, watch, nextTick, toRefs, getCurrentInstance } from 'vue'
+    //  "captchaType":"blockPuzzle",
+    export default {
+        name: 'VerifySlide',
+        props: {
+            captchaType: {
+                type: String
+            },
+            type: {
+                type: String,
+                default: '1'
+            },
+            // 弹出式pop，固定fixed
+            mode: {
+                type: String,
+                default: 'fixed'
+            },
+            vSpace: {
+                type: Number,
+                default: 5
+            },
+            explain: {
+                type: String,
+                default: '向右滑动完成验证'
+            },
+            imgSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '155px'
+                    }
+                }
+            },
+            blockSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '50px',
+                        height: '50px'
+                    }
+                }
+            },
+            barSize: {
+                type: Object,
+                default() {
+                    return {
+                        width: '310px',
+                        height: '40px'
+                    }
                 }
             }
         },
-        blockSize: {
-            type: Object,
-            default () {
-                return {
-                    width: '50px',
-                    height: '50px'
+        setup(props, context) {
+            const { mode, captchaType, vSpace, imgSize, barSize, type, blockSize, explain } = toRefs(props)
+            const { proxy } = getCurrentInstance()
+            const secretKey = ref(''), // 后端返回的ase加密秘钥
+                passFlag = ref(''), // 是否通过的标识
+                backImgBase = ref(''), // 验证码背景图片
+                blockBackImgBase = ref(''), // 验证滑块的背景图片
+                backToken = ref(''), // 后端返回的唯一token值
+                startMoveTime = ref(''), // 移动开始的时间
+                endMoveTime = ref(''), // 移动结束的时间
+                tipsBackColor = ref(''), // 提示词的背景颜色
+                tipWords = ref(''),
+                text = ref(''),
+                finishText = ref(''),
+                setSize = reactive({
+                    imgHeight: 0,
+                    imgWidth: 0,
+                    barHeight: 0,
+                    barWidth: 0
+                }),
+                top = ref(0),
+                left = ref(0),
+                moveBlockLeft = ref(undefined),
+                leftBarWidth = ref(undefined),
+                // 移动中样式
+                moveBlockBackgroundColor = ref(undefined),
+                leftBarBorderColor = ref('#ddd'),
+                iconColor = ref(undefined),
+                iconClass = ref('icon-right'),
+                status = ref(false), // 鼠标状态
+                isEnd = ref(false),		// 是够验证完成
+                showRefresh = ref(true),
+                transitionLeft = ref(''),
+                transitionWidth = ref(''),
+                startLeft = ref(0)
+
+            const barArea = computed(() => {
+                return proxy.$el.querySelector('.verify-bar-area')
+            })
+
+            function init() {
+                text.value = explain.value
+                getPictrue()
+                nextTick(() => {
+                    let { imgHeight, imgWidth, barHeight, barWidth } = resetSize(proxy)
+                    setSize.imgHeight = imgHeight
+                    setSize.imgWidth = imgWidth
+                    setSize.barHeight = barHeight
+                    setSize.barWidth = barWidth
+                    proxy.$parent.$emit('ready', proxy)
+                })
+
+                window.removeEventListener('touchmove', function (e) {
+                    move(e)
+                })
+                window.removeEventListener('mousemove', function (e) {
+                    move(e)
+                })
+
+                // 鼠标松开
+                window.removeEventListener('touchend', function () {
+                    end()
+                })
+                window.removeEventListener('mouseup', function () {
+                    end()
+                })
+
+                window.addEventListener('touchmove', function (e) {
+                    move(e)
+                })
+                window.addEventListener('mousemove', function (e) {
+                    move(e)
+                })
+
+                // 鼠标松开
+                window.addEventListener('touchend', function () {
+                    end()
+                })
+                window.addEventListener('mouseup', function () {
+                    end()
+                })
+            }
+
+            watch(type, () => {
+                init()
+            })
+            onMounted(() => {
+                // 禁止拖拽
+                init()
+                proxy.$el.onselectstart = function () {
+                    return false
                 }
-            }
-        },
-        barSize: {
-            type: Object,
-            default () {
-                return {
-                    width: '310px',
-                    height: '40px'
-                }
-            }
-        }
-    },
-    setup (props, context) {
-        const { mode, captchaType, vSpace, imgSize, barSize, type, blockSize, explain } = toRefs(props)
-        const { proxy } = getCurrentInstance()
-        let secretKey = ref(''), // 后端返回的ase加密秘钥
-            passFlag = ref(''), // 是否通过的标识
-            backImgBase = ref(''), // 验证码背景图片
-            blockBackImgBase = ref(''), // 验证滑块的背景图片
-            backToken = ref(''), // 后端返回的唯一token值
-            startMoveTime = ref(''), // 移动开始的时间
-            endMovetime = ref(''), // 移动结束的时间
-            tipsBackColor = ref(''), // 提示词的背景颜色
-            tipWords = ref(''),
-            text = ref(''),
-            finishText = ref(''),
-            setSize = reactive({
-                imgHeight: 0,
-                imgWidth: 0,
-                barHeight: 0,
-                barWidth: 0
-            }),
-            top = ref(0),
-            left = ref(0),
-            moveBlockLeft = ref(undefined),
-            leftBarWidth = ref(undefined),
-            // 移动中样式
-            moveBlockBackgroundColor = ref(undefined),
-            leftBarBorderColor = ref('#ddd'),
-            iconColor = ref(undefined),
-            iconClass = ref('icon-right'),
-            status = ref(false), // 鼠标状态
-            isEnd = ref(false) ,		// 是够验证完成
-            showRefresh = ref(true),
-            transitionLeft = ref(''),
-            transitionWidth = ref(''),
-            startLeft = ref(0) 
-
-        const barArea = computed(()=>{
-            return proxy.$el.querySelector('.verify-bar-area')
-        })
-        function init() {
-            text.value = explain.value
-            getPictrue()
-            nextTick(() => {
-                let {imgHeight,imgWidth,barHeight,barWidth} = resetSize(proxy)
-                setSize.imgHeight = imgHeight
-                setSize.imgWidth = imgWidth
-                setSize.barHeight = barHeight
-                setSize.barWidth = barWidth
-                proxy.$parent.$emit('ready', proxy)
             })
 
-            window.removeEventListener('touchmove', function (e) {
-                move(e)
-            })
-            window.removeEventListener('mousemove', function (e) {
-                move(e)
-            })
-
-            // 鼠标松开
-            window.removeEventListener('touchend', function () {
-                end()
-            })
-            window.removeEventListener('mouseup', function () {
-                end()
-            })
-
-            window.addEventListener('touchmove', function (e) {
-                move(e)
-            })
-            window.addEventListener('mousemove', function (e) {
-                move(e)
-            })
-
-            // 鼠标松开
-            window.addEventListener('touchend', function () {
-                end()
-            })
-            window.addEventListener('mouseup', function () {
-                end()
-            })
-        }
-        watch(type, () => {
-            init()
-        })
-        onMounted(() => {
-            // 禁止拖拽
-            init()
-            proxy.$el.onselectstart = function () {
-                return false
-            }
-        })
-        // 鼠标按下
-        function start(e) {
-            e = e || window.event
-            if (!e.touches) { // 兼容PC端 
-                var x = e.clientX
-            } else { // 兼容移动端
-                var x = e.touches[0].pageX
-            }
-            startLeft.value =Math.floor(x - barArea.value.getBoundingClientRect().left)
-            startMoveTime.value = +new Date() // 开始滑动的时间
-            if (isEnd.value == false) {
-                text.value = ''
-                moveBlockBackgroundColor.value = '#337ab7'
-                leftBarBorderColor.value = '#337AB7'
-                iconColor.value = '#fff'
-                e.stopPropagation()
-                status.value = true
-            }
-        }
-        // 鼠标移动
-        function move(e) {
-            e = e || window.event
-            if (status.value && isEnd.value == false) {
+            // 鼠标按下
+            function start(e) {
+                e = e || window.event
                 if (!e.touches) { // 兼容PC端
                     var x = e.clientX
                 } else { // 兼容移动端
                     var x = e.touches[0].pageX
                 }
-                var bar_area_left = barArea.value.getBoundingClientRect().left
-                var move_block_left = x - bar_area_left // 小方块相对于父元素的left值
-                if (move_block_left >= barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2) {
-                    move_block_left = barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
+                startLeft.value = Math.floor(x - barArea.value.getBoundingClientRect().left)
+                startMoveTime.value = +new Date() // 开始滑动的时间
+                if (isEnd.value == false) {
+                    text.value = ''
+                    moveBlockBackgroundColor.value = '#337ab7'
+                    leftBarBorderColor.value = '#337AB7'
+                    iconColor.value = '#fff'
+                    e.stopPropagation()
+                    status.value = true
                 }
-                if (move_block_left <= 0) {
-                    move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
-                }
-                // 拖动后小方块的left值
-                moveBlockLeft.value = (move_block_left - startLeft.value) + 'px'
-                leftBarWidth.value = (move_block_left - startLeft.value) + 'px'
             }
-        }
 
-        // 鼠标松开
-        function end() {
-            endMovetime.value = +new Date()
-            // 判断是否重合
-            if (status.value && isEnd.value == false) {
-                var moveLeftDistance = parseInt((moveBlockLeft.value || '').replace('px', ''))
-                moveLeftDistance = moveLeftDistance * 310 / parseInt(setSize.imgWidth)
-                const data = {
-                    captchaType: captchaType.value,
-                    'captcha_code':secretKey.value ? aesEncrypt(JSON.stringify({ x: moveLeftDistance, y: 5.0}), secretKey.value):JSON.stringify({x:moveLeftDistance,y:5.0}),
-                    'captcha_key':backToken.value
+            // 鼠标移动
+            function move(e) {
+                e = e || window.event
+                if (status.value && isEnd.value == false) {
+                    if (!e.touches) { // 兼容PC端
+                        var x = e.clientX
+                    } else { // 兼容移动端
+                        var x = e.touches[0].pageX
+                    }
+                    var bar_area_left = barArea.value.getBoundingClientRect().left
+                    var move_block_left = x - bar_area_left // 小方块相对于父元素的left值
+                    if (move_block_left >= barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2) {
+                        move_block_left = barArea.value.offsetWidth - parseInt(parseInt(blockSize.value.width) / 2) - 2
+                    }
+                    if (move_block_left <= 0) {
+                        move_block_left = parseInt(parseInt(blockSize.value.width) / 2)
+                    }
+                    // 拖动后小方块的left值
+                    moveBlockLeft.value = ( move_block_left - startLeft.value ) + 'px'
+                    leftBarWidth.value = ( move_block_left - startLeft.value ) + 'px'
                 }
-                reqCheck(data).then(res => {
-                    if (res.code == 1) {
-                        moveBlockBackgroundColor.value = '#5cb85c'
-                        leftBarBorderColor.value = '#5cb85c'
-                        iconColor.value = '#fff'
-                        iconClass.value = 'icon-check'
-                        showRefresh.value = false
-                        isEnd.value = true
-                        if (mode.value == 'pop') {
+            }
+
+            // 鼠标松开
+            function end() {
+                endMoveTime.value = +new Date()
+                // 判断是否重合
+                if (status.value && isEnd.value == false) {
+                    var moveLeftDistance = parseInt(( moveBlockLeft.value || '' ).replace('px', ''))
+                    moveLeftDistance = moveLeftDistance * 310 / parseInt(setSize.imgWidth)
+                    const data = {
+                        captchaType: captchaType.value,
+                        'captcha_code': secretKey.value ? aesEncrypt(JSON.stringify({
+                            x: moveLeftDistance,
+                            y: 5.0
+                        }), secretKey.value) : JSON.stringify({ x: moveLeftDistance, y: 5.0 }),
+                        'captcha_key': backToken.value
+                    }
+                    reqCheck(data).then(res => {
+                        if (res.code == 1) {
+                            moveBlockBackgroundColor.value = '#5cb85c'
+                            leftBarBorderColor.value = '#5cb85c'
+                            iconColor.value = '#fff'
+                            iconClass.value = 'icon-check'
+                            showRefresh.value = false
+                            isEnd.value = true
+                            if (mode.value == 'pop') {
+                                setTimeout(() => {
+                                    proxy.$parent.clickShow = false
+                                    refresh()
+                                }, 1500)
+                            }
+                            passFlag.value = true
+                            tipWords.value = `${ ( ( endMoveTime.value - startMoveTime.value ) / 1000 ).toFixed(2) }s验证成功`
+                            var captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify({
+                                x: moveLeftDistance,
+                                y: 5.0
+                            }), secretKey.value) : backToken.value + '---' + JSON.stringify({
+                                x: moveLeftDistance,
+                                y: 5.0
+                            })
                             setTimeout(() => {
-                                proxy.$parent.clickShow = false
+                                tipWords.value = ''
+                                proxy.$parent.closeBox()
+                                proxy.$parent.$emit('success', { captchaVerification })
+                            }, 1000)
+                        } else {
+                            moveBlockBackgroundColor.value = '#d9534f'
+                            leftBarBorderColor.value = '#d9534f'
+                            iconColor.value = '#fff'
+                            iconClass.value = 'icon-close'
+                            passFlag.value = false
+                            setTimeout(function () {
                                 refresh()
-                            }, 1500)
+                            }, 1000)
+                            proxy.$parent.$emit('error', proxy)
+                            tipWords.value = '验证失败'
+                            setTimeout(() => {
+                                tipWords.value = ''
+                            }, 1000)
                         }
-                        passFlag.value = true
-                        tipWords.value = `${((endMovetime.value - startMoveTime.value) / 1000).toFixed(2)}s验证成功`
-                        var captchaVerification = secretKey.value ? aesEncrypt(backToken.value + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 }), secretKey.value) : backToken.value + '---' + JSON.stringify({ x: moveLeftDistance, y: 5.0 })
-                        setTimeout(() => {
-                            tipWords.value = ''
-                            proxy.$parent.closeBox()
-                            proxy.$parent.$emit('success', { captchaVerification })
-                        }, 1000)
+                    })
+                    status.value = false
+                }
+            }
+
+            const refresh = () => {
+                showRefresh.value = true
+                finishText.value = ''
+
+                transitionLeft.value = 'left .3s'
+                moveBlockLeft.value = 0
+
+                leftBarWidth.value = undefined
+                transitionWidth.value = 'width .3s'
+
+                leftBarBorderColor.value = '#ddd'
+                moveBlockBackgroundColor.value = '#fff'
+                iconColor.value = '#000'
+                iconClass.value = 'icon-right'
+                isEnd.value = false
+
+                getPictrue()
+                setTimeout(() => {
+                    transitionWidth.value = ''
+                    transitionLeft.value = ''
+                    text.value = explain.value
+                }, 300)
+            }
+
+            // 请求背景图片和验证图片
+            function getPictrue() {
+                const data = {
+                    captchaType: captchaType.value
+                }
+                reqGet(data).then(res => {
+                    if (res.code == 1) {
+                        backImgBase.value = res.data.originalImageBase64
+                        blockBackImgBase.value = res.data.jigsawImageBase64
+                        backToken.value = res.data.token
+                        secretKey.value = res.data.secretKey
                     } else {
-                        moveBlockBackgroundColor.value = '#d9534f'
-                        leftBarBorderColor.value = '#d9534f'
-                        iconColor.value = '#fff'
-                        iconClass.value = 'icon-close'
-                        passFlag.value = false
-                        setTimeout(function () {
-                            refresh()
-                        }, 1000)
-                        proxy.$parent.$emit('error', proxy)
-                        tipWords.value = '验证失败'
-                        setTimeout(() => {
-                            tipWords.value = ''
-                        }, 1000)
+                        tipWords.value = res.msg
                     }
                 })
-                status.value = false
             }
-        }
 
-        const refresh = () => {
-            showRefresh.value = true
-            finishText.value = ''
-
-            transitionLeft.value = 'left .3s'
-            moveBlockLeft.value = 0
-
-            leftBarWidth.value = undefined
-            transitionWidth.value = 'width .3s'
-
-            leftBarBorderColor.value = '#ddd'
-            moveBlockBackgroundColor.value = '#fff'
-            iconColor.value = '#000'
-            iconClass.value = 'icon-right'
-            isEnd.value = false
-
-            getPictrue()
-            setTimeout(() => {
-                transitionWidth.value = ''
-                transitionLeft.value = ''
-                text.value = explain.value
-            }, 300)
-        }
-
-        // 请求背景图片和验证图片
-        function getPictrue() {
-            const data = {
-                captchaType: captchaType.value
+            return {
+                secretKey, // 后端返回的ase加密秘钥
+                passFlag, // 是否通过的标识
+                backImgBase, // 验证码背景图片
+                blockBackImgBase, // 验证滑块的背景图片
+                backToken, // 后端返回的唯一token值
+                startMoveTime, // 移动开始的时间
+                endMoveTime, // 移动结束的时间
+                tipsBackColor, // 提示词的背景颜色
+                tipWords,
+                text,
+                finishText,
+                setSize,
+                top,
+                left,
+                moveBlockLeft,
+                leftBarWidth,
+                // 移动中样式
+                moveBlockBackgroundColor,
+                leftBarBorderColor,
+                iconColor,
+                iconClass,
+                status, // 鼠标状态
+                isEnd,		// 是够验证完成
+                showRefresh,
+                transitionLeft,
+                transitionWidth,
+                barArea,
+                refresh,
+                start
             }
-            reqGet(data).then(res => {
-                if (res.code == 1) {
-                    backImgBase.value = res.data.originalImageBase64
-                    blockBackImgBase.value = res.data.jigsawImageBase64
-                    backToken.value = res.data.token
-                    secretKey.value = res.data.secretKey
-                } else {
-                    tipWords.value = res.msg
-                }
-            })
-        }
-        return {
-            secretKey, // 后端返回的ase加密秘钥
-            passFlag, // 是否通过的标识
-            backImgBase, // 验证码背景图片
-            blockBackImgBase, // 验证滑块的背景图片
-            backToken, // 后端返回的唯一token值
-            startMoveTime, // 移动开始的时间
-            endMovetime, // 移动结束的时间
-            tipsBackColor, // 提示词的背景颜色
-            tipWords,
-            text,
-            finishText,
-            setSize,
-            top,
-            left,
-            moveBlockLeft,
-            leftBarWidth,
-            // 移动中样式
-            moveBlockBackgroundColor,
-            leftBarBorderColor,
-            iconColor,
-            iconClass,
-            status, // 鼠标状态
-            isEnd,		// 是够验证完成
-            showRefresh,
-            transitionLeft,
-            transitionWidth,
-            barArea,
-            refresh,
-            start
         }
     }
-}
 </script>
diff --git a/admin/src/layout/default/components/header/user-info.vue b/admin/src/layout/default/components/header/user-info.vue
index f49d4dbe8..8ab73e42c 100644
--- a/admin/src/layout/default/components/header/user-info.vue
+++ b/admin/src/layout/default/components/header/user-info.vue
@@ -2,7 +2,8 @@
     <div>
         <el-dropdown @command="clickEvent" :tabindex="1">
             <div class="userinfo flex h-full items-center">
-                <el-avatar :size="25" :icon="UserFilled" :src="userStore.userInfo.head_img ? img(userStore.userInfo.head_img) : ''"/>
+                <el-avatar v-if="userStore.userInfo.head_img" :size="25" :icon="UserFilled" :src="img(userStore.userInfo.head_img)"/>
+                <img v-else src="@/app/assets/images/member_head.png" class="w-[25px] rounded-full" />
                 <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
                 <icon name="element ArrowDown" class="ml-[5px]" />
             </div>
@@ -60,7 +61,7 @@
 <script lang="ts" setup>
 import { UserFilled } from '@element-plus/icons-vue'
 import { reactive, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { FormInstance, FormRules, ElNotification } from 'element-plus'
 import useUserStore from '@/stores/modules/user'
 import { setUserInfo } from '@/app/api/personal'
@@ -89,10 +90,10 @@ const getUserInfoFn = ()=>{
     userInfoEditRef.value?.open()
 }
 // 修改密码 --- start
-let changePasswordDialog = ref(false)
+const changePasswordDialog = ref(false)
 const formRef = ref<FormInstance>();
 // 提交信息
-let saveInfo = reactive({
+const saveInfo = reactive({
     original_password: '',
     password: '',
     password_copy: ''
diff --git a/admin/src/layout/major/components/aside/side.vue b/admin/src/layout/major/components/aside/side.vue
index 932e321de..4f864e291 100644
--- a/admin/src/layout/major/components/aside/side.vue
+++ b/admin/src/layout/major/components/aside/side.vue
@@ -113,18 +113,21 @@ watch(route, () => {
     // 多应用
     if (systemStore?.apps.length > 1) {
         twoMenuData.value = route.matched[1].children
-        oneMenuActive.value = String(route.matched[1].name)
+        oneMenuActive.value = route.matched[1].name
     } else {
         // 单应用
-        if (route.meta.addon == '') {
+        const oneMenu = route.matched[1]
+        if (oneMenu.meta.addon == '') {
             oneMenuActive.value = route.matched[1].name
             twoMenuData.value = route.matched[1].children ?? []
-        } else if (route.meta.addon && route.meta.addon != systemStore?.apps[0].key) {
-            oneMenuActive.value = '/admin/app'
-            twoMenuData.value = route.matched[1].children ?? []
         } else {
-            oneMenuActive.value = route.matched[2].name
-            twoMenuData.value = route.matched[2].children ?? []
+            if (oneMenu.meta.addon == systemStore?.apps[0].key) {
+                oneMenuActive.value = route.matched[2].name
+                twoMenuData.value = route.matched[2].children ?? []
+            } else {
+                oneMenuActive.value = route.matched[1].name
+                twoMenuData.value = route.matched[1].children ?? []
+            }
         }
     }
 }, { immediate: true })
diff --git a/admin/src/layout/major/components/header/user-info.vue b/admin/src/layout/major/components/header/user-info.vue
index 713a327a6..2b1eebe6b 100644
--- a/admin/src/layout/major/components/header/user-info.vue
+++ b/admin/src/layout/major/components/header/user-info.vue
@@ -2,7 +2,7 @@
     <div>
         <el-dropdown @command="clickEvent" :tabindex="1">
             <div class="userinfo flex h-full items-center">
-                <el-avatar :size="25" :icon="UserFilled" :src="userStore.userInfo.head_img ? img(userStore.userInfo.head_img) : ''"/>
+                <el-avatar v-if="userStore.userInfo.head_img" :size="25" :icon="UserFilled" :src="img(userStore.userInfo.head_img)"/>
                 <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
                 <icon name="element ArrowDown" class="ml-[5px]" />
             </div>
@@ -63,6 +63,7 @@ import type { FormInstance, FormRules, ElNotification } from 'element-plus'
 import useUserStore from '@/stores/modules/user'
 import { setUserInfo } from '@/app/api/personal'
 import { t } from '@/lang'
+import { img } from "@/utils/common";
 
 const userStore = useUserStore()
 const router = useRouter()
diff --git a/admin/src/main.ts b/admin/src/main.ts
index 708a19ac9..01600bdab 100644
--- a/admin/src/main.ts
+++ b/admin/src/main.ts
@@ -9,6 +9,7 @@ import { useElementIcon } from './utils/common'
 import 'highlight.js/styles/stackoverflow-light.css';
 import hljs from 'highlight.js/lib/common'
 import hljsVuePlugin from '@highlightjs/vue-plugin'
+import VueUeditorWrap from 'vue-ueditor-wrap'
 
 window.hl = hljs
 
@@ -19,6 +20,7 @@ async function run() {
     app.use(roter)
     app.use(ElementPlus)
     app.use(hljsVuePlugin)
+    app.use(VueUeditorWrap)
     useElementIcon(app)
     app.mount('#app')
 }
diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index 625533c28..6b5a7016e 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -6,7 +6,6 @@ import { language } from '@/lang'
 import useSystemStore from '@/stores/modules/system'
 import useUserStore from '@/stores/modules/user'
 import { setWindowTitle, getAppType, urlToRouteRaw } from '@/utils/common'
-import storage from '@/utils/storage'
 
 const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
@@ -76,7 +75,7 @@ router.beforeEach(async (to, from, next) => {
                 if (!systemStore.apps.length) {
                     await systemStore.getInstallAddons()
                 }
-                await userStore.getAuthMenus()
+                await userStore.getAuthMenusFn()
 
                 // 设置首页路由
                 let firstRoute: symbol | string | undefined = findFirstValidRoute(userStore.routers)
diff --git a/admin/src/router/routers.ts b/admin/src/router/routers.ts
index 0fd339c8b..2dc478864 100644
--- a/admin/src/router/routers.ts
+++ b/admin/src/router/routers.ts
@@ -1,4 +1,3 @@
-import { toRaw } from 'vue'
 import { RouteRecordRaw, RouterView } from 'vue-router'
 import Default from '@/layout/index.vue'
 import Decorate from '@/layout/decorate/index.vue'
@@ -79,12 +78,12 @@ interface Route {
 
 /**
  * 创建路由
- * @param data
- * @returns
+ * @param route
+ * @param parentRoute
  */
 const createRoute = function (route: Route, parentRoute: RouteRecordRaw | null = null): RouteRecordRaw {
     const record: RouteRecordRaw = {
-        path: `/${route.app_type}/${route.router_path}`,
+        path: `/${ route.app_type }/${ route.router_path }`,
         name: route.menu_key,
         meta: {
             title: route.menu_name,
@@ -101,7 +100,7 @@ const createRoute = function (route: Route, parentRoute: RouteRecordRaw | null =
     if (route.menu_type == 0) {
         record.component = RouterView
     } else {
-        record.component = route.addon ? addonModules[`/src/addon/${route.addon}/views/${route.view_path}.vue`] : modules[`/src/app/views/${route.view_path}.vue`]
+        record.component = route.addon ? addonModules[`/src/addon/${ route.addon }/views/${ route.view_path }.vue`] : modules[`/src/app/views/${ route.view_path }.vue`]
     }
     return record
 }
@@ -109,7 +108,7 @@ const createRoute = function (route: Route, parentRoute: RouteRecordRaw | null =
 /**
  * 格式化路由
  * @param routes
- * @returns
+ * @param parentRoute
  */
 export function formatRouters(routes: Route[], parentRoute: RouteRecordRaw | null = null) {
     return routes.map((route) => {
diff --git a/admin/src/stores/modules/diy.ts b/admin/src/stores/modules/diy.ts
index 80568bdc7..e4eb7547e 100644
--- a/admin/src/stores/modules/diy.ts
+++ b/admin/src/stores/modules/diy.ts
@@ -55,11 +55,12 @@ const useDiyStore = defineStore('diy', {
                 // 顶部导航栏
                 topStatusBar: {
                     isShow: true, // 是否显示
-                    bgColor: "#ffffff", // 背景颜色
-                    isTransparent: false, // 是否透明
+                    bgColor: "#ffffff", // 头部背景颜色
+                    rollBgColor: "#ffffff", // 滚动时，头部背景颜色
                     style: 'style-1', // 导航栏风格样式（style-1：文字，style-2：图片+文字，style-3：图片+搜索，style-4：定位）
                     styleName: '风格1', 
                     textColor: "#333333", // 文字颜色
+                    rollTextColor: "#333333", // 滚动时，头部文字颜色
                     textAlign: 'center', // 文字对齐方式
                     inputPlaceholder : '请输入搜索关键词',
                     imgUrl:'', // 图片
@@ -139,11 +140,12 @@ const useDiyStore = defineStore('diy', {
                 // 顶部导航栏
                 topStatusBar: {
                     isShow: true, // 是否显示
-                    bgColor: "#ffffff", // 背景颜色
-                    isTransparent: false, // 是否透明
+                    bgColor: "#ffffff", // 头部背景颜色
+                    rollBgColor: "#ffffff", // 滚动时，头部背景颜色
                     style: 'style-1', // 导航栏风格样式（style-1：文字，style-2：图片+文字，style-3：图片+搜索，style-4：定位）
-                    styleName: '风格1',
+                    styleName: '风格1', 
                     textColor: "#333333", // 文字颜色
+                    rollTextColor: "#333333", // 滚动时，头部文字颜色
                     textAlign: 'center', // 文字对齐方式
                     inputPlaceholder : '请输入搜索关键词',
                     imgUrl:'', // 图片
@@ -312,13 +314,13 @@ const useDiyStore = defineStore('diy', {
         },
         // 上移组件
         moveUpComponent() {
-            if ((this.currentIndex - 1) < 0) return; // 从0开始
-
             var temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
-            temp.id = this.generateRandom(); // 更新id，刷新组件数据
-
             let prevIndex = this.currentIndex - 1;
             var temp2 = cloneDeep(this.value[prevIndex]); // 上个组件
+            
+            if ((this.currentIndex - 1) < 0 || temp2.position && this.position.indexOf(temp2.position) != -1) return; // 从0开始
+
+            temp.id = this.generateRandom(); // 更新id，刷新组件数据
             temp2.id = this.generateRandom(); // 更新id，刷新组件数据
 
             if(temp.position && this.position.indexOf(temp.position) != -1){
diff --git a/admin/src/stores/modules/poster.ts b/admin/src/stores/modules/poster.ts
index 60a898d98..c1e2be892 100644
--- a/admin/src/stores/modules/poster.ts
+++ b/admin/src/stores/modules/poster.ts
@@ -8,8 +8,8 @@ const usePosterStore = defineStore('poster', {
     state: () => {
         return {
 
-            contentBoxWidth: 360, // 360*2=720
-            contentBoxHeight: 640, //  640*2=1280
+            contentBoxWidth: 720, // 360*2=720
+            contentBoxHeight: 1280, //  640*2=1280
 
             id: 0,
             name: '', // 页面名称
@@ -52,11 +52,11 @@ const usePosterStore = defineStore('poster', {
             },
             // 组件类型，文本：text，image：图片，qrcode：二维码
             template: {
-                width: 100, // 宽度
-                height: 100, // 高度
-                minWidth: 30, // 最小宽度
-                minHeight: 30, // 最小高度
-                x: 0, // 横向坐标 →
+                width: 200, // 宽度
+                height: 200, // 高度
+                minWidth: 60, // 最小宽度
+                minHeight: 60, // 最小高度
+                x: 0, // 横向坐标 → 
                 y: 0, // 纵向坐标 ↑
                 angle: 0, // 旋转角度 0~360
                 zIndex: 0 // 层级
@@ -64,14 +64,18 @@ const usePosterStore = defineStore('poster', {
             // 各组件类型的默认值
             templateType: {
                 text: {
-                    height: 30,
-                    minWidth: 60,
-                    minHeight: 22,
-                    fontFamily: '',
-                    fontSize: 20,
+                    height: 60,
+                    minWidth: 120,
+                    minHeight: 44,
+                    fontFamily: 'static/font/SourceHanSansCN-Regular.ttf',
+                    fontSize: 40,
+                    weight: false,
+                    lineHeight: 10,
                     fontColor: '#303133'
                 },
-                image: {},
+                image: {
+                    shape: 'normal' // 圆形 circle 方形  normal
+                },
                 qrcode: {},
                 // 绘画
                 draw: {
@@ -328,38 +332,40 @@ const usePosterStore = defineStore('poster', {
         // 移动事件
         mouseDown(e: any, id: any, index: any) {
             const box: any = document.getElementById(id);
-            const disX = e.clientX - box.offsetLeft;
-            const disY = e.clientY - box.offsetTop;
+            const disX = (e.clientX * 2 ) - box.offsetLeft;
+            const disY = (e.clientY * 2 ) - box.offsetTop;
 
             // 鼠标移动时
             document.onmousemove = (e) => {
+                let clientX = e.clientX * 2;
+                let clientY = e.clientY * 2;
+                
                 if (this.contentBoxWidth == box.offsetWidth) {
                     box.style.left = 0
                 } else {
-                    box.style.left = e.clientX - disX + 'px'
+                    box.style.left = (clientX - disX)  + 'px'
                 }
-                box.style.top = e.clientY - disY + 'px';
+                box.style.top = (clientY - disY)  + 'px';
 
                 // 边界判断
-                if (e.clientX - disX < 0) {
+                if (clientX - disX < 0) {
                     box.style.left = 0
                 }
 
-                if (e.clientX - disX > this.contentBoxWidth - box.offsetWidth) {
+                if (clientX - disX > this.contentBoxWidth - box.offsetWidth) {
                     box.style.left = this.contentBoxWidth - box.offsetWidth + 'px'
                 }
 
-
-                if (e.clientY - disY < 0) {
+                if (clientY - disY < 0) {
                     box.style.top = 0
                 }
 
-                if (e.clientY - disY > this.contentBoxHeight - box.offsetHeight) {
+                if (clientY - disY > this.contentBoxHeight - box.offsetHeight) {
                     box.style.top = this.contentBoxHeight - box.offsetHeight + 'px'
                 }
-
+                
                 this.value[index].x = box.offsetLeft;
-                this.value[index].y = box.offsetTop
+                this.value[index].y = box.offsetTop;
 
             };
 
diff --git a/admin/src/stores/modules/system.ts b/admin/src/stores/modules/system.ts
index 9563368f8..9bb691ffb 100644
--- a/admin/src/stores/modules/system.ts
+++ b/admin/src/stores/modules/system.ts
@@ -42,17 +42,15 @@ const useSystemStore = defineStore('system', {
          * 获取已安装的插件和应用
          */
         async getInstallAddons() {
-            await getInstalledAddonList()
-                .then(({ data }) => {
-                    const apps = [], addons = []
-                    Object.keys(data).forEach(key => {
-                        const item = data[key]
-                        item.type == 'app' ? apps.push(item) : addons.push(item)
-                    })
-                    this.addons = addons
-                    this.apps = apps
+            await getInstalledAddonList().then(({ data }) => {
+                const apps = [], addons = []
+                Object.keys(data).forEach(key => {
+                    const item = data[key]
+                    item.type == 'app' ? apps.push(item) : addons.push(item)
                 })
-                .catch()
+                this.addons = addons
+                this.apps = apps
+            }).catch()
         }
     }
 })
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index 92c2844d9..518db142c 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -1,9 +1,8 @@
 import { defineStore } from 'pinia'
-import { getToken, setToken, removeToken, getAppType } from '@/utils/common'
+import { getToken, setToken, removeToken } from '@/utils/common'
 import { login, getAuthMenus } from '@/app/api/auth'
 import storage from '@/utils/storage'
 import router from '@/router'
-import { getApply } from '@/app/api/apply'
 import { formatRouters, findFirstValidRoute } from '@/router/routers'
 
 interface User {
@@ -27,18 +26,16 @@ const useUserStore = defineStore('user', {
     actions: {
         login(form: object) {
             return new Promise((resolve, reject) => {
-                login(form)
-                    .then((res) => {
-                        this.token = res.data.token
-                        this.userInfo = res.data.userinfo
-                        setToken(res.data.token)
-                        storage.set({ key: 'userinfo', data: res.data.userinfo })
-                        storage.set({ key: 'comparisonTokenStorage', data: res.data.token })
-                        resolve(res)
-                    })
-                    .catch((error) => {
-                        reject(error)
-                    })
+                login(form).then((res) => {
+                    this.token = res.data.token
+                    this.userInfo = res.data.userinfo
+                    setToken(res.data.token)
+                    storage.set({ key: 'userinfo', data: res.data.userinfo })
+                    storage.set({ key: 'comparisonTokenStorage', data: res.data.token })
+                    resolve(res)
+                }).catch((error) => {
+                    reject(error)
+                })
             })
         },
         clearRouters() {
@@ -52,27 +49,29 @@ const useUserStore = defineStore('user', {
             this.routers = []
             router.push('/login')
         },
-        getAuthMenus() {
+        getAuthMenusFn() {
             return new Promise((resolve, reject) => {
-                getAuthMenus()
-                    .then((res) => {
-                        this.routers = formatRouters(res.data)
-                        // 获取插件的首个菜单
-                        this.routers.forEach((item, index) => {
-                            if (item.meta.app !== '') {
-                                if (item.children && item.children.length) {
-                                    this.addonIndexRoute[item.meta.addon] = findFirstValidRoute(item.children)
-                                } else {
-                                    this.addonIndexRoute[item.meta.addon] = item.name
-                                }
+                getAuthMenus({}).then((res) => {
+                    this.routers = formatRouters(res.data)
+                    // 获取插件的首个菜单
+                    this.routers.forEach((item, index) => {
+                        if (item.meta.app !== '') {
+                            if (item.children && item.children.length) {
+                                this.addonIndexRoute[item.meta.addon] = findFirstValidRoute(item.children)
+                            } else {
+                                this.addonIndexRoute[item.meta.addon] = item.name
                             }
-                        })
-                        resolve(res)
-                    })
-                    .catch((error) => {
-                        reject(error)
+                        }
                     })
+                    resolve(res)
+                }).catch((error) => {
+                    reject(error)
+                })
             })
+        },
+        setUserInfo(data: any) {
+            this.userInfo = data
+            storage.set({ key: 'userinfo', data: data })
         }
     }
 })
diff --git a/admin/src/styles/common.scss b/admin/src/styles/common.scss
index 589880a16..c5436c7ce 100644
--- a/admin/src/styles/common.scss
+++ b/admin/src/styles/common.scss
@@ -15,6 +15,18 @@ html, body {
     outline: none;
 }
 
+// 字体设置
+// 海报价格字体
+@font-face {
+    font-family: 'poster_price_font';
+    src: url('./font/price.ttf') format('truetype');
+}
+// 海报价格字体
+@font-face {
+    font-family: 'poster_default_font';
+    src: url('./font/SourceHanSansCN-Regular.ttf') format('truetype');
+}
+
 // 以下最新，请勿改动 2024.5.25
 
 /** 数据展示面板 **/
diff --git a/admin/src/styles/font/SourceHanSansCN-Regular.ttf b/admin/src/styles/font/SourceHanSansCN-Regular.ttf
new file mode 100644
index 000000000..ca9fca1bd
Binary files /dev/null and b/admin/src/styles/font/SourceHanSansCN-Regular.ttf differ
diff --git a/admin/src/styles/font/price.ttf b/admin/src/styles/font/price.ttf
new file mode 100644
index 000000000..6483758ed
Binary files /dev/null and b/admin/src/styles/font/price.ttf differ
diff --git a/admin/src/styles/icon/addon-iconfont.css b/admin/src/styles/icon/addon-iconfont.css
index f40f23509..4401b31bd 100644
--- a/admin/src/styles/icon/addon-iconfont.css
+++ b/admin/src/styles/icon/addon-iconfont.css
@@ -1 +1,2 @@
-/* addon-iconfont */
\ No newline at end of file
+@import "addon/o2o/iconfont.css";
+@import "addon/tourism/iconfont.css";
diff --git a/admin/src/styles/icon/addon/o2o/iconfont.css b/admin/src/styles/icon/addon/o2o/iconfont.css
new file mode 100644
index 000000000..17076410c
--- /dev/null
+++ b/admin/src/styles/icon/addon/o2o/iconfont.css
@@ -0,0 +1,38 @@
+@font-face {
+  font-family: "o2o"; /* Project id 4412516 */
+  src: url('//at.alicdn.com/t/c/font_4412516_cacqsbew46.woff2?t=1705720131974') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4412516_cacqsbew46.woff?t=1705720131974') format('woff'),
+       url('//at.alicdn.com/t/c/font_4412516_cacqsbew46.ttf?t=1705720131974') format('truetype');
+}
+
+.o2o {
+  font-family: "o2o" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.o2o-icon-danhanghuadong:before {
+  content: "\e66f";
+}
+
+.o2o-icon-yuanjiao:before {
+  content: "\e6c0";
+}
+
+.o2o-icon-gl-square:before {
+  content: "\ea92";
+}
+
+.o2o-icon-sousuo12:before {
+  content: "\e699";
+}
+
+.o2o-icon-sousuo11:before {
+  content: "\e6d4";
+}
+
+.o2o-icon-jishi:before {
+  content: "\e600";
+}
diff --git a/admin/src/styles/icon/addon/o2o/iconfont.json b/admin/src/styles/icon/addon/o2o/iconfont.json
new file mode 100644
index 000000000..4ae38c0c4
--- /dev/null
+++ b/admin/src/styles/icon/addon/o2o/iconfont.json
@@ -0,0 +1,51 @@
+{
+  "id": "4412516",
+  "name": "上门服务",
+  "font_family": "o2o",
+  "css_prefix_text": "o2o-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "30621139",
+      "name": "单行滑动",
+      "font_class": "danhanghuadong",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "7149037",
+      "name": "圆角",
+      "font_class": "yuanjiao",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "7594344",
+      "name": "20gl-square",
+      "font_class": "gl-square",
+      "unicode": "ea92",
+      "unicode_decimal": 60050
+    },
+    {
+      "icon_id": "10133070",
+      "name": "搜索",
+      "font_class": "sousuo12",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "14652583",
+      "name": "搜索",
+      "font_class": "sousuo11",
+      "unicode": "e6d4",
+      "unicode_decimal": 59092
+    },
+    {
+      "icon_id": "6818781",
+      "name": "技师",
+      "font_class": "jishi",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    }
+  ]
+}
diff --git a/admin/src/styles/icon/addon/tourism/iconfont.css b/admin/src/styles/icon/addon/tourism/iconfont.css
new file mode 100644
index 000000000..4e28126c0
--- /dev/null
+++ b/admin/src/styles/icon/addon/tourism/iconfont.css
@@ -0,0 +1,58 @@
+@font-face {
+  font-family: "tourism"; /* Project id 4137250 */
+  src: url('//at.alicdn.com/t/c/font_4137250_st1ha9l0k1e.woff2?t=1687685028672') format('woff2'),
+  url('//at.alicdn.com/t/c/font_4137250_st1ha9l0k1e.woff?t=1687685028672') format('woff'),
+  url('//at.alicdn.com/t/c/font_4137250_st1ha9l0k1e.ttf?t=1687685028672') format('truetype');
+}
+
+.tourism {
+  font-family: "tourism" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.tourism-icon-feiji:before {
+  content: "\e600";
+}
+
+.tourism-icon-lvyou:before {
+  content: "\e6a9";
+}
+
+.tourism-icon-lvyouchanpin:before {
+  content: "\e63b";
+}
+
+.tourism-icon-lvyou1:before {
+  content: "\e623";
+}
+
+.tourism-icon-lvyou2:before {
+  content: "\e601";
+}
+
+.tourism-icon-lvyou3:before {
+  content: "\e60c";
+}
+
+.tourism-icon-lvyoubaochedingdan:before {
+  content: "\e612";
+}
+
+.tourism-icon-lvyou4:before {
+  content: "\e653";
+}
+
+.tourism-icon-lvyou5:before {
+  content: "\e610";
+}
+
+.tourism-icon-lvyouguanguang:before {
+  content: "\e87e";
+}
+
+.tourism-icon-lvyou6:before {
+  content: "\e642";
+}
diff --git a/admin/src/styles/icon/addon/tourism/iconfont.json b/admin/src/styles/icon/addon/tourism/iconfont.json
new file mode 100644
index 000000000..f9bc2b78e
--- /dev/null
+++ b/admin/src/styles/icon/addon/tourism/iconfont.json
@@ -0,0 +1,86 @@
+{
+  "id": "4137250",
+  "name": "旅游业",
+  "font_family": "tourism",
+  "css_prefix_text": "tourism-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1443",
+      "name": "飞机",
+      "font_class": "feiji",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "446824",
+      "name": "旅游",
+      "font_class": "lvyou",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "1167173",
+      "name": "旅游产品",
+      "font_class": "lvyouchanpin",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "1354920",
+      "name": "旅游",
+      "font_class": "lvyou1",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "1505555",
+      "name": "旅游",
+      "font_class": "lvyou2",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "2121726",
+      "name": "旅游",
+      "font_class": "lvyou3",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "2357494",
+      "name": "旅游包车订单",
+      "font_class": "lvyoubaochedingdan",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "3944019",
+      "name": "旅游",
+      "font_class": "lvyou4",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "4838220",
+      "name": "旅游",
+      "font_class": "lvyou5",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
+    {
+      "icon_id": "7444178",
+      "name": "旅游观光",
+      "font_class": "lvyouguanguang",
+      "unicode": "e87e",
+      "unicode_decimal": 59518
+    },
+    {
+      "icon_id": "9748082",
+      "name": "旅游",
+      "font_class": "lvyou6",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    }
+  ]
+}
diff --git a/admin/src/styles/icon/iconfont.css b/admin/src/styles/icon/iconfont.css
index 793b1afc1..99550e757 100644
--- a/admin/src/styles/icon/iconfont.css
+++ b/admin/src/styles/icon/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
     font-family: "iconfont"; /* Project id 3883393 */
-    src: url('//at.alicdn.com/t/c/font_3883393_j1lel8pwx7r.woff2?t=1718420877544') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3883393_j1lel8pwx7r.woff?t=1718420877544') format('woff'),
-         url('//at.alicdn.com/t/c/font_3883393_j1lel8pwx7r.ttf?t=1718420877544') format('truetype');
+    src: url('//at.alicdn.com/t/c/font_3883393_go2pmb0sgk8.woff2?t=1720506563694') format('woff2'),
+         url('//at.alicdn.com/t/c/font_3883393_go2pmb0sgk8.woff?t=1720506563694') format('woff'),
+         url('//at.alicdn.com/t/c/font_3883393_go2pmb0sgk8.ttf?t=1720506563694') format('truetype');
   }
   
   .iconfont {
@@ -13,6 +13,74 @@
     -moz-osx-font-smoothing: grayscale;
   }
   
+  .icondiduiqi1:before {
+    content: "\e7b0";
+  }
+  
+  .icondingduiqi1:before {
+    content: "\e827";
+  }
+  
+  .iconchuizhijuzhong1:before {
+    content: "\e828";
+  }
+  
+  .iconzuoduiqi1:before {
+    content: "\e829";
+  }
+  
+  .iconshuipingjuzhong1:before {
+    content: "\e82a";
+  }
+  
+  .iconyouduiqi1:before {
+    content: "\e82b";
+  }
+  
+  .iconxiaochengxu2:before {
+    content: "\e63d";
+  }
+  
+  .icondingdan1:before {
+    content: "\e7b1";
+  }
+  
+  .iconqiandaoguanli:before {
+    content: "\e7b2";
+  }
+  
+  .iconqiandaojilu:before {
+    content: "\e7b3";
+  }
+  
+  .iconshangpincanshu:before {
+    content: "\e820";
+  }
+  
+  .iconpingtaiyouhuiquan:before {
+    content: "\e821";
+  }
+  
+  .iconshangpin:before {
+    content: "\e822";
+  }
+  
+  .iconyingxiao1:before {
+    content: "\e823";
+  }
+  
+  .iconqiandaoshezhi:before {
+    content: "\e824";
+  }
+  
+  .icondianpuyouhuiquan:before {
+    content: "\e825";
+  }
+  
+  .iconshangpinpinpai1:before {
+    content: "\e826";
+  }
+  
   .iconmofangpc:before {
     content: "\e7e6";
   }
@@ -2037,12 +2105,12 @@
     content: "\e659";
   }
   
-  .icon31daifahuo:before {
-    content: "\e634";
+  .icondaifahuo1:before {
+    content: "\e899";
   }
   
-  .icon31daifukuan:before {
-    content: "\e637";
+  .icondaifukuan1:before {
+    content: "\e898";
   }
   
   .icon31dianhua:before {
@@ -2154,7 +2222,7 @@
   }
   
   .iconwenhao:before {
-    content: "\e72d";
+    content: "\e890";
   }
   
   .iconmofang-liangzuoliangyou:before {
diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts
index 8223e6ce9..1740eb038 100644
--- a/admin/src/utils/common.ts
+++ b/admin/src/utils/common.ts
@@ -16,7 +16,6 @@ export function useElementIcon(app: App): void {
 
 /**
  * 设置主题色
- * @param color
  */
 export function setThemeColor(color: string, mode: string = 'light'): void {
     useCssVar('--el-color-primary', null).value = color
@@ -244,7 +243,6 @@ export function moneyFormat(money : string) : string {
 
 /**
  * 时间戳转日期格式
- * @param {Object} timeStamp
  */
 export function timeStampTurnTime(timeStamp, type = "") {
 	if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
@@ -276,14 +274,19 @@ export function timeStampTurnTime(timeStamp, type = "") {
 }
 
 /**
- * 过滤小数点
+ * 过滤小数点(保留两位)
  * @param event
  */
 export function filterDigit(event:any){
     event.target.value = event.target.value.replace(/[^\d\.]/g,'');
     event.target.value = event.target.value.replace(/^\./g,'');
     event.target.value = event.target.value.replace(/\.{2,}/g,'.');
-    event.target.value = event.target.value.replace('.','$#$').replace(/\./g,'').replace('$#$','.');
+    // 限制最多两位小数
+    const decimalParts = event.target.value.split('.');
+    if (decimalParts.length > 1 && decimalParts[1].length > 2) {
+        // 如果有小数部分且超过两位，则截取前两位
+        event.target.value = `${decimalParts[0]}.${decimalParts[1].slice(0, 2)}`;
+    }
 }
 
 /**
@@ -293,6 +296,7 @@ export function filterDigit(event:any){
 export function filterNumber(event:any){
     event.target.value = event.target.value.replace(/[^\d]/g,'');
 }
+
 /**
  * 过滤特殊字符
   * @param event
diff --git a/admin/src/utils/lodop.ts b/admin/src/utils/lodop.ts
new file mode 100644
index 000000000..8f46739d4
--- /dev/null
+++ b/admin/src/utils/lodop.ts
@@ -0,0 +1,224 @@
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref } from 'vue'
+
+// Web打印服务CLodop/Lodop7
+
+// 用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占:
+const MainJS = "CLodopfuncs.js";
+const URL_WS1: any = ref("ws://localhost:{port}/" + MainJS); // ws用8000/18000
+const URL_WS2: any = ref("ws://localhost:{port}/" + MainJS);
+const URL_HTTP1: any = ref("http://localhost:{port}/" + MainJS); // http用8000/18000
+const URL_HTTP2: any = ref("http://localhost:{port}/" + MainJS);
+const URL_HTTP3: any = ref("https://localhost.lodop.net:{port}/" + MainJS); // https用8000/8443
+
+const CreatedOKLodopObject: any = ref(null);
+const CLodopIsLocal: any = ref(null);
+const LoadJsState: any = ref('');
+
+const initPort = (paramas: any) => {
+    if (!paramas) {
+        paramas = {
+            server_port1: 8000,
+            server_port2: 18000,
+            https_port: 8443
+        };
+    }
+    URL_WS1.value = URL_WS1.value.replace('{port}', paramas.server_port1);
+    URL_WS2.value = URL_WS2.value.replace('{port}', paramas.server_port2);
+
+    URL_HTTP1.value = URL_HTTP1.value.replace('{port}', paramas.server_port1);
+    URL_HTTP2.value = URL_HTTP2.value.replace('{port}', paramas.server_port2);
+
+    URL_HTTP3.value = URL_HTTP2.value.replace('{port}', paramas.https_port);
+
+}
+
+//==判断是否需要CLodop(那些不支持插件的浏览器):==
+const needCLodop = () => {
+    try {
+        let ua = navigator.userAgent;
+        if (ua.match(/Windows\sPhone/i) ||
+            ua.match(/iPhone|iPod|iPad/i) ||
+            ua.match(/Android/i) ||
+            ua.match(/Edge\D?\d+/i))
+            return true;
+        let verTrident = ua.match(/Trident\D?\d+/i);
+        let verIE = ua.match(/MSIE\D?\d+/i);
+        let verOPR: any = ua.match(/OPR\D?\d+/i);
+        let verFF: any = ua.match(/Firefox\D?\d+/i);
+        let x64 = ua.match(/x64/i);
+        if ((!verTrident) && (!verIE) && (x64)) return true;
+        else if (verFF) {
+            verFF = verFF[0].match(/\d+/);
+            if ((verFF[0] >= 41) || (x64)) return true;
+        } else if (verOPR) {
+            verOPR = verOPR[0].match(/\d+/);
+            if (verOPR[0] >= 32) return true;
+        } else if ((!verTrident) && (!verIE)) {
+            let verChrome: any = ua.match(/Chrome\D?\d+/i);
+            if (verChrome) {
+                verChrome = verChrome[0].match(/\d+/);
+                if (verChrome[0] >= 41) return true;
+            }
+        }
+        return false;
+    } catch (err) {
+        return true;
+    }
+};
+
+// ==检查加载成功与否，如没成功则用http(s)再试==
+// ==低版本CLODOP6.561/Lodop7.043及前)用本方法==
+function checkOrTryHttp() {
+    if (window.getCLodop) {
+        LoadJsState.value = "complete";
+        return true;
+    }
+    if (LoadJsState.value == "loadingB" || LoadJsState.value == "complete") return;
+    LoadJsState.value = "loadingB";
+    let head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+    let JS1 = document.createElement("script")
+        , JS2 = document.createElement("script")
+        , JS3 = document.createElement("script");
+    JS1.src = URL_HTTP1.value;
+    JS2.src = URL_HTTP2.value;
+    JS3.src = URL_HTTP3.value;
+    JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror = function () {
+        LoadJsState.value = "complete";
+    };
+    JS1.onerror = function (e) {
+        if (window.location.protocol !== 'https:') {
+            head.insertBefore(JS2, head.firstChild);
+        } else {
+            head.insertBefore(JS3, head.firstChild);
+        }
+    };
+    head.insertBefore(JS1, head.firstChild);
+}
+
+// ==加载Lodop对象的主过程:==
+const loadCLodop = (paramas: any = null) => {
+    if (!needCLodop()) return;
+
+    initPort(paramas);
+
+    CLodopIsLocal.value = !!((URL_WS1.value + URL_WS2.value).match(/\/\/localho|\/\/127.0.0./i));
+    LoadJsState.value = "loadingA";
+    if (!window.WebSocket && window.MozWebSocket) window.WebSocket = window.MozWebSocket;
+    //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
+    try {
+        let WSK1 = new WebSocket(URL_WS1.value);
+        WSK1.onopen = function (e) {
+            setTimeout(checkOrTryHttp, 200);
+        };
+        WSK1.onmessage = function (e) {
+            if (!window.getCLodop) eval(e.data);
+        };
+        WSK1.onerror = function (e) {
+            let WSK2 = new WebSocket(URL_WS2.value);
+            WSK2.onopen = function (e) {
+                setTimeout(checkOrTryHttp, 200);
+            };
+            WSK2.onmessage = function (e) {
+                if (!window.getCLodop) eval(e.data);
+            };
+            WSK2.onerror = function (e) {
+                checkOrTryHttp();
+            }
+        }
+    } catch (e) {
+        checkOrTryHttp();
+    }
+};
+
+//==获取LODOP对象主过程,判断是否安装、需否升级:==
+const getLodop = (oOBJECT = null, oEMBED = null) => {
+    let strFontTag = "<br>打印控件";
+    let strLodopInstall = strFontTag + "未安装!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行安装</a>";
+    let strLodopUpdate = strFontTag + "需要升级!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行升级</a>";
+    let strCLodopInstallA = "<br>Web打印服务CLodop未安装启动，点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>下载执行安装</a>";
+    let strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_blank' class='text-primary'>点这里直接再次启动</a>）";
+    let strCLodopUpdate = "<br>Web打印服务CLodop需升级!点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>执行升级</a>";
+    let strLodop7FontTag = "<br>Web打印服务Lodop7";
+    let strLodop7HrefX86 = "点击这里<a href='http://www.lodop.net/download.html' target='_blank' class='text-primary'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
+    let strLodop7Install_X86 = strLodop7FontTag + "未安装启动，" + strLodop7HrefX86;
+    let strLodop7Update_X86 = strLodop7FontTag + "需升级，" + strLodop7HrefX86;
+    let strInstallOK = "，成功后请刷新本页面或重启浏览器。";
+    let LODOP;
+    try {
+        let isWinIE = (/MSIE/i.test(navigator.userAgent)) || (/Trident/i.test(navigator.userAgent));
+        let isLinuxX86 = (/Linux/i.test(navigator.platform)) && (/x86/i.test(navigator.platform));
+        let isLinuxARM = (/Linux/i.test(navigator.platform)) && (/aarch/i.test(navigator.platform));
+
+        if (needCLodop() || isLinuxX86 || isLinuxARM) {
+            try {
+                LODOP = window.getCLodop();
+            } catch (err) {
+            }
+            if (!LODOP && LoadJsState.value !== "complete") {
+                if (!LoadJsState.value) {
+                    ElMessageBox.alert('未曾加载Lodop主JS文件，请先调用loadCLodop过程', '提示', { dangerouslyUseHTMLString: true, })
+                } else {
+                    ElMessageBox.alert('网页还没下载完毕，请稍等一下再操作', '提示', { dangerouslyUseHTMLString: true, })
+                }
+                return;
+            }
+            let strAlertMessage;
+            if (!LODOP) {
+                if (isLinuxX86 || isLinuxARM)
+                    strAlertMessage = strLodop7Install_X86;
+                else
+                    strAlertMessage = strCLodopInstallA + (CLodopIsLocal.value ? strCLodopInstallB : "");
+
+                ElMessageBox.alert(strAlertMessage + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+                return;
+            } else {
+                if ((isLinuxX86 || isLinuxARM) && LODOP.CVERSION < "7.0.7.5")
+                    strAlertMessage = strLodop7Update_X86;
+                else if (CLODOP.CVERSION < "6.5.9.8")
+                    strAlertMessage = strCLodopUpdate;
+
+                if (strAlertMessage) {
+                    ElMessageBox.alert(strAlertMessage + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+                }
+            }
+        } else {
+            //==如果页面有Lodop插件就直接使用,否则新建:==
+            if (oOBJECT || oEMBED) {
+                if (isWinIE) LODOP = oOBJECT;
+                else LODOP = oEMBED;
+            } else if (!CreatedOKLodopObject.value) {
+                LODOP = document.createElement("object");
+                LODOP.setAttribute("width", 0);
+                LODOP.setAttribute("height", 0);
+                LODOP.setAttribute("style", "position:absolute;left:0px;top:-100px;width:0px;height:0px;");
+                if (isWinIE) LODOP.setAttribute("classid", "clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
+                else LODOP.setAttribute("type", "application/x-print-lodop");
+                document.documentElement.appendChild(LODOP);
+                CreatedOKLodopObject.value = LODOP;
+            } else
+                LODOP = CreatedOKLodopObject.value;
+            //==Lodop插件未安装时提示下载地址:==
+            if ((!LODOP) || (!LODOP.VERSION)) {
+                ElMessageBox.alert(strLodopInstall + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+                return LODOP;
+            }
+            if (LODOP.VERSION < "6.2.2.6") {
+                ElMessageBox.alert(strLodopUpdate + strInstallOK, '提示', { dangerouslyUseHTMLString: true, })
+            }
+        }
+
+        //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
+
+        //===============================================================================
+        return LODOP;
+    } catch (err) {
+        ElMessage({
+            message: "getLodop出错:" + err,
+            type: 'error',
+            duration: 5000
+        })
+    }
+};
+
+export { loadCLodop, getLodop }
diff --git a/admin/src/utils/test.ts b/admin/src/utils/test.ts
index 23e244720..33cfec089 100644
--- a/admin/src/utils/test.ts
+++ b/admin/src/utils/test.ts
@@ -230,8 +230,6 @@ const test = {
     },
     /**
      * 是否为正则对象
-     * @param {Object}
-     * @return {Boolean}
      */
     regExp(o) {
         return o && Object.prototype.toString.call(o) === '[object RegExp]'