diff --git a/src/api/cai/consumeLog.js b/src/api/cai/consumeLog.js index 876a06f..0451d64 100644 --- a/src/api/cai/consumeLog.js +++ b/src/api/cai/consumeLog.js @@ -17,6 +17,15 @@ export function getConsumeLog(id) { }) } + +export function getConsumeLogTraceId(traceId) { + return request({ + url: '/cai/consumeLog/trace', + method: 'get', + params:{traceId} + }) +} + // 新增分销记录 export function addConsumeLog(data) { return request({ diff --git a/src/api/cai/guardLog.js b/src/api/cai/guardLog.js index 1c8eec5..6617681 100644 --- a/src/api/cai/guardLog.js +++ b/src/api/cai/guardLog.js @@ -17,6 +17,14 @@ export function getGuardLog(id) { }) } +export function getGuardLogByTraceId(traceId) { + return request({ + url: '/cai/guardLog/trace', + method: 'get', + params:{traceId} + }) +} + // 新增守护赠送流水 export function addGuardLog(data) { return request({ diff --git a/src/api/cai/rechargeOrder.js b/src/api/cai/rechargeOrder.js index 63411e7..f83fa0b 100644 --- a/src/api/cai/rechargeOrder.js +++ b/src/api/cai/rechargeOrder.js @@ -17,6 +17,14 @@ export function getRechargeOrder(id) { }) } +export function getRechargeOrderByTraceId(traceId) { + return request({ + url: '/cai/rechargeOrder/trace', + method: 'get', + params: {traceId} + }) +} + // 新增充值订单 export function addRechargeOrder(data) { return request({ diff --git a/src/api/cai/userGift.js b/src/api/cai/userGift.js index 9f19fe9..68a7f83 100644 --- a/src/api/cai/userGift.js +++ b/src/api/cai/userGift.js @@ -17,6 +17,14 @@ export function getUserGift(id) { }) } +export function getUserGiftByTraceId(traceId) { + return request({ + url: '/cai/userGift/trace', + method: 'get', + params: {traceId} + }) +} + // 新增礼物流水 export function addUserGift(data) { return request({ diff --git a/src/views/cai/accountChangeLog/index.vue b/src/views/cai/accountChangeLog/index.vue index 67ae362..9629fab 100644 --- a/src/views/cai/accountChangeLog/index.vue +++ b/src/views/cai/accountChangeLog/index.vue @@ -31,6 +31,14 @@ /> + + + 搜索 重置 @@ -59,8 +67,16 @@ + @@ -72,18 +88,24 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> + diff --git a/src/views/cai/consumeLog/consume-log-info.vue b/src/views/cai/consumeLog/consume-log-info.vue index 75ac001..97bdc59 100644 --- a/src/views/cai/consumeLog/consume-log-info.vue +++ b/src/views/cai/consumeLog/consume-log-info.vue @@ -12,6 +12,9 @@ + + + @@ -21,6 +24,9 @@ {{info.createTime}} + + {{info.traceId}} + @@ -102,9 +108,10 @@ import { booleanList, consumeLogCalculateStatusList, consumeLogStatusList, - consumeLogTypeList, isAnchorList + consumeLogTypeList, + isAnchorList } from '@/constant/statusMap' -import {getConsumeLog} from "@/api/cai/consumeLog"; +import {getConsumeLog, getConsumeLogTraceId} from "@/api/cai/consumeLog"; export default { name: "UserInfo", @@ -139,7 +146,13 @@ export default { this.open = true; this.id = id; getConsumeLog(this.id).then(response => { - this.info = response.data; + this.info = response.data?response.data:{}; + }); + }, + traceIdInit(traceId){ + this.open = true; + getConsumeLogTraceId(traceId).then(response => { + this.info = response.data?response.data:{}; }); }, } diff --git a/src/views/cai/consumeLog/index.vue b/src/views/cai/consumeLog/index.vue index b947eb4..7ea921e 100644 --- a/src/views/cai/consumeLog/index.vue +++ b/src/views/cai/consumeLog/index.vue @@ -33,6 +33,14 @@ @keyup.enter.native="handleQuery" /> + + + 搜索 重置 @@ -106,6 +114,7 @@ + + + + diff --git a/src/views/cai/guardLog/index.vue b/src/views/cai/guardLog/index.vue index 1d4ad34..b92ad8e 100644 --- a/src/views/cai/guardLog/index.vue +++ b/src/views/cai/guardLog/index.vue @@ -33,6 +33,14 @@ @keyup.enter.native="handleQuery" /> + + + 搜索 重置 @@ -53,16 +61,23 @@ + @@ -75,21 +90,24 @@ @pagination="getList" /> + diff --git a/src/views/cai/guardTotal/index.vue b/src/views/cai/guardTotal/index.vue index 71f4919..921d2d1 100644 --- a/src/views/cai/guardTotal/index.vue +++ b/src/views/cai/guardTotal/index.vue @@ -54,13 +54,6 @@ @@ -76,7 +69,7 @@ diff --git a/src/views/cai/rechargeOrder/index.vue b/src/views/cai/rechargeOrder/index.vue index 3c25dc4..9961806 100644 --- a/src/views/cai/rechargeOrder/index.vue +++ b/src/views/cai/rechargeOrder/index.vue @@ -36,6 +36,14 @@ /> + + + 搜索 重置 @@ -48,7 +56,7 @@ - + @@ -81,8 +89,17 @@ - + + @@ -116,17 +134,19 @@ import { yesOrNoList } from '@/constant/statusMap' import RechargeOrderInfo from "@/views/cai/rechargeOrder/recharge-order-info"; +import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info"; export default { name: "RechargeOrder", components:{ - RechargeOrderInfo + RechargeOrderInfo,ConsumeLogInfo }, data() { return { genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList, payStatusList, rechargeOrderInfoVisible: false, + consumeLogInfoVisible: false, // 遮罩层 loading: true, // 选中数组 @@ -148,7 +168,8 @@ export default { payStatus: undefined, usercode: undefined, mobile: undefined, - orderNo: undefined + orderNo: undefined, + traceId: undefined }, }; }, @@ -181,6 +202,12 @@ export default { this.single = selection.length!==1 this.multiple = !selection.length }, + handleConsumerLog(row) { + this.consumeLogInfoVisible = true + this.$nextTick(() => { + this.$refs.consumeLogInfo.traceIdInit(row.traceId) + }) + }, handleInfo(row) { this.rechargeOrderInfoVisible = true this.$nextTick(() => { diff --git a/src/views/cai/rechargeOrder/recharge-order-info.vue b/src/views/cai/rechargeOrder/recharge-order-info.vue index 72cdabf..8706095 100644 --- a/src/views/cai/rechargeOrder/recharge-order-info.vue +++ b/src/views/cai/rechargeOrder/recharge-order-info.vue @@ -46,6 +46,9 @@ {{info.appid}} + + {{info.traceId}} + {{info.returnContent}} @@ -63,7 +66,7 @@ import { platformTypeList, yesOrNoList } from '@/constant/statusMap' -import { getRechargeOrder } from '@/api/cai/rechargeOrder' +import {getRechargeOrder, getRechargeOrderByTraceId} from '@/api/cai/rechargeOrder' export default { name: "UserInfo", @@ -100,6 +103,12 @@ export default { this.info = response.data; }); }, + traceIdInit(traceId){ + this.open = true; + getRechargeOrderByTraceId(traceId).then(response => { + this.info = response.data; + }); + }, } }; diff --git a/src/views/cai/userGift/index.vue b/src/views/cai/userGift/index.vue index bf57210..0502d0c 100644 --- a/src/views/cai/userGift/index.vue +++ b/src/views/cai/userGift/index.vue @@ -33,6 +33,14 @@ @keyup.enter.native="handleQuery" /> + + + 搜索 重置 @@ -63,16 +71,23 @@ + @@ -85,6 +100,7 @@ @pagination="getList" /> + @@ -92,16 +108,18 @@ import {listUserGift} from "@/api/cai/userGift"; import {userGiftTypeList} from "@/constant/statusMap"; import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info"; +import UserGiftInfo from "@/views/cai/userGift/user-gift-info"; export default { name: "UserGift", components: { - ConsumeLogInfo + ConsumeLogInfo,UserGiftInfo }, data() { return { userGiftTypeList, consumeLogInfoVisible: false, + userGiftInfoVisible: false, // 遮罩层 loading: true, // 选中数组 @@ -125,6 +143,7 @@ export default { toMobile: undefined, fromUsercode: undefined, fromMobile: undefined, + traceId: undefined }, }; }, @@ -160,9 +179,15 @@ export default { handleConsumerLog(row) { this.consumeLogInfoVisible = true this.$nextTick(() => { - this.$refs.consumeLogInfo.init(row.consumerLogId) + this.$refs.consumeLogInfo.traceIdInit(row.traceId) }) }, + handleInfo(row){ + this.userGiftInfoVisible = true + this.$nextTick(() => { + this.$refs.userGiftInfo.traceIdInit(row.id) + }) + } } }; diff --git a/src/views/cai/userGift/user-gift-info.vue b/src/views/cai/userGift/user-gift-info.vue new file mode 100644 index 0000000..3142b36 --- /dev/null +++ b/src/views/cai/userGift/user-gift-info.vue @@ -0,0 +1,101 @@ + + + +