diff --git a/src/api/integral.js b/src/api/integral.js index 575785f..f53bc37 100644 --- a/src/api/integral.js +++ b/src/api/integral.js @@ -86,5 +86,17 @@ const api = { params:data }) }, + freeze: data => { // 冻结积分 + return service({ + url: '/point/freeze/'+data.id, + method: 'put' + }) + }, + unfreeze:data => { // 解冻积分 + return service({ + url: '/point/unfreeze/'+data.id, + method: 'put' + }) + }, } export default api diff --git a/src/api/market.js b/src/api/market.js index 47055c1..8759bfb 100644 --- a/src/api/market.js +++ b/src/api/market.js @@ -57,5 +57,12 @@ const api = { data }) }, + assistantOperator : data => {// 审核提交-助教 + return service({ + url: '/assistant/change', + method: 'post', + data + }) + }, } export default api diff --git a/src/api/userManage.js b/src/api/userManage.js index 86d120b..c3abc73 100644 --- a/src/api/userManage.js +++ b/src/api/userManage.js @@ -70,5 +70,12 @@ const api = { data }) }, + getAuctionDetailList: data => { // 获取竞拍 抽奖 记录 + return service({ + url: '/auction/record', + method: 'get', + params:data + }) + }, } export default api diff --git a/src/utils/custom.js b/src/utils/custom.js index 76c03cd..e65246d 100644 --- a/src/utils/custom.js +++ b/src/utils/custom.js @@ -130,6 +130,21 @@ const custom = { else{ return num/flag+'万' } + },addTreeFormatSubject(data,type) { + if(!data) { + return [] + } + data.map( item => { + item.label = item.name + item.value = item[type] + if(item.level !== 3) { + item.disabled = true + } + if(item.children) { + custom.addTreeFormatSubject(item.children,type) + } + }) + return data }, getDealType() { // 获取交易类型 return [ diff --git a/src/view/auctionManage/index.vue b/src/view/auctionManage/index.vue index 7868449..f891e94 100644 --- a/src/view/auctionManage/index.vue +++ b/src/view/auctionManage/index.vue @@ -265,7 +265,7 @@ const viewParams = ref({ sort:'desc' }) const dialogViewVisible = ref(false) -const viewInfo = ref({}) +const viewInfo = ref([]) const view_total = ref(0) async function viewAuctionFunc(row) { // 竞拍明细 viewParams.value.id = row.id @@ -276,6 +276,9 @@ async function viewAuctionFunc(row) { // 竞拍明细 viewInfo.value = res.data.list } } +function closeViewDialog() { + dialogViewVisible.value = false +} diff --git a/src/view/dealDetailManage/auctionDetail.vue b/src/view/dealDetailManage/auctionDetail.vue index a5a1eeb..cd2dc83 100644 --- a/src/view/dealDetailManage/auctionDetail.vue +++ b/src/view/dealDetailManage/auctionDetail.vue @@ -21,7 +21,8 @@ const queryParams = ref({ pageSize:10, user_id:0, type:'', // 是否中奖 - time:'', // 抽经时间 + time:'', // 抽经时间, + current_page:1 }) const tableData = ref([]) const total = ref(0) @@ -37,6 +38,7 @@ const typeList = ref([ ]) // 生命周期 onMounted(() => { + queryParams.value.id = parseInt(route.params.user_id) // getAuctionDetailList() }) // 方法 @@ -57,7 +59,9 @@ const onReset = () => { user_id:0, type:'', // 是否中奖 time:'', // 抽经时间 + current_page:1 } + queryParams.value.id = parseInt(route.params.user_id) } function handleCurrentChange(val) { queryParams.value.page = val diff --git a/src/view/dealDetailManage/dealDetailMoney.vue b/src/view/dealDetailManage/dealDetailMoney.vue index b9e448c..a0e179e 100644 --- a/src/view/dealDetailManage/dealDetailMoney.vue +++ b/src/view/dealDetailManage/dealDetailMoney.vue @@ -59,6 +59,7 @@ const onReset = () => { type:'', deal_time:'' } + queryParams.value.id = parseInt(route.params.user_id) } function handleCurrentChange(val) { queryParams.value.page = val @@ -90,15 +91,15 @@ function getTypeName(type) { - - - - - - - - - + + + 查询 diff --git a/src/view/dealDetailManage/dealDetailPoint.vue b/src/view/dealDetailManage/dealDetailPoint.vue index f5df15a..3f8028c 100644 --- a/src/view/dealDetailManage/dealDetailPoint.vue +++ b/src/view/dealDetailManage/dealDetailPoint.vue @@ -57,6 +57,7 @@ const onReset = () => { type:'', deal_time:'' } + queryParams.value.id = parseInt(route.params.user_id) } function handleCurrentChange(val) { queryParams.value.page = val @@ -67,6 +68,7 @@ function handleSizeChange(val) { getDealPointList() } function getTypeName(type) { + console.log(deal_types.value,type) return deal_types.value.filter((item,i) => { return item.value == type })[0].name @@ -78,12 +80,12 @@ function getTypeName(type) {
- + @@ -108,10 +110,10 @@ function getTypeName(type) {
- + diff --git a/src/view/dealDetailManage/learningDetail.vue b/src/view/dealDetailManage/learningDetail.vue index 1dc9a24..b4493c8 100644 --- a/src/view/dealDetailManage/learningDetail.vue +++ b/src/view/dealDetailManage/learningDetail.vue @@ -83,7 +83,8 @@ function initChart() { // echart async function getSubject(){ // 获取课程分类 const res = await capi.getSubjectList(subjectParams.value) if(res.code === 0) { - subjectList.value = custom.getStdSubject(res.data.records) + // subjectList.value = custom.getStdSubject(res.data.records) + subjectList.value = custom.addTreeFormatSubject(res.data.records,'id') // console.log(subjectList.value) } } @@ -106,6 +107,7 @@ const onReset = () => { last_time:'', subject:'' } + queryParams.value.id = parseInt(route.params.user_id) } // const handleSelectionChange = (val) => { // question_ids.value = val @@ -126,14 +128,15 @@ function handleSizeChange(val) { - - - + + + + + + + + + @@ -163,7 +166,7 @@ function handleSizeChange(val) { - + diff --git a/src/view/dealDetailManage/raffleDetail.vue b/src/view/dealDetailManage/raffleDetail.vue index acfb7fe..28aaedd 100644 --- a/src/view/dealDetailManage/raffleDetail.vue +++ b/src/view/dealDetailManage/raffleDetail.vue @@ -37,7 +37,7 @@ const typeList = ref([ ]) // 生命周期 onMounted(() => { - // getRaffleDetailList() + getRaffleDetailList() }) // 方法 async function getRaffleDetailList() { diff --git a/src/view/dealDetailManage/testDetail.vue b/src/view/dealDetailManage/testDetail.vue index 8209d4f..982e4c3 100644 --- a/src/view/dealDetailManage/testDetail.vue +++ b/src/view/dealDetailManage/testDetail.vue @@ -36,8 +36,9 @@ onMounted(() => { async function getSubject(){ // 获取课程分类 const res = await capi.getSubjectList(subjectParams.value) if(res.code === 0) { - subjectList.value = custom.getStdSubject(res.data.records) + // subjectList.value = custom.getStdSubject(res.data.records) // console.log(subjectList.value) + subjectList.value = custom.addTreeFormatSubject(res.data.records,'id') } } async function getTestDetailList() { @@ -58,6 +59,7 @@ const onReset = () => { last_time:'', subject:'' } + queryParams.value.id = parseInt(route.params.user_id) } function handleCurrentChange(val) { queryParams.value.page = val @@ -82,14 +84,15 @@ async function getCourseName(course_id) { - - - + + + + + + + + + diff --git a/src/view/drawManage/index.vue b/src/view/drawManage/index.vue index 393db15..d4ec88b 100644 --- a/src/view/drawManage/index.vue +++ b/src/view/drawManage/index.vue @@ -272,7 +272,7 @@ const viewParams = ref({ sort:'desc' }) const dialogViewVisible = ref(false) -const viewInfo = ref({}) +const viewInfo = ref([]) const view_total = ref(0) async function viewAuctionFunc(row) { // 竞拍明细 viewParams.value.id = row.id @@ -511,8 +511,8 @@ async function viewAuctionFunc(row) { // 竞拍明细 - - + +
diff --git a/src/view/integralManage/index.vue b/src/view/integralManage/index.vue index 87ba967..ac06677 100644 --- a/src/view/integralManage/index.vue +++ b/src/view/integralManage/index.vue @@ -128,7 +128,7 @@ function deleteExamFunc(row) { }) } function handleCurrentChange(val) { - queryParams.value.pageIndex = val + queryParams.value.page = val getIntegralList() } function handleSizeChange(val) { @@ -181,6 +181,38 @@ function getStateName(state) { } return str } +async function integralOperationFunc(type,row) { // 冻结 解冻 + let func = '', title = '' + if(type == 1) { + func = 'freeze' + title = '是否冻结该用户积分？' + } + else { + func = 'unfreeze' + title = '是否解冻该用户积分？' + } + // const res = await api[func]({id:row.id}) + // if(res === 0) { + // + // } + + ElMessageBox.confirm(title, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + .then(async() => { + const res = await api[func]({id:row.point_id}) + if (res.code === 0) { + ElMessage({ + type: 'success', + message: '操作成功!' + }) + getIntegralList() + } + },() => { + }) +} + + + diff --git a/src/view/marketManage/managerList/index.vue b/src/view/marketManage/managerList/index.vue index 52bbfa2..402472d 100644 --- a/src/view/marketManage/managerList/index.vue +++ b/src/view/marketManage/managerList/index.vue @@ -57,20 +57,20 @@ const user_list = ref([]) // 生命周期 onMounted(() => { getManagerList() - getUserList() + // getUserList() }) // provide('subjectList', subjectList) // provide('current_subject', current_subject) // 方法 -async function getUserList() { - const res = await capi.getUserList({ - page:1, - pageSize:1000 - }) - if(res.code === 0) { - user_list.value = res.data.records - } -} +// async function getUserList() { +// const res = await capi.getUserList({ +// page:1, +// pageSize:1000 +// }) +// if(res.code === 0) { +// user_list.value = res.data.records +// } +// } async function getManagerList() { const res = await api.getManagerList(queryParams.value) if(res.code === 0) { @@ -182,6 +182,20 @@ async function saveData() { dialogVisible.value = false } } +/*搜索用户相关*/ +const selectLoading = ref(false) +async function remoteMethod(query) { + selectLoading.value = true + const res = await capi.getUserList({ + name:query, + page:1, + pageSize:100 + }) + selectLoading.value = false + if(res.code === 0) { + user_list.value = res.data.records + } +}