diff --git a/.env.development b/.env.development index 5a200ae..d8a7846 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://192.168.0.109:8091' +VUE_APP_BASE_API = 'http://192.168.0.114:8091' VUE_APP_WS_API = 'ws://localhost:8088' - # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index c8df654..c4402c8 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,6 @@ ENV = 'production' # 接口地址 -VUE_APP_BASE_API = 'https://' +VUE_APP_BASE_API = 'http://www.cyjyyjy.com:8091' VUE_APP_WS_API = 'ws:///127.0.0.1:8001' diff --git a/.eslintignore b/.eslintignore index 0fb13a5..ce6e2e5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,8 +1,6 @@ build/*.js -src/assets +src public dist -src/views -src/components diff --git a/dist.rar b/dist.rar new file mode 100644 index 0000000..c276d6e Binary files /dev/null and b/dist.rar differ diff --git a/src/api/CourseLevel.js b/src/api/CourseLevel.js new file mode 100644 index 0000000..7f911ad --- /dev/null +++ b/src/api/CourseLevel.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/CourseLevel', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/CourseLevel/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/CourseLevel', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/src/api/MemberFeedback.js b/src/api/MemberFeedback.js new file mode 100644 index 0000000..8147951 --- /dev/null +++ b/src/api/MemberFeedback.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/MemberFeedback', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/MemberFeedback/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/MemberFeedback', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/src/api/cyCourse.js b/src/api/cyCourse.js index fa39a60..b4cac0b 100644 --- a/src/api/cyCourse.js +++ b/src/api/cyCourse.js @@ -24,4 +24,24 @@ export function edit(data) { }) } -export default { add, edit, del } +export function courseSeat(data) { + return request({ + url: 'api/CourseSeat/addCourseSeats', + method: 'post', + data + }) +} +export function getCourseManage(data) { + return request({ + url: 'api/cyCourse?isModel=' + data, + method: 'GET' + }) +} +export function getCourseLevel(data) { + return request({ + url: 'api/CourseLevel', + method: 'GET' + }) +} + +export default { add, edit, del, courseSeat, getCourseManage, getCourseLevel } diff --git a/src/api/setConfig.js b/src/api/setConfig.js new file mode 100644 index 0000000..511fae5 --- /dev/null +++ b/src/api/setConfig.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 配置管理 +export function setConfig(data) { + return request({ + url: '/api/config/editConfigs', + data, + method: 'post' + }) +} + +export function getConfigs(data) { + return request({ + url: '/api/config/getConfigs', + data, + method: 'post' + }) +} diff --git a/src/assets/images/bg.jpg b/src/assets/images/bg.jpg deleted file mode 100644 index ddc30c8..0000000 Binary files a/src/assets/images/bg.jpg and /dev/null differ diff --git a/src/assets/images/bg.png b/src/assets/images/bg.png new file mode 100644 index 0000000..cbf23ef Binary files /dev/null and b/src/assets/images/bg.png differ diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js index e67aaf5..f70279d 100644 --- a/src/components/Crud/crud.js +++ b/src/components/Crud/crud.js @@ -29,6 +29,8 @@ function CRUD(options) { defaultForm: () => {}, // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc'] sort: ['id,desc'], + //是否为模板 + isModel:null, // 等待时间 time: 50, // CRUD Method @@ -159,6 +161,7 @@ function CRUD(options) { */ toEdit(data) { crud.resetForm(JSON.parse(JSON.stringify(data))) + console.log() if (!(callVmHook(crud, CRUD.HOOK.beforeToEdit, crud.form) && callVmHook(crud, CRUD.HOOK.beforeToCU, crud.form))) { return } @@ -329,6 +332,7 @@ function CRUD(options) { page: crud.page.page - 1, size: crud.page.size, sort: crud.sort, + isModel:crud.isModel, ...crud.query, ...crud.params } @@ -388,6 +392,7 @@ function CRUD(options) { Vue.set(crudFrom, key, form[key]) } } + console.log(crudFrom) }, /** * 重置数据状态 diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index c235dc9..0959ade 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -5,11 +5,11 @@ -