diff --git a/src/App.vue b/src/App.vue index f9f3119..7c2f400 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,7 +20,7 @@ import other from '/@/utils/other'; import { Local, Session } from '/@/utils/storage'; import mittBus from '/@/utils/mitt'; import setIntroduction from '/@/utils/setIconfont'; -import logoMini from '/@/assets/logo-mini.svg'; +import logoMini from '/@/assets/logo.png'; // 引入组件 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue')); @@ -74,7 +74,7 @@ const getGlobalI18n = computed(() => { let link: any = document.querySelector("link[rel*='icon']") || document.createElement("link"); link.type = "image/x-icon"; link.rel = "shortcut icon"; -link.href = themeConfig.value.logoMini||logoMini; +link.href = themeConfig.logoMini||logoMini; document.getElementsByTagName("head")[0].appendChild(link); // 设置初始化，防止刷新时恢复默认 diff --git a/src/api/service/apply/index.ts b/src/api/service/apply/index.ts new file mode 100644 index 0000000..dd03ac4 --- /dev/null +++ b/src/api/service/apply/index.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +import { pixelUrlHost } from '/@/api/baseUrlHost'; + +/** + * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参） + * 注意在写get请求时，参数是params，而不是data，要标注好 + * + * 登录api接口集合 + * @method getServicesList 获取应用服务列表 + * @method getApplyDetail 获取应用服务详情 + * @method updateApply 更新应用服务 + */ + +export function applyApi() { + return { + getServicesList: (params: object) => { + return request({ + url: pixelUrlHost + '/paServices', + method: 'get', + params, + }); + }, + getApplyDetail: (id: Number) => { + return request({ + url: pixelUrlHost + `/paServices/${id}`, + method: 'get', + }); + }, + saveApply: (data: object) => { + return request({ + url: pixelUrlHost + '/paServices', + method: 'post', + data, + }) + }, + updateApply: (data: object) => { + return request({ + url: pixelUrlHost + '/paServices', + method: 'put', + data, + }) + }, + deleteApply: (id: Number) => { + return request({ + url: pixelUrlHost + `/paServices/${id}`, + method: 'delete', + }); + }, + }; +} diff --git a/src/assets/logo.png b/src/assets/logo.png new file mode 100644 index 0000000..84023e9 Binary files /dev/null and b/src/assets/logo.png differ diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 06511ff..3a42dab 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -11,7 +11,7 @@ export default { UserManage: 'UserManage', systemDic: 'systemDic', article: 'article', - apply: 'apply', + applyDetail: 'applyDetail', message: 'message', order: 'order', articleContent: 'articleContent', @@ -100,6 +100,16 @@ export default { layoutLinkView: 'LinkView', layoutIframeViewOne: 'IframeViewOne', layoutIframeViewTwo: 'IframeViewTwo', + /** + * 业务模块start + * @name 业务模块 + */ + + apply: 'apply', + + /** + * 业务模块end + */ }, staticRoutes: { signIn: 'signIn', diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts index 9072357..66cd410 100644 --- a/src/i18n/lang/zh-cn.ts +++ b/src/i18n/lang/zh-cn.ts @@ -11,7 +11,7 @@ export default { systemDept: '部门管理', systemDic: '字典管理', article: '文章管理', - apply: '应用管理', + applyDetail: '应用服务详情', carousel: '轮播图管理', clients: '客户管理', photos: '图片管理', @@ -103,6 +103,16 @@ export default { layoutLinkView: '外链', layoutIframeViewOne: '内嵌 iframe1', layoutIframeViewTwo: '内嵌 iframe2', + /** + * 业务模块start + * @name 业务模块 + */ + + apply: '应用管理', + + /** + * 业务模块end + */ }, staticRoutes: { signIn: '登录', diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts index 7c8cd7a..88e76d4 100644 --- a/src/i18n/lang/zh-tw.ts +++ b/src/i18n/lang/zh-tw.ts @@ -11,7 +11,7 @@ export default { systemDept: '部門管理', systemDic: '字典管理', article: '文章管理', - apply: '应用管理', + applyDetail: '應用服務詳情', message: '聯言管理', articleContent: '文章詳情', order: '訂單管理', @@ -100,6 +100,16 @@ export default { layoutLinkView: '外鏈', layoutIframeViewOne: '内嵌 iframe1', layoutIframeViewTwo: '内嵌 iframe2', + /** + * 业务模块start + * @name 业务模块 + */ + + apply: '應用管理', + + /** + * 业务模块end + */ }, staticRoutes: { signIn: '登入', diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue index 450e081..3bd8653 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -12,7 +12,7 @@ import { computed } from 'vue'; import { storeToRefs } from 'pinia'; import { useThemeConfig } from '/@/stores/themeConfig'; -import logoMini from '/@/assets/logo-mini.svg'; +import logoMini from '/@/assets/logo.png'; // 定义变量内容 const storesThemeConfig = useThemeConfig(); diff --git a/src/router/route.ts b/src/router/route.ts index 6562a63..ba466f7 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -251,23 +251,51 @@ export const dynamicRoutes: Array = [ } ] }, + /** + * + * 业务模块start + * @name 业务模块 + * 应用服务路由——/apply + * + */ // 应用管理 - // { - // path: '/apply', - // name: 'apply', - // component: () => import('/@/views/apply/index.vue'), - // meta: { - // title: 'message.router.apply', - // isLink: '', - // isHide: false, - // isKeepAlive: true, - // isAffix: false, - // isIframe: false, - // roles: ['admin', 'common'], - // icon: 'iconfont icon-crew_feature', - // }, - // children: [] - // }, + { + path: '/apply', + name: 'apply', + component: () => import('/@/views/service/apply/index.vue'), + meta: { + title: 'message.router.apply', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin', 'common'], + icon: 'iconfont icon-crew_feature', + }, + children: [ + // { + // path: '/apply/detail', + // name: 'applyDetail', + // component: () => import('/@/views/service/apply/detail.vue'), + // meta: { + // title: 'message.router.applyDetail', + // isLink: '', + // isHide: true, + // isKeepAlive: true, + // isAffix: false, + // isIframe: false, + // roles: ['admin', 'common'], + // icon: 'ele-Document', + // }, + // }, + ] + }, + + /** + * 业务模块end + */ + // 轮播图管理 { path: '/carousel', diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts index 364167b..34cc5d9 100644 --- a/src/stores/themeConfig.ts +++ b/src/stores/themeConfig.ts @@ -78,7 +78,7 @@ export const useThemeConfig = defineStore('themeConfig', { * 界面显示 */ // 是否开启侧边栏 Logo - isShowLogo: false, + isShowLogo: true, // 初始化变量，用于 el-scrollbar 的高度更新，请勿删除 isShowLogoChange: false, // 是否开启 Breadcrumb，强制经典、横向布局不显示 @@ -102,13 +102,13 @@ export const useThemeConfig = defineStore('themeConfig', { // 是否开启色弱模式 isInvert: false, // 是否开启水印 - isWartermark: true, + isWartermark: false, // 水印文案 - wartermarkText: 'vue-next-admin', + wartermarkText: 'pixel.ai制图后台', // 页脚版权信息内容 - globalFootTitleMsg: '深圳市 xxx 公司版权所有', + globalFootTitleMsg: '广州市 xxx 公司版权所有', // 页脚tip - globalFootTipMsg: 'vue-next-admin，Made by lyt with ❤️', + globalFootTipMsg: 'ai创作，专享您的制图~~~', /** * 其它设置 @@ -141,17 +141,17 @@ export const useThemeConfig = defineStore('themeConfig', { * 全局网站标题 / 副标题 */ // 网站主标题（菜单导航、浏览器当前网页标题） - globalTitle: 'vue-next-admin', + globalTitle: 'pixel.ai制图后台', // 网站副标题（登录页顶部文字） - globalViceTitle: 'vueNextAdmin', + globalViceTitle: 'pixel.ai', // 网站副标题（登录页顶部文字） - globalViceTitleMsg: '专注、免费、开源、维护、解疑', + globalViceTitleMsg: '多种类、多趣味、多质图', // 默认初始语言，可选值""，默认 zh-cn globalI18n: 'zh-cn', // 默认全局组件大小，可选值""，默认 'large' globalComponentSize: 'large', // 网站logo - logoMini: '/@/assets/logo-mini.svg', + logoMini: '/@/assets/logo.png', }, }), actions: { diff --git a/src/utils/request.ts b/src/utils/request.ts index 6ba16fe..9719205 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -44,6 +44,8 @@ service.interceptors.response.use( ElMessageBox.alert('你已被登出，请重新登录', '提示', {}) .then(() => {}) .catch(() => {}); + }else if(res.code === 502 && res.errorMsg){ + return res; } return Promise.reject(service.interceptors.response); } else { diff --git a/src/views/carousel/index.vue b/src/views/carousel/index.vue index 2ca2102..eda0f52 100644 --- a/src/views/carousel/index.vue +++ b/src/views/carousel/index.vue @@ -24,22 +24,23 @@ --> - - + + - + - - + +