diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..18de226 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "type": "chrome", + "request": "launch", + "name": "针对 localhost 启动 Chrome", + "url": "http://localhost:8080", + "webRoot": "${workspaceFolder}" + } + ] +} \ No newline at end of file diff --git a/src/api/integral.js b/src/api/integral.js index f53bc37..5a1359d 100644 --- a/src/api/integral.js +++ b/src/api/integral.js @@ -26,7 +26,7 @@ const api = { editAucitonData: data => { // 编辑竞拍 return service({ url: '/auction', - method: 'post', + method: 'put', data }) }, diff --git a/src/view/course/addCourse/index.vue b/src/view/course/addCourse/index.vue index 4cc1013..12ee50c 100644 --- a/src/view/course/addCourse/index.vue +++ b/src/view/course/addCourse/index.vue @@ -128,6 +128,7 @@ async function getSubject(){ // 获取课程分类 // subjectList.value = custom.addTreeFormatSubject(res.data.records,'id') subjectList_inject.value = custom.addTreeFormatSubject(_.cloneDeep(res.data.records),'name') subjectList.value = custom.addTreeFormatSubject( _.cloneDeep(res.data.records),'id') + // } } async function uploadAction(file){//图片上传 非oss @@ -288,7 +289,7 @@ function goListFunc() { - + - - - + + + + + @@ -535,15 +534,15 @@ function getRandomNumber() { value-format="x" /> - - - + + + + + + + + + diff --git a/src/view/marketManage/brokerage/index.vue b/src/view/marketManage/brokerage/index.vue index c6babf8..56a3a02 100644 --- a/src/view/marketManage/brokerage/index.vue +++ b/src/view/marketManage/brokerage/index.vue @@ -16,17 +16,20 @@ const brokerageFormRules = ref({ exam_assistant: [{ required: true, message: '请输入助教佣金', trigger: 'blur' }], exam_manage:[{ required: true, message: '请输入主管佣金', trigger: 'blur'}, { type: 'number', message: '请输入正确的格式',trigger: 'blur' }], + exam_teacher:[{ required: true, message: '请输入教师佣金', trigger: 'blur'}, + { type: 'number', message: '请输入正确的格式',trigger: 'blur' }], exam_assistant_assistant:[{ required: true, message: '请输入助教推荐助教佣金', trigger: 'blur'}, { type: 'number', message: '请输入正确的格式' }], exam_assistant_teacher:[{ required: true, message: '请输入助教推荐老师佣金', trigger: 'blur'}, { type: 'number', message: '请输入正确的格式' }], course_assistant:[{ required: true, message: '请输入助教佣金占比', trigger: 'blur' }], course_manage:[{ required: true, message: '请输入主管佣金占比', trigger: 'blur' }], + course_teacher:[{ required: true, message: '请输入教师佣金占比', trigger: 'blur' }], course_assistant_assistant:[{ required: true, message: '请输入助教推荐助教佣金占比', trigger: 'blur' }], course_assistant_teacher:[{ required: true, message: '请输入助教推荐老师佣金占比', trigger: 'blur' }], }) const brokerageFormRef = ref(null) -const std_percent_arr = ['course_assistant','course_manage','course_assistant_assistant','course_assistant_teacher'] +const std_percent_arr = ['course_assistant','course_manage','course_teacher','course_assistant_assistant','course_assistant_teacher'] // 方法 async function getBrokerage() { const res = await api.getBrokerage() @@ -74,29 +77,35 @@ async function saveData() { 测试题佣金设置 - + - + + + + - + - + 课程佣金设置 - + - + + + + - + - + 保存 diff --git a/src/view/marketManage/managerList/index.vue b/src/view/marketManage/managerList/index.vue index 2088e0d..ec954d4 100644 --- a/src/view/marketManage/managerList/index.vue +++ b/src/view/marketManage/managerList/index.vue @@ -149,7 +149,7 @@ const dialogVisible = ref(false) const mForm = ref({province: 0}) const mFormRef = ref(null) const mFormRules = ref({ - province: [{ required: true, message: '请选择管辖区域', trigger: 'blur' }], + // province: [{ required: true, message: '请选择管辖区域', trigger: 'blur' }], user_id: [{ required: true, message: '请选择用户', trigger: 'blur' }] }) function openDialog() { @@ -204,7 +204,7 @@ async function remoteMethod(query) { - + 查询 重置 @@ -250,11 +250,11 @@ async function remoteMethod(query) { - + @@ -300,7 +300,7 @@ async function remoteMethod(query) { width="30%" > - +