diff --git a/src/api/baseurl.js b/src/api/baseurl.js index 8cc8962..e69de29 100644 --- a/src/api/baseurl.js +++ b/src/api/baseurl.js @@ -1,3 +0,0 @@ -var baseurl = "https://quanyidaojia.xinelu.cn"; - -export default baseurl diff --git a/src/api/system/stationAvatar.js b/src/api/system/stationAvatar.js index d42ceb0..5bac56b 100644 --- a/src/api/system/stationAvatar.js +++ b/src/api/system/stationAvatar.js @@ -10,8 +10,6 @@ export function updateNurseStationHeads(data) { } //海报视频上传 - - export function updatePoserHeads(data) { return request({ url: '/system/poser/updatePoserHeads', @@ -19,6 +17,28 @@ export function updatePoserHeads(data) { data: data }) } +export function uploadVideoUrl(data) { + return request({ + url: '/system/trainingItem/uploadVideoUrl', + method: 'post', + data: data + }) +} + +export function uploadUrl(data) { + return request({ + url: '/system/trainingItem/uploadUrl', + method: 'post', + data: data + }) +} +export function uploadTrainingCategoryPicture(data) { + return request({ + url: '/system/trainingCategory/uploadTrainingCategoryPicture', + method: 'post', + data: data + }) +} export function posts(data) { return request({ diff --git a/src/api/system/trainingCategory.js b/src/api/system/trainingCategory.js new file mode 100644 index 0000000..c2a7fb9 --- /dev/null +++ b/src/api/system/trainingCategory.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询学习培训分类列表 +export function listTrainingCategory(query) { + return request({ + url: '/system/trainingCategory/list', + method: 'get', + params: query + }) +} + +// 查询学习培训分类详细 +export function getTrainingCategory(id) { + return request({ + url: '/system/trainingCategory/' + id, + method: 'get' + }) +} + +// 新增学习培训分类 +export function addTrainingCategory(data) { + return request({ + url: '/system/trainingCategory/add', + method: 'post', + data: data + }) +} + +// 修改学习培训分类 +export function updateTrainingCategory(data) { + return request({ + url: '/system/trainingCategory/edit', + method: 'post', + data: data + }) +} + +// 删除学习培训分类 +export function delTrainingCategory(id) { + return request({ + url: '/system/trainingCategory/' + id, + method: 'delete' + }) +} diff --git a/src/api/system/trainingItem.js b/src/api/system/trainingItem.js new file mode 100644 index 0000000..137ea15 --- /dev/null +++ b/src/api/system/trainingItem.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' + +// 查询学习培训项目信息列表 +export function listTrainingItem(query) { + return request({ + url: '/system/trainingItem/list', + method: 'get', + params: query + }) +} +export function listTrainingCategory(query) { + return request({ + url: '/system/trainingCategory/list', + method: 'get', + params: query + }) +} +// 父级项目组 +export function selectTrainingParent(query) { + return request({ + url: '/system/trainingItem/selectTrainingParent', + method: 'get', + params: query + }) +} +// 修改上下架 +export function updateTrainingShelfFlag(data) { + return request({ + url: '/system/trainingItem/updateTrainingShelfFlag', + method: 'post', + data: data + + }) +} + +// 查询学习培训项目信息详细 +export function getTrainingItem(id) { + return request({ + url: '/system/trainingItem/' + id, + method: 'get' + }) +} + +// 新增学习培训项目信息 +export function addTrainingItem(data) { + return request({ + url: '/system/trainingItem/add', + method: 'post', + data: data + }) +} + +// 修改学习培训项目信息 +export function updateTrainingItem(data) { + return request({ + url: '/system/trainingItem/edit', + method: 'post', + data: data + }) +} + +// 删除学习培训项目信息 +export function delTrainingItem(id) { + return request({ + url: '/system/trainingItem/' + id, + method: 'delete' + }) +} diff --git a/src/api/system/trainingOrder.js b/src/api/system/trainingOrder.js new file mode 100644 index 0000000..0954095 --- /dev/null +++ b/src/api/system/trainingOrder.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' + +// 查询学习培训订单主列表 +export function listTrainingOrder(query) { + return request({ + url: '/system/trainingOrder/list', + method: 'get', + params: query + }) +} +// 查看视频 +export function orderItemDirectory(id) { + return request({ + url: `/system/trainingOrder/orderItemDirectory?trainingOrderDetailsId=${id}`, + method: 'get', + + }) +} + +// 查询学习培训订单主详细 +export function getTrainingOrder(id) { + return request({ + url: '/system/trainingOrder/' + id, + method: 'get' + }) +} +// 确定按钮 +export function xylWeChatRefundNotify(data) { + return request({ + url: '/nurseApp/weChatPayment/weChatRefundOrderApply', + method: 'post', + data: data + }) +} +// 退款 +export function refundInformation(id) { + return request({ + url: `/system/trainingOrder/refundInformation` + `?id=${id}`, + method: 'get', + }) +} + + +// 新增学习培训订单主 +export function addTrainingOrder(data) { + return request({ + url: '/system/trainingOrder/add', + method: 'post', + data: data + }) +} + +// 修改学习培训订单主 +export function updateTrainingOrder(data) { + return request({ + url: '/system/trainingOrder/edit', + method: 'post', + data: data + }) +} + +// 删除学习培训订单主 +export function delTrainingOrder(id) { + return request({ + url: '/system/trainingOrder/' + id, + method: 'delete' + }) +} diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 1e5db86..616fa47 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -9,10 +9,10 @@ :show-file-list="false" :headers="headers" style="display: none" + :data="filetype" ref="upload" v-if="this.type == 'url'" - > - + >
@@ -57,10 +57,18 @@ export default { type: String, default: "url", }, + url: { + type: String, + default: "/common/richTextPictureUrl", + }, + // filetypes: { + // type: String, + // default: "", + // }, }, data() { return { - uploadUrl: process.env.VUE_APP_BASE_API + "/common/richTextPictureUrl", // 上传的图片服务器地址 + uploadUrl: process.env.VUE_APP_BASE_API, // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, @@ -82,14 +90,22 @@ export default { [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 [{ align: [] }], // 对齐方式 ["clean"], // 清除文本格式 - ["link", "image", "video"], // 链接、图片、视频 + ["link", "image"], // 链接、图片、视频 ], }, placeholder: "请输入内容", readOnly: this.readOnly, }, + filetype: { + type: "", + }, }; }, + created() { + this.uploadUrl = process.env.VUE_APP_BASE_API + this.url; + // console.log(this.url) + // this.filetype.type = this.filetypes; + }, computed: { styles() { let style = {}; @@ -181,9 +197,8 @@ export default { "image", process.env.VUE_APP_BASE_API + res.fileName ); - + console.log(res); this.$emit("imgs", res.fileName); - // 调整光标到最后 quill.setSelection(length + 1); } else { diff --git a/src/utils/request.js b/src/utils/request.js index 303a7eb..6431e83 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -12,7 +12,7 @@ let downloadLoadingInstance; export let isRelogin = { show: false }; axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' - // 创建axios实例 +// 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, @@ -24,7 +24,7 @@ const service = axios.create({ service.interceptors.request.use(config => { // 是否需要设置 token const isToken = (config.headers || {}).isToken === false - // 是否需要防止数据重复提交 + // 是否需要防止数据重复提交 const isRepeatSubmit = (config.headers || {}).repeatSubmit === false if (getToken() && !isToken) { config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 @@ -67,48 +67,48 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - // 未设置状态码则默认成功状态 - const code = res.data.code || 200; - // 获取错误信息 - const msg = errorCode[code] || res.data.msg || errorCode['default'] - // 二进制数据则直接返回 - if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { - return res.data + // 未设置状态码则默认成功状态 + const code = res.data.code || 200; + // 获取错误信息 + const msg = errorCode[code] || res.data.msg || errorCode['default'] + // 二进制数据则直接返回 + if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { + return res.data + } + if (code === 401) { + if (!isRelogin.show) { + isRelogin.show = true; + MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + isRelogin.show = false; + store.dispatch('LogOut').then(() => { + location.href = '/index'; + }) + }).catch(() => { + isRelogin.show = false; + }); } - if (code === 401) { - if (!isRelogin.show) { - isRelogin.show = true; - MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - isRelogin.show = false; - store.dispatch('LogOut').then(() => { - location.href = '/index'; - }) - }).catch(() => { - isRelogin.show = false; - }); - } - return Promise.reject('无效的会话,或者会话已过期,请重新登录。') - } else if (code === 500) { - Message({ - message: msg, - type: 'error' - }) - return Promise.reject(new Error(msg)) - } else if (code === 600) { - return Promise.reject(new Error(msg)) - } else if (code !== 200) { - Notification.error({ - title: msg - }) - return Promise.reject('error') - } else { - return res.data - } - }, + return Promise.reject('无效的会话,或者会话已过期,请重新登录。') + } else if (code === 500) { + Message({ + message: msg, + type: 'error' + }) + return res.data & Promise.reject(new Error(msg)) + } else if (code === 600) { + return Promise.reject(new Error(msg)) + } else if (code !== 200) { + Notification.error({ + title: msg + }) + return Promise.reject('error') + } else { + return res.data + } +}, error => { console.log('err' + error) let { message } = error; @@ -135,7 +135,7 @@ export function download(url, params, filename) { transformRequest: [(params) => { return tansParams(params) }], headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' - }).then(async(data) => { + }).then(async (data) => { const isLogin = await blobValidate(data); if (isLogin) { const blob = new Blob([data]) diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js index a55ff8f..c4ede37 100644 --- a/src/views/system/OperateGoodsInfo/indexjs.js +++ b/src/views/system/OperateGoodsInfo/indexjs.js @@ -14,7 +14,6 @@ import { } from "@/api/system/goodsCategory"; import editor from "@/components/Editor"; import stationAcatar from "../stationAvatar/index.vue"; -import baseurl from "@/api/baseurl.js"; let id = 0; export default { @@ -414,9 +413,11 @@ export default { if (obj.pictureUrlList.length > 0) { updatePicture(obj).then((res) => {}); } - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); + if (response.code == 200) { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + } }); } else { this.form.goodDetailsLists.forEach(e => { @@ -424,10 +425,12 @@ export default { }) // this.nurseStationId=this.form.nurseStationId addGoodsInfo(this.form).then((response) => { - this.$modal.msgSuccess("新增成功"); - this.StationName = "请选择所属护理站"; - this.open = false; - this.getList(); + if (response.code == 200) { + this.$modal.msgSuccess("新增成功"); + this.StationName = "请选择所属护理站"; + this.open = false; + this.getList(); + } }); } } diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue index c1f4265..c5c8d7f 100644 --- a/src/views/system/StationDepartment/index.vue +++ b/src/views/system/StationDepartment/index.vue @@ -722,15 +722,19 @@ export default { if (valid) { if (this.form.id != null) { updateStationDepartment(this.form).then((response) => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); + } }); } else { addStationDepartment(this.form).then((response) => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.addopen = false; this.getList(); + } }); } } diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue index 285ba5f..a2da748 100644 --- a/src/views/system/classifyItem/index.vue +++ b/src/views/system/classifyItem/index.vue @@ -513,6 +513,7 @@ export default { if (valid) { if (this.form.id != null) { updateInfo(this.form).then((response) => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); if (this.form.classifyPictureUrl != this.classifyPictureUrl) { var obj = { pictureUrlList: [] }; @@ -521,12 +522,15 @@ export default { } this.editopen = false; this.getList(); + } }); } else { addInfo(this.form).then((response) => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); + } }); } } diff --git a/src/views/system/communityInfo/index.vue b/src/views/system/communityInfo/index.vue index d8dfde5..8032a14 100644 --- a/src/views/system/communityInfo/index.vue +++ b/src/views/system/communityInfo/index.vue @@ -832,18 +832,22 @@ export default { if (this.form.id != null) { updateCommunityInfo(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open2 = false; this.open = false; this.getList(); + } }); } else { addCommunityInfo(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.open2 = false; this.getList(); + } }); } } diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index f580b98..d8291a3 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -302,15 +302,19 @@ export default { if (valid) { if (this.form.configId != undefined) { updateConfig(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); + } }); } else { addConfig(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); + } }); } } diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 5b898a2..4be35d9 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -308,15 +308,19 @@ export default { if (valid) { if (this.form.deptId != undefined) { updateDept(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); + } }); } else { addDept(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); + } }); } } diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index bfa0fcf..ba06c9c 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -364,15 +364,19 @@ export default { if (valid) { if (this.form.dictCode != undefined) { updateData(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); + } }); } else { addData(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); + } }); } } diff --git a/src/views/system/diseaseInfo/index.vue b/src/views/system/diseaseInfo/index.vue index 5219a43..1b4324b 100644 --- a/src/views/system/diseaseInfo/index.vue +++ b/src/views/system/diseaseInfo/index.vue @@ -415,15 +415,19 @@ export default { if (valid) { if (this.form.id != null) { updateDiseaseInfo(this.form).then((response) => { + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); + } }); } else { addDiseaseInfo(this.form).then((response) => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open2 = false; this.getList(); + } }); } } diff --git a/src/views/system/goodsCategory/index.vue b/src/views/system/goodsCategory/index.vue index f14bd90..2d7940f 100644 --- a/src/views/system/goodsCategory/index.vue +++ b/src/views/system/goodsCategory/index.vue @@ -234,7 +234,6 @@ import { getStationCategoryList } from "@/api/system/goodsCategory"; import stationAcatar from "../stationAvatar/index.vue"; -import baseurl from "@/api/baseurl"; let id = 0; export default { name: "GoodsCategory", @@ -266,7 +265,7 @@ export default { } }, imgone: "", - baseurl: "", + baseurl: process.env.VUE_APP_BASE_API, // 遮罩层 loading: true, // 选中数组 @@ -328,7 +327,6 @@ export default { watch: {}, created() { - this.baseurl = baseurl; this.getList(); this.info(); }, @@ -472,19 +470,23 @@ export default { if (obj.pictureUrlList.length > 0) { updatePicture(obj).then(res => {}); } + if (response.code == 200) { this.$modal.msgSuccess("修改成功"); ++this.isResouceShow; this.open = false; this.getList(); this.info(); + } }); } else { addGoodsCategory(this.form).then(response => { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); ++this.isResouceShow; this.open = false; this.getList(); this.info(); + } }); } } diff --git a/src/views/system/goodsCategoryAcatar/index.vue b/src/views/system/goodsCategoryAcatar/index.vue index 744a190..8c399e3 100644 --- a/src/views/system/goodsCategoryAcatar/index.vue +++ b/src/views/system/goodsCategoryAcatar/index.vue @@ -106,7 +106,6 @@ diff --git a/src/views/system/trainingCategory/index.vue b/src/views/system/trainingCategory/index.vue new file mode 100644 index 0000000..0717e8d --- /dev/null +++ b/src/views/system/trainingCategory/index.vue @@ -0,0 +1,442 @@ + + +