diff --git a/admin/package-lock.json b/admin/package-lock.json index 0160f293b..2621871f1 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -2330,15 +2330,15 @@ } }, "node_modules/browserslist": { - "version": "4.22.2", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.2.tgz", - "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", + "version": "4.24.2", + "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "dev": true, "dependencies": { - "caniuse-lite": "^1.0.30001565", - "electron-to-chromium": "^1.4.601", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" @@ -2413,9 +2413,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001571", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz", - "integrity": "sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==", + "version": "1.0.30001680", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "dev": true }, "node_modules/chalk": { @@ -2809,9 +2809,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.616", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.616.tgz", - "integrity": "sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg==", + "version": "1.5.56", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz", + "integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==", "dev": true }, "node_modules/element-plus": { @@ -2982,9 +2982,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, "engines": { "node": ">=6" @@ -4585,9 +4585,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "version": "2.0.18", + "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "dev": true }, "node_modules/normalize-path": { @@ -4809,9 +4809,9 @@ "dev": true }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -5925,13 +5925,13 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "dev": true, "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" diff --git a/admin/public/ueditor/themes/default/css/ueditor.css b/admin/public/ueditor/themes/default/css/ueditor.css index 1544b010b..81421c3ea 100644 --- a/admin/public/ueditor/themes/default/css/ueditor.css +++ b/admin/public/ueditor/themes/default/css/ueditor.css @@ -145,7 +145,7 @@ div.edui-box { background-color: white; position: relative; overflow: visible; - z-index: 1; + z-index: 1 !important; } .edui-editor div { diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts index b8a25a2e7..217e8c679 100644 --- a/admin/src/app/api/addon.ts +++ b/admin/src/app/api/addon.ts @@ -5,7 +5,7 @@ import request from '@/utils/request' * @returns */ export function getAddonLocal(params: Record) { - return request.get('addon/local', params, { showSuccessMessage: true }) + return request.get('addon/local', params) } /** @@ -13,7 +13,7 @@ export function getAddonLocal(params: Record) { * @returns */ export function getAddonDetail(id: number) { - return request.get(`addon/${id}`) + return request.get(`addon/${ id }`) } /** @@ -22,7 +22,7 @@ export function getAddonDetail(id: number) { * @returns */ export function installAddon(params: Record) { - return request.post(`addon/install/${params.addon}`, params) + return request.post(`addon/install/${ params.addon }`, params) } /** @@ -31,7 +31,7 @@ export function installAddon(params: Record) { * @returns */ export function cloudInstallAddon(params: Record) { - return request.post(`addon/cloudinstall/${params.addon}`, params) + return request.post(`addon/cloudinstall/${ params.addon }`, params) } /** @@ -40,7 +40,7 @@ export function cloudInstallAddon(params: Record) { * @returns */ export function uninstallAddon(params: Record) { - return request.post(`addon/uninstall/${params.addon}`, params, { showSuccessMessage: true }) + return request.post(`addon/uninstall/${ params.addon }`, params, { showSuccessMessage: true }) } /** @@ -49,7 +49,7 @@ export function uninstallAddon(params: Record) { * @returns */ export function preInstallCheck(addon: string) { - return request.get(`addon/install/check/${addon}`) + return request.get(`addon/install/check/${ addon }`) } /** @@ -66,7 +66,7 @@ export function getAddonInstalltask() { * @returns */ export function getAddonCloudInstallLog(addon: string) { - return request.get(`addon/cloudinstall/${addon}`) + return request.get(`addon/cloudinstall/${ addon }`) } /** @@ -75,7 +75,7 @@ export function getAddonCloudInstallLog(addon: string) { * @returns */ export function preUninstallCheck(addon: string) { - return request.get(`addon/uninstall/check/${addon}`) + return request.get(`addon/uninstall/check/${ addon }`) } /** @@ -84,7 +84,7 @@ export function preUninstallCheck(addon: string) { * @returns */ export function cancelInstall(addon: string) { - return request.put(`addon/install/cancel/${addon}`, {}, { showErrorMessage: false }) + return request.put(`addon/install/cancel/${ addon }`, {}, { showErrorMessage: false }) } export function getInstalledAddonList() { diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index c5b94943a..9613b7005 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -480,6 +480,22 @@ export function getCronLogList(params: any) { return request.get(`sys/schedule/log/list`, { params }) } +/** + * 删除任务日志 + * @returns + */ +export function deleteCronLog(params: Record) { + return request.put(`sys/schedule/log/delete`, params, { showSuccessMessage: true }) +} + +/** + * 清空任务日志 + * @returns + */ +export function clearCronLog(params: Record) { + return request.put(`sys/schedule/log/clear`, params, { showSuccessMessage: true }) +} + /***************************************************** 协议管理 ****************************************************/ /** @@ -650,14 +666,6 @@ export function setDeveloperToken(params: Record) { return request.put(`sys/config/developer_token`, params, { showSuccessMessage: true }) } -/** - * 获取布局设置 - * @returns - */ -export function getWebsiteLayout() { - return request.get('sys/web/layout') -} - /***************************************************** 报表导出 ****************************************************/ /** @@ -715,4 +723,3 @@ export function deleteExport(id: number) { export function getInstallConfig() { return request.get('sys/install/config') } - diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index c0628ac1d..358978598 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -105,6 +105,9 @@ "styleSet": "风格设置", "titleStyle": "标题样式", "selectStyle": "风格选择", + "activeCubeBlockBtnText": "按钮文字", + "btnTextItalics": "斜体", + "btnTextNormal": "常规", "styleLabel": "风格", "styleShowTips": "风格 1 2 3，仅在小程序中展示", "titleContent": "标题内容", @@ -199,8 +202,17 @@ "carouselSearchShowWayStatic": "正常显示", "carouselSearchShowWayFixed": "滚动至顶部固定", "carouselSearchFixedBgColor": "置顶背景", + "carouselSearchStyleSelect": "风格选择", "carouselSearchSet": "搜索设置", + "carouselSearchSubTitle": "副标题", + "carouselSearchSubTitleStyle": "副标题样式", + "carouselSearchPositionStyle": "定位样式", + "carouselSearchSubTitlePlaceholder": "请输入副标题内容", "carouselSearchText": "搜索内容", + "carouselSearchTextColor": "文字颜色", + "carouselSearchBgColor": "背景颜色", + "carouselSearchBtnColor": "按钮颜色", + "carouselSearchBtnBgColor": "按钮背景色", "carouselSearchHotWordSet": "搜索热词", "carouselSearchHotWordInterval": "显示时间 / 秒", "carouselSearchHotWordText": "内容", @@ -223,6 +235,7 @@ "carouselSearchSwiperInterval": "切换间隔 / 秒", "carouselSearchSwiperTips": "建议上传尺寸相同的图片，推荐尺寸750*350；鼠标拖拽可调整图片顺序", "carouselSearchTabStyle": "选项卡样式", + "carouselSearchStyle": "搜索框样式", "noColor": "常规颜色", "selectColor": "选中颜色", "fixedNoColor": "下滑常规颜色", @@ -232,6 +245,7 @@ "carouselSearchSwiperStyle": "轮播样式", "carouselSearchSwiperIndicatorStyle1": "样式1", "carouselSearchSwiperIndicatorStyle2": "样式2", + "carouselSearchSwiperIndicatorStyle3": "样式3", "carouselSearchSwiperIndicatorAlign": "显示位置", "alignLeft": "居左", "alignCenter": "居中", @@ -257,5 +271,13 @@ "rollTopStatusBarTextColor": "滚动后标题颜色", "topStatusBarSearchName": "搜索内容", "topStatusBarSearchNamePlaceholder": "请输入搜索关键词", - "settingTips": "点击查看如何配置" + "settingTips": "点击查看如何配置", + "pictureShowBlockOne": "模块一", + "pictureShowBlockTwo": "模块二", + "subTitleTextColor": "标题颜色", + "pictureShowBgColor": "背景颜色", + "pictureShowBtnText": "按钮文字", + "pictureShowBtnColor": "文字颜色", + "pictureShowBtnBgColor": "背景颜色", + "pictureShowBlockStyle": "模块样式" } diff --git a/admin/src/app/lang/zh-cn/member.member.json b/admin/src/app/lang/zh-cn/member.member.json index 35cd69035..035d26274 100644 --- a/admin/src/app/lang/zh-cn/member.member.json +++ b/admin/src/app/lang/zh-cn/member.member.json @@ -30,7 +30,7 @@ "sex": "性别", "wxUnionid": "微信unionid", "weappOpenid": "微信用户openid", - "wxOpenid": "微信小程openid", + "wxOpenid": "微信小程序openid", "head": "会员头像", "username": "用户名", "usernamePlaceholder": "请输入用户名", diff --git a/admin/src/app/lang/zh-cn/setting.login.json b/admin/src/app/lang/zh-cn/setting.login.json index 69bb3614a..8cdf72a5d 100644 --- a/admin/src/app/lang/zh-cn/setting.login.json +++ b/admin/src/app/lang/zh-cn/setting.login.json @@ -10,8 +10,10 @@ "agreement": "政策协议", "agreementTips": "注册时服务协议和隐私协议是否进行展示", "tripartiteSetting": "第三方设置", - "isAuthRegister": "快捷登录/注册", + "isAuthRegister": "自动注册会员", "isAuthRegisterTip": "开启之后，微信公众号、小程序等第三方平台可以自动注册会员或者快捷登录/注册会员，方便会员自动登录", + "isForceAccessUserInfo": "强制获取用户信息", + "isForceAccessUserInfoTip": "开启之后，将强制获取用户头像、昵称等信息，需要用户同意后，才能注册成功", "mobileOrUsernameNoEmpty": "普通注册方式至少需启用一种", "loginPageSet": "界面设置", "bgUrl": "背景图", diff --git a/admin/src/app/lang/zh-cn/setting.map.json b/admin/src/app/lang/zh-cn/setting.map.json index cf2273430..346d9fc75 100644 --- a/admin/src/app/lang/zh-cn/setting.map.json +++ b/admin/src/app/lang/zh-cn/setting.map.json @@ -4,8 +4,8 @@ "isOpen": "定位开关", "validTime": "定位有效期", "minutes": "分钟", - "validTimeTips": "过期后将重新获取定位信息，0为不过期", + "validTimeTips": "过期后将重新获取定位信息", "validTimePlaceholder": "请输入定位有效期", "validTimeFormatTips": "格式输入错误", - "validTimeNotZeroTips": "定位有效期不能小于0" + "validTimeNotZeroTips": "定位有效期不能小于5分钟" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/setting.pay.json b/admin/src/app/lang/zh-cn/setting.pay.json index 69d1b3283..47f70cca9 100644 --- a/admin/src/app/lang/zh-cn/setting.pay.json +++ b/admin/src/app/lang/zh-cn/setting.pay.json @@ -63,5 +63,7 @@ "h5Domain": "H5支付域名", "h5DomainTips": "需在微信商户号>产品中心>开发配置>支付配置 H5支付域名中添加该域名", "nativeDomain": "Native支付回调链接", - "nativeDomainTips": "需在微信商户号>产品中心>开发配置>支付配置 Native支付回调链接中添加该链接" + "nativeDomainTips": "需在微信商户号>产品中心>开发配置>支付配置 Native支付回调链接中添加该链接", + "wechatpayPublicCert": "微信支付公钥", + "wechatpayPublicCertId": "微信支付公钥ID" } diff --git a/admin/src/app/lang/zh-cn/tools.schedule_log.json b/admin/src/app/lang/zh-cn/tools.schedule_log.json index ac0211c83..dfa0e23aa 100644 --- a/admin/src/app/lang/zh-cn/tools.schedule_log.json +++ b/admin/src/app/lang/zh-cn/tools.schedule_log.json @@ -7,5 +7,11 @@ "status": "执行状态", "executeTime": "执行时间", "info": "详情", - "cronInfo": "日志详情" + "cronInfo": "日志详情", + "batchDelete": "批量删除", + "clearAll": "清空", + "batchEmptySelectedCronLogTips": "请选择要删除的日志", + "batchDeleteTips": "确定要删除选中的日志吗？", + "clearAllTips": "确定要清空所有日志吗？", + "deleteTips": "确定要删除该条日志吗？" } \ No newline at end of file diff --git a/admin/src/app/views/app/index.vue b/admin/src/app/views/app/index.vue index 1c0f4b00a..3eec258f4 100644 --- a/admin/src/app/views/app/index.vue +++ b/admin/src/app/views/app/index.vue @@ -4,26 +4,33 @@
应用管理
+
-
-
-
-
- - - -
-
-

{{ item.title }}

+
+ + +
+ + + +
+
+ {{ item.title }} + +
+ +

{{item.desc}}

-
+
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 129b46baa..20bdbcb26 100644 --- a/admin/src/app/views/diy/components/edit-active-cube.vue +++ b/admin/src/app/views/diy/components/edit-active-cube.vue @@ -11,21 +11,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + - +