diff --git a/template/admin/src/api/setting.js b/template/admin/src/api/setting.js index 1bece6f59..1fdb2c06f 100644 --- a/template/admin/src/api/setting.js +++ b/template/admin/src/api/setting.js @@ -1088,4 +1088,15 @@ export function saveType(type) { url: `setting/lang_country/form/${id}`, method: 'get', }); +} +/** + * 添加语言地区表单 + * @param {*} id + * @returns + */ + export function langTypeStatus(id,status) { + return request({ + url: `setting/lang_type/status/${id}/${status}`, + method: 'put', + }); } \ No newline at end of file diff --git a/template/admin/src/api/system.js b/template/admin/src/api/system.js index 672b4d81f..36f849490 100644 --- a/template/admin/src/api/system.js +++ b/template/admin/src/api/system.js @@ -332,18 +332,19 @@ export function opendirListApi(params) { url: `system/file/opendir`, method: 'GET', params, - file_edit:true + file_edit: true, }); } /** * @description 文件管理 -- 读取文件 */ -export function openfileApi(filepath) { +export function openfileApi(params) { return request({ - url: `system/file/openfile?filepath=${filepath}`, + url: `system/file/openfile`, method: 'GET', - file_edit:true + params, + file_edit: true, }); } @@ -352,10 +353,10 @@ export function openfileApi(filepath) { */ export function savefileApi(data) { return request({ - url: `system/file/savefile`, + url: `system/file/savefile?fileToken=${data.fileToken}`, method: 'post', data, - file_edit:true + file_edit: true, }); } /** @@ -366,7 +367,7 @@ export function createFolder(params) { url: `system/file/createFolder`, method: 'GET', params, - file_edit:true + file_edit: true, }); } /** @@ -377,7 +378,7 @@ export function createFile(params) { url: `system/file/createFile`, method: 'GET', params, - file_edit:true + file_edit: true, }); } /** @@ -388,7 +389,7 @@ export function rename(params) { url: `system/file/rename`, method: 'GET', params, - file_edit:true + file_edit: true, }); } /** @@ -399,7 +400,7 @@ export function delFolder(params) { url: `system/file/delFolder`, method: 'GET', params, - file_edit:true + file_edit: true, }); } @@ -587,44 +588,44 @@ export function setAgreements(data, type) { } /** -* @description 获取授权产品 -*/ + * @description 获取授权产品 + */ export function crmebProduct(params) { return request({ - url: 'crmeb_product', - method: 'get', - params + url: 'crmeb_product', + method: 'get', + params, }); } /** * @description 获取授权订单 */ - export function getVersion() { +export function getVersion() { return request({ - url: `setting/get_version`, - method: 'get', + url: `setting/get_version`, + method: 'get', }); } /** -* @description 获取版权 -*/ + * @description 获取版权 + */ export function getCrmebCopyRight() { return request({ - url: `copyright`, - method: 'get' + url: `copyright`, + method: 'get', }); } /** -* @description 保存版权 -*/ + * @description 保存版权 + */ export function saveCrmebCopyRight(data) { return request({ - url: `copyright`, - method: 'post', - data + url: `copyright`, + method: 'post', + data, }); } @@ -632,41 +633,41 @@ export function saveCrmebCopyRight(data) { * @description 升级包 -- 列表 * @param data */ - export function upgradeListApi (params) { +export function upgradeListApi(params) { return request({ - url: '/system/upgrade/list', - method: 'get', - params - }) + url: '/system/upgrade/list', + method: 'get', + params, + }); } /** -* @description 升级进度 -*/ + * @description 升级进度 + */ export function upgradeProgressApi() { return request({ - url: `/system/upgrade_progress`, - method: 'get' + url: `/system/upgrade_progress`, + method: 'get', }); } /** -* @description 升级协议 -*/ + * @description 升级协议 + */ export function upgradeAgreementApi() { return request({ - url: `/system/upgrade/agreement`, - method: 'get' + url: `/system/upgrade/agreement`, + method: 'get', }); } /** -* @description 升级状态 -*/ + * @description 升级状态 + */ export function upgradeStatusApi() { return request({ - url: `/system/upgrade_status`, - method: 'get' + url: `/system/upgrade_status`, + method: 'get', }); } @@ -674,31 +675,31 @@ export function upgradeStatusApi() { * @description 升级包 -- 升级记录 * @param data */ - export function upgradeLogListApi (params) { +export function upgradeLogListApi(params) { return request({ - url: '/system/upgrade_log/list', - method: 'get', - params - }) + url: '/system/upgrade_log/list', + method: 'get', + params, + }); } /** * 导出备份文件 */ - export function upgradeExportApi(id) { +export function upgradeExportApi(id) { return request({ url: `system/upgrade_export/${id}`, method: 'get', - responseType: 'blob' + responseType: 'blob', }); } /** * @description 下载升级包 */ - export function downloadApi(params) { +export function downloadApi(params) { return request({ - url: '/system/upgrade_download/'+params, + url: '/system/upgrade_download/' + params, method: 'POST', }); } @@ -707,10 +708,10 @@ export function upgradeStatusApi() { * @description 升级包 -- 可升级列表 * @param data */ - export function upgradeableListApi (params) { +export function upgradeableListApi(params) { return request({ - url: '/system/upgradeable/list', - method: 'get', - params - }) -} \ No newline at end of file + url: '/system/upgradeable/list', + method: 'get', + params, + }); +} diff --git a/template/admin/src/components/copyright/index.vue b/template/admin/src/components/copyright/index.vue index 6fb6cb8fe..fe10a928d 100644 --- a/template/admin/src/components/copyright/index.vue +++ b/template/admin/src/components/copyright/index.vue @@ -3,11 +3,15 @@ - + + diff --git a/template/admin/src/components/main/components/tags-nav/tags-nav.vue b/template/admin/src/components/main/components/tags-nav/tags-nav.vue index 74b318823..0b06cc21c 100644 --- a/template/admin/src/components/main/components/tags-nav/tags-nav.vue +++ b/template/admin/src/components/main/components/tags-nav/tags-nav.vue @@ -212,7 +212,7 @@ export default { diff --git a/template/admin/src/components/main/components/user/user.vue b/template/admin/src/components/main/components/user/user.vue index 2ccd10419..324c88d64 100644 --- a/template/admin/src/components/main/components/user/user.vue +++ b/template/admin/src/components/main/components/user/user.vue @@ -11,7 +11,7 @@ 个人中心 - 文件管理 + 退出登录 diff --git a/template/admin/src/libs/request.js b/template/admin/src/libs/request.js index 1a590f2e4..946d86e50 100644 --- a/template/admin/src/libs/request.js +++ b/template/admin/src/libs/request.js @@ -34,14 +34,9 @@ service.interceptors.request.use( } const token = getCookies('token'); const kefuToken = getCookies('kefu_token'); - const fileToken = getCookies('file_token'); - if (token || kefuToken || fileToken) { - config.headers['Authori-zation'] = config.file_edit ? (config.kefu ? 'Bearer ' + kefuToken : 'Bearer ' + fileToken) : (config.kefu ? 'Bearer ' + kefuToken : 'Bearer ' + token); + if (token || kefuToken) { + config.headers['Authori-zation'] = config.kefu ? 'Bearer ' + kefuToken : 'Bearer ' + token; } - if(fileToken) - { - config.headers['Invalid-zation'] = 'Bearer ' + fileToken; - } return config; }, (error) => { @@ -85,11 +80,15 @@ service.interceptors.response.use( removeCookies('kefu_uuid'); router.replace({ path: '/kefu' }); break; + case 110008: + router.replace({ path: '/admin/system/maintain/system_file/login' }); + break; default: return Promise.reject(obj || { msg: '未知错误' }); } }, (error) => { + console.log(error); Message.error(error.msg); return Promise.reject(error); }, diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue index e62b1ebb3..d9c08121a 100644 --- a/template/admin/src/pages/account/login/index.vue +++ b/template/admin/src/pages/account/login/index.vue @@ -54,25 +54,24 @@ diff --git a/template/admin/src/pages/system/maintain/systemFile/login.vue b/template/admin/src/pages/system/maintain/systemFile/login.vue new file mode 100644 index 000000000..2fe3f8a9a --- /dev/null +++ b/template/admin/src/pages/system/maintain/systemFile/login.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/template/admin/src/pages/system/maintain/systemFile/opendir.vue b/template/admin/src/pages/system/maintain/systemFile/opendir.vue index f50f2bb03..2e4993b77 100644 --- a/template/admin/src/pages/system/maintain/systemFile/opendir.vue +++ b/template/admin/src/pages/system/maintain/systemFile/opendir.vue @@ -1,771 +1,858 @@ +