diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts index 7fd4f3221..84af6fd79 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, { showSuccessMessage: true }) } /** diff --git a/admin/src/app/api/auth.ts b/admin/src/app/api/auth.ts index 5bd9152fe..ea2892d3a 100644 --- a/admin/src/app/api/auth.ts +++ b/admin/src/app/api/auth.ts @@ -9,6 +9,13 @@ export function login(params: Record, app_type: string) { return request.get(`login/${app_type}`, {params}) } +/** + * 退出登录 + */ +export function logout() { + return request.put('auth/logout', {}, { showErrorMessage: false }) +} + /** * 获取登录用户权限 * @returns diff --git a/admin/src/app/api/cloud.ts b/admin/src/app/api/cloud.ts index 51b4bc422..4f4710cb0 100644 --- a/admin/src/app/api/cloud.ts +++ b/admin/src/app/api/cloud.ts @@ -5,7 +5,7 @@ import request from '@/utils/request' * @param addon */ export function cloudBuild() { - return request.post('niucloud/build') + return request.post('niucloud/build', {}, { timeout: 0 }) } /** diff --git a/admin/src/app/api/diy.ts b/admin/src/app/api/diy.ts index df66a57a2..171bb5d88 100644 --- a/admin/src/app/api/diy.ts +++ b/admin/src/app/api/diy.ts @@ -108,6 +108,13 @@ export function getDiyTemplate(params: Record) { return request.get(`diy/template`, {params}) } +/** + * 获取模板页面列表 + */ +export function getDiyTemplatePages(params: Record) { + return request.get(`diy/template/pages`, {params}) +} + /** * 获取自定义路由列表 * @param params @@ -152,10 +159,10 @@ export function changeTemplate(params: Record) { } /** - * 获取预览数据 + * 获取模板页面的应用插件列表 * @param params * @returns */ -export function getPreviewData(params: Record) { - return request.put(`diy/preview`, params, {showSuccessMessage: false}) +export function getApps(params: Record) { + return request.get(`diy/apps`) } \ No newline at end of file diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index 71c4d27f6..b0616b266 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -166,6 +166,14 @@ export function getWebConfig() { return request.get('sys/web/website') } +/** + * 获取网站设置 + * @returns + */ +export function getWebCopyright() { + return request.get('sys/web/copyright') +} + /** * 更新网站设置 * @param params diff --git a/admin/src/app/api/upgrade.ts b/admin/src/app/api/upgrade.ts index dee726c06..f7a5a2661 100644 --- a/admin/src/app/api/upgrade.ts +++ b/admin/src/app/api/upgrade.ts @@ -29,7 +29,7 @@ export function upgradeAddon(addon: string = '') { * 执行升级 */ export function executeUpgrade() { - return request.post('upgrade/execute') + return request.post('upgrade/execute', {}, { timeout: 0 }) } /** diff --git a/admin/src/app/assets/images/gov_icon.png b/admin/src/app/assets/images/gov_icon.png new file mode 100644 index 000000000..9241291a0 Binary files /dev/null and b/admin/src/app/assets/images/gov_icon.png differ diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue index ef7165aa5..f5091c5eb 100644 --- a/admin/src/app/components/upgrade/index.vue +++ b/admin/src/app/components/upgrade/index.vue @@ -293,6 +293,8 @@ watch(() => showDialog.value, () => { }) const clearUpgradeTaskFn = () => { + active.value = 'content' + uploading.value = false upgradeTask.value = null upgradeLog = [] flashInterval && clearInterval(flashInterval) diff --git a/admin/src/app/lang/zh-cn/diy.edit.json b/admin/src/app/lang/zh-cn/diy.edit.json index 9b15e6361..4142ac23a 100644 --- a/admin/src/app/lang/zh-cn/diy.edit.json +++ b/admin/src/app/lang/zh-cn/diy.edit.json @@ -1,4 +1,7 @@ { + "templatePagePlaceholder": "选择模板", + "templatePageEmpty": "无", + "changeTemplatePageTips":"切换模板后，当前页面内容将被替换且不被保存，请谨慎操作", "developTitle": "开发环境配置", "wapDomain": "wap域名（WAP_DOMAIN）", "wapDomainPlaceholder": "请输入wap域名", diff --git a/admin/src/app/lang/zh-cn/diy.index.json b/admin/src/app/lang/zh-cn/diy.index.json index 9dfcd2c56..12c473e7b 100644 --- a/admin/src/app/lang/zh-cn/diy.index.json +++ b/admin/src/app/lang/zh-cn/diy.index.json @@ -1,24 +1,12 @@ { "decorate": "装修", - "pageDecorate": "页面装修", - "changeTemplate": "选择页面", - "changePage": "切换", - "templateName": "模板名称", + "changePage": "设置", "preview": "预览", - "hopeBeforeTip": "我希望把", - "hopeAfterTip": "切换成其他页面", - "changeTemplateTip": "选择", - "template": "模板", - "changeMyPageTip": "将 微页面 设为", - "changeOtherPageTip": "将 其他页面 设为", - "createPage": "创建微页面", - "myPage": "我的微页面", - "refreshPage": "刷新", - "placeholderTemplate": "请选择一个模板", - "placeholderMyPage": "请选择一个微页面", - "placeholderOtherPage": "请选择一个页面", "developTitle": "开发环境配置", "wapDomain": "wap域名（WAP_DOMAIN）", "wapDomainPlaceholder": "请输入wap域名", - "settingTips": "点击查看如何配置" + "settingTips": "点击查看如何配置", + "link": "链接", + "copy": "复制", + "scanQRCodeOnRight": "扫描右侧二维码查看" } diff --git a/admin/src/app/lang/zh-cn/diy.list.json b/admin/src/app/lang/zh-cn/diy.list.json index 5325f7b53..03b8cb156 100644 --- a/admin/src/app/lang/zh-cn/diy.list.json +++ b/admin/src/app/lang/zh-cn/diy.list.json @@ -1,12 +1,10 @@ { "title": "页面名称", - "typeName": "页面模板", - "templateName": "模板名称", - "addType": "页面类型", + "typeName": "页面类型", + "forAddon": "所属插件", "addPageTips": "创建新页面", - "pageTypePlaceholder": "请选择页面模板", + "pageTypePlaceholder": "请选择页面类型", "nameMax": "名称不能超过12个字符", - "emptyTemplate": "空模板", "status": "状态", "updateTime": "更新时间", "use": "使用", diff --git a/admin/src/app/lang/zh-cn/diy.member.json b/admin/src/app/lang/zh-cn/diy.member.json new file mode 100644 index 000000000..dd6817c4f --- /dev/null +++ b/admin/src/app/lang/zh-cn/diy.member.json @@ -0,0 +1,11 @@ +{ + "decorate": "装修", + "preview": "预览", + "developTitle": "开发环境配置", + "wapDomain": "wap域名（WAP_DOMAIN）", + "wapDomainPlaceholder": "请输入wap域名", + "settingTips": "点击查看如何配置", + "link": "链接", + "copy": "复制", + "scanQRCodeOnRight": "扫描右侧二维码查看" +} diff --git a/admin/src/app/lang/zh-cn/diy.route.json b/admin/src/app/lang/zh-cn/diy.route.json index 2077aa85a..175a8b4ee 100644 --- a/admin/src/app/lang/zh-cn/diy.route.json +++ b/admin/src/app/lang/zh-cn/diy.route.json @@ -1,28 +1,13 @@ { "title": "页面名称", "forAddon": "所属插件", - "typeName": "页面模板", - "addPageTips": "创建新页面", - "pageTemplatePlaceholder": "请选择页面模板", - "nameMax": "名称不能超过12个字符", - "templateName": "模板名称", - "empty": "空白", - "status": "状态", - "updateTime": "更新时间", - "use": "使用", - "isUse": "使用中", - "unused": "未使用", "all": "全部", - "basicRoute": "基础页面", - "diyPage": "自定义页面", "wapUrl": "wap链接", "weappUrl": "小程序链接", "shareLink": "分享链接", "copy": "复制", "copySuccess": "复制成功", "titlePlaceholder": "请输入页面名称", - "addDiyPage": "添加页面", - "diyPageDeleteTips": "确定要删除该自定义页面吗？", "promote": "推广", "share": "分享", "shareSet": "分享设置", diff --git a/admin/src/app/lang/zh-cn/site.group.json b/admin/src/app/lang/zh-cn/site.group.json index 9d90f9e9d..4c9f20d3f 100644 --- a/admin/src/app/lang/zh-cn/site.group.json +++ b/admin/src/app/lang/zh-cn/site.group.json @@ -17,5 +17,7 @@ "remark": "套餐说明", "reset": "重置", "search": "搜索", - "foldText":"展开/折叠" -} \ No newline at end of file + "foldText":"展开/折叠", + "appName": "套餐内含应用", + "addonName": "套餐内含插件" +} diff --git a/admin/src/app/lang/zh-cn/site.info.json b/admin/src/app/lang/zh-cn/site.info.json index dbda7aa92..c710a517a 100644 --- a/admin/src/app/lang/zh-cn/site.info.json +++ b/admin/src/app/lang/zh-cn/site.info.json @@ -27,7 +27,9 @@ "keywordsPlaceholder": "网站关键字", "logoPlaceholder": "网站Logo", "descPlaceholder": "网站简介", - - "phonePlaceholder": "客服电话" - -} \ No newline at end of file + + "phonePlaceholder": "客服电话", + "app" : "站点应用", + "addon" : "站点插件" + +} diff --git a/admin/src/app/lang/zh-cn/site.user.json b/admin/src/app/lang/zh-cn/site.user.json index 2c61dba4d..d08687493 100644 --- a/admin/src/app/lang/zh-cn/site.user.json +++ b/admin/src/app/lang/zh-cn/site.user.json @@ -1,5 +1,5 @@ { - "userRealName": "用户名", + "userRealName": "用户真实名称", "lastLoginTime": "最后登录时间", "createTime": "注册时间", "lastLoginIP": "最后登录IP", @@ -9,4 +9,4 @@ "endDate": "结束时间", "startDate": "开始时间", "loginTime": "最后登录时间" -} \ No newline at end of file +} diff --git a/admin/src/app/views/auth/components/edit-menu.vue b/admin/src/app/views/auth/components/edit-menu.vue index 03b196e8f..10dee9f82 100644 --- a/admin/src/app/views/auth/components/edit-menu.vue +++ b/admin/src/app/views/auth/components/edit-menu.vue @@ -154,16 +154,12 @@ const formRules = computed(() => { trigger: 'blur' } ], - // return /^([a-zA-Z_$])([a-zA-Z0-9_$])*$/.test(val) router_path: [ { required: formData.menu_type != 2, message: t('routePathPlaceholder'), trigger: 'blur' } ], view_path: [ { required: formData.menu_type == 1, message: t('viewPathPlaceholder'), trigger: 'blur' } ], - icon: [ - { required: formData.menu_type != 2, message: t('selectIconPlaceholder'), trigger: 'blur' } - ], api_url: [ { required: formData.menu_type == 2, message: t('authIdPlaceholder'), trigger: 'blur' } ] @@ -214,7 +210,6 @@ const confirm = async (formEl: FormInstance | undefined) => { loading.value = true const data = formData - data.api_url = data.api_url ? `${data.api_url}/${formData.methods}` : '' save(data).then(res => { loading.value = false diff --git a/admin/src/app/views/auth/site_menu.vue b/admin/src/app/views/auth/site_menu.vue index d0a8c78cc..4d42fc643 100644 --- a/admin/src/app/views/auth/site_menu.vue +++ b/admin/src/app/views/auth/site_menu.vue @@ -1,8 +1,8 @@ - - diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue index df97775d0..edc122e02 100644 --- a/admin/src/app/views/index/store.vue +++ b/admin/src/app/views/index/store.vue @@ -29,8 +29,7 @@