diff --git a/index.html b/index.html index dc8466c..9025126 100644 --- a/index.html +++ b/index.html @@ -6,11 +6,11 @@ vue-next-admin diff --git a/public/favicon.ico b/public/favicon.ico index 9da231b..84023e9 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ 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/baseUrlHost.ts b/src/api/baseUrlHost.ts index 55b68c1..c7988fd 100644 --- a/src/api/baseUrlHost.ts +++ b/src/api/baseUrlHost.ts @@ -1,2 +1,3 @@ -export const baseUrlHost = "/vueAdminApi"; +// export const baseUrlHost = "/vueAdminApi"; +export const baseUrlHost = "/pixelApi"; export const pixelUrlHost = "/pixelApi"; \ No newline at end of file diff --git a/src/api/download/index.ts b/src/api/download/index.ts index d9ce1e4..305a116 100644 --- a/src/api/download/index.ts +++ b/src/api/download/index.ts @@ -1,4 +1,5 @@ import axios from "axios"; +import { ElMessage } from "element-plus"; const downloadPhoto = (imgSrc:any) => { axios({ @@ -15,8 +16,9 @@ const downloadPhoto = (imgSrc:any) => { a.click(); document.body.removeChild(a); window.URL.revokeObjectURL(url); + ElMessage({message: '图片下载成功!',type: 'success',}); }).catch(error => { - console.error('Download error:', error); + ElMessage({message: '图片下载失败!',type: 'error',}); }); }; diff --git a/src/api/message/index.ts b/src/api/message/index.ts index 2857969..468dd4c 100644 --- a/src/api/message/index.ts +++ b/src/api/message/index.ts @@ -25,5 +25,12 @@ export function messageApi() { method: 'get', }); }, + updateMessage: (data: object) => { + return request({ + url: baseUrlHost + '/cpMessage', + method: 'put', + data, + }) + }, }; } 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 23a5af9..c89f544 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 95a9998..a16d1ac 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 f77ab6e..f29519e 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..42eed67 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -1,7 +1,7 @@