diff --git a/admin/public/ueditor/lang/zh-cn/zh-cn.js b/admin/public/ueditor/lang/zh-cn/zh-cn.js
index a49e91d82..7527c3177 100644
--- a/admin/public/ueditor/lang/zh-cn/zh-cn.js
+++ b/admin/public/ueditor/lang/zh-cn/zh-cn.js
@@ -157,7 +157,7 @@ UE.I18N['zh-cn'] = {
     'elementPathTip': "元素路径",
     'wordCountTip': "字数统计",
     'wordCountMsg': '{#count} / {#leave}',
-    'wordOverFlowMsg': '<span style="color:red;">字数超出最大允许值，服务器可能拒绝保存！</span>',
+    'wordOverFlowMsg': '<span style="color:red;">字数超出最大允许值！</span>',
     'ok': "确认",
     'cancel': "取消",
     'closeDialog': "关闭对话框",
diff --git a/admin/src/App.vue b/admin/src/App.vue
index b3376ded8..2facb873e 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -35,4 +35,9 @@ onMounted(() => {
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+ .el-page-header__header .el-page-header__left .el-page-header__content{
+    font-size: 14px !important;
+    font-weight: 500 !important;
+ }
+</style>
diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts
index 1fe09fc66..ab9fb5e8f 100644
--- a/admin/src/app/api/diy.ts
+++ b/admin/src/app/api/diy.ts
@@ -199,6 +199,12 @@ export function copyDiy(params: Record<string, any>) {
     return request.post(`diy/copy`, params, { showSuccessMessage: true })
 }
 
+/**
+ * 获取自定义页面选择列表
+ */
+export function getPageLink(params: Record<string, any>) {
+    return request.get(`diy/page_link`, { params })
+}
 /***************************************************** 主题风格 ****************************************************/
 
 
@@ -237,7 +243,7 @@ export function editTheme(params: Record<string, any>) {
 
 /**
  * 删除配色
- * @param params
+ * @param id
  */
 export function deleteTheme(id: number) {
     return request.delete(`diy/theme/delete/${ id }`, { showSuccessMessage: true })
diff --git a/admin/src/app/api/member.ts b/admin/src/app/api/member.ts
index 54d4b4888..4a03299ea 100644
--- a/admin/src/app/api/member.ts
+++ b/admin/src/app/api/member.ts
@@ -393,7 +393,7 @@ export function memberRemark(params: Record<string, any>) {
 }
 /**
  * 检查打款进度
- * @param params
+ * @param id
  */
 export function memberCheck(id: number) {
     return request.put(`member/cash_out/check/${id}`, {}, { showSuccessMessage: true })
diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts
index c30f2dcba..5cef0b3d0 100644
--- a/admin/src/app/api/notice.ts
+++ b/admin/src/app/api/notice.ts
@@ -81,7 +81,6 @@ export function getSmsLog(params: Record<string, any>) {
 
 /**
  * 获取当前登录子账号
- * @param params
  */
 export function getAccountIsLogin() {
     return request.get(`notice/niusms/config`)
@@ -105,7 +104,7 @@ export function registerAccount(params: Record<string, any>) {
 
 /**
  * 获取当前登录子账号信息
- * @param params
+ * @param username
  */
 export function getAccountInfo(username: string) {
     return request.get(`notice/niusms/account/info/${username}`)
@@ -121,6 +120,7 @@ export function getTemplateList(params: Record<string, any>) {
 
 /**
  * 获取签名列表
+ * @param username
  * @param params
  */
 export function getSignList(username: string, params: Record<string, any>) {
@@ -129,6 +129,7 @@ export function getSignList(username: string, params: Record<string, any>) {
 
 /**
  * 添加签名
+ * @param username
  * @param params
  */
 export function addSign(username: string, params: Record<string, any>) {
@@ -137,6 +138,7 @@ export function addSign(username: string, params: Record<string, any>) {
 
 /**
  * 删除签名
+ * @param username
  * @param params
  */
 export function deleteSign(username: string, params: Record<string, any>) {
@@ -145,6 +147,7 @@ export function deleteSign(username: string, params: Record<string, any>) {
 
 /**
  * 更新子账号信息
+ * @param username
  * @param params
  */
 export function editAccount(username: string,params: Record<string, any>) {
@@ -153,6 +156,7 @@ export function editAccount(username: string,params: Record<string, any>) {
 
 /**
  * 获取短信发送记录
+ * @param username
  * @param params
  */
 export function getSmsSendList(username: string, params: Record<string, any>) {
@@ -161,6 +165,7 @@ export function getSmsSendList(username: string, params: Record<string, any>) {
 
 /**
  * 获取充值列表
+ * @param username
  * @param params
  */
 export function getSmsOrdersList(username: string, params: Record<string, any>) {
@@ -169,7 +174,6 @@ export function getSmsOrdersList(username: string, params: Record<string, any>)
 
 /**
  * 获取套餐列表
- * @param params
  */
 export function getSmsPackagesList() {
     return request.get(`notice/niusms/packages`)
@@ -177,7 +181,6 @@ export function getSmsPackagesList() {
 
 /**
  * 获取图像验证码
- * @param params
  */
 export function getSmsCaptcha() {
     return request.get(`notice/niusms/captcha`)
@@ -193,7 +196,6 @@ export function getSmsSend(params: Record<string, any>) {
 
 /**
  * 添加签名配置项
- * @param params
  */
 export function getSmsSignConfig() {
     return request.get(`notice/niusms/sign/report/config`)
@@ -201,7 +203,6 @@ export function getSmsSignConfig() {
 
 /**
  * 模版报备配置项
- * @param params
  */
 export function getTemplateReportConfig() {
     return request.get(`notice/niusms/template/report/config`)
@@ -209,6 +210,10 @@ export function getTemplateReportConfig() {
 
 /**
  * 模版报备
+ * @param sms_type
+ * @param username
+ * @param sms_type
+ * @param username
  * @param params
  */
 export function reportTemplate(sms_type: string, username: string, params: Record<string, any>) {
@@ -217,6 +222,10 @@ export function reportTemplate(sms_type: string, username: string, params: Recor
 
 /**
  * 模版详情
+ * @param sms_type
+ * @param username
+ * @param sms_type
+ * @param username
  * @param params
  */
 export function getreportTemplateInfo(sms_type: string, username: string,params: Record<string, any>) {
@@ -226,6 +235,7 @@ export function getreportTemplateInfo(sms_type: string, username: string,params:
 
 /**
  * 充值下单
+ * @param username
  * @param params
  */
 export function smsOrderCreate(username: string, params: Record<string, any>) {
@@ -234,6 +244,7 @@ export function smsOrderCreate(username: string, params: Record<string, any>) {
 
 /**
  * 获取支付信息
+ * @param username
  * @param params
  */
 export function getOrderPayInfo(username: string, params: Record<string, any>) {
@@ -242,6 +253,7 @@ export function getOrderPayInfo(username: string, params: Record<string, any>) {
 
 /**
  * 获取订单详情
+ * @param username
  * @param params
  */
 export function getOrderInfo(username: string, params: Record<string, any>) {
@@ -250,6 +262,7 @@ export function getOrderInfo(username: string, params: Record<string, any>) {
 
 /**
  * 获取支付状态
+ * @param username
  * @param params
  */
 export function getOrderPayStatus(username: string, params: Record<string, any>) {
@@ -258,6 +271,7 @@ export function getOrderPayStatus(username: string, params: Record<string, any>)
 
 /**
  * 计算金额
+ * @param username
  * @param params
  */
 export function calculateOrderPay(username: string, params: Record<string, any>) {
@@ -274,7 +288,9 @@ export function enableNiusms(params: Record<string, any>) {
 
 /**
  * 同步模版状态
- * @param params
+ * @param username
+ * @param sms_type
+ * @param username
  */
 export function templateSync(sms_type: string, username: string) {
     return request.get(`notice/niusms/template/sync/${sms_type}/${username}`)
@@ -282,6 +298,7 @@ export function templateSync(sms_type: string, username: string) {
 
 /**
  * 重置密码
+ * @param username
  * @param params
  */
 export function resetPassword(username: string,params: Record<string, any>) {
@@ -290,7 +307,9 @@ export function resetPassword(username: string,params: Record<string, any>) {
 
 /**
  * 清除模版报备
- * @param params
+ * @param template_id
+ * @param username
+ * @param template_id
  */
 export function clearTemplate(username: string,template_id: string) {
     return request.delete(`notice/niusms/template/${username}/${template_id}`)
diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts
index 911f2848b..2224092b9 100644
--- a/admin/src/app/api/pay.ts
+++ b/admin/src/app/api/pay.ts
@@ -56,7 +56,6 @@ export function getPayRefundInfo(refund_no: string) {
 
 /**
  * 获取退款状态字典
- * @param refund_no
  */
 export function getRefundStatus() {
     return request.get(`pay/refund/status`)
diff --git a/admin/src/app/api/poster.ts b/admin/src/app/api/poster.ts
index 8c6ca639d..775f355ee 100644
--- a/admin/src/app/api/poster.ts
+++ b/admin/src/app/api/poster.ts
@@ -113,3 +113,7 @@ export function getPreviewPoster(params: Record<string, any>) {
 export function getPosterGenerate(params: Record<string, any>) {
     return request.get(`sys/poster/generate`, { params, showErrorMessage: false })
 }
+// 判断是否安装imagemagick扩展
+export function checkImagick() {
+    return request.get(`sys/check_imagick`, { showErrorMessage: false })
+}
\ No newline at end of file
diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts
index cdf0a12c2..b81001e50 100644
--- a/admin/src/app/api/sys.ts
+++ b/admin/src/app/api/sys.ts
@@ -486,6 +486,15 @@ export function clearCronLog(params: Record<string, any>) {
     return request.put(`sys/schedule/log/clear`, params, { showSuccessMessage: true })
 }
 
+/**
+ * 重置计划任务
+ * @returns
+ */
+export function resetCron() {
+    return request.post(`sys/schedule/reset`, { showSuccessMessage: true })
+}
+
+
 /***************************************************** 协议管理 ****************************************************/
 
 /**
diff --git a/admin/src/app/api/upgrade.ts b/admin/src/app/api/upgrade.ts
index 002a2ed67..4dcbd3ec9 100644
--- a/admin/src/app/api/upgrade.ts
+++ b/admin/src/app/api/upgrade.ts
@@ -19,6 +19,7 @@ export function getUpgradeTask() {
 /**
  * 升级
  * @param addon
+ * @param params
  */
 export function upgradeAddon(addon: string = '', params: Record<string, any> = {}) {
     return request.post(addon ? `upgrade/${ addon }` : 'upgrade', params)
@@ -137,3 +138,25 @@ export function performRecoveryTasks(params: Record<string, any>) {
 export function performBackupTasks(params: Record<string, any>) {
     return request.get("backup/task", params)
 }
+
+/**
+ * 连通测试
+ * @param params
+ */
+export function connectTest(params: Record<string, any>) {
+    return request.post("niucloud/build/connect_test", params)
+}
+/**
+ * 保存服务器地址
+ * @param params
+ */
+export function setLocalUrl(params: Record<string, any>) {
+    return request.post("niucloud/build/set_local_url", params)
+}
+/**
+ * 获取服务器地址
+ * @param params
+ */
+export function getLocalUrl(params: Record<string, any>) {
+    return request.get("niucloud/build/get_local_url", params)
+}
diff --git a/admin/src/app/api/verify.ts b/admin/src/app/api/verify.ts
index be897fd64..e61305004 100644
--- a/admin/src/app/api/verify.ts
+++ b/admin/src/app/api/verify.ts
@@ -21,6 +21,23 @@ export function getVerifyDetail(verifyCode: string) {
     return request.get(`verify/verify/${ verifyCode }`)
 }
 
+/**
+ * 获取核销详情
+ * @param verifyCode
+ * @returns
+ */
+export function getVerifyDetailInfo(verifyCode: string) {
+    return request.get(`verify/detail/${ verifyCode }`)
+}
+
+/**
+ * 核销
+ * @param verifyCode
+ * @returns
+ */
+export function verify(verifyCode: string, params: Record<string, any>) {
+    return request.post(`verify/verify/${ verifyCode }`,params,{ showSuccessMessage: true})
+}
 /***************************************************** 核销员 ****************************************************/
 
 /**
diff --git a/admin/src/app/assets/images/goods_default.png b/admin/src/app/assets/images/goods_default.png
new file mode 100644
index 000000000..4a4c75bdc
Binary files /dev/null and b/admin/src/app/assets/images/goods_default.png differ
diff --git a/admin/src/app/assets/images/icon-addon-one.png b/admin/src/app/assets/images/icon-addon-one.png
new file mode 100644
index 000000000..30cde7880
Binary files /dev/null and b/admin/src/app/assets/images/icon-addon-one.png differ
diff --git a/admin/src/app/assets/images/write.png b/admin/src/app/assets/images/write.png
new file mode 100644
index 000000000..1f45bf6b8
Binary files /dev/null and b/admin/src/app/assets/images/write.png differ
diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue
index dd1c2cb46..9c16709b9 100644
--- a/admin/src/app/components/cloud-build/index.vue
+++ b/admin/src/app/components/cloud-build/index.vue
@@ -5,7 +5,7 @@
             <div class="h-[50vh] flex flex-col" v-if="cloudBuildCheck && !cloudBuildTask">
                 <!-- <el-scrollbar> -->
                     <div class="bg-[#fff] my-3" v-if="cloudBuildCheck.dir">
-                        <div class="">
+                        <div>
                             <p class="pl-[20px] ">{{ t('cloudbuild.dirPermission') }}</p>
                             <div class="mt-[10px] mx-[20px] text-[14px] cursor-pointer text-primary flex items-center justify-between bg-[#EFF6FF] rounded-[4px] p-[10px]" @click="cloudBuildCheckDirFn">
                                 <div class="flex items-center">
@@ -14,7 +14,7 @@
                                 <div class="border-[1px] border-primary rounded-[3px] w-[72px] h-[26px] leading-[25px] text-center">立即查看</div>
                             </div>
                         </div>
-                       
+
                         <div class="px-[20px] pt-[10px] text-[14px] el-table">
                             <el-row class="py-[10px] items table-head-bg pl-[15px] mb-[10px]">
                                 <el-col :span="18">
@@ -66,7 +66,7 @@
                 <!-- </el-scrollbar> -->
             </div>
             <div class="h-[45vh]" v-show="cloudBuildTask">
-                <terminal ref="terminalRef" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
+                <terminal ref="terminalRef" :name="`cloud-build-${terminalId}`" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
             </div>
             <div class="flex justify-end mt-[20px]" v-show="cloudBuildTask">
                 <el-button @click="dialogCancel()" class="!w-[90px]">取消</el-button>
@@ -81,7 +81,7 @@
                             <img src="@/app/assets/images/error_icon.png" alt="">
                         </template>
                         <template #extra>
-                            <el-scrollbar class="max-h-[150px] overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+                            <el-scrollbar class="max-h-[150px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
                                 {{errorInfo}}
                             </el-scrollbar>
                             <el-button @click="handleReturn" class="!w-[90px]">错误信息</el-button>
@@ -110,15 +110,16 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, h, watch ,computed} from 'vue'
+import { ref, h, watch, computed } from 'vue'
 import { t } from '@/lang'
 import { getCloudBuildLog, getCloudBuildTask, cloudBuild, clearCloudBuildTask, preBuildCheck } from '@/app/api/cloud'
 import { Terminal, TerminalFlash } from 'vue-web-terminal'
 import 'vue-web-terminal/lib/theme/dark.css'
-import { AnyObject } from "@/types/global"
-import { ElNotification, ElMessageBox } from "element-plus"
+import { AnyObject } from '@/types/global'
+import { ElNotification, ElMessageBox } from 'element-plus'
 
 const showDialog = ref<boolean>(false)
+const terminalId = ref(Date.now());
 const cloudBuildTask = ref<null | AnyObject>(null)
 const active = ref('build')
 const cloudBuildCheck = ref<null | AnyObject>(null)
@@ -174,7 +175,7 @@ const getCloudBuildLogFn = () => {
             return
         }
 
-        const data = res.data.data ?? [];
+        const data = res.data.data ?? []
         let error = ''
 
         if (data[0] && data[0].length && showDialog.value) {
@@ -203,7 +204,7 @@ const getCloudBuildLogFn = () => {
                 if (!cloudBuildLog.includes(item.action)) {
                     terminalRef.value.pushMessage({ content: `${item.action}` })
                     cloudBuildLog.push(item.action)
-                   
+
                     if (item.code == 0) {
                         error = item.msg
                         terminalRef.value.pushMessage({ content: item.msg, class: 'error' })
@@ -243,8 +244,7 @@ const handleReturn = () => {
     closeType.value = 'success'
 }
 
-
-let notificationEl : any = null
+const notificationEl : any = null
 /**
  * 升级中任务提示
  */
@@ -315,9 +315,9 @@ const onExecCmd = (key, command, success, failed, name) => {
 }
 
 const makeIterator = (array: string[]) => {
-    var nextIndex = 0
+    let nextIndex = 0
     return {
-        next() {
+        next () {
             if ((nextIndex + 1) == array.length) {
                 nextIndex = 0
             }
@@ -397,7 +397,8 @@ defineExpose({
     open,
     cloudBuildTask,
     loading,
-    elNotificationClick
+    elNotificationClick,
+    getCloudBuildTaskFn
 })
 </script>
 
diff --git a/admin/src/app/components/upgrade-log/index.vue b/admin/src/app/components/upgrade-log/index.vue
index 53a4fe8ca..6bacfd39a 100644
--- a/admin/src/app/components/upgrade-log/index.vue
+++ b/admin/src/app/components/upgrade-log/index.vue
@@ -147,8 +147,7 @@ defineExpose({
     left: 125px;
     border-left-color: #dddddd;
     border-left-style: dashed;
-    margin: 12px 0;
-    margin-top: 24px;
+    margin: 24px 0 12px;
     height: calc(100% - 24px - 12px);
 }
 
@@ -201,7 +200,7 @@ defineExpose({
 
 .time-dialog >>> .el-collapse-item__content {
     margin-top: 15px;
-    padding-bottom: 0px !important;
+    padding-bottom: 0 !important;
 }
 
 .time-dialog >>> .el-timeline-item__node--01 {
diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue
index 13618990d..f61bf9c97 100644
--- a/admin/src/app/components/upgrade/index.vue
+++ b/admin/src/app/components/upgrade/index.vue
@@ -130,8 +130,9 @@
                             </el-scrollbar>
                         </div>
                         <div class="h-[370px] mt-[30px]" v-show="showTerminal && upgradeTask && !errorDialog">
-                            <terminal ref="terminalRef" :context="upgradeTask ? upgradeTask.upgrade.app_key : ''" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
+                            <terminal ref="terminalRef" :name="`upgrade-${terminalId}`"  :context="upgradeTask ? upgradeTask.upgrade.app_key : ''" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
                         </div>
+
                     </div>
                     <!-- 是否备份选择 -->
                     <div class="flex flex-col" v-show="active == 'backup'">
@@ -155,18 +156,21 @@
                             </div>
                         </el-scrollbar>
                     </div>
-                    <div class="mt-[50px]" v-show="errorDialog">
-                        <el-result icon="error" :title="t('升级失败')" :sub-title="errorMsg">
+                    <div class="mt-[20px] h-[370px]" v-show="errorDialog">
+                        <el-result icon="error" :title="t('升级失败')">
                             <template #icon>
                                 <img src="@/app/assets/images/error_icon.png" alt="" />
                             </template>
                             <template #extra>
+                                <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+                                    {{errorMsg}}
+                                </el-scrollbar>
                                 <el-button @click="handleBack()" class="!w-[90px]">错误信息</el-button>
                                 <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
                             </template>
                         </el-result>
                     </div>
-                    <div class="mt-[50px]" v-show="active == 'complete'">
+                    <div class="mt-[20px]" v-show="active == 'complete'">
                         <el-result icon="success" :title="t('upgrade.upgradeSuccess')">
                             <template #icon>
                                 <img src="@/app/assets/images/success_icon.png" alt="">
@@ -189,7 +193,7 @@
             <div class="dialog-footer">
                 <!-- 查看升级内容 -->
                 <el-button v-if="step == 1 && upgradeContent.content.length && isAllowUpgrade" @click="step = 2" type="primary">{{ t("upgrade.upgradeButton") }}</el-button>
-
+                <el-button type="primary" v-show="step == 2 && showTerminal && upgradeTask && !errorDialog"  :loading="timeloading" class="!w-[140px]">已用时 {{ formatUpgradeDuration }}</el-button>
                 <template v-if="step == 2 && active != 'complete'">
                 <!--                <el-button v-if="active == 'content'" @click="showDialog = false">{{ t("return") }}</el-button>-->
                     <el-button type="primary" :disabled="!is_pass" v-if="active == 'upgrade' && !upgradeTask" @click="() => { active = 'backup'; numberOfSteps = 1 }">{{ t("nextStep") }}</el-button>
@@ -225,10 +229,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, h, watch ,computed} from "vue"
-import { t } from "@/lang"
-import { getVersions } from "@/app/api/auth"
-import { getFrameworkNewVersion } from "@/app/api/module"
+import { ref, h, watch, computed } from 'vue'
+import { t } from '@/lang'
+import { getVersions } from '@/app/api/auth'
+import { getFrameworkNewVersion } from '@/app/api/module'
 import {
     getUpgradeContent,
     getUpgradeTask,
@@ -236,15 +240,16 @@ import {
     executeUpgrade,
     preUpgradeCheck,
     clearUpgradeTask, upgradeUserOperate
-} from "@/app/api/upgrade"
-import { Terminal, TerminalFlash } from "vue-web-terminal"
-import "vue-web-terminal/lib/theme/dark.css"
-import { AnyObject } from "@/types/global"
-import { ElNotification, ElMessage, ElMessageBox } from "element-plus"
-import Storage from "@/utils/storage"
+} from '@/app/api/upgrade'
+import { Terminal, TerminalFlash } from 'vue-web-terminal'
+import 'vue-web-terminal/lib/theme/dark.css'
+import { AnyObject } from '@/types/global'
+import { ElNotification, ElMessage, ElMessageBox } from 'element-plus'
+import Storage from '@/utils/storage'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
+const terminalId = ref(Date.now()); 
 const showDialog = ref<boolean>(false)
 const upgradeContent = ref<null | AnyObject>(null)
 const isAllowUpgrade = ref(true) // 是否允许升级
@@ -254,7 +259,7 @@ const step = ref(1)
 const upgradeCheck = ref<null | AnyObject>(null)
 const loading = ref(false)
 const terminalRef: any = ref(null)
-const emits = defineEmits(["complete", "cloudbuild"])
+const emits = defineEmits(['complete', 'cloudbuild'])
 const upgradeTipsShowDialog = ref<boolean>(false)
 let upgradeLog: any = []
 let errorLog: any = []
@@ -269,17 +274,18 @@ const upgradeOption = ref({
 // 升级步骤排除，backupCode 备份代码，backupSql 备份数据库
 const excludeSteps: any = ref([
     {
-        name: "备份源码",
-        code: "backupCode"
+        name: '备份源码',
+        code: 'backupCode'
     },
     {
-        name: "备份数据库",
-        code: "backupSql"
+        name: '备份数据库',
+        code: 'backupSql'
     }
 ])
 /**
  * 查询升级任务
  */
+const timeloading = ref(false)
 const showTerminal = ref(false)
 const upgradeStartTime = ref<number | null>(null)
 const upgradeDuration = ref(0) // 单位：秒
@@ -293,7 +299,7 @@ const getUpgradeTaskFn = () => {
         if (!upgradeContent.value) {
             upgradeContent.value = data.upgrade_content
 
-            if ( upgradeContent.value || !data.upgrade_content || !Array.isArray(data.upgrade_content.content)) {
+            if (upgradeContent.value || !data.upgrade_content || !Array.isArray(data.upgrade_content.content)) {
                 return
             }
 
@@ -320,8 +326,9 @@ const getUpgradeTaskFn = () => {
         }
         if (!upgradeTask.value) {
             showTerminal.value = true
-            terminalRef.value.execute("clear")
-            terminalRef.value.execute("开始升级")
+            terminalRef.value.execute('clear')
+            terminalRef.value.execute('开始升级')
+            timeloading.value = true
             upgradeStartTime.value = Date.now()
             upgradeDuration.value = 0
             if (upgradeTimer) clearInterval(upgradeTimer)
@@ -334,7 +341,7 @@ const getUpgradeTaskFn = () => {
 
         data.log.forEach((item) => {
             if (!upgradeLog.includes(item)) {
-                terminalRef.value.pushMessage({ content: `${ item }` })
+                terminalRef.value.pushMessage({ content: `${item}` })
                 upgradeLog.push(item)
             }
         })
@@ -342,7 +349,7 @@ const getUpgradeTaskFn = () => {
         if (data.error) {
             data.error.forEach((item) => {
                 if (!errorLog.includes(item)) {
-                    terminalRef.value.pushMessage({ content: item, class: "error" })
+                    terminalRef.value.pushMessage({ content: item, class: 'error' })
                     errorLog.push(item)
                     errorMsg.value = item
                 }
@@ -353,28 +360,30 @@ const getUpgradeTaskFn = () => {
                 clearInterval(upgradeTimer)
                 upgradeTimer = null
             }
+            timeloading.value = false
         }
         // 恢复完毕
-        if (data.step == "restoreComplete") {
+        if (data.step == 'restoreComplete') {
             flashInterval && clearInterval(flashInterval)
             return
         }
         // 升级完成
-        if (data.step == "upgradeComplete") {
-            active.value = "complete"
+        if (data.step == 'upgradeComplete') {
+            active.value = 'complete'
             showTerminal.value = false
             numberOfSteps.value = 4
             notificationEl && notificationEl.close()
-            emits("complete")
+            emits('complete')
             if (upgradeTimer) {
                 clearInterval(upgradeTimer)
                 upgradeTimer = null
             }
+            timeloading.value = false
             clearUpgradeTask()
             return
         }
         numberOfSteps.value = 2
-        active.value = "upgrade"
+        active.value = 'upgrade'
         executeUpgradeFn()
     })
 }
@@ -382,13 +391,12 @@ const getUpgradeTaskFn = () => {
 getUpgradeTaskFn()
 const isBack = ref(false)
 const handleBack = () => {
-    active.value = "upgrade"
+    active.value = 'upgrade'
     isBack.value = true
     showTerminal.value = true
     errorDialog.value = false // 隐藏错误弹窗
 }
 
-
 const formatUpgradeDuration = computed(() => {
     const s = upgradeDuration.value
     const h = Math.floor(s / 3600)
@@ -426,12 +434,12 @@ let notificationEl: any = null
  */
 const showElNotification = () => {
     notificationEl = ElNotification.success({
-        title: t("warning"),
+        title: t('warning'),
         dangerouslyUseHTMLString: true,
-        message: h("div", {}, [t("upgrade.upgradingTips"), h("span", {
-            class: "text-primary cursor-pointer",
+        message: h('div', {}, [t('upgrade.upgradingTips'), h('span', {
+            class: 'text-primary cursor-pointer',
             onClick: elNotificationClick
-        }, [t("upgrade.clickView")])]),
+        }, [t('upgrade.clickView')])]),
         duration: 0,
         showClose: false
     })
@@ -442,15 +450,15 @@ const elNotificationClick = () => {
     getUpgradeTaskFn()
     step.value = 2
     numberOfSteps.value = 3
-    active.value = "upgrade"
+    active.value = 'upgrade'
     notificationEl && notificationEl.close()
 }
 
-const frameworkVersion = ref("")
+const frameworkVersion = ref('')
 getVersions().then((res) => {
     frameworkVersion.value = res.data.version.version
 })
-const newFrameworkVersion = ref("")
+const newFrameworkVersion = ref('')
 getFrameworkNewVersion().then(({ data }) => {
     newFrameworkVersion.value = data.last_version
 })
@@ -462,7 +470,7 @@ const is_pass = ref(false)
 const repeat = ref(false)
 const readyLoading = ref(false)
 
-const handleUpgrade = async() => {
+const handleUpgrade = async () => {
     if (repeat.value) return
     repeat.value = true
     readyLoading.value = true
@@ -472,7 +480,7 @@ const handleUpgrade = async() => {
     await preUpgradeCheck(appKey).then(async ({ data }) => {
         upgradeCheck.value = data
         is_pass.value = data.is_pass
-        active.value = "upgrade"
+        active.value = 'upgrade'
         !upgradeTask.value ? (numberOfSteps.value = 0) : numberOfSteps.value
         upgradeTipsShowDialog.value = false
         showDialog.value = true
@@ -498,18 +506,18 @@ const upgradeAddonFn = () => {
     })
 }
 
-const open = (addonKey: string = "", callback = null) => {
+const open = (addonKey: string = '', callback = null) => {
     errorDialog.value = false // 隐藏错误弹窗
     if (upgradeTask.value) {
-        ElMessage({ message: "已有正在执行中的升级任务", type: "error" })
+        ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
         showDialog.value = true
         step.value = 2
         numberOfSteps.value = 3
-        active.value = "upgrade"
+        active.value = 'upgrade'
         if (callback) callback()
     } else {
         if (addonKey && frameworkVersion.value != newFrameworkVersion.value) {
-            ElMessage({ message: "存在新版本框架，请先升级框架", type: "error" })
+            ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
             if (callback) callback()
             return
         }
@@ -532,7 +540,7 @@ const open = (addonKey: string = "", callback = null) => {
             } else if (upgradeContent.value.content.length == failUpgradeCount) {
                 isAllowUpgrade.value = false
             }
-            if (Storage.get("upgradeTipsLock")) {
+            if (Storage.get('upgradeTipsLock')) {
                 handleUpgrade()
             } else {
                 upgradeTipsShowDialog.value = true
@@ -551,19 +559,19 @@ const open = (addonKey: string = "", callback = null) => {
 let flashInterval: any = null
 const terminalFlash = new TerminalFlash()
 const onExecCmd = (key, command, success, failed, name) => {
-    if (command == "开始升级") {
+    if (command == '开始升级') {
         success(terminalFlash)
-        const frames = makeIterator(["/", "——", "\\", "|"])
+        const frames = makeIterator(['/', '——', '\\', '|'])
         flashInterval = setInterval(() => {
-            terminalFlash.flush("> " + frames.next().value)
+            terminalFlash.flush('> ' + frames.next().value)
         }, 150)
     }
 }
 
 const makeIterator = (array: string[]) => {
-    var nextIndex = 0
+    let nextIndex = 0
     return {
-        next() {
+        next () {
             if (nextIndex + 1 == array.length) {
                 nextIndex = 0
             }
@@ -573,11 +581,11 @@ const makeIterator = (array: string[]) => {
 }
 
 const dialogClose = (done: () => {}) => {
-    if (active.value == "upgrade" && upgradeTask.value && ['upgradeComplete', 'restoreComplete'].includes(upgradeTask.value.step) === false && !isBack.value) {
-        ElMessageBox.confirm(t("upgrade.showDialogCloseTips"), t("warning"), {
-            confirmButtonText: t("confirm"),
-            cancelButtonText: t("cancel"),
-            type: "warning"
+    if (active.value == 'upgrade' && upgradeTask.value && ['upgradeComplete', 'restoreComplete'].includes(upgradeTask.value.step) === false && !isBack.value) {
+        ElMessageBox.confirm(t('upgrade.showDialogCloseTips'), t('warning'), {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
         }).then(() => {
             done()
         })
@@ -591,13 +599,12 @@ watch(
     () => {
         if (!showDialog.value) {
             clearUpgradeTaskFn()
-
         }
     }
 )
 
 const clearUpgradeTaskFn = () => {
-    active.value = "upgrade"
+    active.value = 'upgrade'
     loading.value = false
     upgradeTask.value = null
     isBack.value = false
@@ -625,16 +632,16 @@ const clearUpgradeTaskFn = () => {
 const cloudBuildError = (event: string) => {
     cloudBuildErrorTipsShowDialog.value = false
     switch (event) {
-        case "local":
+        case 'local':
             upgradeUserOperate(event).then(() => {
                 getUpgradeTaskFn()
             })
             break
-        case "retry":
+        case 'retry':
             executeUpgradeFn()
             retrySecondInterval && clearInterval(retrySecondInterval)
             break
-        case "rollback":
+        case 'rollback':
             upgradeUserOperate(event).then(() => {
                 getUpgradeTaskFn()
             })
@@ -643,13 +650,13 @@ const cloudBuildError = (event: string) => {
 }
 
 const timeSplit = (str: string) => {
-    const [date, time] = str.split(" ")
-    const [hours, minutes] = time.split(":")
-    return [date, `${ hours }:${ minutes }`]
+    const [date, time] = str.split(' ')
+    const [hours, minutes] = time.split(':')
+    return [date, `${hours}:${minutes}`]
 }
 
 const upgradeTipsConfirm = (isLock: boolean = false) => {
-    isLock && Storage.set({ key: "upgradeTipsLock", data: isLock })
+    isLock && Storage.set({ key: 'upgradeTipsLock', data: isLock })
     upgradeTipsShowDialog.value = false
     !isLock && (showDialog.value = true)
 }
@@ -810,8 +817,7 @@ defineExpose({
     left: 125px;
     border-left-color: #dddddd;
     border-left-style: dashed;
-    margin: 12px 0;
-    margin-top: 24px;
+    margin: 24px 0 12px;
     height: calc(100% - 24px - 12px);
 }
 
@@ -892,7 +898,7 @@ defineExpose({
     position: absolute;
     left: 0;
     top: 46px;
-    bottom: 0px;
+    bottom: 0;
     right: 0;
     z-index: 1;
     overflow: hidden;
diff --git a/admin/src/app/lang/zh-cn/diy_form.edit.json b/admin/src/app/lang/zh-cn/diy_form.edit.json
index e5999939b..d731cc525 100644
--- a/admin/src/app/lang/zh-cn/diy_form.edit.json
+++ b/admin/src/app/lang/zh-cn/diy_form.edit.json
@@ -14,6 +14,14 @@
   "statusBarStyle": "导航栏样式",
   "statusBarSwitchTips": "此处控制当前页面导航栏是否显示",
   "bottomNavContent": "底部导航内容",
+  "popWindowAds": "弹窗广告",
+  "popAdsLink": "广告链接",
+  "popAdsImage": "广告图",
+  "popAdsType": "显示类型",
+  "popAdsIsEnabled": "是否显示",
+  "firstPop": "首次弹出",
+  "popWindowCountTips": "建议上传图片大小：290px * 410px",
+  "everyTimePops": "每次弹出",
   "diyPageTitle": "页面名称",
   "diyPageTitlePlaceholder": "请输入页面名称",
   "pageTitleTips": "页面名称用于后台显示",
diff --git a/admin/src/app/lang/zh-cn/setting.system.json b/admin/src/app/lang/zh-cn/setting.system.json
index 4881597cb..c60aa7b04 100644
--- a/admin/src/app/lang/zh-cn/setting.system.json
+++ b/admin/src/app/lang/zh-cn/setting.system.json
@@ -31,5 +31,11 @@
   "contactsTel": "联系电话",
   "contactsTelPlaceholder": "请输入联系电话",
   "logoPlaceholder": "建议图片尺寸：210*30像素；图片格式：jpg、png、jpeg。",
-  "iconPlaceholder": "建议图片尺寸：100*100像素；图片格式：jpg、png、jpeg。"
+  "iconPlaceholder": "建议图片尺寸：100*100像素；图片格式：jpg、png、jpeg。",
+   "metaTitle": "Meta 标题",
+  "MetaPlaceholder": "请输入Meta 标题",
+  "metaDescription": "Meta 描述",
+  "metaDescriptionPlaceholder": "请输入Meta描述",
+  "metaKeywords": "Meta 关键字",
+  "metaKeywordsPlaceholder": "请输入Meta关键字"
 }
diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue
index acf863e86..5c0aaff1f 100644
--- a/admin/src/app/views/app/authorize.vue
+++ b/admin/src/app/views/app/authorize.vue
@@ -4,7 +4,7 @@
         <el-card class="box-card !border-none min-h-[300px]" shadow="never" v-loading="loading">
             <div v-if="!loading">
                 <div class="title text-[16px] font-bold text-[#1D1F3A] mb-[30px]">授权信息</div>
-                <div class="">
+                <div>
                     <div class="flex items-center">
                         <div class="w-[92px] h-[92px] rounded-[10px] flex justify-center items-center mr-[20px]">
                             <img src="@/app/assets/images/tools/authorize.png" class="w-[92px] h-[92px]" />
diff --git a/admin/src/app/views/app/index.vue b/admin/src/app/views/app/index.vue
index f173e85e8..317593f06 100644
--- a/admin/src/app/views/app/index.vue
+++ b/admin/src/app/views/app/index.vue
@@ -83,6 +83,6 @@ const toLink = (item: any) => {
     }
     .app-item:hover{
         transition: 0.5s;
-        box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.1);
+        box-shadow: 0 2px 8px 0 rgba(0,0,0,0.1);
     }
 </style>
diff --git a/admin/src/app/views/app/marketing.vue b/admin/src/app/views/app/marketing.vue
index e4d7ea015..da01772f0 100644
--- a/admin/src/app/views/app/marketing.vue
+++ b/admin/src/app/views/app/marketing.vue
@@ -13,7 +13,7 @@
                     <div class="flex flex-wrap plug-list pb-10 plug-large">
                         <div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)">
                             <div class="w-[264px] flex py-[20px] px-[17px] app-item relative">
-                                <el-image class="w-[40px] h-[40px] mr-[10px]" :src="img(childItem.icon)" fit="contain">
+                                <el-image class="w-[40px] h-[40px] mr-[10px] rounded-[6px] overflow-hidden" :src="img(childItem.icon)" fit="contain">
                                     <template #error>
                                         <div class="image-slot">
                                             <img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" />
@@ -65,7 +65,13 @@ getMarketingList()
 
 const toLink = (item: any) => {
     if (item.url) {
-        router.push(item.url)
+        // 判断如果携带is_target=true就通过新窗口打开
+        if (item.url.indexOf('is_target=true') != -1) {
+            const url = router.resolve(item.url)
+            window.open(url.href)
+        } else {
+            router.push(item.url)
+        }
     } else {
         addonIndexRoute[item.key] && router.push({ name: addonIndexRoute[item.key] })
     }
@@ -83,6 +89,6 @@ const toLink = (item: any) => {
     }
     .app-item:hover{
         transition: 0.5s;
-        box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.1);
+        box-shadow: 0 2px 8px 0 rgba(0,0,0,0.1);
     }
 </style>
diff --git a/admin/src/app/views/auth/components/edit-role.vue b/admin/src/app/views/auth/components/edit-role.vue
index faefe0db6..16093e80e 100644
--- a/admin/src/app/views/auth/components/edit-role.vue
+++ b/admin/src/app/views/auth/components/edit-role.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="ts" setup async>
-import { ref, reactive, computed, watch, toRaw } from 'vue'
+import { ref, reactive, computed, watch, toRaw, nextTick } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
 import { addRole, editRole, getRoleInfo } from '@/app/api/sys'
@@ -56,17 +56,18 @@ const menus = ref<Record<string, any>[]>([])
 getAuthMenus({ is_button: 0 }).then((res) => {
     menus.value = res.data
 })
-
 // 全选
 const selectAll = ref(false)
 const checkStrictly = ref(false)
 const treeRef: Record<string, any> | null = ref(null)
 watch(selectAll, () => {
-    if (selectAll.value) {
-        treeRef.value.setCheckedNodes(toRaw(menus.value))
-    } else {
-        treeRef.value.setCheckedNodes([])
-    }
+    nextTick(() => {
+        if (selectAll.value) {
+            treeRef.value.setCheckedNodes(toRaw(menus.value))
+        } else {
+            treeRef.value.setCheckedNodes([])
+        }
+    })
 })
 
 const handleCheckChange = debounce((e) => {
@@ -97,6 +98,7 @@ const collapseAll = (data:any) => {
         if (data[key].children && data[key].children.length > 0) collapseAll(data[key].children)
     })
 }
+
 /**
  * 表单数据
  */
diff --git a/admin/src/app/views/auth/components/edit-user.vue b/admin/src/app/views/auth/components/edit-user.vue
index 3bf81e44a..23ac148cc 100644
--- a/admin/src/app/views/auth/components/edit-user.vue
+++ b/admin/src/app/views/auth/components/edit-user.vue
@@ -2,30 +2,44 @@
     <el-dialog v-model="showDialog" :title="popTitle" width="500px" :destroy-on-close="true">
         <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
 
-            <el-form-item :label="t('accountNumber')" prop="username">
-                <el-input v-model.trim="formData.username" :placeholder="t('accountNumberPlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="10" show-word-limit />
+            <!-- <el-form-item :label="t('accountNumber')" v-if="!formData.uid" prop="uid">
+                <el-select :model-value="uid" :placeholder="t('accountNumberPlaceholder')" class="input-width" filterable clearable :allow-create="true" @change="selectUser" :default-first-option="true">
+                    <el-option v-for="item in userList" :key="item.uid" :label="item.username" :value="item.uid">
+                        <div class="flex items-center">
+                            <el-avatar :src="img(item.head_img)" size="small" class="mr-[10px]" v-if="item.head_img" />
+                            <img src="@/app/assets/images/member_head.png" alt="" class="mr-[10px] w-[24px]" v-else>
+                            {{ item.username }}
+                        </div>
+                    </el-option>
+                </el-select>
+            </el-form-item> -->
+
+            <el-form-item :label="t('accountNumber')" prop="username" >
+                <el-input v-model.trim="formData.username" :placeholder="t('accountNumberPlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="20" show-word-limit />
             </el-form-item>
 
-            <el-form-item :label="t('headImg')">
-                <upload-image v-model="formData.head_img" />
-            </el-form-item>
-
-            <el-form-item :label="t('userRealName')" prop="real_name">
-                <el-input v-model.trim="formData.real_name" :placeholder="t('userRealNamePlaceholder')" :readonly="real_name_input" @click="real_name_input = false" @blur="real_name_input = true" clearable class="input-width" maxlength="10" show-word-limit />
-            </el-form-item>
-            <div v-if="!formData.uid">
-                <el-form-item :label="t('password')" prop="password">
-                    <el-input v-model.trim="formData.password" :placeholder="t('passwordPlaceholder')" :readonly="password_input" @click="password_input = false" @blur="password_input = true" type="password" :show-password="true" clearable class="input-width" />
+            <div v-if="needAddUserInfo">
+                <el-form-item :label="t('headImg')">
+                    <upload-image v-model="formData.head_img" />
                 </el-form-item>
 
-                <el-form-item :label="t('confirmPassword')" prop="confirm_password">
-                    <el-input v-model.trim="formData.confirm_password" :placeholder="t('confirmPasswordPlaceholder')" :readonly="confirm_password_input" @click="confirm_password_input = false" @blur="confirm_password_input = true" type="password" :show-password="true" clearable class="input-width" />
+                <el-form-item :label="t('userRealName')" prop="real_name">
+                    <el-input v-model.trim="formData.real_name" :placeholder="t('userRealNamePlaceholder')" :readonly="real_name_input" @click="real_name_input = false" @blur="real_name_input = true" clearable class="input-width" maxlength="10" show-word-limit />
                 </el-form-item>
+                <div v-if="!formData.uid">
+                    <el-form-item :label="t('password')" prop="password">
+                        <el-input v-model.trim="formData.password" :placeholder="t('passwordPlaceholder')" :readonly="password_input" @click="password_input = false" @blur="password_input = true" type="password" :show-password="true" clearable class="input-width" />
+                    </el-form-item>
+
+                    <el-form-item :label="t('confirmPassword')" prop="confirm_password">
+                        <el-input v-model.trim="formData.confirm_password" :placeholder="t('confirmPasswordPlaceholder')" :readonly="confirm_password_input" @click="confirm_password_input = false" @blur="confirm_password_input = true" type="password" :show-password="true" clearable class="input-width" />
+                    </el-form-item>
+                </div>
             </div>
 
             <el-form-item :label="t('userRoleName')" prop="role_ids" v-if="!formData.userrole.is_admin">
                 <el-select v-model="formData.role_ids" :placeholder="t('userRolePlaceholder')" class="input-width" multiple collapse-tags collapse-tags-tooltip>
-                    <el-option :label="item.role_name" :value="item.role_id" v-for="(item, index) in roles" :key="index" />
+                    <el-option :label="item.role_name" :value="item.role_id" v-for="(item, index) in roles" :key="index" :disabled="item.disabled" />
                 </el-select>
             </el-form-item>
 
@@ -50,15 +64,35 @@
 import { ref, reactive, computed, toRaw } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { getUserInfo, addUser, editUser } from '@/app/api/user'
+import { getAllUserList,getUserInfo, addUser, editUser } from '@/app/api/user'
 import { allRole } from '@/app/api/sys'
-import { deepClone } from '@/utils/common'
+import { img, deepClone } from '@/utils/common'
+import { AnyObject } from '@/types/global'
 
+const userList = ref<AnyObject>([])
 const uid = ref<number | string>('')
 
+const selectUser = (value: any) => {
+    uid.value = value
+    if (typeof value == 'string') formData.username = value
+}
+
+const getUserList = () => {
+    getAllUserList({}).then(({ data }) => {
+        userList.value = data
+    }).catch()
+}
+getUserList()
 const real_name_input = ref(true)
 const password_input = ref(true)
 const confirm_password_input = ref(true)
+const needAddUserInfo = computed(() => {
+    if (formData.uid || !uid.value || typeof uid.value == 'string') {
+        return true
+    } else {
+        return false
+    }
+})
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -144,10 +178,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
             const data = deepClone(toRaw(formData))
             if (!formData.uid && typeof uid.value == 'number') data.uid = uid.value
-
             save(data).then(res => {
                 loading.value = false
                 showDialog.value = false
+                !formData.uid && getUserList()
                 emit('complete')
             }).catch(() => {
                 loading.value = false
diff --git a/admin/src/app/views/auth/log.vue b/admin/src/app/views/auth/log.vue
index 5352bf213..893f1be3b 100644
--- a/admin/src/app/views/auth/log.vue
+++ b/admin/src/app/views/auth/log.vue
@@ -67,7 +67,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getLogList ,logDestroy} from '@/app/api/user'
+import { getLogList, logDestroy } from '@/app/api/user'
 import UserLogDetail from '@/app/views/auth/components/user-log-detail.vue'
 import { FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
diff --git a/admin/src/app/views/channel/weapp/access.vue b/admin/src/app/views/channel/weapp/access.vue
index 8251a6153..5d35451cf 100644
--- a/admin/src/app/views/channel/weapp/access.vue
+++ b/admin/src/app/views/channel/weapp/access.vue
@@ -108,7 +108,6 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const activeName = ref('/channel/weapp')
-const active = ref(2)
 const qrCode = ref('')
 const weappConfig = ref({})
 
@@ -121,6 +120,12 @@ const onShowGetWeappConfig = async () => {
 
 onMounted(async () => {
     onShowGetWeappConfig()
+    
+    document.addEventListener('visibilitychange', () => {
+        if (document.visibilityState === 'visible') {
+            onShowGetWeappConfig()
+        }
+    })
 })
 
 onUnmounted(() => {
diff --git a/admin/src/app/views/channel/wechat/access.vue b/admin/src/app/views/channel/wechat/access.vue
index 2e2f7d3eb..c5a2c19b1 100644
--- a/admin/src/app/views/channel/wechat/access.vue
+++ b/admin/src/app/views/channel/wechat/access.vue
@@ -96,7 +96,6 @@ const router = useRouter()
 const pageName = route.meta.title
 
 const activeName = ref('/channel/wechat')
-const active = ref(2)
 const qrcode = ref('')
 const wechatConfig = ref({})
 const oplatformConfig = ref({})
@@ -110,6 +109,11 @@ const onShowGetWechatConfig = async () => {
 
 onMounted(async () => {
     onShowGetWechatConfig()
+    document.addEventListener('visibilitychange', () => {
+        if (document.visibilityState === 'visible') {
+            onShowGetWechatConfig()
+        }
+    })
 })
 
 onUnmounted(() => {
diff --git a/admin/src/app/views/channel/wechat/components/select-wechat-media.vue b/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
index 03a3553d8..ff95dd228 100644
--- a/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
+++ b/admin/src/app/views/channel/wechat/components/select-wechat-media.vue
@@ -186,17 +186,17 @@ const waterfall = debounce(() => {
                 const position = {}
                 position.top = '0px'
                 if (i % column == 0) {
-                    position.left = item.clientWidth * i + "px"
+                    position.left = item.clientWidth * i + 'px'
                 } else {
-                    position.left = item.clientWidth * i + (i % column * 10) + "px"
+                    position.left = item.clientWidth * i + (i % column * 10) + 'px'
                 }
                 positions[i] = position
                 heights[i] = item.clientHeight + 10
             } else {
-                let minHeight = Math.min(...heights) //  找到第一列的最小高度
-                let minIndex = heights.findIndex(item => item === minHeight) // 找到最小高度的索引
-                let position = {}
-                position.top = minHeight + 10 + "px"
+                const minHeight = Math.min(...heights) //  找到第一列的最小高度
+                const minIndex = heights.findIndex(item => item === minHeight) // 找到最小高度的索引
+                const position = {}
+                position.top = minHeight + 10 + 'px'
                 position.left = positions[minIndex].left
                 positions[i] = position
                 heights[minIndex] += item.clientHeight + 10
diff --git a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
index 8bb48ceeb..deb6f4118 100644
--- a/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
+++ b/admin/src/app/views/channel/wechat/keyword_reply_edit.vue
@@ -139,7 +139,8 @@ const formRules = reactive<FormRules>({
             validator: (rule: any, value: any, callback: any) => {
                 if (!formData.content.length) callback(new Error(t('contentPlaceholder')))
                 callback()
-            }, trigger: 'blur'
+            },
+            trigger: 'blur'
         }
     ]
 })
diff --git a/admin/src/app/views/diy/components/add-theme.vue b/admin/src/app/views/diy/components/add-theme.vue
index 239a91570..e95e18459 100644
--- a/admin/src/app/views/diy/components/add-theme.vue
+++ b/admin/src/app/views/diy/components/add-theme.vue
@@ -46,21 +46,21 @@ const initialData = {
     value: '',
     tip: ''
 }
-let keyArr = []; // 存储现有颜色的key
-let type = ref('') // 区分编辑和添加
+let keyArr = [] // 存储现有颜色的key
+const type = ref('') // 区分编辑和添加
 const formData: Record<string, any> = reactive({ ...initialData })
 
 const open = (option:any) => {
-    keyArr = option.key;
-    type.value = '';
+    keyArr = option.key
+    type.value = ''
     // 恢复默认值
-    for(let key in formData){
+    for (const key in formData) {
         formData[key] = ''
     }
-    if(option.data && Object.keys(option.data).length){
-        type.value = 'edit';
-        Object.keys(formData).forEach((item,index)=>{
-            formData[item] = option.data[item] ? option.data[item] : '';
+    if (option.data && Object.keys(option.data).length) {
+        type.value = 'edit'
+        Object.keys(formData).forEach((item, index) => {
+            formData[item] = option.data[item] ? option.data[item] : ''
         })
     }
     dialogThemeVisible.value = true
@@ -72,7 +72,7 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
     return {
         title: [
-            { required: true, message: "请输入颜色名称", trigger: 'blur' }
+            { required: true, message: '请输入颜色名称', trigger: 'blur' }
         ],
         value: [
             {
@@ -80,15 +80,15 @@ const formRules = computed(() => {
                 validator: (rule: any, value: any, callback: any) => {
                     if (!value) {
                         callback('请输入颜色value值')
-                    } else{
-                        callback();
+                    } else {
+                        callback()
                     }
                 },
                 trigger: ['blur', 'change']
             }
         ],
         label: [
-            { required: true, message: "请输入颜色key值", trigger: 'blur' },
+            { required: true, message: '请输入颜色key值', trigger: 'blur' },
             {
                 validator: (rule: any, value: any, callback: any) => {
                     const regex = /^[a-zA-Z0-9-]+$/
@@ -96,8 +96,8 @@ const formRules = computed(() => {
                         callback('新增颜色key值与已存在颜色key值命名重复，请修改命名')
                     } if (!regex.test(value)) {
                         callback('颜色key值只能输入字母、数字和连字符')
-                    } else{
-                        callback();
+                    } else {
+                        callback()
                     }
                 },
                 trigger: 'blur'
@@ -113,8 +113,8 @@ const confirmFn = async (formEl: FormInstance | undefined) => {
         confirmRepeat.value = true
         if (valid) {
             confirmRepeat.value = false
-            emit('confirm', cloneDeep(formData));
-            dialogThemeVisible.value = false;
+            emit('confirm', cloneDeep(formData))
+            dialogThemeVisible.value = false
         }
     })
 }
diff --git a/admin/src/app/views/diy/components/edit-active-cube.vue b/admin/src/app/views/diy/components/edit-active-cube.vue
index 4647fc377..01be8224c 100644
--- a/admin/src/app/views/diy/components/edit-active-cube.vue
+++ b/admin/src/app/views/diy/components/edit-active-cube.vue
@@ -7,7 +7,7 @@
             <el-form label-width="80px" class="px-[10px]" @submit.prevent>
                 <el-form-item :label="t('selectStyle')" class="flex">
                     <span class="text-primary flex-1 cursor-pointer" @click="showTitleStyle">{{ diyStore.editComponent.titleStyle.title }}</span>
-                    <el-icon>
+                    <el-icon @click="showTitleStyle" class="cursor-pointer">
                         <ArrowRight />
                     </el-icon>
                 </el-form-item>
@@ -57,7 +57,7 @@
                 <el-form-item :label="t('selectStyle')" class="flex">
                     <span class="text-primary flex-1 cursor-pointer"
                           @click="showBlockStyle">{{ diyStore.editComponent.blockStyle.title }}</span>
-                    <el-icon>
+                    <el-icon @click="showBlockStyle" class="cursor-pointer">
                         <ArrowRight />
                     </el-icon>
                 </el-form-item>
@@ -271,8 +271,8 @@ diyStore.editComponent.list.forEach((item: any) => {
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
-    selectTitleStyle.title = diyStore.editComponent.titleStyle.title;
-    selectTitleStyle.value = diyStore.editComponent.titleStyle.value;
+    selectTitleStyle.title = diyStore.editComponent.titleStyle.title
+    selectTitleStyle.value = diyStore.editComponent.titleStyle.value
     showTitleDialog.value = true
 }
 
@@ -306,43 +306,43 @@ const selectTitleStyle = reactive({
 })
 
 const changeTitleStyle = (item: any) => {
-    selectTitleStyle.title = item.title;
-    selectTitleStyle.value = item.value;
+    selectTitleStyle.title = item.title
+    selectTitleStyle.value = item.value
 }
 
 const confirmTitleStyle = () => {
-    diyStore.editComponent.titleStyle.title = selectTitleStyle.title;
-    diyStore.editComponent.titleStyle.value = selectTitleStyle.value;
-    initTitleStyle(diyStore.editComponent.titleStyle.value);
+    diyStore.editComponent.titleStyle.title = selectTitleStyle.title
+    diyStore.editComponent.titleStyle.value = selectTitleStyle.value
+    initTitleStyle(diyStore.editComponent.titleStyle.value)
     showTitleDialog.value = false
 }
 
 const initTitleStyle = (style) => {
     if (diyStore.editComponent.titleStyle.value == 'style-1') {
-        diyStore.editComponent.titleColor = "#F91700";
-        diyStore.editComponent.subTitle.textColor = "#FFFFFF";
-        diyStore.editComponent.subTitle.startColor = "#FB792F";
-        diyStore.editComponent.subTitle.endColor = "#F91700";
+        diyStore.editComponent.titleColor = '#F91700'
+        diyStore.editComponent.subTitle.textColor = '#FFFFFF'
+        diyStore.editComponent.subTitle.startColor = '#FB792F'
+        diyStore.editComponent.subTitle.endColor = '#F91700'
     } else if (diyStore.editComponent.titleStyle.value == 'style-2') {
-        diyStore.editComponent.titleColor = "#F91700";
-        diyStore.editComponent.subTitle.textColor = "#FFFFFF";
-        diyStore.editComponent.subTitle.startColor = "#FB792F";
-        diyStore.editComponent.subTitle.endColor = "#F91700";
+        diyStore.editComponent.titleColor = '#F91700'
+        diyStore.editComponent.subTitle.textColor = '#FFFFFF'
+        diyStore.editComponent.subTitle.startColor = '#FB792F'
+        diyStore.editComponent.subTitle.endColor = '#F91700'
     } else if (diyStore.editComponent.titleStyle.value == 'style-3') {
-        diyStore.editComponent.titleColor = "#F91700";
-        diyStore.editComponent.subTitle.textColor = "#FFFFFF";
-        diyStore.editComponent.subTitle.startColor = "#FB792F";
-        diyStore.editComponent.subTitle.endColor = "#F91700";
+        diyStore.editComponent.titleColor = '#F91700'
+        diyStore.editComponent.subTitle.textColor = '#FFFFFF'
+        diyStore.editComponent.subTitle.startColor = '#FB792F'
+        diyStore.editComponent.subTitle.endColor = '#F91700'
     } else if (diyStore.editComponent.titleStyle.value == 'style-4') {
-        diyStore.editComponent.titleColor = "#FFFFFF";
-        diyStore.editComponent.subTitle.textColor = "#333333";
-        diyStore.editComponent.subTitle.startColor = "#FFFFFF";
-        diyStore.editComponent.subTitle.endColor = "#FFFFFF";
+        diyStore.editComponent.titleColor = '#FFFFFF'
+        diyStore.editComponent.subTitle.textColor = '#333333'
+        diyStore.editComponent.subTitle.startColor = '#FFFFFF'
+        diyStore.editComponent.subTitle.endColor = '#FFFFFF'
     } else if (diyStore.editComponent.titleStyle.value == 'style-5') {
-        diyStore.editComponent.titleColor = "";
-        diyStore.editComponent.subTitle.textColor = "#999999";
-        diyStore.editComponent.subTitle.startColor = "#FFFFFF";
-        diyStore.editComponent.subTitle.endColor = "#FFFFFF";
+        diyStore.editComponent.titleColor = ''
+        diyStore.editComponent.subTitle.textColor = '#999999'
+        diyStore.editComponent.subTitle.startColor = '#FFFFFF'
+        diyStore.editComponent.subTitle.endColor = '#FFFFFF'
     }
 }
 
@@ -382,178 +382,177 @@ const selectBlockStyle = reactive({
 })
 
 const changeBlockStyle = (item: any) => {
-    selectBlockStyle.title = item.title;
-    selectBlockStyle.value = item.value;
+    selectBlockStyle.title = item.title
+    selectBlockStyle.value = item.value
 }
 
 const confirmBlockStyle = () => {
-    diyStore.editComponent.blockStyle.title = selectBlockStyle.title;
-    diyStore.editComponent.blockStyle.value = selectBlockStyle.value;
-    initBlockStyle(diyStore.editComponent.blockStyle.value);
+    diyStore.editComponent.blockStyle.title = selectBlockStyle.title
+    diyStore.editComponent.blockStyle.value = selectBlockStyle.value
+    initBlockStyle(diyStore.editComponent.blockStyle.value)
     showListDialog.value = false
 }
 
 const initBlockStyle = (style: any) => {
     if (style == 'style-1') {
-        diyStore.editComponent.blockStyle.fontWeight = "normal";
-        diyStore.editComponent.blockStyle.btnText = "normal";
+        diyStore.editComponent.blockStyle.fontWeight = 'normal'
+        diyStore.editComponent.blockStyle.btnText = 'normal'
 
-        diyStore.editComponent.list[0].title.textColor = "#303133";
-        diyStore.editComponent.list[0].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[0].subTitle.startColor = "";
-        diyStore.editComponent.list[0].subTitle.endColor = "";
-        diyStore.editComponent.list[0].moreTitle.startColor = "#FEA715";
-        diyStore.editComponent.list[0].moreTitle.endColor = "#FE1E00";
-        diyStore.editComponent.list[0].listFrame.startColor = "#FFFAF5";
-        diyStore.editComponent.list[0].listFrame.endColor = "#FFFFFF";
+        diyStore.editComponent.list[0].title.textColor = '#303133'
+        diyStore.editComponent.list[0].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[0].subTitle.startColor = ''
+        diyStore.editComponent.list[0].subTitle.endColor = ''
+        diyStore.editComponent.list[0].moreTitle.startColor = '#FEA715'
+        diyStore.editComponent.list[0].moreTitle.endColor = '#FE1E00'
+        diyStore.editComponent.list[0].listFrame.startColor = '#FFFAF5'
+        diyStore.editComponent.list[0].listFrame.endColor = '#FFFFFF'
 
-        diyStore.editComponent.list[1].title.textColor = "#303133";
-        diyStore.editComponent.list[1].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[1].subTitle.startColor = "";
-        diyStore.editComponent.list[1].subTitle.endColor = "";
-        diyStore.editComponent.list[1].moreTitle.startColor = "#FFBF50";
-        diyStore.editComponent.list[1].moreTitle.endColor = "#FF9E03";
-        diyStore.editComponent.list[1].listFrame.startColor = "#FFFAF5";
-        diyStore.editComponent.list[1].listFrame.endColor = "#FFFFFF";
+        diyStore.editComponent.list[1].title.textColor = '#303133'
+        diyStore.editComponent.list[1].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[1].subTitle.startColor = ''
+        diyStore.editComponent.list[1].subTitle.endColor = ''
+        diyStore.editComponent.list[1].moreTitle.startColor = '#FFBF50'
+        diyStore.editComponent.list[1].moreTitle.endColor = '#FF9E03'
+        diyStore.editComponent.list[1].listFrame.startColor = '#FFFAF5'
+        diyStore.editComponent.list[1].listFrame.endColor = '#FFFFFF'
 
-        diyStore.editComponent.list[2].title.textColor = "#303133";
-        diyStore.editComponent.list[2].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[2].subTitle.startColor = "";
-        diyStore.editComponent.list[2].subTitle.endColor = "";
-        diyStore.editComponent.list[2].moreTitle.startColor = "#A2E792";
-        diyStore.editComponent.list[2].moreTitle.endColor = "#49CD2D";
-        diyStore.editComponent.list[2].listFrame.startColor = "#FFFAF5";
-        diyStore.editComponent.list[2].listFrame.endColor = "#FFFFFF";
-
-        diyStore.editComponent.list[3].title.textColor = "#303133";
-        diyStore.editComponent.list[3].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[3].subTitle.startColor = "";
-        diyStore.editComponent.list[3].subTitle.endColor = "";
-        diyStore.editComponent.list[3].moreTitle.startColor = "#4AC1FF";
-        diyStore.editComponent.list[3].moreTitle.endColor = "#1D7CFF";
-        diyStore.editComponent.list[3].listFrame.startColor = "#FFFAF5";
-        diyStore.editComponent.list[3].listFrame.endColor = "#FFFFFF";
+        diyStore.editComponent.list[2].title.textColor = '#303133'
+        diyStore.editComponent.list[2].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[2].subTitle.startColor = ''
+        diyStore.editComponent.list[2].subTitle.endColor = ''
+        diyStore.editComponent.list[2].moreTitle.startColor = '#A2E792'
+        diyStore.editComponent.list[2].moreTitle.endColor = '#49CD2D'
+        diyStore.editComponent.list[2].listFrame.startColor = '#FFFAF5'
+        diyStore.editComponent.list[2].listFrame.endColor = '#FFFFFF'
 
+        diyStore.editComponent.list[3].title.textColor = '#303133'
+        diyStore.editComponent.list[3].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[3].subTitle.startColor = ''
+        diyStore.editComponent.list[3].subTitle.endColor = ''
+        diyStore.editComponent.list[3].moreTitle.startColor = '#4AC1FF'
+        diyStore.editComponent.list[3].moreTitle.endColor = '#1D7CFF'
+        diyStore.editComponent.list[3].listFrame.startColor = '#FFFAF5'
+        diyStore.editComponent.list[3].listFrame.endColor = '#FFFFFF'
     } else if (style == 'style-2') {
-        diyStore.editComponent.blockStyle.fontWeight = "normal";
-        diyStore.editComponent.blockStyle.btnText = "normal";
+        diyStore.editComponent.blockStyle.fontWeight = 'normal'
+        diyStore.editComponent.blockStyle.btnText = 'normal'
 
-        diyStore.editComponent.blockStyle.fontWeight = "bold";
-        diyStore.editComponent.blockStyle.btnText = "italics";
+        diyStore.editComponent.blockStyle.fontWeight = 'bold'
+        diyStore.editComponent.blockStyle.btnText = 'italics'
 
-        diyStore.editComponent.list[0].title.textColor = "#303133";
-        diyStore.editComponent.list[0].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[0].subTitle.startColor = "";
-        diyStore.editComponent.list[0].subTitle.endColor = "";
-        diyStore.editComponent.list[0].moreTitle.startColor = "#FFC051";
-        diyStore.editComponent.list[0].moreTitle.endColor = "#FF9C00";
-        diyStore.editComponent.list[0].listFrame.startColor = "#FFF1DB";
-        diyStore.editComponent.list[0].listFrame.endColor = "#FFFBF4";
+        diyStore.editComponent.list[0].title.textColor = '#303133'
+        diyStore.editComponent.list[0].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[0].subTitle.startColor = ''
+        diyStore.editComponent.list[0].subTitle.endColor = ''
+        diyStore.editComponent.list[0].moreTitle.startColor = '#FFC051'
+        diyStore.editComponent.list[0].moreTitle.endColor = '#FF9C00'
+        diyStore.editComponent.list[0].listFrame.startColor = '#FFF1DB'
+        diyStore.editComponent.list[0].listFrame.endColor = '#FFFBF4'
 
-        diyStore.editComponent.list[1].title.textColor = "#303133";
-        diyStore.editComponent.list[1].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[1].subTitle.startColor = "";
-        diyStore.editComponent.list[1].subTitle.endColor = "";
-        diyStore.editComponent.list[1].moreTitle.startColor = "#A4E894";
-        diyStore.editComponent.list[1].moreTitle.endColor = "#45CC2A";
-        diyStore.editComponent.list[1].listFrame.startColor = "#E6F6E2";
-        diyStore.editComponent.list[1].listFrame.endColor = "#F5FDF3";
+        diyStore.editComponent.list[1].title.textColor = '#303133'
+        diyStore.editComponent.list[1].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[1].subTitle.startColor = ''
+        diyStore.editComponent.list[1].subTitle.endColor = ''
+        diyStore.editComponent.list[1].moreTitle.startColor = '#A4E894'
+        diyStore.editComponent.list[1].moreTitle.endColor = '#45CC2A'
+        diyStore.editComponent.list[1].listFrame.startColor = '#E6F6E2'
+        diyStore.editComponent.list[1].listFrame.endColor = '#F5FDF3'
 
-        diyStore.editComponent.list[2].title.textColor = "#303133";
-        diyStore.editComponent.list[2].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[2].subTitle.startColor = "";
-        diyStore.editComponent.list[2].subTitle.endColor = "";
-        diyStore.editComponent.list[2].moreTitle.startColor = "#4BC2FF";
-        diyStore.editComponent.list[2].moreTitle.endColor = "#1F7DFF";
-        diyStore.editComponent.list[2].listFrame.startColor = "#E2F6FF";
-        diyStore.editComponent.list[2].listFrame.endColor = "#F2FAFF";
+        diyStore.editComponent.list[2].title.textColor = '#303133'
+        diyStore.editComponent.list[2].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[2].subTitle.startColor = ''
+        diyStore.editComponent.list[2].subTitle.endColor = ''
+        diyStore.editComponent.list[2].moreTitle.startColor = '#4BC2FF'
+        diyStore.editComponent.list[2].moreTitle.endColor = '#1F7DFF'
+        diyStore.editComponent.list[2].listFrame.startColor = '#E2F6FF'
+        diyStore.editComponent.list[2].listFrame.endColor = '#F2FAFF'
 
-        diyStore.editComponent.list[3].title.textColor = "#303133";
-        diyStore.editComponent.list[3].subTitle.textColor = "#999999";
-        diyStore.editComponent.list[3].subTitle.startColor = "";
-        diyStore.editComponent.list[3].subTitle.endColor = "";
-        diyStore.editComponent.list[3].moreTitle.startColor = "#FB792F";
-        diyStore.editComponent.list[3].moreTitle.endColor = "#F91700";
-        diyStore.editComponent.list[3].listFrame.startColor = "#FFEAEA";
-        diyStore.editComponent.list[3].listFrame.endColor = "#FFFCFB";
+        diyStore.editComponent.list[3].title.textColor = '#303133'
+        diyStore.editComponent.list[3].subTitle.textColor = '#999999'
+        diyStore.editComponent.list[3].subTitle.startColor = ''
+        diyStore.editComponent.list[3].subTitle.endColor = ''
+        diyStore.editComponent.list[3].moreTitle.startColor = '#FB792F'
+        diyStore.editComponent.list[3].moreTitle.endColor = '#F91700'
+        diyStore.editComponent.list[3].listFrame.startColor = '#FFEAEA'
+        diyStore.editComponent.list[3].listFrame.endColor = '#FFFCFB'
     } else if (style == 'style-3') {
-        diyStore.editComponent.blockStyle.fontWeight = "normal";
-        diyStore.editComponent.blockStyle.btnText = "normal";
+        diyStore.editComponent.blockStyle.fontWeight = 'normal'
+        diyStore.editComponent.blockStyle.btnText = 'normal'
 
-        diyStore.editComponent.list[0].title.textColor = "#FF1128";
-        diyStore.editComponent.list[0].subTitle.textColor = "";
-        diyStore.editComponent.list[0].subTitle.startColor = "";
-        diyStore.editComponent.list[0].subTitle.endColor = "";
-        diyStore.editComponent.list[0].moreTitle.startColor = "";
-        diyStore.editComponent.list[0].moreTitle.endColor = "";
-        diyStore.editComponent.list[0].listFrame.startColor = "";
-        diyStore.editComponent.list[0].listFrame.endColor = "";
+        diyStore.editComponent.list[0].title.textColor = '#FF1128'
+        diyStore.editComponent.list[0].subTitle.textColor = ''
+        diyStore.editComponent.list[0].subTitle.startColor = ''
+        diyStore.editComponent.list[0].subTitle.endColor = ''
+        diyStore.editComponent.list[0].moreTitle.startColor = ''
+        diyStore.editComponent.list[0].moreTitle.endColor = ''
+        diyStore.editComponent.list[0].listFrame.startColor = ''
+        diyStore.editComponent.list[0].listFrame.endColor = ''
 
-        diyStore.editComponent.list[1].title.textColor = "#303133";
-        diyStore.editComponent.list[1].subTitle.textColor = "";
-        diyStore.editComponent.list[1].subTitle.startColor = "";
-        diyStore.editComponent.list[1].subTitle.endColor = "";
-        diyStore.editComponent.list[1].moreTitle.startColor = "";
-        diyStore.editComponent.list[1].moreTitle.endColor = "";
-        diyStore.editComponent.list[1].listFrame.startColor = "";
-        diyStore.editComponent.list[1].listFrame.endColor = "";
+        diyStore.editComponent.list[1].title.textColor = '#303133'
+        diyStore.editComponent.list[1].subTitle.textColor = ''
+        diyStore.editComponent.list[1].subTitle.startColor = ''
+        diyStore.editComponent.list[1].subTitle.endColor = ''
+        diyStore.editComponent.list[1].moreTitle.startColor = ''
+        diyStore.editComponent.list[1].moreTitle.endColor = ''
+        diyStore.editComponent.list[1].listFrame.startColor = ''
+        diyStore.editComponent.list[1].listFrame.endColor = ''
 
-        diyStore.editComponent.list[2].title.textColor = "#303133";
-        diyStore.editComponent.list[2].subTitle.textColor = "";
-        diyStore.editComponent.list[2].subTitle.startColor = "";
-        diyStore.editComponent.list[2].subTitle.endColor = "";
-        diyStore.editComponent.list[2].moreTitle.startColor = "";
-        diyStore.editComponent.list[2].moreTitle.endColor = "";
-        diyStore.editComponent.list[2].listFrame.startColor = "";
-        diyStore.editComponent.list[2].listFrame.endColor = "";
+        diyStore.editComponent.list[2].title.textColor = '#303133'
+        diyStore.editComponent.list[2].subTitle.textColor = ''
+        diyStore.editComponent.list[2].subTitle.startColor = ''
+        diyStore.editComponent.list[2].subTitle.endColor = ''
+        diyStore.editComponent.list[2].moreTitle.startColor = ''
+        diyStore.editComponent.list[2].moreTitle.endColor = ''
+        diyStore.editComponent.list[2].listFrame.startColor = ''
+        diyStore.editComponent.list[2].listFrame.endColor = ''
 
-        diyStore.editComponent.list[3].title.textColor = "#303133";
-        diyStore.editComponent.list[3].subTitle.textColor = "";
-        diyStore.editComponent.list[3].subTitle.startColor = "";
-        diyStore.editComponent.list[3].subTitle.endColor = "";
-        diyStore.editComponent.list[3].moreTitle.startColor = "";
-        diyStore.editComponent.list[3].moreTitle.endColor = "";
-        diyStore.editComponent.list[3].listFrame.startColor = "";
-        diyStore.editComponent.list[3].listFrame.endColor = "";
+        diyStore.editComponent.list[3].title.textColor = '#303133'
+        diyStore.editComponent.list[3].subTitle.textColor = ''
+        diyStore.editComponent.list[3].subTitle.startColor = ''
+        diyStore.editComponent.list[3].subTitle.endColor = ''
+        diyStore.editComponent.list[3].moreTitle.startColor = ''
+        diyStore.editComponent.list[3].moreTitle.endColor = ''
+        diyStore.editComponent.list[3].listFrame.startColor = ''
+        diyStore.editComponent.list[3].listFrame.endColor = ''
     } else if (style == 'style-4') {
-        diyStore.editComponent.blockStyle.fontWeight = "bold";
-        diyStore.editComponent.blockStyle.btnText = "normal";
+        diyStore.editComponent.blockStyle.fontWeight = 'bold'
+        diyStore.editComponent.blockStyle.btnText = 'normal'
 
-        diyStore.editComponent.list[0].title.textColor = "#303133";
-        diyStore.editComponent.list[0].subTitle.textColor = "#ED6E00";
-        diyStore.editComponent.list[0].subTitle.startColor = "#FFE4D9";
-        diyStore.editComponent.list[0].subTitle.endColor = "#FFE4D9";
-        diyStore.editComponent.list[0].moreTitle.startColor = "";
-        diyStore.editComponent.list[0].moreTitle.endColor = "";
-        diyStore.editComponent.list[0].listFrame.startColor = "#FFAD4D";
-        diyStore.editComponent.list[0].listFrame.endColor = "#F93D02";
+        diyStore.editComponent.list[0].title.textColor = '#303133'
+        diyStore.editComponent.list[0].subTitle.textColor = '#ED6E00'
+        diyStore.editComponent.list[0].subTitle.startColor = '#FFE4D9'
+        diyStore.editComponent.list[0].subTitle.endColor = '#FFE4D9'
+        diyStore.editComponent.list[0].moreTitle.startColor = ''
+        diyStore.editComponent.list[0].moreTitle.endColor = ''
+        diyStore.editComponent.list[0].listFrame.startColor = '#FFAD4D'
+        diyStore.editComponent.list[0].listFrame.endColor = '#F93D02'
 
-        diyStore.editComponent.list[1].title.textColor = "#303133";
-        diyStore.editComponent.list[1].subTitle.textColor = "#2E59E9";
-        diyStore.editComponent.list[1].subTitle.startColor = "#CAD7F8";
-        diyStore.editComponent.list[1].subTitle.endColor = "#CAD7F8";
-        diyStore.editComponent.list[1].moreTitle.startColor = "";
-        diyStore.editComponent.list[1].moreTitle.endColor = "";
-        diyStore.editComponent.list[1].listFrame.startColor = "#7CA7F4";
-        diyStore.editComponent.list[1].listFrame.endColor = "#2B56E9";
+        diyStore.editComponent.list[1].title.textColor = '#303133'
+        diyStore.editComponent.list[1].subTitle.textColor = '#2E59E9'
+        diyStore.editComponent.list[1].subTitle.startColor = '#CAD7F8'
+        diyStore.editComponent.list[1].subTitle.endColor = '#CAD7F8'
+        diyStore.editComponent.list[1].moreTitle.startColor = ''
+        diyStore.editComponent.list[1].moreTitle.endColor = ''
+        diyStore.editComponent.list[1].listFrame.startColor = '#7CA7F4'
+        diyStore.editComponent.list[1].listFrame.endColor = '#2B56E9'
 
-        diyStore.editComponent.list[2].title.textColor = "#303133";
-        diyStore.editComponent.list[2].subTitle.textColor = "#F62F55";
-        diyStore.editComponent.list[2].subTitle.startColor = "#FCD6D9";
-        diyStore.editComponent.list[2].subTitle.endColor = "#FCD6D9";
-        diyStore.editComponent.list[2].moreTitle.startColor = "";
-        diyStore.editComponent.list[2].moreTitle.endColor = "";
-        diyStore.editComponent.list[2].listFrame.startColor = "#FF7F48";
-        diyStore.editComponent.list[2].listFrame.endColor = "#EE335B";
+        diyStore.editComponent.list[2].title.textColor = '#303133'
+        diyStore.editComponent.list[2].subTitle.textColor = '#F62F55'
+        diyStore.editComponent.list[2].subTitle.startColor = '#FCD6D9'
+        diyStore.editComponent.list[2].subTitle.endColor = '#FCD6D9'
+        diyStore.editComponent.list[2].moreTitle.startColor = ''
+        diyStore.editComponent.list[2].moreTitle.endColor = ''
+        diyStore.editComponent.list[2].listFrame.startColor = '#FF7F48'
+        diyStore.editComponent.list[2].listFrame.endColor = '#EE335B'
 
-        diyStore.editComponent.list[3].title.textColor = "#303133";
-        diyStore.editComponent.list[3].subTitle.textColor = "#139B3C";
-        diyStore.editComponent.list[3].subTitle.startColor = "#D3F1DA";
-        diyStore.editComponent.list[3].subTitle.endColor = "#D3F1DA";
-        diyStore.editComponent.list[3].moreTitle.startColor = "";
-        diyStore.editComponent.list[3].moreTitle.endColor = "";
-        diyStore.editComponent.list[3].listFrame.startColor = "#90D48C";
-        diyStore.editComponent.list[3].listFrame.endColor = "#299F4F";
+        diyStore.editComponent.list[3].title.textColor = '#303133'
+        diyStore.editComponent.list[3].subTitle.textColor = '#139B3C'
+        diyStore.editComponent.list[3].subTitle.startColor = '#D3F1DA'
+        diyStore.editComponent.list[3].subTitle.endColor = '#D3F1DA'
+        diyStore.editComponent.list[3].moreTitle.startColor = ''
+        diyStore.editComponent.list[3].moreTitle.endColor = ''
+        diyStore.editComponent.list[3].listFrame.startColor = '#90D48C'
+        diyStore.editComponent.list[3].listFrame.endColor = '#299F4F'
     }
 }
 
@@ -562,17 +561,17 @@ const addItem = () => {
         id: diyStore.generateRandom(),
         title: {
             title: '标题',
-            textColor: "#000000"
+            textColor: '#000000'
         },
         subTitle: {
             text: '副标题',
-            textColor: "#999999",
+            textColor: '#999999',
             startColor: '',
             endColor: ''
         },
         listFrame: {
-            startColor: "#4AC1FF",
-            endColor: "#1D7CFF"
+            startColor: '#4AC1FF',
+            endColor: '#1D7CFF'
         },
         moreTitle: {
             text: '去看看',
diff --git a/admin/src/app/views/diy/components/edit-carousel-search.vue b/admin/src/app/views/diy/components/edit-carousel-search.vue
index d94bba697..cca5e0824 100644
--- a/admin/src/app/views/diy/components/edit-carousel-search.vue
+++ b/admin/src/app/views/diy/components/edit-carousel-search.vue
@@ -29,7 +29,7 @@
             <el-form label-width="100px" class="px-[10px]" @submit.prevent>
                 <el-form-item :label="t('selectStyle')" class="flex">
                     <span class="text-primary flex-1 cursor-pointer" @click="showSearchStyle">{{ diyStore.editComponent.search.styleName }}</span>
-                    <el-icon>
+                    <el-icon @click="showSearchStyle" class="cursor-pointer">
                         <ArrowRight />
                     </el-icon>
                 </el-form-item>
@@ -348,7 +348,7 @@ diyStore.editComponent.verify = (index: number) => {
             res.message = t('carouselSearchHotWordTextPlaceholder')
             return res
         }
-    });
+    })
 
     diyStore.value[index].tab.list.forEach((item: any) => {
         if (item.text == '') {
@@ -361,7 +361,7 @@ diyStore.editComponent.verify = (index: number) => {
         //     res.message = t('selectDiyPagePlaceholder')
         //     return res
         // }
-    });
+    })
 
     if (diyStore.value[index].swiper.control) {
         diyStore.value[index].swiper.list.forEach((item: any) => {
@@ -370,13 +370,13 @@ diyStore.editComponent.verify = (index: number) => {
                 res.message = t('imageUrlTip')
                 return res
             }
-        });
+        })
     }
 
     return res
 }
 
-/************** 搜索框样式选择-start ********************/
+/** ************ 搜索框样式选择-start ********************/
 const selectSearchStyle = reactive({
     title: diyStore.editComponent.search.styleName,
     value: diyStore.editComponent.search.style
@@ -386,18 +386,18 @@ const showSearchDialog = ref(false)
 
 const showSearchStyle = () => {
     showSearchDialog.value = true
-    selectSearchStyle.title = diyStore.editComponent.search.styleName;
-    selectSearchStyle.value = diyStore.editComponent.search.style;
+    selectSearchStyle.title = diyStore.editComponent.search.styleName
+    selectSearchStyle.value = diyStore.editComponent.search.style
 }
 
 const changeSearchStyle = (item: any) => {
-    selectSearchStyle.title = item.title;
-    selectSearchStyle.value = item.value;
+    selectSearchStyle.title = item.title
+    selectSearchStyle.value = item.value
 }
 
 const confirmSearchStyle = () => {
-    diyStore.editComponent.search.styleName = selectSearchStyle.title;
-    diyStore.editComponent.search.style = selectSearchStyle.value;
+    diyStore.editComponent.search.styleName = selectSearchStyle.title
+    diyStore.editComponent.search.style = selectSearchStyle.value
     showSearchDialog.value = false
 }
 
@@ -414,7 +414,7 @@ const searchStyleList = reactive([
     }
 ])
 
-/************** 搜索框样式选择-end ********************/
+/** ************ 搜索框样式选择-end ********************/
 
 diyStore.editComponent.search.hotWord.list.forEach((item: any) => {
     if (!item.id) item.id = diyStore.generateRandom()
@@ -439,13 +439,13 @@ onMounted(() => {
 const addHotWordItem = () => {
     diyStore.editComponent.search.hotWord.list.push({
         id: diyStore.generateRandom(),
-        text: '关键词',
+        text: '关键词'
     })
 }
 
 const tabClear = (index: any) => {
-    diyStore.editComponent.tab.list[index].diy_id = 0;
-    diyStore.editComponent.tab.list[index].diy_title = '';
+    diyStore.editComponent.tab.list[index].diy_id = 0
+    diyStore.editComponent.tab.list[index].diy_title = ''
 }
 
 const addTabItem = () => {
@@ -539,24 +539,24 @@ const loadDiyPageList = (page: number = 1) => {
         ...diyPageTable.searchParam
     }).then(res => {
         diyPageTable.loading = false
-        let data = res.data.data;
-        let newData: any = [];
-        let isExistCount = 0;
+        const data = res.data.data
+        let newData: any = []
+        let isExistCount = 0
 
         // 排除当前编辑的微页面以及存在 置顶组件的数据
         if (diyStore.id) {
             for (let i = 0; i < data.length; i++) {
                 if (data[i].id == diyStore.id) {
-                    isExistCount++;
+                    isExistCount++
                 } else {
-                    newData.push(data[i]);
+                    newData.push(data[i])
                 }
             }
         } else {
-            newData = cloneDeep(data); // 添加
+            newData = cloneDeep(data) // 添加
         }
         if (isExistCount) {
-            res.data.total = res.data.total - isExistCount;
+            res.data.total = res.data.total - isExistCount
         }
         diyPageTable.data = newData
         diyPageTable.total = res.data.total
@@ -567,20 +567,20 @@ const loadDiyPageList = (page: number = 1) => {
 
 // 选择微页面
 let currDiyPage: any = {}
-let currTabIndexForDiyPage = 0;
+let currTabIndexForDiyPage = 0
 const handleCurrentDiyPageChange = (val: string | any[]) => {
     currDiyPage = val
 }
 
 const saveDiyPageId = () => {
-    diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_id = currDiyPage.id;
-    diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_title = currDiyPage.title;
+    diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_id = currDiyPage.id
+    diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_title = currDiyPage.title
     diyPageShowDialog.value = false
 }
 
 const diyPageShowDialogOpen = (index: any) => {
     diyPageShowDialog.value = true
-    currTabIndexForDiyPage = index;
+    currTabIndexForDiyPage = index
     if (currDiyPage) {
         setTimeout(() => {
             diyPageTableRef.value!.setCurrentRow(currDiyPage)
@@ -620,7 +620,7 @@ const handleHeight = (isCalcHeight: boolean = false) => {
     diyStore.editComponent.swiper.list.forEach((item: any, index: number) => {
         const image = new Image()
         image.src = img(item.imageUrl)
-        image.onload = async() => {
+        image.onload = async () => {
             item.imgWidth = image.width
             item.imgHeight = image.height
             // 计算第一张图片高度
diff --git a/admin/src/app/views/diy/components/edit-float-btn.vue b/admin/src/app/views/diy/components/edit-float-btn.vue
index 467617f4b..45502e7bb 100644
--- a/admin/src/app/views/diy/components/edit-float-btn.vue
+++ b/admin/src/app/views/diy/components/edit-float-btn.vue
@@ -122,7 +122,7 @@ templateList.value.forEach((item) => {
 })
 
 const changeTemplateList = (data: any) => {
-    selectTemplate.value = data;
+    selectTemplate.value = data
     diyStore.editComponent.bottomPosition = data.className
 }
 
@@ -134,7 +134,7 @@ const addImageAd = () => {
     })
 }
 
-const imageBoxRef = ref();
+const imageBoxRef = ref()
 diyStore.editComponent.list.forEach((item: any) => {
     if (!item.id) item.id = diyStore.generateRandom()
 })
diff --git a/admin/src/app/views/diy/components/edit-graphic-nav.vue b/admin/src/app/views/diy/components/edit-graphic-nav.vue
index 635115567..f762b7122 100644
--- a/admin/src/app/views/diy/components/edit-graphic-nav.vue
+++ b/admin/src/app/views/diy/components/edit-graphic-nav.vue
@@ -189,7 +189,7 @@ watch(
         diyStore.editComponent.list.forEach((item: any) => {
             const image = new Image()
             image.src = img(item.imageUrl)
-            image.onload = async() => {
+            image.onload = async () => {
                 item.imgWidth = image.width
                 item.imgHeight = image.height
             }
@@ -239,9 +239,9 @@ onMounted(() => {
 
 const changePageCount = (value: any) => {
     if (value == '1') {
-        diyStore.editComponent.showStyle = 'singleSlide';
+        diyStore.editComponent.showStyle = 'singleSlide'
     } else if (value == '2') {
-        diyStore.editComponent.showStyle = 'fixed';
+        diyStore.editComponent.showStyle = 'fixed'
     }
 }
 
diff --git a/admin/src/app/views/diy/components/edit-member-level.vue b/admin/src/app/views/diy/components/edit-member-level.vue
index 0b758ca43..94b0358ef 100644
--- a/admin/src/app/views/diy/components/edit-member-level.vue
+++ b/admin/src/app/views/diy/components/edit-member-level.vue
@@ -7,7 +7,7 @@
                 <el-form-item :label="t('selectStyle')" class="flex">
                     <span class="text-primary flex-1 cursor-pointer"
                           @click="showStyle">{{ diyStore.editComponent.styleName }}</span>
-                    <el-icon>
+                    <el-icon @click="showStyle" class="cursor-pointer">
                         <ArrowRight />
                     </el-icon>
                 </el-form-item>
@@ -65,8 +65,8 @@ const showDialog = ref(false)
 
 const showStyle = () => {
     showDialog.value = true
-    selectStyle.title = diyStore.editComponent.styleName;
-    selectStyle.value = diyStore.editComponent.style;
+    selectStyle.title = diyStore.editComponent.styleName
+    selectStyle.value = diyStore.editComponent.style
 }
 
 const styleList = reactive([
@@ -98,36 +98,34 @@ const styleList = reactive([
 ])
 
 const changeStyle = (item: any) => {
-    selectStyle.title = item.title;
-    selectStyle.value = item.value;
+    selectStyle.title = item.title
+    selectStyle.value = item.value
 }
 
 const confirmStyle = () => {
-    diyStore.editComponent.styleName = selectStyle.title;
-    diyStore.editComponent.style = selectStyle.value;
-    initStyle(diyStore.editComponent.style);
+    diyStore.editComponent.styleName = selectStyle.title
+    diyStore.editComponent.style = selectStyle.value
+    initStyle(diyStore.editComponent.style)
     showDialog.value = false
 }
 
-
 const initStyle = (style: any) => {
     if (style == 'style-1') {
-        diyStore.editComponent.bottomRounded = 0;
-        diyStore.editComponent.topRounded = 12;
+        diyStore.editComponent.bottomRounded = 0
+        diyStore.editComponent.topRounded = 12
     } else if (style == 'style-2') {
-        diyStore.editComponent.bottomRounded = 0;
-        diyStore.editComponent.topRounded = 12;
+        diyStore.editComponent.bottomRounded = 0
+        diyStore.editComponent.topRounded = 12
     } else if (style == 'style-3') {
-        diyStore.editComponent.bottomRounded = 12;
-        diyStore.editComponent.topRounded = 12;
+        diyStore.editComponent.bottomRounded = 12
+        diyStore.editComponent.topRounded = 12
     } else if (style == 'style-4') {
-        diyStore.editComponent.bottomRounded = 12;
-        diyStore.editComponent.topRounded = 12;
+        diyStore.editComponent.bottomRounded = 12
+        diyStore.editComponent.topRounded = 12
     } else if (style == 'style-5') {
-        diyStore.editComponent.bottomRounded = 12;
-        diyStore.editComponent.topRounded = 12;
+        diyStore.editComponent.bottomRounded = 12
+        diyStore.editComponent.topRounded = 12
     }
-
 }
 
 defineExpose({})
diff --git a/admin/src/app/views/diy/components/edit-notice.vue b/admin/src/app/views/diy/components/edit-notice.vue
index 491234982..9514e6f5e 100644
--- a/admin/src/app/views/diy/components/edit-notice.vue
+++ b/admin/src/app/views/diy/components/edit-notice.vue
@@ -139,17 +139,17 @@ diyStore.editComponent.list.forEach((item: any) => {
 })
 
 const changeStyle = (value: any) => {
-    diyStore.editComponent.systemUrl = value;
-    diyStore.editComponent.imgType = 'system';
+    diyStore.editComponent.systemUrl = value
+    diyStore.editComponent.imgType = 'system'
 }
 
 watch(
     () => diyStore.editComponent.imageUrl,
     (newValue, oldValue) => {
         if (newValue) {
-            diyStore.editComponent.imgType = 'diy';
+            diyStore.editComponent.imgType = 'diy'
         } else {
-            changeStyle('style_1');
+            changeStyle('style_1')
         }
     }
 )
@@ -158,7 +158,7 @@ const addNotice = () => {
     diyStore.editComponent.list.push({
         id: diyStore.generateRandom(),
         text: '公告',
-        link: { name: '' },
+        link: { name: '' }
     })
 }
 
diff --git a/admin/src/app/views/diy/components/edit-page.vue b/admin/src/app/views/diy/components/edit-page.vue
index e595851c8..0d513860d 100644
--- a/admin/src/app/views/diy/components/edit-page.vue
+++ b/admin/src/app/views/diy/components/edit-page.vue
@@ -16,7 +16,7 @@
         <!-- 表单布局 页面设置 -->
         <slot name="content"></slot>
 
-        <div class="edit-attr-item-wrap">
+        <div class="edit-attr-item-wrap" v-if="diyStore.global.topStatusBar.control">
             <h3 class="mb-[10px]">{{ t('statusBarContent') }}</h3>
             <el-form label-width="80px" class="px-[10px]" @submit.prevent>
                 <el-form-item :label="t('topStatusBarNav')" class="display-block">
@@ -56,11 +56,11 @@
                 </template>
             </el-form>
         </div>
-        <div class="edit-attr-item-wrap">
+        <div class="edit-attr-item-wrap" v-if="diyStore.global.bottomTabBar.control">
             <h3 class="mb-[10px]">{{ t('bottomNavContent') }}</h3>
             <el-form label-width="80px" class="px-[10px]">
                 <el-form-item :label="t('tabbar')" class="display-block">
-                    <el-switch v-model="diyStore.global.bottomTabBarSwitch" />
+                    <el-switch v-model="diyStore.global.bottomTabBar.isShow" />
                     <div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>
                 </el-form-item>
             </el-form>
@@ -145,7 +145,7 @@
                 </el-form-item>
             </el-form>
         </div>
-        <div class="edit-attr-item-wrap">
+        <div class="edit-attr-item-wrap" v-if="diyStore.global.topStatusBar.control">
             <h3 class="mb-[10px]">{{ t('statusBarStyle') }}</h3>
             <el-form label-width="115px" class="px-[10px]">
                 <el-form-item :label="t('topStatusBarBgColor')" class="display-block">
@@ -187,7 +187,7 @@ watch(
         // 设置图片宽高
         const image = new Image()
         image.src = img(diyStore.global.bgUrl)
-        image.onload = async() => {
+        image.onload = async () => {
             diyStore.global.imgWidth = image.width
             diyStore.global.imgHeight = image.height
         }
@@ -201,7 +201,7 @@ watch(
 // 改变页面的左右边距时，更新所有组件的数值
 const inputBoth = (value: any) => {
     diyStore.value.forEach((item, index) => {
-        item.margin.both = value;
+        item.margin.both = value
     })
 }
 
@@ -217,7 +217,7 @@ const showStyle = () => {
     showDialog.value = true
 }
 
-const selectStyle = ref("style-1")
+const selectStyle = ref('style-1')
 const changeStyle = () => {
     switch (selectStyle.value) {
         case 'style-1':
@@ -240,7 +240,7 @@ const changeStyle = () => {
 const selectImg = (url: any) => {
     const image = new Image()
     image.src = img(url)
-    image.onload = async() => {
+    image.onload = async () => {
         diyStore.global.popWindow.imgWidth = image.width
         diyStore.global.popWindow.imgHeight = image.height
     }
diff --git a/admin/src/app/views/diy/components/edit-rubik-cube.vue b/admin/src/app/views/diy/components/edit-rubik-cube.vue
index c1c570f3c..3efc3c6b3 100644
--- a/admin/src/app/views/diy/components/edit-rubik-cube.vue
+++ b/admin/src/app/views/diy/components/edit-rubik-cube.vue
@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref, computed, watch } from 'vue'
 import { t } from '@/lang'
 import useDiyStore from '@/stores/modules/diy'
 import { img } from '@/utils/common'
@@ -330,6 +330,10 @@ const handleHeight = (isCalcHeight: boolean = false) => {
     })
 }
 
+watch(() => diyStore.editComponent.list, () => {
+    handleHeight(true)
+}, { deep: true })
+
 defineExpose({})
 </script>
 
diff --git a/admin/src/app/views/diy/components/edit-text.vue b/admin/src/app/views/diy/components/edit-text.vue
index 225ce11d4..60a867bcd 100644
--- a/admin/src/app/views/diy/components/edit-text.vue
+++ b/admin/src/app/views/diy/components/edit-text.vue
@@ -7,7 +7,7 @@
                 <el-form-item :label="t('selectStyle')" class="flex">
                     <span class="text-primary flex-1 cursor-pointer"
                           @click="showStyle">{{ diyStore.editComponent.styleName }}</span>
-                    <el-icon>
+                    <el-icon @click="showStyle" class="cursor-pointer">
                         <ArrowRight />
                     </el-icon>
                 </el-form-item>
diff --git a/admin/src/app/views/diy/edit.vue b/admin/src/app/views/diy/edit.vue
index cb6db3cbd..74ec223b0 100644
--- a/admin/src/app/views/diy/edit.vue
+++ b/admin/src/app/views/diy/edit.vue
@@ -406,6 +406,17 @@ initPage({
     template.value = data.template;
     diyStore.isDefault = data.is_default
     diyStore.pageMode = data.mode
+    if (data.global) {
+        for (const key in data.global) {
+            if(data.global[key]) {
+                for (const childKey in data.global[key]) {
+                    diyStore.global[key][childKey] = data.global[key][childKey]
+                }
+            }else{
+                diyStore.global[key] = data.global[key]
+            }
+        }
+    }
     if (data.value) {
         const sources = JSON.parse(data.value)
         diyStore.global = sources.global
@@ -472,7 +483,7 @@ initPage({
         }
     }
 
-    if(repeat) {
+    if (repeat) {
         setDomain()
     }
 
diff --git a/admin/src/app/views/diy/list.vue b/admin/src/app/views/diy/list.vue
index ac195e905..d37b39405 100644
--- a/admin/src/app/views/diy/list.vue
+++ b/admin/src/app/views/diy/list.vue
@@ -127,10 +127,10 @@
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import { getApps,getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare, setUseDiyPage,copyDiy } from '@/app/api/diy'
+import { getApps, getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare, setUseDiyPage, copyDiy } from '@/app/api/diy'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
+import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const router = useRouter()
@@ -177,10 +177,10 @@ const addEvent = async (formEl: FormInstance | undefined) => {
 }
 
 // 获取自定义页面类型
-const loadDiyTemplate = (addon = '')=> {
-    getDiyTemplate({mode: '', addon}).then(res => {
-        for (let key in pageType) {
-            delete pageType[key];
+const loadDiyTemplate = (addon = '') => {
+    getDiyTemplate({ mode: '', addon }).then(res => {
+        for (const key in pageType) {
+            delete pageType[key]
         }
 
         for (const key in res.data) {
@@ -189,21 +189,21 @@ const loadDiyTemplate = (addon = '')=> {
     })
 }
 
-loadDiyTemplate();
+loadDiyTemplate()
 
 const apps: any = reactive({}) // 应用插件列表
 
-getApps({}).then(res=>{
-    if(res.data){
+getApps({}).then(res => {
+    if (res.data) {
         for (const key in res.data) {
-            apps[key] = res.data[key];
+            apps[key] = res.data[key]
         }
     }
-});
+})
 
 // 根据所属插件，查询页面类型
 const handleSelectAddonChange = (value: any) => {
-    diyPageTableData.searchParam.type = '';
+    diyPageTableData.searchParam.type = ''
     loadDiyTemplate(value)
 }
 
@@ -236,13 +236,13 @@ const loadDiyPageList = (page: number = 1) => {
         diyPageTableData.loading = false
         diyPageTableData.data = res.data.data
         diyPageTableData.total = res.data.total
-        setTablePageStorage(diyPageTableData.page, diyPageTableData.limit, diyPageTableData.searchParam);
+        setTablePageStorage(diyPageTableData.page, diyPageTableData.limit, diyPageTableData.searchParam)
     }).catch(() => {
         diyPageTableData.loading = false
     })
 }
 
-loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page);
+loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page)
 
 // 编辑自定义页面
 const editEvent = (data: any) => {
@@ -255,7 +255,7 @@ const editEvent = (data: any) => {
 
 // 设为使用
 const setUse = (id: any) => {
-    setUseDiyPage({id}).then(() => {
+    setUseDiyPage({ id }).then(() => {
         loadDiyPageList()
     })
 }
@@ -273,7 +273,7 @@ const copyEvent = (id: any) => {
         if (repeat.value) return
         repeat.value = true
 
-        copyDiy({id: id}).then((res: any) => {
+        copyDiy({ id }).then((res: any) => {
             if (res.code == 1) {
                 loadDiyPageList()
             }
@@ -307,7 +307,7 @@ const toPreview = (data: any) => {
         query: {
             page: data.type_page + '?id=' + data.id
         }
-    });
+    })
     window.open(url.href)
 }
 
@@ -335,10 +335,12 @@ const shareFormRef = ref<FormInstance>()
 const openShare = async (row: any) => {
     shareFormId.value = row.id
     sharePage.value = row.title
-    const share = row.share ? JSON.parse(row.share) : {
-        wechat: { title: '', desc: '', url: '' },
-        weapp: { title: '', url: '' }
-    }
+    const share = row.share
+        ? JSON.parse(row.share)
+        : {
+            wechat: { title: '', desc: '', url: '' },
+            weapp: { title: '', url: '' }
+        }
     if (share) {
         shareFormData.wechat = share.wechat
         shareFormData.weapp = share.weapp
diff --git a/admin/src/app/views/diy/route.vue b/admin/src/app/views/diy/route.vue
index 0dbe22dcf..924df537d 100644
--- a/admin/src/app/views/diy/route.vue
+++ b/admin/src/app/views/diy/route.vue
@@ -94,7 +94,7 @@
 <script lang="ts" setup>
 import { reactive, ref, watch, computed } from 'vue'
 import { t } from '@/lang'
-import { getDiyRouteAppList,getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyRouteShare } from '@/app/api/diy'
+import { getDiyRouteAppList, getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyRouteShare } from '@/app/api/diy'
 import { ElMessage, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { useClipboard } from '@vueuse/core'
@@ -118,7 +118,7 @@ const diyRouteTableData = reactive({
     data: [],
     searchParam: {
         title: '',
-        addon_name:''
+        addon_name: ''
     }
 })
 
@@ -133,13 +133,13 @@ getDomain()
 
 const apps: any = reactive({}) // 应用插件列表
 
-getDiyRouteAppList().then(res=> {
+getDiyRouteAppList().then(res => {
     if (res.data) {
         for (const key in res.data) {
-            apps[key] = res.data[key];
+            apps[key] = res.data[key]
         }
     }
-});
+})
 
 const getDiyRouteListFn = () => {
     getDiyRouteList({}).then(res => {
@@ -148,10 +148,10 @@ const getDiyRouteListFn = () => {
         loadDiyRouteList(diyRouteTableData.page)
     }).catch(() => {
         diyRouteTableData.loading = false
-    });
+    })
 }
 
-getDiyRouteListFn();
+getDiyRouteListFn()
 
 /**
  * 获取自定义路由列表
@@ -160,21 +160,21 @@ const loadDiyRouteList = (page: number = 1) => {
     diyRouteTableData.page = page
 
     const tempData = cloneDeep(diyRouteList.value)
-    const data: any = [];
+    const data: any = []
 
     // 筛选条件
     for (let i = 0; i < tempData.length; i++) {
-        let isAdd = true;
+        let isAdd = true
         if (diyRouteTableData.searchParam.title && tempData[i].title.indexOf(diyRouteTableData.searchParam.title) == -1) {
-            isAdd = false;
+            isAdd = false
         }
 
         if (diyRouteTableData.searchParam.addon_name && tempData[i].addon_info && tempData[i].addon_info.key != diyRouteTableData.searchParam.addon_name) {
-            isAdd = false;
+            isAdd = false
         }
 
         if (isAdd) {
-            data.push(tempData[i]);
+            data.push(tempData[i])
         }
     }
 
@@ -271,10 +271,12 @@ const openShare = async (row: any) => {
 
     shareFormId.value = row.id
     sharePage.value = row.title
-    const share = row.share ? JSON.parse(row.share) : {
-        wechat: { title: '', desc: '', url: '' },
-        weapp: { title: '', url: '' }
-    }
+    const share = row.share
+        ? JSON.parse(row.share)
+        : {
+            wechat: { title: '', desc: '', url: '' },
+            weapp: { title: '', url: '' }
+        }
     if (share) {
         shareFormData.wechat = share.wechat
         shareFormData.weapp = share.weapp
diff --git a/admin/src/app/views/diy_form/components/edit-form-checkbox.vue b/admin/src/app/views/diy_form/components/edit-form-checkbox.vue
index eb4d0d0b9..e150fa6b8 100644
--- a/admin/src/app/views/diy_form/components/edit-form-checkbox.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-checkbox.vue
@@ -79,7 +79,7 @@ import { ref, onMounted, nextTick } from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
-import { ElMessage } from "element-plus";
+import { ElMessage } from 'element-plus'
 
 const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
@@ -87,21 +87,21 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
     const res = { code: true, message: '' }
-    let pass = true;
+    let pass = true
     for (let i = 0; i < diyStore.value[index].options.length; i++) {
         if (!diyStore.value[index].options[i].text) {
-            res.code = false;
-            res.message = t('optionPlaceholder');
-            pass = false;
-            break;
+            res.code = false
+            res.message = t('optionPlaceholder')
+            pass = false
+            break
         }
     }
 
-    if (!pass) return res;
+    if (!pass) return res
 
-    let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
+    const uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
     if (uniqueOptions.length != diyStore.value[index].options.length) {
-        res.code = false;
+        res.code = false
         res.message = t('errorTipsOne')
     }
     return res
@@ -117,11 +117,11 @@ const addOption = () => {
     diyStore.editComponent.options.push({
         id: diyStore.generateRandom(),
         text: '选项' + (diyStore.editComponent.options.length + 1)
-    });
-};
+    })
+}
 
 const removeOption = (index: any) => {
-    diyStore.editComponent.options.splice(index, 1);
+    diyStore.editComponent.options.splice(index, 1)
 }
 
 // 批量添加选项
@@ -131,39 +131,39 @@ const batchAddOptions = () => {
             return {
                 id: diyStore.generateRandom(),
                 text: option.trim()
-            };
-        }).filter((option: any) => option.text !== '');
+            }
+        }).filter((option: any) => option.text !== '')
 
         // 去除重复的选项
-        const uniqueNewOptions = uniqueByKey(newOptions, 'text');
+        const uniqueNewOptions = uniqueByKey(newOptions, 'text')
 
         // 过滤掉已存在的选项
         const filteredNewOptions = uniqueNewOptions.filter((newOption: any) =>
             !diyStore.editComponent.options.some((existingOption: any) => existingOption.text === newOption.text)
-        );
+        )
 
         // 如果有新的选项，添加到选项列表中
         if (filteredNewOptions.length > 0) {
-            diyStore.editComponent.options.push(...filteredNewOptions);
+            diyStore.editComponent.options.push(...filteredNewOptions)
         } else {
             ElMessage({
                 message: t('errorTipsTwo'),
-                type: "error",
-            });
+                type: 'error'
+            })
         }
 
-        optionsValue.value = '';
-        visible.value = false;
+        optionsValue.value = ''
+        visible.value = false
     }
-};
+}
 
 // 数组去重
 const uniqueByKey = (arr: any, key: any) => {
-    const seen = new Set();
+    const seen = new Set()
     return arr.filter((item: any) => {
-        const serializedKey = JSON.stringify(item[key]);
-        return seen.has(serializedKey) ? false : seen.add(serializedKey);
-    });
+        const serializedKey = JSON.stringify(item[key])
+        return seen.has(serializedKey) ? false : seen.add(serializedKey)
+    })
 }
 
 const formCheckboxRef = ref()
diff --git a/admin/src/app/views/diy_form/components/edit-form-date-scope.vue b/admin/src/app/views/diy_form/components/edit-form-date-scope.vue
index c9644f881..379405b4b 100644
--- a/admin/src/app/views/diy_form/components/edit-form-date-scope.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-date-scope.vue
@@ -110,7 +110,7 @@ diyStore.editComponent.verify = (index: number) => {
     let starTime = diyStore.value[index].field.default.start.date
     let endTime = diyStore.value[index].field.default.end.date
 
-    let today = new Date()
+    const today = new Date()
     const hours = String(today.getHours()).padStart(2, '0')
     const minutes = String(today.getMinutes()).padStart(2, '0')
 
@@ -162,8 +162,8 @@ const disabledEndDate = (time: Date) => {
 }
 
 onMounted(() => {
-    let today = new Date()
-    let endDate = new Date()
+    const today = new Date()
+    const endDate = new Date()
     endDate.setDate(endDate.getDate() + 7) // 设置日期为7天后的日期
 
     if (diyStore.editComponent.field.default.start.timestamp) {
@@ -176,16 +176,16 @@ onMounted(() => {
         diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000)
     }
 
-    let year = today.getFullYear()
-    let month = String(today.getMonth() + 1).padStart(2, '0')
-    let day = String(today.getDate()).padStart(2, '0')
+    const year = today.getFullYear()
+    const month = String(today.getMonth() + 1).padStart(2, '0')
+    const day = String(today.getDate()).padStart(2, '0')
 
     const hours = String(today.getHours()).padStart(2, '0')
     const minutes = String(today.getMinutes()).padStart(2, '0')
-    dateFormat.format1 = `${ year }年${ month }月${ day }日`
-    dateFormat.format2 = `${ year }-${ month }-${ day }`
-    dateFormat.format3 = `${ year }/${ month }/${ day }`
-    dateFormat.format4 = `${ year }-${ month }-${ day } ${ hours }:${ minutes }`
+    dateFormat.format1 = `${year}年${month}月${day}日`
+    dateFormat.format2 = `${year}-${month}-${day}`
+    dateFormat.format3 = `${year}/${month}/${day}`
+    dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
 })
 
 // 开始日期选择器
@@ -193,7 +193,7 @@ const startDateChange = (date) => {
     diyStore.editComponent.field.default.start.date = date
     diyStore.editComponent.field.default.start.timestamp = timeTurnTimeStamp(date)
 
-    let endDate = new Date(date)
+    const endDate = new Date(date)
     endDate.setDate(endDate.getDate() + 7)
     diyStore.editComponent.field.default.end.date = endDate.toISOString().split('T')[0]
     diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000)
diff --git a/admin/src/app/views/diy_form/components/edit-form-date.vue b/admin/src/app/views/diy_form/components/edit-form-date.vue
index 6e636424e..2ebf2708e 100644
--- a/admin/src/app/views/diy_form/components/edit-form-date.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-date.vue
@@ -68,30 +68,30 @@ const dateFormat: any = reactive({
     format2: '',
     format3: '',
     format4: ''
-});
+})
 
 onMounted(() => {
     // 初始赋值当天日期
-    const today = new Date();
+    const today = new Date()
     if (!diyStore.editComponent.field.default.date) {
-        diyStore.editComponent.field.default.date = today.toISOString().split('T')[0];
-        diyStore.editComponent.field.default.timestamp = today.getTime() / 1000;
+        diyStore.editComponent.field.default.date = today.toISOString().split('T')[0]
+        diyStore.editComponent.field.default.timestamp = today.getTime() / 1000
     }
-    let year = today.getFullYear();
-    let month = String(today.getMonth() + 1).padStart(2, '0');
-    let day = String(today.getDate()).padStart(2, '0');
+    const year = today.getFullYear()
+    const month = String(today.getMonth() + 1).padStart(2, '0')
+    const day = String(today.getDate()).padStart(2, '0')
 
-    const hours = String(today.getHours()).padStart(2, '0');
-    const minutes = String(today.getMinutes()).padStart(2, '0');
-    dateFormat.format1 = `${ year }年${ month }月${ day }日`;
-    dateFormat.format2 = `${ year }-${ month }-${ day }`;
-    dateFormat.format3 = `${ year }/${ month }/${ day }`;
-    dateFormat.format4 = `${ year }-${ month }-${ day } ${ hours }:${ minutes }`;
-});
+    const hours = String(today.getHours()).padStart(2, '0')
+    const minutes = String(today.getMinutes()).padStart(2, '0')
+    dateFormat.format1 = `${year}年${month}月${day}日`
+    dateFormat.format2 = `${year}-${month}-${day}`
+    dateFormat.format3 = `${year}/${month}/${day}`
+    dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
+})
 
 const dateChange = (date: any) => {
-    diyStore.editComponent.field.default.date = date;
-    diyStore.editComponent.field.default.timestamp = timeTurnTimeStamp(date);
+    diyStore.editComponent.field.default.date = date
+    diyStore.editComponent.field.default.timestamp = timeTurnTimeStamp(date)
 }
 
 defineExpose({})
diff --git a/admin/src/app/views/diy_form/components/edit-form-number.vue b/admin/src/app/views/diy_form/components/edit-form-number.vue
index ffecc7983..64a426ab2 100644
--- a/admin/src/app/views/diy_form/components/edit-form-number.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-number.vue
@@ -94,10 +94,10 @@ diyStore.editComponent.verify = (index: number) => {
     const res = { code: true, message: '' }
     if (diyStore.value[index].field.default) {
         if (isNaN(diyStore.value[index].field.default) || !regExp.digit.test(diyStore.value[index].field.default)) {
-            res.code = false;
-            res.message = t('defaultErrorTips');
+            res.code = false
+            res.message = t('defaultErrorTips')
         } else if (diyStore.value[index].field.default < 0) {
-            res.code = false;
+            res.code = false
             res.message = t('defaultMustZeroTips')
         }
     }
diff --git a/admin/src/app/views/diy_form/components/edit-form-radio.vue b/admin/src/app/views/diy_form/components/edit-form-radio.vue
index 1593cf2be..e17b82df9 100644
--- a/admin/src/app/views/diy_form/components/edit-form-radio.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-radio.vue
@@ -99,7 +99,7 @@ import { ref, onMounted, nextTick } from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
-import { ElMessage } from "element-plus";
+import { ElMessage } from 'element-plus'
 
 const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
@@ -107,22 +107,22 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
     const res = { code: true, message: '' }
-    let pass = true;
+    let pass = true
     for (let i = 0; i < diyStore.value[index].options.length; i++) {
         if (!diyStore.value[index].options[i].text) {
-            res.code = false;
-            res.message = t('optionPlaceholder');
-            pass = false;
-            break;
+            res.code = false
+            res.message = t('optionPlaceholder')
+            pass = false
+            break
         }
     }
 
-    if (!pass) return res;
+    if (!pass) return res
 
-    let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
+    const uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
 
     if (uniqueOptions.length != diyStore.value[index].options.length) {
-        res.code = false;
+        res.code = false
         res.message = t('errorTipsOne')
     }
     return res
@@ -138,11 +138,11 @@ const addOption = () => {
     diyStore.editComponent.options.push({
         id: diyStore.generateRandom(),
         text: '选项' + (diyStore.editComponent.options.length + 1)
-    });
-};
+    })
+}
 
 const removeOption = (index: any) => {
-    diyStore.editComponent.options.splice(index, 1);
+    diyStore.editComponent.options.splice(index, 1)
 }
 
 const batchAddOptions = () => {
@@ -151,39 +151,39 @@ const batchAddOptions = () => {
             return {
                 id: diyStore.generateRandom(),
                 text: option.trim()
-            };
-        }).filter((option: any) => option.text !== '');
+            }
+        }).filter((option: any) => option.text !== '')
 
         // 去除重复的选项
-        const uniqueNewOptions = uniqueByKey(newOptions, 'text');
+        const uniqueNewOptions = uniqueByKey(newOptions, 'text')
 
         // 过滤掉已存在的选项
         const filteredNewOptions = uniqueNewOptions.filter(newOption =>
             !diyStore.editComponent.options.some(existingOption => existingOption.text === newOption.text)
-        );
+        )
 
         // 如果有新的选项，添加到选项列表中
         if (filteredNewOptions.length > 0) {
-            diyStore.editComponent.options.push(...filteredNewOptions);
+            diyStore.editComponent.options.push(...filteredNewOptions)
         } else {
             ElMessage({
                 message: t('errorTipsTwo'),
-                type: "warning",
-            });
+                type: 'warning'
+            })
         }
 
-        optionsValue.value = '';
-        visible.value = false;
+        optionsValue.value = ''
+        visible.value = false
     }
-};
+}
 
 // 数组去重
 const uniqueByKey = (arr: any, key: any) => {
-    const seen = new Set();
+    const seen = new Set()
     return arr.filter((item: any) => {
-        const serializedKey = JSON.stringify(item[key]);
-        return seen.has(serializedKey) ? false : seen.add(serializedKey);
-    });
+        const serializedKey = JSON.stringify(item[key])
+        return seen.has(serializedKey) ? false : seen.add(serializedKey)
+    })
 }
 
 const formRadioRef = ref()
diff --git a/admin/src/app/views/diy_form/components/edit-form-submit.vue b/admin/src/app/views/diy_form/components/edit-form-submit.vue
index ff510a3a1..652be169e 100644
--- a/admin/src/app/views/diy_form/components/edit-form-submit.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-submit.vue
@@ -87,9 +87,9 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 // 单选
 const btnPositionChangeFn = (e) => {
     if (e == 'hover_screen_bottom') {
-        diyStore.editComponent.margin.bottom = 0;
-        diyStore.editComponent.margin.both = 0;
-        diyStore.editComponent.margin.top = 0;
+        diyStore.editComponent.margin.bottom = 0
+        diyStore.editComponent.margin.both = 0
+        diyStore.editComponent.margin.top = 0
     }
 }
 
@@ -97,14 +97,14 @@ const btnPositionChangeFn = (e) => {
 diyStore.editComponent.verify = (index: number) => {
     const res = { code: true, message: '' }
     if (diyStore.value[index].submitBtn.text == '') {
-        res.code = false;
-        res.message = t('submitBtnNamePlaceholder');
-        return res;
+        res.code = false
+        res.message = t('submitBtnNamePlaceholder')
+        return res
     }
     if (diyStore.value[index].resetBtn.text == '') {
-        res.code = false;
-        res.message = t('resetBtnNamePlaceholder');
-        return res;
+        res.code = false
+        res.message = t('resetBtnNamePlaceholder')
+        return res
     }
 
     return res
diff --git a/admin/src/app/views/diy_form/components/edit-form-table.vue b/admin/src/app/views/diy_form/components/edit-form-table.vue
index d83c2d172..ca055c0da 100644
--- a/admin/src/app/views/diy_form/components/edit-form-table.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-table.vue
@@ -166,7 +166,7 @@
 <script lang="ts" setup>
 import { t } from '@/lang'
 import Sortable from 'sortablejs'
-import { ref, watch, onMounted, nextTick ,reactive, computed} from 'vue'
+import { ref, watch, onMounted, nextTick, reactive, computed } from 'vue'
 import useDiyStore from '@/stores/modules/diy'
 import { range } from 'lodash-es'
 const diyStore = useDiyStore()
@@ -221,7 +221,7 @@ const addOption = (item) => {
         id: generateId(),
         name: item.label,
         type: item.value, // 列类型
-        value: ''         // 默认值（可选）
+        value: '' // 默认值（可选）
     }
 
     // 如果是单选项，初始化 options
@@ -233,11 +233,11 @@ const addOption = (item) => {
     }
     // 如果是日期，初始化 dateFormat
     if (item.value === 'date') {
-        newColumn.dateFormat  = 'YYYY年M月D日' // 默认日期格式
+        newColumn.dateFormat = 'YYYY年M月D日' // 默认日期格式
     }
     // 如果是地址，初始化 addressFormat
     if (item.value === 'address') {
-        newColumn.addressFormat  = 'province/city/district/address' // 默认日期格式
+        newColumn.addressFormat = 'province/city/district/address' // 默认日期格式
     }
 
     diyStore.editComponent.columnList.push(newColumn)
@@ -247,7 +247,6 @@ const removeOption = (index: number) => {
     diyStore.editComponent.columnList.splice(index, 1)
 }
 
-
 onMounted(() => {
     // nextTick(() => {
     //     if (diyStore.editComponent.columnList.length < 2) return;
@@ -266,8 +265,7 @@ onMounted(() => {
     //         }
     //     })
     // })
-    console.log(diyStore.editComponent.columnList);
-
+    console.log(diyStore.editComponent.columnList)
 })
 
 const activeColumn = ref<any>({}) // 真正数据（原始数据，不动它）
@@ -284,31 +282,31 @@ const dateFormat: any = reactive({
     format2: '',
     format3: '',
     format4: ''
-});
+})
 
 const openRadioDialog = (item, index) => {
     activeRadioIndex.value = index // 记录当前列的下标，方便确定时更新
     activeColumn.value = item
     activeColumnTemp.value = JSON.parse(JSON.stringify(item)) // 深拷贝，避免联动
-    if(item.type == 'radio'){
+    if (item.type == 'radio') {
         if (!activeColumnTemp.value.options) activeColumnTemp.value.options = []
         radioDialogVisible.value = true
         // nextTick(() => initRadioSortable()) // 拖拽初始化
-    }else if(item.type == 'date'){
+    } else if (item.type == 'date') {
         // 初始赋值当天日期
-    const today = new Date();
-    let year = today.getFullYear();
-    let month = String(today.getMonth() + 1).padStart(2, '0');
-    let day = String(today.getDate()).padStart(2, '0');
+        const today = new Date()
+        const year = today.getFullYear()
+        const month = String(today.getMonth() + 1).padStart(2, '0')
+        const day = String(today.getDate()).padStart(2, '0')
 
-    const hours = String(today.getHours()).padStart(2, '0');
-    const minutes = String(today.getMinutes()).padStart(2, '0');
-    dateFormat.format1 = `${ year }年${ month }月${ day }日`;
-    dateFormat.format2 = `${ year }-${ month }-${ day }`;
-    dateFormat.format3 = `${ year }/${ month }/${ day }`;
-    dateFormat.format4 = `${ year }-${ month }-${ day } ${ hours }:${ minutes }`;
-    radioDialogVisible.value = true
-    } else if(item.type == 'address'){
+        const hours = String(today.getHours()).padStart(2, '0')
+        const minutes = String(today.getMinutes()).padStart(2, '0')
+        dateFormat.format1 = `${year}年${month}月${day}日`
+        dateFormat.format2 = `${year}-${month}-${day}`
+        dateFormat.format3 = `${year}/${month}/${day}`
+        dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
+        radioDialogVisible.value = true
+    } else if (item.type == 'address') {
         radioDialogVisible.value = true
     }
 }
@@ -329,7 +327,7 @@ const openRadioDialog = (item, index) => {
 // }
 
 const handleDialogConfirm = () => {
-    console.log(activeColumnTemp.value);
+    console.log(activeColumnTemp.value)
 
     diyStore.editComponent.columnList[activeRadioIndex.value] = JSON.parse(JSON.stringify(activeColumnTemp.value)) // 同步副本到原数据
     radioDialogVisible.value = false // 关闭弹窗
@@ -351,11 +349,11 @@ const removeOptionItem = (index: number) => {
 
 // 数组去重
 const uniqueByKey = (arr: any, key: any) => {
-    const seen = new Set();
+    const seen = new Set()
     return arr.filter((item: any) => {
-        const serializedKey = JSON.stringify(item[key]);
-        return seen.has(serializedKey) ? false : seen.add(serializedKey);
-    });
+        const serializedKey = JSON.stringify(item[key])
+        return seen.has(serializedKey) ? false : seen.add(serializedKey)
+    })
 }
 // 批量添加
 const batchAddOptions = () => {
@@ -364,36 +362,31 @@ const batchAddOptions = () => {
             return {
                 id: diyStore.generateRandom(),
                 label: option.trim()
-            };
-        }).filter((option: any) => option.label !== '');
+            }
+        }).filter((option: any) => option.label !== '')
 
         // 去除重复的选项
-        const uniqueNewOptions = uniqueByKey(newOptions, 'label');
+        const uniqueNewOptions = uniqueByKey(newOptions, 'label')
 
         // 过滤掉已存在的选项
         const filteredNewOptions = uniqueNewOptions.filter(newOption =>
             !activeColumnTemp.value.options.some(existingOption => existingOption.label === newOption.label)
-        );
+        )
 
         // 如果有新的选项，添加到选项列表中
         if (filteredNewOptions.length > 0) {
-            activeColumnTemp.value.options.push(...filteredNewOptions);
+            activeColumnTemp.value.options.push(...filteredNewOptions)
         } else {
             ElMessage({
                 message: t('errorTipsTwo'),
-                type: "warning",
-            });
+                type: 'warning'
+            })
         }
 
-        optionsValue.value = '';
-        visible.value = false;
+        optionsValue.value = ''
+        visible.value = false
     }
-};
-
-
-
-
-
+}
 
 defineExpose({})
 
diff --git a/admin/src/app/views/diy_form/components/edit-form-time-scope.vue b/admin/src/app/views/diy_form/components/edit-form-time-scope.vue
index 1ec45865a..495a4b44c 100644
--- a/admin/src/app/views/diy_form/components/edit-form-time-scope.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-time-scope.vue
@@ -91,18 +91,18 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
     const res = { code: true, message: '' }
-    let starTime = diyStore.value[index].field.default.start.date;
-    let endTime = diyStore.value[index].field.default.end.date;
+    let starTime = diyStore.value[index].field.default.start.date
+    let endTime = diyStore.value[index].field.default.end.date
 
-    const today = new Date();
-    const hours = String(today.getHours()).padStart(2, '0');
-    const minutes = String(today.getMinutes()).padStart(2, '0');
+    const today = new Date()
+    const hours = String(today.getHours()).padStart(2, '0')
+    const minutes = String(today.getMinutes()).padStart(2, '0')
 
     if (diyStore.editComponent.start.timeWay == 'current') {
-        starTime = `${ hours }:${ minutes }`;
+        starTime = `${hours}:${minutes}`
     }
     if (diyStore.editComponent.end.timeWay == 'current') {
-        endTime = `${ hours }:${ minutes }`;
+        endTime = `${hours}:${minutes}`
     }
 
     if (diyStore.editComponent.start.defaultControl && starTime == '') {
@@ -125,51 +125,51 @@ diyStore.editComponent.verify = (index: number) => {
 }
 
 onMounted(() => {
-    const today = new Date();
-    const hours = String(today.getHours()).padStart(2, '0');
-    const minutes = String(today.getMinutes()).padStart(2, '0');
+    const today = new Date()
+    const hours = String(today.getHours()).padStart(2, '0')
+    const minutes = String(today.getMinutes()).padStart(2, '0')
 
     if (!diyStore.editComponent.field.default.start.date) {
-        diyStore.editComponent.field.default.start.date = `${ hours }:${ minutes }`;
-        diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(`${ hours }:${ minutes }`);
+        diyStore.editComponent.field.default.start.date = `${hours}:${minutes}`
+        diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(`${hours}:${minutes}`)
     }
     if (!diyStore.editComponent.field.default.end.date) {
-        let endDate = new Date();
-        endDate.setHours(today.getHours(), today.getMinutes() + 10, 0, 0); // 在当前时间基础上加 10 分钟
-        const endHours = String(endDate.getHours()).padStart(2, '0');
-        const endMinutes = String(endDate.getMinutes()).padStart(2, '0');
+        const endDate = new Date()
+        endDate.setHours(today.getHours(), today.getMinutes() + 10, 0, 0) // 在当前时间基础上加 10 分钟
+        const endHours = String(endDate.getHours()).padStart(2, '0')
+        const endMinutes = String(endDate.getMinutes()).padStart(2, '0')
 
-        diyStore.editComponent.field.default.end.date = `${ endHours }:${ endMinutes }`;
-        diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(`${ endHours }:${ endMinutes }`);
+        diyStore.editComponent.field.default.end.date = `${endHours}:${endMinutes}`
+        diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(`${endHours}:${endMinutes}`)
     }
-});
+})
 
 // 开始时间选择器
 const startTimePickerChange = (e) => {
-    diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(e);
+    diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(e)
 
-    const startTimeArr = e.split(":");
-    const date = new Date();
-    date.setHours(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]), 0, 0);
-    date.setMinutes(date.getMinutes() + 10);
-    const updatedEndTime = `${ String(date.getHours()).padStart(2, '0') }:${ String(date.getMinutes()).padStart(2, '0') }`;
-    diyStore.editComponent.field.default.end.date = updatedEndTime;
-    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(updatedEndTime);
+    const startTimeArr = e.split(':')
+    const date = new Date()
+    date.setHours(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]), 0, 0)
+    date.setMinutes(date.getMinutes() + 10)
+    const updatedEndTime = `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
+    diyStore.editComponent.field.default.end.date = updatedEndTime
+    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(updatedEndTime)
 }
 
 // 结束时间选择器
 const endTimePickerChange = (e) => {
-    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(e);
+    diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(e)
 }
 
 const disabledHours = () => {
-    let timeArr = diyStore.editComponent.field.default.start.date.split(":")
-    return makeRange(0, timeArr[0]);
+    const timeArr = diyStore.editComponent.field.default.start.date.split(':')
+    return makeRange(0, timeArr[0])
 }
 
 const disabledMinutes = (hour: number) => {
-    let timeArr = diyStore.editComponent.field.default.start.date.split(":")
-    return makeRange(0, timeArr[1]);
+    const timeArr = diyStore.editComponent.field.default.start.date.split(':')
+    return makeRange(0, timeArr[1])
 }
 
 const makeRange = (start: number, end: number) => {
@@ -181,18 +181,18 @@ const makeRange = (start: number, end: number) => {
 }
 
 const timeInvertSecond = (time: any) => {
-    let arr = time.split(":");
-    let num = 0;
+    const arr = time.split(':')
+    let num = 0
     if (arr[0]) {
-        num += arr[0] * 60 * 60;
+        num += arr[0] * 60 * 60
     }
     if (arr[1]) {
-        num += arr[1] * 60;
+        num += arr[1] * 60
     }
     if (arr[2]) {
-        num += arr[2];
+        num += arr[2]
     }
-    return num;
+    return num
 }
 
 defineExpose({})
diff --git a/admin/src/app/views/diy_form/components/edit-form-time.vue b/admin/src/app/views/diy_form/components/edit-form-time.vue
index 753180ae9..107e75aee 100644
--- a/admin/src/app/views/diy_form/components/edit-form-time.vue
+++ b/admin/src/app/views/diy_form/components/edit-form-time.vue
@@ -56,31 +56,31 @@ diyStore.editComponent.verify = (index: number) => {
 onMounted(() => {
     // 初始赋值当天时间
     if (!diyStore.editComponent.field.default) {
-        const today = new Date();
-        const hours = String(today.getHours()).padStart(2, '0');
-        const minutes = String(today.getMinutes()).padStart(2, '0');
-        diyStore.editComponent.field.default = `${ hours }:${ minutes }`;
+        const today = new Date()
+        const hours = String(today.getHours()).padStart(2, '0')
+        const minutes = String(today.getMinutes()).padStart(2, '0')
+        diyStore.editComponent.field.default = `${hours}:${minutes}`
     }
-});
+})
 
 const changeDateDefaultControl = (val: any) => {
     if (val) {
-        const today = new Date();
-        const hours = String(today.getHours()).padStart(2, '0');
-        const minutes = String(today.getMinutes()).padStart(2, '0');
-        diyStore.editComponent.field.default = `${ hours }:${ minutes }`;
+        const today = new Date()
+        const hours = String(today.getHours()).padStart(2, '0')
+        const minutes = String(today.getMinutes()).padStart(2, '0')
+        diyStore.editComponent.field.default = `${hours}:${minutes}`
     }
 }
 
 watch(
     () => diyStore.editComponent.timeWay,
     (newVal) => {
-        const today = new Date();
-        const hours = String(today.getHours()).padStart(2, '0');
-        const minutes = String(today.getMinutes()).padStart(2, '0');
-        diyStore.editComponent.field.default = `${ hours }:${ minutes }`;
+        const today = new Date()
+        const hours = String(today.getHours()).padStart(2, '0')
+        const minutes = String(today.getMinutes()).padStart(2, '0')
+        diyStore.editComponent.field.default = `${hours}:${minutes}`
     }
-);
+)
 
 defineExpose({})
 
diff --git a/admin/src/app/views/diy_form/components/form-select-content.vue b/admin/src/app/views/diy_form/components/form-select-content.vue
index e245cab7b..5842836c7 100644
--- a/admin/src/app/views/diy_form/components/form-select-content.vue
+++ b/admin/src/app/views/diy_form/components/form-select-content.vue
@@ -39,7 +39,7 @@
 import { reactive, ref, nextTick } from 'vue'
 import { t } from '@/lang'
 import { getFormType, getDiyFormSelectPageList } from '@/app/api/diy_form'
-import { FormInstance, ElMessage } from "element-plus";
+import { FormInstance, ElMessage } from 'element-plus'
 
 const prop = defineProps({
     formId: {
@@ -52,7 +52,7 @@ const formType: any = reactive({}) // 表单类型
 
 const searchFormRef = ref<FormInstance>()
 
-const tableRef = ref();
+const tableRef = ref()
 
 const tableData: any = reactive({
     page: 1,
@@ -102,8 +102,8 @@ const loadList = (page: number = 1) => {
 // 获取万能表单类型
 const loadFormType = (addon = '') => {
     getFormType({}).then(res => {
-        for (let key in formType) {
-            delete formType[key];
+        for (const key in formType) {
+            delete formType[key]
         }
 
         for (const key in res.data) {
@@ -112,7 +112,7 @@ const loadFormType = (addon = '') => {
     })
 }
 
-loadFormType();
+loadFormType()
 loadList()
 
 const handleCheckChange = (isSelect: any, row: any) => {
@@ -147,14 +147,14 @@ const getData = () => {
     if (selectData.form_id == 0) {
         ElMessage({
             type: 'warning',
-            message: `${ t('formSelectContentTips') }`
+            message: `${t('formSelectContentTips')}`
         })
-        return;
+        return
     }
     return {
         name: 'DIY_FORM',
         title: selectData.page_title,
-        url: `/app/pages/index/diy_form?form_id=${ selectData.form_id }`,
+        url: `/app/pages/index/diy_form?form_id=${selectData.form_id}`,
         action: '',
         formId: selectData.form_id
     }
diff --git a/admin/src/app/views/diy_form/edit.vue b/admin/src/app/views/diy_form/edit.vue
index aa98813af..7fe74962a 100644
--- a/admin/src/app/views/diy_form/edit.vue
+++ b/admin/src/app/views/diy_form/edit.vue
@@ -746,7 +746,7 @@ const initLoad = () => {
 
 // 验证表单组件公共属性
 const verifyFormComponent = () => {
-    for (var i = 0; i < diyStore.value.length; i++) {
+    for (let i = 0; i < diyStore.value.length; i++) {
         try {
             if (diyStore.value[i].componentType == 'diy_form' && diyStore.value[i].componentName != 'FormSubmit' && diyStore.value[i].field.name == '') {
                 diyStore.changeCurrentIndex(i, diyStore.value[i])
diff --git a/admin/src/app/views/diy_form/list.vue b/admin/src/app/views/diy_form/list.vue
index 7cb7215e0..b16cdcf19 100644
--- a/admin/src/app/views/diy_form/list.vue
+++ b/admin/src/app/views/diy_form/list.vue
@@ -176,10 +176,10 @@
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { getFormType, getApps, getDiyFormPageList, deleteDiyForm, editDiyFormShare, editFormStatus, copyForm } from '@/app/api/diy_form'
-import { FormInstance, ElMessage, ElMessageBox } from "element-plus";
+import { FormInstance, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
-import { img } from '@/utils/common'
+import { setTablePageStorage, getTablePageStorage, img } from '@/utils/common'
+
 import recordsDetail from '@/app/views/diy_form/records.vue'
 import formSubmitPopup from '@/app/views/diy_form/components/form-submit-popup.vue'
 import formWritePopup from '@/app/views/diy_form/components/form-write-popup.vue'
@@ -198,12 +198,12 @@ const formData = reactive({
     type: ''
 })
 
-//详情
+// 详情
 const recordsDetailDialog: Record<string, any> | null = ref(null)
-const detailEvent=(row: any)=>{
-    let data = {form_id: row.form_id};
-    recordsDetailDialog.value.setFormData(data);
-    recordsDetailDialog.value.showDialog = true;
+const detailEvent = (row: any) => {
+    const data = { form_id: row.form_id }
+    recordsDetailDialog.value.setFormData(data)
+    recordsDetailDialog.value.showDialog = true
 }
 
 // 表单验证规则
@@ -223,7 +223,7 @@ const dialogVisible = ref(false)
 const addEvent = async (formEl: FormInstance | undefined) => {
     if (!formEl) return
 
-    await formEl.validate(async(valid) => {
+    await formEl.validate(async (valid) => {
         if (valid) {
             const query = { type: formData.type } // , title: formData.title
             const url = router.resolve({
@@ -250,10 +250,10 @@ const showClick = (row: any) => {
 }
 
 // 获取万能表单类型
-const loadFormType = (addon = '')=> {
+const loadFormType = (addon = '') => {
     getFormType({}).then(res => {
-        for (let key in formType) {
-            delete formType[key];
+        for (const key in formType) {
+            delete formType[key]
         }
 
         for (const key in res.data) {
@@ -263,7 +263,7 @@ const loadFormType = (addon = '')=> {
     })
 }
 
-loadFormType();
+loadFormType()
 
 const apps: any = reactive({}) // 应用插件列表
 
@@ -278,7 +278,7 @@ const apps: any = reactive({}) // 应用插件列表
 
 // 根据所属插件，查询表单类型
 const handleSelectAddonChange = (value: any) => {
-    diyFormTableData.searchParam.type = '';
+    diyFormTableData.searchParam.type = ''
     loadFormType(value)
 }
 
@@ -311,16 +311,16 @@ const loadDiyFormList = (page: number = 1) => {
         diyFormTableData.loading = false
         diyFormTableData.data = res.data.data
         diyFormTableData.total = res.data.total
-        setTablePageStorage(diyFormTableData.page, diyFormTableData.limit, diyFormTableData.searchParam);
+        setTablePageStorage(diyFormTableData.page, diyFormTableData.limit, diyFormTableData.searchParam)
     }).catch(() => {
         diyFormTableData.loading = false
     })
 }
 
-loadDiyFormList(getTablePageStorage(diyFormTableData.searchParam).page);
+loadDiyFormList(getTablePageStorage(diyFormTableData.searchParam).page)
 
 const selectType = (index: number) => {
-    formData.type = index.toString();
+    formData.type = index.toString()
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
@@ -350,7 +350,7 @@ const copyEvent = (id: any) => {
         if (repeat.value) return
         repeat.value = true
 
-        copyForm({form_id: id}).then((res: any) => {
+        copyForm({ form_id: id }).then((res: any) => {
             if (res.code == 1) {
                 loadDiyFormList()
             }
@@ -377,74 +377,74 @@ const deleteEvent = (form_id: number) => {
     })
 }
 // 批量复选框
-const toggleCheckbox = ref();
+const toggleCheckbox = ref()
 
 // 复选框中间状态
-const isIndeterminate = ref(false);
+const isIndeterminate = ref(false)
 
 // 监听批量复选框事件
 const toggleChange = (value: any) => {
-  isIndeterminate.value = false;
-  diyFormListTableRef.value.toggleAllSelection();
-};
+    isIndeterminate.value = false
+    diyFormListTableRef.value.toggleAllSelection()
+}
 
-const diyFormListTableRef = ref();
+const diyFormListTableRef = ref()
 
 // 选中数据
-const multipleSelection: any = ref([]);
+const multipleSelection: any = ref([])
 
 // 监听表格单行选中
 const handleSelectionChange = (val: []) => {
-    multipleSelection.value = val;
+    multipleSelection.value = val
 
-    toggleCheckbox.value = false;
+    toggleCheckbox.value = false
     if (
         multipleSelection.value.length > 0 &&
         multipleSelection.value.length < diyFormTableData.data.length
     ) {
-        isIndeterminate.value = true;
+        isIndeterminate.value = true
     } else {
-        isIndeterminate.value = false;
+        isIndeterminate.value = false
     }
 
     if (multipleSelection.value.length == diyFormTableData.data.length) {
-        toggleCheckbox.value = true;
+        toggleCheckbox.value = true
     }
-};
+}
 
 // 批量删除
 const batchDeleteForms = () => {
     if (multipleSelection.value.length == 0) {
         ElMessage({
-        type: "warning",
-        message: `${t("batchEmptySelectedFormsTips")}`,
-        });
-        return;
+            type: 'warning',
+            message: `${t('batchEmptySelectedFormsTips')}`
+        })
+        return
     }
 
-    ElMessageBox.confirm(t("batchFormsDeleteTips"), t("warning"), {
-        confirmButtonText: t("confirm"),
-        cancelButtonText: t("cancel"),
-        type: "warning",
+    ElMessageBox.confirm(t('batchFormsDeleteTips'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning'
     }).then(() => {
-        if (repeat.value) return;
-        repeat.value = true;
+        if (repeat.value) return
+        repeat.value = true
 
-        const form_ids: any = [];
+        const form_ids: any = []
         multipleSelection.value.forEach((item: any) => {
-            form_ids.push(item.form_id);
-        });
+            form_ids.push(item.form_id)
+        })
 
         deleteDiyForm({
-            form_ids: form_ids,
+            form_ids
         }).then(() => {
-            loadDiyFormList();
-        repeat.value = false;
+            loadDiyFormList()
+            repeat.value = false
         }).catch(() => {
-        repeat.value = false;
-        });
-    });
-};
+            repeat.value = false
+        })
+    })
+}
 
 // 跳转去预览
 const toPreview = (data: any) => {
@@ -453,7 +453,7 @@ const toPreview = (data: any) => {
         query: {
             page: '/app/pages/index/diy_form?form_id=' + data.form_id
         }
-    });
+    })
     window.open(url.href)
 }
 
@@ -509,16 +509,15 @@ const shareEvent = async (formEl: FormInstance | undefined) => {
 const spreadPopupRef = ref(null)
 
 const spreadEvent = (data: any) => {
-    const pagePath = "/app/pages/index/diy_form"
-    const columnName = "form_id"
-    const columnValue = data.form_id
-    const title = "表单推广"
-    const folder = "diy_form"
-
-    spreadPopupRef.value?.show(pagePath, columnName, columnValue, title,folder)
+    const pagePath = '/app/pages/index/diy_form'
+    const paramsArr = [
+        { name: 'form_id', value: data.form_id },
+    ];
+    const title = '表单推广'
+    const folder = 'diy_form'
+    spreadPopupRef.value?.show(pagePath, paramsArr, title, folder);
 }
 
-
 // 表单提交成功页弹出框
 const formSubmitPopupRef: any = ref(null)
 
@@ -545,7 +544,7 @@ const handleExportClose = (val) => {
 }
 
 const diyFormDetailData: any = reactive({
-    form_id: 0,
+    form_id: 0
 })
 const exportEvent = (data: any) => {
     diyFormDetailData.form_id = data.form_id
diff --git a/admin/src/app/views/diy_form/records.vue b/admin/src/app/views/diy_form/records.vue
index 957373148..59fc02a97 100644
--- a/admin/src/app/views/diy_form/records.vue
+++ b/admin/src/app/views/diy_form/records.vue
@@ -181,7 +181,7 @@
 <script lang="ts" setup>
 import { reactive, ref, defineAsyncComponent } from 'vue'
 import { t } from '@/lang'
-import { getDiyFormFieldsList, getDiyFormFieldStat, getFormRecords,getFormRecordsInfo,deleteFormRecords,getFormRecordsMember} from '@/app/api/diy_form'
+import { getDiyFormFieldsList, getDiyFormFieldStat, getFormRecords, getFormRecordsInfo, deleteFormRecords, getFormRecordsMember } from '@/app/api/diy_form'
 import { useRouter } from 'vue-router'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
@@ -195,7 +195,7 @@ const searchFormDiyFormRef = ref<FormInstance>()
 const searchFormDiyMemberRef = ref<FormInstance>()
 const searchFormDiyFieldsRef = ref<FormInstance>()
 const handleClose = (done: () => void) => {
-    showDialog.value = false;
+    showDialog.value = false
 }
 
 const formData = reactive({
@@ -220,7 +220,7 @@ const getDiyFormFieldsListFn = (form_id: any) => {
         order: 'field_id',
         sort: 'asc'
     }).then((res: any) => {
-        formFieldsList.value = res.data;
+        formFieldsList.value = res.data
     })
 }
 
@@ -230,7 +230,7 @@ const getDiyFormFieldStatFn = (form_id: any) => {
     getDiyFormFieldStat({
         form_id
     }).then((res: any) => {
-        formFieldsStat.value = res.data;
+        formFieldsStat.value = res.data
     })
 }
 
@@ -238,7 +238,7 @@ const modules: any = import.meta.glob('@/**/*.vue')
 const formDetail = ref([])
 
 const formDetailEvent = (row: any) => {
-    getFormRecordsInfo(row.record_id).then((res:any)=>{
+    getFormRecordsInfo(row.record_id).then((res:any) => {
         formDetail.value = res.data.value
         dialogVisible.value = true
     })
@@ -257,7 +257,7 @@ const deleteEvent = (row: any) => {
             record_id: row.record_id,
             form_id: row.form_id
         }).then(() => {
-            initData();
+            initData()
         })
     })
 }
@@ -273,7 +273,7 @@ const resetFormMember = (formEl: FormInstance | undefined) => {
     getFormRecordsMemberFn()
 }
 
-const loadFormRecordsListFn= (page: number = 1)=> {
+const loadFormRecordsListFn = (page: number = 1) => {
     formData.loading = true
     formData.page = page
     getFormRecords({
@@ -284,7 +284,7 @@ const loadFormRecordsListFn= (page: number = 1)=> {
         formData.loading = false
         formData.data = res.data.data
         formData.data.forEach((item: any) => {
-            for (let key: any in item.recordsFieldList) {
+            for (const key: any in item.recordsFieldList) {
                 if (modules[item.recordsFieldList[key].detailComponent]) {
                     item.recordsFieldList[key].detailComponent && (item.recordsFieldList[key].detailComponent = defineAsyncComponent(modules[item.recordsFieldList[key].detailComponent]))
                 }
@@ -315,32 +315,32 @@ const getFormRecordsMemberFn = (page: number = 1) => {
         limit: formMemberList.limit,
         ...formMemberList.searchParam
     }).then((res: any) => {
-        formMemberList.data = res.data.data;
-        formMemberList.total = res.total;
-        formMemberList.loading = false;
+        formMemberList.data = res.data.data
+        formMemberList.total = res.total
+        formMemberList.loading = false
     }).catch((error) => {
-        formMemberList.loading = false;
+        formMemberList.loading = false
     })
 }
 
-//查看会员详情
+// 查看会员详情
 const detailEvent = (member_id:number) => {
-    let routeData = router.resolve(`/member/detail?id=${ member_id }`)
-    window.open(routeData.href, ' blank');
+    const routeData = router.resolve(`/member/detail?id=${member_id}`)
+    window.open(routeData.href, ' blank')
 }
 
 const setFormData = async (row: any = null) => {
-    formId.value = row.form_id;
-    formData.searchParam.form_id = row.form_id;
-    formMemberList.searchParam.form_id = row.form_id;
+    formId.value = row.form_id
+    formData.searchParam.form_id = row.form_id
+    formMemberList.searchParam.form_id = row.form_id
 
-    getDiyFormFieldsListFn(row.form_id);
-    initData();
+    getDiyFormFieldsListFn(row.form_id)
+    initData()
 }
 
 const initData = () => {
-    getFormRecordsMemberFn();
-    getDiyFormFieldStatFn(formId.value);
+    getFormRecordsMemberFn()
+    getDiyFormFieldStatFn(formId.value)
     loadFormRecordsListFn()
 }
 
diff --git a/admin/src/app/views/finance/cash_out.vue b/admin/src/app/views/finance/cash_out.vue
index a3cee50a4..4e532abf2 100644
--- a/admin/src/app/views/finance/cash_out.vue
+++ b/admin/src/app/views/finance/cash_out.vue
@@ -45,7 +45,7 @@
                     </el-form-item>
 
                     <el-form-item :label="t('memberInfo')" prop="keywords">
-                        <el-input v-model.trim="orderTableData.searchParam.keywords" class="w-[240px]"
+                        <el-input v-model.trim="orderTableData.searchParam.keywords" class="!w-[230px]"
                             :placeholder="t('memberInfoPlaceholder')" />
                     </el-form-item>
 
diff --git a/admin/src/app/views/finance/components/refund-detail.vue b/admin/src/app/views/finance/components/refund-detail.vue
index 2b0a44e6b..c7e0020a4 100644
--- a/admin/src/app/views/finance/components/refund-detail.vue
+++ b/admin/src/app/views/finance/components/refund-detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="showDialog" title="退款详情" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+    <el-drawer v-model="showDialog" title="退款详情" direction="rtl" :before-close="handleClose" size="1300px">
         <div class="main-container" v-loading="loading">
             <div class="relative" v-if="formData">
                 <div class="flex mb-[20px] justify-between text-[15px]">
@@ -152,8 +152,4 @@ defineExpose({
     setFormData
 })
 </script>
-<style lang="scss">
-.member-detail-drawer{
-    width: 1300px !important;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/finance/pay_refund.vue b/admin/src/app/views/finance/pay_refund.vue
index be09e882c..60947cf95 100644
--- a/admin/src/app/views/finance/pay_refund.vue
+++ b/admin/src/app/views/finance/pay_refund.vue
@@ -62,7 +62,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getPayRefundPages ,getRefundStatus} from '@/app/api/pay'
+import { getPayRefundPages, getRefundStatus } from '@/app/api/pay'
 import { useRoute } from 'vue-router'
 import type { FormInstance } from 'element-plus'
 import refundDetail from '@/app/views/finance/components/refund-detail.vue'
@@ -114,9 +114,9 @@ const handleMessage = () => {
 }
 const refundDetailDialog: Record<string, any> | null = ref(null)
 const infoEvent = (res:any) => {
-    let data = {no: res.refund_no};
-    refundDetailDialog.value.setFormData(data);
-    refundDetailDialog.value.showDialog = true;
+    const data = { no: res.refund_no }
+    refundDetailDialog.value.setFormData(data)
+    refundDetailDialog.value.showDialog = true
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
diff --git a/admin/src/app/views/index/app_manage.vue b/admin/src/app/views/index/app_manage.vue
index 74c5f58ed..7a423c325 100644
--- a/admin/src/app/views/index/app_manage.vue
+++ b/admin/src/app/views/index/app_manage.vue
@@ -132,7 +132,7 @@ const toAppStore = () => {
 }
 
 .app-item {
-    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.18);
 }
 .app-item:hover .app-item-head{
     background-color: #FDF4EF;
diff --git a/admin/src/app/views/index/preview.vue b/admin/src/app/views/index/preview.vue
index c61d65239..255a5285c 100644
--- a/admin/src/app/views/index/preview.vue
+++ b/admin/src/app/views/index/preview.vue
@@ -83,11 +83,10 @@ setLayout('decorate')
 getUrl().then((res: any) => {
     wapUrl.value = res.data.wap_url
 
-    let repeat = true; // 防重复执行
+    let repeat = true // 防重复执行
 
     // 开发模式下执行
     if (import.meta.env.MODE == 'development') {
-
         wapDomain.value = res.data.wap_domain
 
         // env文件配置过wap域名
@@ -105,10 +104,9 @@ getUrl().then((res: any) => {
         }
     }
 
-    if(repeat) {
+    if (repeat) {
         setDomain()
     }
-
 })
 
 const save = () => {
@@ -134,7 +132,7 @@ const setDomain = () => {
             wapImage.value = url
         })
 
-        const send = ()=>{
+        const send = () => {
             timeIframe.value = new Date().getTime()
             postMessage()
         }
@@ -143,17 +141,17 @@ const setDomain = () => {
         send()
 
         // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
-        let sendCount = 0;
-        let timeInterVal = setInterval(()=>{
+        let sendCount = 0
+        const timeInterVal = setInterval(() => {
             // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
-            if(uniAppLoadStatus.value || sendCount >= 50){
+            if (uniAppLoadStatus.value || sendCount >= 50) {
                 clearInterval(timeInterVal)
                 return
             }
 
             send()
-            sendCount++;
-        },200)
+            sendCount++
+        }, 200)
 
         // 如果10秒内加载不出来，则需要配置域名
         setTimeout(() => {
@@ -168,17 +166,17 @@ const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加载完
 window.addEventListener('message', (event) => {
     try {
         let data = {
-            type :''
-        };
-        if(typeof event.data == 'string') {
+            type: ''
+        }
+        if (typeof event.data == 'string') {
             data = JSON.parse(event.data)
-        }else if(typeof event.data == 'object') {
+        } else if (typeof event.data == 'object') {
             data = event.data
         }
         if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
             loadingDev.value = false
             loadingIframe.value = true
-            let loadTime = new Date().getTime()
+            const loadTime = new Date().getTime()
             uniAppLoadStatus.value = true // 加载完成
             difference.value = loadTime - timeIframe.value
         }
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index e2d9c9344..c04336429 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -56,7 +56,7 @@
                                 <el-image class="w-[54px] h-[54px]" :src="row.icon" fit="contain">
                                     <template #error>
                                         <div class="flex items-center w-full h-full">
-                                        <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon.png" alt="" />
+                                        <img class="max-w-full max-h-full" src="@/app/assets/images/icon-addon-one.png" alt="" />
                                         </div>
                                     </template>
                                 </el-image>
@@ -351,7 +351,7 @@
                     </div>
                 </div>
                 <div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]">
-                    <terminal ref="terminalRef" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
+                    <terminal ref="terminalRef" :name="`install-${terminalId}`" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
                 </div>
                 <div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col">
                     <!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> -->
@@ -375,12 +375,15 @@
                         </template>
                     </el-result>
                 </div>
-                <div class="mt-[50px]" v-show="errorDialog">
-                    <el-result icon="error" :title="t('安装失败')" :sub-title="errorMsg">
+                <div class="h-[50vh] mt-[20px] flex flex-col" v-show="errorDialog">
+                    <el-result icon="error" :title="t('安装失败')">
                         <template #icon>
                             <img src="@/app/assets/images/error_icon.png" alt="">
                         </template>
                         <template #extra>
+                            <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+                                {{errorMsg}}
+                            </el-scrollbar>
                             <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">错误信息</el-button>
                             <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
                         </template>
@@ -500,6 +503,7 @@ import UpgradeLog from '@/app/components/upgrade-log/index.vue'
 
 const router = useRouter()
 const route = useRoute()
+const terminalId = ref(Date.now());
 const activeName = ref(storage.get('storeActiveName') || 'installed')
 const upgradeRef = ref(null)
 const cloudBuildRef = ref(null)
diff --git a/admin/src/app/views/marketing/components/sign-continue.vue b/admin/src/app/views/marketing/components/sign-continue.vue
index 86dd85733..54f055b85 100644
--- a/admin/src/app/views/marketing/components/sign-continue.vue
+++ b/admin/src/app/views/marketing/components/sign-continue.vue
@@ -49,7 +49,7 @@ const formData = ref({
     continue_sign: 0,
     continue_tag: guid(),
     receive_limit: 1,
-    receive_num: 0,
+    receive_num: 0
 })
 
 const value = computed({
@@ -101,7 +101,7 @@ const formRules = reactive<FormRules>({
                 } else if (Number(value) > Number(props.sign_period)) {
                     callback(t('continueSignMustLessThanSignPeriod')) // 添加这个校验
                 } else {
-                    callback();
+                    callback()
                 }
             },
             trigger: 'blur'
diff --git a/admin/src/app/views/marketing/components/verify-detail.vue b/admin/src/app/views/marketing/components/verify-detail.vue
index 5e4d9d9c0..eb083192c 100644
--- a/admin/src/app/views/marketing/components/verify-detail.vue
+++ b/admin/src/app/views/marketing/components/verify-detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="showDialog" title="核销记录详情" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+    <el-drawer v-model="showDialog" title="核销记录详情" direction="rtl" :before-close="handleClose" size="1300px">
         <div class="main-container" v-loading="loading">
             <el-tabs v-model="activeName" class="pb-[10px]" @tab-change="handleClick">
                 <el-tab-pane label="核销信息" name="verifyInfo" />
@@ -28,7 +28,7 @@
                         <div class="flex items-center mt-[15px]">
                             <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销人员') }}</span>
                             <span class="text-[14px] text-[#666666]">
-                                {{ verifyData.member ? verifyData.member.nickname : '--' }}
+                                {{ (verifyData.is_admin == 1 ? '后台核销' : verifyData.member?.nickname) || '--' }}
                             </span>
                         </div>
                     </el-col>
@@ -147,7 +147,7 @@ const getVerifyDetailFn = async () => {
 
 const setFormData = async (row: any = null) => {
     code = row.code;
-    getVerifyDetailFn();
+    await getVerifyDetailFn();
 }
 
 defineExpose({
@@ -156,8 +156,4 @@ defineExpose({
 })
 </script>
 
-<style lang="scss">
-.member-detail-drawer{
-    width: 1300px !important;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/marketing/sign_list.vue b/admin/src/app/views/marketing/sign_list.vue
index d6b79fabb..0d1845076 100644
--- a/admin/src/app/views/marketing/sign_list.vue
+++ b/admin/src/app/views/marketing/sign_list.vue
@@ -10,7 +10,7 @@
             <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberSignListTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('memberInfo')" prop="keywords">
-                        <el-input v-model.trim="memberSignListTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                        <el-input v-model.trim="memberSignListTableData.searchParam.keywords" class="!w-[230px]" :placeholder="t('memberInfoPlaceholder')" />
                     </el-form-item>
                     <el-form-item :label="t('createTime')" prop="create_time">
                         <el-date-picker v-model="memberSignListTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
diff --git a/admin/src/app/views/marketing/verify.vue b/admin/src/app/views/marketing/verify.vue
index fba962b8b..4114f28d6 100644
--- a/admin/src/app/views/marketing/verify.vue
+++ b/admin/src/app/views/marketing/verify.vue
@@ -39,15 +39,17 @@
                     <template #empty>
                         <span>{{ !recordTable.loading ? t('emptyData') : '' }}</span>
                     </template>
-
-                    <el-table-column prop="code" :show-overflow-tooltip="true" :label="t('verifyCode')" align="left" min-width="150" />
-                    <el-table-column prop="type_name" :label="t('verifyType')" align="left" min-width="150" />
-                    <el-table-column :label="t('verifyTime')" min-width="180" align="center" :show-overflow-tooltip="true">
+                    <el-table-column :label="t('verifyTime')" min-width="180" align="left" :show-overflow-tooltip="true">
                         <template #default="{ row }">
                             {{ row.create_time || '' }}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="member.nickname" :label="t('verifyer')" min-width="180" align="center">
+                    <el-table-column prop="type_name" :label="t('verifyType')" align="left" min-width="150" />
+                    <el-table-column prop="code" :show-overflow-tooltip="true" :label="t('verifyCode')" align="left" min-width="150" />
+                    <el-table-column :label="t('verifyer')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            {{ row.is_admin == 1 ? '后台核销' : row.member?.nickname }}
+                        </template>
                     </el-table-column>
                     <el-table-column :label="t('operation')" align="right" fixed="right" width="100">
                         <template #default="{ row }">
@@ -89,7 +91,7 @@ const recordTable = reactive({
     data: [],
     searchParam: {
         code: '',
-        type: '',
+        type: route.query.type || '',
         verifier_member_id: '',
         create_time: []
     }
diff --git a/admin/src/app/views/marketing/verify_index.vue b/admin/src/app/views/marketing/verify_index.vue
new file mode 100644
index 000000000..f34cf61d2
--- /dev/null
+++ b/admin/src/app/views/marketing/verify_index.vue
@@ -0,0 +1,130 @@
+<template>
+    <div class="main-container min-h-[300px]">
+        <div class="">
+            <el-card class="box-card mt-[10px]!border-none table-search-wrap" shadow="never">
+                <div class="flex p-[10px] items-end">
+                    <div class="flex items-center w-[500px] h-[45px] border-[2px] border-primary rounded-l-lg">
+                        <span class="h-[15px] ml-[10px] pr-[10px] border-r-[1px] border-[#DEE1E7] leading-[1]">
+                            <img class="w-[15px]" src="@/app/assets/images/write.png" />
+                        </span>
+                        <input class="w-[400px] h-[40px] outline-none pl-[10px] text-[18px] bg-transparent"
+                            v-model="verifycode" />
+                    </div>
+                    <div class="bg-primary h-[45px] flex items-center px-[20px] rounded-[10px] ml-[10px] text-[#fff] cursor-pointer"
+                        @click="handelVerify">
+                        <span>{{ t("核销") }}</span>
+                    </div>
+                    <div class="bg-primary h-[45px] flex items-center px-[20px] rounded-[10px] ml-[10px] text-[#fff] cursor-pointer"
+                        @click="router.push('/marketing/verify')">
+                        <span>{{ t("核销记录") }}</span>
+                    </div>
+                </div>
+
+            </el-card>
+        </div>
+        <el-dialog v-model="showDialog" :title="t('核销')" width="500px" :destroy-on-close="true">
+            <div>
+                <h3 class="panel-title !text-sm">{{ t('核销信息') }}</h3>
+                <div class="flex items-center mt-[15px]">
+                    <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销码') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{verifycode}}
+                    </span>
+                </div>
+                <div class="flex items-center mt-[15px]">
+                    <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('核销类型') }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ verifyInfo.type_name }}
+                    </span>
+                </div>
+                <div class="flex items-center mt-[15px]" v-for="(item,index) in verifyInfo.fixed" :key="index">
+                    <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ item.title }}</span>
+                    <span class="text-[14px] text-[#666666]">
+                        {{ item.value }}
+                    </span>
+                </div>
+                <div class="box-card mt-[15px] !border-none" shadow="never" v-for="(item,index) in verifyContentData.diy" :key="index">
+                    <h3 class="panel-title !text-sm">{{ item.title }}</h3>
+
+                    <div class="flex items-center mt-[15px]" v-for="(subItem,subIndex) in item.list" :key="subIndex">
+                        <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ subItem.title }}</span>
+                        <span class="text-[14px] text-[#666666]">
+                            {{ subItem.value }}
+                        </span>
+                    </div>
+                </div>
+                <div class="mt-[15px]">
+                    <h3 class="panel-title !text-sm">{{ t('商品信息') }}</h3>
+                    <el-table :data="verifyGoodsList" size="large">
+                        <el-table-column :label="t('商品名称')" align="left" width="300">
+                            <template #default="{ row }">
+                                <div class="flex">
+                                    <div class="flex items-center shrink-0">
+                                        <el-image v-if="row.cover" class="w-[50px] h-[50px] mr-[10rpx]" :src="img(row.cover)" fit="contain">
+                                            <template #error>
+                                                <div class="image-slot">
+                                                    <img class="w-[50px] h-[50px] mr-[10rpx]" src="@/app/assets/images/goods_default.png" />
+                                                </div>
+                                            </template>
+                                        </el-image>
+                                        <img v-else  class="w-[50px] h-[50px] mr-[10rpx]" src="@/app/assets/images/goods_default.png" fit="contain" />
+                                    </div>
+                                    <div class="flex flex-col">
+                                        <p class="multi-hidden text-[14px]">{{ row.name }}</p>
+                                    </div>
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="num" :label="t('数量')" min-width="50" align="right" />
+                    </el-table>
+                </div>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button type="primary" @click="verifyCode">{{ t("confirm") }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang='ts' setup>
+import { ref } from 'vue'
+import { t } from '@/lang'
+import {img} from '@/utils/common'
+import { useRouter } from 'vue-router'
+import { getVerifyDetailInfo ,verify} from '@/app/api/verify'
+
+const router = useRouter()
+const loading = ref(false)
+const verifycode = ref('')
+const verifyInfo = ref<any>([])
+const verifyContentData: any = ref({})
+const verifyGoodsList: any = ref([])
+const showDialog = ref(false)
+const handelVerify = () => {
+    if (verifycode.value == '') return
+    getVerifyDetailInfo(verifycode.value).then((res) => {
+        showDialog.value = true
+        verifyInfo.value = res.data
+        verifyContentData.value = res.data.value.content || {}
+        verifyGoodsList.value = res.data.value.list || []
+        loading.value = false
+    })
+}
+
+const isSubmit = ref(false)
+const verifyCode = () => {
+    if (verifycode.value == '') return
+    if (isSubmit.value) return
+    isSubmit.value = true
+    verify(verifycode.value).then(() => {
+        showDialog.value = false
+        isSubmit.value = false
+    }).catch(() => {
+        isSubmit.value = false
+    })
+}
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/admin/src/app/views/member/balance.vue b/admin/src/app/views/member/balance.vue
index 7119aefa5..5367e20c3 100644
--- a/admin/src/app/views/member/balance.vue
+++ b/admin/src/app/views/member/balance.vue
@@ -46,7 +46,7 @@
                 <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
 
                     <el-form-item :label="t('memberInfo')" prop="keywords">
-                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
                     </el-form-item>
 
                     <el-form-item :label="t('balanceType')" prop="balance_type">
@@ -257,9 +257,9 @@ checkBalanceInfo()
 const balanceStatus = ref([])
 const checkBalanceStatus = () => {
     getBalanceStatus().then(res => {
-        for (var i in res.data) {
+        for (const i in res.data) {
             if (i == 'balance' || i == 'money') {
-                balanceStatus.value.push({ 'name': res.data[i], 'type': i })
+                balanceStatus.value.push({ name: res.data[i], type: i })
             }
         }
     })
diff --git a/admin/src/app/views/member/commission.vue b/admin/src/app/views/member/commission.vue
index 7e54a41a3..9e8e51eea 100644
--- a/admin/src/app/views/member/commission.vue
+++ b/admin/src/app/views/member/commission.vue
@@ -55,7 +55,7 @@
             <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('memberInfo')" prop="keywords">
-                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
                     </el-form-item>
                     <el-form-item :label="t('fromType')" prop="from_type">
                         <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
diff --git a/admin/src/app/views/member/components/add-member.vue b/admin/src/app/views/member/components/add-member.vue
index 1380b0015..804ca3c85 100644
--- a/admin/src/app/views/member/components/add-member.vue
+++ b/admin/src/app/views/member/components/add-member.vue
@@ -7,7 +7,7 @@
             </el-form-item>
 
             <el-form-item :label="t('mobile')" prop="mobile">
-                <el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" @keyup="filterNumber($event)" class="input-width" />
+                <el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" maxlength="11" @keyup="filterNumber($event)" class="input-width" />
             </el-form-item>
 
             <el-form-item :label="t('nickname')">
diff --git a/admin/src/app/views/member/components/detail-member.vue b/admin/src/app/views/member/components/detail-member.vue
index 3daba4d0b..316875d12 100644
--- a/admin/src/app/views/member/components/detail-member.vue
+++ b/admin/src/app/views/member/components/detail-member.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="member-detail-drawer">
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="member-detail-drawer" size="1300px">
         <div class="main-container" v-loading="loading">
             <div class="bg-page py-[20px] pr-[30px] relative flex">
                 <div class="member-info w-[250px]">
@@ -375,17 +375,20 @@ const getMemberInfoFn = async (bool=false) => {
         Object.keys(data).forEach((item) => {
             formData[item] = data[item]
         })
-
+        if(!data.member_label_array){
+            formData.member_label_array =[]
+             formData.member_label_name=''
+        }
         if (formData?.member_label_array && Object.keys(formData.member_label_array)?.length) {
             formData.member_label = Object.values(formData.member_label_array).map((item: any, index) => {
                 return item.label_id
             })
-
+            
             formData.member_label_name = Object.values(formData.member_label_array).map((item: any, index) => {
                 return item.label_name
             })
         }
-        loading.value = false
+         loading.value = false
     } else {
         loading.value = false
     }
@@ -397,7 +400,7 @@ const getMemberInfoFn = async (bool=false) => {
 const setFormData = async (row: any = null) => {
     id = row.id;
     Object.assign(formData, initialFormData)
-    getMemberInfoFn(true);
+    await getMemberInfoFn(true);
 }
 
 defineExpose({
@@ -406,8 +409,4 @@ defineExpose({
 })
 </script>
 
-<style lang="scss">
-.member-detail-drawer{
-    width: 1300px !important;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/member/components/edit-member.vue b/admin/src/app/views/member/components/edit-member.vue
index be40d7116..5e211cde2 100644
--- a/admin/src/app/views/member/components/edit-member.vue
+++ b/admin/src/app/views/member/components/edit-member.vue
@@ -1,7 +1,7 @@
 <template>
     <el-dialog v-model="showDialog" :title="title || t('updateMember')" width="500px" :destroy-on-close="true">
 
-        <el-form :model="saveData" label-width="90px" :rules="formRules" ref="formRef" class="page-form" v-loading="loading">
+        <el-form :model="saveData" label-width="90px" :rules="formRules" ref="formRef" class="page-form" @submit.prevent v-loading="loading">
             <el-form-item :label="t('headimg')" v-if="type == 'headimg'">
                 <upload-image v-model="saveData.headimg" />
             </el-form-item>
@@ -23,7 +23,7 @@
             <el-form-item :label="t('sex')" v-if="type == 'sex'">
                 <el-select v-model="saveData.sex" clearable :placeholder="t('sexPlaceholder')" class="input-width">
                     <el-option :label="item['name']" :value="item['id']" v-for="(item,index) in sexSelectData" :key="index" />
-                </el-select>
+                </el-select> 
             </el-form-item>
             <el-form-item :label="t('memberLabel')" v-if="type == 'member_label'">
                 <el-select v-model="saveData.member_label" multiple collapse-tags :placeholder="t('memberLabelPlaceholder')" class="input-width">
@@ -33,7 +33,7 @@
             <div v-if="type == 'member_level'">
                 <el-form-item :label="t('memberLevelUpdate')" prop="member_level">
                     <el-select v-model="saveData.member_level" :placeholder="t('memberLevelPlaceholder')"  clearable class="input-width">
-                        <el-option :label="t('memberLevelPlaceholder')" :value="0" />
+                        <!-- <el-option :label="t('memberLevelPlaceholder')" :value="0" /> -->
                         <el-option :label="item['level_name']" :value="item['level_id']" v-for="(item,index) in levelSelectData"  :key="index"/>
                     </el-select>
                     <div class="text-sm text-gray-400">{{ t('memberLevelUpdateTips') }}</div>
@@ -56,7 +56,7 @@ import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import { deepClone } from '@/utils/common'
 import type { FormInstance } from 'element-plus'
-import { editMemberDetail, getMemberLabelAll, getMemberLevelAll,memberBatchModify } from '@/app/api/member'
+import { editMemberDetail, getMemberLabelAll, getMemberLevelAll, memberBatchModify } from '@/app/api/member'
 import Test from '@/utils/test'
 
 // 修改类型
@@ -99,34 +99,34 @@ const formRules = computed(() => {
     return {
         mobile: [
             {
-                validator(rule, value, callback) {
+                validator (rule, value, callback) {
                 // 允许为空，直接通过验证
-                if (!value) return callback();
-                
-                // 非空值时，验证手机号格式 
-                const reg = /^1[3-9]\d{9}$/;
-                if (!reg.test(value)) {
-                    callback(new Error('请输入正确的手机号'));
-                } else {
-                    callback();
-                }
+                    if (!value) return callback()
+
+                    // 非空值时，验证手机号格式
+                    const reg = /^1[3-9]\d{9}$/
+                    if (!reg.test(value)) {
+                        callback(new Error('请输入正确的手机号'))
+                    } else {
+                        callback()
+                    }
                 },
                 trigger: 'blur'
             }
         ],
-        id_card:[
+        id_card: [
             {
-                validator(rule, value, callback) {
+                validator (rule, value, callback) {
                 // 允许为空，直接通过验证
-                if (!value) return callback();
+                    if (!value) return callback()
 
-                // 非空值时，验证身份证号格式 
-                const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
-                if (!reg.test(value)) {
-                    callback(new Error('请输入正确的身份证号'));
-                } else {
-                    callback();
-                }
+                    // 非空值时，验证身份证号格式
+                    const reg = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/
+                    if (!reg.test(value)) {
+                        callback(new Error('请输入正确的身份证号'))
+                    } else {
+                        callback()
+                    }
                 },
                 trigger: 'blur'
             }
@@ -171,10 +171,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
             if (repeat.value) return
             repeat.value = true
 
-            let val = saveData[type.value];
-            if(type.value == 'member_label'){
+            let val = saveData[type.value]
+            if (type.value == 'member_label') {
                 // 将saveData[type.value]中的值，转换为字符串
-                val = saveData[type.value] && saveData[type.value].length  ? deepClone(saveData[type.value]).join(',').split(',') : '';
+                val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : ''
             }
 
             const data = ref({
@@ -204,19 +204,18 @@ const setDialogType = async (row: any = null) => {
     saveData[type.value] = row.data[type.value]
     if (type.value == 'member_label' && saveData[type.value]) {
         saveData[type.value].forEach((item: any, index: any) => {
-            let isExist = false;
+            let isExist = false
             for (let i = 0; i < labelSelectData.value.length; i++) {
                 if (labelSelectData.value[i].label_id == item) {
-                    isExist = true;
-                    break;
+                    isExist = true
+                    break
                 }
             }
             if (isExist) {
                 saveData[type.value][index] = Number.parseFloat(item)
             } else {
-                saveData[type.value].splice(index, 1); // 删除不存在的id
+                saveData[type.value].splice(index, 1) // 删除不存在的id
             }
-
         })
     }
     loading.value = false
@@ -229,9 +228,9 @@ const batchInfo = ref({
     ids: [],
     where: {}
 })
-const batchSetDialogType = (data)=>{
+const batchSetDialogType = (data) => {
     loading.value = true
-    type.value =data.type
+    type.value = data.type
     method.value = data.method
     batchInfo.value.is_all = data.data.is_all
     batchInfo.value.ids = data.data.ids
@@ -249,14 +248,14 @@ const batchSetConfirm = async (formEl: FormInstance | undefined) => {
             if (repeat.value) return
             repeat.value = true
 
-            let val = saveData[type.value];
-            if(type.value == 'member_label'){
-                val = saveData[type.value] && saveData[type.value].length  ? deepClone(saveData[type.value]).join(',').split(',') : '';
+            let val = saveData[type.value]
+            if (type.value == 'member_label') {
+                val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : ''
             }
 
             const data = ref({
                 is_all: batchInfo.value.is_all,
-                member_ids:batchInfo.value.ids,
+                member_ids: batchInfo.value.ids,
                 where: batchInfo.value.where,
                 field: type.value,
                 value: val
diff --git a/admin/src/app/views/member/member.vue b/admin/src/app/views/member/member.vue
index ddeebe908..82c7fd99c 100644
--- a/admin/src/app/views/member/member.vue
+++ b/admin/src/app/views/member/member.vue
@@ -48,9 +48,9 @@
 
             <div class="mt-[10px]">
                 <div class="mb-[10px] flex items-center">
-                    <el-dropdown class="mr-[20px] !text-primary">
+                    <el-dropdown class="mr-[20px] !text-primary w-[125px]">
                         <span class="el-dropdown-link">
-                            <span>{{ currentSelectMode === 'all' ? t('全选所有页') : t('全选当前页')}}</span>({{ selectedCount }})
+                            <span>{{ currentSelectMode === 'all' ? t('全选所有页') : t('全选当前页')}}</span>(<span class="text-center inline-block">{{ selectedCount }}</span>)
                             <el-icon>
                                 <arrow-down />
                             </el-icon>
diff --git a/admin/src/app/views/member/member_detail.vue b/admin/src/app/views/member/member_detail.vue
index c19994dd0..9850c09d0 100644
--- a/admin/src/app/views/member/member_detail.vue
+++ b/admin/src/app/views/member/member_detail.vue
@@ -386,7 +386,7 @@ const back = () => {
 
 <style lang="scss" scoped>
     .member-info {
-        left: 0px
+        left: 0
     }
 
     .member-info-item {
diff --git a/admin/src/app/views/member/point.vue b/admin/src/app/views/member/point.vue
index 5793eb71e..d6215d265 100644
--- a/admin/src/app/views/member/point.vue
+++ b/admin/src/app/views/member/point.vue
@@ -35,7 +35,7 @@
             <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
                     <el-form-item :label="t('memberInfo')" prop="keywords">
-                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" />
+                        <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
                     </el-form-item>
                     <el-form-item :label="t('fromType')" prop="from_type">
                         <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">
diff --git a/admin/src/app/views/poster/components/preview-draw.vue b/admin/src/app/views/poster/components/preview-draw.vue
index 1395ea583..cff24ead4 100644
--- a/admin/src/app/views/poster/components/preview-draw.vue
+++ b/admin/src/app/views/poster/components/preview-draw.vue
@@ -13,18 +13,18 @@ const prop = defineProps({
 })
 
 const data = computed(() => {
-    return prop.value;
+    return prop.value
 })
 
 const componentStyle = computed(() => {
-    var style = '';
-    style += `background-color: ${ prop.value.bgColor };`;
-    style += `width: ${ prop.value.width }px;height: ${ prop.value.height }px;`;
-    let box: any = document.getElementById(prop.value.id)
+    let style = ''
+    style += `background-color: ${prop.value.bgColor};`
+    style += `width: ${prop.value.width}px;height: ${prop.value.height}px;`
+    const box: any = document.getElementById(prop.value.id)
     if (box) {
-        style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`;
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
     }
-    return style;
+    return style
 })
 
 defineExpose({})
diff --git a/admin/src/app/views/poster/components/preview-friendspay-message.vue b/admin/src/app/views/poster/components/preview-friendspay-message.vue
index bd1789c43..026c55a21 100644
--- a/admin/src/app/views/poster/components/preview-friendspay-message.vue
+++ b/admin/src/app/views/poster/components/preview-friendspay-message.vue
@@ -16,28 +16,28 @@ const prop = defineProps({
 })
 
 const data = computed(() => {
-    return prop.value;
+    return prop.value
 })
 
 const componentStyle = computed(() => {
-    var style = '';
-    style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`;
+    let style = ''
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
     if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
-        style += `text-align: ${ prop.value.x };`;
+        style += `text-align: ${prop.value.x};`
     }
     if (prop.value.weight) {
-        style += `font-weight: bold;`;
+        style += 'font-weight: bold;'
     }
-    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
-        style += `font-family: poster_default_font;`;
+    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
+        style += 'font-family: poster_default_font;'
     }
-    let box: any = document.getElementById(prop.value.id)
+    const box: any = document.getElementById(prop.value.id)
     if (box) {
-        style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`;
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
     } else {
-        style += `width:${ prop.value.width }px;height:${ prop.value.height }px;`;
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`
     }
-    return style;
+    return style
 })
 
 defineExpose({})
diff --git a/admin/src/app/views/poster/components/preview-friendspay-money.vue b/admin/src/app/views/poster/components/preview-friendspay-money.vue
index bd1789c43..026c55a21 100644
--- a/admin/src/app/views/poster/components/preview-friendspay-money.vue
+++ b/admin/src/app/views/poster/components/preview-friendspay-money.vue
@@ -16,28 +16,28 @@ const prop = defineProps({
 })
 
 const data = computed(() => {
-    return prop.value;
+    return prop.value
 })
 
 const componentStyle = computed(() => {
-    var style = '';
-    style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`;
+    let style = ''
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
     if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
-        style += `text-align: ${ prop.value.x };`;
+        style += `text-align: ${prop.value.x};`
     }
     if (prop.value.weight) {
-        style += `font-weight: bold;`;
+        style += 'font-weight: bold;'
     }
-    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
-        style += `font-family: poster_default_font;`;
+    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
+        style += 'font-family: poster_default_font;'
     }
-    let box: any = document.getElementById(prop.value.id)
+    const box: any = document.getElementById(prop.value.id)
     if (box) {
-        style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`;
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
     } else {
-        style += `width:${ prop.value.width }px;height:${ prop.value.height }px;`;
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`
     }
-    return style;
+    return style
 })
 
 defineExpose({})
diff --git a/admin/src/app/views/poster/components/preview-headimg.vue b/admin/src/app/views/poster/components/preview-headimg.vue
index db8a63a50..0749de286 100644
--- a/admin/src/app/views/poster/components/preview-headimg.vue
+++ b/admin/src/app/views/poster/components/preview-headimg.vue
@@ -16,16 +16,16 @@ const prop = defineProps({
 })
 
 const data = computed(() => {
-    return prop.value;
+    return prop.value
 })
 
 const componentStyle = computed(() => {
-    var style = '';
-    style += `width: ${ prop.value.width }px;`;
+    let style = ''
+    style += `width: ${prop.value.width}px;`
     if (prop.value.shape == 'circle') {
-        style += `border-radius: 50%; overflow: hidden;`;
+        style += 'border-radius: 50%; overflow: hidden;'
     }
-    return style;
+    return style
 })
 
 defineExpose({})
diff --git a/admin/src/app/views/poster/components/preview-image.vue b/admin/src/app/views/poster/components/preview-image.vue
index 65bc6c3df..e60deaf6b 100644
--- a/admin/src/app/views/poster/components/preview-image.vue
+++ b/admin/src/app/views/poster/components/preview-image.vue
@@ -17,13 +17,13 @@ const prop = defineProps({
 })
 
 const data = computed(() => {
-    return prop.value;
+    return prop.value
 })
 
 const componentStyle = computed(() => {
-    var style = '';
-    style += `width: ${ prop.value.width }px;`;
-    return style;
+    let style = ''
+    style += `width: ${prop.value.width}px;`
+    return style
 })
 
 defineExpose({})
diff --git a/admin/src/app/views/poster/components/preview-nickname.vue b/admin/src/app/views/poster/components/preview-nickname.vue
index d63f66a25..9666528cb 100644
--- a/admin/src/app/views/poster/components/preview-nickname.vue
+++ b/admin/src/app/views/poster/components/preview-nickname.vue
@@ -16,28 +16,28 @@ const prop = defineProps({
 })
 
 const data = computed(() => {
-    return prop.value;
+    return prop.value
 })
 
 const componentStyle = computed(() => {
-    var style = '';
-    style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`;
+    let style = ''
+    style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
     if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
-        style += `text-align: ${ prop.value.x };`;
+        style += `text-align: ${prop.value.x};`
     }
     if (prop.value.weight) {
-        style += `font-weight: bold;`;
+        style += 'font-weight: bold;'
     }
-    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
-        style += `font-family: poster_default_font;`;
+    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
+        style += 'font-family: poster_default_font;'
     }
-    let box: any = document.getElementById(prop.value.id)
+    const box: any = document.getElementById(prop.value.id)
     if (box) {
-        style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`;
+        style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
     } else {
-        style += `width:${ prop.value.width }px;height:${ prop.value.height }px;`;
+        style += `width:${prop.value.width}px;height:${prop.value.height}px;`
     }
-    return style;
+    return style
 })
 
 defineExpose({})
diff --git a/admin/src/app/views/poster/components/preview-qrcode.vue b/admin/src/app/views/poster/components/preview-qrcode.vue
index a92953de5..88ad4ecd4 100644
--- a/admin/src/app/views/poster/components/preview-qrcode.vue
+++ b/admin/src/app/views/poster/components/preview-qrcode.vue
@@ -20,7 +20,7 @@ const data = computed(() => {
 })
 
 const componentStyle = computed(() => {
-    var style = '';
+    let style = '';
     style += `width: ${ prop.value.width }px;`;
     return style;
 })
diff --git a/admin/src/app/views/poster/components/preview-text.vue b/admin/src/app/views/poster/components/preview-text.vue
index bd1789c43..d737c47fa 100644
--- a/admin/src/app/views/poster/components/preview-text.vue
+++ b/admin/src/app/views/poster/components/preview-text.vue
@@ -20,7 +20,7 @@ const data = computed(() => {
 })
 
 const componentStyle = computed(() => {
-    var style = '';
+    let style = '';
     style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`;
     if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
         style += `text-align: ${ prop.value.x };`;
@@ -28,7 +28,7 @@ const componentStyle = computed(() => {
     if (prop.value.weight) {
         style += `font-weight: bold;`;
     }
-    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
+    if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
         style += `font-family: poster_default_font;`;
     }
     let box: any = document.getElementById(prop.value.id)
diff --git a/admin/src/app/views/poster/list.vue b/admin/src/app/views/poster/list.vue
index 63060c1dd..c49961a57 100644
--- a/admin/src/app/views/poster/list.vue
+++ b/admin/src/app/views/poster/list.vue
@@ -6,7 +6,13 @@
                 <span class="text-page-title">{{ pageName }}</span>
                 <el-button type="primary" class="w-[100px]" @click="dialogVisible = true">{{ t('添加海报') }}</el-button>
             </div>
-
+            <div class="mt-[20px]" v-if="!isImagick">
+                <el-alert type="warning" show-icon :closable="false">
+                    <template #title>
+                        <span class="!text-[14px]">检测到PHP未安装ImageMagick扩展，需安装后才能使用海报功能</span>
+                    </template>
+                </el-alert>
+            </div>
             <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                 <el-form :inline="true" :model="posterTableData.searchParam" ref="searchFormDiyPosterRef">
                     <el-form-item :label="t('posterName')" prop="name">
@@ -103,8 +109,8 @@ import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { getPosterPageList,getPosterType,modifyPosterStatus,modifyPosterDefault,deletePoster,getPreviewPoster } from '@/app/api/poster'
-import { img,setTablePageStorage,getTablePageStorage } from '@/utils/common'
+import { getPosterPageList, getPosterType, modifyPosterStatus, modifyPosterDefault, deletePoster, getPreviewPoster ,checkImagick} from '@/app/api/poster'
+import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const router = useRouter()
 const route = useRoute()
@@ -151,10 +157,10 @@ const addEvent = async (formEl: FormInstance | undefined) => {
 }
 
 // 获取自定义海报类型
-const loadPosterType = ()=> {
-    getPosterType({}).then((res:any)=>{
-        for (let key in posterType) {
-            delete posterType[key];
+const loadPosterType = () => {
+    getPosterType({}).then((res:any) => {
+        for (const key in posterType) {
+            delete posterType[key]
         }
 
         for (const key in res.data) {
@@ -163,7 +169,7 @@ const loadPosterType = ()=> {
     })
 }
 
-loadPosterType();
+loadPosterType()
 
 const posterTableData: any = reactive({
     page: 1,
@@ -192,13 +198,13 @@ const loadPosterPageList = (page: number = 1) => {
         posterTableData.loading = false
         posterTableData.data = res.data.data
         posterTableData.total = res.data.total
-        setTablePageStorage(posterTableData.page, posterTableData.limit, posterTableData.searchParam);
+        setTablePageStorage(posterTableData.page, posterTableData.limit, posterTableData.searchParam)
     }).catch(() => {
         posterTableData.loading = false
     })
 }
 
-loadPosterPageList(getTablePageStorage(posterTableData.searchParam).page);
+loadPosterPageList(getTablePageStorage(posterTableData.searchParam).page)
 
 // 编辑自定义海报
 const editEvent = (data: any) => {
@@ -212,7 +218,7 @@ const editEvent = (data: any) => {
 const isRepeat = ref(false)
 
 // 修改海报启用状态
-const modifyPosterStatusFn = (id:any,status:any)=> {
+const modifyPosterStatusFn = (id:any, status:any) => {
     if (isRepeat.value) return
     isRepeat.value = true
 
@@ -225,7 +231,7 @@ const modifyPosterStatusFn = (id:any,status:any)=> {
 }
 
 // 将自定义海报修改为默认海报
-const modifyPosterDefaultFn = (id:any)=> {
+const modifyPosterDefaultFn = (id:any) => {
     if (isRepeat.value) return
     isRepeat.value = true
     modifyPosterDefault({
@@ -265,16 +271,15 @@ const previewPoster = (data: any) => {
     isRepeat.value = true
 
     getPreviewPoster({
-        id:data.id,
-        type:data.type
-    }).then(((res:any)=>{
-        if(res.data) {
-            previewPosterUrl.value = res.data;
-            previewDialogVisible.value = true;
+        id: data.id,
+        type: data.type
+    }).then((res:any) => {
+        if (res.data) {
+            previewPosterUrl.value = res.data
+            previewDialogVisible.value = true
         }
         isRepeat.value = false
-    }))
-
+    })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
@@ -282,6 +287,16 @@ const resetForm = (formEl: FormInstance | undefined) => {
     formEl.resetFields()
     loadPosterPageList()
 }
+const isImagick = ref(false)
+// 判断是否安装imagemagick扩展
+const checkImagickFn = () => {
+    checkImagick().then((res:any) => {
+        console.log(res)
+        isImagick.value = res.data
+        
+    })
+}
+checkImagickFn()
 
 </script>
 
diff --git a/admin/src/app/views/printer/list.vue b/admin/src/app/views/printer/list.vue
index dd7066a8e..e34e92c38 100644
--- a/admin/src/app/views/printer/list.vue
+++ b/admin/src/app/views/printer/list.vue
@@ -68,14 +68,14 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getPrinterPageList, modifyPrinterStatus, deletePrinter,refreshPrinterToken,testPrint } from '@/app/api/printer'
-import { ElMessageBox,FormInstance } from 'element-plus'
-import { useRoute,useRouter } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
+import { getPrinterPageList, modifyPrinterStatus, deletePrinter, refreshPrinterToken, testPrint } from '@/app/api/printer'
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title;
+const pageName = route.meta.title
 const repeat = ref(false)
 
 const handleClick = (path: string) => {
@@ -110,7 +110,7 @@ const loadPrinterList = (page: number = 1) => {
         printerTable.loading = false
         printerTable.data = res.data.data
         printerTable.total = res.data.total
-        setTablePageStorage(printerTable.page, printerTable.limit, printerTable.searchParam);
+        setTablePageStorage(printerTable.page, printerTable.limit, printerTable.searchParam)
     }).catch(() => {
         printerTable.loading = false
     })
@@ -154,11 +154,11 @@ const editEvent = (data: any) => {
  */
 const deleteEvent = (id: number) => {
     ElMessageBox.confirm(t('printerDeleteTips'), t('warning'),
-            {
-                confirmButtonText: t('confirm'),
-                cancelButtonText: t('cancel'),
-                type: 'warning',
-            }
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
     ).then(() => {
         if (repeat.value) return
         repeat.value = true
@@ -183,11 +183,11 @@ const resetForm = (formEl: FormInstance | undefined) => {
  */
 const testPrintEvent = (printer_id: any) => {
     ElMessageBox.confirm(t('testPrintTips'), t('warning'),
-            {
-                confirmButtonText: t('confirm'),
-                cancelButtonText: t('cancel'),
-                type: 'warning',
-            }
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
     ).then(() => {
         if (repeat.value) return
         repeat.value = true
@@ -205,11 +205,11 @@ const testPrintEvent = (printer_id: any) => {
  */
 const refreshTokenEvent = (printer_id: any) => {
     ElMessageBox.confirm(t('refreshTokenTips'), t('warning'),
-            {
-                confirmButtonText: t('confirm'),
-                cancelButtonText: t('cancel'),
-                type: 'warning',
-            }
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
     ).then(() => {
         if (repeat.value) return
         repeat.value = true
diff --git a/admin/src/app/views/setting/adminlogin.vue b/admin/src/app/views/setting/adminlogin.vue
index 2da4e1d0b..719afdcbe 100644
--- a/admin/src/app/views/setting/adminlogin.vue
+++ b/admin/src/app/views/setting/adminlogin.vue
@@ -3,8 +3,8 @@
 
         <el-form class="page-form" :model="formData" label-width="150px" ref="ruleFormRef" v-loading="loading">
             <el-card class="box-card !border-none" shadow="never">
-                <h3 class="panel-title !text-sm">{{ t('admin') }}</h3>
-
+                <h3 class="text-[16px] text-[#1D1F3A] font-bold mb-4">{{ pageName }}</h3>
+                <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('admin') }}</h3>
                 <el-form-item :label="t('isCaptcha')">
                     <el-switch v-model="formData.is_captcha" :active-value="1" :inactive-value="0" />
                 </el-form-item>
@@ -12,8 +12,8 @@
                     <upload-image v-model="formData.bg" />
                     <div class="form-tip">{{t('adminBgImgTip')}}</div>
                 </el-form-item>
-            </el-card>
 
+            </el-card>
         </el-form>
 
         <div class="fixed-footer-wrap">
@@ -29,12 +29,11 @@ import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { getConfigLogin, setConfigLogin } from '@/app/api/sys'
 import { FormInstance } from 'element-plus'
-import { useRoute } from 'vue-router'
 import { cloneDeep } from 'lodash-es'
+import { useRoute } from 'vue-router'
 
 const route = useRoute()
 const pageName = route.meta.title
-
 const loading = ref(true)
 const ruleFormRef = ref<FormInstance>()
 const formData = reactive<Record<string, number | string>>({
diff --git a/admin/src/app/views/setting/components/sms-records-info.vue b/admin/src/app/views/setting/components/sms-records-info.vue
index a724e95d7..9152f17ed 100644
--- a/admin/src/app/views/setting/components/sms-records-info.vue
+++ b/admin/src/app/views/setting/components/sms-records-info.vue
@@ -25,7 +25,11 @@
             <el-form-item :label="t('createTime')">
                 <div class="input-width"> {{ formData.create_time }} </div>
             </el-form-item>
-
+            <el-form-item :label="t('发送结果')">
+                <div class="input-width" v-if="formData.status == 'sending'"> 发送失败 </div>
+                <div class="input-width" v-if="formData.status == 'success'"> 发送成功 </div>
+                <div class="input-width" v-if="formData.status == 'fail'"> {{ formData.result }} </div>
+            </el-form-item>
         </el-form>
 
         <template #footer>
@@ -55,7 +59,9 @@ const initialFormData = {
     name: '',
     nickname: '',
     mobile: '',
-    sms_type_name: ''
+    sms_type_name: '',
+    status:'',
+    result:''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
diff --git a/admin/src/app/views/setting/components/sms-tencent.vue b/admin/src/app/views/setting/components/sms-tencent.vue
index 5247a48b2..064f81326 100644
--- a/admin/src/app/views/setting/components/sms-tencent.vue
+++ b/admin/src/app/views/setting/components/sms-tencent.vue
@@ -53,8 +53,8 @@ const initialFormData = {
     access_key: '',
     secret_key: '',
     is_use: '',
-    app_id:'',
-    secret_id:'',
+    app_id: '',
+    secret_id: ''
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
diff --git a/admin/src/app/views/setting/components/sms_niu_login.vue b/admin/src/app/views/setting/components/sms_niu_login.vue
index a88383703..06595a71a 100644
--- a/admin/src/app/views/setting/components/sms_niu_login.vue
+++ b/admin/src/app/views/setting/components/sms_niu_login.vue
@@ -2,7 +2,7 @@
     <el-card class="box-card !border-none"  shadow="never" v-loading="loading">
         <div v-if="type=='login'" >
             <div class="bg-[var(--el-color-primary-light-9)] p-2 text-[14px] rounded-[6px]">
-                <span class="">还未注册牛云短信?</span>
+                <span>还未注册牛云短信?</span>
                 <span @click="toRegister" class="cursor-pointer text-primary">去注册</span>
             </div>
             <el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form mt-[20px]">
@@ -21,7 +21,7 @@
         </div>
         <div v-if="type=='register'" >
             <div class="bg-[var(--el-color-primary-light-9)] p-2 text-[14px] rounded-[6px]">
-                <span class="">已有账号，</span>
+                <span>已有账号，</span>
                 <span @click="type='login'" class="cursor-pointer text-primary">去登录</span>
             </div>
             <el-form :model="registerFormData" label-width="150px" ref="registerFormRef" :rules="registerFormRules" class="page-form mt-[20px]">
@@ -111,6 +111,9 @@
                 <span class="text-primary">忘记密码，快去修改</span>
             </div>
             <el-form :model="changeFormData" label-width="150px" ref="changeFormRef" :rules="changeFormRules" class="page-form mt-[20px]">
+                <el-form-item label="用户名" prop="username">
+                    <el-input placeholder="请输入用户名" class="input-width" maxlength="50" show-word-limit v-model="changeFormData.username" clearable />
+                </el-form-item>
                 <el-form-item label="手机号" prop="mobile">
                     <el-input placeholder="请输入手机号" class="input-width" maxlength="11" show-word-limit v-model="changeFormData.mobile" clearable />
                 </el-form-item>
@@ -139,16 +142,16 @@
 </template>
 
 <script lang="ts" setup>
-import { ref ,computed,reactive} from 'vue'
-import { loginAccount,getSmsCaptcha,getSmsSend,resetPassword,registerAccount ,getSmsSignConfig} from '@/app/api/notice'
-import { t } from "@/lang";
+import { ref, computed, reactive } from 'vue'
+import { loginAccount, getSmsCaptcha, getSmsSend, resetPassword, registerAccount, getSmsSignConfig } from '@/app/api/notice'
+import { t } from '@/lang'
 
 const props = defineProps({
-    info:{
+    info: {
         type: Object,
         default: () => ({})
     },
-    isLogin:{
+    isLogin: {
         type: Boolean,
         default: false
     }
@@ -164,7 +167,7 @@ const formData = ref({
 })
 
 const isBack = computed(() => {
-    return !!props.info && Object.keys(props.info).length > 0;
+    return !!props.info && Object.keys(props.info).length > 0
 })
 
 const formRules = computed(() => {
@@ -194,9 +197,9 @@ const back = () => {
 // 注册
 const signConfig = reactive({
     signTypeList: [],
-    signSourceList:[]
+    signSourceList: []
 })
-const getSmsSignConfigFn = ()=> {
+const getSmsSignConfigFn = () => {
     getSmsSignConfig().then(res => {
         signConfig.signTypeList = res.data.sign_type_list
         signConfig.signSourceList = res.data.sign_source_list
@@ -263,39 +266,39 @@ const registerFormRules = computed(() => {
             }
         ],
         mobile: [
-            { required: true, message: '请输入手机号', trigger: 'blur' },
+            { required: true, message: '请输入手机号', trigger: 'blur' }
         ],
         captcha_code: [
-            { required: true, message: '请输入验证码', trigger: 'blur' },
+            { required: true, message: '请输入验证码', trigger: 'blur' }
         ],
         code: [
-            { required: true, message: '请输入动态码', trigger: 'blur' },
+            { required: true, message: '请输入动态码', trigger: 'blur' }
         ],
         company: [
-            { required: true, message: '请输入公司名称', trigger: 'blur' },
+            { required: true, message: '请输入公司名称', trigger: 'blur' }
         ],
         signature: [
             { required: true, message: '请输入短信签名', trigger: 'blur' },
             {
                 validator: (rule, value, callback) => {
-                    const singleBracketValid = /^【[^【】]*】$/.test(value);
+                    const singleBracketValid = /^【[^【】]*】$/.test(value)
                     if (!singleBracketValid) {
-                        return callback(new Error('短信签名必须被【】包裹'));
+                        return callback(new Error('短信签名必须被【】包裹'))
                     }
 
-                    const content = value.slice(1, -1);
+                    const content = value.slice(1, -1)
 
-                    const lengthValid = content.length >= 2 && content.length <= 20;
+                    const lengthValid = content.length >= 2 && content.length <= 20
                     if (!lengthValid) {
-                        return callback(new Error('短信签名内容需在 2-20 个字符之间'));
+                        return callback(new Error('短信签名内容需在 2-20 个字符之间'))
                     }
 
-                    const invalidChars = /[\s\-+=*&%#@~;]/;
+                    const invalidChars = /[\s\-+=*&%#@~;]/
                     if (invalidChars.test(content)) {
-                        return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'));
+                        return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'))
                     }
 
-                    callback();
+                    callback()
                 },
                 trigger: 'blur'
             }
@@ -305,19 +308,19 @@ const registerFormRules = computed(() => {
             { validator: phoneVerify, trigger: 'blur' }
         ],
         companyName: [
-            { required: true, message: '请输入企业名称', trigger: 'blur' },
+            { required: true, message: '请输入企业名称', trigger: 'blur' }
         ],
         contentExample: [
-            { required: true, message: '请输入短信示例内容', trigger: 'blur' },
+            { required: true, message: '请输入短信示例内容', trigger: 'blur' }
         ],
         creditCode: [
-            { required: true, message: '请输入社会统一信用代码', trigger: 'blur' },
+            { required: true, message: '请输入社会统一信用代码', trigger: 'blur' }
         ],
         legalPerson: [
-            { required: true, message: '请输入法人姓名', trigger: 'blur' },
+            { required: true, message: '请输入法人姓名', trigger: 'blur' }
         ],
         principalName: [
-            { required: true, message: '请输入经办人姓名', trigger: 'blur' },
+            { required: true, message: '请输入经办人姓名', trigger: 'blur' }
         ],
         principalIdCard: [
             { required: true, message: '请输入经办人身份证', trigger: 'blur' },
@@ -326,22 +329,22 @@ const registerFormRules = computed(() => {
         imgUrl: [
             {
                 validator: (rule, value, callback) => {
-                    const needImage = [3, 4, 5].includes(registerFormData.value.signSource) || registerFormData.value.signType == 1;
+                    const needImage = [3, 4, 5].includes(registerFormData.value.signSource) || registerFormData.value.signType == 1
                     if (needImage) {
                         if (!value || value.length === 0) {
-                            callback(new Error('请上传图片'));
+                            callback(new Error('请上传图片'))
                         } else {
-                            callback();
+                            callback()
                         }
                     } else {
-                        callback(); // 不需要校验
+                        callback() // 不需要校验
                     }
                 },
                 trigger: 'blur'
             }
         ]
-    };
-});
+    }
+})
 const idCardVerify = (rule: any, value: any, callback: any) => {
     if (value && !/^[1-9]\d{5}(19|20)\d{2}((0\d)|(1[0-2]))(([0-2]\d)|3[0-1])\d{3}([0-9Xx])$/.test(value)) {
         callback(new Error(t('请输入正确的身份证号码')))
@@ -360,25 +363,26 @@ const phoneVerify = (rule: any, value: any, callback: any) => {
 const register = async () => {
     await registerFormRef.value?.validate(async (valid) => {
         if (valid) {
-            const { captcha_key, captcha_code, captcha_img, ...params } = registerFormData.value;
+            const { captcha_key, captcha_code, captcha_img, ...params } = registerFormData.value
             registerAccount(params).then((res) => {
-                type.value='login'
+                type.value = 'login'
             }).catch((err) => {
                 getSmsCaptchaFn()
             })
         }
-    });
+    })
 }
 
 // 重置密码
 const changeFormRef = ref()
 const changeFormData = ref({
     mobile: '',
-    captcha_key : '',
+    captcha_key: '',
     captcha_code: '',
     captcha_img: '',
     code: '',
-    key: ''
+    key: '',
+    username: props.info.username || '',
 })
 
 const getSmsCaptchaFn = async () => {
@@ -398,11 +402,11 @@ const getSmsCaptchaFn = async () => {
     }
 }
 
-const sending = ref(false); // 发送中状态
-const countdown = ref(0); // 倒计时秒数
+const sending = ref(false) // 发送中状态
+const countdown = ref(0) // 倒计时秒数
 
 const getSmsSendFn = () => {
-    if (countdown.value > 0 || sending.value) return; // 正在倒计时或发送中，直接返回
+    if (countdown.value > 0 || sending.value) return // 正在倒计时或发送中，直接返回
     if (type.value === 'register') {
         registerFormRef.value.validateField(['mobile', 'captcha_code'], (valid) => {
             if (!valid) return
@@ -413,13 +417,13 @@ const getSmsSendFn = () => {
                 captcha_code: registerFormData.value.captcha_code
             }
             getSmsSend(params).then((res) => {
-                startCountdown(60); // 启动60秒倒计时
-                registerFormData.value.key = res.data.key;
+                startCountdown(60) // 启动60秒倒计时
+                registerFormData.value.key = res.data.key
             }).catch((err) => {
                 getSmsCaptchaFn()
-                sending.value = false;
+                sending.value = false
             }).finally(() => {
-                sending.value = false; // 无论成功失败都重置发送状态
+                sending.value = false // 无论成功失败都重置发送状态
             })
         })
     } else if (type.value === 'password') {
@@ -433,28 +437,28 @@ const getSmsSendFn = () => {
                 captcha_code: changeFormData.value.captcha_code
             }
             getSmsSend(params).then((res) => {
-                startCountdown(60); // 启动60秒倒计时
-                changeFormData.value.key = res.data.key;
+                startCountdown(60) // 启动60秒倒计时
+                changeFormData.value.key = res.data.key
             }).catch((err) => {
                 getSmsCaptchaFn()
-                sending.value = false;
+                sending.value = false
             }).finally(() => {
-                sending.value = false; // 无论成功失败都重置发送状态
-            });
-        });
+                sending.value = false // 无论成功失败都重置发送状态
+            })
+        })
     }
 }
 
 // 启动倒计时
 const startCountdown = (seconds) => {
-    countdown.value = seconds;
+    countdown.value = seconds
     const timer = setInterval(() => {
-        countdown.value--;
+        countdown.value--
         if (countdown.value <= 0) {
-            clearInterval(timer);
-            sending.value = false; // 发送状态重置
+            clearInterval(timer)
+            sending.value = false // 发送状态重置
         }
-    }, 1000);
+    }, 1000)
 }
 
 const changeFormRules = computed(() => {
@@ -468,13 +472,16 @@ const changeFormRules = computed(() => {
             }
         ],
         captcha_code: [
-            { required: true, message: '请输入验证码', trigger: 'blur' },
+            { required: true, message: '请输入验证码', trigger: 'blur' }
         ],
         code: [
-            { required: true, message: '请输入动态码', trigger: 'blur' },
+            { required: true, message: '请输入动态码', trigger: 'blur' }
+        ],
+        username: [
+            { required: true, message: '请输入用户名', trigger: 'blur' }
         ]
-    };
-});
+    }
+})
 const editPass = async () => {
     loading.value = true
     captchaType.value = 'password'
@@ -488,16 +495,16 @@ const editPass = async () => {
 const reset = async () => {
     await changeFormRef.value?.validate(async (valid) => {
         if (valid) {
-            let params = {
+            const params = {
                 key: changeFormData.value.key,
                 code: changeFormData.value.code,
                 mobile: changeFormData.value.mobile
             }
-            resetPassword(props.info.username, { ...params }).then((res) => {
-                let newPassword = res.data.password
-                ElMessageBox.confirm(`新密码为：${ newPassword }`, '请保存好新密码', {
+            resetPassword(changeFormData.value.username, { ...params }).then((res) => {
+                const newPassword = res.data.password
+                ElMessageBox.confirm(`新密码为：${newPassword}`, '请保存好新密码', {
                     confirmButtonText: '确定',
-                    showCancelButton: false,
+                    showCancelButton: false
                 }).then(() => {
                     type.value = 'login'
                     emit('complete')
diff --git a/admin/src/app/views/setting/components/sms_recharge.vue b/admin/src/app/views/setting/components/sms_recharge.vue
index a2ff9ca56..712f732f4 100644
--- a/admin/src/app/views/setting/components/sms_recharge.vue
+++ b/admin/src/app/views/setting/components/sms_recharge.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref ,watch} from 'vue'
+import { ref, watch } from 'vue'
 import { getSmsPackagesList, smsOrderCreate, getOrderPayInfo, getOrderPayStatus, calculateOrderPay } from '@/app/api/notice'
 
 const props = defineProps({
@@ -100,7 +100,7 @@ const submitPayment = async () => {
             await ElMessageBox.confirm('请确认支付是否完成', '支付提示', {
                 confirmButtonText: '已完成支付',
                 cancelButtonText: '返回',
-                type: 'warning',
+                type: 'warning'
             })
             emit('complete')
         }
@@ -115,13 +115,13 @@ const goBack = () => {
     emit('back')
 }
 
-const showRecharge = ref(false);
+const showRecharge = ref(false)
 watch(() => props.isRecharge, (newVal) => {
-    showRecharge.value = newVal;
+    showRecharge.value = newVal
     if (newVal) {
-        getSmsPackagesListFn();
+        getSmsPackagesListFn()
     }
-});
+})
 
 </script>
 
@@ -140,4 +140,4 @@ watch(() => props.isRecharge, (newVal) => {
         box-shadow: 0 0 6px rgba(64, 158, 255, 0.3);
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/admin/src/app/views/setting/components/sms_recharge_record.vue b/admin/src/app/views/setting/components/sms_recharge_record.vue
index 543567b34..48db0c297 100644
--- a/admin/src/app/views/setting/components/sms_recharge_record.vue
+++ b/admin/src/app/views/setting/components/sms_recharge_record.vue
@@ -64,9 +64,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref , reactive,onMounted} from 'vue'
-import { getSmsOrdersList ,getOrderInfo} from '@/app/api/notice'
-import { t } from "@/lang";
+import { ref, reactive, onMounted } from 'vue'
+import { getSmsOrdersList, getOrderInfo } from '@/app/api/notice'
+import { t } from '@/lang'
 
 const props = defineProps({
     username: {
@@ -82,27 +82,27 @@ const tableData = reactive({
     loading: false,
     data: [],
     searchParam: {
-        name: "",
+        name: '',
         order: '',
         sort: ''
-    },
-});
+    }
+})
 
 // 获取列表
 const loadRankList = () => {
-    tableData.loading = true;
-    let params = {
+    tableData.loading = true
+    const params = {
         page: tableData.page,
         limit: tableData.limit,
         ...tableData.searchParam
     }
     getSmsOrdersList(props.username, params).then((res) => {
-        tableData.loading = false;
-        tableData.data = res.data.data;
-        tableData.total = res.data.total;
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
     }).catch(() => {
-        tableData.loading = false;
-    });
+        tableData.loading = false
+    })
 }
 
 // 详情
@@ -112,7 +112,7 @@ const loading = ref(false)
 const detailEvent = (row:any) => {
     loading.value = true
     visibleDetail.value = true
-    getOrderInfo(props.username,{out_trade_no:row.out_trade_no}).then(res=>{
+    getOrderInfo(props.username, { out_trade_no: row.out_trade_no }).then(res => {
         detail.value = res.data
         loading.value = false
     })
diff --git a/admin/src/app/views/setting/components/sms_send.vue b/admin/src/app/views/setting/components/sms_send.vue
index 1627beaee..20e441e3d 100644
--- a/admin/src/app/views/setting/components/sms_send.vue
+++ b/admin/src/app/views/setting/components/sms_send.vue
@@ -47,10 +47,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref ,reactive,onMounted} from 'vue'
+import { ref, reactive, onMounted } from 'vue'
 import { getSmsSendList } from '@/app/api/notice'
 import { timeStampTurnTime } from '@/utils/common'
-import { t } from "@/lang";
+import { t } from '@/lang'
 
 const props = defineProps({
     username: {
@@ -75,26 +75,26 @@ const tableData = reactive({
 
 // 获取列表
 const loadRankList = () => {
-    tableData.loading = true;
-    let params = {
+    tableData.loading = true
+    const params = {
         page: tableData.page,
         limit: tableData.limit,
         ...tableData.searchParam
     }
     getSmsSendList(props.username, params).then((res) => {
-        tableData.loading = false;
-        tableData.data = res.data.data;
-        tableData.total = res.data.total;
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.total = res.data.total
     }).catch(() => {
-        tableData.loading = false;
-    });
+        tableData.loading = false
+    })
 }
 onMounted(() => {
     if (props.username) {
-        loadRankList();
+        loadRankList()
     }
 })
-const searchFormRef = ref<FormInstance>();
+const searchFormRef = ref<FormInstance>()
 const resetForm = (formEl: FormInstance | undefined) => {
     if (!formEl) return
     formEl.resetFields()
diff --git a/admin/src/app/views/setting/components/sms_signature.vue b/admin/src/app/views/setting/components/sms_signature.vue
index 01b2a3cff..379a71b2c 100644
--- a/admin/src/app/views/setting/components/sms_signature.vue
+++ b/admin/src/app/views/setting/components/sms_signature.vue
@@ -3,7 +3,7 @@
         <el-dialog v-model="visible" :title="t('选择签名')" width="1200px" destroy-on-close :close-on-click-modal="false">
             <el-alert type="warning" :closable="false" class="!mb-[10px]">
                 <template #default>
-                    <p class="">签名数据的变更（新增 / 删除）需经过五分钟的生效周期，在此期间系统将完成数据同步与更新</p>
+                    <p>签名数据的变更（新增 / 删除）需经过五分钟的生效周期，在此期间系统将完成数据同步与更新</p>
                 </template>
             </el-alert>
             <div class="flex justify-between items-center mb-[16px]">
@@ -141,8 +141,8 @@
 
 <script lang="ts" setup>
 import { ref, computed, reactive } from 'vue'
-import { getSignList,addSign,getSmsSignConfig,deleteSign } from '@/app/api/notice'
-import { t } from "@/lang";
+import { getSignList, addSign, getSmsSignConfig, deleteSign } from '@/app/api/notice'
+import { t } from '@/lang'
 
 const visible = ref(false)
 const visibleAdd = ref(false)
@@ -171,9 +171,9 @@ const formData = reactive({ ...initialFormData })
 
 const signConfig = reactive({
     signTypeList: [],
-    signSourceList:[]
+    signSourceList: []
 })
-const getSmsSignConfigFn = ()=> {
+const getSmsSignConfigFn = () => {
     getSmsSignConfig().then(res => {
         signConfig.signTypeList = res.data.sign_type_list
         signConfig.signSourceList = res.data.sign_source_list
@@ -191,24 +191,24 @@ const formRules = computed(() => {
             { required: true, message: '请输入短信签名', trigger: 'blur' },
             {
                 validator: (rule, value, callback) => {
-                    const singleBracketValid = /^【[^【】]*】$/.test(value);
+                    const singleBracketValid = /^【[^【】]*】$/.test(value)
                     if (!singleBracketValid) {
-                        return callback(new Error('短信签名必须被【】包裹'));
+                        return callback(new Error('短信签名必须被【】包裹'))
                     }
 
-                    const content = value.slice(1, -1);
+                    const content = value.slice(1, -1)
 
-                    const lengthValid = content.length >= 2 && content.length <= 20;
+                    const lengthValid = content.length >= 2 && content.length <= 20
                     if (!lengthValid) {
-                        return callback(new Error('短信签名内容需在 2-20 个字符之间'));
+                        return callback(new Error('短信签名内容需在 2-20 个字符之间'))
                     }
 
-                    const invalidChars = /[\s\-+=*&%#@~;]/;
+                    const invalidChars = /[\s\-+=*&%#@~;]/
                     if (invalidChars.test(content)) {
-                        return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'));
+                        return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'))
                     }
 
-                    callback();
+                    callback()
                 },
                 trigger: 'blur'
             }
@@ -218,19 +218,19 @@ const formRules = computed(() => {
             { validator: phoneVerify, trigger: 'blur' }
         ],
         companyName: [
-            { required: true, message: '请输入企业名称', trigger: 'blur' },
+            { required: true, message: '请输入企业名称', trigger: 'blur' }
         ],
         contentExample: [
-            { required: true, message: '请输入短信示例内容', trigger: 'blur' },
+            { required: true, message: '请输入短信示例内容', trigger: 'blur' }
         ],
         creditCode: [
-            { required: true, message: '请输入社会统一信用代码', trigger: 'blur' },
+            { required: true, message: '请输入社会统一信用代码', trigger: 'blur' }
         ],
         legalPerson: [
-            { required: true, message: '请输入法人姓名', trigger: 'blur' },
+            { required: true, message: '请输入法人姓名', trigger: 'blur' }
         ],
         principalName: [
-            { required: true, message: '请输入经办人姓名', trigger: 'blur' },
+            { required: true, message: '请输入经办人姓名', trigger: 'blur' }
         ],
         principalIdCard: [
             { required: true, message: '请输入经办人身份证', trigger: 'blur' },
@@ -239,22 +239,22 @@ const formRules = computed(() => {
         imgUrl: [
             {
                 validator: (rule, value, callback) => {
-                    const needImage = [3, 4, 5].includes(formData.signSource) || formData.signType === 1;
+                    const needImage = [3, 4, 5].includes(formData.signSource) || formData.signType === 1
                     if (needImage) {
                         if (!value || value.length === 0) {
-                            callback(new Error('请上传图片'));
+                            callback(new Error('请上传图片'))
                         } else {
-                            callback();
+                            callback()
                         }
                     } else {
-                        callback(); // 不需要校验
+                        callback() // 不需要校验
                     }
                 },
                 trigger: 'blur'
             }
         ]
 
-    };
+    }
 })
 
 const idCardVerify = (rule: any, value: any, callback: any) => {
@@ -276,14 +276,14 @@ const phoneVerify = (rule: any, value: any, callback: any) => {
 const onSave = async () => {
     await formRef.value?.validate(async (valid) => {
         if (valid) {
-            addSign(props.username,formData).then((res) => {
+            addSign(props.username, formData).then((res) => {
                 setTimeout(() => {
                     visibleAdd.value = false
                     loadSignList()
-                }, 500);
+                }, 500)
             })
         }
-    });
+    })
 }
 
 // 表单内容
@@ -293,8 +293,8 @@ const tableData = reactive({
     total: 0,
     loading: false,
     data: [],
-    searchParam: {},
-});
+    searchParam: {}
+})
 
 const open = () => {
     visible.value = true
@@ -302,19 +302,19 @@ const open = () => {
 }
 // 获取列表
 const loadSignList = () => {
-    tableData.loading = true;
-    let params = {
+    tableData.loading = true
+    const params = {
         page: tableData.page,
         limit: tableData.limit,
-        ...tableData.searchParam,
+        ...tableData.searchParam
     }
     getSignList(props.username, params).then((res) => {
-        tableData.loading = false;
-        tableData.data = res.data.data;
+        tableData.loading = false
+        tableData.data = res.data.data
         tableData.total = res.data.total
     }).catch(() => {
-        tableData.loading = false;
-    });
+        tableData.loading = false
+    })
 }
 
 const addEvent = () => {
@@ -328,14 +328,14 @@ const deleteTemplate = (row:any) => {
     ElMessageBox.confirm(t('确定删除该签名吗？'), t('提示'), {
         confirmButtonText: t('确定'),
         cancelButtonText: t('取消'),
-        type: 'warning',
+        type: 'warning'
     }).then(() => {
         deleteSign(props.username, { signatures: [row.sign] }).then((res) => {
             // loadSignList()
-            tableData.loading = true;
+            tableData.loading = true
             setTimeout(() => {
                 loadSignList()
-            },1000)
+            }, 1000)
         })
     })
 }
@@ -373,23 +373,23 @@ const handleSelectionChange = (val: []) => {
     }
 }
 const checkSelectable = (row: any, index: number) => {
-    return !row.is_default; // 只有不是“使用中”的行可选
+    return !row.is_default // 只有不是“使用中”的行可选
 }
 
 // 批量删除
 const batchDeleteEvent = () => {
     if (multipleSelection.value.length == 0) {
         ElMessage({
-            type: "warning",
-            message: `${ t("请选择要删除的签名") }`,
+            type: 'warning',
+            message: `${t('请选择要删除的签名')}`
         })
         return
     }
 
-    ElMessageBox.confirm(t("确定删除选中的签名吗？"), t("warning"), {
-        confirmButtonText: t("confirm"),
-        cancelButtonText: t("cancel"),
-        type: "warning"
+    ElMessageBox.confirm(t('确定删除选中的签名吗？'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning'
     }).then(() => {
         const signatures: any = []
         multipleSelection.value.forEach((item: any) => {
@@ -399,7 +399,7 @@ const batchDeleteEvent = () => {
         deleteSign(props.username, {
             signatures
         }).then(() => {
-            tableData.loading = true;
+            tableData.loading = true
             setTimeout(() => {
                 loadSignList()
             }, 1000)
@@ -416,4 +416,4 @@ const selectTemplate = (row:any) => {
 defineExpose({ open })
 </script>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/admin/src/app/views/setting/components/sms_template.vue b/admin/src/app/views/setting/components/sms_template.vue
index ebb461ca2..ee4b4bed4 100644
--- a/admin/src/app/views/setting/components/sms_template.vue
+++ b/admin/src/app/views/setting/components/sms_template.vue
@@ -143,16 +143,16 @@
 </template>
 
 <script lang="ts" setup>
-import { ref ,computed,reactive,onMounted,watch} from 'vue'
-import { getTemplateList,getTemplateReportConfig,reportTemplate,templateSync ,getreportTemplateInfo,clearTemplate} from '@/app/api/notice'
-import { t } from "@/lang";
+import { ref, computed, reactive, onMounted, watch } from 'vue'
+import { getTemplateList, getTemplateReportConfig, reportTemplate, templateSync, getreportTemplateInfo, clearTemplate } from '@/app/api/notice'
+import { t } from '@/lang'
 
 const props = defineProps({
     username: {
         type: String,
         default: ''
     },
-    signature:{
+    signature: {
         type: String,
         default: ''
     }
@@ -163,22 +163,22 @@ const tableData = reactive({
     limit: 10,
     total: 0,
     loading: false,
-    data: [],          // 当前页展示的数据（通过 computed 生成）
-    allData: [],       // 原始完整数据
+    data: [], // 当前页展示的数据（通过 computed 生成）
+    allData: [], // 原始完整数据
     searchParam: {
-        template_id: "",
+        template_id: '',
         name: '',
         status: ''
     }
-});
+})
 const filterData = () => {
-    const { template_id, name, status } = tableData.searchParam;
+    const { template_id, name, status } = tableData.searchParam
     return tableData.allData.filter(item => {
-        const matchId = !template_id || String(item.template_id || '').includes(template_id);
-        const matchName = !name || String(item.name || '').includes(name);
-        const matchStatus = !status || item.audit_info.audit_status == status;
-        return matchId && matchName && matchStatus;
-    });
+        const matchId = !template_id || String(item.template_id || '').includes(template_id)
+        const matchName = !name || String(item.name || '').includes(name)
+        const matchStatus = !status || item.audit_info.audit_status == status
+        return matchId && matchName && matchStatus
+    })
 }
 
 watch(() => [tableData.limit, tableData.page], () => {
@@ -187,33 +187,33 @@ watch(() => [tableData.limit, tableData.page], () => {
 
 // 获取列表
 const loadSmsTemplateList = () => {
-    tableData.loading = true;
+    tableData.loading = true
     getTemplateList({ sms_type: 'niuyun', username: props.username }).then((res) => {
-        tableData.allData = res.data;
-        tableData.page = 1; // 搜索后回到第一页
+        tableData.allData = res.data
+        tableData.page = 1 // 搜索后回到第一页
         pagedDataChange()
     }).catch(() => {
-        tableData.loading = false;
-    });
+        tableData.loading = false
+    })
 }
 const searchFormRef = ref(null)
 const resetForm = (formRef) => {
-    if (!formRef) return;
+    if (!formRef) return
     tableData.searchParam = {
-        template_id: "",
+        template_id: '',
         name: '',
         status: ''
     }
     loadSmsTemplateList()
-};
+}
 const pagedData = ref([])
 const pagedDataChange = () => {
-    const filtered = filterData(); // 使用筛选后的数据
-    tableData.total = filtered.length;
-    const start = (tableData.page - 1) * tableData.limit;
-    const end = start + tableData.limit;
-    pagedData.value = filtered.slice(start, end);
-    tableData.loading = false;
+    const filtered = filterData() // 使用筛选后的数据
+    tableData.total = filtered.length
+    const start = (tableData.page - 1) * tableData.limit
+    const end = start + tableData.limit
+    pagedData.value = filtered.slice(start, end)
+    tableData.loading = false
 }
 
 onMounted(() => {
@@ -226,7 +226,7 @@ const visibleAsync = ref(false)
 const repeatList = ref({})
 const syncEvent = () => {
     templateSync('niuyun', props.username).then((res) => {
-        repeatList.value = res.data.repeat_list;
+        repeatList.value = res.data.repeat_list
         if (repeatList.value && Object.keys(repeatList.value).length > 0) {
             visibleAsync.value = true
         } else {
@@ -255,7 +255,7 @@ const clearEvent = (row:any) => {
     ElMessageBox.confirm(t('确定要清除报备信息吗'), t('提示'), {
         confirmButtonText: t('确定'),
         cancelButtonText: t('取消'),
-        type: 'warning',
+        type: 'warning'
     }).then(() => {
         clearTemplate(props.username, row.template_id).then(() => {
             loadSmsTemplateList()
@@ -271,7 +271,7 @@ const visibleReport = ref(false)
 const reportData = ref({
     template_type: 1,
     template_key: '',
-    params_json:{}
+    params_json: {}
 })
 const getTemplateReportConfigFn = () => {
     getTemplateReportConfig().then((res) => {
@@ -296,33 +296,32 @@ const isMarketingWithVariable = computed(() => {
 
 watch(isMarketingWithVariable, (val) => {
     if (val) {
-        ElMessage.error('营销推广类型不支持变量');
+        ElMessage.error('营销推广类型不支持变量')
     }
-});
+})
 
 const reportLoading = ref(false)
 const reportEvent = (row:any) => {
     reportLoading.value = true
-    let signature = props.signature
+    const signature = props.signature
     if (!signature) {
         ElMessage.error('请先配置签名')
-        return
     } else {
         if (row.template_id) {
-            visibleReport.value = true;
-            detail.value = row;
+            visibleReport.value = true
+            detail.value = row
             getreportTemplateInfo('niuyun', props.username, { template_key: row.key }).then((res) => {
-                const paramJson = res.data?.param_json ?? {};
-                reportData.value.template_key = res.data.template_key;
-                reportData.value.template_type = Number(res.data.template_type);
-                reportData.value.params_json = {};
+                const paramJson = res.data?.param_json ?? {}
+                reportData.value.template_key = res.data.template_key
+                reportData.value.template_type = Number(res.data.template_type)
+                reportData.value.params_json = {}
                 if (detail.value.variable) {
                     for (const key in detail.value.variable) {
-                        reportData.value.params_json[key] = paramJson[key] ?? '';
+                        reportData.value.params_json[key] = paramJson[key] ?? ''
                     }
                 }
-                reportLoading.value = false;
-            });
+                reportLoading.value = false
+            })
         } else {
             visibleReport.value = true
             reportLoading.value = false
@@ -331,7 +330,6 @@ const reportEvent = (row:any) => {
             reportData.value.template_key = detail.value.key
             reportData.value.params_json = {}
         }
-
     }
 }
 
@@ -343,10 +341,10 @@ const reportTemplateFn = () => {
     // 校验每个变量是否已选择类型
     const missingParams = Object.entries(detail.value.variable).some(
         ([key]) => !reportData.value.params_json[key]
-    );
+    )
     if (missingParams) {
-        ElMessage.error('请为每个变量选择类型');
-        return;
+        ElMessage.error('请为每个变量选择类型')
+        return
     }
     if (detail.value.template_id) {
         reportData.value.template_id = Number(detail.value.template_id)
diff --git a/admin/src/app/views/setting/copyright.vue b/admin/src/app/views/setting/copyright.vue
index 29bafa7b1..f2ca58287 100644
--- a/admin/src/app/views/setting/copyright.vue
+++ b/admin/src/app/views/setting/copyright.vue
@@ -3,7 +3,8 @@
 
         <el-form class="page-form" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
             <el-card class="box-card !border-none" shadow="never">
-                <h3 class="panel-title !text-sm">{{ t('copyrightEdit') }}</h3>
+                <h3 class="text-[16px] text-[#1D1F3A] font-bold mb-4">{{ pageName }}</h3>
+                <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('copyrightEdit') }}</h3>
 
                 <el-form-item :label="t('logo')">
                     <upload-image v-model="formData.logo" />
@@ -17,23 +18,25 @@
                 <el-form-item :label="t('copyrightDesc')" >
                     <el-input v-model.trim="formData.copyright_desc" type="textarea" rows="4" clearable :placeholder="t('copyrightDescPlaceholder')" class="input-width" maxlength="150" />
                 </el-form-item>
-            </el-card>
-
-            <el-card class="box-card mt-[15px] !border-none" shadow="never">
-                <h3 class="panel-title !text-sm">{{ t('putOnRecordEdit') }}</h3>
-
-                <el-form-item :label="t('icp')" prop="icp">
-                    <el-input v-model.trim="formData.icp" :placeholder="t('icpPlaceholder')" class="input-width" clearable maxlength="20"/>
-                </el-form-item>
-                <el-form-item :label="t('govRecord')" >
-                    <el-input v-model.trim="formData.gov_record" :placeholder="t('govRecordPlaceholder')" class="input-width" clearable maxlength="50"/>
-                </el-form-item>
-                <el-form-item :label="t('govUrl')" >
-                    <el-input v-model.trim="formData.gov_url" :placeholder="t('govUrlPlaceholder')" class="input-width" clearable />
-                </el-form-item>
-                <el-form-item :label="t('marketSupervisionUrl')" >
-                    <el-input v-model.trim="formData.market_supervision_url" rows="4" clearable :placeholder="t('marketSupervisionUrlPlaceholder')" class="input-width" />
-                </el-form-item>
+                <div class="mt-[20px]">
+                    <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('putOnRecordEdit') }}</h3>
+                    <el-form-item :label="t('icp')" prop="icp">
+                        <el-input v-model.trim="formData.icp" :placeholder="t('icpPlaceholder')" class="input-width" clearable maxlength="20"/>
+                        <div class="form-tip">{{ t('网站的ICP备案号，显示在H5和PC端底部') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('govRecord')" >
+                        <el-input v-model.trim="formData.gov_record" :placeholder="t('govRecordPlaceholder')" class="input-width" clearable maxlength="50"/>
+                        <div class="form-tip">{{ t('公安部门登记的备案信息，显示在pc底部') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('govUrl')" >
+                        <el-input v-model.trim="formData.gov_url" :placeholder="t('govUrlPlaceholder')" class="input-width" clearable />
+                        <div class="form-tip">{{ t('H5和PC底部显示的网站公安点击跳转的链接') }}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('marketSupervisionUrl')" >
+                        <el-input v-model.trim="formData.market_supervision_url" rows="4" clearable :placeholder="t('marketSupervisionUrlPlaceholder')" class="input-width" />
+                        <div class="form-tip">{{ t('H5和PC底部显示的市场监督管理局点击跳转的链接') }}</div>
+                    </el-form-item>
+                </div>
             </el-card>
         </el-form>
 
diff --git a/admin/src/app/views/setting/export.vue b/admin/src/app/views/setting/export.vue
index 58f174eb4..206a5c03c 100644
--- a/admin/src/app/views/setting/export.vue
+++ b/admin/src/app/views/setting/export.vue
@@ -145,8 +145,8 @@ loadExportList()
  * 下载导出报表
  */
 const downloadEvent = (data: any) => {
-    var url = img(data.file_path);
-    var suffix = url.substring(url.lastIndexOf("."), url.length);
+    const url = img(data.file_path);
+    const suffix = url.substring(url.lastIndexOf("."), url.length);
     const a = document.createElement('a')
     a.setAttribute('download', url)
     a.setAttribute('target', '_blank')
diff --git a/admin/src/app/views/setting/notice.vue b/admin/src/app/views/setting/notice.vue
index 75b09cfbc..a6caa6432 100644
--- a/admin/src/app/views/setting/notice.vue
+++ b/admin/src/app/views/setting/notice.vue
@@ -107,7 +107,7 @@ const loadNoticeList = () => {
         noticeTableData.seller = []
         res.data.forEach(item => {
             if (item.notice.length) {
-                const buyer = [], seller = []
+                const buyer = []; const seller = []
                 Object.keys(item.notice).forEach((key, index) => {
                     const notice = item.notice[key]
                     notice.addon_name = item.title
diff --git a/admin/src/app/views/setting/notice_records.vue b/admin/src/app/views/setting/notice_records.vue
index 7b71cbe5e..3e862b170 100644
--- a/admin/src/app/views/setting/notice_records.vue
+++ b/admin/src/app/views/setting/notice_records.vue
@@ -113,7 +113,7 @@ const setTemplateList = async () => {
         templateList.seller.list = []
         res.data.forEach(item => {
             if (item.notice.length) {
-                const buyer = [], seller = []
+                const buyer = []; const seller = []
                 Object.keys(item.notice).forEach((key, index) => {
                     const notice = item.notice[key]
                     notice.addon_name = item.title
diff --git a/admin/src/app/views/setting/pay.vue b/admin/src/app/views/setting/pay.vue
index 722512aa0..ee7825cf2 100644
--- a/admin/src/app/views/setting/pay.vue
+++ b/admin/src/app/views/setting/pay.vue
@@ -13,7 +13,7 @@
             <h3 class="panel-title !text-sm">{{ payItems.name }}</h3>
 
             <div>
-                <div class="flex items-center justify-between p-[10px] table-item-border bg">
+                <div class="flex items-center justify-between px-[10px] table-item-border bg h-[50px]">
                     <span class="text-base w-[230px]">{{ t('payType') }}</span>
                     <span class="text-base w-[110px] text-center">{{ t('onState') }}</span>
                     <span class="text-base w-[80px] text-center" v-if="isEdit">{{ t('templateName') }}</span>
@@ -52,7 +52,6 @@
                 <el-button type="primary" :loading="loading" @click="saveFn(formRef)">{{ t('save') }}</el-button>
             </div>
         </div>
-
         <template v-for="(item, index) in payTypeList">
             <component :is="item.setting_component" :ref="(el) => setPayTypeRefs(el, item.key)" v-if="item.setting_component" @complete="setConfigInfo"/>
         </template>
@@ -210,6 +209,6 @@ const cancelFn = () => {
 
 <style lang="scss" scoped>
     .table-item-border {
-        @apply border-b border-[var(--el-border-color)];
+        @apply border-b border-[var(--el-border-color-lighter)];
     }
 </style>
diff --git a/admin/src/app/views/setting/sms.vue b/admin/src/app/views/setting/sms.vue
index f513b4a5c..f722c9f7f 100644
--- a/admin/src/app/views/setting/sms.vue
+++ b/admin/src/app/views/setting/sms.vue
@@ -39,7 +39,7 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getSmsList ,getAccountIsLogin} from '@/app/api/notice'
+import { getSmsList, getAccountIsLogin } from '@/app/api/notice'
 import { useRoute, useRouter } from 'vue-router'
 
 const router = useRouter()
diff --git a/admin/src/app/views/setting/sms_niu.vue b/admin/src/app/views/setting/sms_niu.vue
index 11a8107a6..42ae8b86e 100644
--- a/admin/src/app/views/setting/sms_niu.vue
+++ b/admin/src/app/views/setting/sms_niu.vue
@@ -135,11 +135,11 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref ,computed, onMounted} from 'vue'
+import { reactive, ref, computed, onMounted } from 'vue'
 import { t } from '@/lang'
-import { ArrowLeft } from "@element-plus/icons-vue"
-import { getAccountIsLogin,getAccountInfo,editAccount ,editSms,getSmsCaptcha,getSmsSend,enableNiusms} from '@/app/api/notice'
-import { useRoute, useRouter} from 'vue-router'
+import { ArrowLeft } from '@element-plus/icons-vue'
+import { getAccountIsLogin, getAccountInfo, editAccount, editSms, getSmsCaptcha, getSmsSend, enableNiusms } from '@/app/api/notice'
+import { useRoute, useRouter } from 'vue-router'
 import smsNiuLogin from '@/app/views/setting/components/sms_niu_login.vue'
 import smsTemplate from '@/app/views/setting/components/sms_template.vue'
 import smsRechargeRecord from '@/app/views/setting/components/sms_recharge_record.vue'
@@ -173,7 +173,7 @@ const backRecharge = () => {
     isRecharge.value = false
     getAccountIsLoginFn()
 }
-const getAccountIsLoginFn =()=> {
+const getAccountIsLoginFn = () => {
     loading.value = true
     getAccountIsLogin().then(res => {
         isLoginStatus.value = res.data.is_login
@@ -190,7 +190,6 @@ const getAccountIsLoginFn =()=> {
             loading.value = false
             isInit.value = true
         }
-
     }).catch(err => {
         loading.value = false
         isInit.value = true
@@ -206,7 +205,7 @@ const openDialog = () => {
 const beforeChangeIsEnable = (val) => {
     if (!isInit.value) return false
 
-    let enable = is_enable.value == 1 ? 0 : 1
+    const enable = is_enable.value == 1 ? 0 : 1
     return new Promise((resolve, reject) => {
         enableNiusms({ is_enable: enable }).then(() => {
             resolve(true)
@@ -218,7 +217,7 @@ const beforeChangeIsEnable = (val) => {
 
 const handleSelectTemplate = (val) => {
     loading.value = true
-    editAccount(username.value,{signature: val.sign}).then(res=>{
+    editAccount(username.value, { signature: val.sign }).then(res => {
         getAccountIsLoginFn()
     })
 }
@@ -269,48 +268,48 @@ const changeFormRules = computed(() => {
             }
         ],
         captcha_code: [
-            { required: true, message: '请输入验证码', trigger: 'blur' },
+            { required: true, message: '请输入验证码', trigger: 'blur' }
         ],
         code: [
-            { required: true, message: '请输入动态码', trigger: 'blur' },
+            { required: true, message: '请输入动态码', trigger: 'blur' }
         ]
-    };
-});
+    }
+})
 
-const sending = ref(false); // 发送中状态
-const countdown = ref(0); // 倒计时秒数
+const sending = ref(false) // 发送中状态
+const countdown = ref(0) // 倒计时秒数
 
 const getSmsSendFn = () => {
-    if (countdown.value > 0 || sending.value) return; // 正在倒计时或发送中，直接返回
+    if (countdown.value > 0 || sending.value) return // 正在倒计时或发送中，直接返回
     changeFormRef.value.validateField(['captcha_code'], (valid) => {
-        if (!valid) return;
-        sending.value = true; // 标记为发送中 
+        if (!valid) return
+        sending.value = true // 标记为发送中
         const params = {
             mobile: formData.mobiles,
             captcha_key: changeFormData.value.captcha_key,
             captcha_code: changeFormData.value.captcha_code
-        };
+        }
         getSmsSend(params).then((res) => {
-            changeFormData.value.key = res.data.key;
-            startCountdown(60); // 启动60秒倒计时
+            changeFormData.value.key = res.data.key
+            startCountdown(60) // 启动60秒倒计时
         }).catch((err) => {
             getSmsCaptchaFn()
-            sending.value = false;
+            sending.value = false
         }).finally(() => {
-            sending.value = false; // 无论成功失败都重置发送状态
-        });
-    });
-};
+            sending.value = false // 无论成功失败都重置发送状态
+        })
+    })
+}
 
 // 启动倒计时
 const startCountdown = (seconds) => {
-    countdown.value = seconds;
+    countdown.value = seconds
     const timer = setInterval(() => {
-        countdown.value--;
+        countdown.value--
         if (countdown.value <= 0) {
-            clearInterval(timer);
+            clearInterval(timer)
         }
-    }, 1000);
+    }, 1000)
 }
 
 const onSave = async () => {
@@ -326,7 +325,7 @@ const onSave = async () => {
                 }
             } else {
                 params = {
-                    new_mobile: changeFormData.value.new_mobile,
+                    new_mobile: changeFormData.value.new_mobile
                 }
             }
 
@@ -335,7 +334,7 @@ const onSave = async () => {
                 getAccountIsLoginFn()
             })
         }
-    });
+    })
 }
 
 const back = () => {
diff --git a/admin/src/app/views/setting/sms_niu_pay_result.vue b/admin/src/app/views/setting/sms_niu_pay_result.vue
index 638196c06..e90ad93cb 100644
--- a/admin/src/app/views/setting/sms_niu_pay_result.vue
+++ b/admin/src/app/views/setting/sms_niu_pay_result.vue
@@ -26,7 +26,7 @@
 import { onMounted, onBeforeUnmount, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { t } from '@/lang'
-import { ArrowLeft } from "@element-plus/icons-vue"
+import { ArrowLeft } from '@element-plus/icons-vue'
 import { getOrderPayStatus } from '@/app/api/notice'
 
 const router = useRouter()
diff --git a/admin/src/app/views/setting/sms_records.vue b/admin/src/app/views/setting/sms_records.vue
index cb2b2d98c..9313f7033 100644
--- a/admin/src/app/views/setting/sms_records.vue
+++ b/admin/src/app/views/setting/sms_records.vue
@@ -106,7 +106,7 @@ const setTemplateList = async () => {
         templateList.seller.list = []
         res.data.forEach(item => {
             if (item.notice.length) {
-                const buyer = [], seller = []
+                const buyer = []; const seller = []
                 Object.keys(item.notice).forEach((key, index) => {
                     const notice = item.notice[key]
                     notice.addon_name = item.title
diff --git a/admin/src/app/views/setting/system.vue b/admin/src/app/views/setting/system.vue
index caac15278..5ef0d85cb 100644
--- a/admin/src/app/views/setting/system.vue
+++ b/admin/src/app/views/setting/system.vue
@@ -1,9 +1,10 @@
 <template>
     <div class="main-container">
 
-        <el-form class="page-form" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
+        <el-form class="page-form loading-box" :model="formData" label-width="150px" ref="formRef" :rules="formRules" v-loading="loading">
             <el-card class="box-card !border-none" shadow="never">
-                <h3 class="panel-title !text-sm">{{ t('websiteInfo') }}</h3>
+                <h3 class="text-[16px] text-[#1D1F3A] font-bold mb-4">{{ pageName }}</h3>
+                <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('websiteInfo') }}</h3>
 
                 <el-form-item :label="t('siteName')" prop="site_name">
                     <el-input v-model.trim="formData.site_name" :placeholder="t('siteNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
@@ -29,7 +30,7 @@
             </el-card>
 
             <el-card class="box-card mt-[15px] !border-none" shadow="never">
-                <h3 class="panel-title !text-sm">{{ t('frontEndInfo') }}</h3>
+                <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('frontEndInfo') }}</h3>
                 <el-form-item :label="t('frontEndName')">
                     <el-input v-model.trim="formData.front_end_name" :placeholder="t('frontEndNamePlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
                 </el-form-item>
@@ -45,7 +46,7 @@
             </el-card>
 
             <el-card class="box-card mt-[15px] !border-none" shadow="never">
-                <h3 class="panel-title !text-sm">{{ t('serviceInformation') }}</h3>
+                <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('serviceInformation') }}</h3>
 
                 <el-form-item :label="t('contactsTel')">
                     <el-input v-model.trim="formData.tel" :placeholder="t('contactsTelPlaceholder')" class="input-width" clearable maxlength="20" show-word-limit />
@@ -150,4 +151,8 @@ const save = async (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+:deep(.loading-box .el-loading-spinner){
+    top: 33%;
+}
+</style>
diff --git a/admin/src/app/views/tools/backup_records.vue b/admin/src/app/views/tools/backup_records.vue
index 4cc08facd..1cc88b9e1 100644
--- a/admin/src/app/views/tools/backup_records.vue
+++ b/admin/src/app/views/tools/backup_records.vue
@@ -160,11 +160,11 @@
 
                 <!-- 执行任务 -->
                 <div class="h-[370px] mt-[30px]" v-show="active == 'execute'">
-                    <terminal ref="terminalRef" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
+                    <terminal ref="terminalRef" :name="`backup-restore-${terminalId}`" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
                 </div>
 
                 <!-- 完成 -->
-                <div class="mt-[50px]" v-show="active == 'complete'">
+                <div class="mt-[20px]" v-show="active == 'complete'">
                     <el-result icon="success" :title="iSBackupRecovery == 1 ? t('backupCompleteTips') : t('restoreCompleteTips')" :sub-title="iSBackupRecovery == 1 ?`备份耗时${formattedDuration}，成功备份完成。` : `恢复耗时${formattedDuration}，成功恢复完成。`">
                         <template #icon>
                             <img src="@/app/assets/images/success_icon.png" alt="">
@@ -176,12 +176,15 @@
                     </el-result>
                 </div>
                 <!-- 失败 -->
-                <div class="mt-[50px]" v-show="active == 'error'">
-                    <el-result icon="success" :title="iSBackupRecovery == 1 ? t('备份失败') : t('恢复失败')" :sub-title="backupErrorMessage" >
+                <div class="mt-[20px] h-[370px]" v-show="active == 'error'">
+                    <el-result icon="success" :title="iSBackupRecovery == 1 ? t('备份失败') : t('恢复失败')">
                         <template #icon>
                             <img src="@/app/assets/images/error_icon.png" alt="">
                         </template>
                         <template #extra>
+                            <el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
+                                {{backupErrorMessage}}
+                            </el-scrollbar>
                             <el-button @click="handleReturn" class="!w-[90px]">错误信息</el-button>
                             <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
                         </template>
@@ -197,6 +200,9 @@
                     <!-- 恢复 -->
                     <el-button v-else type="primary" :loading="uploading" :disabled="isPass" @click="restoreUpgradeBackupFn(currentId)">{{ t("nextStep") }}</el-button>
                 </div>
+                <div class="dialog-footer" v-if="active == 'execute'">
+                    <el-button type="primary"  :loading="timeloading" class="!w-[140px]">已用时 {{ formattedDuration }}</el-button>
+                </div>
             </template>
 
         </el-dialog>
@@ -218,7 +224,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, nextTick, watch, h,computed } from 'vue'
+import { ref, reactive, nextTick, watch, h, computed } from 'vue'
 import { t } from '@/lang'
 import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute } from 'vue-router'
@@ -228,6 +234,7 @@ import 'vue-web-terminal/lib/theme/dark.css'
 import { AnyObject } from '@/types/global'
 
 const route = useRoute()
+const terminalId = ref(Date.now());
 const pageName = route.meta.title
 const searchFormRef = ref<FormInstance>()
 const multipleSelection: any = ref([]) // 选中数据
@@ -315,6 +322,7 @@ const manualBackupEvent = () => {
     })
 }
 // 计时器相关
+const timeloading = ref(false)
 const buildStartTime = ref<number | null>(null)
 const buildDuration = ref<number>(0)
 let buildTimer: number | null = null
@@ -340,6 +348,7 @@ const manualBackupFn = (task: any = '') => {
         if (task == '') {
             terminalRef.value.execute('clear')
             terminalRef.value.execute('开始执行')
+            timeloading.value = true
             const storedTime = localStorage.getItem('manual_back_start_time')
             if (storedTime) {
                 buildStartTime.value = Number(storedTime)
@@ -358,13 +367,14 @@ const manualBackupFn = (task: any = '') => {
         }
         if (data.content && !backupContents.includes(data.content)) {
             backupContents.push(data.content)
-            terminalRef.value.pushMessage({ content: `${ data.content }` })
+            terminalRef.value.pushMessage({ content: `${data.content}` })
         }
         if (data.task == 'end') {
             numberOfSteps.value = 2
             setTimeout(() => {
                 numberOfSteps.value = 3
                 active.value = 'complete'
+                timeloading.value = true
                 buildTimer && clearInterval(buildTimer) // 清除计时器
                 localStorage.removeItem('manual_back_start_time')
                 loadList()
@@ -378,6 +388,7 @@ const manualBackupFn = (task: any = '') => {
             }, 2000)
             backupErrorMessage.value = data.content
             active.value = 'error'
+            timeloading.value = true
             // 停止计时器
             if (buildTimer) {
                 clearInterval(buildTimer)
@@ -555,7 +566,7 @@ const restoreUpgradeBackupFn = (id: any, task: any = '') => {
         }
         if (data.content && !restoreContents.includes(data.content)) {
             restoreContents.push(data.content)
-            terminalRef.value.pushMessage({ content: `${ data.content }` })
+            terminalRef.value.pushMessage({ content: `${data.content}` })
         }
         if (data.task == 'end') {
             numberOfSteps.value = 2
diff --git a/admin/src/app/views/tools/cloud_compile.vue b/admin/src/app/views/tools/cloud_compile.vue
index e5a21cbb0..ed35fca9c 100644
--- a/admin/src/app/views/tools/cloud_compile.vue
+++ b/admin/src/app/views/tools/cloud_compile.vue
@@ -71,6 +71,50 @@
                     </el-timeline>
                 </div>
             </div>
+            <div class="mt-[10px]">
+                <div class="panel-title bg-[#F4F5F7] border-[#E6E6E6] border-solid border-b-[1px] h-[40px] flex items-center p-[10px]">
+                    <span class="text-[16px] font-500 text-[#1D1F3A]">第三方云编译</span>
+                     <el-switch v-model="isCloudCompilation" :active-value="1" :inactive-value="0" class="ml-[10px]" @change="confirm" />
+                     <span class="ml-[10px] text-[#9699B6] text-[12px]">自己搭建第三方云编译服务器，无需等待</span>
+                </div>
+                <div class="mt-[20px] flex mb-[14px] text-[16px] items-center text-[#1D1F3A]">
+                    <span class="flex ml-[20px] items-center">
+                        <!-- <i class="w-[3px] h-[12px] bg-primary mr-[6px] block"></i> -->
+                        温馨提示
+                    </span>
+                    <span class="text-[12px] text-[#9699B6] ml-[10px]">运行环境要求：需预先配置 Nodejs 环境</span>
+                    <span class="text-[14px]  text-primary cursor-pointer ml-[10px] border-b-[1px] border-solid border-primary"  @click="linkEvent('https://doc.niucloud.com/saas.html?keywords=/di-san-fang-yun-bian-yi-pei-zhi')">搭建教程</span>
+                </div>
+                 <div class="ml-[40px] text-[14px] text-[#4F516D] mb-[18px]">
+                    <span>1、下载第三方云编译服务器搭建程序包</span><span class="text-primary cursor-pointer "  @click="linkEvent('https://gitee.com/niucloud-team/niucloud-compile-server')"> niucloud-compile-server</span>
+                </div>
+                 <div class="ml-[40px] text-[14px] text-[#4F516D] mb-[18px]">
+                    <span>2、请在指定目录（不能包含中文）下执行 npm install 命令安装依赖包</span>
+                </div>
+                 <div class="ml-[40px] text-[14px] text-[#4F516D] mb-[18px]">
+                    <span>3、启动编译服务器：执行 node niucloud-compile-server.js 命令</span>
+                 </div>
+                 <div class="ml-[40px] text-[14px] text-[#4F516D] mb-[18px]">
+                    <span>4、填写服务器地址并成功连通测试后，点击开启即可享受自己搭建的云编译服务器，编译将无需排队等待。</span>
+                 </div>
+                <div class="mt-[20px] flex mb-[14px] text-[16px] items-center text-[#1D1F3A]">
+                    <span class="flex ml-[20px] items-center">
+                        <!-- <i class="w-[3px] h-[12px] bg-primary mr-[6px] block"></i> -->
+                        云编译服务器设置
+                    </span>
+                </div>
+                <div class="mt-[20px] flex mb-[14px] text-[16px] items-center text-[#1D1F3A] ml-[20px]">
+                    <span class="flex ml-[20px] items-center">
+                        <!-- <i class="w-[3px] h-[12px] bg-primary mr-[6px] block"></i> -->
+                        服务器地址
+                    </span>
+                </div>
+                <div class="flex ml-[40px] mb-[30px] items-center">
+                        <el-input clearable placeholder="请输入服务器地址" class="!w-[520px]"  maxlength="200" v-model="serverurl" />
+                        <el-button type="primary"  class="ml-[10px]" @click="confirm">确定</el-button>
+                        <el-button type="primary" plain class="ml-[10px]" @click="connect" :loading="testConnectLoading">连通测试</el-button>
+                </div>
+            </div>
             <div class="mt-[10px]">
                 <div class="panel-title bg-[#F4F5F7] border-[#E6E6E6] border-solid border-b-[1px] h-[40px] flex items-center p-[10px]">
                     <span class="text-[16px] font-500 text-[#1D1F3A]">本地编译</span>
@@ -159,22 +203,25 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch } from "vue"
-import { ElMessage } from "element-plus"
-import { useClipboard } from "@vueuse/core"
-import { t } from "@/lang"
-import Upgrade from "@/app/components/upgrade/index.vue"
-import CloudBuild from "@/app/components/cloud-build/index.vue"
-
+import { ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useClipboard } from '@vueuse/core'
+import { t } from '@/lang'
+import Upgrade from '@/app/components/upgrade/index.vue'
+import CloudBuild from '@/app/components/cloud-build/index.vue'
+import { connectTest, setLocalUrl, getLocalUrl } from '@/app/api/upgrade'
+import Test from '@/utils/test'
 const loading = ref<Boolean>(false)
+const btnLoading = ref<Boolean>(false)
+const testConnectLoading = ref(false)
 
 // 云编译调用
 const cloudBuildRef = ref<any>(null)
 const handleCloudBuild = () => {
-    ElMessageBox.confirm(t("cloudBuildTips"), t("warning"), {
-        confirmButtonText: t("confirm"),
-        cancelButtonText: t("cancel"),
-        type: "warning"
+    ElMessageBox.confirm(t('cloudBuildTips'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning'
     }).then(() => {
         cloudBuildRef.value?.open()
     })
@@ -186,8 +233,8 @@ const { copy, isSupported, copied } = useClipboard()
 const copyEvent = (text: string) => {
     if (!isSupported.value) {
         ElMessage({
-            message: t("notSupportCopy"),
-            type: "warning"
+            message: t('notSupportCopy'),
+            type: 'warning'
         })
         return
     }
@@ -197,11 +244,81 @@ const copyEvent = (text: string) => {
 watch(copied, () => {
     if (copied.value) {
         ElMessage({
-            message: t("copySuccess"),
-            type: "success"
+            message: t('copySuccess'),
+            type: 'success'
         })
     }
 })
+
+const linkEvent = (url: string) => {
+    window.open(url, '_blank')
+}
+const isCloudCompilation = ref(0)
+const serverurl = ref('')
+const connect = async () => {
+    if (serverurl.value != '' && !Test.url(serverurl.value)) {
+        ElMessage({
+            message: '请输入正确的服务器地址，必须以http://或https://开头',
+            type: 'warning'
+        })
+        return
+    }
+    testConnectLoading.value = true
+    connectTest({
+        url: serverurl.value
+    }).then(res => {
+        if (res.data == false) {
+            ElMessage({
+                message: '连通测试失败',
+                type: 'error'
+            })
+        } else {
+            ElMessage({
+                message: '连通测试成功',
+                type: 'success'
+            })
+        }
+        testConnectLoading.value = false
+    }).catch(() => {
+        testConnectLoading.value = false
+    })
+}
+const confirm = async () => {
+    if (serverurl.value != '' && !Test.url(serverurl.value)) {
+        ElMessage({
+            message: '请输入正确的服务器地址，必须以http://或https://开头',
+            type: 'warning'
+        })
+        return
+    }
+    btnLoading.value = true
+    setLocalUrl({
+        url: serverurl.value,
+        is_open: isCloudCompilation.value
+    }).then(res => {
+        if (res.data == 1) {
+            ElMessage({
+                message: '保存成功',
+                type: 'success'
+            })
+            getLocalUrlFn()
+        }
+    }).catch(() => {
+        ElMessage({
+            message: '保存失败',
+            type: 'error'
+        })
+    }).finally(() => {
+        btnLoading.value = false
+    })
+}
+const getLocalUrlFn = async () => {
+    getLocalUrl({}).then(res => {
+        serverurl.value = res.data.baseUri
+        isCloudCompilation.value = res.data.isOpen
+    })
+}
+getLocalUrlFn()
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/app/views/tools/code/components/add-table.vue b/admin/src/app/views/tools/code/components/add-table.vue
index d15fe02cc..29e8ae817 100644
--- a/admin/src/app/views/tools/code/components/add-table.vue
+++ b/admin/src/app/views/tools/code/components/add-table.vue
@@ -73,7 +73,7 @@ loadTableList()
 const confirm = (row: any) => {
     const name: string = row.Name
     tableTableData.loading = true
-    addGenerateTable({ 'table_name': name }).then(res => {
+    addGenerateTable({ table_name: name }).then(res => {
         tableTableData.loading = false
         showDialog.value = false
         router.push({ path: '/tools/code/edit', query: { id: res.data.id } })
diff --git a/admin/src/app/views/tools/code/index.vue b/admin/src/app/views/tools/code/index.vue
index 6df650348..8fe57ca67 100644
--- a/admin/src/app/views/tools/code/index.vue
+++ b/admin/src/app/views/tools/code/index.vue
@@ -76,7 +76,7 @@
                 <el-tab-pane :label="t('codeList')" name="codeList">
                     <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
                         <el-form :inline="true" :model="codeTableData.searchParam" ref="searchFormRef">
-                             <el-form-item :label="t('addonName')" prop="addon_name">
+                            <el-form-item :label="t('addonName')" prop="addon_name">
                                 <el-select v-model="codeTableData.searchParam.addon_name" placeholder="全部" filterable remote clearable :remote-method="getAddonDevelopFn">
                                     <el-option label="全部" value="" />
                                     <el-option label="系统" value="2" />
@@ -129,8 +129,8 @@
                         </el-table>
                         <div class="mt-[16px] flex justify-end">
                             <el-pagination v-model:current-page="codeTableData.page" v-model:page-size="codeTableData.limit"
-                                layout="total, sizes, prev, pager, next, jumper" :total="codeTableData.total"
-                                @size-change="loadGenerateTableList()" @current-change="loadGenerateTableList" />
+                                           layout="total, sizes, prev, pager, next, jumper" :total="codeTableData.total"
+                                           @size-change="loadGenerateTableList()" @current-change="loadGenerateTableList" />
                         </div>
                     </div>
                 </el-tab-pane>
@@ -142,8 +142,8 @@
                 <div class="flex h-[50vh]" v-loading="codeLoading">
                     <el-scrollbar class="h-[100%] w-[270px]">
                         <el-tree v-if="treeData.length && treeKey != ''" :data="treeData" :props="{ label: 'name', value: 'key' }"
-                            node-key="key" :current-node-key="treeKey" :expand-on-click-node="false" highlight-current
-                            default-expand-all ref="treeRef" @node-click="nodeClick">
+                                 node-key="key" :current-node-key="treeKey" :expand-on-click-node="false" highlight-current
+                                 default-expand-all ref="treeRef" @node-click="nodeClick">
                             <template #default="{ node, data }">
                                 <div class="flex items-center">
                                     <el-icon v-if="data.children">
@@ -285,12 +285,12 @@ const generatorCheckFileFn = ((id: any) => {
     generatorCheckFile({ id }).then((res: any) => {
         codeTableData.loading = false
         ElMessageBox.confirm(
-                res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
-                t('warning'),
-                {
-                    confirmButtonText: t('confirm'),
-                    cancelButtonText: t('cancel')
-                }
+            res.msg != '2' ? t('saveAndSyncText') : t('saveAndSyncText1'),
+            t('warning'),
+            {
+                confirmButtonText: t('confirm'),
+                cancelButtonText: t('cancel')
+            }
         ).then(() => {
             generateCreateFn(id, 3)
         }).catch(() => {
diff --git a/admin/src/app/views/tools/detection.vue b/admin/src/app/views/tools/detection.vue
index b1b1cb2a4..601bf4a4b 100644
--- a/admin/src/app/views/tools/detection.vue
+++ b/admin/src/app/views/tools/detection.vue
@@ -77,7 +77,7 @@ import { t } from '@/lang'
 import { getSystem } from '@/app/api/tools'
 
 const systemService = ref({})
-const loading = ref(true);
+const loading = ref(true)
 const getSystemService = () => {
     getSystem().then(res => {
         systemService.value = res.data
diff --git a/admin/src/app/views/tools/schedule.vue b/admin/src/app/views/tools/schedule.vue
index dc9232225..615ad8fcd 100644
--- a/admin/src/app/views/tools/schedule.vue
+++ b/admin/src/app/views/tools/schedule.vue
@@ -4,7 +4,11 @@
 
             <div class="flex justify-between items-center mb-[20px]">
                 <span class="text-page-title">{{ pageName }}</span>
-                <el-button type="primary" @click="showEvent">{{ t('addCron') }}</el-button>
+                <div>
+                    <el-button type="primary" @click="showEvent">{{ t('addCron') }}</el-button>
+                    <el-button type="primary" @click="resetCronFn">{{ t('重置计划任务') }}</el-button>
+                </div>
+               
             </div>
 
             <el-alert type="info">
@@ -22,13 +26,13 @@
                 <div class="flex justify-between">
                     <el-form :inline="true" :model="cronTableData.searchParam" ref="searchFormRef">
                         <el-form-item :label="t('title')" prop="key">
-                            <el-select v-model="cronTableData.searchParam.key" placeholder="全部" filterable remote clearable :remote-method="loadCronList">
+                            <el-select v-model="cronTableData.searchParam.key" placeholder="全部" filterable remote clearable>
                                 <el-option label="全部" value="all" />
                                 <el-option v-for="item in templateList" :key="item.key" :label="item.name" :value="item.key" />
                             </el-select>
                         </el-form-item>
                         <el-form-item :label="t('status')" prop="status">
-                            <el-select v-model="cronTableData.searchParam.status" placeholder="全部" filterable remote clearable :remote-method="loadCronList">
+                            <el-select v-model="cronTableData.searchParam.status" placeholder="全部" clearable>
                                 <el-option label="全部" value="all" />
                                 <el-option label="启用" value="1" />
                                 <el-option label="关闭" value="0" />
@@ -142,7 +146,8 @@ import {
     addCron,
     editCron,
     deleteCron,
-    doCron
+    doCron,
+    resetCron
 } from '@/app/api/sys'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
@@ -220,14 +225,14 @@ const formData: Record<string, any> = reactive({ ...initialFormData })
 const formRef = ref<FormInstance>()
 
 const showEvent = () => {
-    formData.id = 0,
-    formData.key = '',
-    formData.status = 2,
-    formData.time.type = 'min',
-    formData.time.week = '',
-    formData.time.day = '',
-    formData.time.hour = '',
-    formData.time.min = '',
+    formData.id = 0
+    formData.key = ''
+    formData.status = 2
+    formData.time.type = 'min'
+    formData.time.week = ''
+    formData.time.day = ''
+    formData.time.hour = ''
+    formData.time.min = ''
     showDialog.value = true
 }
 
@@ -285,8 +290,8 @@ const addEvent = async (formEl: FormInstance | undefined) => {
 }
 
 const editEvent = (item:any) => {
-    formData.id = item.id,
-    formData.key = item.key,
+    formData.id = item.id
+    formData.key = item.key
     formData.status = item.status
     formData.time = item.time
     showDialog.value = true
@@ -321,6 +326,24 @@ const doEvent = (row: any) => {
     })
 }
 
+// 重置任务
+const resetCronFn = (row: any) => {
+    ElMessageBox.confirm(t('确认要重置计划任务吗？'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }
+    ).then(() => {
+        resetCron().then((res) => {
+            ElMessage.success(res.msg)
+        }).catch(() => {
+        })
+    })
+}
+
+
+
 const cronDialog: Record<string, any> | null = ref(null)
 /**
  * 查看任务
diff --git a/admin/src/components/diy-page/index.vue b/admin/src/components/diy-page/index.vue
new file mode 100644
index 000000000..52f40efee
--- /dev/null
+++ b/admin/src/components/diy-page/index.vue
@@ -0,0 +1,202 @@
+<template>
+    <div>
+        <div @click="show">
+            <slot>
+                <el-input v-model="selectData.title" :placeholder="t('请选择跳转页面')" readonly class="link-input">
+                    <template #suffix>
+                        <div @click.stop="clear">
+                            <el-icon v-if="selectData.name">
+                                <Close />
+                            </el-icon>
+                            <el-icon v-else>
+                                <ArrowRight />
+                            </el-icon>
+                        </div>
+                    </template>
+                </el-input>
+            </slot>
+        </div>
+        <el-dialog v-model="showDialog" :title="t('页面选择')" width="850px" :destroy-on-close="true" :close-on-click-modal="false">
+
+        <el-table :data="tableData.data" size="large" v-loading="tableData.loading" ref="timeListTableRef" max-height="400">
+            <template #empty>
+                <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
+            </template>
+            <el-table-column min-width="7%">
+                <template #default="{ row }">
+                    <el-checkbox v-model="row.checked" @change="handleCheckChange($event,row)" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="page_title" :label="t('页面名称')"  min-width="25%" />
+            <el-table-column prop="type_name" :label="t('页面类型')"   min-width="25%" />
+            <el-table-column prop="url" :label="t('页面路径')"   min-width="25%" />
+        </el-table>
+        <div class="mt-[16px] flex">
+            <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
+                layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
+                @size-change="loadList()" @current-change="loadList" />
+        </div>
+        <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" @click="save">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+    
+</template>
+
+<script lang="ts" setup>
+import { t } from '@/lang'
+import { ref, reactive, nextTick,computed } from 'vue'
+import { FormInstance, ElMessage } from "element-plus";
+import { getPageLink } from '@/app/api/diy'
+
+const prop = defineProps({
+    modelValue: {
+        type: Object,
+        default: () => {
+            return {
+                id: 0,
+                name: '',
+                parent: '',
+                title: '',
+                url: ''
+            }
+        }
+    },
+    ignore: {
+        type: Array,
+        default: []
+    }
+})
+
+const clear = () => {
+    selectData.value = {
+        id: 0,
+        name: '',
+        parent: '',
+        title: '',
+        url: ''
+    }
+}
+
+const emit = defineEmits(['update:modelValue', 'confirm', 'success'])
+
+const selectData: any = computed({
+    get() {
+        return prop.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+const searchFormRef = ref<FormInstance>()
+
+const tableData = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        name: '',
+    }
+})
+
+const timeListTableRef = ref()
+const showDialog = ref(false)
+const show = () => {
+    showDialog.value = true
+    loadList()
+}
+
+/**
+ * 获取商品列表
+ */
+const loadList = (page: number = 1) => {
+    tableData.loading = true
+    tableData.page = page
+    getPageLink({
+        page: tableData.page,
+        limit: tableData.limit,
+        ...tableData.searchParam
+    }).then(res => {
+        tableData.loading = false
+        tableData.data = res.data.data
+        tableData.data.forEach((item: any) => {
+            item.checked = item.id == selectData.value.id
+
+        })
+        tableData.total = res.data.total
+        setTimesSelected();
+    }).catch(() => {
+        tableData.loading = false
+    })
+}
+loadList()
+const handleCheckChange = (isSelect: any, row: any) => {
+    if (isSelect) {
+        selectData.value.id = row.id
+    } else {
+        selectData.value.id = 0 // 未选中，移除当前
+    }
+    setTimesSelected()
+}
+
+// // 表格设置选中状态
+const setTimesSelected = () => {
+    nextTick(() => {
+        for (let i = 0; i < tableData.data.length; i++) {
+            tableData.data[i].checked = false
+            if (selectData.value.id == tableData.data[i].id) {
+                tableData.data[i].checked = true
+                Object.assign(selectData.value, tableData.data[i])
+            }
+        }
+    })
+}
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+
+    loadList()
+}
+
+const save = () => {
+    if (selectData.value.id == 0) {
+        ElMessage({
+            type: 'warning',
+            message: `${ t('请选择页面') }`
+        })
+        return;
+    }
+   selectData.value ={
+       id:selectData.value.id,
+       name:selectData.value.name,
+       parent:selectData.value.parent,
+       title:selectData.value.title,
+       url:selectData.value.url
+   }
+   showDialog.value = false;
+
+}
+
+defineExpose({
+    show,
+    showDialog,
+})
+</script>
+
+<style lang="scss" scoped>
+.form-item-wrap {
+    margin-right: 10px !important;
+    margin-bottom: 10px !important;
+
+    &.last-child {
+        margin-right: 0 !important;
+    }
+}
+</style>
diff --git a/admin/src/components/spread-popup/index.vue b/admin/src/components/spread-popup/index.vue
index 9f9f42fd6..e9b82cda8 100644
--- a/admin/src/components/spread-popup/index.vue
+++ b/admin/src/components/spread-popup/index.vue
@@ -50,15 +50,19 @@ import { img } from '@/utils/common'
 
 const showDialog = ref(false)
 const channel = ref('h5')
+
+// H5相关变量
 const wapUrl = ref('')
 const wapDomain = ref('')
 const wapImage = ref('')
 const wapPreview = ref('')
-const pageName = ref('')
+
+// 小程序相关变量
 const weappData = reactive({
     path: ''
 })
 
+// 基础配置获取
 getUrl().then((res: any) => {
     wapUrl.value = res.data.wap_url
 
@@ -66,42 +70,53 @@ getUrl().then((res: any) => {
     if (import.meta.env.MODE == 'production') return
 
     wapDomain.value = res.data.wap_domain
-
     // env文件配置过wap域名
     if (wapDomain.value) {
         wapUrl.value = wapDomain.value + '/wap'
     }
-
     const wapDomainStorage = storage.get('wap_domain')
     if (wapDomainStorage) {
         wapUrl.value = wapDomainStorage
     }
 })
 
-// **生成H5二维码**
+// 生成H5二维码（支持多参数）
 const generateH5QRCode = () => {
-    wapPreview.value = `${ wapUrl.value }${ pageName.value }`
-    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+    // 处理参数为URL格式
+    const queryStr = params.value
+        .map(item => `${encodeURIComponent(item.name)}=${encodeURIComponent(item.value)}`)
+        .join('&')
+    
+    // 拼接完整H5链接
+    wapPreview.value = `${wapUrl.value}${pagePath.value}${queryStr ? '?' + queryStr : ''}`
+    
+    // 生成二维码
+    QRCode.toDataURL(wapPreview.value, { 
+        errorCorrectionLevel: 'L', 
+        margin: 0, 
+        width: 120 
+    }).then(url => {
         wapImage.value = url
     })
 }
 
-// **获取小程序二维码**
+// 获取小程序二维码（支持多参数）
 const fetchWeAppQRCode = () => {
-    // 去掉 page 参数前面的 '/'
-    if (pagePath.value.startsWith('/')) {
-        pagePath.value = pagePath.value.slice(1);
+    // 处理页面路径（去掉前缀的 '/'）
+    let page = pagePath.value
+    if (page.startsWith('/')) {
+        page = page.slice(1)
     }
 
+    // 调用接口获取小程序二维码
     getQrcode({
-        page: pagePath.value, // 传递页面路径
-        folder: folder.value, // 传递模块目录
-        params: [
-            {
-                column_name: columnName.value,
-                column_value: columnValue.value
-            }
-        ]
+        page: page,
+        folder: folder.value,
+        // 转换参数格式为接口要求的 { column_name, column_value }
+        params: params.value.map(item => ({
+            column_name: item.name,
+            column_value: item.value
+        }))
     }).then((res: any) => {
         if (res.data) {
             weappData.path = res.data.weapp_path
@@ -109,24 +124,30 @@ const fetchWeAppQRCode = () => {
     })
 }
 
-// 定义变量存储传入的数据
-const pagePath = ref("")
-const columnName = ref("")
-const columnValue = ref("")
-const titleName = ref("")
-const folder: any = ref("")
+// 核心参数存储
+const pagePath = ref("") // 页面路径（如 "/addon/pintuan/pages/goods/detail"）
+const params = ref<Array<{name: string; value: string | number}>>([]) // 多参数数组
+const titleName = ref("") // 弹窗标题
+const folder: any = ref("") // 模块目录
 
-// **显示对话框**
-const show = (page: string, column: string, value: string, title: string, dir: string) => {
+// 显示弹窗（对外暴露的方法）
+const show = (
+    page: string, 
+    paramsArr: Array<{name: string; value: string | number}>, 
+    title: string, 
+    dir: string
+) => {
+    // 重置参数
     pagePath.value = page
-    columnName.value = column
-    columnValue.value = value
+    params.value = paramsArr
     titleName.value = title
     folder.value = dir
-    pageName.value = `${ pagePath.value }?${ columnName.value }=${ columnValue.value }`
-
+    
+    // 生成二维码
     generateH5QRCode()
     fetchWeAppQRCode()
+    
+    // 显示弹窗
     showDialog.value = true
 }
 
@@ -156,3 +177,4 @@ defineExpose({
     show
 })
 </script>
+    
\ No newline at end of file
diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue
index cc3a8daed..4fd464428 100644
--- a/admin/src/components/upload-attachment/attachment.vue
+++ b/admin/src/components/upload-attachment/attachment.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex border-t border-b main-wrap border-color w-full" :class="scene == 'select' ? 'h-[40vh]' : 'h-full'">
+    <div class="flex border-t border-b main-wrap border-color w-full attachment-wrap" :class="scene == 'select' ? 'h-[546px]' : 'h-full'">
 
         <!-- 分组 -->
         <div class="group-wrap w-[180px] p-[15px] h-full border-r border-color flex flex-col">
@@ -67,8 +67,8 @@
                         <div class="attachment-item mr-[10px]" :class="scene == 'select' ? 'w-[100px]' : 'w-[120px]'" v-for="(item, index) in attachment.data" :key="index">
                             <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center" :class="scene == 'select' ? 'h-[100px]' : 'h-[120px]'" @click="selectFile(item)">
 
-                                <el-image :src="img(item.url)" fit="contain" v-if="type == 'image'"/>
-                                <video :src="img(item.url)" v-else-if="type == 'video'"/>
+                                <el-image :src="img(item.thumb)" fit="contain" v-if="type == 'image'"/>
+                                <video :src="img(item.thumb)" v-else-if="type == 'video'"/>
                                 <icon :name="item.url" size="24px" v-else-if="type == 'icon'"/>
                                 <div class="absolute z-[1] flex items-center justify-center w-full h-full inset-0 bg-black bg-opacity-60" v-show="selectedFile[item.att_id]">
                                     <icon name="element Select" color="#fff" size="40px" />
@@ -82,7 +82,7 @@
                             <div class="flex items-center">
                                 <el-tooltip placement="top">
                                     <template #content>{{ item.real_name }}</template>
-                                    <div class="truncate my-[10px] cursor-pointer text-base flex-1 text-center">{{ item.real_name }}</div>
+                                    <div class="truncate my-[10px] cursor-pointer text-base flex-1 text-center h-[20px] leading-[20px]">{{ item.real_name }}</div>
                                 </el-tooltip>
                                 <!-- 图片操作 -->
                                 <el-dropdown :hide-on-click="false" v-if="scene == 'attachment'" class="attachment-action hidden ">
@@ -112,8 +112,8 @@
                     <div class="flex flex-wrap" v-else-if="attachment.data.length && operate === false">
                         <div class="attachment-item mr-[10px] w-[120px]" v-for="(item, index) in attachment.data" :key="index">
                             <div class="attachment-wrap w-full rounded cursor-pointer overflow-hidden relative flex items-center justify-center h-[120px]">
-                                <el-image :src="img(item.url)" fit="contain" v-if="type == 'image'" :preview-src-list="item.image_list"/>
-                                <video :src="img(item.url)" v-else-if="type == 'video'" @click="previewVideo(index)"></video>
+                                <el-image :src="img(item.thumb)" fit="contain" v-if="type == 'image'" :preview-src-list="item.image_list"/>
+                                <video :src="img(item.thumb)" v-else-if="type == 'video'" @click="previewVideo(index)"></video>
                                 <icon :name="item.url" size="24px" v-else-if="type == 'icon'"></icon>
                             </div>
                             <div class="flex items-center">
@@ -232,12 +232,12 @@ const attachment: Record<string, any> = reactive({
     loading: true,
     page: 1,
     total: 0,
-    limit: prop.scene == 'select' ? 10 : 20,
+    limit: prop.scene == 'select' ? 18 : 20,
     data: []
 })
 
 if (prop.scene == 'select') {
-    attachment.limit = 10
+    attachment.limit = 18
     if (prop.type == 'icon') {
         attachment.limit = 20
     }
@@ -271,7 +271,7 @@ const getIconCategoryList = (search) => {
             }
 
             Object.keys(iconJsonFile).reverse().forEach(key => {
-                let item = iconJsonFile[key].default
+                const item = iconJsonFile[key].default
                 if (search.name && item.name.indexOf(search.name) != -1) {
                     result.data.push(item)
                 } else if (!search.name) {
@@ -280,7 +280,7 @@ const getIconCategoryList = (search) => {
 
                 if (!iconList[item.id]) {
                     item.glyphs = item.glyphs.map(iconItem => {
-                        iconItem.url = `${ item.font_family } ${ item.css_prefix_text }${ iconItem.font_class }`
+                        iconItem.url = `${item.font_family} ${item.css_prefix_text}${iconItem.font_class}`
                         iconItem.real_name = iconItem.name
                         iconItem.att_id = iconItem.icon_id
                         return iconItem
@@ -361,11 +361,14 @@ const getAttachmentList = debounce((page: number = 1) => {
 
         if (prop.type != 'icon') {
             for (let i = 0; i < attachment.data.length; i++) {
-                attachment.data[i]['image_list'] = []
-                attachment.data[i]['image_list'].push(img(res.data.data[i]['url']))
+                attachment.data[i].image_list = []
+                attachment.data[i].image_list.push(img(res.data.data[i].thumb))
             }
         }
-    }).catch(() => {
+    }).catch((err) => {
+        if (prop.type == 'image' && err.response.status == 500) {
+            showElMessage({ message: 'php脚本内存不足请加大php配置中memory_limit的数值, <a style="text-decoration: underline;" href="https://www.kancloud.cn/niucloud/niucloud-admin-develop/3249216" target="blank">点击查看相关手册</a>', type: 'error', dangerouslyUseHTMLString: true })
+        }
         attachment.loading = false
     })
 })
@@ -442,9 +445,10 @@ const time = ref<any>(null)
 const upload = computed(() => {
     const headers: Record<string, any> = {}
     headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+    const baseURL = import.meta.env.VITE_APP_BASE_URL.substr(-1) == '/' ? import.meta.env.VITE_APP_BASE_URL : `${import.meta.env.VITE_APP_BASE_URL}/`
 
     return {
-        action: `${import.meta.env.VITE_APP_BASE_URL}/sys/${prop.type}`,
+        action: `${baseURL}sys/${prop.type}`,
         multiple: true,
         data: {
             cate_id: attachmentParam.cate_id
@@ -519,30 +523,30 @@ const clearSelected = () => {
 const selectFile = (data: any) => {
     if (selectedFile[data.att_id]) {
         delete selectedFile[data.att_id]
-        selectedFileIndex.splice(selectedFileIndex.indexOf(data.att_id),1);
+        selectedFileIndex.splice(selectedFileIndex.indexOf(data.att_id), 1)
     } else if (prop.scene == 'select') {
         const keys = Object.keys(toRaw(selectedFile))
         const length = keys.length
         if (prop.limit == 1 && length == prop.limit) {
             delete selectedFile[keys[0]]
-            selectedFileIndex.splice(selectedFileIndex.indexOf(keys[0]),1);
+            selectedFileIndex.splice(selectedFileIndex.indexOf(keys[0]), 1)
         } else if (prop.limit && length >= prop.limit) {
             ElMessage.info(t('upload.triggerUpperLimit'))
             return
         }
         selectedFile[data.att_id] = toRaw(data)
-        selectedFileIndex.push(data.att_id);
+        selectedFileIndex.push(data.att_id)
     } else {
         selectedFile[data.att_id] = toRaw(data)
-        selectedFileIndex.push(data.att_id);
+        selectedFileIndex.push(data.att_id)
     }
 }
 
 // 获取当前选中文件的下标
-const getFileIndex = (att_id:any)=>{
-    let index = selectedFileIndex.indexOf(att_id);
-    if(index == -1) return 0;
-    return index + 1;
+const getFileIndex = (att_id:any) => {
+    const index = selectedFileIndex.indexOf(att_id)
+    if (index == -1) return 0
+    return index + 1
 }
 
 /**
@@ -612,7 +616,7 @@ const previewImage = (index: number) => {
 }
 const previewImageList = computed(() => {
     return toRaw(attachment.data).map((item: Record<string, any>) => {
-        return img(item.url)
+        return img(item.thumb)
     })
 })
 
@@ -626,7 +630,7 @@ const videoViewer = reactive({
 
 const previewVideo = (index: number) => {
     videoViewer.visible = true
-    videoViewer.src = img(attachment.data[index].url)
+    videoViewer.src = img(attachment.data[index].thumb)
 }
 
 defineExpose({
@@ -676,11 +680,9 @@ defineExpose({
         content: '';
         display: block;
         position: absolute;
-        border: 15px solid;
-        border-bottom-color: var(--el-color-primary);
+        border: 15px solid transparent;
         border-right-color: var(--el-color-primary);
-        border-top-color: transparent;
-        border-left-color: transparent;
+        border-bottom-color: var(--el-color-primary);
         bottom: 0;
         right: 0;
     }
@@ -713,4 +715,8 @@ defineExpose({
         background: #fff !important;
         box-shadow: var(--el-box-shadow-light);
     }
-}</style>
+}
+.attachment-wrap .el-upload-list__item .el-upload-list__item-info {
+    width: 150px!important;
+}
+</style>
diff --git a/admin/src/components/upload-attachment/index.vue b/admin/src/components/upload-attachment/index.vue
index 7ff86fd64..38f148f64 100644
--- a/admin/src/components/upload-attachment/index.vue
+++ b/admin/src/components/upload-attachment/index.vue
@@ -2,7 +2,7 @@
     <span @click="openDialog" class="cursor-pointer">
         <slot></slot>
     </span>
-    <el-dialog v-model="showDialog" :title="t('upload.select' + type)" width="60%" class="attachment-dialog" :destroy-on-close="true">
+    <el-dialog v-model="showDialog" :title="t('upload.select' + type)" width="920px" class="attachment-dialog" :destroy-on-close="true">
 
         <attachment :limit="limit" :type="type" ref="attachmentRef" />
 
diff --git a/admin/src/components/upload-audio/index.vue b/admin/src/components/upload-audio/index.vue
new file mode 100644
index 000000000..4ea84fdf4
--- /dev/null
+++ b/admin/src/components/upload-audio/index.vue
@@ -0,0 +1,73 @@
+<template>
+    <el-upload v-bind="upload" class="upload-file">
+        <slot>
+            <el-button type="primary">{{ t('上传音频') }}</el-button>
+        </slot>
+    </el-upload>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { t } from '@/lang'
+import { getToken } from '@/utils/common'
+import { UploadFile, ElMessage } from 'element-plus'
+import storage from '@/utils/storage'
+
+const prop = defineProps({
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    api: {
+        type: String,
+        default: 'sys/audio'
+    }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const value = computed({
+    get () {
+        return prop.modelValue
+    },
+    set (value) {
+        emit('update:modelValue', value)
+    }
+})
+
+const upload: Record<string, any> = {
+    action: `${import.meta.env.VITE_APP_BASE_URL}/${prop.api}`,
+    showFileList: false,
+    headers: {},
+    accept: 'audio/*,.mp3,.wav,.ogg,.m4a,.flac,.aac,.wma',
+    beforeUpload: (file: File) => {
+        const audioTypes = ['audio/mp3', 'audio/wav', 'audio/ogg', 'audio/m4a', 'audio/flac', 'audio/aac', 'audio/wma', 'audio/mpeg']
+        const audioExtensions = ['.mp3', '.wav', '.ogg', '.m4a', '.flac', '.aac', '.wma']
+        
+        const isAudio = audioTypes.includes(file.type) || audioExtensions.some(ext => file.name.toLowerCase().endsWith(ext))
+        
+        if (!isAudio) {
+            ElMessage({ message: t('请上传音频文件'), type: 'error' })
+            return false
+        }
+        
+        return true
+    },
+    onSuccess: (response: any, uploadFile: UploadFile) => {
+        if (response.code != undefined && response.code != 1) {
+            ElMessage({ message: response.msg, type: 'error' })
+            return
+        }
+        value.value = response.data.url
+        ElMessage({ message: t('upload.success'), type: 'success' })
+    }
+}
+upload.headers[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+
+</script>
+
+<style lang="scss">
+.upload-file .el-upload {
+    width: 100%;
+}
+</style>
diff --git a/admin/src/components/verifition/utils/ase.js b/admin/src/components/verifition/utils/ase.js
index 4c1c55945..970a9fdbf 100644
--- a/admin/src/components/verifition/utils/ase.js
+++ b/admin/src/components/verifition/utils/ase.js
@@ -3,9 +3,9 @@ import CryptoJS from 'crypto-js'
  * @word 要加密的内容
  * @keyWord String  服务器随机返回的关键字
  *  */
-export function aesEncrypt(word,keyWord="XwKsGlMcdPMEhR1B"){
-  var key = CryptoJS.enc.Utf8.parse(keyWord);
-  var srcs = CryptoJS.enc.Utf8.parse(word);
-  var encrypted = CryptoJS.AES.encrypt(srcs, key, {mode:CryptoJS.mode.ECB,padding: CryptoJS.pad.Pkcs7});
-  return encrypted.toString();
+export function aesEncrypt (word, keyWord = 'XwKsGlMcdPMEhR1B') {
+    const key = CryptoJS.enc.Utf8.parse(keyWord)
+    const srcs = CryptoJS.enc.Utf8.parse(word)
+    const encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+    return encrypted.toString()
 }
diff --git a/admin/src/components/verifition/utils/axios.js b/admin/src/components/verifition/utils/axios.js
index 979b44cec..3719b67e2 100644
--- a/admin/src/components/verifition/utils/axios.js
+++ b/admin/src/components/verifition/utils/axios.js
@@ -1,30 +1,30 @@
-import axios from 'axios';
+import axios from 'axios'
 
-axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL;
+axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL
 
 const service = axios.create({
-  timeout: 40000,
-  headers: {
-    'X-Requested-With': 'XMLHttpRequest',
-    'Content-Type': 'application/json; charset=UTF-8'
-  },
+    timeout: 40000,
+    headers: {
+        'X-Requested-With': 'XMLHttpRequest',
+        'Content-Type': 'application/json; charset=UTF-8'
+    }
 })
 service.interceptors.request.use(
-  config => {
-    return config
-  },
-  error => {
-    Promise.reject(error)
-  }
+    config => {
+        return config
+    },
+    error => {
+        Promise.reject(error)
+    }
 )
 
 // response interceptor
 service.interceptors.response.use(
-  response => {
-    const res = response.data;
-    return res
-  },
-  error => {
-  }
+    response => {
+        const res = response.data
+        return res
+    },
+    error => {
+    }
 )
 export default service
diff --git a/admin/src/components/verifition/utils/util.js b/admin/src/components/verifition/utils/util.js
index 4cd1ad9be..f5f2e54a0 100644
--- a/admin/src/components/verifition/utils/util.js
+++ b/admin/src/components/verifition/utils/util.js
@@ -1,8 +1,8 @@
 export function resetSize(vm) {
-    var img_width, img_height, bar_width, bar_height;	//图片的宽度、高度，移动条的宽度、高度
+    let img_width, img_height, bar_width, bar_height;	//图片的宽度、高度，移动条的宽度、高度
 
-    var parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth
-    var parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight
+    const parentWidth = vm.$el.parentNode.offsetWidth || window.offsetWidth;
+    const parentHeight = vm.$el.parentNode.offsetHeight || window.offsetHeight;
     if (vm.imgSize.width.indexOf('%') != -1) {
         img_width = parseInt(vm.imgSize.width) / 100 * parentWidth + 'px'
     } else {
diff --git a/admin/src/lang/language.ts b/admin/src/lang/language.ts
index f6e1cd749..aebd82d50 100644
--- a/admin/src/lang/language.ts
+++ b/admin/src/lang/language.ts
@@ -24,6 +24,7 @@ class Language {
 
     /**
      * 加载语言包
+     * @param app
      * @param path
      * @param locale
      * @returns
@@ -43,7 +44,7 @@ class Language {
             // 查询插件的公共语言包
             if (app) {
                 try {
-                    var messagesCommon = await import( `@/${app}/lang/${locale}/common.json`)
+                    const messagesCommon = await import( `@/${ app }/lang/${ locale }/common.json`);
                     Object.keys(messagesCommon.default).forEach(key => {
                         data[`${file}.${key}`] = messagesCommon.default[key]
                     })
diff --git a/admin/src/layout/default/components/aside/index.vue b/admin/src/layout/default/components/aside/index.vue
index c30b7137d..b12f283aa 100644
--- a/admin/src/layout/default/components/aside/index.vue
+++ b/admin/src/layout/default/components/aside/index.vue
@@ -62,7 +62,7 @@ watch(route, () => {
 
 .aside-drawer {
     .el-drawer__body {
-        padding: 0px !important;
+        padding: 0 !important;
     }
 }
 </style>
diff --git a/admin/src/layout/default/components/aside/side.vue b/admin/src/layout/default/components/aside/side.vue
index a8e453e71..5fefe3909 100644
--- a/admin/src/layout/default/components/aside/side.vue
+++ b/admin/src/layout/default/components/aside/side.vue
@@ -4,7 +4,7 @@
             <div class="logo flex items-center justify-center m-auto w-full h-[64px]" v-if="!systemStore.menuIsCollapse">
                 <template v-if="webSite">
                     <img class="max-h-[40px] max-w-[70%]" v-if="webSite.logo" :src="img(webSite.logo)" alt="">
-                    <img class="max-h-[40px] max-w-[70%]" src="@/app/assets/images/login_logo.png" alt="" v-else>
+                    <img class="max-h-[40px] max-w-[70%]" src="@/app/assets/images/icon-addon-one.png" alt="" v-else>
                 </template>
             </div>
             <div class="logo flex items-center justify-center h-[64px]" v-else>
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index 1ed6b6ed5..524956942 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -15,13 +15,30 @@
                     <!-- 面包屑导航 -->
                     <div class="flex items-center h-full pl-[10px]">
                         <el-breadcrumb separator="/">
-                            <el-breadcrumb-item v-for="(route, index) in breadcrumb" :key="index">{{route.meta.title }}</el-breadcrumb-item>
+                             <!-- :to="route.path" class="inter" 这种修改方式导致部分跳转不对，需要重新调整菜单才可以 -->
+                            <el-breadcrumb-item v-for="(route, index) in breadcrumb" :to="route.path" class="inter" :key="index">{{route.meta.title }}</el-breadcrumb-item>
                         </el-breadcrumb>
                     </div>
                 </div>
             </el-col>
             <el-col :span="12">
                 <div class="right-panel h-full flex items-center justify-end">
+                    <div class="flex items-center flex-shrink-0 hidden-xs-only">
+                        <el-popover placement="bottom" :width="330" trigger="click" v-model:visible="isMenuSearch" >
+                            <template #reference>
+                                <i class="iconfont icona-sousuoV6xx-36 cursor-pointer px-[8px] !text-[14px]"></i>
+                            </template>
+                            <template #default>
+                                <div class="flex items-center">
+                                    <el-select v-model="selectedRoute"  filterable class="!w-[250px] mr-[20px] menu-select" :teleported="false" clearable  @change="handleRouteSelect">
+                                        <el-option v-for="item in flatRoutes" :key="item.name" :label="item.full_title" :value="item.name" >
+                                        </el-option>
+                                    </el-select>
+                                    <el-button type="primary" link @click="isMenuSearch = false">{{t('取消')}}</el-button>
+                                </div>
+                            </template>
+                        </el-popover>
+                    </div>
                     <!-- 预览 只有站点时展示-->
                     <i class="iconfont iconicon_huojian1 cursor-pointer px-[8px]" :title="t('visitWap')" @click="toPreview"></i>
                     <!-- 切换语言 -->
@@ -64,6 +81,7 @@ import userInfo from './user-info.vue'
 import switchLang from './switch-lang.vue'
 import { useFullscreen } from '@vueuse/core'
 import useSystemStore from '@/stores/modules/system'
+import useUserStore from '@/stores/modules/user'
 import useAppStore from '@/stores/modules/app'
 import { useRoute,useRouter } from 'vue-router'
 import { t } from '@/lang'
@@ -80,6 +98,57 @@ const dark = computed(() => {
     return systemStore.dark
 })
 
+const userStore = useUserStore()
+const isMenuSearch = ref(false)
+const routers = userStore.routers
+const getParentTitleChain=(meta:any) =>{
+    let titles = []
+    let current = meta?.parent_route
+
+    while (current) {
+        if (current.short_title) {
+        titles.unshift(current.short_title)
+        }
+        current = current.parent_route
+    }
+
+    return titles.join(' - ')
+}
+const flattenRoutes = (routes:any, parent = null)=> {
+    let flat = [];
+    routes.forEach(route => {
+        const { path, name, meta = {}, short_title, children } = route
+        const isLeaf = meta.type ==1 && meta.show==1
+        if(isLeaf){
+            const title = meta.title || short_title || ''
+            const parentTitleChain = getParentTitleChain(meta)
+            const fullTitle = parentTitleChain ? `${parentTitleChain} - ${title}` : title
+            const item = {
+                path,
+                name,
+                title,
+                parent_title: parentTitleChain,
+                full_title: fullTitle
+            };
+
+            flat.push(item);
+        }
+        if (children && children.length > 0) {
+            flat = flat.concat(flattenRoutes(children, route))
+        }
+    });
+
+    return flat;
+}
+const flatRoutes = flattenRoutes(routers)
+const selectedRoute = ref('')
+const handleRouteSelect = (name:any) => {
+    if (name) {
+        router.push({ name })
+        isMenuSearch.value = false
+    }
+}
+
 // 检测登录 start
 const detectionLoginDialog = ref(false)
 const comparisonToken = ref('')
@@ -158,7 +227,7 @@ const toPreview = () => {
 .layout-header{
     position: relative;
     z-index: 5;
-    box-shadow: 0px 0px 4px 0px rgba(0,145,255,0.1);
+    box-shadow: 0 0 4px 0 rgba(0,145,255,0.1);
 }
 .navbar-item {
     padding: 0 8px;
@@ -174,5 +243,8 @@ const toPreview = () => {
         background-color: var(--el-color-primary);
     }
 }
-
+:deep(.inter .el-breadcrumb__inner){
+    font-weight: inherit !important;
+    color: var(--el-text-color-regular) !important;
+}
 </style>
diff --git a/admin/src/router/routers.ts b/admin/src/router/routers.ts
index 2999dd842..19993567e 100644
--- a/admin/src/router/routers.ts
+++ b/admin/src/router/routers.ts
@@ -71,6 +71,7 @@ interface Route {
         type: string
     },
     children?: [],
+    auth?:[],
     is_show: boolean,
     app_type: string,
     addon: string,
@@ -96,7 +97,8 @@ const createRoute = function (route: Route, parentRoute: RouteRecordRaw | null =
             view: route.view_path,
             addon: route.addon,
             attr: route.menu_attr,
-            parent_route: parentRoute ? parentRoute.meta : parentRoute
+            parent_route: parentRoute ? parentRoute.meta : parentRoute,
+            sort: route.sort
         }
     }
     if (route.menu_type == 0) {
@@ -140,3 +142,21 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine
         }
     }
 }
+
+/**
+ * 获取按钮权限
+ * @param routes
+ * @param rules
+ */
+export function findRules(routes: Route[], rules :string[] = []) : string[] {
+    for (const route of routes) {
+        if (route.auth && Array.isArray(route.auth)) {
+            rules = rules.concat(route.auth)
+        }
+        if (route.children) {
+            rules = findRules(route.children, rules)
+        }
+    }
+    return rules
+}
+
diff --git a/admin/src/stores/modules/diy.ts b/admin/src/stores/modules/diy.ts
index 1d3f8687f..ee0ba3b8c 100644
--- a/admin/src/stores/modules/diy.ts
+++ b/admin/src/stores/modules/diy.ts
@@ -57,6 +57,7 @@ const useDiyStore = defineStore('diy', {
 
                 // 顶部导航栏
                 topStatusBar: {
+                    control: true, // 是否允许展示编辑
                     isShow: true, // 是否显示
                     bgColor: "#ffffff", // 头部背景颜色
                     rollBgColor: "#ffffff", // 滚动时，头部背景颜色
@@ -72,7 +73,11 @@ const useDiyStore = defineStore('diy', {
                     }
                 },
 
-                bottomTabBarSwitch: true, // 底部导航开关
+                // 底部导航
+                bottomTabBar: {
+                    control: true, // 是否允许展示编辑
+                    isShow: true, // 是否显示
+                },
 
                 // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
                 popWindow: {
@@ -146,6 +151,7 @@ const useDiyStore = defineStore('diy', {
 
                 // 顶部导航栏
                 topStatusBar: {
+                    control: true, // 是否允许展示编辑
                     isShow: true, // 是否显示
                     bgColor: "#ffffff", // 头部背景颜色
                     rollBgColor: "#ffffff", // 滚动时，头部背景颜色
@@ -161,7 +167,11 @@ const useDiyStore = defineStore('diy', {
                     }
                 },
 
-                bottomTabBarSwitch: true, // 底部导航开关
+                // 底部导航
+                bottomTabBar: {
+                    control: true, // 是否允许展示编辑
+                    isShow: true, // 是否显示
+                },
 
                 // 弹框 count：不弹出 -1，首次弹出 1，每次弹出 0
                 popWindow: {
@@ -320,7 +330,7 @@ const useDiyStore = defineStore('diy', {
         },
         // 将数据发送到uniapp
         postMessage() {
-            var diyData = JSON.stringify({
+            const diyData = JSON.stringify({
                 pageMode: this.pageMode,
                 currentIndex: this.currentIndex,
                 global: toRaw(this.global),
@@ -372,9 +382,9 @@ const useDiyStore = defineStore('diy', {
         },
         // 上移组件
         moveUpComponent() {
-            var temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
+            const temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
             let prevIndex = this.currentIndex - 1;
-            var temp2 = cloneDeep(this.value[prevIndex]); // 上个组件
+            const temp2 = cloneDeep(this.value[prevIndex]); // 上个组件
 
             if ((this.currentIndex - 1) < 0 || temp2.position && this.position.indexOf(temp2.position) != -1) return; // 从0开始
 
@@ -398,12 +408,12 @@ const useDiyStore = defineStore('diy', {
         moveDownComponent() {
             if (this.currentIndex < -1 || (this.currentIndex + 1) >= this.value.length) return; // 最后一个不能下移
 
-            var nextIndex = this.currentIndex + 1;
+            const nextIndex = this.currentIndex + 1;
 
-            var temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
+            const temp = cloneDeep(this.value[this.currentIndex]); // 当前选中组件
             temp.id = this.generateRandom(); // 更新id，刷新组件数据
 
-            var temp2 = cloneDeep(this.value[nextIndex]); // 下个组件
+            const temp2 = cloneDeep(this.value[nextIndex]); // 下个组件
             temp2.id = this.generateRandom(); // 更新id，刷新组件数据
 
             if (temp2.position && this.position.indexOf(temp2.position) != -1) return;
@@ -445,7 +455,7 @@ const useDiyStore = defineStore('diy', {
                 return;
             }
 
-            var index = this.currentIndex + 1;
+            const index = this.currentIndex + 1;
             this.value.splice(index, 0, component);
 
             this.changeCurrentIndex(index, component);
@@ -457,10 +467,10 @@ const useDiyStore = defineStore('diy', {
             //为0时不处理
             if (component.uses === 0) return true;
 
-            var count = 0;
+            let count = 0;
 
             //遍历已添加的自定义组件，检测是否超出数量
-            for (var i in this.value) if (this.value[i].componentName === component.componentName) count++;
+            for (let i in this.value) if (this.value[i].componentName === component.componentName) count++;
 
             if (count >= component.uses) return false;
             else return true;
@@ -510,7 +520,7 @@ const useDiyStore = defineStore('diy', {
             //     this.changeCurrentIndex(-99);
             //     return false;
             // }
-            
+
             if (this.global.popWindow.show && !this.global.popWindow.imgUrl) {
                 ElMessage({
                     message: '请上传弹窗图片',
@@ -519,10 +529,10 @@ const useDiyStore = defineStore('diy', {
                 return false;
             }
 
-            for (var i = 0; i < this.value.length; i++) {
+            for (let i = 0; i < this.value.length; i++) {
                 try {
                     if (this.value[i].verify) {
-                        var res = this.value[i].verify(i);
+                        const res = this.value[i].verify(i);
                         if (!res.code) {
                             this.changeCurrentIndex(i, this.value[i])
                             ElMessage({
diff --git a/admin/src/stores/modules/poster.ts b/admin/src/stores/modules/poster.ts
index c1e2be892..24a8ad547 100644
--- a/admin/src/stores/modules/poster.ts
+++ b/admin/src/stores/modules/poster.ts
@@ -67,7 +67,7 @@ const usePosterStore = defineStore('poster', {
                     height: 60,
                     minWidth: 120,
                     minHeight: 44,
-                    fontFamily: 'static/font/SourceHanSansCN-Regular.ttf',
+                    fontFamily: 'static/font/PingFang-Medium.ttf',
                     fontSize: 40,
                     weight: false,
                     lineHeight: 10,
@@ -241,7 +241,7 @@ const usePosterStore = defineStore('poster', {
                 return;
             }
 
-            var index = this.currentIndex + 1;
+            const index = this.currentIndex + 1;
             this.value.splice(index, 0, component);
 
             this.changeCurrentIndex(index, component);
@@ -252,10 +252,10 @@ const usePosterStore = defineStore('poster', {
             //为0时不处理
             if (component.uses === 0) return true;
 
-            var count = 0;
+            let count = 0;
 
             //遍历已添加的自定义组件，检测是否超出数量
-            for (var i in this.value) if (this.value[i].componentName === component.componentName) count++;
+            for (let i in this.value) if (this.value[i].componentName === component.componentName) count++;
 
             if (count >= component.uses) return false;
             else return true;
@@ -310,10 +310,10 @@ const usePosterStore = defineStore('poster', {
                 return false;
             }
 
-            for (var i = 0; i < this.value.length; i++) {
+            for (let i = 0; i < this.value.length; i++) {
                 try {
                     if (this.value[i].verify) {
-                        var res = this.value[i].verify(i);
+                        const res = this.value[i].verify(i);
                         if (!res.code) {
                             this.changeCurrentIndex(i, this.value[i]);
                             ElMessage({
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index 9c9d9e0c9..b92a835aa 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -1,17 +1,17 @@
 import { defineStore } from 'pinia'
 import { getToken, setToken, removeToken } from '@/utils/common'
-import { login, getAuthMenus } from '@/app/api/auth'
+import { login, logout, getAuthMenus } from '@/app/api/auth'
 import storage from '@/utils/storage'
 import router from '@/router'
-import { formatRouters, findFirstValidRoute } from '@/router/routers'
+import { formatRouters, findFirstValidRoute, findRules } from '@/router/routers'
 import useTabbarStore from './tabbar'
 
 interface User {
     token: string,
     userInfo: object,
     routers: any[],
-    addonIndexRoute: Record<string, symbol>,
-    rules: any[]
+    rules: any[],
+    addonIndexRoute: Record<string, symbol>
 }
 
 const useUserStore = defineStore('user', {
@@ -20,14 +20,14 @@ const useUserStore = defineStore('user', {
             token: getToken() || '',
             userInfo: storage.get('userinfo') || {},
             routers: [],
-            addonIndexRoute: {},
-            rules: []
+            rules: [],
+            addonIndexRoute: {}
         }
     },
     actions: {
         login(form: object) {
             return new Promise((resolve, reject) => {
-                login(form).then((res) => {
+                login(form).then(async (res) => {
                     this.token = res.data.token
                     this.userInfo = res.data.userinfo
                     setToken(res.data.token)
@@ -47,9 +47,10 @@ const useUserStore = defineStore('user', {
             this.token = ''
             this.userInfo = {}
             removeToken()
-            storage.remove(['userinfo'])
+            storage.remove(['userinfo','comparisonTokenStorage','defaultMarketingKeys'])
             this.routers = []
             this.rules = []
+            logout()
             // 清除tabbar
             useTabbarStore().clearTab()
             router.push('/login')
@@ -68,6 +69,7 @@ const useUserStore = defineStore('user', {
                             }
                         }
                     })
+                    this.rules = findRules(res.data)
                     resolve(res)
                 }).catch((error) => {
                     reject(error)
diff --git a/admin/src/styles/common.scss b/admin/src/styles/common.scss
index 41cb5f033..ea6f0b356 100644
--- a/admin/src/styles/common.scss
+++ b/admin/src/styles/common.scss
@@ -19,12 +19,12 @@ html, body {
 // 海报价格字体
 @font-face {
     font-family: 'poster_price_font';
-    src: url('./font/price.ttf') format('truetype');
+    src: url('./font/OPLUSSANS3-REGULAR.ttf') format('truetype');
 }
 // 海报价格字体
 @font-face {
     font-family: 'poster_default_font';
-    src: url('./font/SourceHanSansCN-Regular.ttf') format('truetype');
+    src: url('./font/PingFang-Medium.ttf') format('truetype');
 }
 
 // 以下最新，请勿改动 2024.5.25
diff --git a/admin/src/styles/font/OPLUSSANS3-REGULAR.TTF b/admin/src/styles/font/OPLUSSANS3-REGULAR.TTF
new file mode 100644
index 000000000..d2c2155e4
Binary files /dev/null and b/admin/src/styles/font/OPLUSSANS3-REGULAR.TTF differ
diff --git a/admin/src/styles/font/PingFang-Medium.ttf b/admin/src/styles/font/PingFang-Medium.ttf
new file mode 100644
index 000000000..982661b83
Binary files /dev/null and b/admin/src/styles/font/PingFang-Medium.ttf differ
diff --git a/admin/src/styles/icon/iconfont.css b/admin/src/styles/icon/iconfont.css
index c098073b9..2651bc05c 100644
--- a/admin/src/styles/icon/iconfont.css
+++ b/admin/src/styles/icon/iconfont.css
@@ -1,3071 +1,3207 @@
 @font-face {
-    font-family: "iconfont"; /* Project id 3883393 */
-    src: url('//at.alicdn.com/t/c/font_3883393_yoxx0oc1k5.woff2?t=1749110697461') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3883393_yoxx0oc1k5.woff?t=1749110697461') format('woff'),
-         url('//at.alicdn.com/t/c/font_3883393_yoxx0oc1k5.ttf?t=1749110697461') format('truetype');
-  }
-  
-  .iconfont {
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  
-  .iconquanxian:before {
-    content: "\e8e2";
-  }
-  
-  .iconhuiyuan:before {
-    content: "\e8e3";
-  }
-  
-  .iconqudao:before {
-    content: "\e8e5";
-  }
-  
-  .iconyingxiao2:before {
-    content: "\e8e6";
-  }
-  
-  .iconshezhi3:before {
-    content: "\e8e7";
-  }
-  
-  .iconcaiwu1:before {
-    content: "\e8e8";
-  }
-  
-  .iconyingyong21:before {
-    content: "\e8e9";
-  }
-  
-  .iconzhuangxiu3:before {
-    content: "\e8ea";
-  }
-  
-  .iconanzhuangyigechajian1:before {
-    content: "\e8e1";
-  }
-  
-  .iconshoucang11:before {
-    content: "\e8df";
-  }
-  
-  .iconxiaoliang:before {
-    content: "\e8e0";
-  }
-  
-  .iconbofang:before {
-    content: "\e8dd";
-  }
-  
-  .iconshoucang1:before {
-    content: "\e8de";
-  }
-  
-  .iconFramec-1:before {
-    content: "\e8dc";
-  }
-  
-  .iconcuowu:before {
-    content: "\e8da";
-  }
-  
-  .iconchenggong:before {
-    content: "\e8db";
-  }
-  
-  .iconzhuyiV6xx:before {
-    content: "\e8d3";
-  }
-  
-  .iconchakanV6xx:before {
-    content: "\e8d4";
-  }
-  
-  .iconFrame2:before {
-    content: "\e8d5";
-  }
-  
-  .icona-1:before {
-    content: "\e8d6";
-  }
-  
-  .iconFrame-1:before {
-    content: "\e8d7";
-  }
-  
-  .icona-:before {
-    content: "\e8d8";
-  }
-  
-  .icona-Group1128:before {
-    content: "\e8d9";
-  }
-  
-  .icona-gengduoV6xx-28:before {
-    content: "\e8d2";
-  }
-  
-  .iconbanquanshezhic:before {
-    content: "\e8d0";
-  }
-  
-  .iconcaozuorizhic:before {
-    content: "\e8bb";
-  }
-  
-  .iconbujushezhic:before {
-    content: "\e8bc";
-  }
-  
-  .iconCMSc:before {
-    content: "\e8bd";
-  }
-  
-  .iconguanliyuanjiaosec:before {
-    content: "\e8be";
-  }
-  
-  .iconguanliyuanc:before {
-    content: "\e8bf";
-  }
-  
-  .iconcunchushezhic:before {
-    content: "\e8c1";
-  }
-  
-  .iconditushezhic:before {
-    content: "\e8c4";
-  }
-  
-  .iconjichushezhic:before {
-    content: "\e8c5";
-  }
-  
-  .iconshangchengc:before {
-    content: "\e8c6";
-  }
-  
-  .icondenglushezhic:before {
-    content: "\e8c7";
-  }
-  
-  .iconsuoyouyingyongc:before {
-    content: "\e8c8";
-  }
-  
-  .iconpingtaifenleic:before {
-    content: "\e8c9";
-  }
-  
-  .iconquanxianshezhic:before {
-    content: "\e8ca";
-  }
-  
-  .iconsucaiguanlic:before {
-    content: "\e8cb";
-  }
-  
-  .iconwangzhanshezhic:before {
-    content: "\e8cc";
-  }
-  
-  .iconkaifangpingtaipeizhic:before {
-    content: "\e8cd";
-  }
-  
-  .iconweixinkaifangpingtaic:before {
-    content: "\e8ce";
-  }
-  
-  .iconwangzhanc:before {
-    content: "\e8d1";
-  }
-  
-  .iconfuzhiV6xx1:before {
-    content: "\e8a6";
-  }
-  
-  .iconanzhuangyigechajian:before {
-    content: "\e8a7";
-  }
-  
-  .iconchajiankaifa11:before {
-    content: "\e8a8";
-  }
-  
-  .iconkehuduan:before {
-    content: "\e8a9";
-  }
-  
-  .iconhuanjingjiance11:before {
-    content: "\e8aa";
-  }
-  
-  .icondaimashengcheng11:before {
-    content: "\e8ab";
-  }
-  
-  .iconpingtaicaidan1:before {
-    content: "\e8ac";
-  }
-  
-  .iconjihuarenwu11:before {
-    content: "\e8ad";
-  }
-  
-  .icongengxinhuancun2:before {
-    content: "\e8ae";
-  }
-  
-  .iconshouquanxinxi1:before {
-    content: "\e8af";
-  }
-  
-  .iconbeifenjilu:before {
-    content: "\e8b0";
-  }
-  
-  .iconguanliduan:before {
-    content: "\e8b1";
-  }
-  
-  .iconxitonggengxin1:before {
-    content: "\e8b2";
-  }
-  
-  .iconshengjijilu1:before {
-    content: "\e8b3";
-  }
-  
-  .iconzhandianliebiao1:before {
-    content: "\e8b4";
-  }
-  
-  .iconshujuzidian1:before {
-    content: "\e8b5";
-  }
-  
-  .iconyunbianyi:before {
-    content: "\e8b6";
-  }
-  
-  .iconkaifazhekry:before {
-    content: "\e8b7";
-  }
-  
-  .iconzhandiantaocan1:before {
-    content: "\e8b8";
-  }
-  
-  .iconzhandiancaidan1:before {
-    content: "\e8ba";
-  }
-  
-  .iconAIshengchengchajianc:before {
-    content: "\e8a2";
-  }
-  
-  .iconanzhuangyigechajianc:before {
-    content: "\e8a3";
-  }
-  
-  .iconkaifayigechajianc:before {
-    content: "\e8a4";
-  }
-  
-  .iconyunbianyic:before {
-    content: "\e8a5";
-  }
-  
-  .iconAPPc:before {
-    content: "\e89b";
-  }
-  
-  .iconPCc:before {
-    content: "\e89e";
-  }
-  
-  .iconH5c:before {
-    content: "\e89f";
-  }
-  
-  .iconzhifubaoxiaochengxuc:before {
-    content: "\e8a0";
-  }
-  
-  .iconxiaochengxutongbuc:before {
-    content: "\e8a1";
-  }
-  
-  .icona-Frame427322133:before {
-    content: "\e89a";
-  }
-  
-  .iconyonghu11:before {
-    content: "\e895";
-  }
-  
-  .iconshezhi2:before {
-    content: "\e896";
-  }
-  
-  .iconFramec-2:before {
-    content: "\e88f";
-  }
-  
-  .iconFramec-5:before {
-    content: "\e890";
-  }
-  
-  .iconFramec-4:before {
-    content: "\e891";
-  }
-  
-  .iconxitongc:before {
-    content: "\e892";
-  }
-  
-  .iconFramec-3:before {
-    content: "\e893";
-  }
-  
-  .iconshouyec:before {
-    content: "\e894";
-  }
-  
-  .iconbeifenjiluV6xx:before {
-    content: "\e89d";
-  }
-  
-  .iconyun2:before {
-    content: "\e88d";
-  }
-  
-  .iconxitonggengxin:before {
-    content: "\e88c";
-  }
-  
-  .iconshengjijilu:before {
-    content: "\e88e";
-  }
-  
-  .iconshanchu-fanggaiV6xx:before {
-    content: "\e88a";
-  }
-  
-  .iconshanchu-yuangaiV6xx:before {
-    content: "\e88b";
-  }
-  
-  .iconbangzhuV6mm-1:before {
-    content: "\e888";
-  }
-  
-  .iconshangchengshequ:before {
-    content: "\e880";
-  }
-  
-  .iconhuiyuanka:before {
-    content: "\e882";
-  }
-  
-  .iconshangmenfuwu:before {
-    content: "\e883";
-  }
-  
-  .iconweiguanwang:before {
-    content: "\e885";
-  }
-  
-  .iconzhongcaoshequ:before {
-    content: "\e886";
-  }
-  
-  .iconlvyou:before {
-    content: "\e887";
-  }
-  
-  .iconyingyong2:before {
-    content: "\e615";
-  }
-  
-  .iconzhandianguanli:before {
-    content: "\e87c";
-  }
-  
-  .iconyonghu1:before {
-    content: "\e87d";
-  }
-  
-  .iconshouye2:before {
-    content: "\e87e";
-  }
-  
-  .iconshezhi11:before {
-    content: "\e87f";
-  }
-  
-  .icona-kaifa1:before {
-    content: "\eb58";
-  }
-  
-  .iconditu2:before {
-    content: "\e87b";
-  }
-  
-  .iconkaifamyi:before {
-    content: "\e851";
-  }
-  
-  .iconditushezhi:before {
-    content: "\e863";
-  }
-  
-  .iconbanquanshezhi:before {
-    content: "\e85c";
-  }
-  
-  .iconcaozuorizhi:before {
-    content: "\e85d";
-  }
-  
-  .iconchajiankaifa1:before {
-    content: "\e85e";
-  }
-  
-  .iconbujushezhi:before {
-    content: "\e85f";
-  }
-  
-  .iconcunchushezhi:before {
-    content: "\e860";
-  }
-  
-  .iconchajianguanli:before {
-    content: "\e861";
-  }
-  
-  .iconhuanjingjiance1:before {
-    content: "\e862";
-  }
-  
-  .iconguanliyuanjiaose:before {
-    content: "\e864";
-  }
-  
-  .iconguanliyuan:before {
-    content: "\e865";
-  }
-  
-  .icongongjuguanli:before {
-    content: "\e866";
-  }
-  
-  .icondaimashengcheng1:before {
-    content: "\e867";
-  }
-  
-  .icondenglushezhi:before {
-    content: "\e868";
-  }
-  
-  .iconjichushezhi1:before {
-    content: "\e869";
-  }
-  
-  .iconpingtaicaidan:before {
-    content: "\e86a";
-  }
-  
-  .iconkaifazhekey:before {
-    content: "\e86b";
-  }
-  
-  .iconjihuarenwu1:before {
-    content: "\e86c";
-  }
-  
-  .iconquanxianshezhi:before {
-    content: "\e86d";
-  }
-  
-  .iconsucaiguanli1:before {
-    content: "\e86e";
-  }
-  
-  .iconwangzhan2:before {
-    content: "\e86f";
-  }
-  
-  .iconshouquanxinxi:before {
-    content: "\e870";
-  }
-  
-  .iconwangzhanshezhi:before {
-    content: "\e871";
-  }
-  
-  .iconshujuzidian:before {
-    content: "\e872";
-  }
-  
-  .iconzhandianliebiao:before {
-    content: "\e873";
-  }
-  
-  .iconxitongcaidan:before {
-    content: "\e874";
-  }
-  
-  .iconyingyongcaidan:before {
-    content: "\e875";
-  }
-  
-  .iconkaifangpingtaipeizhi:before {
-    content: "\e876";
-  }
-  
-  .iconzhandiancaidan:before {
-    content: "\e877";
-  }
-  
-  .iconzhandiantaocan:before {
-    content: "\e878";
-  }
-  
-  .iconweixinkaifangpingtai:before {
-    content: "\e879";
-  }
-  
-  .iconxiaochengxutongbu:before {
-    content: "\e87a";
-  }
-  
-  .iconpeizhimyi:before {
-    content: "\e850";
-  }
-  
-  .iconkaifaxyi:before {
-    content: "\e852";
-  }
-  
-  .iconyingyongmyi:before {
-    content: "\e853";
-  }
-  
-  .iconyonghuxyi:before {
-    content: "\e854";
-  }
-  
-  .iconyonghumyi:before {
-    content: "\e855";
-  }
-  
-  .iconyingyongxyi:before {
-    content: "\e856";
-  }
-  
-  .iconpeizhixyi:before {
-    content: "\e857";
-  }
-  
-  .iconshouyexyi:before {
-    content: "\e858";
-  }
-  
-  .iconshouyemyi:before {
-    content: "\e859";
-  }
-  
-  .iconzhandian-1:before {
-    content: "\e85a";
-  }
-  
-  .iconzhandian:before {
-    content: "\e85b";
-  }
-  
-  .icona-duihaopc30:before {
-    content: "\e84e";
-  }
-  
-  .icona-duoxuanxiangpc301:before {
-    content: "\e84f";
-  }
-  
-  .icona-duoxuanxiangpc30-1:before {
-    content: "\e84d";
-  }
-  
-  .icona-duoxuanxiangpc30:before {
-    content: "\e72d";
-  }
-  
-  .icona-shenfenzhengpc30:before {
-    content: "\e83f";
-  }
-  
-  .icona-shijianpc30-1:before {
-    content: "\e840";
-  }
-  
-  .icona-danhangwenbenpc30:before {
-    content: "\e841";
-  }
-  
-  .icona-shoujipc30:before {
-    content: "\e842";
-  }
-  
-  .icona-youxiangpc30:before {
-    content: "\e843";
-  }
-  
-  .icona-biaodantijiaopc30:before {
-    content: "\e844";
-  }
-  
-  .icona-shijianfanweipc30:before {
-    content: "\e845";
-  }
-  
-  .icona-duohangwenben-1pc30:before {
-    content: "\e846";
-  }
-  
-  .icona-danhangwenben-1pc30:before {
-    content: "\e847";
-  }
-  
-  .icona-tupianpc30:before {
-    content: "\e848";
-  }
-  
-  .icona-shuzipc30-1:before {
-    content: "\e849";
-  }
-  
-  .icona-riqifanweipc30:before {
-    content: "\e84a";
-  }
-  
-  .icona-danxuanxiangpc30:before {
-    content: "\e84b";
-  }
-  
-  .icona-riqipc30:before {
-    content: "\e84c";
-  }
-  
-  .iconyuezhifu:before {
-    content: "\e680";
-  }
-  
-  .iconshujutongji:before {
-    content: "\e835";
-  }
-  
-  .iconshangpinguanli1:before {
-    content: "\e837";
-  }
-  
-  .icondingdanguanli:before {
-    content: "\e838";
-  }
-  
-  .icona-tupianzhanbopc302:before {
-    content: "\e83c";
-  }
-  
-  .icona-jingxuantuijianpc302:before {
-    content: "\e83d";
-  }
-  
-  .icona-jingxuantuijianpc30-12:before {
-    content: "\e83e";
-  }
-  
-  .icona-baokuantuijianpc30:before {
-    content: "\e836";
-  }
-  
-  .icona-shangpintuijianpc30:before {
-    content: "\e839";
-  }
-  
-  .icona-paihangbangpc30:before {
-    content: "\e83a";
-  }
-  
-  .icona-xinrenzhuanxiangpc30:before {
-    content: "\e83b";
-  }
-  
-  .icona-lipinkatupianpc30:before {
-    content: "\e82c";
-  }
-  
-  .icona-lipinkayouxiaoqipc30:before {
-    content: "\e82d";
-  }
-  
-  .icona-lipinkazhufuyupc30:before {
-    content: "\e833";
-  }
-  
-  .icona-lipinkamingchengpc30:before {
-    content: "\e834";
-  }
-  
-  .iconshezhiV6xx:before {
-    content: "\e82e";
-  }
-  
-  .iconshezhiV6xx-2:before {
-    content: "\e82f";
-  }
-  
-  .iconshezhiV6xx-1:before {
-    content: "\e830";
-  }
-  
-  .iconshezhiV6xx1:before {
-    content: "\e831";
-  }
-  
-  .iconshezhi-1V6xx:before {
-    content: "\e832";
-  }
-  
-  .icondiduiqi1:before {
-    content: "\e7b0";
-  }
-  
-  .icondingduiqi1:before {
-    content: "\e827";
-  }
-  
-  .iconchuizhijuzhong1:before {
-    content: "\e828";
-  }
-  
-  .iconzuoduiqi1:before {
-    content: "\e829";
-  }
-  
-  .iconshuipingjuzhong1:before {
-    content: "\e82a";
-  }
-  
-  .iconyouduiqi1:before {
-    content: "\e82b";
-  }
-  
-  .iconxiaochengxu2:before {
-    content: "\e63d";
-  }
-  
-  .icondingdan1:before {
-    content: "\e7b1";
-  }
-  
-  .iconqiandaoguanli:before {
-    content: "\e7b2";
-  }
-  
-  .iconqiandaojilu:before {
-    content: "\e7b3";
-  }
-  
-  .iconshangpincanshu:before {
-    content: "\e820";
-  }
-  
-  .iconpingtaiyouhuiquan:before {
-    content: "\e821";
-  }
-  
-  .iconshangpin:before {
-    content: "\e822";
-  }
-  
-  .iconyingxiao1:before {
-    content: "\e823";
-  }
-  
-  .iconqiandaoshezhi:before {
-    content: "\e824";
-  }
-  
-  .icondianpuyouhuiquan:before {
-    content: "\e825";
-  }
-  
-  .iconshangpinpinpai1:before {
-    content: "\e826";
-  }
-  
-  .iconmofangpc:before {
-    content: "\e7e6";
-  }
-  
-  .iconjingdianpc:before {
-    content: "\e7e7";
-  }
-  
-  .iconliangzuoliangyoupc:before {
-    content: "\e7e8";
-  }
-  
-  .iconfuzhuxianpc:before {
-    content: "\e7e9";
-  }
-  
-  .iconbiaotipc:before {
-    content: "\e7ea";
-  }
-  
-  .iconkaxiangpc:before {
-    content: "\e7ed";
-  }
-  
-  .iconhuiyuanqiandaopc:before {
-    content: "\e7ee";
-  }
-  
-  .iconfuwenbenpc:before {
-    content: "\e7ef";
-  }
-  
-  .iconfenxiaoshangpinpc:before {
-    content: "\e7f0";
-  }
-  
-  .iconfudonganniupc:before {
-    content: "\e7f1";
-  }
-  
-  .iconhuiyuandengjipc:before {
-    content: "\e7f2";
-  }
-  
-  .icongonggaopc:before {
-    content: "\e7f3";
-  }
-  
-  .iconfuzhukongbaipc:before {
-    content: "\e7f4";
-  }
-  
-  .iconduoshangpinzupc:before {
-    content: "\e7f5";
-  }
-  
-  .iconshouyepc-1:before {
-    content: "\e7f6";
-  }
-  
-  .iconzuoyoutuwenpc:before {
-    content: "\e7f7";
-  }
-  
-  .iconzhongyingwenfanyipc:before {
-    content: "\e7f8";
-  }
-  
-  .iconyunkongjianpc:before {
-    content: "\e7f9";
-  }
-  
-  .iconyouxiapc:before {
-    content: "\e7fa";
-  }
-  
-  .iconzuoshangpc:before {
-    content: "\e7fb";
-  }
-  
-  .iconzuoxiapc:before {
-    content: "\e7fc";
-  }
-  
-  .iconxiaochengxupc:before {
-    content: "\e7fd";
-  }
-  
-  .iconyingxiaopc:before {
-    content: "\e7fe";
-  }
-  
-  .iconyoushangpc:before {
-    content: "\e7ff";
-  }
-  
-  .iconshouquanxinxipc:before {
-    content: "\e800";
-  }
-  
-  .iconxiazaipc-2:before {
-    content: "\e801";
-  }
-  
-  .icontuichuquanpingpc:before {
-    content: "\e802";
-  }
-  
-  .iconhuojianpc:before {
-    content: "\e803";
-  }
-  
-  .iconsousuopc-1:before {
-    content: "\e804";
-  }
-  
-  .iconhuihuapc:before {
-    content: "\e805";
-  }
-  
-  .iconliebiaopc:before {
-    content: "\e806";
-  }
-  
-  .iconxiazaipc-1:before {
-    content: "\e807";
-  }
-  
-  .iconwendangsousuopc:before {
-    content: "\e808";
-  }
-  
-  .iconshoujiapc:before {
-    content: "\e809";
-  }
-  
-  .iconxiazaipc:before {
-    content: "\e80a";
-  }
-  
-  .icontuwendaohangpc1:before {
-    content: "\e80b";
-  }
-  
-  .iconshangpintupianpc:before {
-    content: "\e80c";
-  }
-  
-  .iconjifenshangpinpc1:before {
-    content: "\e80d";
-  }
-  
-  .icontuichudenglupc:before {
-    content: "\e80e";
-  }
-  
-  .iconsousuokuangpc:before {
-    content: "\e80f";
-  }
-  
-  .iconshouyepc:before {
-    content: "\e810";
-  }
-  
-  .iconrilipc:before {
-    content: "\e811";
-  }
-  
-  .iconsousuopc1:before {
-    content: "\e812";
-  }
-  
-  .iconquanpingpc:before {
-    content: "\e813";
-  }
-  
-  .iconnichengpc:before {
-    content: "\e814";
-  }
-  
-  .iconduipc:before {
-    content: "\e815";
-  }
-  
-  .iconhuajiaqianpc:before {
-    content: "\e816";
-  }
-  
-  .iconqiehuanpc:before {
-    content: "\e817";
-  }
-  
-  .iconjianpanpc:before {
-    content: "\e818";
-  }
-  
-  .iconshangxiatuwenpc:before {
-    content: "\e819";
-  }
-  
-  .iconchajianpc:before {
-    content: "\e81a";
-  }
-  
-  .iconditulianxianpc:before {
-    content: "\e81b";
-  }
-  
-  .icongengduopc:before {
-    content: "\e81c";
-  }
-  
-  .iconchazhaopc:before {
-    content: "\e81d";
-  }
-  
-  .iconTpc:before {
-    content: "\e81e";
-  }
-  
-  .iconbofangpc:before {
-    content: "\e81f";
-  }
-  
-  .iconyihang2gepc:before {
-    content: "\e7b4";
-  }
-  
-  .iconyouhuiquanpc:before {
-    content: "\e7b5";
-  }
-  
-  .iconyihang4gepc:before {
-    content: "\e7b6";
-  }
-  
-  .icontianjiapc:before {
-    content: "\e7b7";
-  }
-  
-  .iconyihang4gepc-1:before {
-    content: "\e7b8";
-  }
-  
-  .iconyingyongliebiaopc:before {
-    content: "\e7b9";
-  }
-  
-  .iconwenzidaohangpc:before {
-    content: "\e7ba";
-  }
-  
-  .iconyihang3gepc-1:before {
-    content: "\e7bb";
-  }
-  
-  .iconyizuosanyoupc:before {
-    content: "\e7ce";
-  }
-  
-  .iconyihang2gepc1:before {
-    content: "\e7cf";
-  }
-  
-  .iconyizuoliangyoupc:before {
-    content: "\e7d0";
-  }
-  
-  .iconshengyinpc:before {
-    content: "\e7d1";
-  }
-  
-  .iconyihang3gepc:before {
-    content: "\e7d2";
-  }
-  
-  .icontuwenguanggaopc:before {
-    content: "\e7d3";
-  }
-  
-  .iconjifenpc:before {
-    content: "\e7d4";
-  }
-  
-  .iconyishangliangxiapc:before {
-    content: "\e7d5";
-  }
-  
-  .iconxianlupc:before {
-    content: "\e7d6";
-  }
-  
-  .iconrequpc:before {
-    content: "\e7d7";
-  }
-  
-  .iconshipinpc:before {
-    content: "\e7d8";
-  }
-  
-  .iconwenzhangpc:before {
-    content: "\e7d9";
-  }
-  
-  .icontuwendaohangpc:before {
-    content: "\e7da";
-  }
-  
-  .iconhuodongmofangpc:before {
-    content: "\e7db";
-  }
-  
-  .icontupiandaohangpc:before {
-    content: "\e7dc";
-  }
-  
-  .iconjifenshangpinpc:before {
-    content: "\e7dd";
-  }
-  
-  .icona-Group1003pc:before {
-    content: "\e7de";
-  }
-  
-  .iconshangpinliebiaopc:before {
-    content: "\e7df";
-  }
-  
-  .iconsousuopc:before {
-    content: "\e7e0";
-  }
-  
-  .iconhellowenbenpc:before {
-    content: "\e7e1";
-  }
-  
-  .iconlunbosousuopc:before {
-    content: "\e7e2";
-  }
-  
-  .iconmeiriqiandaopc:before {
-    content: "\e7e3";
-  }
-  
-  .iconjiudianpc:before {
-    content: "\e7e4";
-  }
-  
-  .iconjishizhongxinpc:before {
-    content: "\e7e5";
-  }
-  
-  .icondingdanzhongxinPC-1:before {
-    content: "\e7ac";
-  }
-  
-  .icondingdanzhongxinPC-3:before {
-    content: "\e7ad";
-  }
-  
-  .icondingdanzhongxinPC-2:before {
-    content: "\e7ae";
-  }
-  
-  .icondingdanzhongxinPC:before {
-    content: "\e7af";
-  }
-  
-  .icondakuanshezhi1:before {
-    content: "\e7bc";
-  }
-  
-  .iconxiaoximoban:before {
-    content: "\e7bd";
-  }
-  
-  .iconweiyemian:before {
-    content: "\e7be";
-  }
-  
-  .iconyemianlujing:before {
-    content: "\e7bf";
-  }
-  
-  .iconshujudaochu:before {
-    content: "\e7c0";
-  }
-  
-  .iconzhucedenglu:before {
-    content: "\e7c1";
-  }
-  
-  .iconduanxinshezhi:before {
-    content: "\e7c2";
-  }
-  
-  .iconFrame:before {
-    content: "\e7c3";
-  }
-  
-  .iconzhifushezhi1:before {
-    content: "\e7c4";
-  }
-  
-  .iconduanxinshezhi-1:before {
-    content: "\e7c5";
-  }
-  
-  .iconshujudaochu-1:before {
-    content: "\e7c6";
-  }
-  
-  .iconshujudaochu1:before {
-    content: "\e7c7";
-  }
-  
-  .iconzhifujilu:before {
-    content: "\e7c8";
-  }
-  
-  .iconshoujiduan:before {
-    content: "\e7c9";
-  }
-  
-  .iconxiaoximoban1:before {
-    content: "\e7ca";
-  }
-  
-  .iconduanxinshezhi1:before {
-    content: "\e7cb";
-  }
-  
-  .icondianpucaidan:before {
-    content: "\e7cc";
-  }
-  
-  .icona-Group844:before {
-    content: "\e7cd";
-  }
-  
-  .iconbanquan2:before {
-    content: "\e61b";
-  }
-  
-  .iconjifen1:before {
-    content: "\e641";
-  }
-  
-  .iconyuandaima:before {
-    content: "\e610";
-  }
-  
-  .iconjiaoseguanli:before {
-    content: "\e637";
-  }
-  
-  .iconweixinxiaochengxu:before {
-    content: "\e614";
-  }
-  
-  .iconjiaoseyonghu:before {
-    content: "\e648";
-  }
-  
-  .iconyonghu:before {
-    content: "\e65e";
-  }
-  
-  .iconbanquan1:before {
-    content: "\e66d";
-  }
-  
-  .iconweixingongzhonghao:before {
-    content: "\e613";
-  }
-  
-  .iconbanquan:before {
-    content: "\e632";
-  }
-  
-  .iconjifen-xianxing:before {
-    content: "\e897";
-  }
-  
-  .iconhuiyuanliebiao:before {
-    content: "\e634";
-  }
-  
-  .iconjifen:before {
-    content: "\e70c";
-  }
-  
-  .iconguanbi:before {
-    content: "\e612";
-  }
-  
-  .icondengluzhucemima:before {
-    content: "\e67f";
-  }
-  
-  .iconqiehuanjiaose:before {
-    content: "\e60f";
-  }
-  
-  .iconxiaochengxushezhi:before {
-    content: "\e6b4";
-  }
-  
-  .icondenglu:before {
-    content: "\e604";
-  }
-  
-  .iconweixingongzhonghaoguanli:before {
-    content: "\e609";
-  }
-  
-  .iconweixingongzhonghao1:before {
-    content: "\e705";
-  }
-  
-  .icondibudaohang:before {
-    content: "\e617";
-  }
-  
-  .iconwangpuzhuangxiu:before {
-    content: "\e881";
-  }
-  
-  .iconfenyehuadong:before {
-    content: "\e673";
-  }
-  
-  .iconwendaohang:before {
-    content: "\e674";
-  }
-  
-  .iconzhuangxiu:before {
-    content: "\e62d";
-  }
-  
-  .icondianpuzhuangxiu:before {
-    content: "\e616";
-  }
-  
-  .icontupianguanggao1:before {
-    content: "\e649";
-  }
-  
-  .iconwenzhang:before {
-    content: "\e662";
-  }
-  
-  .icondanhanghuadong:before {
-    content: "\e66f";
-  }
-  
-  .icontudaohang:before {
-    content: "\e671";
-  }
-  
-  .iconfuzhushuxian:before {
-    content: "\e6f7";
-  }
-  
-  .iconmofang:before {
-    content: "\e6c4";
-  }
-  
-  .iconshoudongxuanze:before {
-    content: "\e6e1";
-  }
-  
-  .iconfuzhukongbai1:before {
-    content: "\e642";
-  }
-  
-  .iconyihang5ge:before {
-    content: "\e6f3";
-  }
-  
-  .iconjubao:before {
-    content: "\e611";
-  }
-  
-  .iconhuiyuanzhongxin:before {
-    content: "\e692";
-  }
-  
-  .iconbiaoti:before {
-    content: "\e643";
-  }
-  
-  .iconbankuai:before {
-    content: "\e668";
-  }
-  
-  .iconneirong2:before {
-    content: "\e889";
-  }
-  
-  .icondesktop:before {
-    content: "\e6e8";
-  }
-  
-  .iconzhifubao:before {
-    content: "\e8e4";
-  }
-  
-  .iconyingyongshichang:before {
-    content: "\e618";
-  }
-  
-  .icondianzan:before {
-    content: "\ec7f";
-  }
-  
-  .iconh5e:before {
-    content: "\e654";
-  }
-  
-  .iconkaifazheguanli:before {
-    content: "\e62c";
-  }
-  
-  .iconlianmengguanli:before {
-    content: "\e65f";
-  }
-  
-  .iconyingyongguanli:before {
-    content: "\e61f";
-  }
-  
-  .iconmanage-apply:before {
-    content: "\e619";
-  }
-  
-  .icongengxinhuancun:before {
-    content: "\e686";
-  }
-  
-  .iconsixingjiance:before {
-    content: "\e645";
-  }
-  
-  .iconzhuceshezhi:before {
-    content: "\e6ad";
-  }
-  
-  .icontuikuanjilu:before {
-    content: "\e8cf";
-  }
-  
-  .iconqianbao:before {
-    content: "\e6ca";
-  }
-  
-  .iconic_description_file24px:before {
-    content: "\e61a";
-  }
-  
-  .iconzhuangxiu1:before {
-    content: "\e66b";
-  }
-  
-  .iconhuiyuanguanli:before {
-    content: "\e64c";
-  }
-  
-  .iconhuangjinhuiyuan0101-copy:before {
-    content: "\e621";
-  }
-  
-  .iconhuiyuan1:before {
-    content: "\e644";
-  }
-  
-  .iconweixin:before {
-    content: "\e647";
-  }
-  
-  .icontaocanliebiao:before {
-    content: "\e6b2";
-  }
-  
-  .iconyingyongshichang2:before {
-    content: "\e60b";
-  }
-  
-  .iconyingyongshichang1:before {
-    content: "\e61c";
-  }
-  
-  .iconic_manage_assignprop:before {
-    content: "\e60c";
-  }
-  
-  .iconchengshi:before {
-    content: "\ec70";
-  }
-  
-  .iconhuiyuandingdan:before {
-    content: "\e68a";
-  }
-  
-  .iconjiudian:before {
-    content: "\e68b";
-  }
-  
-  .iconhellowenbenanli:before {
-    content: "\e68c";
-  }
-  
-  .icondingdan:before {
-    content: "\e61d";
-  }
-  
-  .icona-02_luxian:before {
-    content: "\e687";
-  }
-  
-  .iconhuiyuanxinxi:before {
-    content: "\e688";
-  }
-  
-  .iconjingdian:before {
-    content: "\e689";
-  }
-  
-  .iconxinyongqia:before {
-    content: "\e785";
-  }
-  
-  .iconmendian:before {
-    content: "\e60a";
-  }
-  
-  .iconico_yuyueguanli_yuyuebiangeng:before {
-    content: "\e94a";
-  }
-  
-  .iconkaifazheguanli1:before {
-    content: "\e636";
-  }
-  
-  .iconmofang1:before {
-    content: "\e64d";
-  }
-  
-  .iconrequ:before {
-    content: "\e68d";
-  }
-  
-  .iconquanbudingdan:before {
-    content: "\e606";
-  }
-  
-  .iconshimingrenzheng-xian:before {
-    content: "\e89c";
-  }
-  
-  .iconpaixu:before {
-    content: "\e60d";
-  }
-  
-  .iconpaixu1:before {
-    content: "\e64e";
-  }
-  
-  .iconshoucang:before {
-    content: "\e8c2";
-  }
-  
-  .iconshezhi:before {
-    content: "\e64b";
-  }
-  
-  .iconhuiyuan11:before {
-    content: "\e691";
-  }
-  
-  .iconwangzhan:before {
-    content: "\e690";
-  }
-  
-  .iconyingyong:before {
-    content: "\e68f";
-  }
-  
-  .iconqudaoguanli:before {
-    content: "\e695";
-  }
-  
-  .iconshichangwuliaozhichi:before {
-    content: "\e694";
-  }
-  
-  .iconcaiwu:before {
-    content: "\e693";
-  }
-  
-  .iconxianxiazhifu2:before {
-    content: "\e69a";
-  }
-  
-  .iconhuiyuantixian:before {
-    content: "\e69b";
-  }
-  
-  .iconcode:before {
-    content: "\e620";
-  }
-  
-  .iconcaidan:before {
-    content: "\e652";
-  }
-  
-  .iconwangzhan1:before {
-    content: "\e69d";
-  }
-  
-  .iconyingyongshichang11:before {
-    content: "\e697";
-  }
-  
-  .iconcaiwuliushui:before {
-    content: "\e698";
-  }
-  
-  .iconhuiyuanliebiao1:before {
-    content: "\e69c";
-  }
-  
-  .iconyun-line:before {
-    content: "\e622";
-  }
-  
-  .iconyingyongshichang-:before {
-    content: "\e607";
-  }
-  
-  .iconguanzhu:before {
-    content: "\e739";
-  }
-  
-  .iconlishijilu:before {
-    content: "\f1e2";
-  }
-  
-  .icona-huaban1fuben25:before {
-    content: "\e608";
-  }
-  
-  .iconyun:before {
-    content: "\e69e";
-  }
-  
-  .icongaikuang:before {
-    content: "\e623";
-  }
-  
-  .iconwenzhangguanli:before {
-    content: "\e6b0";
-  }
-  
-  .iconhuiyuan2:before {
-    content: "\e6b1";
-  }
-  
-  .iconhuiyuanyue:before {
-    content: "\e69f";
-  }
-  
-  .iconxiaoxiguanli:before {
-    content: "\e6a1";
-  }
-  
-  .iconwodexingbiao:before {
-    content: "\e6a0";
-  }
-  
-  .iconzhifuguanli:before {
-    content: "\e6af";
-  }
-  
-  .iconqudaoguanli1:before {
-    content: "\e6aa";
-  }
-  
-  .iconquanxianguanli:before {
-    content: "\e6a6";
-  }
-  
-  .iconsucaiguanli:before {
-    content: "\e6a7";
-  }
-  
-  .icona-shouyediannao:before {
-    content: "\e6a5";
-  }
-  
-  .iconhuanjingjiance:before {
-    content: "\e6a2";
-  }
-  
-  .iconjihuarenwu:before {
-    content: "\e6a3";
-  }
-  
-  .iconchakanlishi:before {
-    content: "\e6a8";
-  }
-  
-  .icongengxinhuancun1:before {
-    content: "\e6ac";
-  }
-  
-  .iconhuiyuanbiaoqian:before {
-    content: "\e6a4";
-  }
-  
-  .iconhuiyuanjifen:before {
-    content: "\e6ab";
-  }
-  
-  .iconhuiyuanyongjin:before {
-    content: "\e6a9";
-  }
-  
-  .icondaimashengcheng:before {
-    content: "\e6ae";
-  }
-  
-  .iconchajiankaifa:before {
-    content: "\e6b3";
-  }
-  
-  .iconyunshichang:before {
-    content: "\e6b5";
-  }
-  
-  .iconnav-market:before {
-    content: "\e60e";
-  }
-  
-  .iconwenzhangguanli1:before {
-    content: "\e6bc";
-  }
-  
-  .iconkaxiangdingdan:before {
-    content: "\e6b9";
-  }
-  
-  .iconlvyouchanpin:before {
-    content: "\e6ba";
-  }
-  
-  .iconlvyoudingdan:before {
-    content: "\e6bb";
-  }
-  
-  .icongaikuang1:before {
-    content: "\e6b7";
-  }
-  
-  .iconkaxiangchanpin:before {
-    content: "\e6b6";
-  }
-  
-  .iconchongzhidingdan:before {
-    content: "\e6b8";
-  }
-  
-  .iconqiehuan1:before {
-    content: "\e627";
-  }
-  
-  .iconyingyong1:before {
-    content: "\e6bf";
-  }
-  
-  .iconzhuangxiu2:before {
-    content: "\e6bd";
-  }
-  
-  .iconzhuangxiu21:before {
-    content: "\e6be";
-  }
-  
-  .iconfenlei:before {
-    content: "\e6c3";
-  }
-  
-  .iconqiehuan2:before {
-    content: "\e6c0";
-  }
-  
-  .iconqudaoguanli2:before {
-    content: "\e6c1";
-  }
-  
-  .iconguanfangshichang:before {
-    content: "\e6c2";
-  }
-  
-  .iconjiantou_xiangzuoliangci_o:before {
-    content: "\eb93";
-  }
-  
-  .iconshouye:before {
-    content: "\e675";
-  }
-  
-  .iconshouye-shouye:before {
-    content: "\e638";
-  }
-  
-  .icondian:before {
-    content: "\ec1e";
-  }
-  
-  .iconchajian1:before {
-    content: "\e679";
-  }
-  
-  .iconanzhuang:before {
-    content: "\e676";
-  }
-  
-  .iconicon_huojian:before {
-    content: "\e677";
-  }
-  
-  .iconjiantou:before {
-    content: "\e67a";
-  }
-  
-  .iconyuanquan_huaban1:before {
-    content: "\e66c";
-  }
-  
-  .iconzhankai:before {
-    content: "\e67b";
-  }
-  
-  .iconyun1:before {
-    content: "\e67e";
-  }
-  
-  .iconshangpinguanli:before {
-    content: "\e67c";
-  }
-  
-  .iconshangpinliebiao:before {
-    content: "\e628";
-  }
-  
-  .icongonggao:before {
-    content: "\e629";
-  }
-  
-  .iconshangpinpinglun:before {
-    content: "\e6d3";
-  }
-  
-  .iconshangpinfuwu:before {
-    content: "\e6d4";
-  }
-  
-  .iconxiangmufenlei:before {
-    content: "\e6d0";
-  }
-  
-  .iconwuliugenzong:before {
-    content: "\e6d1";
-  }
-  
-  .iconshangpinbiaoqian:before {
-    content: "\e6d2";
-  }
-  
-  .icontuikuanweiquan:before {
-    content: "\e6ce";
-  }
-  
-  .iconyingxiaozhongxin:before {
-    content: "\e6cf";
-  }
-  
-  .iconjishiguanli:before {
-    content: "\e684";
-  }
-  
-  .iconxiangmuguanli:before {
-    content: "\e6cc";
-  }
-  
-  .iconyouhuiquan:before {
-    content: "\e6cd";
-  }
-  
-  .iconpaisongshezhi:before {
-    content: "\e685";
-  }
-  
-  .iconyuyueshezhi:before {
-    content: "\e6cb";
-  }
-  
-  .iconyuyuexiangmu:before {
-    content: "\e68e";
-  }
-  
-  .iconshangpinpinpai:before {
-    content: "\e6c9";
-  }
-  
-  .icona-dingdanliebiao:before {
-    content: "\e6e7";
-  }
-  
-  .iconjiaoyishezhi:before {
-    content: "\e6e4";
-  }
-  
-  .icondingdanhexiao:before {
-    content: "\e6e5";
-  }
-  
-  .icondingdanweiquan:before {
-    content: "\e6e6";
-  }
-  
-  .iconjiudiandingdan:before {
-    content: "\e6df";
-  }
-  
-  .iconjingdianguanli:before {
-    content: "\e6e0";
-  }
-  
-  .icondingdanshezhi:before {
-    content: "\e6e3";
-  }
-  
-  .iconluxianguanli:before {
-    content: "\e6db";
-  }
-  
-  .iconjiudianguanli:before {
-    content: "\e6dc";
-  }
-  
-  .iconshangjiadizhiku:before {
-    content: "\e6dd";
-  }
-  
-  .iconkaxiangguanli:before {
-    content: "\e6de";
-  }
-  
-  .iconhuishouzhan:before {
-    content: "\e6d7";
-  }
-  
-  .iconshangpinliebiao1:before {
-    content: "\e6d8";
-  }
-  
-  .iconshangpinfenlei:before {
-    content: "\e6d9";
-  }
-  
-  .iconfenleishezhi:before {
-    content: "\e6da";
-  }
-  
-  .iconfapiaoguanli:before {
-    content: "\e683";
-  }
-  
-  .iconjingdiandingdan:before {
-    content: "\e6ea";
-  }
-  
-  .iconluxiandingdan:before {
-    content: "\e6eb";
-  }
-  
-  .iconqiehuan3:before {
-    content: "\e6ec";
-  }
-  
-  .iconshangchengshezhi:before {
-    content: "\e6ee";
-  }
-  
-  .iconjichushezhi:before {
-    content: "\e6ed";
-  }
-  
-  .iconjishuzhichi:before {
-    content: "\e6f1";
-  }
-  
-  .iconjiagebanben:before {
-    content: "\e6f0";
-  }
-  
-  .icona-shangbiao2:before {
-    content: "\e64f";
-  }
-  
-  .iconkaifashangzhongxin:before {
-    content: "\e6fa";
-  }
-  
-  .iconts-tubiao_CertificateServer:before {
-    content: "\e62b";
-  }
-  
-  .iconwodeshouquan:before {
-    content: "\e6f6";
-  }
-  
-  .iconwodezhanghu:before {
-    content: "\e6f8";
-  }
-  
-  .iconshimingrenzheng:before {
-    content: "\e6f9";
-  }
-  
-  .iconwodedingdan:before {
-    content: "\e6f2";
-  }
-  
-  .icongerenxinxi:before {
-    content: "\e6f4";
-  }
-  
-  .iconwodezhandian:before {
-    content: "\e6f5";
-  }
-  
-  .icontishi:before {
-    content: "\e6fc";
-  }
-  
-  .iconshouquanliebiao:before {
-    content: "\e6fd";
-  }
-  
-  .iconhuojian:before {
-    content: "\e6ff";
-  }
-  
-  .iconrili1:before {
-    content: "\e62e";
-  }
-  
-  .iconmap-link:before {
-    content: "\ea01";
-  }
-  
-  .iconbanbenqiehuan:before {
-    content: "\e792";
-  }
-  
-  .iconjishi:before {
-    content: "\e749";
-  }
-  
-  .iconicon_congzuodaoyou:before {
-    content: "\e7eb";
-  }
-  
-  .iconicon_congshangdaoxia:before {
-    content: "\e7ec";
-  }
-  
-  .iconhengxianghuadong:before {
-    content: "\e63e";
-  }
-  
-  .iconico:before {
-    content: "\e63f";
-  }
-  
-  .iconxiaochengxu1:before {
-    content: "\e631";
-  }
-  
-  .icontransferout-copy:before {
-    content: "\ecad";
-  }
-  
-  .iconguanwang:before {
-    content: "\e704";
-  }
-  
-  .icontransferout:before {
-    content: "\e651";
-  }
-  
-  .iconshuiqijiaoliu:before {
-    content: "\e67d";
-  }
-  
-  .icontuikuantuihuo:before {
-    content: "\e639";
-  }
-  
-  .iconhome:before {
-    content: "\e633";
-  }
-  
-  .icontuihuobaozhang:before {
-    content: "\e653";
-  }
-  
-  .iconguahao:before {
-    content: "\e66a";
-  }
-  
-  .icondaifukuan:before {
-    content: "\e672";
-  }
-  
-  .iconhuiyuan12:before {
-    content: "\e70b";
-  }
-  
-  .iconerweima:before {
-    content: "\e70d";
-  }
-  
-  .iconshangjiantou:before {
-    content: "\e678";
-  }
-  
-  .iconwenzhanglanmu1:before {
-    content: "\e722";
-  }
-  
-  .iconliushui1:before {
-    content: "\e723";
-  }
-  
-  .iconwenzhangliebiao1:before {
-    content: "\e71f";
-  }
-  
-  .iconyouqinglianjie1:before {
-    content: "\e720";
-  }
-  
-  .icondianpuliebiao1:before {
-    content: "\e721";
-  }
-  
-  .iconhuiyuantixian1:before {
-    content: "\e71c";
-  }
-  
-  .icondianputixian1:before {
-    content: "\e71d";
-  }
-  
-  .icondianpushenqing1:before {
-    content: "\e71e";
-  }
-  
-  .iconhuiyuanyongjin1:before {
-    content: "\e71a";
-  }
-  
-  .iconshouyelouceng1:before {
-    content: "\e71b";
-  }
-  
-  .icondianputaocan1:before {
-    content: "\e717";
-  }
-  
-  .icondianpuyonghu1:before {
-    content: "\e718";
-  }
-  
-  .iconhuiyuanyue1:before {
-    content: "\e719";
-  }
-  
-  .icondianpufenlei1:before {
-    content: "\e714";
-  }
-  
-  .iconjiesuanjilu1:before {
-    content: "\e715";
-  }
-  
-  .icona-Rectangle106:before {
-    content: "\e7a8";
-  }
-  
-  .icona-Polygon13:before {
-    content: "\e7a9";
-  }
-  
-  .iconUnion-7:before {
-    content: "\e77e";
-  }
-  
-  .iconUnion-6:before {
-    content: "\e78a";
-  }
-  
-  .icona-Polygon17Stroke:before {
-    content: "\e7a7";
-  }
-  
-  .iconUnion-8:before {
-    content: "\e79a";
-  }
-  
-  .iconUnion-2:before {
-    content: "\e79b";
-  }
-  
-  .iconUnion-4:before {
-    content: "\e79d";
-  }
-  
-  .iconUnion-5:before {
-    content: "\e79e";
-  }
-  
-  .iconUnion:before {
-    content: "\e7a0";
-  }
-  
-  .icona-Star6Stroke:before {
-    content: "\e7a1";
-  }
-  
-  .icona-Star5Stroke:before {
-    content: "\e7a2";
-  }
-  
-  .iconUnion-1:before {
-    content: "\e7a3";
-  }
-  
-  .icona-SubtractStroke:before {
-    content: "\e7a4";
-  }
-  
-  .iconUnion-3:before {
-    content: "\e7a5";
-  }
-  
-  .iconxiajiantou:before {
-    content: "\e681";
-  }
-  
-  .iconriqi:before {
-    content: "\e657";
-  }
-  
-  .icontuikuan:before {
-    content: "\e75e";
-  }
-  
-  .icongouwu:before {
-    content: "\e65a";
-  }
-  
-  .icondaishouhuo:before {
-    content: "\e65c";
-  }
-  
-  .icondaifahuo:before {
-    content: "\e669";
-  }
-  
-  .icona-Polygon10:before {
-    content: "\e7a6";
-  }
-  
-  .iconkaifashezhi:before {
-    content: "\e6ef";
-  }
-  
-  .iconzhifushezhi:before {
-    content: "\e625";
-  }
-  
-  .icondakuanshezhi:before {
-    content: "\e624";
-  }
-  
-  .iconVector-43:before {
-    content: "\e772";
-  }
-  
-  .iconVector-22:before {
-    content: "\e773";
-  }
-  
-  .iconVector-30:before {
-    content: "\e774";
-  }
-  
-  .iconVector-36:before {
-    content: "\e775";
-  }
-  
-  .iconVector-42:before {
-    content: "\e776";
-  }
-  
-  .iconVector-35:before {
-    content: "\e777";
-  }
-  
-  .iconVector-20:before {
-    content: "\e778";
-  }
-  
-  .iconVector-25:before {
-    content: "\e779";
-  }
-  
-  .iconVector-31:before {
-    content: "\e77a";
-  }
-  
-  .iconVector-28:before {
-    content: "\e77b";
-  }
-  
-  .iconVector-34:before {
-    content: "\e77c";
-  }
-  
-  .iconVector-24:before {
-    content: "\e77d";
-  }
-  
-  .iconVector-17:before {
-    content: "\e77f";
-  }
-  
-  .iconVector-27:before {
-    content: "\e780";
-  }
-  
-  .iconVector-6:before {
-    content: "\e781";
-  }
-  
-  .iconVector-26:before {
-    content: "\e782";
-  }
-  
-  .iconVector-15:before {
-    content: "\e783";
-  }
-  
-  .iconVector-21:before {
-    content: "\e784";
-  }
-  
-  .iconVector-11:before {
-    content: "\e786";
-  }
-  
-  .iconVector-5:before {
-    content: "\e787";
-  }
-  
-  .iconVector-19:before {
-    content: "\e788";
-  }
-  
-  .iconVector-23:before {
-    content: "\e789";
-  }
-  
-  .iconVector-16:before {
-    content: "\e78b";
-  }
-  
-  .iconVector-14:before {
-    content: "\e78c";
-  }
-  
-  .iconVector-8:before {
-    content: "\e78d";
-  }
-  
-  .iconVector-13:before {
-    content: "\e78e";
-  }
-  
-  .iconVector-12:before {
-    content: "\e78f";
-  }
-  
-  .iconVector-18:before {
-    content: "\e790";
-  }
-  
-  .icona-9:before {
-    content: "\e791";
-  }
-  
-  .iconVector-1:before {
-    content: "\e793";
-  }
-  
-  .iconVector-7:before {
-    content: "\e794";
-  }
-  
-  .iconVector-2:before {
-    content: "\e795";
-  }
-  
-  .iconVector-9:before {
-    content: "\e796";
-  }
-  
-  .iconVector:before {
-    content: "\e797";
-  }
-  
-  .iconVector-10:before {
-    content: "\e798";
-  }
-  
-  .iconVector-3:before {
-    content: "\e799";
-  }
-  
-  .iconVector-4:before {
-    content: "\e79c";
-  }
-  
-  .icona-Vector1Stroke:before {
-    content: "\e79f";
-  }
-  
-  .iconq96:before {
-    content: "\e7aa";
-  }
-  
-  .icona-Vector3Stroke-copy-copy:before {
-    content: "\e7ab";
-  }
-  
-  .iconVector-104:before {
-    content: "\e724";
-  }
-  
-  .iconVector-105:before {
-    content: "\e725";
-  }
-  
-  .iconVector-108:before {
-    content: "\e726";
-  }
-  
-  .iconVector-107:before {
-    content: "\e727";
-  }
-  
-  .iconVector-106:before {
-    content: "\e728";
-  }
-  
-  .iconVector-97:before {
-    content: "\e729";
-  }
-  
-  .iconVector-102:before {
-    content: "\e72a";
-  }
-  
-  .iconVector-103:before {
-    content: "\e72b";
-  }
-  
-  .iconVector-101:before {
-    content: "\e72c";
-  }
-  
-  .iconVector-92:before {
-    content: "\e72e";
-  }
-  
-  .iconVector-90:before {
-    content: "\e72f";
-  }
-  
-  .iconVector-98:before {
-    content: "\e730";
-  }
-  
-  .iconVector-99:before {
-    content: "\e731";
-  }
-  
-  .iconVector-100:before {
-    content: "\e732";
-  }
-  
-  .iconVector-95:before {
-    content: "\e733";
-  }
-  
-  .iconVector-96:before {
-    content: "\e734";
-  }
-  
-  .iconVector-94:before {
-    content: "\e735";
-  }
-  
-  .iconVector-91:before {
-    content: "\e736";
-  }
-  
-  .iconVector-93:before {
-    content: "\e737";
-  }
-  
-  .iconVector-89:before {
-    content: "\e738";
-  }
-  
-  .iconVector-84:before {
-    content: "\e73a";
-  }
-  
-  .iconVector-83:before {
-    content: "\e73b";
-  }
-  
-  .iconVector-88:before {
-    content: "\e73c";
-  }
-  
-  .iconVector-82:before {
-    content: "\e73d";
-  }
-  
-  .iconVector-86:before {
-    content: "\e73e";
-  }
-  
-  .iconVector-74:before {
-    content: "\e73f";
-  }
-  
-  .iconVector-81:before {
-    content: "\e740";
-  }
-  
-  .iconVector-85:before {
-    content: "\e741";
-  }
-  
-  .iconVector-87:before {
-    content: "\e742";
-  }
-  
-  .iconVector-77:before {
-    content: "\e743";
-  }
-  
-  .iconVector-79:before {
-    content: "\e744";
-  }
-  
-  .iconVector-80:before {
-    content: "\e745";
-  }
-  
-  .iconVector-75:before {
-    content: "\e746";
-  }
-  
-  .iconVector-72:before {
-    content: "\e747";
-  }
-  
-  .iconVector-71:before {
-    content: "\e748";
-  }
-  
-  .iconVector-76:before {
-    content: "\e74a";
-  }
-  
-  .iconVector-73:before {
-    content: "\e74b";
-  }
-  
-  .iconVector-78:before {
-    content: "\e74c";
-  }
-  
-  .iconVector-67:before {
-    content: "\e74d";
-  }
-  
-  .iconVector-59:before {
-    content: "\e74e";
-  }
-  
-  .iconVector-60:before {
-    content: "\e74f";
-  }
-  
-  .iconVector-69:before {
-    content: "\e750";
-  }
-  
-  .iconVector-58:before {
-    content: "\e751";
-  }
-  
-  .iconVector-70:before {
-    content: "\e752";
-  }
-  
-  .iconVector-54:before {
-    content: "\e753";
-  }
-  
-  .iconVector-68:before {
-    content: "\e754";
-  }
-  
-  .iconVector-65:before {
-    content: "\e756";
-  }
-  
-  .iconVector-57:before {
-    content: "\e757";
-  }
-  
-  .iconVector-64:before {
-    content: "\e758";
-  }
-  
-  .iconVector-61:before {
-    content: "\e759";
-  }
-  
-  .iconVector-63:before {
-    content: "\e75a";
-  }
-  
-  .iconVector-38:before {
-    content: "\e75b";
-  }
-  
-  .iconVector-49:before {
-    content: "\e75c";
-  }
-  
-  .iconVector-66:before {
-    content: "\e75d";
-  }
-  
-  .iconVector-53:before {
-    content: "\e75f";
-  }
-  
-  .iconVector-62:before {
-    content: "\e760";
-  }
-  
-  .iconVector-46:before {
-    content: "\e761";
-  }
-  
-  .iconVector-55:before {
-    content: "\e762";
-  }
-  
-  .iconVector-56:before {
-    content: "\e763";
-  }
-  
-  .iconVector-37:before {
-    content: "\e764";
-  }
-  
-  .iconVector-51:before {
-    content: "\e765";
-  }
-  
-  .iconVector-52:before {
-    content: "\e766";
-  }
-  
-  .iconVector-50:before {
-    content: "\e767";
-  }
-  
-  .iconVector-29:before {
-    content: "\e768";
-  }
-  
-  .iconVector-47:before {
-    content: "\e769";
-  }
-  
-  .iconVector-48:before {
-    content: "\e76a";
-  }
-  
-  .iconVector-45:before {
-    content: "\e76b";
-  }
-  
-  .iconVector-39:before {
-    content: "\e76c";
-  }
-  
-  .iconVector-32:before {
-    content: "\e76d";
-  }
-  
-  .iconVector-44:before {
-    content: "\e76e";
-  }
-  
-  .iconVector-41:before {
-    content: "\e76f";
-  }
-  
-  .iconVector-40:before {
-    content: "\e770";
-  }
-  
-  .iconVector-33:before {
-    content: "\e771";
-  }
-  
-  .iconshouye1:before {
-    content: "\e716";
-  }
-  
-  .iconjifenshangpin:before {
-    content: "\e707";
-  }
-  
-  .iconnicheng1:before {
-    content: "\e708";
-  }
-  
-  .iconhuihua1:before {
-    content: "\e709";
-  }
-  
-  .icongeren:before {
-    content: "\e70a";
-  }
-  
-  .iconhuajiaqian:before {
-    content: "\e70e";
-  }
-  
-  .iconshoujia:before {
-    content: "\e70f";
-  }
-  
-  .iconshangpintupian:before {
-    content: "\e710";
-  }
-  
-  .icontupian1:before {
-    content: "\e711";
-  }
-  
-  .iconjinbi:before {
-    content: "\e712";
-  }
-  
-  .iconhuangguan:before {
-    content: "\e713";
-  }
-  
-  .icona-Group13:before {
-    content: "\e712";
-  }
-  
-  .iconyingxiao:before {
-    content: "\e706";
-  }
-  
-  .iconxiazai19:before {
-    content: "\e682";
-  }
-  
-  .icon31yiguanzhudianpu:before {
-    content: "\e656";
-  }
-  
-  .icon31huidaodingbu:before {
-    content: "\e658";
-  }
-  
-  .iconbianji:before {
-    content: "\e659";
-  }
-  
-  .icondaifahuo1:before {
-    content: "\e899";
-  }
-  
-  .icondaifukuan1:before {
-    content: "\e898";
-  }
-  
-  .icon31dianhua:before {
-    content: "\e63c";
-  }
-  
-  .iconxingzhuang-wenzi:before {
-    content: "\eb99";
-  }
-  
-  .iconshipin1:before {
-    content: "\e63a";
-  }
-  
-  .icontupian:before {
-    content: "\e667";
-  }
-  
-  .iconfenxiang:before {
-    content: "\e655";
-  }
-  
-  .iconkaifazujian:before {
-    content: "\e640";
-  }
-  
-  .iconzuoshangjiao:before {
-    content: "\e700";
-  }
-  
-  .iconyoushangjiao:before {
-    content: "\e701";
-  }
-  
-  .iconyouxiajiao:before {
-    content: "\e702";
-  }
-  
-  .iconzuoxiajiao:before {
-    content: "\e703";
-  }
-  
-  .iconfudonganniu1:before {
-    content: "\e630";
-  }
-  
-  .iconshangpinliebiaohengxianghuadong:before {
-    content: "\e926";
-  }
-  
-  .iconduoshangpinzu:before {
-    content: "\e650";
-  }
-  
-  .iconsousuokuang:before {
-    content: "\e65b";
-  }
-  
-  .iconmap-connect:before {
-    content: "\ea02";
-  }
-  
-  .iconfuwenben1:before {
-    content: "\e62f";
-  }
-  
-  .iconfuzhuxian1:before {
-    content: "\e646";
-  }
-  
-  .iconyouhuiquan1:before {
-    content: "\e665";
-  }
-  
-  .icontuichudenglu:before {
-    content: "\e64a";
-  }
-  
-  .iconicon_huojian1:before {
-    content: "\e6fe";
-  }
-  
-  .iconrili:before {
-    content: "\e664";
-  }
-  
-  .iconxiugai:before {
-    content: "\e62a";
-  }
-  
-  .iconxiazai01:before {
-    content: "\ea38";
-  }
-  
-  .icongouwuche:before {
-    content: "\e6c8";
-  }
-  
-  .iconicon-selected:before {
-    content: "\e626";
-  }
-  
-  .iconshouquanxinxi2:before {
-    content: "\e699";
-  }
-  
-  .iconshezhi1:before {
-    content: "\e696";
-  }
-  
-  .iconwenhao:before {
-    content: "\f1e3";
-  }
-  
-  .iconmofang-liangzuoliangyou:before {
-    content: "\e6c5";
-  }
-  
-  .iconmofang-yishangliangxia:before {
-    content: "\e6c6";
-  }
-  
-  .iconmofang-yizuoliangyou:before {
-    content: "\e6c7";
-  }
-  
-  .iconxuanzemoban-yizuosanyou:before {
-    content: "\e6e9";
-  }
-  
-  .iconsousuo:before {
-    content: "\e8b9";
-  }
-  
-  .icongengduo:before {
-    content: "\e63b";
-  }
-  
-  .iconqiehuan:before {
-    content: "\e61e";
-  }
-  
-  .iconxiangyoujiantou:before {
-    content: "\e660";
-  }
-  
-  .iconxiangzuojiantou:before {
-    content: "\e663";
-  }
-  
-  .iconlingdang-xianxing:before {
-    content: "\e8c0";
-  }
-  
-  .icondianhua:before {
-    content: "\e8c3";
-  }
-  
-  .iconyunkongjian:before {
-    content: "\e666";
-  }
-  
-  .iconjiantoushang:before {
-    content: "\e600";
-  }
-  
-  .iconloader-line:before {
-    content: "\e601";
-  }
-  
-  .icondelete-line:before {
-    content: "\e602";
-  }
-  
-  .iconjiantouxia:before {
-    content: "\e603";
-  }
-  
-  .iconcopy-line:before {
-    content: "\e605";
-  }
-  
-  .icontuodong:before {
-    content: "\e884";
-  }
-  
-  .iconyihangsange:before {
-    content: "\e6d5";
-  }
-  
-  .iconyihangsige:before {
-    content: "\e6d6";
-  }
-  
-  .iconyihangliangge:before {
-    content: "\e6e2";
-  }
-  
-  .icontuwendaohang2:before {
-    content: "\e65d";
-  }
-  
-  .icongudingzhanshi:before {
-    content: "\e66e";
-  }
-  
-  .icontuwendaohang3:before {
-    content: "\e670";
-  }
-  
-  .iconxiaochengxu:before {
-    content: "\e635";
-  }
-  
-  .iconjianpan:before {
-    content: "\e661";
-  }
-  
-  .icon24gf-playCircle:before {
-    content: "\ea82";
-  }
-  
-  .icontuichuquanping:before {
-    content: "\e755";
-  }
-  
-  .iconfanyi:before {
-    content: "\e6fb";
-  }
-  
-  .iconquanping:before {
-    content: "\eb11";
-  }
-  
\ No newline at end of file
+  font-family: "iconfont";
+  /* Project id 3883393 */
+  src: url('//at.alicdn.com/t/c/font_3883393_6d60cyygl4.woff2?t=1755603992297') format('woff2'),
+    url('//at.alicdn.com/t/c/font_3883393_6d60cyygl4.woff?t=1755603992297') format('woff'),
+    url('//at.alicdn.com/t/c/font_3883393_6d60cyygl4.ttf?t=1755603992297') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icona-bijiPC30:before {
+  content: "\e90b";
+}
+
+.icona-chengtuanrenshuPC30:before {
+  content: "\e90c";
+}
+
+.iconliulanliang:before {
+  content: "\e8fc";
+}
+
+.iconrenjunfangwenshu:before {
+  content: "\e8fd";
+}
+
+.iconxiadanshu1:before {
+  content: "\e8fe";
+}
+
+.iconfangkeshu:before {
+  content: "\e8ff";
+}
+
+.iconxiadanshuai:before {
+  content: "\e900";
+}
+
+.iconxiadanjine:before {
+  content: "\e901";
+}
+
+.icontuikuandingdanshu:before {
+  content: "\e902";
+}
+
+.iconzhifudingdanjine:before {
+  content: "\e903";
+}
+
+.iconzhifudingdanshu:before {
+  content: "\e904";
+}
+
+.iconzhifushuai:before {
+  content: "\e905";
+}
+
+.icondingdanguanbishuai:before {
+  content: "\e906";
+}
+
+.icontuikuandingdanjine:before {
+  content: "\e907";
+}
+
+.iconguanbidingdanshu:before {
+  content: "\e908";
+}
+
+.icontuikuanshuai:before {
+  content: "\e909";
+}
+
+.iconguanbidingdanjine:before {
+  content: "\e90a";
+}
+
+.iconhuodongguanli:before {
+  content: "\e8fb";
+}
+
+.icontuwendaohang:before {
+  content: "\e8f5";
+}
+
+.iconmiaoshashangpin:before {
+  content: "\e8f6";
+}
+
+.iconbaokuanmiaosha:before {
+  content: "\e8f7";
+}
+
+.iconmiaoshamofang:before {
+  content: "\e8f8";
+}
+
+.iconhuodongshijian:before {
+  content: "\e8f9";
+}
+
+.icontehuimiaosha:before {
+  content: "\e8fa";
+}
+
+.icondibucaidan:before {
+  content: "\e8ee";
+}
+
+.iconshangpinshuxing:before {
+  content: "\e8ef";
+}
+
+.iconjichuxinxi:before {
+  content: "\e8f0";
+}
+
+.iconshangpinxiangqing:before {
+  content: "\e8f1";
+}
+
+.iconshangpinpingjia1:before {
+  content: "\e8f2";
+}
+
+.iconzhongcaoxiu:before {
+  content: "\e8f3";
+}
+
+.iconshangpinfuwu1:before {
+  content: "\e8f4";
+}
+
+.iconmiaosha:before {
+  content: "\e8ed";
+}
+
+.iconchakan:before {
+  content: "\e8ec";
+}
+
+.icona-sousuoV6xx-36:before {
+  content: "\e8eb";
+}
+
+.iconquanxian:before {
+  content: "\e8e2";
+}
+
+.iconhuiyuan:before {
+  content: "\e8e3";
+}
+
+.iconqudao:before {
+  content: "\e8e5";
+}
+
+.iconyingxiao2:before {
+  content: "\e8e6";
+}
+
+.iconshezhi3:before {
+  content: "\e8e7";
+}
+
+.iconcaiwu1:before {
+  content: "\e8e8";
+}
+
+.iconyingyong21:before {
+  content: "\e8e9";
+}
+
+.iconzhuangxiu3:before {
+  content: "\e8ea";
+}
+
+.iconanzhuangyigechajian1:before {
+  content: "\e8e1";
+}
+
+.iconshoucang11:before {
+  content: "\e8df";
+}
+
+.iconxiaoliang:before {
+  content: "\e8e0";
+}
+
+.iconbofang:before {
+  content: "\e8dd";
+}
+
+.iconshoucang1:before {
+  content: "\e8de";
+}
+
+.iconFramec-1:before {
+  content: "\e8dc";
+}
+
+.iconcuowu:before {
+  content: "\e8da";
+}
+
+.iconchenggong:before {
+  content: "\e8db";
+}
+
+.iconzhuyiV6xx:before {
+  content: "\e8d3";
+}
+
+.iconchakanV6xx:before {
+  content: "\e8d4";
+}
+
+.iconFrame2:before {
+  content: "\e8d5";
+}
+
+.icona-1:before {
+  content: "\e8d6";
+}
+
+.iconFrame-1:before {
+  content: "\e8d7";
+}
+
+.icona-:before {
+  content: "\e8d8";
+}
+
+.icona-Group1128:before {
+  content: "\e8d9";
+}
+
+.icona-gengduoV6xx-28:before {
+  content: "\e8d2";
+}
+
+.iconbanquanshezhic:before {
+  content: "\e8d0";
+}
+
+.iconcaozuorizhic:before {
+  content: "\e8bb";
+}
+
+.iconbujushezhic:before {
+  content: "\e8bc";
+}
+
+.iconCMSc:before {
+  content: "\e8bd";
+}
+
+.iconguanliyuanjiaosec:before {
+  content: "\e8be";
+}
+
+.iconguanliyuanc:before {
+  content: "\e8bf";
+}
+
+.iconcunchushezhic:before {
+  content: "\e8c1";
+}
+
+.iconditushezhic:before {
+  content: "\e8c4";
+}
+
+.iconjichushezhic:before {
+  content: "\e8c5";
+}
+
+.iconshangchengc:before {
+  content: "\e8c6";
+}
+
+.icondenglushezhic:before {
+  content: "\e8c7";
+}
+
+.iconsuoyouyingyongc:before {
+  content: "\e8c8";
+}
+
+.iconpingtaifenleic:before {
+  content: "\e8c9";
+}
+
+.iconquanxianshezhic:before {
+  content: "\e8ca";
+}
+
+.iconsucaiguanlic:before {
+  content: "\e8cb";
+}
+
+.iconwangzhanshezhic:before {
+  content: "\e8cc";
+}
+
+.iconkaifangpingtaipeizhic:before {
+  content: "\e8cd";
+}
+
+.iconweixinkaifangpingtaic:before {
+  content: "\e8ce";
+}
+
+.iconwangzhanc:before {
+  content: "\e8d1";
+}
+
+.iconfuzhiV6xx1:before {
+  content: "\e8a6";
+}
+
+.iconanzhuangyigechajian:before {
+  content: "\e8a7";
+}
+
+.iconchajiankaifa11:before {
+  content: "\e8a8";
+}
+
+.iconkehuduan:before {
+  content: "\e8a9";
+}
+
+.iconhuanjingjiance11:before {
+  content: "\e8aa";
+}
+
+.icondaimashengcheng11:before {
+  content: "\e8ab";
+}
+
+.iconpingtaicaidan1:before {
+  content: "\e8ac";
+}
+
+.iconjihuarenwu11:before {
+  content: "\e8ad";
+}
+
+.icongengxinhuancun2:before {
+  content: "\e8ae";
+}
+
+.iconshouquanxinxi1:before {
+  content: "\e8af";
+}
+
+.iconbeifenjilu:before {
+  content: "\e8b0";
+}
+
+.iconguanliduan:before {
+  content: "\e8b1";
+}
+
+.iconxitonggengxin1:before {
+  content: "\e8b2";
+}
+
+.iconshengjijilu1:before {
+  content: "\e8b3";
+}
+
+.iconzhandianliebiao1:before {
+  content: "\e8b4";
+}
+
+.iconshujuzidian1:before {
+  content: "\e8b5";
+}
+
+.iconyunbianyi:before {
+  content: "\e8b6";
+}
+
+.iconkaifazhekry:before {
+  content: "\e8b7";
+}
+
+.iconzhandiantaocan1:before {
+  content: "\e8b8";
+}
+
+.iconzhandiancaidan1:before {
+  content: "\e8ba";
+}
+
+.iconAIshengchengchajianc:before {
+  content: "\e8a2";
+}
+
+.iconanzhuangyigechajianc:before {
+  content: "\e8a3";
+}
+
+.iconkaifayigechajianc:before {
+  content: "\e8a4";
+}
+
+.iconyunbianyic:before {
+  content: "\e8a5";
+}
+
+.iconAPPc:before {
+  content: "\e89b";
+}
+
+.iconPCc:before {
+  content: "\e89e";
+}
+
+.iconH5c:before {
+  content: "\e89f";
+}
+
+.iconzhifubaoxiaochengxuc:before {
+  content: "\e8a0";
+}
+
+.iconxiaochengxutongbuc:before {
+  content: "\e8a1";
+}
+
+.icona-Frame427322133:before {
+  content: "\e89a";
+}
+
+.iconyonghu11:before {
+  content: "\e895";
+}
+
+.iconshezhi2:before {
+  content: "\e896";
+}
+
+.iconFramec-2:before {
+  content: "\e88f";
+}
+
+.iconFramec-5:before {
+  content: "\e890";
+}
+
+.iconFramec-4:before {
+  content: "\e891";
+}
+
+.iconxitongc:before {
+  content: "\e892";
+}
+
+.iconFramec-3:before {
+  content: "\e893";
+}
+
+.iconshouyec:before {
+  content: "\e894";
+}
+
+.iconbeifenjiluV6xx:before {
+  content: "\e89d";
+}
+
+.iconyun2:before {
+  content: "\e88d";
+}
+
+.iconxitonggengxin:before {
+  content: "\e88c";
+}
+
+.iconshengjijilu:before {
+  content: "\e88e";
+}
+
+.iconshanchu-fanggaiV6xx:before {
+  content: "\e88a";
+}
+
+.iconshanchu-yuangaiV6xx:before {
+  content: "\e88b";
+}
+
+.iconbangzhuV6mm-1:before {
+  content: "\e888";
+}
+
+.iconshangchengshequ:before {
+  content: "\e880";
+}
+
+.iconhuiyuanka:before {
+  content: "\e882";
+}
+
+.iconshangmenfuwu:before {
+  content: "\e883";
+}
+
+.iconweiguanwang:before {
+  content: "\e885";
+}
+
+.iconzhongcaoshequ:before {
+  content: "\e886";
+}
+
+.iconlvyou:before {
+  content: "\e887";
+}
+
+.iconyingyong2:before {
+  content: "\e615";
+}
+
+.iconzhandianguanli:before {
+  content: "\e87c";
+}
+
+.iconyonghu1:before {
+  content: "\e87d";
+}
+
+.iconshouye2:before {
+  content: "\e87e";
+}
+
+.iconshezhi11:before {
+  content: "\e87f";
+}
+
+.icona-kaifa1:before {
+  content: "\eb58";
+}
+
+.iconditu2:before {
+  content: "\e87b";
+}
+
+.iconkaifamyi:before {
+  content: "\e851";
+}
+
+.iconditushezhi:before {
+  content: "\e863";
+}
+
+.iconbanquanshezhi:before {
+  content: "\e85c";
+}
+
+.iconcaozuorizhi:before {
+  content: "\e85d";
+}
+
+.iconchajiankaifa1:before {
+  content: "\e85e";
+}
+
+.iconbujushezhi:before {
+  content: "\e85f";
+}
+
+.iconcunchushezhi:before {
+  content: "\e860";
+}
+
+.iconchajianguanli:before {
+  content: "\e861";
+}
+
+.iconhuanjingjiance1:before {
+  content: "\e862";
+}
+
+.iconguanliyuanjiaose:before {
+  content: "\e864";
+}
+
+.iconguanliyuan:before {
+  content: "\e865";
+}
+
+.icongongjuguanli:before {
+  content: "\e866";
+}
+
+.icondaimashengcheng1:before {
+  content: "\e867";
+}
+
+.icondenglushezhi:before {
+  content: "\e868";
+}
+
+.iconjichushezhi1:before {
+  content: "\e869";
+}
+
+.iconpingtaicaidan:before {
+  content: "\e86a";
+}
+
+.iconkaifazhekey:before {
+  content: "\e86b";
+}
+
+.iconjihuarenwu1:before {
+  content: "\e86c";
+}
+
+.iconquanxianshezhi:before {
+  content: "\e86d";
+}
+
+.iconsucaiguanli1:before {
+  content: "\e86e";
+}
+
+.iconwangzhan2:before {
+  content: "\e86f";
+}
+
+.iconshouquanxinxi:before {
+  content: "\e870";
+}
+
+.iconwangzhanshezhi:before {
+  content: "\e871";
+}
+
+.iconshujuzidian:before {
+  content: "\e872";
+}
+
+.iconzhandianliebiao:before {
+  content: "\e873";
+}
+
+.iconxitongcaidan:before {
+  content: "\e874";
+}
+
+.iconyingyongcaidan:before {
+  content: "\e875";
+}
+
+.iconkaifangpingtaipeizhi:before {
+  content: "\e876";
+}
+
+.iconzhandiancaidan:before {
+  content: "\e877";
+}
+
+.iconzhandiantaocan:before {
+  content: "\e878";
+}
+
+.iconweixinkaifangpingtai:before {
+  content: "\e879";
+}
+
+.iconxiaochengxutongbu:before {
+  content: "\e87a";
+}
+
+.iconpeizhimyi:before {
+  content: "\e850";
+}
+
+.iconkaifaxyi:before {
+  content: "\e852";
+}
+
+.iconyingyongmyi:before {
+  content: "\e853";
+}
+
+.iconyonghuxyi:before {
+  content: "\e854";
+}
+
+.iconyonghumyi:before {
+  content: "\e855";
+}
+
+.iconyingyongxyi:before {
+  content: "\e856";
+}
+
+.iconpeizhixyi:before {
+  content: "\e857";
+}
+
+.iconshouyexyi:before {
+  content: "\e858";
+}
+
+.iconshouyemyi:before {
+  content: "\e859";
+}
+
+.iconzhandian-1:before {
+  content: "\e85a";
+}
+
+.iconzhandian:before {
+  content: "\e85b";
+}
+
+.icona-duihaopc30:before {
+  content: "\e84e";
+}
+
+.icona-duoxuanxiangpc301:before {
+  content: "\e84f";
+}
+
+.icona-duoxuanxiangpc30-1:before {
+  content: "\e84d";
+}
+
+.icona-duoxuanxiangpc30:before {
+  content: "\e72d";
+}
+
+.icona-shenfenzhengpc30:before {
+  content: "\e83f";
+}
+
+.icona-shijianpc30-1:before {
+  content: "\e840";
+}
+
+.icona-danhangwenbenpc30:before {
+  content: "\e841";
+}
+
+.icona-shoujipc30:before {
+  content: "\e842";
+}
+
+.icona-youxiangpc30:before {
+  content: "\e843";
+}
+
+.icona-biaodantijiaopc30:before {
+  content: "\e844";
+}
+
+.icona-shijianfanweipc30:before {
+  content: "\e845";
+}
+
+.icona-duohangwenben-1pc30:before {
+  content: "\e846";
+}
+
+.icona-danhangwenben-1pc30:before {
+  content: "\e847";
+}
+
+.icona-tupianpc30:before {
+  content: "\e848";
+}
+
+.icona-shuzipc30-1:before {
+  content: "\e849";
+}
+
+.icona-riqifanweipc30:before {
+  content: "\e84a";
+}
+
+.icona-danxuanxiangpc30:before {
+  content: "\e84b";
+}
+
+.icona-riqipc30:before {
+  content: "\e84c";
+}
+
+.iconyuezhifu:before {
+  content: "\e680";
+}
+
+.iconshujutongji:before {
+  content: "\e835";
+}
+
+.iconshangpinguanli1:before {
+  content: "\e837";
+}
+
+.icondingdanguanli:before {
+  content: "\e838";
+}
+
+.icona-tupianzhanbopc302:before {
+  content: "\e83c";
+}
+
+.icona-jingxuantuijianpc302:before {
+  content: "\e83d";
+}
+
+.icona-jingxuantuijianpc30-12:before {
+  content: "\e83e";
+}
+
+.icona-baokuantuijianpc30:before {
+  content: "\e836";
+}
+
+.icona-shangpintuijianpc30:before {
+  content: "\e839";
+}
+
+.icona-paihangbangpc30:before {
+  content: "\e83a";
+}
+
+.icona-xinrenzhuanxiangpc30:before {
+  content: "\e83b";
+}
+
+.icona-lipinkatupianpc30:before {
+  content: "\e82c";
+}
+
+.icona-lipinkayouxiaoqipc30:before {
+  content: "\e82d";
+}
+
+.icona-lipinkazhufuyupc30:before {
+  content: "\e833";
+}
+
+.icona-lipinkamingchengpc30:before {
+  content: "\e834";
+}
+
+.iconshezhiV6xx:before {
+  content: "\e82e";
+}
+
+.iconshezhiV6xx-2:before {
+  content: "\e82f";
+}
+
+.iconshezhiV6xx-1:before {
+  content: "\e830";
+}
+
+.iconshezhiV6xx1:before {
+  content: "\e831";
+}
+
+.iconshezhi-1V6xx:before {
+  content: "\e832";
+}
+
+.icondiduiqi1:before {
+  content: "\e7b0";
+}
+
+.icondingduiqi1:before {
+  content: "\e827";
+}
+
+.iconchuizhijuzhong1:before {
+  content: "\e828";
+}
+
+.iconzuoduiqi1:before {
+  content: "\e829";
+}
+
+.iconshuipingjuzhong1:before {
+  content: "\e82a";
+}
+
+.iconyouduiqi1:before {
+  content: "\e82b";
+}
+
+.iconxiaochengxu2:before {
+  content: "\e63d";
+}
+
+.icondingdan1:before {
+  content: "\e7b1";
+}
+
+.iconqiandaoguanli:before {
+  content: "\e7b2";
+}
+
+.iconqiandaojilu:before {
+  content: "\e7b3";
+}
+
+.iconshangpincanshu:before {
+  content: "\e820";
+}
+
+.iconpingtaiyouhuiquan:before {
+  content: "\e821";
+}
+
+.iconshangpin:before {
+  content: "\e822";
+}
+
+.iconyingxiao1:before {
+  content: "\e823";
+}
+
+.iconqiandaoshezhi:before {
+  content: "\e824";
+}
+
+.icondianpuyouhuiquan:before {
+  content: "\e825";
+}
+
+.iconshangpinpinpai1:before {
+  content: "\e826";
+}
+
+.iconmofangpc:before {
+  content: "\e7e6";
+}
+
+.iconjingdianpc:before {
+  content: "\e7e7";
+}
+
+.iconliangzuoliangyoupc:before {
+  content: "\e7e8";
+}
+
+.iconfuzhuxianpc:before {
+  content: "\e7e9";
+}
+
+.iconbiaotipc:before {
+  content: "\e7ea";
+}
+
+.iconkaxiangpc:before {
+  content: "\e7ed";
+}
+
+.iconhuiyuanqiandaopc:before {
+  content: "\e7ee";
+}
+
+.iconfuwenbenpc:before {
+  content: "\e7ef";
+}
+
+.iconfenxiaoshangpinpc:before {
+  content: "\e7f0";
+}
+
+.iconfudonganniupc:before {
+  content: "\e7f1";
+}
+
+.iconhuiyuandengjipc:before {
+  content: "\e7f2";
+}
+
+.icongonggaopc:before {
+  content: "\e7f3";
+}
+
+.iconfuzhukongbaipc:before {
+  content: "\e7f4";
+}
+
+.iconduoshangpinzupc:before {
+  content: "\e7f5";
+}
+
+.iconshouyepc-1:before {
+  content: "\e7f6";
+}
+
+.iconzuoyoutuwenpc:before {
+  content: "\e7f7";
+}
+
+.iconzhongyingwenfanyipc:before {
+  content: "\e7f8";
+}
+
+.iconyunkongjianpc:before {
+  content: "\e7f9";
+}
+
+.iconyouxiapc:before {
+  content: "\e7fa";
+}
+
+.iconzuoshangpc:before {
+  content: "\e7fb";
+}
+
+.iconzuoxiapc:before {
+  content: "\e7fc";
+}
+
+.iconxiaochengxupc:before {
+  content: "\e7fd";
+}
+
+.iconyingxiaopc:before {
+  content: "\e7fe";
+}
+
+.iconyoushangpc:before {
+  content: "\e7ff";
+}
+
+.iconshouquanxinxipc:before {
+  content: "\e800";
+}
+
+.iconxiazaipc-2:before {
+  content: "\e801";
+}
+
+.icontuichuquanpingpc:before {
+  content: "\e802";
+}
+
+.iconhuojianpc:before {
+  content: "\e803";
+}
+
+.iconsousuopc-1:before {
+  content: "\e804";
+}
+
+.iconhuihuapc:before {
+  content: "\e805";
+}
+
+.iconliebiaopc:before {
+  content: "\e806";
+}
+
+.iconxiazaipc-1:before {
+  content: "\e807";
+}
+
+.iconwendangsousuopc:before {
+  content: "\e808";
+}
+
+.iconshoujiapc:before {
+  content: "\e809";
+}
+
+.iconxiazaipc:before {
+  content: "\e80a";
+}
+
+.icontuwendaohangpc1:before {
+  content: "\e80b";
+}
+
+.iconshangpintupianpc:before {
+  content: "\e80c";
+}
+
+.iconjifenshangpinpc1:before {
+  content: "\e80d";
+}
+
+.icontuichudenglupc:before {
+  content: "\e80e";
+}
+
+.iconsousuokuangpc:before {
+  content: "\e80f";
+}
+
+.iconshouyepc:before {
+  content: "\e810";
+}
+
+.iconrilipc:before {
+  content: "\e811";
+}
+
+.iconsousuopc1:before {
+  content: "\e812";
+}
+
+.iconquanpingpc:before {
+  content: "\e813";
+}
+
+.iconnichengpc:before {
+  content: "\e814";
+}
+
+.iconduipc:before {
+  content: "\e815";
+}
+
+.iconhuajiaqianpc:before {
+  content: "\e816";
+}
+
+.iconqiehuanpc:before {
+  content: "\e817";
+}
+
+.iconjianpanpc:before {
+  content: "\e818";
+}
+
+.iconshangxiatuwenpc:before {
+  content: "\e819";
+}
+
+.iconchajianpc:before {
+  content: "\e81a";
+}
+
+.iconditulianxianpc:before {
+  content: "\e81b";
+}
+
+.icongengduopc:before {
+  content: "\e81c";
+}
+
+.iconchazhaopc:before {
+  content: "\e81d";
+}
+
+.iconTpc:before {
+  content: "\e81e";
+}
+
+.iconbofangpc:before {
+  content: "\e81f";
+}
+
+.iconyihang2gepc:before {
+  content: "\e7b4";
+}
+
+.iconyouhuiquanpc:before {
+  content: "\e7b5";
+}
+
+.iconyihang4gepc:before {
+  content: "\e7b6";
+}
+
+.icontianjiapc:before {
+  content: "\e7b7";
+}
+
+.iconyihang4gepc-1:before {
+  content: "\e7b8";
+}
+
+.iconyingyongliebiaopc:before {
+  content: "\e7b9";
+}
+
+.iconwenzidaohangpc:before {
+  content: "\e7ba";
+}
+
+.iconyihang3gepc-1:before {
+  content: "\e7bb";
+}
+
+.iconyizuosanyoupc:before {
+  content: "\e7ce";
+}
+
+.iconyihang2gepc1:before {
+  content: "\e7cf";
+}
+
+.iconyizuoliangyoupc:before {
+  content: "\e7d0";
+}
+
+.iconshengyinpc:before {
+  content: "\e7d1";
+}
+
+.iconyihang3gepc:before {
+  content: "\e7d2";
+}
+
+.icontuwenguanggaopc:before {
+  content: "\e7d3";
+}
+
+.iconjifenpc:before {
+  content: "\e7d4";
+}
+
+.iconyishangliangxiapc:before {
+  content: "\e7d5";
+}
+
+.iconxianlupc:before {
+  content: "\e7d6";
+}
+
+.iconrequpc:before {
+  content: "\e7d7";
+}
+
+.iconshipinpc:before {
+  content: "\e7d8";
+}
+
+.iconwenzhangpc:before {
+  content: "\e7d9";
+}
+
+.icontuwendaohangpc:before {
+  content: "\e7da";
+}
+
+.iconhuodongmofangpc:before {
+  content: "\e7db";
+}
+
+.icontupiandaohangpc:before {
+  content: "\e7dc";
+}
+
+.iconjifenshangpinpc:before {
+  content: "\e7dd";
+}
+
+.icona-Group1003pc:before {
+  content: "\e7de";
+}
+
+.iconshangpinliebiaopc:before {
+  content: "\e7df";
+}
+
+.iconsousuopc:before {
+  content: "\e7e0";
+}
+
+.iconhellowenbenpc:before {
+  content: "\e7e1";
+}
+
+.iconlunbosousuopc:before {
+  content: "\e7e2";
+}
+
+.iconmeiriqiandaopc:before {
+  content: "\e7e3";
+}
+
+.iconjiudianpc:before {
+  content: "\e7e4";
+}
+
+.iconjishizhongxinpc:before {
+  content: "\e7e5";
+}
+
+.icondingdanzhongxinPC-1:before {
+  content: "\e7ac";
+}
+
+.icondingdanzhongxinPC-3:before {
+  content: "\e7ad";
+}
+
+.icondingdanzhongxinPC-2:before {
+  content: "\e7ae";
+}
+
+.icondingdanzhongxinPC:before {
+  content: "\e7af";
+}
+
+.icondakuanshezhi1:before {
+  content: "\e7bc";
+}
+
+.iconxiaoximoban:before {
+  content: "\e7bd";
+}
+
+.iconweiyemian:before {
+  content: "\e7be";
+}
+
+.iconyemianlujing:before {
+  content: "\e7bf";
+}
+
+.iconshujudaochu:before {
+  content: "\e7c0";
+}
+
+.iconzhucedenglu:before {
+  content: "\e7c1";
+}
+
+.iconduanxinshezhi:before {
+  content: "\e7c2";
+}
+
+.iconFrame:before {
+  content: "\e7c3";
+}
+
+.iconzhifushezhi1:before {
+  content: "\e7c4";
+}
+
+.iconduanxinshezhi-1:before {
+  content: "\e7c5";
+}
+
+.iconshujudaochu-1:before {
+  content: "\e7c6";
+}
+
+.iconshujudaochu1:before {
+  content: "\e7c7";
+}
+
+.iconzhifujilu:before {
+  content: "\e7c8";
+}
+
+.iconshoujiduan:before {
+  content: "\e7c9";
+}
+
+.iconxiaoximoban1:before {
+  content: "\e7ca";
+}
+
+.iconduanxinshezhi1:before {
+  content: "\e7cb";
+}
+
+.icondianpucaidan:before {
+  content: "\e7cc";
+}
+
+.icona-Group844:before {
+  content: "\e7cd";
+}
+
+.iconbanquan2:before {
+  content: "\e61b";
+}
+
+.iconjifen1:before {
+  content: "\e641";
+}
+
+.iconyuandaima:before {
+  content: "\e610";
+}
+
+.iconjiaoseguanli:before {
+  content: "\e637";
+}
+
+.iconweixinxiaochengxu:before {
+  content: "\e614";
+}
+
+.iconjiaoseyonghu:before {
+  content: "\e648";
+}
+
+.iconyonghu:before {
+  content: "\e65e";
+}
+
+.iconbanquan1:before {
+  content: "\e66d";
+}
+
+.iconweixingongzhonghao:before {
+  content: "\e613";
+}
+
+.iconbanquan:before {
+  content: "\e632";
+}
+
+.iconjifen-xianxing:before {
+  content: "\e897";
+}
+
+.iconhuiyuanliebiao:before {
+  content: "\e634";
+}
+
+.iconjifen:before {
+  content: "\e70c";
+}
+
+.iconguanbi:before {
+  content: "\e612";
+}
+
+.icondengluzhucemima:before {
+  content: "\e67f";
+}
+
+.iconqiehuanjiaose:before {
+  content: "\e60f";
+}
+
+.iconxiaochengxushezhi:before {
+  content: "\e6b4";
+}
+
+.icondenglu:before {
+  content: "\e604";
+}
+
+.iconweixingongzhonghaoguanli:before {
+  content: "\e609";
+}
+
+.iconweixingongzhonghao1:before {
+  content: "\e705";
+}
+
+.icondibudaohang:before {
+  content: "\e617";
+}
+
+.iconwangpuzhuangxiu:before {
+  content: "\e881";
+}
+
+.iconfenyehuadong:before {
+  content: "\e673";
+}
+
+.iconwendaohang:before {
+  content: "\e674";
+}
+
+.iconzhuangxiu:before {
+  content: "\e62d";
+}
+
+.icondianpuzhuangxiu:before {
+  content: "\e616";
+}
+
+.icontupianguanggao1:before {
+  content: "\e649";
+}
+
+.iconwenzhang:before {
+  content: "\e662";
+}
+
+.icondanhanghuadong:before {
+  content: "\e66f";
+}
+
+.icontudaohang:before {
+  content: "\e671";
+}
+
+.iconfuzhushuxian:before {
+  content: "\e6f7";
+}
+
+.iconmofang:before {
+  content: "\e6c4";
+}
+
+.iconshoudongxuanze:before {
+  content: "\e6e1";
+}
+
+.iconfuzhukongbai1:before {
+  content: "\e642";
+}
+
+.iconyihang5ge:before {
+  content: "\e6f3";
+}
+
+.iconjubao:before {
+  content: "\e611";
+}
+
+.iconhuiyuanzhongxin:before {
+  content: "\e692";
+}
+
+.iconbiaoti:before {
+  content: "\e643";
+}
+
+.iconbankuai:before {
+  content: "\e668";
+}
+
+.iconneirong2:before {
+  content: "\e889";
+}
+
+.icondesktop:before {
+  content: "\e6e8";
+}
+
+.iconzhifubao:before {
+  content: "\e8e4";
+}
+
+.iconyingyongshichang:before {
+  content: "\e618";
+}
+
+.icondianzan:before {
+  content: "\ec7f";
+}
+
+.iconh5e:before {
+  content: "\e654";
+}
+
+.iconkaifazheguanli:before {
+  content: "\e62c";
+}
+
+.iconlianmengguanli:before {
+  content: "\e65f";
+}
+
+.iconyingyongguanli:before {
+  content: "\e61f";
+}
+
+.iconmanage-apply:before {
+  content: "\e619";
+}
+
+.icongengxinhuancun:before {
+  content: "\e686";
+}
+
+.iconsixingjiance:before {
+  content: "\e645";
+}
+
+.iconzhuceshezhi:before {
+  content: "\e6ad";
+}
+
+.icontuikuanjilu:before {
+  content: "\e8cf";
+}
+
+.iconqianbao:before {
+  content: "\e6ca";
+}
+
+.iconic_description_file24px:before {
+  content: "\e61a";
+}
+
+.iconzhuangxiu1:before {
+  content: "\e66b";
+}
+
+.iconhuiyuanguanli:before {
+  content: "\e64c";
+}
+
+.iconhuangjinhuiyuan0101-copy:before {
+  content: "\e621";
+}
+
+.iconhuiyuan1:before {
+  content: "\e644";
+}
+
+.iconweixin:before {
+  content: "\e647";
+}
+
+.icontaocanliebiao:before {
+  content: "\e6b2";
+}
+
+.iconyingyongshichang2:before {
+  content: "\e60b";
+}
+
+.iconyingyongshichang1:before {
+  content: "\e61c";
+}
+
+.iconic_manage_assignprop:before {
+  content: "\e60c";
+}
+
+.iconchengshi:before {
+  content: "\ec70";
+}
+
+.iconhuiyuandingdan:before {
+  content: "\e68a";
+}
+
+.iconjiudian:before {
+  content: "\e68b";
+}
+
+.iconhellowenbenanli:before {
+  content: "\e68c";
+}
+
+.icondingdan:before {
+  content: "\e61d";
+}
+
+.icona-02_luxian:before {
+  content: "\e687";
+}
+
+.iconhuiyuanxinxi:before {
+  content: "\e688";
+}
+
+.iconjingdian:before {
+  content: "\e689";
+}
+
+.iconxinyongqia:before {
+  content: "\e785";
+}
+
+.iconmendian:before {
+  content: "\e60a";
+}
+
+.iconico_yuyueguanli_yuyuebiangeng:before {
+  content: "\e94a";
+}
+
+.iconkaifazheguanli1:before {
+  content: "\e636";
+}
+
+.iconmofang1:before {
+  content: "\e64d";
+}
+
+.iconrequ:before {
+  content: "\e68d";
+}
+
+.iconquanbudingdan:before {
+  content: "\e606";
+}
+
+.iconshimingrenzheng-xian:before {
+  content: "\e89c";
+}
+
+.iconpaixu:before {
+  content: "\e60d";
+}
+
+.iconpaixu1:before {
+  content: "\e64e";
+}
+
+.iconshoucang:before {
+  content: "\e8c2";
+}
+
+.iconshezhi:before {
+  content: "\e64b";
+}
+
+.iconhuiyuan11:before {
+  content: "\e691";
+}
+
+.iconwangzhan:before {
+  content: "\e690";
+}
+
+.iconyingyong:before {
+  content: "\e68f";
+}
+
+.iconqudaoguanli:before {
+  content: "\e695";
+}
+
+.iconshichangwuliaozhichi:before {
+  content: "\e694";
+}
+
+.iconcaiwu:before {
+  content: "\e693";
+}
+
+.iconxianxiazhifu2:before {
+  content: "\e69a";
+}
+
+.iconhuiyuantixian:before {
+  content: "\e69b";
+}
+
+.iconcode:before {
+  content: "\e620";
+}
+
+.iconcaidan:before {
+  content: "\e652";
+}
+
+.iconwangzhan1:before {
+  content: "\e69d";
+}
+
+.iconyingyongshichang11:before {
+  content: "\e697";
+}
+
+.iconcaiwuliushui:before {
+  content: "\e698";
+}
+
+.iconhuiyuanliebiao1:before {
+  content: "\e69c";
+}
+
+.iconyun-line:before {
+  content: "\e622";
+}
+
+.iconyingyongshichang-:before {
+  content: "\e607";
+}
+
+.iconguanzhu:before {
+  content: "\e739";
+}
+
+.iconlishijilu:before {
+  content: "\f1e2";
+}
+
+.icona-huaban1fuben25:before {
+  content: "\e608";
+}
+
+.iconyun:before {
+  content: "\e69e";
+}
+
+.icongaikuang:before {
+  content: "\e623";
+}
+
+.iconwenzhangguanli:before {
+  content: "\e6b0";
+}
+
+.iconhuiyuan2:before {
+  content: "\e6b1";
+}
+
+.iconhuiyuanyue:before {
+  content: "\e69f";
+}
+
+.iconxiaoxiguanli:before {
+  content: "\e6a1";
+}
+
+.iconwodexingbiao:before {
+  content: "\e6a0";
+}
+
+.iconzhifuguanli:before {
+  content: "\e6af";
+}
+
+.iconqudaoguanli1:before {
+  content: "\e6aa";
+}
+
+.iconquanxianguanli:before {
+  content: "\e6a6";
+}
+
+.iconsucaiguanli:before {
+  content: "\e6a7";
+}
+
+.icona-shouyediannao:before {
+  content: "\e6a5";
+}
+
+.iconhuanjingjiance:before {
+  content: "\e6a2";
+}
+
+.iconjihuarenwu:before {
+  content: "\e6a3";
+}
+
+.iconchakanlishi:before {
+  content: "\e6a8";
+}
+
+.icongengxinhuancun1:before {
+  content: "\e6ac";
+}
+
+.iconhuiyuanbiaoqian:before {
+  content: "\e6a4";
+}
+
+.iconhuiyuanjifen:before {
+  content: "\e6ab";
+}
+
+.iconhuiyuanyongjin:before {
+  content: "\e6a9";
+}
+
+.icondaimashengcheng:before {
+  content: "\e6ae";
+}
+
+.iconchajiankaifa:before {
+  content: "\e6b3";
+}
+
+.iconyunshichang:before {
+  content: "\e6b5";
+}
+
+.iconnav-market:before {
+  content: "\e60e";
+}
+
+.iconwenzhangguanli1:before {
+  content: "\e6bc";
+}
+
+.iconkaxiangdingdan:before {
+  content: "\e6b9";
+}
+
+.iconlvyouchanpin:before {
+  content: "\e6ba";
+}
+
+.iconlvyoudingdan:before {
+  content: "\e6bb";
+}
+
+.icongaikuang1:before {
+  content: "\e6b7";
+}
+
+.iconkaxiangchanpin:before {
+  content: "\e6b6";
+}
+
+.iconchongzhidingdan:before {
+  content: "\e6b8";
+}
+
+.iconqiehuan1:before {
+  content: "\e627";
+}
+
+.iconyingyong1:before {
+  content: "\e6bf";
+}
+
+.iconzhuangxiu2:before {
+  content: "\e6bd";
+}
+
+.iconzhuangxiu21:before {
+  content: "\e6be";
+}
+
+.iconfenlei:before {
+  content: "\e6c3";
+}
+
+.iconqiehuan2:before {
+  content: "\e6c0";
+}
+
+.iconqudaoguanli2:before {
+  content: "\e6c1";
+}
+
+.iconguanfangshichang:before {
+  content: "\e6c2";
+}
+
+.iconjiantou_xiangzuoliangci_o:before {
+  content: "\eb93";
+}
+
+.iconshouye:before {
+  content: "\e675";
+}
+
+.iconshouye-shouye:before {
+  content: "\e638";
+}
+
+.icondian:before {
+  content: "\ec1e";
+}
+
+.iconchajian1:before {
+  content: "\e679";
+}
+
+.iconanzhuang:before {
+  content: "\e676";
+}
+
+.iconicon_huojian:before {
+  content: "\e677";
+}
+
+.iconjiantou:before {
+  content: "\e67a";
+}
+
+.iconyuanquan_huaban1:before {
+  content: "\e66c";
+}
+
+.iconzhankai:before {
+  content: "\e67b";
+}
+
+.iconyun1:before {
+  content: "\e67e";
+}
+
+.iconshangpinguanli:before {
+  content: "\e67c";
+}
+
+.iconshangpinliebiao:before {
+  content: "\e628";
+}
+
+.icongonggao:before {
+  content: "\e629";
+}
+
+.iconshangpinpinglun:before {
+  content: "\e6d3";
+}
+
+.iconshangpinfuwu:before {
+  content: "\e6d4";
+}
+
+.iconxiangmufenlei:before {
+  content: "\e6d0";
+}
+
+.iconwuliugenzong:before {
+  content: "\e6d1";
+}
+
+.iconshangpinbiaoqian:before {
+  content: "\e6d2";
+}
+
+.icontuikuanweiquan:before {
+  content: "\e6ce";
+}
+
+.iconyingxiaozhongxin:before {
+  content: "\e6cf";
+}
+
+.iconjishiguanli:before {
+  content: "\e684";
+}
+
+.iconxiangmuguanli:before {
+  content: "\e6cc";
+}
+
+.iconyouhuiquan:before {
+  content: "\e6cd";
+}
+
+.iconpaisongshezhi:before {
+  content: "\e685";
+}
+
+.iconyuyueshezhi:before {
+  content: "\e6cb";
+}
+
+.iconyuyuexiangmu:before {
+  content: "\e68e";
+}
+
+.iconshangpinpinpai:before {
+  content: "\e6c9";
+}
+
+.icona-dingdanliebiao:before {
+  content: "\e6e7";
+}
+
+.iconjiaoyishezhi:before {
+  content: "\e6e4";
+}
+
+.icondingdanhexiao:before {
+  content: "\e6e5";
+}
+
+.icondingdanweiquan:before {
+  content: "\e6e6";
+}
+
+.iconjiudiandingdan:before {
+  content: "\e6df";
+}
+
+.iconjingdianguanli:before {
+  content: "\e6e0";
+}
+
+.icondingdanshezhi:before {
+  content: "\e6e3";
+}
+
+.iconluxianguanli:before {
+  content: "\e6db";
+}
+
+.iconjiudianguanli:before {
+  content: "\e6dc";
+}
+
+.iconshangjiadizhiku:before {
+  content: "\e6dd";
+}
+
+.iconkaxiangguanli:before {
+  content: "\e6de";
+}
+
+.iconhuishouzhan:before {
+  content: "\e6d7";
+}
+
+.iconshangpinliebiao1:before {
+  content: "\e6d8";
+}
+
+.iconshangpinfenlei:before {
+  content: "\e6d9";
+}
+
+.iconfenleishezhi:before {
+  content: "\e6da";
+}
+
+.iconfapiaoguanli:before {
+  content: "\e683";
+}
+
+.iconjingdiandingdan:before {
+  content: "\e6ea";
+}
+
+.iconluxiandingdan:before {
+  content: "\e6eb";
+}
+
+.iconqiehuan3:before {
+  content: "\e6ec";
+}
+
+.iconshangchengshezhi:before {
+  content: "\e6ee";
+}
+
+.iconjichushezhi:before {
+  content: "\e6ed";
+}
+
+.iconjishuzhichi:before {
+  content: "\e6f1";
+}
+
+.iconjiagebanben:before {
+  content: "\e6f0";
+}
+
+.icona-shangbiao2:before {
+  content: "\e64f";
+}
+
+.iconkaifashangzhongxin:before {
+  content: "\e6fa";
+}
+
+.iconts-tubiao_CertificateServer:before {
+  content: "\e62b";
+}
+
+.iconwodeshouquan:before {
+  content: "\e6f6";
+}
+
+.iconwodezhanghu:before {
+  content: "\e6f8";
+}
+
+.iconshimingrenzheng:before {
+  content: "\e6f9";
+}
+
+.iconwodedingdan:before {
+  content: "\e6f2";
+}
+
+.icongerenxinxi:before {
+  content: "\e6f4";
+}
+
+.iconwodezhandian:before {
+  content: "\e6f5";
+}
+
+.icontishi:before {
+  content: "\e6fc";
+}
+
+.iconshouquanliebiao:before {
+  content: "\e6fd";
+}
+
+.iconhuojian:before {
+  content: "\e6ff";
+}
+
+.iconrili1:before {
+  content: "\e62e";
+}
+
+.iconmap-link:before {
+  content: "\ea01";
+}
+
+.iconbanbenqiehuan:before {
+  content: "\e792";
+}
+
+.iconjishi:before {
+  content: "\e749";
+}
+
+.iconicon_congzuodaoyou:before {
+  content: "\e7eb";
+}
+
+.iconicon_congshangdaoxia:before {
+  content: "\e7ec";
+}
+
+.iconhengxianghuadong:before {
+  content: "\e63e";
+}
+
+.iconico:before {
+  content: "\e63f";
+}
+
+.iconxiaochengxu1:before {
+  content: "\e631";
+}
+
+.icontransferout-copy:before {
+  content: "\ecad";
+}
+
+.iconguanwang:before {
+  content: "\e704";
+}
+
+.icontransferout:before {
+  content: "\e651";
+}
+
+.iconshuiqijiaoliu:before {
+  content: "\e67d";
+}
+
+.icontuikuantuihuo:before {
+  content: "\e639";
+}
+
+.iconhome:before {
+  content: "\e633";
+}
+
+.icontuihuobaozhang:before {
+  content: "\e653";
+}
+
+.iconguahao:before {
+  content: "\e66a";
+}
+
+.icondaifukuan:before {
+  content: "\e672";
+}
+
+.iconhuiyuan12:before {
+  content: "\e70b";
+}
+
+.iconerweima:before {
+  content: "\e70d";
+}
+
+.iconshangjiantou:before {
+  content: "\e678";
+}
+
+.iconwenzhanglanmu1:before {
+  content: "\e722";
+}
+
+.iconliushui1:before {
+  content: "\e723";
+}
+
+.iconwenzhangliebiao1:before {
+  content: "\e71f";
+}
+
+.iconyouqinglianjie1:before {
+  content: "\e720";
+}
+
+.icondianpuliebiao1:before {
+  content: "\e721";
+}
+
+.iconhuiyuantixian1:before {
+  content: "\e71c";
+}
+
+.icondianputixian1:before {
+  content: "\e71d";
+}
+
+.icondianpushenqing1:before {
+  content: "\e71e";
+}
+
+.iconhuiyuanyongjin1:before {
+  content: "\e71a";
+}
+
+.iconshouyelouceng1:before {
+  content: "\e71b";
+}
+
+.icondianputaocan1:before {
+  content: "\e717";
+}
+
+.icondianpuyonghu1:before {
+  content: "\e718";
+}
+
+.iconhuiyuanyue1:before {
+  content: "\e719";
+}
+
+.icondianpufenlei1:before {
+  content: "\e714";
+}
+
+.iconjiesuanjilu1:before {
+  content: "\e715";
+}
+
+.icona-Rectangle106:before {
+  content: "\e7a8";
+}
+
+.icona-Polygon13:before {
+  content: "\e7a9";
+}
+
+.iconUnion-7:before {
+  content: "\e77e";
+}
+
+.iconUnion-6:before {
+  content: "\e78a";
+}
+
+.icona-Polygon17Stroke:before {
+  content: "\e7a7";
+}
+
+.iconUnion-8:before {
+  content: "\e79a";
+}
+
+.iconUnion-2:before {
+  content: "\e79b";
+}
+
+.iconUnion-4:before {
+  content: "\e79d";
+}
+
+.iconUnion-5:before {
+  content: "\e79e";
+}
+
+.iconUnion:before {
+  content: "\e7a0";
+}
+
+.icona-Star6Stroke:before {
+  content: "\e7a1";
+}
+
+.icona-Star5Stroke:before {
+  content: "\e7a2";
+}
+
+.iconUnion-1:before {
+  content: "\e7a3";
+}
+
+.icona-SubtractStroke:before {
+  content: "\e7a4";
+}
+
+.iconUnion-3:before {
+  content: "\e7a5";
+}
+
+.iconxiajiantou:before {
+  content: "\e681";
+}
+
+.iconriqi:before {
+  content: "\e657";
+}
+
+.icontuikuan:before {
+  content: "\e75e";
+}
+
+.icongouwu:before {
+  content: "\e65a";
+}
+
+.icondaishouhuo:before {
+  content: "\e65c";
+}
+
+.icondaifahuo:before {
+  content: "\e669";
+}
+
+.icona-Polygon10:before {
+  content: "\e7a6";
+}
+
+.iconkaifashezhi:before {
+  content: "\e6ef";
+}
+
+.iconzhifushezhi:before {
+  content: "\e625";
+}
+
+.icondakuanshezhi:before {
+  content: "\e624";
+}
+
+.iconVector-43:before {
+  content: "\e772";
+}
+
+.iconVector-22:before {
+  content: "\e773";
+}
+
+.iconVector-30:before {
+  content: "\e774";
+}
+
+.iconVector-36:before {
+  content: "\e775";
+}
+
+.iconVector-42:before {
+  content: "\e776";
+}
+
+.iconVector-35:before {
+  content: "\e777";
+}
+
+.iconVector-20:before {
+  content: "\e778";
+}
+
+.iconVector-25:before {
+  content: "\e779";
+}
+
+.iconVector-31:before {
+  content: "\e77a";
+}
+
+.iconVector-28:before {
+  content: "\e77b";
+}
+
+.iconVector-34:before {
+  content: "\e77c";
+}
+
+.iconVector-24:before {
+  content: "\e77d";
+}
+
+.iconVector-17:before {
+  content: "\e77f";
+}
+
+.iconVector-27:before {
+  content: "\e780";
+}
+
+.iconVector-6:before {
+  content: "\e781";
+}
+
+.iconVector-26:before {
+  content: "\e782";
+}
+
+.iconVector-15:before {
+  content: "\e783";
+}
+
+.iconVector-21:before {
+  content: "\e784";
+}
+
+.iconVector-11:before {
+  content: "\e786";
+}
+
+.iconVector-5:before {
+  content: "\e787";
+}
+
+.iconVector-19:before {
+  content: "\e788";
+}
+
+.iconVector-23:before {
+  content: "\e789";
+}
+
+.iconVector-16:before {
+  content: "\e78b";
+}
+
+.iconVector-14:before {
+  content: "\e78c";
+}
+
+.iconVector-8:before {
+  content: "\e78d";
+}
+
+.iconVector-13:before {
+  content: "\e78e";
+}
+
+.iconVector-12:before {
+  content: "\e78f";
+}
+
+.iconVector-18:before {
+  content: "\e790";
+}
+
+.icona-9:before {
+  content: "\e791";
+}
+
+.iconVector-1:before {
+  content: "\e793";
+}
+
+.iconVector-7:before {
+  content: "\e794";
+}
+
+.iconVector-2:before {
+  content: "\e795";
+}
+
+.iconVector-9:before {
+  content: "\e796";
+}
+
+.iconVector:before {
+  content: "\e797";
+}
+
+.iconVector-10:before {
+  content: "\e798";
+}
+
+.iconVector-3:before {
+  content: "\e799";
+}
+
+.iconVector-4:before {
+  content: "\e79c";
+}
+
+.icona-Vector1Stroke:before {
+  content: "\e79f";
+}
+
+.iconq96:before {
+  content: "\e7aa";
+}
+
+.icona-Vector3Stroke-copy-copy:before {
+  content: "\e7ab";
+}
+
+.iconVector-104:before {
+  content: "\e724";
+}
+
+.iconVector-105:before {
+  content: "\e725";
+}
+
+.iconVector-108:before {
+  content: "\e726";
+}
+
+.iconVector-107:before {
+  content: "\e727";
+}
+
+.iconVector-106:before {
+  content: "\e728";
+}
+
+.iconVector-97:before {
+  content: "\e729";
+}
+
+.iconVector-102:before {
+  content: "\e72a";
+}
+
+.iconVector-103:before {
+  content: "\e72b";
+}
+
+.iconVector-101:before {
+  content: "\e72c";
+}
+
+.iconVector-92:before {
+  content: "\e72e";
+}
+
+.iconVector-90:before {
+  content: "\e72f";
+}
+
+.iconVector-98:before {
+  content: "\e730";
+}
+
+.iconVector-99:before {
+  content: "\e731";
+}
+
+.iconVector-100:before {
+  content: "\e732";
+}
+
+.iconVector-95:before {
+  content: "\e733";
+}
+
+.iconVector-96:before {
+  content: "\e734";
+}
+
+.iconVector-94:before {
+  content: "\e735";
+}
+
+.iconVector-91:before {
+  content: "\e736";
+}
+
+.iconVector-93:before {
+  content: "\e737";
+}
+
+.iconVector-89:before {
+  content: "\e738";
+}
+
+.iconVector-84:before {
+  content: "\e73a";
+}
+
+.iconVector-83:before {
+  content: "\e73b";
+}
+
+.iconVector-88:before {
+  content: "\e73c";
+}
+
+.iconVector-82:before {
+  content: "\e73d";
+}
+
+.iconVector-86:before {
+  content: "\e73e";
+}
+
+.iconVector-74:before {
+  content: "\e73f";
+}
+
+.iconVector-81:before {
+  content: "\e740";
+}
+
+.iconVector-85:before {
+  content: "\e741";
+}
+
+.iconVector-87:before {
+  content: "\e742";
+}
+
+.iconVector-77:before {
+  content: "\e743";
+}
+
+.iconVector-79:before {
+  content: "\e744";
+}
+
+.iconVector-80:before {
+  content: "\e745";
+}
+
+.iconVector-75:before {
+  content: "\e746";
+}
+
+.iconVector-72:before {
+  content: "\e747";
+}
+
+.iconVector-71:before {
+  content: "\e748";
+}
+
+.iconVector-76:before {
+  content: "\e74a";
+}
+
+.iconVector-73:before {
+  content: "\e74b";
+}
+
+.iconVector-78:before {
+  content: "\e74c";
+}
+
+.iconVector-67:before {
+  content: "\e74d";
+}
+
+.iconVector-59:before {
+  content: "\e74e";
+}
+
+.iconVector-60:before {
+  content: "\e74f";
+}
+
+.iconVector-69:before {
+  content: "\e750";
+}
+
+.iconVector-58:before {
+  content: "\e751";
+}
+
+.iconVector-70:before {
+  content: "\e752";
+}
+
+.iconVector-54:before {
+  content: "\e753";
+}
+
+.iconVector-68:before {
+  content: "\e754";
+}
+
+.iconVector-65:before {
+  content: "\e756";
+}
+
+.iconVector-57:before {
+  content: "\e757";
+}
+
+.iconVector-64:before {
+  content: "\e758";
+}
+
+.iconVector-61:before {
+  content: "\e759";
+}
+
+.iconVector-63:before {
+  content: "\e75a";
+}
+
+.iconVector-38:before {
+  content: "\e75b";
+}
+
+.iconVector-49:before {
+  content: "\e75c";
+}
+
+.iconVector-66:before {
+  content: "\e75d";
+}
+
+.iconVector-53:before {
+  content: "\e75f";
+}
+
+.iconVector-62:before {
+  content: "\e760";
+}
+
+.iconVector-46:before {
+  content: "\e761";
+}
+
+.iconVector-55:before {
+  content: "\e762";
+}
+
+.iconVector-56:before {
+  content: "\e763";
+}
+
+.iconVector-37:before {
+  content: "\e764";
+}
+
+.iconVector-51:before {
+  content: "\e765";
+}
+
+.iconVector-52:before {
+  content: "\e766";
+}
+
+.iconVector-50:before {
+  content: "\e767";
+}
+
+.iconVector-29:before {
+  content: "\e768";
+}
+
+.iconVector-47:before {
+  content: "\e769";
+}
+
+.iconVector-48:before {
+  content: "\e76a";
+}
+
+.iconVector-45:before {
+  content: "\e76b";
+}
+
+.iconVector-39:before {
+  content: "\e76c";
+}
+
+.iconVector-32:before {
+  content: "\e76d";
+}
+
+.iconVector-44:before {
+  content: "\e76e";
+}
+
+.iconVector-41:before {
+  content: "\e76f";
+}
+
+.iconVector-40:before {
+  content: "\e770";
+}
+
+.iconVector-33:before {
+  content: "\e771";
+}
+
+.iconshouye1:before {
+  content: "\e716";
+}
+
+.iconjifenshangpin:before {
+  content: "\e707";
+}
+
+.iconnicheng1:before {
+  content: "\e708";
+}
+
+.iconhuihua1:before {
+  content: "\e709";
+}
+
+.icongeren:before {
+  content: "\e70a";
+}
+
+.iconhuajiaqian:before {
+  content: "\e70e";
+}
+
+.iconshoujia:before {
+  content: "\e70f";
+}
+
+.iconshangpintupian:before {
+  content: "\e710";
+}
+
+.icontupian1:before {
+  content: "\e711";
+}
+
+.iconjinbi:before {
+  content: "\e712";
+}
+
+.iconhuangguan:before {
+  content: "\e713";
+}
+
+.icona-Group13:before {
+  content: "\e712";
+}
+
+.iconyingxiao:before {
+  content: "\e706";
+}
+
+.iconxiazai19:before {
+  content: "\e682";
+}
+
+.icon31yiguanzhudianpu:before {
+  content: "\e656";
+}
+
+.icon31huidaodingbu:before {
+  content: "\e658";
+}
+
+.iconbianji:before {
+  content: "\e659";
+}
+
+.icondaifahuo1:before {
+  content: "\e899";
+}
+
+.icondaifukuan1:before {
+  content: "\e898";
+}
+
+.icon31dianhua:before {
+  content: "\e63c";
+}
+
+.iconxingzhuang-wenzi:before {
+  content: "\eb99";
+}
+
+.iconshipin1:before {
+  content: "\e63a";
+}
+
+.icontupian:before {
+  content: "\e667";
+}
+
+.iconfenxiang:before {
+  content: "\e655";
+}
+
+.iconkaifazujian:before {
+  content: "\e640";
+}
+
+.iconzuoshangjiao:before {
+  content: "\e700";
+}
+
+.iconyoushangjiao:before {
+  content: "\e701";
+}
+
+.iconyouxiajiao:before {
+  content: "\e702";
+}
+
+.iconzuoxiajiao:before {
+  content: "\e703";
+}
+
+.iconfudonganniu1:before {
+  content: "\e630";
+}
+
+.iconshangpinliebiaohengxianghuadong:before {
+  content: "\e926";
+}
+
+.iconduoshangpinzu:before {
+  content: "\e650";
+}
+
+.iconsousuokuang:before {
+  content: "\e65b";
+}
+
+.iconmap-connect:before {
+  content: "\ea02";
+}
+
+.iconfuwenben1:before {
+  content: "\e62f";
+}
+
+.iconfuzhuxian1:before {
+  content: "\e646";
+}
+
+.iconyouhuiquan1:before {
+  content: "\e665";
+}
+
+.icontuichudenglu:before {
+  content: "\e64a";
+}
+
+.iconicon_huojian1:before {
+  content: "\e6fe";
+}
+
+.iconrili:before {
+  content: "\e664";
+}
+
+.iconxiugai:before {
+  content: "\e62a";
+}
+
+.iconxiazai01:before {
+  content: "\ea38";
+}
+
+.icongouwuche:before {
+  content: "\e6c8";
+}
+
+.iconicon-selected:before {
+  content: "\e626";
+}
+
+.iconshouquanxinxi2:before {
+  content: "\e699";
+}
+
+.iconshezhi1:before {
+  content: "\e696";
+}
+
+.iconwenhao:before {
+  content: "\f1e3";
+}
+
+.iconmofang-liangzuoliangyou:before {
+  content: "\e6c5";
+}
+
+.iconmofang-yishangliangxia:before {
+  content: "\e6c6";
+}
+
+.iconmofang-yizuoliangyou:before {
+  content: "\e6c7";
+}
+
+.iconxuanzemoban-yizuosanyou:before {
+  content: "\e6e9";
+}
+
+.iconsousuo:before {
+  content: "\e8b9";
+}
+
+.icongengduo:before {
+  content: "\e63b";
+}
+
+.iconqiehuan:before {
+  content: "\e61e";
+}
+
+.iconxiangyoujiantou:before {
+  content: "\e660";
+}
+
+.iconxiangzuojiantou:before {
+  content: "\e663";
+}
+
+.iconlingdang-xianxing:before {
+  content: "\e8c0";
+}
+
+.icondianhua:before {
+  content: "\e8c3";
+}
+
+.iconyunkongjian:before {
+  content: "\e666";
+}
+
+.iconjiantoushang:before {
+  content: "\e600";
+}
+
+.iconloader-line:before {
+  content: "\e601";
+}
+
+.icondelete-line:before {
+  content: "\e602";
+}
+
+.iconjiantouxia:before {
+  content: "\e603";
+}
+
+.iconcopy-line:before {
+  content: "\e605";
+}
+
+.icontuodong:before {
+  content: "\e884";
+}
+
+.iconyihangsange:before {
+  content: "\e6d5";
+}
+
+.iconyihangsige:before {
+  content: "\e6d6";
+}
+
+.iconyihangliangge:before {
+  content: "\e6e2";
+}
+
+.icontuwendaohang2:before {
+  content: "\e65d";
+}
+
+.icongudingzhanshi:before {
+  content: "\e66e";
+}
+
+.icontuwendaohang3:before {
+  content: "\e670";
+}
+
+.iconxiaochengxu:before {
+  content: "\e635";
+}
+
+.iconjianpan:before {
+  content: "\e661";
+}
+
+.icon24gf-playCircle:before {
+  content: "\ea82";
+}
+
+.icontuichuquanping:before {
+  content: "\e755";
+}
+
+.iconfanyi:before {
+  content: "\e6fb";
+}
+
+.iconquanping:before {
+  content: "\eb11";
+}
\ No newline at end of file
diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts
index 36bcb47c5..dc000c910 100644
--- a/admin/src/utils/common.ts
+++ b/admin/src/utils/common.ts
@@ -252,17 +252,17 @@ export function moneyFormat(money: string): string {
  */
 export function timeStampTurnTime(timeStamp: any, type = "") {
     if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
-        var date = new Date();
+        const date = new Date();
         date.setTime(timeStamp * 1000);
-        var y: any = date.getFullYear();
-        var m: any = date.getMonth() + 1;
+        const y: any = date.getFullYear();
+        let m: any = date.getMonth() + 1;
         m = m < 10 ? ('0' + m) : m;
-        var d: any = date.getDate();
+        let d: any = date.getDate();
         d = d < 10 ? ('0' + d) : d;
-        var h: any = date.getHours();
+        let h: any = date.getHours();
         h = h < 10 ? ('0' + h) : h;
-        var minute: any = date.getMinutes();
-        var second: any = date.getSeconds();
+        let minute: any = date.getMinutes();
+        let second: any = date.getSeconds();
         minute = minute < 10 ? ('0' + minute) : minute;
         second = second < 10 ? ('0' + second) : second;
         if (type) {
@@ -279,14 +279,34 @@ export function timeStampTurnTime(timeStamp: any, type = "") {
     }
 }
 
+/**
+ * 获取当前日期时间
+ */
+export function getCurrentDataTime(timeStamp: any) {
+    const addZero = (t) => {
+        return t < 10 ? '0' + t : t;
+    }
+    const time = new Date(timeStamp);
+    let Y = time.getFullYear(), // 年
+        M = time.getMonth() + 1, // 月
+        D = time.getDate(), // 日
+        h = time.getHours(), // 时
+        m = time.getMinutes(), // 分
+        s = time.getSeconds(); // 秒
+    if (M > 12) {
+        M = M - 12;
+    }
+    return `${Y}-${addZero(M)}-${addZero(D)} ${addZero(h)}:${addZero(m)}:${addZero(s)}`
+}
+
 /**
  * 日期格式转时间戳
  * @param {Object} date
  */
 export function timeTurnTimeStamp(date: string) {
-    var f = date.split(' ', 2);
-    var d = (f[0] ? f[0] : '').split('-', 3);
-    var t = (f[1] ? f[1] : '').split(':', 3);
+    const f = date.split(' ', 2);
+    const d = (f[0] ? f[0] : '').split('-', 3);
+    const t = (f[1] ? f[1] : '').split(':', 3);
     return (new Date(
         parseInt(d[0], 10) || null,
         (parseInt(d[1], 10) || 1) - 1,
@@ -344,18 +364,18 @@ export function filterBlank(event: any) {
  * @param where
  */
 export function setTablePageStorage(page: any = 1, limit: any = 10, where: any = {}) {
-    var data = storage.get('tablePageStorage');
+    let data = storage.get('tablePageStorage');
     if (!data) {
         data = {};
     }
 
-    var key = location.pathname + JSON.stringify(where);
+    const key = location.pathname + JSON.stringify(where);
     data[key] = {
         page,
         limit
     };
 
-    var MAX_COUNT = 5; // 最多存储 5 个页面的分页缓存，超出则删除最开始的第一个页面
+    const MAX_COUNT = 5; // 最多存储 5 个页面的分页缓存，超出则删除最开始的第一个页面
     if (Object.keys(data).length > MAX_COUNT) {
         delete data[Object.keys(data)[0]];
     }
@@ -368,8 +388,8 @@ export function setTablePageStorage(page: any = 1, limit: any = 10, where: any =
  * @param where
  */
 export function getTablePageStorage(where: any = {}) {
-    var data = storage.get('tablePageStorage');
-    var key = location.pathname + JSON.stringify(where);
+    let data = storage.get('tablePageStorage');
+    const key = location.pathname + JSON.stringify(where);
     if (!data || !data[key]) {
         data = {
             page: 1,