diff --git a/src/api/finance.js b/src/api/finance.js new file mode 100644 index 0000000..3195dac --- /dev/null +++ b/src/api/finance.js @@ -0,0 +1,12 @@ +import service from '@/utils/request' +const api = { + /*助教*/ + getFinanceInfo : data => { // 财务管理 + return service({ + url: '/finance', + method: 'get', + params:data + }) + } +} +export default api diff --git a/src/api/market.js b/src/api/market.js index ba5be88..47055c1 100644 --- a/src/api/market.js +++ b/src/api/market.js @@ -44,5 +44,18 @@ const api = { data }) }, + getBrokerage: data => { // 获取佣金信息 + return service({ + url: '/brokerage', + method: 'get' + }) + }, + brokerageFunc: data => { // 提交佣金设置 + return service({ + url: '/brokerage', + method: 'post', + data + }) + }, } export default api diff --git a/src/api/userManage.js b/src/api/userManage.js index 7358cb6..86d120b 100644 --- a/src/api/userManage.js +++ b/src/api/userManage.js @@ -48,6 +48,27 @@ const api = { method: 'get', params:data }) - } + }, + getWithdrawList:data => { // 获取用户提现记录 + return service({ + url: '/withdraw', + method: 'get', + params:data + }) + }, + passWithdraw:data => { // 同意提现申请 + return service({ + url: '/withdraw', + method: 'post', + data + }) + }, + rejectWithdraw:data => { // 拒绝提现申请 + return service({ + url: '/withdraw/reject', + method: 'post', + data + }) + }, } export default api diff --git a/src/assets/f_icon1.png b/src/assets/f_icon1.png new file mode 100644 index 0000000..37288db Binary files /dev/null and b/src/assets/f_icon1.png differ diff --git a/src/assets/f_icon2.png b/src/assets/f_icon2.png new file mode 100644 index 0000000..804b7dd Binary files /dev/null and b/src/assets/f_icon2.png differ diff --git a/src/assets/f_icon3.png b/src/assets/f_icon3.png new file mode 100644 index 0000000..2177b51 Binary files /dev/null and b/src/assets/f_icon3.png differ diff --git a/src/assets/f_icon4.png b/src/assets/f_icon4.png new file mode 100644 index 0000000..28660ac Binary files /dev/null and b/src/assets/f_icon4.png differ diff --git a/src/assets/f_icon5.png b/src/assets/f_icon5.png new file mode 100644 index 0000000..6983f4c Binary files /dev/null and b/src/assets/f_icon5.png differ diff --git a/src/view/course/addCourse/index.vue b/src/view/course/addCourse/index.vue index 2ecaa3d..979a1d8 100644 --- a/src/view/course/addCourse/index.vue +++ b/src/view/course/addCourse/index.vue @@ -58,7 +58,7 @@ function stepChangeFunc(type) { break; case 2: // 下一步 if(active.value == 0) { // 保存第一步的信息 - console.log(isChange.value) + // console.log(isChange.value) if(isChange.value){ submitForm(ruleFormRef.value) } @@ -88,6 +88,12 @@ async function saveStep1() { return item.name === form.value.subject })[0].id form.value.price = parseFloat(form.value.price)<0?0:form.value.price + if(!checkFreeTestFromPrice()) { + ElMessage({ + type: 'warning', + message: '赠送价格不能超过课程价格!' + }) + } let params = { step1:{ ...form.value @@ -180,6 +186,25 @@ function handlerChange(e) { // console.log(e) isChange.value = true } +function freeTestFunc() { // 免费试卷数量 + if(!checkFreeTestFromPrice()) { + ElMessage({ + type: 'warning', + message: '赠送价格不能超过课程价格!' + }) + } + handlerChange() +} +const STD_TEST_PRICE = 4.9 +function checkFreeTestFromPrice() { // 检查免费试卷分数是否合理 + let flag = true + if(form.value.free_test && form.value.price) { + if(parseInt(form.value.free_test) * STD_TEST_PRICE > parseFloat(form.value.price)) { + flag = false + } + } + return flag +} diff --git a/src/view/marketManage/brokerage/index.vue b/src/view/marketManage/brokerage/index.vue new file mode 100644 index 0000000..cfe392d --- /dev/null +++ b/src/view/marketManage/brokerage/index.vue @@ -0,0 +1,98 @@ + + + diff --git a/src/view/userManage/withdraw.vue b/src/view/userManage/withdraw.vue new file mode 100644 index 0000000..cc64fb6 --- /dev/null +++ b/src/view/userManage/withdraw.vue @@ -0,0 +1,262 @@ + + + +