diff --git a/admin/src/App.vue b/admin/src/App.vue
index e5191849d..f56b86b2a 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -12,7 +12,6 @@ import useSystemStore from '@/stores/modules/system'
 import useAppStore from '@/stores/modules/app'
 import { useDark, useToggle } from '@vueuse/core'
 import { setThemeColor } from '@/utils/common'
-import { language } from '@/lang'
 import { useRoute } from 'vue-router'
 
 const route = useRoute()
@@ -20,15 +19,14 @@ const route = useRoute()
 // 初始化设置语言
 const systemStore = useSystemStore()
 const locale = computed(() => (systemStore.lang === 'zh-cn' ? zhCn : en))
-language.loadLocaleMessages(route.path, systemStore.lang)
 
 const toggleDark = useToggle(useDark())
 
 watch(route, () => {
     useAppStore().$patch(state => {
-        state.route = route.path
+        state.route = route.meta.view || route.path
     })
-})
+}, { immediate: true })
 
 onMounted(() => {
     // 设置主题色
diff --git a/admin/src/api/diy.ts b/admin/src/api/diy.ts
index 313e0bd75..df66a57a2 100644
--- a/admin/src/api/diy.ts
+++ b/admin/src/api/diy.ts
@@ -2,13 +2,22 @@ import request from '@/utils/request'
 
 /***************************************************** 自定义页面 ****************************************************/
 
+/**
+ * 获取自定义页面分页列表
+ * @param params
+ * @returns
+ */
+export function getDiyPageList(params: Record<string, any>) {
+    return request.get(`diy/diy`, {params})
+}
+
 /**
  * 获取自定义页面列表
  * @param params
  * @returns
  */
-export function getDiyPageList(params: Record<string, any>) {
-    return request.get(`diy/diy`, { params })
+export function getDiyList(params: Record<string, any>) {
+    return request.get(`diy/list`, {params})
 }
 
 /**
@@ -26,7 +35,7 @@ export function getDiyPageInfo(id: number) {
  * @returns
  */
 export function addDiyPage(params: Record<string, any>) {
-    return request.post('diy/diy', params, { showSuccessMessage: true })
+    return request.post('diy/diy', params, {showSuccessMessage: true})
 }
 
 /**
@@ -34,7 +43,7 @@ export function addDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function editDiyPage(params: Record<string, any>) {
-    return request.put(`diy/diy/${params.id}`, params, { showSuccessMessage: true })
+    return request.put(`diy/diy/${params.id}`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -42,7 +51,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, {showSuccessMessage: true})
 }
 
 /**
@@ -50,7 +59,7 @@ export function setUseDiyPage(params: Record<string, any>) {
  * @param params
  */
 export function editDiyPageShare(params: Record<string, any>) {
-    return request.put(`diy/diy/share`, params, { showSuccessMessage: true })
+    return request.put(`diy/diy/share`, params, {showSuccessMessage: true})
 }
 
 /**
@@ -59,28 +68,28 @@ export function editDiyPageShare(params: Record<string, any>) {
  * @returns
  */
 export function deleteDiyPage(id: number) {
-    return request.delete(`diy/diy/${id}`, { showSuccessMessage: true })
+    return request.delete(`diy/diy/${id}`, {showSuccessMessage: true})
 }
 
 /**
  * 获取自定义页面初始化数据
  */
 export function initPage(params: Record<string, any>) {
-    return request.get(`diy/init`, { params })
+    return request.get(`diy/init`, {params})
 }
 
 /**
  * 获取自定义链接列表
  */
 export function getLink(params: Record<string, any>) {
-    return request.get(`diy/link`, { params })
+    return request.get(`diy/link`, {params})
 }
 
 /**
  * 获取底部导航数据
  */
 export function getDiyBottom(params: Record<string, any>) {
-    return request.get(`diy/bottom`, { params })
+    return request.get(`diy/bottom`, {params})
 }
 
 /**
@@ -89,14 +98,14 @@ export function getDiyBottom(params: Record<string, any>) {
  * @returns
  */
 export function setDiyBottom(params: Record<string, any>) {
-    return request.post('diy/bottom', params, { showSuccessMessage: true })
+    return request.post('diy/bottom', params, {showSuccessMessage: true})
 }
 
 /**
  * 获取页面模板
  */
 export function getDiyTemplate(params: Record<string, any>) {
-    return request.get(`diy/template`, { params })
+    return request.get(`diy/template`, {params})
 }
 
 /**
@@ -105,7 +114,7 @@ export function getDiyTemplate(params: Record<string, any>) {
  * @returns
  */
 export function getDiyRouteList(params: Record<string, any>) {
-    return request.get(`diy/route`, { params })
+    return request.get(`diy/route`, {params})
 }
 
 /**
@@ -113,7 +122,7 @@ export function getDiyRouteList(params: Record<string, any>) {
  * @param params
  */
 export function getDiyRouteInfo(params: Record<string, any>) {
-    return request.get(`diy/route/info`, { params });
+    return request.get(`diy/route/info`, {params});
 }
 
 /**
@@ -121,5 +130,32 @@ export function getDiyRouteInfo(params: Record<string, any>) {
  * @param params
  */
 export function editDiyRouteShare(params: Record<string, any>) {
-    return request.put(`diy/route/share`, params, { showSuccessMessage: true })
+    return request.put(`diy/route/share`, params, {showSuccessMessage: true})
+}
+
+/**
+ * 获取自定义页面列表
+ * @param params
+ * @returns
+ */
+export function getDecoratePage(params: Record<string, any>) {
+    return request.get(`diy/decorate`, {params})
+}
+
+/**
+ * 切换模板
+ * @param params
+ * @returns
+ */
+export function changeTemplate(params: Record<string, any>) {
+    return request.put(`diy/change`, params, {showSuccessMessage: true})
+}
+
+/**
+ * 获取预览数据
+ * @param params
+ * @returns
+ */
+export function getPreviewData(params: Record<string, any>) {
+    return request.put(`diy/preview`, params, {showSuccessMessage: false})
 }
\ No newline at end of file
diff --git a/admin/src/api/site.ts b/admin/src/api/site.ts
index 8a57eee23..d4e89cb36 100644
--- a/admin/src/api/site.ts
+++ b/admin/src/api/site.ts
@@ -216,4 +216,39 @@ export function getLogList(params: Record<string, any>) {
  */
 export function getLogInfo(id: number) {
     return request.get(`site/log/${id}`)
+}
+/***************************************************** 账单列表 **************************************************/
+
+/**
+ * 获取账单列表
+ * @param params 
+ * @returns 
+ */
+export function getAccountList(params: Record<string, any>) {
+    return request.get(`site/account`, { params })
+}
+
+/**
+ * 获取账单详情
+ * @param params 
+ * @returns 
+ */
+export function getAccountInfo(id: number) {
+    return request.get(`site/account/${id}`)
+}
+
+/**
+ * 获取账单统计
+ * @returns 
+ */
+export function getAccountStat() {
+    return request.get(`site/account/stat`)
+}
+
+/**
+ * 获取账单类型
+ * @returns 
+ */
+export function getAccountType() {
+    return request.get(`site/account/type`)
 }
\ No newline at end of file
diff --git a/admin/src/api/sys.ts b/admin/src/api/sys.ts
index 6ed0283fe..8d061e423 100644
--- a/admin/src/api/sys.ts
+++ b/admin/src/api/sys.ts
@@ -244,6 +244,26 @@ export function moveAttachment(params: Record<string, any>) {
     return request.put(`sys/attachment/batchmove`, params)
 }
 
+/**
+ * 获取menu菜单
+ */
+export function getAuthMenu() {
+    return request.get(`auth/site/showmenu`)
+}
+
+/**
+ * 获取快捷菜单
+ */
+export function getShortcutMenu() {
+    return request.get(`sys/config/shortcut_menu`)
+}
+
+/**
+ * 添加快捷菜单
+ */
+export function setShortcutMenu(params: Record<string, any>) {
+    return request.put(`sys/config/shortcut_menu`, params, { showSuccessMessage: true })
+}
 
 /***************************************************** 地址管理 ****************************************************/
 
@@ -265,6 +285,21 @@ export function getAreatree(level: number = 1) {
     return request.get(`sys/area/tree/${level}`)
 }
 
+
+/**
+ * 获取地址信息
+ */
+export function getAddressInfo(params: any) {
+    return request.get(`sys/area/get_info`, { params })
+}
+
+/**
+ * 获取地址信息
+ */
+export function getContraryAddress(params: any) {
+    return request.get(`sys/area/contrary`, { params })
+}
+
 /***************************************************** 存储设置 ****************************************************/
 
 /**
@@ -345,7 +380,7 @@ export function setTransferInfo(params: Record<string, any>) {
  * @returns 
  */
 export function getCronList(params: any) {
-    return request.get(`sys/cron`, { params })
+    return request.get(`sys/schedule/list`, { params })
 }
 
 /**
@@ -481,5 +516,17 @@ export function getMap() {
     return request.get(`sys/config/map`)
 }
 
+/***************************************************** 首页 ****************************************************/
+/**
+ * 获取首页列表
+ */
+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 })
+}
diff --git a/admin/src/assets/images/index/add_menu.png b/admin/src/assets/images/index/add_menu.png
new file mode 100644
index 000000000..3bc05d8fc
Binary files /dev/null and b/admin/src/assets/images/index/add_menu.png differ
diff --git a/admin/src/assets/images/index/del_model.png b/admin/src/assets/images/index/del_model.png
new file mode 100644
index 000000000..ac223b9ed
Binary files /dev/null and b/admin/src/assets/images/index/del_model.png differ
diff --git a/admin/src/assets/images/index/edit.png b/admin/src/assets/images/index/edit.png
new file mode 100644
index 000000000..97f8eda29
Binary files /dev/null and b/admin/src/assets/images/index/edit.png differ
diff --git a/admin/src/assets/images/index/model_tag.png b/admin/src/assets/images/index/model_tag.png
new file mode 100644
index 000000000..01cfc40f7
Binary files /dev/null and b/admin/src/assets/images/index/model_tag.png differ
diff --git a/admin/src/assets/images/index/site_img.png b/admin/src/assets/images/index/site_img.png
new file mode 100644
index 000000000..9cb88f39f
Binary files /dev/null and b/admin/src/assets/images/index/site_img.png differ
diff --git a/admin/src/assets/images/iphone_bg.png b/admin/src/assets/images/iphone_bg.png
new file mode 100644
index 000000000..3feb4143e
Binary files /dev/null and b/admin/src/assets/images/iphone_bg.png differ
diff --git a/admin/src/lang/language.ts b/admin/src/lang/language.ts
index f62c565be..5d363f8cb 100644
--- a/admin/src/lang/language.ts
+++ b/admin/src/lang/language.ts
@@ -44,7 +44,6 @@ class Language {
             this.setI18nLanguage(locale)
             return nextTick()
         } catch (e) {
-            console.log(e)
             this.setI18nLanguage(locale)
             return nextTick()
         }
diff --git a/admin/src/lang/zh-cn/app_store.json b/admin/src/lang/zh-cn/app.store.json
similarity index 100%
rename from admin/src/lang/zh-cn/app_store.json
rename to admin/src/lang/zh-cn/app.store.json
diff --git a/admin/src/lang/zh-cn/auth.menu.site.json b/admin/src/lang/zh-cn/auth.menu.site.json
deleted file mode 100644
index b8d33d6ef..000000000
--- a/admin/src/lang/zh-cn/auth.menu.site.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "menuName": "菜单名称",
-    "menuType": "类型",
-    "authId": "权限标识",
-    "menuTypeDir": "目录",
-    "menuTypeMenu": "菜单",
-    "menuTypeButton": "按钮",
-    "menuDeleteTips": "确定要删除该菜单吗？",
-    "addMenu": "添加菜单",
-    "updateMenu": "编辑菜单",
-    "routePath": "路由路径",
-    "viewPath": "组件路径",
-    "parentMenu": "父级菜单",
-    "menuIcon": "菜单图标",
-    "sort":"权重",
-    "menuKey":"菜单标识",
-    "menuNamePlaceholder": "请输入菜单名称",
-    "menuKeyPlaceholder": "请输入菜单标识",
-    "menuKeyValidata":"菜单标识只能使用字母数字下划线并且开头不能为数字",
-    "routePathPlaceholder": "请输入路由路径",
-    "viewPathPlaceholder": "请输入组件路径",
-    "authIdPlaceholder": "请输入权限标识",
-    "selectIconPlaceholder": "请选择菜单图标",
-    "topLevel": "顶级"
-}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/auth.menu.admin.json b/admin/src/lang/zh-cn/auth.site_menu.json
similarity index 100%
rename from admin/src/lang/zh-cn/auth.menu.admin.json
rename to admin/src/lang/zh-cn/auth.site_menu.json
diff --git a/admin/src/lang/zh-cn/channel.weapp.message.json b/admin/src/lang/zh-cn/channel.weapp.template.json
similarity index 100%
rename from admin/src/lang/zh-cn/channel.weapp.message.json
rename to admin/src/lang/zh-cn/channel.weapp.template.json
diff --git a/admin/src/lang/zh-cn/channel.wechat.message.json b/admin/src/lang/zh-cn/channel.wechat.template.json
similarity index 100%
rename from admin/src/lang/zh-cn/channel.wechat.message.json
rename to admin/src/lang/zh-cn/channel.wechat.template.json
diff --git a/admin/src/lang/zh-cn/common.json b/admin/src/lang/zh-cn/common.json
index 516e2635f..c22ab7c96 100644
--- a/admin/src/lang/zh-cn/common.json
+++ b/admin/src/lang/zh-cn/common.json
@@ -90,7 +90,9 @@
     "503": "服务不可用",
     "504": "网络超时",
     "505": "http版本不支持该请求",
-    "timeout": "网络请求超时！"
+    "timeout": "网络请求超时！",
+    "requestError": "请求错误",
+    "errNetwork": "网络请求错误"
   },
   "linkPlaceholder": "请选择跳转链接",
   "selectLinkTips": "链接选择",
@@ -105,5 +107,8 @@
   "emptyApp": "暂未安装任何应用",
   "newInfo": "最新消息",
   "mapSetting": "地图设置",
-  "mapKey": "腾讯地图KEY"
+  "mapKey": "腾讯地图KEY",
+  "indexTemplate": "首页模版",
+  "indexSwitch": "切换首页",
+  "indexWarning": "你确定要切换首页吗？"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/decorate.preview.json b/admin/src/lang/zh-cn/decorate.preview.json
new file mode 100644
index 000000000..b706dee11
--- /dev/null
+++ b/admin/src/lang/zh-cn/decorate.preview.json
@@ -0,0 +1,12 @@
+{
+  "preview": "预览",
+  "weapp": "微信小程序",
+  "wechat": "微信公众号",
+  "link": "链接",
+  "copy": "复制",
+  "copySuccess": "复制成功",
+  "weappNotSet": "小程序未配置",
+  "developTitle": "开发环境配置",
+  "wapDomain": "wap域名（WAP_DOMAIN）",
+  "wapDomainPlaceholder": "请输入wap域名"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/diy.member.json b/admin/src/lang/zh-cn/diy.edit.json
similarity index 77%
rename from admin/src/lang/zh-cn/diy.member.json
rename to admin/src/lang/zh-cn/diy.edit.json
index 512921482..a38a6a6a8 100644
--- a/admin/src/lang/zh-cn/diy.member.json
+++ b/admin/src/lang/zh-cn/diy.edit.json
@@ -1,9 +1,26 @@
 {
+  "developTitle": "开发环境配置",
+  "wapDomain": "wap域名（WAP_DOMAIN）",
+  "wapDomainPlaceholder": "请输入wap域名",
   "pageSet": "页面设置",
+  "tabEditContent": "内容",
+  "tabEditStyle": "样式",
+  "pageStyle": "页面样式",
   "pageContent": "页面内容",
   "pageName": "页面名称",
   "pageNamePlaceholder": "请输入页面名称",
   "pageBgColor": "页面颜色",
+  "bgUrl": "背景图片",
+  "marginSet": "边距设置",
+  "componentStyleTitle": "组件样式",
+  "bottomBgColor": "底部背景",
+  "bottomBgTips": "底部背景包含边距和圆角",
+  "componentBgColor": "组件背景",
+  "marginTop": "上边距",
+  "marginBottom": "下边距",
+  "marginBoth": "左右边距",
+  "topRounded": "上圆角",
+  "bottomRounded": "下圆角",
   "warmPrompt": "温馨提示",
   "leavePageTitleTips": "确定离开此页面？",
   "leavePageContentTips": "系统可能不会保存您所做的更改。",
@@ -27,7 +44,12 @@
   "imageAdsTips": "建议上传尺寸相同的图片，推荐尺寸750*350",
   "addImageAd": "添加图片",
   "imageUrlTip": "请上传图片",
+  "imageHeight": "图片高度",
+  "imageHeightPlaceholder": "请输入图片高度",
+  "imageHeightRegNum": "图片高度格式错误，请输入数字",
   "articleData": "文章数据",
+  "articleStyle": "文章样式",
+  "articleBgColor": "文章背景",
   "dataSources": "数据来源",
   "defaultSources": "默认",
   "manualSelectionSources": "手动选择",
@@ -65,6 +87,7 @@
   "addGraphicNav": "添加导航",
   "blankHeightSet": "高度设置",
   "blankHeight": "空白高度",
+  "styleSet": "风格设置",
   "titleStyle": "标题样式",
   "selectStyle": "风格选择",
   "titleContent": "标题内容",
@@ -73,6 +96,7 @@
   "textAlign": "对齐方式",
   "textAlignLeft": "居左",
   "textAlignCenter": "居中",
+  "textSet": "文字设置",
   "textFontSize": "文字大小",
   "textFontWeight": "文字粗细",
   "fontWeightBold": "加粗",
@@ -84,5 +108,6 @@
   "moreContent": "“更多”按钮内容",
   "more": "文字",
   "morePlaceholder": "请输入文字",
-  "moreIsShow": "是否显示"
+  "moreIsShow": "是否显示",
+  "memberStyle": "会员样式"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/diy.index.json b/admin/src/lang/zh-cn/diy.index.json
index 4c5e1f486..bac301df5 100644
--- a/admin/src/lang/zh-cn/diy.index.json
+++ b/admin/src/lang/zh-cn/diy.index.json
@@ -1,12 +1,19 @@
 {
   "decorate": "装修",
+  "pageDecorate": "页面装修",
+  "changeTemplate": "切换模板",
+  "templateName": "模板名称",
   "preview": "预览",
-  "weapp": "微信小程序",
-  "wechat": "微信公众号",
-  "link": "链接",
-  "copy": "复制",
-  "copySuccess": "复制成功",
-  "weappNotSet": "小程序未配置",
+  "hopeBeforeTip": "我希望把",
+  "hopeAfterTip": "切换成其他样式",
+  "changeTemplateTip": "选择",
+  "template": "模板",
+  "changeMyPageTip": "选择微页面作为",
+  "createPage": "创建微页面",
+  "myPage": "我的微页面",
+  "refreshPage": "刷新",
+  "placeholderTemplate": "请选择一个模板",
+  "placeholderMyPage": "请选择一个微页面",
   "developTitle": "开发环境配置",
   "wapDomain": "wap域名（WAP_DOMAIN）",
   "wapDomainPlaceholder": "请输入wap域名"
diff --git a/admin/src/lang/zh-cn/diy.list.json b/admin/src/lang/zh-cn/diy.list.json
index e951cb26b..c3ec6aa73 100644
--- a/admin/src/lang/zh-cn/diy.list.json
+++ b/admin/src/lang/zh-cn/diy.list.json
@@ -1,11 +1,12 @@
 {
   "title": "页面名称",
   "typeName": "页面模板",
+  "addType": "页面类型",
   "addPageTips": "创建新页面",
-  "pageTemplatePlaceholder": "请选择页面模板",
+  "pageTypePlaceholder": "请选择页面模板",
   "nameMax": "名称不能超过12个字符",
-  "templateName": "模板名称",
-  "empty": "空白",
+  "templateName": "已有模板",
+  "emptyTemplate": "空模板",
   "status": "状态",
   "updateTime": "更新时间",
   "use": "使用",
diff --git a/admin/src/lang/zh-cn/diy.preview.json b/admin/src/lang/zh-cn/diy.preview.json
new file mode 100644
index 000000000..b706dee11
--- /dev/null
+++ b/admin/src/lang/zh-cn/diy.preview.json
@@ -0,0 +1,12 @@
+{
+  "preview": "预览",
+  "weapp": "微信小程序",
+  "wechat": "微信公众号",
+  "link": "链接",
+  "copy": "复制",
+  "copySuccess": "复制成功",
+  "weappNotSet": "小程序未配置",
+  "developTitle": "开发环境配置",
+  "wapDomain": "wap域名（WAP_DOMAIN）",
+  "wapDomainPlaceholder": "请输入wap域名"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/diy.route.json b/admin/src/lang/zh-cn/diy.route.json
new file mode 100644
index 000000000..e951cb26b
--- /dev/null
+++ b/admin/src/lang/zh-cn/diy.route.json
@@ -0,0 +1,36 @@
+{
+  "title": "页面名称",
+  "typeName": "页面模板",
+  "addPageTips": "创建新页面",
+  "pageTemplatePlaceholder": "请选择页面模板",
+  "nameMax": "名称不能超过12个字符",
+  "templateName": "模板名称",
+  "empty": "空白",
+  "status": "状态",
+  "updateTime": "更新时间",
+  "use": "使用",
+  "isUse": "使用中",
+  "unused": "未使用",
+  "all": "全部",
+  "basicRoute": "基础页面",
+  "diyPage": "自定义页面",
+  "wapUrl": "wap链接",
+  "weappUrl": "小程序链接",
+  "shareLink": "分享链接",
+  "copy": "复制",
+  "copySuccess": "复制成功",
+  "titlePlaceholder": "请输入页面名称",
+  "addDiyPage": "添加页面",
+  "diyPageDeleteTips": "确定要删除该自定义页面吗？",
+  "promote": "推广",
+  "share": "分享",
+  "shareSet": "分享设置",
+  "sharePage": "分享页面",
+  "wechat": "微信公众号",
+  "weapp": "微信小程序",
+  "shareTitle": "分享标题",
+  "shareTitlePlaceholder": "请输入分享标题",
+  "shareDesc": "分享描述",
+  "shareDescPlaceholder": "请输入分享描述",
+  "shareImageUrl": "分享图片"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/finance.account.json b/admin/src/lang/zh-cn/finance.account.json
new file mode 100644
index 000000000..6d91b5570
--- /dev/null
+++ b/admin/src/lang/zh-cn/finance.account.json
@@ -0,0 +1,33 @@
+{
+    "id":"主键",
+    "accountDetail":"账单详情",
+    "detail":"详情",
+    "idPlaceholder":"请输入主键",
+    "siteId":"站点id",
+    "siteIdPlaceholder":"请输入站点id",
+    "type":"账单类型",
+    "money":"账单金额",
+    "moneyPlaceholder":"请输入账单金额",
+    "tradeNo":"账单编号",
+    "tradeNoPlaceholder":"请输入账单编号",
+    "createTime":"添加时间",
+    "createTimePlaceholder":"请输入添加时间",
+    "addSiteAccountLog":"添加站点账单记录",
+    "updateSiteAccountLog":"编辑站点账单记录",
+    "siteAccountLogDeleteTips":"确定要删除该站点账单记录吗？",
+    "totalPay":"累计收款（元）",
+    "totalRefund":"累计退款（元）",
+    "totalTransfer":"累计转账（元）",
+	"accountType": "请选择退款类型",
+	"startDate": "开始时间",
+	"endDate": "结束时间",
+	"transferNo" : "转账单号",
+	"transferTime": "转账时间",
+	"transferType": "转账类型",
+	"transferMoney": "转账金额",
+	"transferRemark": "转账说明",
+	"outTradeNo": "单号",
+	"refundMoney": "退款金额",
+	"failReason": "退款说明",
+	"body": "说明"
+}
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/index.json b/admin/src/lang/zh-cn/index.index.json
similarity index 100%
rename from admin/src/lang/zh-cn/index.json
rename to admin/src/lang/zh-cn/index.index.json
diff --git a/admin/src/lang/zh-cn/siteindex.json b/admin/src/lang/zh-cn/index.site_index.json
similarity index 66%
rename from admin/src/lang/zh-cn/siteindex.json
rename to admin/src/lang/zh-cn/index.site_index.json
index e3058ad30..8aae3b0b0 100644
--- a/admin/src/lang/zh-cn/siteindex.json
+++ b/admin/src/lang/zh-cn/index.site_index.json
@@ -40,5 +40,28 @@
 	"accumulative":"累计",
 	"officialAccount": "Niucloud官方公众号",
 	"officialAccountDesc": "微信扫码关注",
-	"WeCom": "添加企业微信群"
+	"WeCom": "添加企业微信群",
+	"path": "地址",
+	"menuName": "名称",
+	"menuNamePlaceholder": "模版名称",
+	"menuBgColor": "背景颜色",
+	"menuImg": "选择图标",
+	"menuDesc": "描述",
+	"addShortcutMenu": "添加快捷模版",
+	"appTemplate": "应用模块",
+	"siteType": "站点类型",
+	"periodTime": "有效期",
+	"renew": "续费",
+	"selectModel": "选择模版",
+	"addMenu": "添加模块",
+	"shortcutLink": "链接",
+	"emptyMenu": "暂无快捷模块",
+	"select": "选择",
+	"custom": "自定义",
+	"accessSite": "访问站点",
+	"pathSelect": "选择链接",
+	"bgColorPlaceholder": "请选择背景色",
+	"iconPlaceholder": "请选择图标",
+	"pathPlaceholder": "请选择链接",
+	"descPlaceholder": "输入描述语…"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/member.detail.json b/admin/src/lang/zh-cn/member.member_detail.json
similarity index 100%
rename from admin/src/lang/zh-cn/member.detail.json
rename to admin/src/lang/zh-cn/member.member_detail.json
diff --git a/admin/src/lang/zh-cn/order.recharge.order.json b/admin/src/lang/zh-cn/order.recharge.list.json
similarity index 100%
rename from admin/src/lang/zh-cn/order.recharge.order.json
rename to admin/src/lang/zh-cn/order.recharge.list.json
diff --git a/admin/src/lang/zh-cn/setting.notice.template.json b/admin/src/lang/zh-cn/setting.notice.json
similarity index 94%
rename from admin/src/lang/zh-cn/setting.notice.template.json
rename to admin/src/lang/zh-cn/setting.notice.json
index f2f25cd8a..2ce179c98 100644
--- a/admin/src/lang/zh-cn/setting.notice.template.json
+++ b/admin/src/lang/zh-cn/setting.notice.json
@@ -17,6 +17,5 @@
       "weappTempKey" : "模板编号",
       "smsId":"短信模版ID",
       "smsIdPlaceholder":"短信模版ID",
-	  "noticeType":"消息类型"
-      
+      "noticeType":"消息类型"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/setting.notice.records.json b/admin/src/lang/zh-cn/setting.notice_records.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.notice.records.json
rename to admin/src/lang/zh-cn/setting.notice_records.json
diff --git a/admin/src/lang/zh-cn/setting.pay.channel.json b/admin/src/lang/zh-cn/setting.pay.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.pay.channel.json
rename to admin/src/lang/zh-cn/setting.pay.json
diff --git a/admin/src/lang/zh-cn/setting.sms.setting.json b/admin/src/lang/zh-cn/setting.sms.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.sms.setting.json
rename to admin/src/lang/zh-cn/setting.sms.json
diff --git a/admin/src/lang/zh-cn/setting.sms.records.json b/admin/src/lang/zh-cn/setting.sms_records.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.sms.records.json
rename to admin/src/lang/zh-cn/setting.sms_records.json
diff --git a/admin/src/lang/zh-cn/setting.pay.transfer.json b/admin/src/lang/zh-cn/setting.transfer.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.pay.transfer.json
rename to admin/src/lang/zh-cn/setting.transfer.json
diff --git a/admin/src/lang/zh-cn/setting.oplatform.json b/admin/src/lang/zh-cn/setting.wxoplatform.json
similarity index 100%
rename from admin/src/lang/zh-cn/setting.oplatform.json
rename to admin/src/lang/zh-cn/setting.wxoplatform.json
diff --git a/admin/src/lang/zh-cn/tools.code.edit.json b/admin/src/lang/zh-cn/tools.code.edit.json
index 535e9410f..56c0fe9c5 100644
--- a/admin/src/lang/zh-cn/tools.code.edit.json
+++ b/admin/src/lang/zh-cn/tools.code.edit.json
@@ -34,6 +34,8 @@
       "columnComment": "字段描述",
       "columnType": "类型",
       "fieldAttribute": "字段属性",
+      "addAndEdit":"添加编辑",
+      "listSearch":"列表查询",
       "isPk":"是否主键",
       "isRequired":"是否必填",
       "isInsert":"是否添加",
@@ -41,7 +43,7 @@
       "isLists":"列表展示",
       "isSearch":"是否搜索",
       "isQuery":"是否查询",
-      "queryType":"查询方式",
+      "queryType":"搜索方式",
       "viewType":"显示方式",
       "pkRepeatTip": "只能添加一个主键",
       "formInput":"文本框",
diff --git a/admin/src/lang/zh-cn/tools.code.json b/admin/src/lang/zh-cn/tools.code.index.json
similarity index 100%
rename from admin/src/lang/zh-cn/tools.code.json
rename to admin/src/lang/zh-cn/tools.code.index.json
diff --git a/admin/src/lang/zh-cn/tools.cron.json b/admin/src/lang/zh-cn/tools.schedule.json
similarity index 79%
rename from admin/src/lang/zh-cn/tools.cron.json
rename to admin/src/lang/zh-cn/tools.schedule.json
index 62a72e664..c9ad30da8 100644
--- a/admin/src/lang/zh-cn/tools.cron.json
+++ b/admin/src/lang/zh-cn/tools.schedule.json
@@ -13,5 +13,8 @@
       "nextTime":"下次执行时间",
       "task":"任务命令",
       "data":"附加参数",
-      "statusDesc":"最后执行结果"
+      "statusDesc":"最后执行结果",
+	  "key": "key",
+	  "timeClass": "时间类型",
+	  "executeTime": "执行时间"
 }
\ No newline at end of file
diff --git a/admin/src/lang/zh-cn/tools.update.json b/admin/src/lang/zh-cn/tools.updatecache.json
similarity index 100%
rename from admin/src/lang/zh-cn/tools.update.json
rename to admin/src/lang/zh-cn/tools.updatecache.json
diff --git a/admin/src/layout/default/components/aside/menu-item.vue b/admin/src/layout/default/components/aside/menu-item.vue
index 1e8476c01..8b0b09df3 100644
--- a/admin/src/layout/default/components/aside/menu-item.vue
+++ b/admin/src/layout/default/components/aside/menu-item.vue
@@ -14,7 +14,12 @@
                 <icon :name="meta.icon" class="absolute top-[50%] -translate-y-[50%]" />
             </div>
             <template #title>
-                <span :class="['ml-[10px]', {'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}]">{{ meta.title }}</span>
+				<div class="relative">
+					<span :class="['ml-[10px]', {'text-[15px]': routes.meta.class == 1}, {'text-[14px]': routes.meta.class != 1}]">{{ meta.title }}</span>
+					<div class="absolute  top-[50%] -translate-y-[50%] right-[-288%]" @click="checkIndexList">
+						<img v-if="routes.path == '/site/siteindex'" class="w-[12px] h-[12px]" src="@/assets/images/index/model_tag.png"/>
+					</div>
+				</div>
             </template>
         </el-menu-item>
         <el-menu-item v-else :index="String(routes.name)" :route="routePath">
@@ -23,13 +28,35 @@
             </template>
         </el-menu-item>
     </template>
+	<el-dialog v-model="showDialog" :title="t('indexTemplate')" width="550px" :destroy-on-close="true" >
+		<div class="flex flex-wrap">
+			<div v-for="(items, index) in indexList" :key="index" v-if="index_path == ''">
+				<div @click="index_path = items.view_path" class="index-item py-[5px] px-[10px] mr-[10px] rounded-[3px] cursor-pointer" :class="items.is_use == 1 ? 'selected' : '' ">
+					<span >{{ items.name }}</span>
+				</div>
+			</div>
+			<div v-for="(itemTo, indexTo) in indexList" :key="indexTo" v-else>
+				<div @click="index_path = itemTo.view_path" class="index-item py-[5px] px-[10px] mr-[10px] rounded-[3px] cursor-pointer" :class="index_path == itemTo.view_path ? 'selected' : '' ">
+					<span >{{ itemTo.name }}</span>
+				</div>
+			</div>
+		</div>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button type="primary" @click="submitIndex">{{ t('confirm') }}</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script lang="ts" setup>
+import { t } from '@/lang'
+import { getIndexList, setIndexList } from '@/api/sys'
+import { useRoute, useRouter } from 'vue-router'
 import { CollectionTag } from '@element-plus/icons-vue'
-import { computed } from 'vue'
+import { ref, computed } from 'vue'
 import menuItem from './menu-item.vue'
-
+const router = useRouter()
 const props = defineProps({
     routes: {
         type: Object,
@@ -45,6 +72,26 @@ const meta = computed(() => props.routes.meta)
 const resolvePath = (path: string) => {
     return `${props.routePath}/${path}`
 }
+
+const indexList = ref();
+const showDialog = ref(false)
+const checkIndexList = () => {
+	getIndexList().then(res => {
+		showDialog.value = true
+		indexList.value = res.data
+	})
+}
+
+const index_path = ref('');
+const submitIndex = () => {
+	setIndexList({
+		view_path: index_path.value
+	}).then(() => {
+	    showDialog.value = false
+	    router.go(0)
+	})
+}
+
 </script>
 
 <style lang="scss">
@@ -59,4 +106,8 @@ const resolvePath = (path: string) => {
 .el-alert .el-alert__description{
     margin-top: 0;
 }
+.selected {
+	color: #fff;
+	background-color: #2C3EEF;
+}
 </style>
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index be886629b..edebf1b6e 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -23,7 +23,12 @@
             <el-col :span="12">
                 <div class="right-panel h-full flex items-center justify-end">
                     <!-- 预览 只有站点时展示-->
+					
                     <i class="iconfont iconlingdang-xianxing cursor-pointer px-[8px]" :title="t('newInfo')" v-if="appType == 'site'"></i>
+					<!-- 切换首页 -->
+					<div class="navbar-item flex items-center h-full cursor-pointer"  v-if="appType == 'site'" @click="checkIndexList">
+						<icon name="iconfont-iconqiehuan" :title="t('indexSwitch')"/>
+					</div>
                     <!-- 切换语言 -->
                     <div class="navbar-item flex items-center h-full cursor-pointer">
                         <switch-lang />
@@ -55,6 +60,26 @@
                 </span>
             </template>
         </el-dialog>
+		
+		<el-dialog v-model="showDialog" :title="t('indexTemplate')" width="550px" :destroy-on-close="true" >
+			<div class="flex flex-wrap">
+				<div v-for="(items, index) in indexList" :key="index" v-if="index_path == ''">
+					<div @click="index_path = items.view_path" class="index-item py-[5px] px-[10px] mr-[10px] rounded-[3px] cursor-pointer" :class="items.is_use == 1 ? 'selected' : '' ">
+						<span >{{ items.name }}</span>
+					</div>
+				</div>
+				<div v-for="(itemTo, indexTo) in indexList" :key="indexTo" v-else>
+					<div @click="index_path = itemTo.view_path" class="index-item py-[5px] px-[10px] mr-[10px] rounded-[3px] cursor-pointer" :class="index_path == itemTo.view_path ? 'selected' : '' ">
+						<span >{{ itemTo.name }}</span>
+					</div>
+				</div>
+			</div>
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="submitIndex">{{ t('confirm') }}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
     </el-container>
 </template>
 
@@ -70,6 +95,9 @@ import { useRoute, useRouter } from 'vue-router'
 import { t } from '@/lang'
 import storage from '@/utils/storage'
 import useUserStore from '@/stores/modules/user'
+import { getIndexList, setIndexList } from '@/api/sys'
+import { ElMessageBox } from 'element-plus'
+
 const router = useRouter()
 const appType = storage.get('app_type')
 const { toggle: toggleFullscreen, isFullscreen } = useFullscreen()
@@ -138,7 +166,7 @@ const toggleMenuCollapse = () => {
 
 // 刷新路由
 const refreshRouter = () => {
-    if (!appStore.routeRefrehTag) return
+    if (!appStore.routeRefreshTag) return
     appStore.refreshRouterView()
 }
 
@@ -153,6 +181,25 @@ const breadcrumb = computed(() => {
 const backFn = () => {
     router.go(-1)
 }
+
+const indexList = ref();
+const showDialog = ref(false)
+const checkIndexList = () => {
+	getIndexList().then(res => {
+		showDialog.value = true
+		indexList.value = res.data
+	})
+}
+
+const index_path = ref('');
+const submitIndex = () => {
+	setIndexList({
+		view_path: index_path.value
+	}).then(() => {
+	    showDialog.value = false
+	    router.go(0)
+	})
+}
 </script>
 
 <style lang="scss" scoped>
@@ -167,4 +214,16 @@ const backFn = () => {
     &:hover {
         background-color: var(--el-bg-color-page);
     }
-}</style>
+}
+.index-item {
+	background-color: var(--el-bg-color-page);
+	&:hover {
+		color: #fff;
+		background-color: #2C3EEF;
+	}
+}
+.selected {
+	color: #fff;
+	background-color: #2C3EEF;
+}
+</style>
diff --git a/admin/src/layout/default/index.vue b/admin/src/layout/default/index.vue
index baafe049c..e9f455faa 100644
--- a/admin/src/layout/default/index.vue
+++ b/admin/src/layout/default/index.vue
@@ -11,7 +11,7 @@
                 <el-main :class="['main-wrap h-full p-0',{'bg-page': dark}]">
                     <el-scrollbar>
                         <div class="p-[10px]">
-                            <router-view v-slot="{ Component, route }" v-if="appStore.routeRefrehTag">
+                            <router-view v-slot="{ Component, route }" v-if="appStore.routeRefreshTag">
                                 <keep-alive :include="tabbarStore.tabNames">
                                     <component :is="Component" :key="route.fullPath" />
                                 </keep-alive>
diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index 3bada10a2..4d320de66 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory, RouteLocationRaw } from 'vue-router'
+import { createRouter, createWebHistory, RouteLocationRaw, RouteLocationNormalizedLoaded } from 'vue-router'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import { STATIC_ROUTES, NO_LOGIN_ROUTES, ROOT_ROUTER, ADMIN_ROUTE, SITE_ROUTE, DECORATE_ROUTER, findFirstValidRoute } from './routers'
@@ -24,6 +24,17 @@ router.push = (to: RouteLocationRaw) => {
     return originPush(route)
 }
 
+/**
+ * 重写resolve方法
+ */
+const originResolve = router.resolve
+router.resolve = (to: RouteLocationRaw, currentLocation?: RouteLocationNormalizedLoaded) => {
+    const route = typeof to == 'string' ? urlToRouteRaw(to) : to
+    const paths = route.path.split('/').filter((item: string) => { return item })
+    route.path = ['admin', 'site', 'decorate'].indexOf(paths[0]) == -1 ? `/${getAppType()}${route.path}` : route.path
+    return originResolve(route, currentLocation)
+}
+
 // 全局前置守卫
 router.beforeEach(async (to, from, next) => {
     NProgress.configure({ showSpinner: false })
@@ -39,7 +50,7 @@ router.beforeEach(async (to, from, next) => {
     setWindowTitle(title)
 
     // 加载语言包
-    await language.loadLocaleMessages(to.path, useSystemStore().lang);
+    await language.loadLocaleMessages((to.meta.view || to.path), useSystemStore().lang);
 
     let matched: any = to.matched;
 
diff --git a/admin/src/router/routers.ts b/admin/src/router/routers.ts
index 78495e335..35dfa382e 100644
--- a/admin/src/router/routers.ts
+++ b/admin/src/router/routers.ts
@@ -122,7 +122,8 @@ const createRoute = function (route: Route, parentRoute: RouteRecordRaw | null =
             icon: route.icon,
             type: route.menu_type,
             show: route.is_show,
-            app: route.app_type
+            app: route.app_type,
+            view: route.view_path
         }
     }
     if (route.menu_type == 0) {
diff --git a/admin/src/stores/modules/app.ts b/admin/src/stores/modules/app.ts
index 074a2ee0f..6ad1d6e17 100644
--- a/admin/src/stores/modules/app.ts
+++ b/admin/src/stores/modules/app.ts
@@ -4,7 +4,7 @@ import NProgress from 'nprogress'
 
 interface App {
     route: string,
-    routeRefrehTag: boolean,
+    routeRefreshTag: boolean,
     pageReturn: boolean
 }
 
@@ -12,17 +12,17 @@ const useAppStore = defineStore('app', {
     state: (): App => {
         return {
             route: '',
-            routeRefrehTag: true,
+            routeRefreshTag: true,
             pageReturn: false
         }
     },
     actions: {
         refreshRouterView() {
-            this.routeRefrehTag = false
+            this.routeRefreshTag = false
             NProgress.start()
 
             nextTick(() => {
-                this.routeRefrehTag = true
+                this.routeRefreshTag = true
                 NProgress.done()
             })
         }
diff --git a/admin/src/stores/modules/diy.ts b/admin/src/stores/modules/diy.ts
index d43819173..e08f211ea 100644
--- a/admin/src/stores/modules/diy.ts
+++ b/admin/src/stores/modules/diy.ts
@@ -15,6 +15,7 @@ const useDiyStore = defineStore('diy', {
             name: '', // 页面标识
             type: '', // 页面模板
             typeName: '',  // 页面模板名称
+            templateName : '', // 页面模板标识
             isDefault: 0, // 是否默认页面
             predefineColors: [
                 '#F4391c',
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index 8f22a50e2..3973f5a56 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -33,9 +33,9 @@ const useSystemStore = defineStore('user', {
                         this.userInfo = res.data.userinfo
                         setToken(res.data.token)
                         storage.set({ key: 'userinfo', data: res.data.userinfo })
-                        storage.set({ key: 'siteId', data: res.data.site_id })
+                        storage.set({ key: 'siteId', data: res.data.site_info.site_code })
                         storage.set({ key: 'siteInfo', data: res.data.site_info })
-                        storage.set({ key: 'comparisonSiteIdStorage', data: res.data.site_id })
+                        storage.set({ key: 'comparisonSiteIdStorage', data: res.data.site_info.site_code })
                         storage.set({ key: 'comparisonTokenStorage', data: res.data.token })
                         resolve(res)
                     })
diff --git a/admin/src/styles/iconfont.css b/admin/src/styles/iconfont.css
index 2dcddd766..6638f3818 100644
--- a/admin/src/styles/iconfont.css
+++ b/admin/src/styles/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3883393 */
-  src: url('//at.alicdn.com/t/c/font_3883393_pwtqr51nps.woff2?t=1686032889350') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3883393_pwtqr51nps.woff?t=1686032889350') format('woff'),
-       url('//at.alicdn.com/t/c/font_3883393_pwtqr51nps.ttf?t=1686032889350') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3883393_pgas1v4bw2a.woff2?t=1686965237342') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3883393_pgas1v4bw2a.woff?t=1686965237342') format('woff'),
+       url('//at.alicdn.com/t/c/font_3883393_pgas1v4bw2a.ttf?t=1686965237342') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconqiehuan:before {
+  content: "\e61e";
+}
+
 .iconxiangyoujiantou:before {
   content: "\e660";
 }
diff --git a/admin/src/utils/request.ts b/admin/src/utils/request.ts
index 4a33681ab..71459b531 100644
--- a/admin/src/utils/request.ts
+++ b/admin/src/utils/request.ts
@@ -23,7 +23,7 @@ class Request {
 
     constructor() {
         this.instance = axios.create({
-            baseURL: import.meta.env.VITE_APP_BASE_URL,
+            baseURL: import.meta.env.VITE_APP_BASE_URL.substr(-1) == '/' ? import.meta.env.VITE_APP_BASE_URL : `${import.meta.env.VITE_APP_BASE_URL}/`,
             timeout: 30000,
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;',
@@ -111,7 +111,7 @@ class Request {
      * @param err 
      */
     private handleNetworkError(err: any) {
-        let errMessage = t('axios.requestError')
+        let errMessage = ''
 
         if (err.response && err.response.status) {
             const errStatus = err.response.status
@@ -158,8 +158,9 @@ class Request {
                     break
             }
         }
-        if (err.message.includes('timeout')) errMessage = t('axios.timeout')
-        ElMessage({ message: errMessage, type: 'error' })
+        err.message.includes('timeout') && (errMessage = t('axios.timeout'))
+        err.code == 'ERR_NETWORK' && (errMessage = err.config.baseURL + t('axios.errNetwork'))
+        errMessage && ElMessage({ message: errMessage, type: 'error' })
     }
 
     private handleAuthError(code: number) {
diff --git a/admin/src/views/diy/components/edit-image-ads.vue b/admin/src/views/diy/components/edit-image-ads.vue
index a339fe906..5eead82d2 100644
--- a/admin/src/views/diy/components/edit-image-ads.vue
+++ b/admin/src/views/diy/components/edit-image-ads.vue
@@ -125,7 +125,7 @@
     }
 
     const blurImageHeight = ()=> {
-        diyStore.editComponent.imageHeight = parseFloat(diyStore.editComponent.imageHeight).toFixed(2);
+        diyStore.editComponent.imageHeight = parseInt(diyStore.editComponent.imageHeight);
     }
 
     const imageBoxRef = ref()
diff --git a/admin/src/views/diy/edit.vue b/admin/src/views/diy/edit.vue
index 762dfdc42..2adcff30b 100644
--- a/admin/src/views/diy/edit.vue
+++ b/admin/src/views/diy/edit.vue
@@ -155,6 +155,13 @@ const diyStore = useDiyStore()
 const route = useRoute();
 const router = useRouter()
 
+route.query.id = route.query.id || 0;
+route.query.name = route.query.name || '';
+route.query.type = route.query.type || ''; // 页面模板，新页面传入
+route.query.template = route.query.template || ''; // 页面模板名称，新页面传入
+route.query.title = route.query.title || '';
+route.query.back = route.query.back || '/diy/list';
+
 const wapUrl = ref('')
 const wapDomain = ref('')
 const wapPreview = ref('')
@@ -163,7 +170,7 @@ const loadingIframe = ref(false) // 加载iframe
 const loadingDev = ref(false) // 加载开发环境配置
 const timeFrame = ref(0)
 
-const backPath = route.query.back || '/diy/list'
+const backPath = route.query.back
 const component = ref([])
 const componentType: string[] = reactive([])
 const page = ref('')
@@ -172,12 +179,6 @@ const siteId = ref(0)
 const activeNames = ref(componentType)
 const handleChange = (val: string[]) => { }
 
-route.query.id = route.query.id || 0;
-route.query.name = route.query.name || '';
-route.query.template = route.query.template || ''; // 页面模板，新页面传入
-route.query.template_name = route.query.template_name || ''; // 页面模板名称，新页面传入
-route.query.title = route.query.title || '';
-
 // 初始化原数据
 const originData = reactive({
     id: diyStore.id,
@@ -245,8 +246,8 @@ watch(
 initPage({
     id: route.query.id,
     name: route.query.name,
+    type: route.query.type,
     template: route.query.template,
-    template_name: route.query.template_name,
     title: route.query.title
 }).then(res => {
     let data = res.data;
@@ -255,6 +256,7 @@ initPage({
     diyStore.name = data.name;
     diyStore.type = data.type;
     diyStore.typeName = data.type_name;
+    diyStore.templateName = data.template;
     diyStore.isDefault = data.is_default;
     if (data.value) {
         let sources = JSON.parse(data.value);
@@ -387,11 +389,13 @@ const save = () => {
         name: diyStore.name,
         title: diyStore.global.title,
         type: diyStore.type,
+        template: diyStore.templateName,
         is_default: diyStore.isDefault,
+        is_change: isChange.value ? 0 : 1,
         value: JSON.stringify({
             global: toRaw(diyStore.global),
             value: toRaw(diyStore.value)
-        })
+        }),
     };
 
     const save = diyStore.id ? editDiyPage : addDiyPage
diff --git a/admin/src/views/diy/index.vue b/admin/src/views/diy/index.vue
index 9c971a441..ce8f41151 100644
--- a/admin/src/views/diy/index.vue
+++ b/admin/src/views/diy/index.vue
@@ -1,196 +1,355 @@
 <template>
-	<div class="main-container">
+	<div class="flex flex-wrap">
+		<div class="page-item relative bg-no-repeat mr-[40px] mt-[20px] bg-[#f7f7f7] w-[300px] pt-[80px] pb-[20px]"
+		     :class="{ 'cursor-pointer' : !item.isDisabledPop }"
+		     v-for="(item,key) in page"
+		     :key="key">
+			<p class="absolute top-[46px] left-[50%] translate-x-[-50%] text-[14px] truncate w-[130px] text-center">
+				{{item.use_template.title}}</p>
 
-		<div class="flex h-[700px] bg-body p-[20px]" v-show="loading">
-			<iframe v-show="loadingIframe" class="w-[375px] border border-slate-100" :src="wapPreview" frameborder="0" id="previewIframe" @load="loadIframe"></iframe>
-			<div v-show="loadingDev" class="w-[375px] border border-slate-100 pt-[20px] px-[20px]">
-				<div class="font-bold text-xl mb-[40px]">{{t('developTitle')}}</div>
-				<div class="mb-[20px] flex flex-col">
-					<text class="mb-[10px]">{{ t('wapDomain') }}</text>
-					<el-input v-model="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable />
+			<div v-show="item.use_template.url" class="w-[282px] h-[500px] mx-auto">
+				<iframe v-show="item.loadingIframe" class="w-[282px] h-[500px] mx-auto"
+				        :src="item.use_template.wapPreview"
+				        frameborder="0" @load="loadIframe(key)"></iframe>
+				<div v-show="item.loadingDev"
+				     class="w-[282px] h-[500px] mx-auto bg-body pt-[20px] px-[20px]">
+					<div class="font-bold text-xl mb-[40px]">{{t('developTitle')}}</div>
+					<div class="mb-[20px] flex flex-col">
+						<text class="mb-[10px]">{{ t('wapDomain') }}</text>
+						<el-input v-model="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable/>
+					</div>
+					<el-button type="primary" @click="saveDomain()">{{ t('confirm') }}</el-button>
 				</div>
-				<el-button type="primary" @click="save" >{{ t('confirm') }}</el-button>
 			</div>
 
-			<div class="w-[500px] ml-[40px]">
-				<el-button type="primary" @click="toDecorate()">{{ t('decorate') }}</el-button>
-
-				<div class="info-wrap mt-[20px]">
-					<el-form label-width="80px" class="px-[10px]">
-						<el-form-item :label="t('preview')">
-							<el-radio-group v-model="previewMode">
-								<el-radio :label="'weapp'">{{t('weapp')}}</el-radio>
-								<el-radio :label="'wechat'">{{t('wechat')}}</el-radio>
-							</el-radio-group>
-						</el-form-item>
-						<template v-if="previewMode == 'wechat'">
-							<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>
-									</template>
-								</el-input>
-							</el-form-item>
-							<el-form-item label=" " v-show="wapImage">
-								<el-image :src="wapImage"/>
-							</el-form-item>
-						</template>
-						<template v-if="previewMode == 'weapp'">
-							<el-form-item label=" " v-if="weappConfig.qr_code">
-								<el-image class="w-[100px] h-[100px]" :src="img(weappConfig.qr_code)"/>
-							</el-form-item>
-							<el-form-item label=" " v-else>
-								<span class="text-gray-400">{{t('weappNotSet')}}</span>
-							</el-form-item>
-						</template>
-					</el-form>
-
-				</div>
-
+			<div v-show="!item.use_template.wapPreview" class="overflow-hidden w-[282px] h-[500px] mx-auto">
+				<img class="max-w-full" v-if="item.use_template.cover"
+				     :src="img(item.use_template.cover)"/>
 			</div>
+
+			<p class="text-[12px] text-[#999] mt-[10px] mx-auto truncate text-center w-[250px]">
+				{{item.use_template.desc}}</p>
+
+			<div class="item-hide absolute inset-x-0 inset-y-0 bg-black bg-opacity-50 text-center rounded-[40px]"
+			     :class="{ 'disabled' : item.isDisabledPop }">
+				<div class="item-btn-box absolute top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] flex flex-col flex-wrap">
+					<el-button @click="show(key,item)">切换</el-button>
+					<el-button v-show="item.use_template.mode == 'diy'" @click="toDecorate(item.use_template)">装修
+					</el-button>
+					<el-button @click="toPreview(item.use_template)">预览</el-button>
+				</div>
+			</div>
+
 		</div>
-
 	</div>
+
+	<el-dialog v-model="showDialog" :title="t('changeTemplate')" width="400px" :close-on-press-escape="false"
+	           :destroy-on-close="true" :close-on-click-modal="false">
+
+		<el-form :model="form" label-width="0px" v-if="formData.type">
+			<el-form-item label="">
+				<div>{{t('hopeBeforeTip')}}<span class="text-primary px-[5px]">{{ page[formData.type].title }}</span>{{t('hopeAfterTip')}}
+				</div>
+			</el-form-item>
+
+			<el-form-item label="">
+				<el-select v-model="hope" class="w-full">
+					<el-option :label="t('changeTemplateTip') + ' ' + page[formData.type].title + ' ' + t('template')"
+					           value="template"/>
+					<el-option :label="t('changeMyPageTip') + ' ' + page[formData.type].title" value="diy"/>
+				</el-select>
+			</el-form-item>
+
+			<el-form-item label="" v-show="hope == 'template'">
+				<el-select v-model="formData.template" class="w-full">
+					<el-option v-for="(item, key) in page[formData.type].template" :label="item.title" :value="key"/>
+				</el-select>
+			</el-form-item>
+
+			<el-form-item label="" v-show="hope == 'diy'">
+				<el-select v-model="formData.id" class="w-full">
+					<el-option v-for="(item, index) in page[formData.type].my_page" :label="item.title"
+					           :value="item.id"/>
+				</el-select>
+				<div class="mt-[10px]">
+					<span class="cursor-pointer text-primary mr-[10px]" @click="toDiyList">{{ t('createPage') }}</span>
+					<span class="cursor-pointer text-primary" @click="refreshMyPage">{{ t('refreshPage') }}</span>
+				</div>
+			</el-form-item>
+
+		</el-form>
+
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="showDialog = false">{{ t('cancel')}}</el-button>
+				<el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+			</span>
+		</template>
+	</el-dialog>
+
 </template>
 
 <script lang="ts" setup>
-    import {ref, reactive, watch} from 'vue'
+    import {reactive, ref, watch, computed} from 'vue'
     import {t} from '@/lang'
-    import { useRouter} from 'vue-router'
-    import {getWeappConfig} from '@/api/weapp'
-    import {getUrl} from '@/api/sys'
-    import {useClipboard} from '@vueuse/core'
-    import {ElMessage} from 'element-plus'
     import {img} from '@/utils/common'
-    import QRCode from "qrcode";
+    import {useRoute, useRouter} from 'vue-router'
+    import {TabsPaneContext, ElMessage, ElMessageBox} from 'element-plus'
+    import {getDecoratePage, getDiyList, changeTemplate} from '@/api/diy'
     import storage from '@/utils/storage'
 
-    const wapUrl = ref('')
+    const page: any = reactive({})
+    const showDialog = ref(false)
+    const router = useRouter()
+    const hope = ref('template')
     const wapDomain = ref('')
-    const wapImage = ref('')
-    const wapPreview = ref('')
 
-    const loading = ref(false)
-    const loadingIframe = ref(false) // 加载iframe
-    const loadingDev = ref(false) // 加载开发环境配置
-    const timeFrame = ref(0)
+    // 添加自定义页面
+    const formData = reactive({
+        type: '',
+        mode: '',
+        template: '',
+        id: ''
+    })
 
-    var time = new Date().getTime();
+    const refreshData = () => {
+        formData.type = '';
+        formData.mode = '';
+        formData.template = '';
+        formData.id = '';
+        getDecoratePage({}).then((res => {
+            for (let key in res.data) {
+                page[key] = res.data[key]
+            }
 
-    getUrl().then((res:any)=> {
-        wapDomain.value = res.data.wap_domain;
-        wapUrl.value = res.data.wap_url;
-        setDomain();
+            for (let key in page) {
+                if (page[key].use_template.url) {
+                    page[key].loadingIframe = false; // 加载iframe
+                    page[key].loadingDev = false; // 加载开发环境配置
+                    page[key].isDisabledPop = false; // 是否禁止打开遮罩层
 
-        // 生产模式禁止
-        if(import.meta.env.MODE == 'production') return;
+                    wapDomain.value = page[key].domain_url.wap_domain;
+                    page[key].wapUrl = page[key].domain_url.wap_url;
 
-        // env文件配置过wap域名
-        if (wapDomain.value) return;
+                    // 开发模式情况下，并且未配置wap域名，则获取缓存域名
+                    if (import.meta.env.MODE == 'development' && !wapDomain.value && storage.get('wap_domain')) {
+                        page[key].wapUrl = storage.get('wap_domain')
+                        page[key].loadingIframe = true; // 加载iframe
+                        page[key].loadingDev = false; // 加载开发环境配置
+                        page[key].isDisabledPop = false; // 是否禁止打开遮罩层
+                    }
 
-        let wap_domain_storage = storage.get('wap_domain');
-        if(wap_domain_storage){
-            wapUrl.value = wap_domain_storage
-            setDomain();
-            return;
-        }
+                    setDomain(key);
+                    page[key].timeFrame = new Date().getTime();
+                }
+            }
 
-        timeFrame.value = new Date().getTime();
-    });
-
-    const save = ()=> {
-        wapUrl.value = wapDomain.value + '/wap'
-        setDomain();
-        storage.set({ key : 'wap_domain', data :wapUrl.value });
-        loadingIframe.value = true;
-        loadingDev.value = false;
+        }));
     }
 
-    const setDomain = ()=> {
-        let siteInfo = storage.get('siteInfo');
-        let siteId = 0;
-        if (siteInfo) siteId = siteInfo.site_id;
-        wapPreview.value = `${wapUrl.value}/pages/index/index?mode=preview&site_id=${siteId}`;
-        QRCode.toDataURL(wapPreview.value, {errorCorrectionLevel: 'L', margin: 0, width: 100}).then(url => {
-            wapImage.value = url
+    refreshData();
+
+    // 监听iframe加载事件
+    const loadIframe = (key: string) => {
+        if (storage.get('wap_domain')) return;
+        if (!page[key].use_template.wapPreview) return;
+
+        var loadTime = new Date().getTime();
+        var difference = loadTime - page[key].timeFrame;
+        // 检测页面加载差异，小于1000毫秒，则配置wap端域名
+        if (difference < 1000) {
+            page[key].loadingDev = true;
+            page[key].isDisabledPop = true;
+            page[key].loadingIframe = false;
+        } else {
+            page[key].loadingDev = false;
+            page[key].isDisabledPop = false;
+            page[key].loadingIframe = true;
+        }
+    }
+
+    const saveDomain = () => {
+        let wapUrl = wapDomain.value + '/wap';
+        storage.set({key: 'wap_domain', data: wapUrl});
+
+        for (let key in page) {
+            if (page[key].use_template.url) {
+                page[key].wapUrl = wapUrl;
+                setDomain(key);
+            }
+        }
+        setTimeout(() => {
+            for (let key in page) {
+                if (page[key].use_template.url) {
+                    page[key].loadingIframe = true; // 加载iframe
+                    page[key].loadingDev = false; // 加载开发环境配置
+                    page[key].isDisabledPop = false; // 是否禁止打开遮罩层
+                }
+            }
+        }, 100 * 3);
+    }
+
+    const setDomain = (key: string) => {
+        page[key].use_template.wapPreview = page[key].wapUrl + page[key].use_template.url;
+    }
+
+    const show = (key: string, data: any) => {
+        // 每次打开时赋值
+        showDialog.value = true;
+
+        hope.value = data.use_template.hope;
+        formData.type = key;
+        formData.mode = data.use_template.mode;
+
+        if (hope.value == 'template') {
+            formData.template = data.use_template.template;
+        } else if (hope.value == 'diy') {
+            formData.id = data.use_template.id;
+        }
+    }
+
+    // 跳转去装修
+    const toDecorate = (data: any) => {
+        let query: any = {
+            back: '/diy/index'
+        };
+        if (data.id) {
+            query.id = data.id;
+        } else if (data.name) {
+            query.name = data.name;
+        }
+        let url = router.resolve({
+            path: '/decorate/edit',
+            query
+        });
+        window.open(url.href);
+    }
+
+    // 跳转去预览
+    const toPreview = (data: any) => {
+        let query: any = {};
+        if (data.id) {
+            query.id = data.id;
+        } else if (data.name) {
+            query.name = data.name;
+        }
+        let url = router.resolve({
+            path: '/decorate/preview',
+            query
+        });
+        window.open(url.href);
+    }
+
+    // 创建微页面
+    const toDiyList = (data: any) => {
+        let url = router.resolve({
+            path: '/site/diy/list'
+        });
+        window.open(url.href);
+    }
+
+    // 刷新我的微页面
+    const refreshMyPage = () => {
+        getDiyList({type: formData.type, mode: 'diy'}).then((res) => {
+            let isExist = true; // 检测选择的微页面是否存在，不存在则清空
+            for (let i = 0; i < res.data.length; i++) {
+                if (formData.id == res.data[i].id) {
+                    isExist = false;
+                    break;
+                }
+            }
+            if (isExist) {
+                formData.id = '';
+            }
+            page[formData.type].my_page = {};
+            Object.assign(page[formData.type].my_page, res.data);
         })
     }
 
-    // 监听iframe加载事件
-    const loadIframe = ()=> {
-        if (!wapPreview.value) return
-        var loadTime = new Date().getTime();
-        var difference = loadTime - timeFrame.value;
-	    // 检测页面加载差异，小于1000毫秒，则配置wap端域名
-        if (difference < 1000) {
-            loadingDev.value = true;
-            loadingIframe.value = false;
-            wapPreview.value = ''
-            wapImage.value = ''
-        } else {
-            loadingDev.value = false;
-            loadingIframe.value = true;
+    watch(
+        () => hope.value,
+        (newValue, oldValue) => {
+            if (newValue == 'template') {
+                formData.id = '';
+            } else if (newValue == 'diy') {
+                formData.mode = 'diy';
+                formData.template = '';
+            }
         }
-        loading.value = true
+    )
+
+    watch(
+        () => formData.template,
+        (newValue, oldValue) => {
+            if (newValue) {
+                formData.mode = page[formData.type].template[newValue].mode;
+            }
+        }
+    )
+
+    const isRepeat = ref(false)
+    const save = () => {
+        if (hope.value == 'template') {
+            if (formData.template == '') {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('placeholderTemplate')}`,
+                });
+                return;
+            }
+        } else if (hope.value == 'diy') {
+            if (formData.id == '') {
+                ElMessage({
+                    type: 'warning',
+                    message: `${t('placeholderMyPage')}`,
+                });
+                return;
+            }
+        }
+
+        if (isRepeat.value) return
+        isRepeat.value = true
+
+        changeTemplate({
+            ...formData
+        }).then((res) => {
+            isRepeat.value = false;
+            showDialog.value = false;
+            refreshData();
+        })
+
     }
-
-    const router = useRouter()
-
-    const weappConfig = reactive({
-        qr_code: ''
-    })
-
-    const previewMode = ref('weapp')
-
-    /**
-     * 获取微信配置
-     */
-    getWeappConfig().then((res: any) => {
-        if (res.code == 1) {
-            let data = res.data;
-            weappConfig.qr_code = data.qr_code;
-        }
-    })
-
-    const url = router.resolve({
-        path: '/decorate/edit',
-        query: {name: 'DIY_INDEX'}
-    });
-
-    const toDecorate = () => {
-        router.push('/decorate/edit?name=DIY_INDEX&back=/diy/index')
-    }
-
-    /**
-     * 复制
-     */
-    const {copy, isSupported, copied} = useClipboard()
-    const copyEvent = (text: string) => {
-        if (!isSupported.value) {
-            ElMessage({
-                message: t('notSupportCopy'),
-                type: 'warning'
-            })
-        }
-        copy(text)
-    }
-
-    watch(copied, () => {
-        if (copied.value) {
-            ElMessage({
-                message: t('copySuccess'),
-                type: 'success'
-            })
-        }
-    })
-
 </script>
 
-<style lang="scss">
-	.copy {
-		background: var(--el-color-primary) !important;
-		color: var(--el-color-white) !important;
-	}
-</style>
 <style lang="scss" scoped>
+	.page-item {
+
+		background-image: url(assets/images/iphone_bg.png);
+		background-color: var(--el-bg-color);
+		background-size: 100%;
+
+		.item-hide {
+			display: none;
+
+			.item-btn-box {
+
+				button {
+					height: 35px;
+					width: 100px;
+
+					& ~ button {
+						margin-top: 15px;
+						margin-left: 0;
+					}
+				}
+
+			}
+		}
+
+		&:hover {
+			.item-hide:not(.disabled) {
+				display: block !important;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/admin/src/views/diy/list.vue b/admin/src/views/diy/list.vue
index b9695114f..48af15881 100644
--- a/admin/src/views/diy/list.vue
+++ b/admin/src/views/diy/list.vue
@@ -9,14 +9,14 @@
             </div>
 
             <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="diyPageTableData.searchParam" ref="searchFormDiyPageRef" v-if="tabValue == 'diy'">
+                <el-form :inline="true" :model="diyPageTableData.searchParam" ref="searchFormDiyPageRef">
                     <el-form-item :label="t('title')" prop="title">
                         <el-input v-model="diyPageTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
                     </el-form-item>
                     <el-form-item :label="t('typeName')" prop="type">
-                        <el-select v-model="diyPageTableData.searchParam.type" :placeholder="t('pageTemplatePlaceholder')">
+                        <el-select v-model="diyPageTableData.searchParam.type" :placeholder="t('pageTypePlaceholder')">
                             <el-option :label="t('all')" value="" />
-                            <el-option v-for="(item, key) in pageTemplate" :label="item.title" :value="key" />
+                            <el-option v-for="(item, key) in pageType" :label="item.title" :value="key" />
                         </el-select>
                     </el-form-item>
                     <el-form-item>
@@ -24,84 +24,40 @@
                         <el-button @click="resetForm(searchFormDiyPageRef)">{{ t('reset') }}</el-button>
                     </el-form-item>
                 </el-form>
-                <el-form :inline="true" :model="diyRouteTableData.searchParam" ref="searchFormDiyRouteRef" v-if="tabValue == 'route'">
-                    <el-form-item :label="t('title')" prop="title">
-                        <el-input v-model="diyRouteTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" @click="loadDiyRouteList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormDiyRouteRef)">{{ t('reset') }}</el-button>
-                    </el-form-item>
-                </el-form>
             </el-card>
 
-            <div>
-                <el-tabs v-model="tabValue" class="demo-tabs" @tab-click="handleClick">
-                    <el-tab-pane :label="t('diyPage')" name="diy">
+            <el-table :data="diyPageTableData.data" size="large" v-loading="diyPageTableData.loading">
 
-                        <el-table :data="diyPageTableData.data" size="large" v-loading="diyPageTableData.loading">
+                <template #empty>
+                    <span>{{ !diyPageTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
 
-                            <template #empty>
-                                <span>{{ !diyPageTableData.loading ? t('emptyData') : '' }}</span>
-                            </template>
+                <el-table-column prop="title" :label="t('title')" min-width="120" />
+                <el-table-column prop="type_name" :label="t('typeName')" min-width="80" />
+<!--                <el-table-column :label="t('status')" min-width="80">-->
+<!--                    <template #default="{ row }">-->
+<!--                        <span v-if="row.type == 'DIY_PAGE'">-</span>-->
+<!--                        <template v-else>-->
+<!--                            <span v-if="row.is_default == 1" class="text-primary">{{ t('isUse') }}</span>-->
+<!--                            <span v-else>{{ t('unused') }}</span>-->
+<!--                        </template>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
+                <el-table-column prop="update_time" :label="t('updateTime')" min-width="120" />
 
-                            <el-table-column prop="title" :label="t('title')" min-width="120" />
-                            <el-table-column prop="type_name" :label="t('typeName')" min-width="80" />
-                            <el-table-column :label="t('status')" min-width="80">
-                                <template #default="{ row }">
-                                    <span v-if="row.type == 'DIY_PAGE'">-</span>
-                                    <template v-else>
-                                        <span v-if="row.is_default == 1" class="text-primary">{{ t('isUse') }}</span>
-                                        <span v-else>{{ t('unused') }}</span>
-                                    </template>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="update_time" :label="t('updateTime')" min-width="120" />
-
-                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
-                                <template #default="{ row }">
-                                    <el-button type="primary" link @click="promoteEvent(row)">{{ t('promote') }}</el-button>
-                                    <el-button v-if="row.type != 'DIY_PAGE' && row.is_default == 0" type="primary" link @click="setUse(row)">{{ t('use') }}</el-button>
-                                    <el-button v-if="row.type == 'DIY_PAGE'" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
-                                    <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                                    <el-button v-if="row.type == 'DIY_PAGE' || row.is_default == 0" type="danger" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
-                                </template>
-                            </el-table-column>
-
-                        </el-table>
-                        <div class="mt-[16px] flex justify-end">
-                            <el-pagination v-model:current-page="diyPageTableData.page" v-model:page-size="diyPageTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="diyPageTableData.total" @size-change="loadDiyPageList()" @current-change="loadDiyPageList" />
-                        </div>
-                    </el-tab-pane>
-                    <!-- 基础页面路径 -->
-                    <el-tab-pane :label="t('basicRoute')" name="route">
-                        <el-table :data="diyRouteTableData.data" size="large" v-loading="diyRouteTableData.loading">
-                            <template #empty>
-                                <span>{{ !diyRouteTableData.loading ? t('emptyData') : '' }}</span>
-                            </template>
-                            <el-table-column prop="title" :label="t('title')" min-width="70" />
-                            <el-table-column prop="page" :label="t('wapUrl')" min-width="170">
-                                <template #default="{ row }">
-                                    <span class="mr-[10px]">{{ wapDomain + row.page }}</span>
-                                    <el-button type="primary" link @click="copyEvent(wapDomain + row.page)">{{ t('copy') }}</el-button>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="page" :label="t('weappUrl')" min-width="120">
-                                <template #default="{ row }">
-                                    <span class="mr-[10px]">{{ row.page }}</span>
-                                    <el-button type="primary" link @click="copyEvent(row.page)">{{ t('copy') }}</el-button>
-                                </template>
-                            </el-table-column>
-                            <el-table-column :label="t('share')" fixed="right" min-width="80">
-                                <template #default="{ row }">
-                                    <el-button v-if="row.is_share == 1" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </el-tab-pane>
-
-                </el-tabs>
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="160">
+                    <template #default="{ row }">
+                        <el-button type="primary" link @click="toPreview(row)">{{ t('promote') }}</el-button>
+                        <el-button v-if="row.type == 'DIY_PAGE'" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
+                        <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+<!--                        <el-button v-if="row.type == 'DIY_PAGE' || row.is_default == 0" type="danger" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>-->
+                        <el-button type="danger" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                    </template>
+                </el-table-column>
 
+            </el-table>
+            <div class="mt-[16px] flex justify-end">
+                <el-pagination v-model:current-page="diyPageTableData.page" v-model:page-size="diyPageTableData.limit" layout="total, sizes, prev, pager, next, jumper" :total="diyPageTableData.total" @size-change="loadDiyPageList()" @current-change="loadDiyPageList" />
             </div>
 
         </el-card>
@@ -113,16 +69,16 @@
                 <el-form-item :label="t('title')" prop="title">
                     <el-input v-model="formData.title" :placeholder="t('titlePlaceholder')" clearable maxlength="12" show-word-limit class="w-full" />
                 </el-form-item>
-                <el-form-item :label="t('typeName')" prop="template">
-                    <el-select v-model="formData.template" :placeholder="t('pageTemplatePlaceholder')" class="w-full">
-                        <el-option v-for="(item, key) in pageTemplate" :label="item.title" :value="key" />
+                <el-form-item :label="t('addType')" prop="type">
+                    <el-select v-model="formData.type" :placeholder="t('pageTypePlaceholder')" class="w-full">
+                        <el-option v-for="(item, key) in pageType" :label="item.title" :value="key" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('templateName')" prop="template_name" v-show="pageTemplateData">
-                    <el-radio-group v-model="formData.template_name">
-                        <el-radio label="">{{ t('empty') }}</el-radio>
-                        <el-radio v-for="(item,key) in pageTemplateData" :label="key">{{item.title}}</el-radio>
-                    </el-radio-group>
+                <el-form-item :label="t('templateName')" prop="template" v-show="pageTypeData">
+                    <el-select v-model="formData.template" class="w-full">
+                        <el-option :label="t('emptyTemplate')" value="" />
+                        <el-option v-for="(item, key) in pageTypeData" :label="item.title" :value="key" />
+                    </el-select>
                 </el-form-item>
             </el-form>
 
@@ -136,7 +92,6 @@
 
         <!-- 分享设置-->
         <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
-
             <el-tabs v-model="tabShareType">
                 <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
                 <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
@@ -164,345 +119,217 @@
             </template>
         </el-dialog>
 
-        <!-- 推广-->
-        <el-dialog v-model="promoteDialogVisible" :title="t('promote')" width="30%">
-            <el-form label-width="90px">
-                <el-form-item :label="t('shareLink')">
-                    <el-input readonly :value="promoteWapDomain">
-                        <template #append>
-                            <el-button @click="copyEvent(promoteWapDomain)" class="bg-primary copy">{{ t('copy') }}</el-button>
-                        </template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label=" ">
-                    <el-image :src="wapImage" />
-                </el-form-item>
-            </el-form>
-
-            <!--			<el-tabs v-model="tabPromote">-->
-            <!--				<el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>-->
-            <!--				<el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>-->
-            <!--			</el-tabs>-->
-
-        </el-dialog>
-
     </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, watch, computed } from 'vue'
-import { t } from '@/lang'
-import { getDiyPageList, deleteDiyPage, setUseDiyPage, getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyPageShare, editDiyRouteShare } from '@/api/diy'
-import { TabsPaneContext, ElMessage, ElMessageBox, FormInstance } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
-import { useClipboard } from '@vueuse/core'
-import QRCode from "qrcode";
-import { getUrl } from '@/api/sys'
+    import { reactive, ref, watch, computed } from 'vue'
+    import { t } from '@/lang'
+    import { getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare } from '@/api/diy'
+    import {  ElMessage, ElMessageBox, FormInstance } from 'element-plus'
+    import { useRoute, useRouter } from 'vue-router'
+    import QRCode from "qrcode";
+    import { getUrl } from '@/api/sys'
 
-const pageTemplate: any = reactive({})
+    const router = useRouter()
+    const route = useRoute()
+    const pageName = route.meta.title;
+    const pageType: any = reactive({}) // 页面模板类型
 
-const router = useRouter()
-const route = useRoute()
-const pageName = route.meta.title;
-
-// 添加自定义页面
-const formData = reactive({
-    title: '',
-    template: '',
-    template_name:''
-})
-
-// 表单验证规则
-const formRules = computed(() => {
-    return {
-        template: [
-            { required: true, message: t('pageTemplatePlaceholder'), trigger: 'blur' },
-        ],
-        title: [
-            { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
-        ]
-    }
-})
-
-const pageTemplateData = computed(()=>{
-    let data:any = '';
-    formData.template_name = '';
-    if(formData.template){
-        data = pageTemplate[formData.template].template;
-        // 默认选中第一个
-        // if(Object.keys(data).length) formData.template_name =Object.keys(data)[0];
-    }
-    return data;
-})
-
-const formRef = ref<FormInstance>()
-const dialogVisible = ref(false)
-const addEvent = async (formEl: FormInstance | undefined) => {
-    if (!formEl) return
-
-    await formEl.validate(async (valid) => {
-        if (valid) {
-            dialogVisible.value = false;
-            router.push(`/decorate/edit?template=${formData.template}&template_name=${formData.template_name}&title=${formData.title}`);
-        }
-    })
-}
-
-let diyRouteTableData = reactive({
-    loading: true,
-    data: [],
-    searchParam: {
-        "title": "",
-        "type":""
-    }
-})
-
-const wapDomain = ref('')
-const getDomain = async () => {
-    wapDomain.value = (await getUrl()).data.wap_url;
-};
-getDomain();
-
-/**
- * 获取自定义路由列表
- */
-const loadDiyRouteList = () => {
-    diyRouteTableData.loading = true
-
-    getDiyRouteList({
-        ...diyRouteTableData.searchParam
-    }).then(res => {
-        diyRouteTableData.loading = false
-        diyRouteTableData.data = res.data
-    }).catch(() => {
-        diyRouteTableData.loading = false
-    })
-}
-loadDiyRouteList()
-
-// 获取自定义页面模板
-getDiyTemplate({}).then(res => {
-    for (let key in res.data) {
-        pageTemplate[key] = res.data[key]
-    }
-})
-
-let diyPageTableData: any = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: true,
-    data: [],
-    searchParam: {
-        "title": "",
-        "template": '',
-    }
-})
-
-const tabValue = ref('diy')
-const handleClick = (tab: TabsPaneContext, event: Event) => {
-    tabValue.value = tab.props.name;
-    if (tabValue.value == 'diy') {
-        loadDiyPageList()
-    } else {
-        loadDiyRouteList()
-    }
-
-}
-
-const searchFormDiyRouteRef = ref<FormInstance>()
-const searchFormDiyPageRef = ref<FormInstance>()
-
-// 获取自定义页面列表
-const loadDiyPageList = (page: number = 1) => {
-    diyPageTableData.loading = true
-    diyPageTableData.page = page
-
-    getDiyPageList({
-        page: diyPageTableData.page,
-        limit: diyPageTableData.limit,
-        ...diyPageTableData.searchParam
-    }).then(res => {
-        diyPageTableData.loading = false
-        diyPageTableData.data = res.data.data
-        diyPageTableData.total = res.data.total
-    }).catch(() => {
-        diyPageTableData.loading = false
-    })
-}
-
-loadDiyPageList()
-
-// 编辑自定义页面
-const editEvent = (data: any) => {
-    let url = router.resolve({
-        path: '/decorate/edit',
-        query: { id: data.id }
-    });
-    window.open(url.href);
-}
-
-// 删除自定义页面
-const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('diyPageDeleteTips'), t('warning'),
-        {
-            confirmButtonText: t('confirm'),
-            cancelButtonText: t('cancel'),
-            type: 'warning',
-        }
-    ).then(() => {
-        deleteDiyPage(id).then(() => {
-            loadDiyPageList()
-        }).catch(() => {
-        })
-    })
-}
-
-// 设为使用
-const setUse = (data: any) => {
-    setUseDiyPage({ id: data.id }).then(() => {
-        loadDiyPageList()
-    })
-}
-
-/**
- * 复制
- */
-const { copy, isSupported, copied } = useClipboard()
-const copyEvent = (text: string) => {
-    if (!isSupported.value) {
-        ElMessage({
-            message: t('notSupportCopy'),
-            type: 'warning'
-        })
-    }
-    copy(text)
-}
-
-watch(copied, () => {
-    if (copied.value) {
-        ElMessage({
-            message: t('copySuccess'),
-            type: 'success'
-        })
-    }
-})
-
-const tabShareType = ref('wechat')
-const sharePage = ref('')
-const shareFormId = ref(0)
-const diyRouteData = reactive({
-    title: '',
-    name: '',
-    page: '',
-    is_share: 0,
-    sort: 0
-})
-const shareFormData = reactive({
-    wechat: {
+    // 添加自定义页面
+    const formData = reactive({
         title: '',
-        desc: '',
-        url: ''
-    },
-    weapp: {
-        title: '',
-        url: ''
-    }
-})
-const shareDialogVisible = ref(false)
-const shareFormRules = computed(() => {
-    return {}
-})
+        type: '',
+        template:''
+    })
 
-const shareFormRef = ref<FormInstance>()
-const openShare = async (row: any) => {
-    if (tabValue.value == 'route') {
-        // 基础页面
-        let info = (await getDiyRouteInfo({
-            name: row.name
-        })).data;
-
-        if (info.title) {
-            row.id = info.id;
-            row.title = info.title
-            row.name = info.name
-            row.page = info.page
-            row.is_share = info.is_share
-            row.sort = info.sort
-            row.share = info.share
+    // 表单验证规则
+    const formRules = computed(() => {
+        return {
+            title: [
+                { required: true, message: t('titlePlaceholder'), trigger: 'blur' },
+            ],
+            type: [
+                { required: true, message: t('pageTypePlaceholder'), trigger: 'blur' },
+            ]
         }
+    })
 
-        diyRouteData.title = row.title
-        diyRouteData.name = row.name
-        diyRouteData.page = row.page
-        diyRouteData.is_share = row.is_share
-        diyRouteData.sort = row.sort
+    const pageTypeData = computed(()=>{
+        let data:any = '';
+        formData.template = '';
+        if(formData.type){
+            data = pageType[formData.type].template;
+        }
+        return data;
+    })
 
+    const formRef = ref<FormInstance>()
+    const dialogVisible = ref(false)
+    const addEvent = async (formEl: FormInstance | undefined) => {
+        if (!formEl) return
+
+        await formEl.validate(async (valid) => {
+            if (valid) {
+                dialogVisible.value = false;
+                let url = `/decorate/edit?type=${formData.type}&title=${formData.title}`;
+                if(formData.template) url += `&template=${formData.template}`;
+                router.push(url);
+            }
+        })
     }
-    shareFormId.value = row.id;
-    sharePage.value = row.title;
-    let share = row.share ? JSON.parse(row.share) : {
-        wechat: { title: '', desc: '', url: '' },
-        weapp: { title: '', url: '' }
+
+    const wapDomain = ref('')
+    const getDomain = async () => {
+        wapDomain.value = (await getUrl()).data.wap_url;
     };
-    if (share) {
-        shareFormData.wechat = share.wechat;
-        shareFormData.weapp = share.weapp;
+    getDomain();
+
+    // 获取自定义页面模板
+    getDiyTemplate({ mode : 'diy' }).then(res => {
+        for (let key in res.data) {
+            pageType[key] = res.data[key]
+        }
+    })
+
+    let diyPageTableData: any = reactive({
+        page: 1,
+        limit: 10,
+        total: 0,
+        loading: true,
+        data: [],
+        searchParam: {
+            "title": "",
+            "template": '',
+        }
+    })
+
+    const searchFormDiyPageRef = ref<FormInstance>()
+
+    // 获取自定义页面列表
+    const loadDiyPageList = (page: number = 1) => {
+        diyPageTableData.loading = true
+        diyPageTableData.page = page
+
+        getDiyPageList({
+            page: diyPageTableData.page,
+            limit: diyPageTableData.limit,
+            ...diyPageTableData.searchParam
+        }).then(res => {
+            diyPageTableData.loading = false
+            diyPageTableData.data = res.data.data
+            diyPageTableData.total = res.data.total
+        }).catch(() => {
+            diyPageTableData.loading = false
+        })
     }
 
-    shareDialogVisible.value = true;
-}
+    loadDiyPageList()
 
-const shareEvent = async (formEl: FormInstance | undefined) => {
-    if (!formEl) return
+    // 编辑自定义页面
+    const editEvent = (data: any) => {
+        let url = router.resolve({
+            path: '/decorate/edit',
+            query: {id: data.id}
+        });
+        window.open(url.href);
+    }
 
-    await formEl.validate(async (valid) => {
-        if (valid) {
-            let save = tabValue.value == 'diy' ? editDiyPageShare : editDiyRouteShare
-            save({
-                id: shareFormId.value,
-                share: JSON.stringify(shareFormData),
-                ...diyRouteData
-            }).then(() => {
-                if (tabValue.value == 'diy') {
-                    loadDiyPageList()
-                } else {
-                    loadDiyRouteList()
+    // 删除自定义页面
+    const deleteEvent = (id: number) => {
+        ElMessageBox.confirm(t('diyPageDeleteTips'), t('warning'),
+                {
+                    confirmButtonText: t('confirm'),
+                    cancelButtonText: t('cancel'),
+                    type: 'warning',
                 }
-                shareDialogVisible.value = false;
+        ).then(() => {
+            deleteDiyPage(id).then(() => {
+                loadDiyPageList()
             }).catch(() => {
             })
+        })
+    }
+
+    // 跳转去预览
+    const toPreview = (data: any) => {
+        let query: any = {};
+        if (data.id) {
+            query.id = data.id;
+        } else if (data.name) {
+            query.name = data.name;
+        }
+        let url = router.resolve({
+            path: '/decorate/preview',
+            query
+        });
+        window.open(url.href);
+    }
+
+    const tabShareType = ref('wechat')
+    const sharePage = ref('')
+    const shareFormId = ref(0)
+    const shareFormData = reactive({
+        wechat: {
+            title: '',
+            desc: '',
+            url: ''
+        },
+        weapp: {
+            title: '',
+            url: ''
         }
     })
-}
-
-const promoteDialogVisible = ref(false)
-const tabPromote = ref('wechat')
-const promoteWapDomain = ref('')
-const wapImage = ref('')
-const promoteEvent = (data: any) => {
-    promoteWapDomain.value = wapDomain.value + '/pages/index/diy?id=' + data.id;
-    QRCode.toDataURL(promoteWapDomain.value, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
-        wapImage.value = url
+    const shareDialogVisible = ref(false)
+    const shareFormRules = computed(() => {
+        return {}
     })
 
-    promoteDialogVisible.value = true;
-}
+    const shareFormRef = ref<FormInstance>()
+    const openShare = async (row: any) => {
+        shareFormId.value = row.id;
+        sharePage.value = row.title;
+        let share = row.share ? JSON.parse(row.share) : {
+            wechat: { title: '', desc: '', url: '' },
+            weapp: { title: '', url: '' }
+        };
+        if (share) {
+            shareFormData.wechat = share.wechat;
+            shareFormData.weapp = share.weapp;
+        }
 
+        shareDialogVisible.value = true;
+    }
 
-const resetForm = (formEl: FormInstance | undefined)=>{
-    if (!formEl) return
-    formEl.resetFields();
-    loadDiyPageList();
-}
+    const shareEvent = async (formEl: FormInstance | undefined) => {
+        if (!formEl) return
 
+        await formEl.validate(async (valid) => {
+            if (valid) {
+                editDiyPageShare({
+                    id: shareFormId.value,
+                    share: JSON.stringify(shareFormData),
+                }).then(() => {
+                    loadDiyPageList()
+                    shareDialogVisible.value = false;
+                }).catch(() => {
+                })
+            }
+        })
+    }
+
+    const resetForm = (formEl: FormInstance | undefined)=>{
+        if (!formEl) return
+        formEl.resetFields();
+        loadDiyPageList();
+    }
 
 </script>
 
 <style lang="scss">
-.copy {
-    background: var(--el-color-primary) !important;
-    color: var(--el-color-white) !important;
-}
+    .copy {
+        background: var(--el-color-primary) !important;
+        color: var(--el-color-white) !important;
+    }
 </style>
 <style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/admin/src/views/diy/member.vue b/admin/src/views/diy/member.vue
deleted file mode 100644
index 06bdb94d4..000000000
--- a/admin/src/views/diy/member.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-	<div class="main-container"></div>
-</template>
-
-<script lang="ts" setup>
-    import {ref} from 'vue'
-    import {useRouter} from 'vue-router'
-
-    const router = useRouter()
-    const url = router.resolve({
-        path: '/decorate/edit',
-        query: {name: 'DIY_MEMBER_INDEX'}
-    });
-    router.push('/decorate/edit?name=DIY_MEMBER_INDEX')
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/admin/src/views/diy/preview.vue b/admin/src/views/diy/preview.vue
new file mode 100644
index 000000000..0b5a6fead
--- /dev/null
+++ b/admin/src/views/diy/preview.vue
@@ -0,0 +1,196 @@
+<template>
+	<div class="main-container w-[375px] mx-auto my-[20px] relative">
+
+		<div class="flex h-full" v-show="loading">
+			<iframe v-show="loadingIframe" class="w-[375px] border border-slate-100 bg-gray-100" :src="wapPreview" frameborder="0" id="previewIframe" @load="loadIframe"></iframe>
+			<div v-show="loadingDev" class="w-[375px] border border-slate-100 bg-body pt-[20px] px-[20px]">
+				<div class="font-bold text-xl mb-[40px]">{{t('developTitle')}}</div>
+				<div class="mb-[20px] flex flex-col">
+					<text class="mb-[10px]">{{ t('wapDomain') }}</text>
+					<el-input v-model="wapDomain" :placeholder="t('wapDomainPlaceholder')" clearable/>
+				</div>
+				<el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+			</div>
+
+			<div class="w-[400px] absolute bg-body top-[10%] -right-[450px]" v-if="loadingIframe">
+
+				<div class="info-wrap mt-[20px]">
+					<el-form label-width="40px" class="px-[20px]">
+						<el-form-item :label="t('preview')">
+							<el-radio-group v-model="previewMode">
+								<el-radio :label="'weapp'">{{t('weapp')}}</el-radio>
+								<el-radio :label="'wechat'">{{t('wechat')}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+						<template v-if="previewMode == 'wechat'">
+							<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>
+									</template>
+								</el-input>
+							</el-form-item>
+							<el-form-item label=" " v-show="wapImage">
+								<el-image :src="wapImage"/>
+							</el-form-item>
+						</template>
+						<template v-if="previewMode == 'weapp'">
+							<el-form-item label=" " v-if="weappConfig.qr_code">
+								<el-image class="w-[100px] h-[100px]" :src="img(weappConfig.qr_code)"/>
+							</el-form-item>
+							<el-form-item label=" " v-else>
+								<span class="text-gray-400">{{t('weappNotSet')}}</span>
+							</el-form-item>
+						</template>
+					</el-form>
+
+				</div>
+
+			</div>
+
+		</div>
+
+	</div>
+</template>
+
+<script lang="ts" setup>
+    import {ref, reactive, watch} from 'vue'
+    import {t} from '@/lang'
+    import {useRoute, useRouter} from 'vue-router'
+    import {getWeappConfig} from '@/api/weapp'
+    import {getUrl} from '@/api/sys'
+    import {useClipboard} from '@vueuse/core'
+    import {ElMessage} from 'element-plus'
+    import {img} from '@/utils/common'
+    import QRCode from "qrcode";
+    import storage from '@/utils/storage'
+    import {getPreviewData} from '@/api/diy'
+
+    const wapUrl = ref('')
+    const wapDomain = ref('')
+    const wapImage = ref('')
+    const wapPreview = ref('')
+
+    const loading = ref(false)
+    const loadingIframe = ref(false) // 加载iframe
+    const loadingDev = ref(false) // 加载开发环境配置
+    const timeFrame = ref(0)
+
+    var time = new Date().getTime();
+    const route = useRoute();
+    route.query.id = route.query.id || 0;
+    route.query.name = route.query.name || '';
+
+    getUrl().then((res: any) => {
+        wapDomain.value = res.data.wap_domain;
+        wapUrl.value = res.data.wap_url;
+        setDomain();
+
+        // 生产模式禁止
+        if (import.meta.env.MODE == 'production') return;
+
+        // env文件配置过wap域名
+        if (wapDomain.value) return;
+
+        let wap_domain_storage = storage.get('wap_domain');
+        if (wap_domain_storage) {
+            wapUrl.value = wap_domain_storage
+            setDomain();
+            return;
+        }
+
+        timeFrame.value = new Date().getTime();
+    });
+
+    const save = () => {
+        wapUrl.value = wapDomain.value + '/wap';
+        setDomain();
+        storage.set({key: 'wap_domain', data: wapUrl.value});
+        loadingIframe.value = true;
+        loadingDev.value = false;
+    }
+
+    const setDomain = () => {
+        let siteInfo = storage.get('siteInfo');
+        let siteCode = '';
+        if (siteInfo) siteCode = siteInfo.site_code;
+
+        getPreviewData({
+            id: route.query.id,
+            name: route.query.name,
+        }).then((res: any) => {
+            let data = res.data;
+            wapPreview.value = `${wapUrl.value}/${data.page}&mode=preview&site_id=${siteCode}`;
+            QRCode.toDataURL(wapPreview.value, {errorCorrectionLevel: 'L', margin: 0, width: 100}).then(url => {
+                wapImage.value = url
+            })
+        })
+    }
+
+    // 监听iframe加载事件
+    const loadIframe = () => {
+        if (!wapPreview.value) return;
+        var loadTime = new Date().getTime();
+        var difference = loadTime - timeFrame.value;
+        // 检测页面加载差异，小于1000毫秒，则配置wap端域名
+        if (difference < 1000) {
+            loadingDev.value = true;
+            loadingIframe.value = false;
+            wapPreview.value = '';
+            wapImage.value = '';
+        } else {
+            loadingDev.value = false;
+            loadingIframe.value = true;
+        }
+        loading.value = true
+    }
+
+    const weappConfig = reactive({
+        qr_code: ''
+    })
+
+    const previewMode = ref('weapp')
+
+    // 获取微信配置
+    getWeappConfig().then((res: any) => {
+        if (res.code == 1) {
+            let data = res.data;
+            weappConfig.qr_code = data.qr_code;
+        }
+    })
+
+    // 复制
+    const {copy, isSupported, copied} = useClipboard()
+    const copyEvent = (text: string) => {
+        if (!isSupported.value) {
+            ElMessage({
+                message: t('notSupportCopy'),
+                type: 'warning'
+            })
+        }
+        copy(text)
+    }
+
+    watch(copied, () => {
+        if (copied.value) {
+            ElMessage({
+                message: t('copySuccess'),
+                type: 'success'
+            })
+        }
+    })
+
+</script>
+
+<style lang="scss">
+	body {
+		background: #edf0f3;
+	}
+
+	.copy {
+		background: var(--el-color-primary) !important;
+		color: var(--el-color-white) !important;
+	}
+</style>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/admin/src/views/diy/route.vue b/admin/src/views/diy/route.vue
new file mode 100644
index 000000000..00c070234
--- /dev/null
+++ b/admin/src/views/diy/route.vue
@@ -0,0 +1,258 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="diyRouteTableData.searchParam" ref="searchFormDiyRouteRef">
+                    <el-form-item :label="t('title')" prop="title">
+                        <el-input v-model="diyRouteTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDiyRouteList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormDiyRouteRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <el-table :data="diyRouteTableData.data" size="large" v-loading="diyRouteTableData.loading">
+                <template #empty>
+                    <span>{{ !diyRouteTableData.loading ? t('emptyData') : '' }}</span>
+                </template>
+                <el-table-column prop="title" :label="t('title')" min-width="70" />
+                <el-table-column prop="page" :label="t('wapUrl')" min-width="170">
+                    <template #default="{ row }">
+                        <span class="mr-[10px]">{{ wapDomain + row.page }}</span>
+                        <el-button type="primary" link @click="copyEvent(wapDomain + row.page)">{{ t('copy') }}</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="page" :label="t('weappUrl')" min-width="120">
+                    <template #default="{ row }">
+                        <span class="mr-[10px]">{{ row.page }}</span>
+                        <el-button type="primary" link @click="copyEvent(row.page)">{{ t('copy') }}</el-button>
+                    </template>
+                </el-table-column>
+                <el-table-column :label="t('share')" fixed="right" min-width="80">
+                    <template #default="{ row }">
+                        <el-button v-if="row.is_share == 1" type="primary" link @click="openShare(row)">{{ t('shareSet') }}</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+        </el-card>
+
+        <!-- 分享设置-->
+        <el-dialog v-model="shareDialogVisible" :title="t('shareSet')" width="30%">
+
+            <el-tabs v-model="tabShareType">
+                <el-tab-pane :label="t('wechat')" name="wechat"></el-tab-pane>
+                <el-tab-pane :label="t('weapp')" name="weapp"></el-tab-pane>
+            </el-tabs>
+            <el-form :model="shareFormData[tabShareType]" label-width="90px" ref="shareFormRef" :rules="shareFormRules">
+                <el-form-item :label="t('sharePage')">
+                    <span>{{ sharePage }}</span>
+                </el-form-item>
+                <el-form-item :label="t('shareTitle')" prop="title">
+                    <el-input v-model="shareFormData[tabShareType].title" :placeholder="t('shareTitlePlaceholder')" clearable maxlength="30" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareDesc')" prop="desc" v-if="tabShareType == 'wechat'">
+                    <el-input v-model="shareFormData[tabShareType].desc" :placeholder="t('shareDescPlaceholder')" type="textarea" rows="4" clearable maxlength="100" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('shareImageUrl')" prop="url">
+                    <upload-image v-model="shareFormData[tabShareType].url" :limit="1" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="shareDialogVisible = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="shareEvent(shareFormRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch, computed } from 'vue'
+import { t } from '@/lang'
+import { getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyRouteShare } from '@/api/diy'
+import {  ElMessage, ElMessageBox, FormInstance } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import { useClipboard } from '@vueuse/core'
+import QRCode from "qrcode";
+import { getUrl } from '@/api/sys'
+
+const pageTemplate: any = reactive({})
+
+const router = useRouter()
+const route = useRoute()
+const pageName = route.meta.title;
+
+const formRef = ref<FormInstance>()
+const dialogVisible = ref(false)
+
+let diyRouteTableData = reactive({
+    loading: true,
+    data: [],
+    searchParam: {
+        "title": "",
+        "type":""
+    }
+})
+
+const wapDomain = ref('')
+const getDomain = async () => {
+    wapDomain.value = (await getUrl()).data.wap_url;
+};
+getDomain();
+
+/**
+ * 获取自定义路由列表
+ */
+const loadDiyRouteList = () => {
+    diyRouteTableData.loading = true
+
+    getDiyRouteList({
+        ...diyRouteTableData.searchParam
+    }).then(res => {
+        diyRouteTableData.loading = false
+        diyRouteTableData.data = res.data
+    }).catch(() => {
+        diyRouteTableData.loading = false
+    })
+}
+loadDiyRouteList()
+
+// 获取自定义页面模板
+getDiyTemplate({}).then(res => {
+    for (let key in res.data) {
+        pageTemplate[key] = res.data[key]
+    }
+})
+
+
+const searchFormDiyRouteRef = ref<FormInstance>()
+
+/**
+ * 复制
+ */
+const { copy, isSupported, copied } = useClipboard()
+const copyEvent = (text: string) => {
+    if (!isSupported.value) {
+        ElMessage({
+            message: t('notSupportCopy'),
+            type: 'warning'
+        })
+    }
+    copy(text)
+}
+
+watch(copied, () => {
+    if (copied.value) {
+        ElMessage({
+            message: t('copySuccess'),
+            type: 'success'
+        })
+    }
+})
+
+const tabShareType = ref('wechat')
+const sharePage = ref('')
+const shareFormId = ref(0)
+const diyRouteData = reactive({
+    title: '',
+    name: '',
+    page: '',
+    is_share: 0,
+    sort: 0
+})
+const shareFormData = reactive({
+    wechat: {
+        title: '',
+        desc: '',
+        url: ''
+    },
+    weapp: {
+        title: '',
+        url: ''
+    }
+})
+const shareDialogVisible = ref(false)
+const shareFormRules = computed(() => {
+    return {}
+})
+
+const shareFormRef = ref<FormInstance>()
+const openShare = async (row: any) => {
+    // 基础页面
+    let info = (await getDiyRouteInfo({
+        name: row.name
+    })).data;
+
+    if (info.title) {
+        row.id = info.id;
+        row.title = info.title
+        row.name = info.name
+        row.page = info.page
+        row.is_share = info.is_share
+        row.sort = info.sort
+        row.share = info.share
+    }
+
+    diyRouteData.title = row.title
+    diyRouteData.name = row.name
+    diyRouteData.page = row.page
+    diyRouteData.is_share = row.is_share
+    diyRouteData.sort = row.sort
+
+    shareFormId.value = row.id;
+    sharePage.value = row.title;
+    let share = row.share ? JSON.parse(row.share) : {
+        wechat: {title: '', desc: '', url: ''},
+        weapp: {title: '', url: ''}
+    };
+    if (share) {
+        shareFormData.wechat = share.wechat;
+        shareFormData.weapp = share.weapp;
+    }
+
+    shareDialogVisible.value = true;
+}
+
+const shareEvent = async (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            let save = editDiyRouteShare
+            save({
+                id: shareFormId.value,
+                share: JSON.stringify(shareFormData),
+                ...diyRouteData
+            }).then(() => {
+                loadDiyRouteList()
+                shareDialogVisible.value = false;
+            }).catch(() => {
+            })
+        }
+    })
+}
+
+const resetForm = (formEl: FormInstance | undefined)=>{
+    if (!formEl) return
+    formEl.resetFields();
+    loadDiyRouteList();
+}
+</script>
+
+<style lang="scss">
+.copy {
+    background: var(--el-color-primary) !important;
+    color: var(--el-color-white) !important;
+}
+</style>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/admin/src/views/finance/account.vue b/admin/src/views/finance/account.vue
new file mode 100644
index 000000000..1046da2a9
--- /dev/null
+++ b/admin/src/views/finance/account.vue
@@ -0,0 +1,283 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <el-card class="box-card !border-none base-bg !px-[35px]" shadow="never">
+			    <el-row class="flex">
+			        <el-col :span="8" class="min-w-[100px]">
+						<div class="statistic-card">
+                            <el-statistic :value="accountStat.pay ? Number.parseFloat(accountStat.pay).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalPay') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+					<el-col :span="8" class="min-w-[100px]">
+						<div class="statistic-card">
+                            <el-statistic :value="accountStat.refund ? Number.parseFloat(accountStat.refund).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalRefund') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+			        <el-col :span="8" class="min-w-[100px]">
+						<div class="statistic-card">
+                            <el-statistic :value="accountStat.transfer ? Number.parseFloat(accountStat.transfer).toFixed(2) : '0.00'"></el-statistic>
+                            <div class="statistic-footer">
+                                <div class="footer-item text-[14px] text-[#666]">
+                                    <span>{{ t('totalTransfer') }}</span>
+                                </div>
+                            </div>
+                        </div>
+			        </el-col>
+			    </el-row>
+			</el-card>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="siteAccountLogTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('type')" class="items-center">
+						<el-select v-model="siteAccountLogTable.searchParam.type" class="m-2" :placeholder="t('accountType')" >
+							<el-option
+								v-for="(item, index) in accountType"
+								:key="index"
+								:label="item"
+								:value="index"
+							/>
+						</el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('tradeNo')" prop="trade_no">
+                        <el-input v-model="siteAccountLogTable.searchParam.trade_no" :placeholder="t('tradeNoPlaceholder')" />
+                    </el-form-item>
+					<el-form-item :label="t('createTime')" prop="create_time">
+					    <el-date-picker v-model="siteAccountLogTable.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="loadSiteAccountLogList()">{{ 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="siteAccountLogTable.data" size="large" v-loading="siteAccountLogTable.loading">
+                    <template #empty>
+                        <span>{{ !siteAccountLogTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="trade_no" :label="t('tradeNo')" min-width="120" />
+                    <el-table-column prop=	"type_name" :label="t('type')" min-width="120" />
+                    <el-table-column prop="money" :label="t('money')" min-width="120" align="right" />
+                    <el-table-column :label="t('createTime')" min-width="150" align="center">
+                        <template #default="{ row }">
+                            {{ row.create_time || '' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="siteAccountLogTable.page" v-model:page-size="siteAccountLogTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="siteAccountLogTable.total"
+                        @size-change="loadSiteAccountLogList()" @current-change="loadSiteAccountLogList" />
+                </div>
+            </div>
+        </el-card>
+		<el-dialog v-model="showDialog" :title="t('accountDetail')" width="550px" :destroy-on-close="true">
+		    <el-form :model="formData" label-width="110px" ref="formRef" class="page-form">
+		 
+				<el-form-item :label="t('tradeNo')" >
+				    <div class="input-width"> {{ formData.trade_no }} </div>
+				</el-form-item>
+				<el-form-item :label="t('type')" >
+				    <div class="input-width"> {{ formData.type_name }} </div>
+				</el-form-item>
+				<el-form-item :label="t('money')" >
+				    <div class="input-width"> {{ formData.money }} </div>
+				</el-form-item>
+				<el-form-item :label="t('createTime')" >
+				    <div class="input-width"> {{ formData.create_time }} </div>
+				</el-form-item>
+				<div v-if="formData.type == 'transfer'">
+					<el-form-item :label="t('transferNo')" >
+					    <div class="input-width"> {{ formData.pay_info.transfer_no }} </div>
+					</el-form-item>
+					<el-form-item :label="t('transferTime')" >
+					    <div class="input-width"> {{ formData.pay_info.transfer_time }} </div>
+					</el-form-item>
+					<el-form-item :label="t('transferType')" >
+					    <div class="input-width"> {{ formData.pay_info.transfer_type }} </div>
+					</el-form-item>
+					<el-form-item :label="t('transferMoney')" >
+					    <div class="input-width"> {{ formData.pay_info.money }} </div>
+					</el-form-item>
+					<el-form-item :label="t('transferRemark')" >
+					    <div class="input-width"> {{ formData.pay_info.remark }} </div>
+					</el-form-item>
+				</div>
+				<div v-if="formData.type == 'refund'">
+					<el-form-item :label="t('outTradeNo')" >
+					    <div class="input-width"> {{ formData.pay_info.out_trade_no }} </div>
+					</el-form-item>
+					<el-form-item :label="t('createTime')" >
+					    <div class="input-width"> {{ formData.pay_info.create_time }} </div>
+					</el-form-item>
+					<el-form-item :label="t('refundMoney')" >
+					    <div class="input-width"> {{ formData.pay_info.money }} </div>
+					</el-form-item>
+					<el-form-item :label="t('failReason')" >
+					    <div class="input-width"> {{ formData.pay_info.fail_reason }} </div>
+					</el-form-item>
+				</div>
+				<div v-if="formData.type == 'pay'">
+					<el-form-item :label="t('outTradeNo')" >
+					    <div class="input-width"> {{ formData.pay_info.out_trade_no }} </div>
+					</el-form-item>
+					<el-form-item :label="t('createTime')" >
+					    <div class="input-width"> {{ formData.pay_info.create_time }} </div>
+					</el-form-item>
+					<el-form-item :label="t('money')" >
+					    <div class="input-width"> {{ formData.pay_info.money }} </div>
+					</el-form-item>
+					<el-form-item :label="t('body')" >
+					    <div class="input-width"> {{ formData.pay_info.body }} </div>
+					</el-form-item>
+				</div>
+	<!-- 	        <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="@/assets/images/default_headimg.png" alt="" >
+		            </div>
+		        </el-form-item>
+		
+				<el-form-item :label="t('memberId')" >
+		            <div class="input-width"> {{ formData.member.member_no }} </div>
+		        </el-form-item>
+		
+		        <el-form-item :label="t('nickName')" >
+		            <div class="input-width"> {{ formData.member.nickname }} </div>
+		        </el-form-item>
+		
+		
+		        <el-form-item :label="t('mobile')" >
+		            <div class="input-width"> {{ formData.member.mobile }} </div>
+		        </el-form-item>
+		
+		        <el-form-item :label="t('accountData')" >
+		            <div class="input-width"> {{ formData.account_data }} </div>
+		        </el-form-item>
+		 
+		        <el-form-item :label="t('fromType')" >
+		            <div class="input-width"> {{ formData.from_type_name }} </div>
+		        </el-form-item>
+		
+		        <el-form-item :label="t('memo')" >
+		            <div class="input-width"> {{ formData.memo }} </div>
+		        </el-form-item>
+		 
+		        <el-form-item :label="t('createTime')" >
+		            <div class="input-width"> {{ formData.create_time }} </div>
+		        </el-form-item> -->
+		
+		    </el-form>
+		
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="showDialog = false">{{ t('confirm') }}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { getAccountList, getAccountStat, getAccountType } from '@/api/site'
+import { img } from '@/utils/common'
+import { ElMessageBox } from 'element-plus'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let siteAccountLogTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+		site_id: "",
+        type: "",
+        money: "",
+        trade_no: "",
+        create_time: ""
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+/**
+ * 获取站点账单记录列表
+ */
+const loadSiteAccountLogList = (page: number = 1) => {
+    siteAccountLogTable.loading = true
+    siteAccountLogTable.page = page
+
+    getAccountList({
+        page: siteAccountLogTable.page,
+        limit: siteAccountLogTable.limit,
+         ...siteAccountLogTable.searchParam
+    }).then(res => {
+        siteAccountLogTable.loading = false
+        siteAccountLogTable.data = res.data.data
+        siteAccountLogTable.total = res.data.total
+    }).catch(() => {
+        siteAccountLogTable.loading = false
+    })
+}
+loadSiteAccountLogList()
+
+
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadSiteAccountLogList()
+}
+
+const accountType = ref([])
+const checkAccountType = () => {
+	getAccountType().then(res=>{
+		accountType.value = res.data
+		console.log(accountType.value)
+	})
+}
+checkAccountType()
+const showDialog = ref(false)
+const formData = ref([]);
+const detailEvent = (info) => {
+	showDialog.value = true
+	formData.value = info
+}
+
+const accountStat = ref([])
+const checkAccountStat = async () => {
+    accountStat.value = await (await getAccountStat()).data
+}
+checkAccountStat()
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/admin/src/views/index/site_index.vue b/admin/src/views/index/site_index.vue
index ddc4975dd..c2c29a798 100644
--- a/admin/src/views/index/site_index.vue
+++ b/admin/src/views/index/site_index.vue
@@ -1,211 +1,147 @@
 <template>
-    <div class="main-container flex" v-loading="loading">
-        <div class="main-body flex-1 mr-[15px]" >
-            <el-card class="box-card !border-none" shadow="never">
-                <template #header>
-                    <div class="card-header">
-                        <span class="text-[15px]">{{t('todayData')}}</span>
-                    </div>
-                </template>
-                <el-row>
-                    <el-col :span="6">
-                        <el-statistic :value="statInfo.today_data.total_member_count">
-                            <template #title>
-                                <div class="text-[14px] mb-[9px]">{{t('memberNumb')}}</div>
-                            </template> 
-                        </el-statistic>
-						<div class="statistic-footer">
-						    <div class="footer-item text-[14px] text-[#333333]">
-						        <span>{{t('accumulative')}}</span>
-						        <span class="green ml-1">
-						            {{ statInfo.total_data.total_member_count }}
-						        </span>
-						    </div>
+    <div class="main-container flex min-h-[300px]" v-loading="loading" >
+        <div class="main-body flex-1 mr-[15px]" :class="!loading ? '' : 'hidden'">
+            <el-card class="box-card !border-none" shadow="never" >
+                <div class="flex justify-between items-center">
+					<div class="flex">
+						<div><img class="w-[44px] h-[44px]" src="@/assets/images/index/site_img.png"/></div>
+						<div class="ml-[12px]">
+							<div>
+								<span class="font-bold text-[18px]">{{ statInfo.site_info.site_name }}</span>
+								<span class="text-[12px] ml-[12px]">ID:{{ statInfo.site_info.site_code }}</span>
+							</div>
+							<div>
+								<span class="text-[14px] text-[#666] mr-[12px]">{{ t('siteType') }}：{{ statInfo.site_info.group_name }}</span>
+								<span class="text-[10px] py-[3px] px-[10px] bg-[#E6EFFF] text-[#2D5FFF] rounded-[3px]">{{ statInfo.site_info.status_name }}</span>
+							</div>
 						</div>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-statistic :value="statInfo.today_data.total_order_money" :precision="2">
-                            <template #title>
-                                <div class="text-[14px] mb-[9px]">{{t('orderMoney')}}</div>
-                            </template>
-                        </el-statistic>
-						<div class="statistic-footer">
-						    <div class="footer-item text-[14px] text-[#333333]">
-						        <span>{{t('accumulative')}}</span>
-						        <span class="green ml-1">
-						            {{ statInfo.total_data.total_order_money }}
-						        </span>
-						    </div>
-						</div>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-statistic :value="statInfo.today_data.total_visit_count">
-                            <template #title>
-                                <div class="text-[14px] mb-[9px]">{{t('numberOfVisitors')}}</div>
-                            </template>
-                        </el-statistic>
-						<div class="statistic-footer">
-						    <div class="footer-item text-[14px] text-[#333333]">
-						        <span>{{t('accumulative')}}</span>
-						        <span class="green ml-1">
-						            {{ statInfo.total_data.total_visit_count }}
-						        </span>
-						    </div>
-						</div>
-                    </el-col>
-					<el-col :span="6">
-					    <el-statistic :value="statInfo.today_data.total_order_count">
-					        <template #title>
-					            <div class="text-[14px] mb-[9px]">{{t('orderNumber')}}</div>
-					        </template>
-					    </el-statistic>
-						<div class="statistic-footer">
-						    <div class="footer-item text-[14px] text-[#333333]">
-						        <span>{{t('accumulative')}}</span>
-						        <span class="green ml-1">
-						            {{ statInfo.total_data.total_order_count }}
-						        </span>
-						    </div>
-						</div>
-					</el-col>
-                </el-row>
-            </el-card>
-
-            <el-card class="box-card !border-none mt-[15px]" shadow="never">
-                <el-row justify="space-between">
-                    <el-col :span="4">
-                        <div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/article/list')">
-							<img class="w-[33px]" src="@/assets/images/index/article.png"/>
-                            <span class="ml-[10px] text-[16px] text-[#666]">{{t('articleList')}}</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="4">
-						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/member')">
-							<img class="w-[33px]" src="@/assets/images/index/site_member.png"/>
-						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('memberManagement')}}</span>
-						</div>
-                    </el-col>
-                    <el-col :span="4">
-						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/balance')">
-							<img class="w-[33px]" src="@/assets/images/index/site_balance.png"/>
-						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('balanceAccount')}}</span>
-						</div>
-                    </el-col>
-                    <el-col :span="4">
-						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/member')">
-							<img class="w-[33px]" src="@/assets/images/index/site_auth.png"/>
-						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('administrator')}}</span>
-						</div>
-                    </el-col>
-                    <el-col :span="4">
-						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/diy/index')">
-							<img class="w-[33px]" src="@/assets/images/index/renovation.png"/>
-						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('WebDecoration')}}</span>
-						</div>
-                    </el-col>
-                </el-row>
-            </el-card>
-            
-            <div class="mt-[15px] flex">
-                <el-card class="box-card !border-none flex-1 mr-[15px]" shadow="never">
-                    <template #header>
-                        <div class="card-header">
-                            <span class="text-[15px]">{{t('pageView')}}</span>
-                        </div>
-                    </template>
-                    <div ref="visitStat" :style="{ width: '100%', height: '300px' }"></div>
-                </el-card>
-                <el-card class="box-card !border-none flex-1" shadow="never">
-                    <template #header>
-                        <div class="card-header">
-                            <span class="text-[15px]">{{t('memberDistribution')}}</span>
-                        </div>
-                    </template>
-                    <div ref="memberStat" :style="{ width: '100%', height: '300px' }"></div>
-                </el-card>
-            </div>
-        </div>
-        <div class="main-aside w-[300px]">
-            <el-card class="box-card !border-none" shadow="never">
-                <template #header>
-                    <div class="card-header">
-                        <span class="text-[15px]">{{t('siteInfo')}}</span>
-                    </div>
-                </template>
-				<div class="site-info w-[260px] h-[150px] pl-[20px] pt-[20px] pb-[10px] pr-[15px]">
-					<div class="flex items-end justify-between">
-						<div>
-							<div class="flex"><icon name="iconfont-iconhuangjinhuiyuan0101-copy" class="leading-[1] mr-[5px]" size="22px" color="#2934DD"></icon><span class="text-[#2934DD] text-[16px] font-bold ">{{ statInfo.site_info.group_name }}</span></div>
-							<div><span class="text-[#3C45A5] text-[12px]">{{ t('siteName') }}：{{ statInfo.site_info.site_name }}</span></div>
-						</div>
-						<span @click="renew" class="cursor-pointer w-[70px] h-[30px] text-center leading-[30px] bg-[#2C3EEF] text-[#fff] text-[14px] rounded-[5px]">续费</span>
 					</div>
-					<i class="block w-[30px] h-[4px] bg-[#2934DD] mt-[6px] mb-[18px]"></i>
+					<div class="flex">
+						<div>
+							<div><span class="text-[14px] text-[#666]">{{ t('periodTime') }}：{{ statInfo.site_info.create_time ? statInfo.site_info.create_time.split(' ')[0] : '' }} / {{ statInfo.site_info.expire_time ? statInfo.site_info.expire_time.split(' ')[0] : '' }}</span></div>
+							<div class="w-[300px] h-[12px] bg-[#E6EFFF] rounded-[999px] mt-1">
+								<div class="bg-primary site-date rounded-[999px] h-[12px]" :style="{width: statInfo.site_info.mix}"></div>
+							</div>
+						</div>
+						<div class="ml-[40px]">
+							<el-button v-if="statInfo.site_info.over_date <= 7" class="bottom-back w-[80px] h-[40px] text-[14px] bg-transparent" type="primary" plain @click="renew">{{ t('renew') }}</el-button>
+							<el-button class="w-[80px] h-[40px] text-[14px]" type="primary" >{{ t('accessSite') }}</el-button>
+						</div>
+					</div>
+				</div>
+				<div class="mt-[60px]">
+					<div class="card-header flex justify-between border-b-[1px] border-[#EBEBEC] pb-[15px]">
+					    <span class="text-[18px]">{{t('appTemplate')}}</span>
+						<div @click="optionModel" v-if="!edit_menu" class="cursor-pointer">
+							<img class="w-[15px]" src="@/assets/images/index/edit.png"/>
+						</div>
+						<div v-if="edit_menu">
+							<el-button type="primary" @click="primary">{{ t('complete') }}</el-button>
+						</div>
+					</div>
+					<div class="flex flex-wrap" >
+						<div class="flex flex-wrap" ref="shortcutModel" v-if="edit_menu">
+							<div v-for="(items, index) in shortcut_menu" :style="{backgroundColor : items.bg_color}" :data-id="items.id" class="design-field w-[180px] h-[120px] relative mt-[30px] rounded-[5px] mr-[30px] cursor-pointer">
+								<div class="flex items-center h-[88px]" @click="editModel(items)">
+									<img class="ml-[24px] w-[40px]" :src="img(items.img)"/>
+									<span class="text-item text-[16px] text-[#fff] ml-[12px] max-w-[120px]">{{ items.name }}</span>
+								</div>
+								<div class="item-bottom h-[32px] leading-[32px] text-center" @click="editModel(items)">
+									<span class="text-item text-[12px] text-[#fff] max-w-[150px]">{{ items.desc }}</span>
+								</div>
+								<div class="delete-item absolute w-[20px] h-[20px] rounded-[999px] overflow-hidden" v-if="edit_menu" @click="remowMenu(items)">
+									<img class="w-[20px] h-[20px]" src="@/assets/images/index/del_model.png"/>
+								</div>
+							</div>
+						</div>
+						<div v-else class="flex flex-wrap">
+							<div v-for="(items, index) in shortcut_menu" :style="{backgroundColor : items.bg_color}" class="design-field w-[180px] h-[120px] relative mt-[30px] rounded-[5px] overflow-hidden mr-[30px] cursor-pointer">
+								<div class="flex items-center h-[88px]" @click="toLink(items.router_path)">
+									<img class="ml-[24px] w-[40px]" :src="img(items.img)"/>
+									<span class="text-item text-[16px] text-[#fff] ml-[12px] max-w-[120px]">{{ items.name }}</span>
+								</div>
+								<div class="item-bottom h-[32px] leading-[32px] text-center"  @click="toLink(items.router_path)">
+									<span class="text-item text-[12px] text-[#fff] max-w-[150px]">{{ items.desc }}</span>
+								</div>
+							</div>
+						</div>
+						<div v-if="edit_menu" class="w-[180px] h-[120px] mt-[30px] rounded-[5px] overflow-hidden border-dashed border-[1px] border-[#D0D7D9] cursor-pointer" @click="showFromMunu">
+							<div class="w-[40px] mx-auto mt-[20px]"><img class="w-[40px]" src="@/assets/images/index/add_menu.png" /></div>
+							<p class="text-center mt-[5px] text-[20px]">{{ t('addMenu') }}</p>
+						</div>
+						<div v-if="shortcut_menu.length <= 0 && !edit_menu" class="flex w-full justify-center items-center min-w-[1000px] min-h-[400px]">
+							<div>
+								<img src="@/assets/images/empty.png"/>
+								<p class="text-center text-gray-400">{{ t('emptyMenu') }}</p>
+							</div>
+						</div>
+					</div>
+				</div>
+            </el-card>
+        </div>
+		<el-dialog v-model="shortcutMenu" :title="t('addShortcutMenu')" 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('path')" prop="router_path">
+				    <el-input v-model="formData.router_path" clearable class="w-[245px]" placeholder="https://"/>
+					<el-button class="model-btn ml-[10px] text-[14px]" type="primary" plain @click="showMenu = true">{{ t('selectModel') }}</el-button>
+				</el-form-item>
+				
+			    <el-form-item :label="t('menuName')" prop="name">
+			        <el-input v-model="formData.name" clearable class="w-[245px]" :placeholder="t('menuNamePlaceholder')" />
+			    </el-form-item>
+			
+			    <el-form-item :label="t('menuBgColor')" prop="bg_color">
+					<div class="flex items-center">
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#6F77FF' ? 'border-[1px] border-[##DCDFE6]' : '' ">
+							<div @click="formData.bg_color = '#6F77FF'" class="w-[20px] h-[20px] cursor-pointer bg-[#6F77FF] rounded-[99px]"></div>
+						</div>
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#0FB199' ? 'border-[1px] border-[##DCDFE6' : '' ">
+							<div @click="formData.bg_color = '#0FB199'" class="w-[20px] h-[20px] cursor-pointer bg-[#0FB199] rounded-[99px]"></div>
+						</div>
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#FFA238' ? 'border-[1px] border-[##DCDFE6]' : '' ">
+							<div @click="formData.bg_color = '#FFA238'" class="w-[20px] h-[20px] cursor-pointer bg-[#FFA238] rounded-[99px]"></div>
+						</div>
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#4A78FF' ? 'border-[1px] border-[##DCDFE6]' : '' ">
+							<div @click="formData.bg_color = '#4A78FF'" class="w-[20px] h-[20px] cursor-pointer bg-[#4A78FF] rounded-[99px]"></div>
+						</div>
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#FE5858' ? 'border-[1px] border-[##DCDFE6]' : '' ">
+							<div @click="formData.bg_color = '#FE5858'" class="w-[20px] h-[20px] cursor-pointer bg-[#FE5858] rounded-[99px]"></div>
+						</div>
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#6EB44E' ? 'border-[1px] border-[##DCDFE6]' : '' ">
+							<div @click="formData.bg_color = '#6EB44E'" class="w-[20px] h-[20px] cursor-pointer bg-[#6EB44E] rounded-[99px]"></div>
+						</div>
+						<div class="mr-[8px] p-[4px] rounded-[99px]" :class="formData.bg_color == '#FA6400' ? 'border-[1px] border-[##DCDFE6]' : '' ">
+							<div @click="formData.bg_color = '#FA6400'" class="w-[20px] h-[20px] cursor-pointer bg-[#FA6400] rounded-[99px]"></div>
+						</div>
+						<el-color-picker v-model="formData.bg_color" show-alpha />
+					</div>
+			    </el-form-item>
+				
+				<!-- <el-form-item :label="t('shortcutLink')" prop="path">
 					<div>
-						<div><span class="text-[#3C45A5] text-[12px]">{{ t('statusName') }}：{{ statInfo.site_info.status_name }}</span></div>
-						<div><span class="text-[#3C45A5] text-[12px]">{{ t('expireTime') }}：{{ statInfo.site_info.expire_time ? statInfo.site_info.expire_time : t('permanent')}}</span></div>
+						<span v-if='formData.router_path' class="py-[8px] px-[15px] bg-[#E6EFFF] text-[12px] max-w-[200px] overflow-hidden">{{ formData.link_name ? formData.link_name : formData.router_path }}</span>
+						<el-button text type="primary" @click="showMenu = true" >{{ t('select') }}</el-button>
+						<el-button text type="primary" @click="customPath = true">{{ t('custom') }}</el-button>
 					</div>
-				</div>
-            </el-card>
-            
-            <el-card class="box-card !border-none mt-[15px]" shadow="never">
-                <template #header>
-                    <div class="card-header">
-                        <span class="text-[15px]">{{t('serviceSupport')}}</span>
-                    </div>
-                </template>
-				<div>
-					<div class="flex items-center pt-[10px] pb-[25px]" v-if="serviceData.wechat_code">
-						<img class="w-[120px] h-[120px] mr-[8px]" :src="img(serviceData.wechat_code)" alt="">
-						<div>
-							<p class="text-[14px]">{{ t('wechatCode') }}</p>
-							<p class="text-[14px] text-gray-400">{{ t('wechatCodeDesc') }}</p>
-						</div>
-					</div>
-					<div v-else class="flex items-center pt-[10px] pb-[25px]">
-						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wx_qrcode.jpg" alt="">
-						<div>
-							<p class="text-[14px]">{{ t('officialAccount') }}</p>
-							<p class="text-[14px] text-gray-400">{{ t('wechatCodeDesc') }}</p>
-						</div>
-					</div>
-					
-					<div class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]" v-if="serviceData.enterprise_wechat">
-						<img class="w-[120px] h-[120px] mr-[8px]" :src="img(serviceData.enterprise_wechat)" alt="">
-						<div>
-							<p class="text-[14px]">{{ t('enterpriseWechatCode') }}</p>
-							<p class="text-[14px] text-gray-400">{{ t('enterpriseWechatCodeDesc') }}</p>
-						</div>
-					</div>
-					<div v-else class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]">
-						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wework_qrcode.png" alt="">
-						<div>
-							<p class="text-[14px]">{{ t('WeCom') }}</p>
-							<p class="text-[14px] text-gray-400">{{ t('enterpriseWechatCodeDesc') }}</p>
-						</div>
-					</div>
-					
-					<div class="flex items-center mt-3" v-if="serviceData.tel">
-						<div class="mr-[30px] flex">
-							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
-							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
-						</div>
-						<div>
-							<p class="text-[14px]">{{ serviceData.tel }}</p>
-						</div>
-					</div>
-					<div v-else class="flex items-center mt-3">
-						<div class="mr-[30px] flex">
-							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
-							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
-						</div>
-						<div>
-							<p class="text-[14px]">400-886-7993</p>
-						</div>
-					</div>
-				</div>
-            </el-card>
-        </div>
+				</el-form-item> -->
+			
+			    <el-form-item :label="t('menuImg')" prop="icon">
+					<upload-image v-model="formData.img" :limit="1" />
+			    </el-form-item>
+			    
+			    <el-form-item :label="t('menuDesc')">
+			        <el-input v-model="formData.desc" :placeholder="t('descPlaceholder')" clearable class="w-[245px] bg-[#F2F4F6]" />
+			    </el-form-item>
+			
+			</el-form>
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="addShortcut(formRef)">{{t('confirm')}}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
 		<el-dialog v-model="renewDialog" :title="t('message')" width="500px" :destroy-on-close="true">
 			<div class="flex mt-1">
 				<div class="mr-[30px] flex">
@@ -222,18 +158,35 @@
 		        </span>
 		    </template>
 		</el-dialog>
+		<el-dialog v-model="showMenu" :title="t('pathSelect')" width="500px" :destroy-on-close="true">
+			<div class="flex mt-1 flex-wrap">
+				<el-button v-for="item in menu_list" class="menu-btn mb-[5px] mr-[10px] ml-[0px]" @click="selectMenu(item)">{{ item.menu_name }}</el-button>
+			</div>
+		</el-dialog>
+		<el-dialog v-model="customPath" width="500px" :destroy-on-close="true">
+			<el-form :model="formData" label-width="90px" ref="formRef" class="page-form">
+			    <el-form-item :label="t('shortcutLink')">
+			        <el-input v-model="formData.router_path" clearable class="input-width" />
+			    </el-form-item>
+			</el-form>
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="customPath = false">{{t('confirm')}}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref,onMounted } from 'vue'
+import { reactive, ref, computed, onMounted } from 'vue'
 import { t } from '@/lang'
 import { getSiteStatInfo } from '@/api/stat'
-import { getService } from '@/api/sys'
-import { ElMessage, FormRules, ElMessageBox } from 'element-plus'
-import * as echarts from 'echarts'
+import { getService, getShortcutMenu, setShortcutMenu, getAuthMenu } from '@/api/sys'
 import { img } from '@/utils/common'
+import Sortable, { SortableEvent } from 'sortablejs'
 import { useRouter } from 'vue-router'
+import type { FormInstance } from 'element-plus'
 
 const renewDialog = ref(false)
 const renew = () => {
@@ -241,92 +194,212 @@ const renew = () => {
 }
 
 const loading = ref(true)
-const visitStat = ref<any>(null)
-const memberStat = ref<any>(null)
-
-const serviceData = reactive<Record<string, string>>({
-	wechat_code: '',
-	enterprise_wechat: '',
-	tel: ''
-})
 
 let statInfo = ref({'today_data':{},system:{},version:{},about:[],visit_stat:{},member_stat:{},site_info:{},total_data:{}})
 const getStatInfoFn = async (id: number = 0) => {
     statInfo.value = await (await getSiteStatInfo()).data
-	
-	const data = await (await getService()).data
-
-	serviceData['wechat_code'] = data.wechat_code;
-	serviceData['enterprise_wechat'] = data.enterprise_wechat;
-	serviceData['tel'] = data.tel;
-	
     loading.value = false;
-    setTimeout(() => {
-        drawChart()
-    }, 20)
 }
 getStatInfoFn()
 
-// 绘制折线图
-const drawChart = () => {
-    //访问消息
-    const visitStatChart = echarts.init(visitStat.value);
-    const visitStatOption = ref({
-        legend: {},
-        xAxis: {
-            data: []
-        },
-        yAxis: {},
-        tooltip: {
-            trigger: 'axis'
-        },
-        series: [
-            {
-            name: t('pageView'),
-            type: 'line',
-            data: []
-            }
-        ]
-    });
-    visitStatOption.value.xAxis.data = statInfo.value.visit_stat.date;
-    visitStatOption.value.series[0].data = statInfo.value.visit_stat.value;
-    visitStatChart.setOption(visitStatOption.value);
-
-    // 会员分布 
-    const memberStatChart = echarts.init(memberStat.value);
-    const memberStatOption = ref({
-        legend: {},
-        tooltip: {},
-        series: [
-            {
-                type: 'pie',
-                data: []
-            }
-        ]
-    });
-
-    const len = statInfo.value.member_stat.type.length;
-    for(let i = 0; i < len; i++){
-        let obj = {};
-        obj.name = statInfo.value.member_stat.type[i];
-        obj.value = statInfo.value.member_stat.value[i];
-        memberStatOption.value.series[0].data.push(obj);
-    }
-    memberStatChart.setOption(memberStatOption.value);
-    window.addEventListener("resize", () => {
-    //页面大小变化后Echarts也更改大小
-        visitStatChart.resize();
-        memberStatChart.resize();
-    })
-}
-
 const router = useRouter()
 /**
  * 链接跳转
  */
 const toLink = (link) => {
-    router.push(link)
+    router.push("/"+link)
 }
+
+const initialFormData = {
+	id: 0,
+	name: '',
+	bg_color: '',
+	img: '',
+	desc: '',
+	link_name: '',
+	router_path: '',
+	menu_key: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+        name: [
+            { required: true, message: t('menuNamePlaceholder'), trigger: 'blur' },
+        ],
+        bg_color: [
+            { required: true, message: t('bgColorPlaceholder'), trigger: 'blur' },
+        ],
+        icon: [
+            { required: true, validator: iconPass, trigger: 'blur' }
+        ],
+        path: [
+            { required: true, validator: pathPass, trigger: 'blur' },
+        ]
+    }
+})
+
+const iconPass = (rule: any, value: any, callback: any) => {
+	if(formData.img == ''){
+		callback(new Error(t('iconPlaceholder')))
+	}
+	callback()
+}
+const pathPass = (rule: any, value: any, callback: any) => {
+	if(formData.router_path == ''){
+		callback(new Error(t('pathPlaceholder')))
+	}
+	callback()
+}
+
+const shortcutMenu = ref(false)
+const edit_menu = ref(false)
+const customPath = ref(false)
+const showMenu = ref(false)
+const shortcut_menu = ref([]);
+const menu_list = ref()
+const is_remove = ref(false)
+const checkMenu = () => {
+	getShortcutMenu().then(res=>{
+		if(res.data){
+			shortcut_menu.value = res.data
+		}
+	})
+}
+checkMenu()
+const addShortcut = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        if (valid) {
+			let data = []
+			if(shortcut_menu.value.length > 0){
+				data = shortcut_menu.value
+			}
+			
+			let time = parseInt(new Date().getTime() / 1000) + '';
+			let num = Math.floor(Math.random() * (999 - 1) ) + 1;
+			
+			//如果是编辑，找到原数据，删除原数据
+			if(formData.id > 0){
+				for(let i in data){
+					if(data[i].id == formData.id){
+						data.splice(i, 1)
+					}
+				}
+			}
+
+			data.push({
+				id: formData.id > 0 ? formData.id : time+num,
+				name: formData.name,
+				bg_color: formData.bg_color,
+				img: formData.img,
+				desc: formData.desc,
+				link_name: formData.link_name,
+				router_path: formData.path,
+				menu_key: formData.menu_key
+			})
+			setShortcutMenu({
+				menu: data
+			}).then(() =>{
+				shortcutMenu.value = false
+				checkMenu()
+			})
+        }
+    })
+}
+
+const editModel = (item) => {
+	shortcutMenu.value = true
+	formData.id = item.id,
+	formData.name = item.name,
+	formData.bg_color = item.bg_color,
+	formData.img = item.img,
+	formData.desc = item.desc,
+	formData.link_name = item.link_name,
+	formData.router_path = item.router_path,
+	formData.menu_key = item.menu_key
+}
+
+const remowMenu = (item) => {
+	is_remove.value = true
+	let menu_arr = shortcut_menu.value;
+	for(let i in menu_arr){
+		if(menu_arr[i].id == item.id){
+			menu_arr.splice(i, 1)
+		}
+	}
+	shortcut_menu.value = menu_arr;
+}
+
+const primary = () => {
+	edit_menu.value = false;
+	if(!is_remove.value) return
+	setShortcutMenu({
+		menu: shortcut_menu.value
+	}).then(() =>{})
+}
+const showFromMunu = () =>{
+	shortcutMenu.value = true
+	formData.name = ''
+	formData.bg_color = ''
+	formData.img = ''
+	formData.desc = ''
+	formData.link_name = ''
+	formData.router_path = ''
+	formData.menu_key = ''
+} 
+const checkMenuList = () => {
+	getAuthMenu().then(res=> {
+		menu_list.value = res.data
+	})
+}
+checkMenuList()
+const selectMenu = (item) => {
+	formData.link_name = item.menu_name
+	formData.router_path = item.router_path
+	formData.menu_key = item.menu_key
+	showMenu.value = false
+}
+const shortcutModel = ref()
+const optionModel = () =>{
+	edit_menu.value = true
+	setTimeout(() => {
+		const sortable = Sortable.create(shortcutModel.value, {
+			group: {
+				name: 'design-field',
+				pull: 'clone',
+				put: false
+			},
+			animation: 200,
+			onAdd: (evt) => {
+				console.log("1111")
+				console.log(evt)
+			},
+			onEnd: (evt) => {
+				let new_data = [];
+				// evt.oldIndex  原位置下标 
+				// evt.newIndex  当前位置下标
+				// console.log(evt.oldIndex+"原位置下标")
+				// console.log(evt.newIndex+"当前位置下标")
+				// for(let k = 0; k < evt.newIndex; k ++){
+				// 	new_data.push(shortcut_menu.value[k])
+				// }
+				// new_data.push(shortcut_menu.value[evt.oldIndex])
+				// let v =  evt.newIndex + 1;
+				// for(v; v < shortcut_menu.value.length; v ++){
+				// 	new_data.push(shortcut_menu.value[v])
+				// }
+				// shortcut_menu.value = new_data
+				// is_remove.value = true
+			}
+		})
+	}, 500)
+	
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -337,4 +410,32 @@ const toLink = (link) => {
 	background-image: url('data:image/png;base64,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');
 	background-size: 100% 100%;
 }
+.item-bottom {
+	background-color: rgba(0, 0, 0, 0.10);
+}
+.bottom-back {
+	background-color:rgba(255, 255, 255, 0)
+}
+.delete-item {
+	top: -8px;
+	right: -8px;
+	font-size: 20px;
+}
+.text-item{
+	  overflow:hidden;
+	  white-space: nowrap;
+	  text-overflow: ellipsis;
+	  -o-text-overflow:ellipsis;
+}
+.menu-btn {
+	margin-left: 0px !important;
+}
+.model-btn {
+
+	font-size: 14px;
+	padding: 3px 6px;
+}
+.input-bg{
+	background-color: #F2F4F6;
+}
 </style>
diff --git a/admin/src/views/index/site_index__.vue b/admin/src/views/index/site_index__.vue
new file mode 100644
index 000000000..ddc4975dd
--- /dev/null
+++ b/admin/src/views/index/site_index__.vue
@@ -0,0 +1,340 @@
+<template>
+    <div class="main-container flex" v-loading="loading">
+        <div class="main-body flex-1 mr-[15px]" >
+            <el-card class="box-card !border-none" shadow="never">
+                <template #header>
+                    <div class="card-header">
+                        <span class="text-[15px]">{{t('todayData')}}</span>
+                    </div>
+                </template>
+                <el-row>
+                    <el-col :span="6">
+                        <el-statistic :value="statInfo.today_data.total_member_count">
+                            <template #title>
+                                <div class="text-[14px] mb-[9px]">{{t('memberNumb')}}</div>
+                            </template> 
+                        </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_member_count }}
+						        </span>
+						    </div>
+						</div>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-statistic :value="statInfo.today_data.total_order_money" :precision="2">
+                            <template #title>
+                                <div class="text-[14px] mb-[9px]">{{t('orderMoney')}}</div>
+                            </template>
+                        </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_order_money }}
+						        </span>
+						    </div>
+						</div>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-statistic :value="statInfo.today_data.total_visit_count">
+                            <template #title>
+                                <div class="text-[14px] mb-[9px]">{{t('numberOfVisitors')}}</div>
+                            </template>
+                        </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_visit_count }}
+						        </span>
+						    </div>
+						</div>
+                    </el-col>
+					<el-col :span="6">
+					    <el-statistic :value="statInfo.today_data.total_order_count">
+					        <template #title>
+					            <div class="text-[14px] mb-[9px]">{{t('orderNumber')}}</div>
+					        </template>
+					    </el-statistic>
+						<div class="statistic-footer">
+						    <div class="footer-item text-[14px] text-[#333333]">
+						        <span>{{t('accumulative')}}</span>
+						        <span class="green ml-1">
+						            {{ statInfo.total_data.total_order_count }}
+						        </span>
+						    </div>
+						</div>
+					</el-col>
+                </el-row>
+            </el-card>
+
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <el-row justify="space-between">
+                    <el-col :span="4">
+                        <div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/article/list')">
+							<img class="w-[33px]" src="@/assets/images/index/article.png"/>
+                            <span class="ml-[10px] text-[16px] text-[#666]">{{t('articleList')}}</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="4">
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/member')">
+							<img class="w-[33px]" src="@/assets/images/index/site_member.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('memberManagement')}}</span>
+						</div>
+                    </el-col>
+                    <el-col :span="4">
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/balance')">
+							<img class="w-[33px]" src="@/assets/images/index/site_balance.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('balanceAccount')}}</span>
+						</div>
+                    </el-col>
+                    <el-col :span="4">
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/member/member')">
+							<img class="w-[33px]" src="@/assets/images/index/site_auth.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('administrator')}}</span>
+						</div>
+                    </el-col>
+                    <el-col :span="4">
+						<div class="w-[120px]  2xl:w-[200px]  py-[15px] rounded-[10px] flex justify-center items-center cursor-pointer border-[1px] border-[#E5E8EE]" @click="toLink('/diy/index')">
+							<img class="w-[33px]" src="@/assets/images/index/renovation.png"/>
+						    <span class="ml-[10px] text-[16px] text-[#666]">{{t('WebDecoration')}}</span>
+						</div>
+                    </el-col>
+                </el-row>
+            </el-card>
+            
+            <div class="mt-[15px] flex">
+                <el-card class="box-card !border-none flex-1 mr-[15px]" shadow="never">
+                    <template #header>
+                        <div class="card-header">
+                            <span class="text-[15px]">{{t('pageView')}}</span>
+                        </div>
+                    </template>
+                    <div ref="visitStat" :style="{ width: '100%', height: '300px' }"></div>
+                </el-card>
+                <el-card class="box-card !border-none flex-1" shadow="never">
+                    <template #header>
+                        <div class="card-header">
+                            <span class="text-[15px]">{{t('memberDistribution')}}</span>
+                        </div>
+                    </template>
+                    <div ref="memberStat" :style="{ width: '100%', height: '300px' }"></div>
+                </el-card>
+            </div>
+        </div>
+        <div class="main-aside w-[300px]">
+            <el-card class="box-card !border-none" shadow="never">
+                <template #header>
+                    <div class="card-header">
+                        <span class="text-[15px]">{{t('siteInfo')}}</span>
+                    </div>
+                </template>
+				<div class="site-info w-[260px] h-[150px] pl-[20px] pt-[20px] pb-[10px] pr-[15px]">
+					<div class="flex items-end justify-between">
+						<div>
+							<div class="flex"><icon name="iconfont-iconhuangjinhuiyuan0101-copy" class="leading-[1] mr-[5px]" size="22px" color="#2934DD"></icon><span class="text-[#2934DD] text-[16px] font-bold ">{{ statInfo.site_info.group_name }}</span></div>
+							<div><span class="text-[#3C45A5] text-[12px]">{{ t('siteName') }}：{{ statInfo.site_info.site_name }}</span></div>
+						</div>
+						<span @click="renew" class="cursor-pointer w-[70px] h-[30px] text-center leading-[30px] bg-[#2C3EEF] text-[#fff] text-[14px] rounded-[5px]">续费</span>
+					</div>
+					<i class="block w-[30px] h-[4px] bg-[#2934DD] mt-[6px] mb-[18px]"></i>
+					<div>
+						<div><span class="text-[#3C45A5] text-[12px]">{{ t('statusName') }}：{{ statInfo.site_info.status_name }}</span></div>
+						<div><span class="text-[#3C45A5] text-[12px]">{{ t('expireTime') }}：{{ statInfo.site_info.expire_time ? statInfo.site_info.expire_time : t('permanent')}}</span></div>
+					</div>
+				</div>
+            </el-card>
+            
+            <el-card class="box-card !border-none mt-[15px]" shadow="never">
+                <template #header>
+                    <div class="card-header">
+                        <span class="text-[15px]">{{t('serviceSupport')}}</span>
+                    </div>
+                </template>
+				<div>
+					<div class="flex items-center pt-[10px] pb-[25px]" v-if="serviceData.wechat_code">
+						<img class="w-[120px] h-[120px] mr-[8px]" :src="img(serviceData.wechat_code)" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('wechatCode') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('wechatCodeDesc') }}</p>
+						</div>
+					</div>
+					<div v-else class="flex items-center pt-[10px] pb-[25px]">
+						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wx_qrcode.jpg" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('officialAccount') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('wechatCodeDesc') }}</p>
+						</div>
+					</div>
+					
+					<div class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]" v-if="serviceData.enterprise_wechat">
+						<img class="w-[120px] h-[120px] mr-[8px]" :src="img(serviceData.enterprise_wechat)" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('enterpriseWechatCode') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('enterpriseWechatCodeDesc') }}</p>
+						</div>
+					</div>
+					<div v-else class="flex items-center pt-[25px] pb-[30px] border-gray-300 border-b-[1px]">
+						<img class="w-[120px] h-[120px] mr-[8px]" src="@/assets/images/index/wework_qrcode.png" alt="">
+						<div>
+							<p class="text-[14px]">{{ t('WeCom') }}</p>
+							<p class="text-[14px] text-gray-400">{{ t('enterpriseWechatCodeDesc') }}</p>
+						</div>
+					</div>
+					
+					<div class="flex items-center mt-3" v-if="serviceData.tel">
+						<div class="mr-[30px] flex">
+							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+						</div>
+						<div>
+							<p class="text-[14px]">{{ serviceData.tel }}</p>
+						</div>
+					</div>
+					<div v-else class="flex items-center mt-3">
+						<div class="mr-[30px] flex">
+							<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+							<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+						</div>
+						<div>
+							<p class="text-[14px]">400-886-7993</p>
+						</div>
+					</div>
+				</div>
+            </el-card>
+        </div>
+		<el-dialog v-model="renewDialog" :title="t('message')" width="500px" :destroy-on-close="true">
+			<div class="flex mt-1">
+				<div class="mr-[30px] flex">
+					<icon name="iconfont-icondianhua" class="leading-[1]" size="20px" color="#000"></icon>
+					<p class="text-[14px] ml-2">{{ t('tel') }}</p>
+				</div>
+				<div>
+				    <p class="text-[14px]">{{ serviceData.tel }}</p>
+				</div>
+			</div>
+		    <template #footer>
+		        <span class="dialog-footer">
+		            <el-button type="primary" @click="renewDialog = false">{{t('confirm')}}</el-button>
+		        </span>
+		    </template>
+		</el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref,onMounted } from 'vue'
+import { t } from '@/lang'
+import { getSiteStatInfo } from '@/api/stat'
+import { getService } from '@/api/sys'
+import { ElMessage, FormRules, ElMessageBox } from 'element-plus'
+import * as echarts from 'echarts'
+import { img } from '@/utils/common'
+import { useRouter } from 'vue-router'
+
+const renewDialog = ref(false)
+const renew = () => {
+  renewDialog.value = true
+}
+
+const loading = ref(true)
+const visitStat = ref<any>(null)
+const memberStat = ref<any>(null)
+
+const serviceData = reactive<Record<string, string>>({
+	wechat_code: '',
+	enterprise_wechat: '',
+	tel: ''
+})
+
+let statInfo = ref({'today_data':{},system:{},version:{},about:[],visit_stat:{},member_stat:{},site_info:{},total_data:{}})
+const getStatInfoFn = async (id: number = 0) => {
+    statInfo.value = await (await getSiteStatInfo()).data
+	
+	const data = await (await getService()).data
+
+	serviceData['wechat_code'] = data.wechat_code;
+	serviceData['enterprise_wechat'] = data.enterprise_wechat;
+	serviceData['tel'] = data.tel;
+	
+    loading.value = false;
+    setTimeout(() => {
+        drawChart()
+    }, 20)
+}
+getStatInfoFn()
+
+// 绘制折线图
+const drawChart = () => {
+    //访问消息
+    const visitStatChart = echarts.init(visitStat.value);
+    const visitStatOption = ref({
+        legend: {},
+        xAxis: {
+            data: []
+        },
+        yAxis: {},
+        tooltip: {
+            trigger: 'axis'
+        },
+        series: [
+            {
+            name: t('pageView'),
+            type: 'line',
+            data: []
+            }
+        ]
+    });
+    visitStatOption.value.xAxis.data = statInfo.value.visit_stat.date;
+    visitStatOption.value.series[0].data = statInfo.value.visit_stat.value;
+    visitStatChart.setOption(visitStatOption.value);
+
+    // 会员分布 
+    const memberStatChart = echarts.init(memberStat.value);
+    const memberStatOption = ref({
+        legend: {},
+        tooltip: {},
+        series: [
+            {
+                type: 'pie',
+                data: []
+            }
+        ]
+    });
+
+    const len = statInfo.value.member_stat.type.length;
+    for(let i = 0; i < len; i++){
+        let obj = {};
+        obj.name = statInfo.value.member_stat.type[i];
+        obj.value = statInfo.value.member_stat.value[i];
+        memberStatOption.value.series[0].data.push(obj);
+    }
+    memberStatChart.setOption(memberStatOption.value);
+    window.addEventListener("resize", () => {
+    //页面大小变化后Echarts也更改大小
+        visitStatChart.resize();
+        memberStatChart.resize();
+    })
+}
+
+const router = useRouter()
+/**
+ * 链接跳转
+ */
+const toLink = (link) => {
+    router.push(link)
+}
+</script>
+
+<style lang="scss" scoped>
+.card-header > span{
+    line-height: 21px;
+}
+.site-info {
+	background-image: url('data:image/png;base64,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');
+	background-size: 100% 100%;
+}
+</style>
diff --git a/admin/src/views/setting/map.vue b/admin/src/views/setting/map.vue
index 56c750e1f..58dd41716 100644
--- a/admin/src/views/setting/map.vue
+++ b/admin/src/views/setting/map.vue
@@ -25,6 +25,7 @@ import { setMap, getMap } from '@/api/sys'
 import { FormInstance, } from 'element-plus'
 
 const loading = ref(false)
+const formRef = ref<FormInstance>()
 const formData = reactive<Record<string, string>>({
 	key : ''
 })
@@ -39,7 +40,6 @@ setFormData()
  */
 const save = async (formEl: FormInstance | undefined) => {
     if (loading.value || !formEl) return
-
     setMap(formData).then(() => {
         loading.value = false
     }).catch(() => {
diff --git a/admin/src/views/setting/notice.vue b/admin/src/views/setting/notice.vue
index a64bb52ea..349ff4373 100644
--- a/admin/src/views/setting/notice.vue
+++ b/admin/src/views/setting/notice.vue
@@ -101,10 +101,10 @@ const loadNoticeList = () => {
             item.sms_type = item.support_type.indexOf('sms') !== -1 ? 1 : 0;
             item.wechat_type = item.support_type.indexOf('wechat') !== -1 ? 1 : 0;
             item.weapp_type = item.support_type.indexOf('weapp') !== -1 ? 1 : 0;
-            if(item.receiver_type == 1){
+            if(item.receiver_type == 0){
                 noticeTableData.buyer.push(item)
             }
-            if(item.receiver_type == 2){
+            if(item.receiver_type == 1){
                 noticeTableData.seller.push(item)
             }
         })
diff --git a/admin/src/views/setting/notice_records.vue b/admin/src/views/setting/notice_records.vue
index 0987630de..93e257c68 100644
--- a/admin/src/views/setting/notice_records.vue
+++ b/admin/src/views/setting/notice_records.vue
@@ -110,7 +110,7 @@ const setTemplateList = async () => {
         Object.keys(res.data).forEach(key => {
             const item = res.data[key]
             const value = { value: key, name: item.name }
-            item.receiver_type == 1 ? templateList.buyer.list.push(value) : templateList.seller.list.push(value)
+            item.receiver_type == 0 ? templateList.buyer.list.push(value) : templateList.seller.list.push(value)
         })
     }).catch(() => {
 
diff --git a/admin/src/views/setting/sms_records.vue b/admin/src/views/setting/sms_records.vue
index e2a1445d3..5ec406e07 100644
--- a/admin/src/views/setting/sms_records.vue
+++ b/admin/src/views/setting/sms_records.vue
@@ -111,7 +111,7 @@ const setTemplateList = async () => {
         Object.keys(res.data).forEach(key => {
             const item = res.data[key]
             const value = { value: key, name: item.name }
-            item.receiver_type == 1 ? templateList.buyer.list.push(value) : templateList.seller.list.push(value)
+            item.receiver_type == 0 ? templateList.buyer.list.push(value) : templateList.seller.list.push(value)
         })
     }).catch(() => {
 
diff --git a/admin/src/views/tools/code/edit.vue b/admin/src/views/tools/code/edit.vue
index 892d67822..c243b3985 100644
--- a/admin/src/views/tools/code/edit.vue
+++ b/admin/src/views/tools/code/edit.vue
@@ -126,20 +126,20 @@
                                 </el-radio-group>
                             </div>
                         </div>
-                    </div>
-                    <el-divider content-position="left">{{ t('commentField') }}</el-divider>
-                    <div>
                         <div class="flex flex-row ">
-                            <div class="text-xs text-gray-500 w-20 items-center	justify-end	 flex">{{ t('isRequired') }}：
+                            <div class="text-xs text-gray-500 w-20 items-center	justify-end	 flex">{{ t('viewType') }}：
                             </div>
                             <div>
-                                <el-radio-group class="ml-4"
-                                    v-model="formData.table_column[formData.editFiledIndex]['is_required']">
-                                    <el-radio :label="1" size="large">{{ t('yes') }}</el-radio>
-                                    <el-radio :label="0" size="large">{{ t('no') }}</el-radio>
-                                </el-radio-group>
+                                <el-select class="m-2" :placeholder="t('selectPlaceholder')" size="small"
+                                    v-model="formData.table_column[formData.editFiledIndex]['view_type']">
+                                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in viewType"
+                                        :key="index" />
+                                </el-select>
                             </div>
                         </div>
+                    </div>
+                    <el-divider content-position="left">{{t('addAndEdit')}}</el-divider>
+                    <div>
                         <div class="flex flex-row ">
                             <div class="text-xs text-gray-500 w-20 items-center	justify-end	 flex">{{ t('isInsert') }}：
                             </div>
@@ -162,6 +162,21 @@
                                 </el-radio-group>
                             </div>
                         </div>
+                        <div class="flex flex-row ">
+                            <div class="text-xs text-gray-500 w-20 items-center	justify-end	 flex">{{ t('isRequired') }}：
+                            </div>
+                            <div>
+                                <el-radio-group class="ml-4"
+                                    v-model="formData.table_column[formData.editFiledIndex]['is_required']">
+                                    <el-radio :label="1" size="large">{{ t('yes') }}</el-radio>
+                                    <el-radio :label="0" size="large">{{ t('no') }}</el-radio>
+                                </el-radio-group>
+                            </div>
+                        </div>
+                    </div>
+                    <el-divider content-position="left">{{t('listSearch')}}</el-divider>
+                    <div>
+                   
                         <div class="flex flex-row ">
                             <div class="text-xs text-gray-500 w-20 items-center	justify-end	 flex">{{ t('isLists') }}：</div>
                             <div>
@@ -204,17 +219,7 @@
                                 </el-select>
                             </div>
                         </div>
-                        <div class="flex flex-row ">
-                            <div class="text-xs text-gray-500 w-20 items-center	justify-end	 flex">{{ t('viewType') }}：
-                            </div>
-                            <div>
-                                <el-select class="m-2" :placeholder="t('selectPlaceholder')" size="small"
-                                    v-model="formData.table_column[formData.editFiledIndex]['view_type']">
-                                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in viewType"
-                                        :key="index" />
-                                </el-select>
-                            </div>
-                        </div>
+
                     </div>
 
                 </el-card>
diff --git a/admin/src/views/tools/cron.vue b/admin/src/views/tools/cron.vue
deleted file mode 100644
index eeedb02d9..000000000
--- a/admin/src/views/tools/cron.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
-    <div class="main-container">
-        <el-card class="box-card !border-none" shadow="never">
-            <div class="flex justify-between items-center">
-                <span class="text-[24px]">{{pageName}}</span>
-            </div>
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="cronTableData.searchParam" ref="searchFormRef">
-                    <el-form-item :label="t('title')" prop="title">
-                        <el-input v-model="cronTableData.searchParam.title" :placeholder="t('titlePlaceholder')" />
-                    </el-form-item>
-                    <el-form-item :label="t('type')" prop="type">
-                        <el-select v-model="cronTableData.searchParam.type" clearable class="input-width">
-                            <el-option :label="t('selectPlaceholder')" value="" />
-                            <el-option :label="item" :value="key" v-for="(item, key) in typeList" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item :label="t('lastTime')" prop="last_time">
-                        <el-date-picker
-                            v-model="cronTableData.searchParam.last_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="loadCronList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-card>
-
-            <div>
-                <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
-
-                    <template #empty>
-                        <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
-                    </template>
-                    
-                    <el-table-column prop="title" :show-overflow-tooltip="true" :label="t('title')" min-width="150" />
-                    <el-table-column prop="type_name" :label="t('typeName')" min-width="120" />
-                    
-                    <el-table-column :label="t('crondType')" min-width="180" align="center">
-                        <template #default="{ row }">
-                            <span v-if="row.type == 'crond'">{{ row.crond_length }}{{ row.crond_type_name }}</span>
-                            <span v-else>{{ t('cron') }}</span>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column prop="count" :label="t('count')" min-width="120" />
-
-                    <el-table-column :label="t('lastTime')" min-width="180" align="center">
-                        <template #default="{ row }">
-                            {{ row.last_time || '' }}
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column :label="t('nextTime')" min-width="180" align="center">
-                        <template #default="{ row }">
-                            {{ row.next_time || '' }}
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column :label="t('operation')" fixed="right" width="100">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="infoEvent(row)">{{ t('info') }}</el-button>
-                        </template>
-                    </el-table-column>
-
-                </el-table>
-                <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="cronTableData.page" v-model:page-size="cronTableData.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="cronTableData.total"
-                        @size-change="loadCronList()" @current-change="loadCronList" />
-                </div>
-            </div>
-
-        </el-card>
-        <cron-info ref="cronDialog" @complete="loadCronList" />
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
-import { t } from '@/lang'
-import { getCronList,getCronType } from '@/api/sys'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import { useRouter } from 'vue-router'
-import CronInfo from '@/views/setting/components/cron-info.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title;
-
-const cronTableData = reactive({
-    page: 1,
-    limit: 10,
-    total: 0,
-    loading: true,
-    data: [],
-    searchParam: {
-        title: '',
-        type:'',
-        last_time:''
-    }
-})
-const typeList = ref([])
-
-const searchFormRef = ref<FormInstance>()
-
-const setTypeList = async () => {
-    typeList.value = await (await getCronType()).data
-}
-setTypeList()
-
-
-const resetForm = (formEl: FormInstance | undefined)=>{
-    if (!formEl) return
-    
-    formEl.resetFields();
-    loadCronList();
-}
-
-/**
- * 获取任务列表
- */
-const loadCronList = (page: number = 1) => {
-    cronTableData.loading = true
-    cronTableData.page = page
-
-    getCronList({
-        page: cronTableData.page,
-        limit: cronTableData.limit,
-        ...cronTableData.searchParam
-    }).then(res => {
-        cronTableData.loading = false
-        cronTableData.data = res.data.data
-        cronTableData.total = res.data.total
-    }).catch(() => {
-        cronTableData.loading = false
-    })
-}
-loadCronList()
-
-const router = useRouter()
-
-const cronDialog: Record<string, any> | null = ref(null)
-/**
- * 查看任务
- * @param data
- */
-const infoEvent = (data: any) => {
-    cronDialog.value.setFormData(data)
-    cronDialog.value.showDialog = true
-}
- 
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/admin/src/views/tools/schedule.vue b/admin/src/views/tools/schedule.vue
new file mode 100644
index 000000000..6ec468fd4
--- /dev/null
+++ b/admin/src/views/tools/schedule.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="text-[24px]">{{pageName}}</span>
+            </div>
+            <div>
+                <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading">
+
+                    <template #empty>
+                        <span>{{ !cronTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    
+                    <el-table-column prop="name" :label="t('title')" min-width="150" />
+					<el-table-column prop="key" :label="t('key')" min-width="150" />
+					<el-table-column :label="t('crondType')" min-width="150">
+						<template #default="{ row }">
+							{{ row.crontab_content }}
+						</template>
+					</el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="cronTableData.page" v-model:page-size="cronTableData.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="cronTableData.total"
+                        @size-change="loadCronList()" @current-change="loadCronList" />
+                </div>
+            </div>
+
+        </el-card>
+        <cron-info ref="cronDialog" @complete="loadCronList" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { getCronList,getCronType } from '@/api/sys'
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { useRouter } from 'vue-router'
+import CronInfo from '@/views/setting/components/cron-info.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+const cronTableData = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        title: '',
+        type:'',
+        last_time:''
+    }
+})
+const typeList = ref([])
+
+const searchFormRef = ref<FormInstance>()
+
+const setTypeList = async () => {
+    typeList.value = await (await getCronType()).data
+}
+setTypeList()
+
+/**
+ * 获取任务列表
+ */
+const loadCronList = (page: number = 1) => {
+    cronTableData.loading = true
+    cronTableData.page = page
+
+    getCronList({
+        page: cronTableData.page,
+        limit: cronTableData.limit,
+        ...cronTableData.searchParam
+    }).then(res => {
+        cronTableData.loading = false
+        cronTableData.data = res.data.data
+        cronTableData.total = res.data.total
+    }).catch(() => {
+        cronTableData.loading = false
+    })
+}
+loadCronList()
+
+const router = useRouter()
+
+const cronDialog: Record<string, any> | null = ref(null)
+/**
+ * 查看任务
+ * @param data
+ */
+const infoEvent = (data: any) => {
+    cronDialog.value.setFormData(data)
+    cronDialog.value.showDialog = true
+}
+ 
+</script>
+
+<style lang="scss" scoped></style>