diff --git a/src/api/index.js b/src/api/index.js index e841d7f..229d331 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,10 +1,13 @@ import Setting from '@/setting' -const host = Setting.apiBaseURL +const { huoranApi, apiBaseURL: host } = Setting export default { logins: `/iasf/sys/user/login`, verification: `${host}/iasf/sys/getVerify`, upload: `${host}/iasf/sysFiles/upload`, + courseDiscipline: `${huoranApi}/nakadai/nakadai/subject/courseDiscipline`, + courseProfessionalClass: `${huoranApi}/nakadai/nakadai/subject/courseProfessionalClass`, + courseProfessional: `${huoranApi}/nakadai/nakadai/subject/courseProfessional`, listByPage: `/iasf/sysFiles/listByPage`, delFile: `/iasf/sysFiles/delete`, updateFile: `/iasf/sysFiles/update`, @@ -15,12 +18,12 @@ export default { user: `/iasf/sys/user`, sendPhoneOrEmailCode: `/iasf/sys/sendPhoneOrEmailCode`, updatePhoneOrEmail: `/iasf/sys/updatePhoneOrEmail`, - updateUserAvatars: `${host}/iasf/sys/updateUserAvatars`, staffTemplate: `http://139.159.254.212/用户导入模板.xlsx`, checkJobNumber: `/iasf/sys/checkJobNumber`, checkUsername: `/iasf/sys/checkUsername`, resetPwd: `/iasf/sys/resetPwd`, pwd: `/iasf/sys/user/pwd`, + updateUserAvatars: `${host}/iasf/sys/updateUserAvatars`, exportFailure: `${host}/iasf/sys/exportFailure`, importStaff: `${host}/iasf/sys/importStaff`, roles: `/iasf/sys/roles`, @@ -88,6 +91,7 @@ export default { delSeo: `/iasf/seo/delete`, seoList: `/iasf/seo/list`, updateSeo: `/iasf/seo/update`, + batchDeletionFloating: `/iasf/SysFloatingColumnSchemeService/SysFloatingColumnScheme/batchDeletion`, findFloating: `/iasf/SysFloatingColumnSchemeService/SysFloatingColumnScheme/findById`, listFloating: `/iasf/SysFloatingColumnSchemeService/SysFloatingColumnScheme/floatingBarList`, @@ -102,4 +106,16 @@ export default { saveFooter: `/iasf/SysFooterSetupService/SysFooterSetup/saveOrUpdate`, checkEnableOrDisableFooter: `/iasf/SysFooterSetupService/SysFooterSetup/checkEnableOrDisable`, enableOrDisableSchemeFooter: `/iasf/SysFooterSetupService/SysFooterSetup/enableOrDisableScheme`, + + categoryDel: `/iasf/categoryService/Category/batchDelete`, + categoryFind: `/iasf/categoryService/Category/findById`, + categoryList: `/iasf/categoryService/Category/list`, + categorySave: `/iasf/categoryService/Category/saveOrUpdate`, + + productDetailsSave: `/iasf/productDetails/saveOrUpdate`, + productDetailsFind: `/iasf/productDetails/findById`, + productDetailsDel: `/iasf/productDetails/batchDelete`, + productDetailsEnable: `/iasf/productDetails/articleEnableOrDisable`, + productDetailsTop: `/iasf/productDetails/courseProductTopOperation`, + productDetailsCheck: `/iasf/productDetails/checkIfTheTitleIsRepeat`, } \ No newline at end of file diff --git a/src/assets/images/style/78.png b/src/assets/images/style/78.png new file mode 100644 index 0000000..2b42b1e Binary files /dev/null and b/src/assets/images/style/78.png differ diff --git a/src/assets/images/style/79.png b/src/assets/images/style/79.png new file mode 100644 index 0000000..90d1f51 Binary files /dev/null and b/src/assets/images/style/79.png differ diff --git a/src/assets/images/style/80.png b/src/assets/images/style/80.png new file mode 100644 index 0000000..afde0c4 Binary files /dev/null and b/src/assets/images/style/80.png differ diff --git a/src/assets/images/style/81.png b/src/assets/images/style/81.png new file mode 100644 index 0000000..884b63e Binary files /dev/null and b/src/assets/images/style/81.png differ diff --git a/src/const/modules.js b/src/const/modules.js index 58b5de3..cf1a745 100644 --- a/src/const/modules.js +++ b/src/const/modules.js @@ -113,7 +113,7 @@ export default { }, list: [ { - pic: 'https://www.occupationlab.com/images/index/1.png', + pic: 'https://occupationlab.com/images/index/1.png', title: '职站', link: { linkName: '无', @@ -130,7 +130,7 @@ export default { isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/index/2.png', + pic: 'https://occupationlab.com/images/index/2.png', title: 'Dataforward数据前瞻', link: { linkName: '无', @@ -147,7 +147,7 @@ export default { isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/index/3.png', + pic: 'https://occupationlab.com/images/index/3.png', title: '大赛平台', link: { linkName: '无', @@ -244,37 +244,37 @@ export default { }, list: [ { - pic: 'https://www.occupationlab.com/images/member/icon1.png', + pic: 'https://occupationlab.com/images/member/icon1.png', title: '采购降本', des: '优选高品质低价格产品', isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/member/icon2.png', + pic: 'https://occupationlab.com/images/member/icon2.png', title: '精准匹配', des: '体系化产品方案匹配满足不同学科需求', isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/member/icon3.png', + pic: 'https://occupationlab.com/images/member/icon3.png', title: '本地服务', des: '提供项目全流程售前售后支持服务', isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/member/icon4.png', + pic: 'https://occupationlab.com/images/member/icon4.png', title: '移动办公', des: '查看产品、参数，下单，方案生成，手机上即可完成', isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/member/icon5.png', + pic: 'https://occupationlab.com/images/member/icon5.png', title: '免息账期', des: '先发货后付款，支持背靠背支付', isEnable: 1 }, { - pic: 'https://www.occupationlab.com/images/member/icon6.png', + pic: 'https://occupationlab.com/images/member/icon6.png', title: '智能方案', des: '内置有实验室配置方案模板只需3分钟即可生成方案', isEnable: 1 diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue index 14d880c..f0c4b8a 100644 --- a/src/pages/article/add/index.vue +++ b/src/pages/article/add/index.vue @@ -159,16 +159,6 @@ @@ -101,107 +87,123 @@ export default { \ No newline at end of file diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js index ee9f49c..0cd208f 100644 --- a/src/plugins/requests/index.js +++ b/src/plugins/requests/index.js @@ -30,8 +30,8 @@ service.interceptors.request.use(config => { service.interceptors.response.use( response => { const res = response.data - const { code } = res - if (code == 200) { + const { code, status } = res + if (code == 200 || status === 200) { return Promise.resolve(res).catch(e => { }); } else if (code === 401) { Util.errorMsg(res.msg) diff --git a/src/router/modules/article.js b/src/router/modules/article.js index ee66c77..c25a2d5 100644 --- a/src/router/modules/article.js +++ b/src/router/modules/article.js @@ -5,25 +5,31 @@ const meta = {} const pre = 'article-' export default { - path: '/article', - name: 'article', - redirect: { - name: `${pre}list` + path: '/article', + name: 'article', + redirect: { + name: `${pre}list` + }, + meta, + component: BasicLayout, + children: [ + { + name: `${pre}list`, + path: `list`, + component: () => import('@/pages/article/list'), + meta: { title: '文章管理' } }, - meta, - component: BasicLayout, - children: [ - { - name: `${pre}list`, - path: `list`, - component: () => import('@/pages/article/list'), - meta: { title: '文章管理' } - }, - { - name: `${pre}add`, - path: `add`, - component: () => import('@/pages/article/add'), - meta: { title: '添加文章' } - } - ] + { + name: `${pre}add`, + path: `add`, + component: () => import('@/pages/article/add'), + meta: { title: '添加文章' } + }, + { + name: `${pre}addProduct`, + path: `addProduct`, + component: () => import('@/pages/article/add/product'), + meta: { title: '添加文章' } + } + ] } diff --git a/src/setting.js b/src/setting.js index 901a426..ae214af 100644 --- a/src/setting.js +++ b/src/setting.js @@ -16,6 +16,8 @@ const Setting = { routerMode: "hash", // 路由模式，可选值为 history 或 hash showProgressBar: true, // 页面切换时，是否显示模拟的进度条 apiBaseURL: host, // 接口请求地址 + // huoranApi: `https://occupationlab.com`, + huoranApi: `http://121.37.12.51`, autoLogoutTime: 1000 * 60 * 60 * 3, // 长时间未操作，自动退出登录时间 modalDuration: 3, // 接口请求返回错误时，弹窗的持续时间，单位：秒 errorModalType: "Message", // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice