diff --git a/src/views/user/index/api.js b/src/views/user/index/api.js index 5b5f2f4..a53b982 100644 --- a/src/views/user/index/api.js +++ b/src/views/user/index/api.js @@ -14,4 +14,6 @@ export default { gettgJllist: (data) => request.post('/user/referee/point', data), // 积分赠送 addUserPulse: (data) => request.post('/gift/pulse', data), + // 获取赠送记录 + getgiftJllist: (data) => request.post('/user/gift/pluse', data), } diff --git a/src/views/user/index/index.vue b/src/views/user/index/index.vue index 39f251f..28775c2 100644 --- a/src/views/user/index/index.vue +++ b/src/views/user/index/index.vue @@ -83,6 +83,19 @@ + +
+ 活动赠送: + + + +
+
时间筛选: @@ -112,7 +125,7 @@
- + avatarUrl
昵称:{{ nowRow.nickName }}
电话:{{ nowRow.phone }}
@@ -134,6 +147,8 @@ + + @@ -193,7 +208,7 @@ - + { selectKey: null, status: '', time: null, + type: '', } getList() } @@ -433,7 +465,8 @@ const getList = async () => { loading.value = true try { const query_data = { - Status: queryParams.value.status || '', + Status: queryParams.value.status, + Type: queryParams.value.type, StartTime: queryParams.value.time === null ? '' : queryParams.value.time[0] || '', EndTime: queryParams.value.time === null ? '' : queryParams.value.time[1] || '', } @@ -614,7 +647,7 @@ const tabsChange = async (e = '1') => { key: 'add_time', }, ] - } else { + } else if (tabVal.value === '5') { tabsColumns.value = [ { title: '订单号', @@ -642,6 +675,45 @@ const tabsChange = async (e = '1') => { key: 'add_time', }, ] + } else if (tabVal.value === '6') { + tabsColumns.value = [ + { + title: '获取豆子', + align: 'center', + key: 'number', + }, + { + title: '类型', + align: 'center', + slot: 'type', + render: (row) => { + let nameStr = '' + switch (row.type) { + case 5: + nameStr = '注册赠送' + break + case 6: + nameStr = '签到赠送' + break + case 7: + nameStr = '主动赠送' + break + } + return h( + 'span', + {}, + { + default: () => nameStr, + } + ) + }, + }, + { + title: '获得时间', + align: 'center', + key: 'add_time', + }, + ] } tabsPagination.value.page = 1 await getTabsList() @@ -674,6 +746,9 @@ const getTabsList = async () => { case '5': res = await api.gettgJllist(data) break + case '6': + res = await api.getgiftJllist(data) + break } tabsData.value = res.data.data || [] tabsPagination.value.itemCount = res.data.total @@ -736,6 +811,7 @@ const addClear = () => { Number: 0, } showModal.value = false + getList() }