diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index e7b26eef3..3bada10a2 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => { if (matched && matched.length && matched[0].path != '/:pathMatch(.*)*') { matched = matched[0].path; } else { - matched = 'site'; + matched = getAppType(); } const loginPath = to.path == '/' ? '/admin/login' : `${matched}/login` diff --git a/admin/src/views/site/list.vue b/admin/src/views/site/list.vue index 2d87aae8c..3cfe0fe1c 100644 --- a/admin/src/views/site/list.vue +++ b/admin/src/views/site/list.vue @@ -3,7 +3,7 @@
- {{pageName}} + {{ pageName }} {{ t('addSite') }} @@ -53,8 +53,11 @@ @@ -65,32 +68,30 @@ - + - - - - - + + + + + {{ t('url') }} {{ t('info') }} - {{ row.status == 1 ? t('closeTxt') : t('openTxt') }} + {{ row.status == 1 ? t('closeTxt') : t('openTxt') + }} - +
import { reactive, ref } from 'vue' +import { img } from '@/utils/common' import { t } from '@/lang' import { getSiteList, getSiteGroupAll, getStatusList, closeSite, openSite } from '@/api/site' import { FormInstance } from 'element-plus' import { useRouter, useRoute } from 'vue-router' import EditSite from '@/views/site/components/edit-site.vue' const route = useRoute() -const pageName = route.meta.title; +const pageName = route.meta.title const siteLink = location.origin + '/site/login' @@ -169,11 +173,11 @@ setStatusList() const searchFormRef = ref() -const resetForm = (formEl: FormInstance | undefined)=>{ +const resetForm = (formEl: FormInstance | undefined) => { if (!formEl) return - - formEl.resetFields(); - loadSiteList(); + + formEl.resetFields() + loadSiteList() } /** @@ -216,17 +220,16 @@ const infoEvent = (data: any) => { router.push('/admin/site/info?id=' + data.site_id) } - /** * 站点域名 * @param data */ - const urlEvent = (data: any) => { +const urlEvent = (data: any) => { ElMessage({ - message: t('siteUrlDevelopMessage') , - grouping: true, - type: 'success', - }) + message: t('siteUrlDevelopMessage'), + grouping: true, + type: 'success' + }) } const toLink = (link) => { @@ -242,23 +245,23 @@ const toSiteLink = () => { } const openClose = (i, site_id) => { - if(i == 1) { - closeSite({site_id}).then(res=>{ - loadSiteList() - }) - } - if(i == 3) { - openSite({site_id}).then(res=>{ - loadSiteList() - }) - } + if (i == 1) { + closeSite({ site_id }).then(res => { + loadSiteList() + }) + } + if (i == 3) { + openSite({ site_id }).then(res => { + loadSiteList() + }) + } }