init
This commit is contained in:
@@ -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) {
|
export function addConsumeLog(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@@ -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) {
|
export function addGuardLog(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@@ -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) {
|
export function addRechargeOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@@ -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) {
|
export function addUserGift(data) {
|
||||||
return request({
|
return request({
|
||||||
|
|||||||
@@ -31,6 +31,14 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="链路号" prop="traceId">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.traceId"
|
||||||
|
placeholder="请输入链路号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -59,8 +67,16 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作时间" align="center" prop="createTime" />
|
<el-table-column label="操作时间" align="center" prop="createTime" />
|
||||||
|
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-info"
|
||||||
|
v-if="scope.row.traceId"
|
||||||
|
@click="handleInfo(scope.row)"
|
||||||
|
>关联业务</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -72,18 +88,24 @@
|
|||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
|
<recharge-order-info v-if="rechargeOrderInfoVisible" ref="rechargeOrderInfo" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {listAccountChangeLog, listChangeType} from "@/api/cai/accountChangeLog";
|
import {listAccountChangeLog, listChangeType} from "@/api/cai/accountChangeLog";
|
||||||
import {accountTypeList, yesOrNoList} from "@/constant/statusMap";
|
import {accountTypeList, yesOrNoList} from "@/constant/statusMap";
|
||||||
|
import RechargeOrderInfo from "@/views/cai/rechargeOrder/recharge-order-info";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "AccountChangeLog",
|
name: "AccountChangeLog",
|
||||||
|
components: {
|
||||||
|
RechargeOrderInfo
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
accountTypeList,yesOrNoList,
|
accountTypeList,yesOrNoList,
|
||||||
|
rechargeOrderInfoVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
@@ -104,7 +126,8 @@ export default {
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
usercode: undefined,
|
usercode: undefined,
|
||||||
accountType: undefined,
|
accountType: undefined,
|
||||||
cateId: undefined
|
cateId: undefined,
|
||||||
|
traceId:undefined
|
||||||
},
|
},
|
||||||
changeTypeList:[],
|
changeTypeList:[],
|
||||||
};
|
};
|
||||||
@@ -141,6 +164,31 @@ export default {
|
|||||||
this.single = selection.length!==1
|
this.single = selection.length!==1
|
||||||
this.multiple = !selection.length
|
this.multiple = !selection.length
|
||||||
},
|
},
|
||||||
|
handleInfo(row){
|
||||||
|
const command = row.traceLinkType
|
||||||
|
switch (command) {
|
||||||
|
case "RECHARGE":
|
||||||
|
this.rechargeOrderInfoVisible = true
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.rechargeOrderInfo.traceIdInit(row.traceId)
|
||||||
|
})
|
||||||
|
break;
|
||||||
|
case "GIFT":
|
||||||
|
this.handleResetPwd(row);
|
||||||
|
break;
|
||||||
|
case "GUARD":
|
||||||
|
this.handleResetMobile(row);
|
||||||
|
break;
|
||||||
|
case "VIDEO":
|
||||||
|
this.handleResetMobile(row);
|
||||||
|
break;
|
||||||
|
case "WITHDRAW":
|
||||||
|
this.handleResetMobile(row);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -12,6 +12,9 @@
|
|||||||
<el-descriptions-item label="是否计算">
|
<el-descriptions-item label="是否计算">
|
||||||
<cai-dict-tag :options="consumeLogCalculateStatusList" :value="info.calculateStatus" />
|
<cai-dict-tag :options="consumeLogCalculateStatusList" :value="info.calculateStatus" />
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="类型">
|
||||||
|
<cai-dict-tag :options="consumeLogStatusList" :value="info.status" />
|
||||||
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="后台操作?">
|
<el-descriptions-item label="后台操作?">
|
||||||
<cai-dict-tag :options="booleanList" :value="info.admin" />
|
<cai-dict-tag :options="booleanList" :value="info.admin" />
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
@@ -21,6 +24,9 @@
|
|||||||
<el-descriptions-item label="创建时间">
|
<el-descriptions-item label="创建时间">
|
||||||
{{info.createTime}}
|
{{info.createTime}}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="链路号">
|
||||||
|
{{info.traceId}}
|
||||||
|
</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
<el-collapse-item title="消费方" name="source">
|
<el-collapse-item title="消费方" name="source">
|
||||||
@@ -102,9 +108,10 @@ import {
|
|||||||
booleanList,
|
booleanList,
|
||||||
consumeLogCalculateStatusList,
|
consumeLogCalculateStatusList,
|
||||||
consumeLogStatusList,
|
consumeLogStatusList,
|
||||||
consumeLogTypeList, isAnchorList
|
consumeLogTypeList,
|
||||||
|
isAnchorList
|
||||||
} from '@/constant/statusMap'
|
} from '@/constant/statusMap'
|
||||||
import {getConsumeLog} from "@/api/cai/consumeLog";
|
import {getConsumeLog, getConsumeLogTraceId} from "@/api/cai/consumeLog";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "UserInfo",
|
name: "UserInfo",
|
||||||
@@ -139,7 +146,13 @@ export default {
|
|||||||
this.open = true;
|
this.open = true;
|
||||||
this.id = id;
|
this.id = id;
|
||||||
getConsumeLog(this.id).then(response => {
|
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:{};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,14 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="链路号" prop="traceId">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.traceId"
|
||||||
|
placeholder="请输入链路号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -106,6 +114,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="分销时间" align="center" prop="opCreate" width="180" />
|
<el-table-column label="分销时间" align="center" prop="opCreate" width="180" />
|
||||||
|
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button
|
<el-button
|
||||||
@@ -165,7 +174,8 @@ export default {
|
|||||||
unionUsercode: undefined,
|
unionUsercode: undefined,
|
||||||
oneUsercode: undefined,
|
oneUsercode: undefined,
|
||||||
targetUsercode: undefined,
|
targetUsercode: undefined,
|
||||||
sourceUsercode: undefined
|
sourceUsercode: undefined,
|
||||||
|
traceId: undefined
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
94
src/views/cai/guardLog/guard-log-info.vue
Normal file
94
src/views/cai/guardLog/guard-log-info.vue
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog title="守护流水详情" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
|
||||||
|
<el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
|
||||||
|
<el-descriptions-item label="赠送蜜瓜号">
|
||||||
|
{{info.fromUsercode}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="赠送手机号" :span="2">
|
||||||
|
{{info.fromMobile}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="接受蜜瓜号">
|
||||||
|
{{info.toUsercode}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="接受手机号" :span="2">
|
||||||
|
{{info.toMobile}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="发生时间">
|
||||||
|
{{info.createTime}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="个数">
|
||||||
|
{{info.guardNum}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="守护值">
|
||||||
|
{{info.guardValue}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="单价">
|
||||||
|
{{info.guardPrice}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="链路号">
|
||||||
|
{{info.traceId}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
</el-descriptions>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {userGiftTypeList} from '@/constant/statusMap'
|
||||||
|
import {getGuardLog} from "@/api/cai/guardLog";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "UserInfo",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
userGiftTypeList,
|
||||||
|
CS: {
|
||||||
|
'text-align': 'center', //文本居中
|
||||||
|
'min-width': '250px', //最小宽度
|
||||||
|
'word-break': 'break-all' //过长时自动换行
|
||||||
|
},
|
||||||
|
LS: {
|
||||||
|
// 'color': '#000',
|
||||||
|
'text-align': 'center',
|
||||||
|
// 'font-weight': '600',
|
||||||
|
'height': '40px',
|
||||||
|
// 'background-color': 'rgba(255, 97, 2, 0.1)',
|
||||||
|
'min-width': '110px',
|
||||||
|
'word-break': 'keep-all'
|
||||||
|
},
|
||||||
|
open:false,
|
||||||
|
info:{},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
init(id){
|
||||||
|
this.open = true;
|
||||||
|
getGuardLog(id).then(response => {
|
||||||
|
this.info = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
traceIdInit(traceId){
|
||||||
|
this.open = true;
|
||||||
|
getGuardLogByTraceId(traceId).then(response => {
|
||||||
|
this.info = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.el-row {
|
||||||
|
margin-bottom: -15px;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
/* .el-card {
|
||||||
|
min-width: 100%;
|
||||||
|
height: 80%; // 高度要设置百分比才可以
|
||||||
|
margin-right: 20px;
|
||||||
|
transition: all .5s;
|
||||||
|
}*/
|
||||||
|
</style>
|
||||||
@@ -33,6 +33,14 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="链路号" prop="traceId">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.traceId"
|
||||||
|
placeholder="请输入链路号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -53,16 +61,23 @@
|
|||||||
<el-table-column label="个数" align="center" prop="guardNum" />
|
<el-table-column label="个数" align="center" prop="guardNum" />
|
||||||
<el-table-column label="守护值" align="center" prop="guardValue" />
|
<el-table-column label="守护值" align="center" prop="guardValue" />
|
||||||
<el-table-column label="单价" align="center" prop="guardPrice" />
|
<el-table-column label="单价" align="center" prop="guardPrice" />
|
||||||
|
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-info"
|
icon="el-icon-info"
|
||||||
v-if="scope.row.consumerLogId"
|
v-if="scope.row.traceId"
|
||||||
@click="handleConsumerLog(scope.row)"
|
@click="handleConsumerLog(scope.row)"
|
||||||
>分销记录
|
>分销记录
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-info"
|
||||||
|
@click="handleInfo(scope.row)"
|
||||||
|
>详情</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -75,21 +90,24 @@
|
|||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
|
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
|
||||||
|
<guard-log-info v-if="guardLogInfoVisible" ref="guardLogInfo"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {listGuardLog} from "@/api/cai/guardLog";
|
import {listGuardLog} from "@/api/cai/guardLog";
|
||||||
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
|
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
|
||||||
|
import GuardLogInfo from "@/views/cai/guardLog/guard-log-info";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "GuardLog",
|
name: "GuardLog",
|
||||||
components: {
|
components: {
|
||||||
ConsumeLogInfo
|
ConsumeLogInfo,GuardLogInfo
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
consumeLogInfoVisible: false,
|
consumeLogInfoVisible: false,
|
||||||
|
guardLogInfoVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
@@ -112,6 +130,7 @@ export default {
|
|||||||
toMobile: undefined,
|
toMobile: undefined,
|
||||||
fromUsercode: undefined,
|
fromUsercode: undefined,
|
||||||
fromMobile: undefined,
|
fromMobile: undefined,
|
||||||
|
traceId:undefined,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -147,9 +166,15 @@ export default {
|
|||||||
handleConsumerLog(row) {
|
handleConsumerLog(row) {
|
||||||
this.consumeLogInfoVisible = true
|
this.consumeLogInfoVisible = true
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.consumeLogInfo.init(row.consumerLogId)
|
this.$refs.consumeLogInfo.traceIdInit(row.traceId)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
handleInfo(row){
|
||||||
|
this.guardLogInfoVisible = true
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.guardLogInfo.init(row.id)
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -54,13 +54,6 @@
|
|||||||
<el-table-column label="守护值" align="center" prop="guardValue" />
|
<el-table-column label="守护值" align="center" prop="guardValue" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-info"
|
|
||||||
@click="handleConsumerLog(scope.row)"
|
|
||||||
>分销记录
|
|
||||||
</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -76,7 +69,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { listGuardTotal, getGuardTotal, delGuardTotal, addGuardTotal, updateGuardTotal } from "@/api/cai/guardTotal";
|
import {listGuardTotal} from "@/api/cai/guardTotal";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "GuardTotal",
|
name: "GuardTotal",
|
||||||
@@ -136,8 +129,6 @@ export default {
|
|||||||
this.single = selection.length!==1
|
this.single = selection.length!==1
|
||||||
this.multiple = !selection.length
|
this.multiple = !selection.length
|
||||||
},
|
},
|
||||||
handleConsumerLog(row) {
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -36,6 +36,14 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="链路号" prop="traceId">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.traceId"
|
||||||
|
placeholder="请输入链路号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -48,7 +56,7 @@
|
|||||||
|
|
||||||
<el-table v-loading="loading" :data="rechargeOrderList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="rechargeOrderList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column label="订单号" align="center" prop="orderNo" />
|
<el-table-column label="订单号" align="center" prop="orderNo" show-overflow-tooltip/>
|
||||||
<el-table-column label="蜜瓜号" align="center" prop="usercode" />
|
<el-table-column label="蜜瓜号" align="center" prop="usercode" />
|
||||||
<el-table-column label="昵称" align="center" prop="nickname" />
|
<el-table-column label="昵称" align="center" prop="nickname" />
|
||||||
<el-table-column label="手机" align="center" prop="mobile" />
|
<el-table-column label="手机" align="center" prop="mobile" />
|
||||||
@@ -81,8 +89,17 @@
|
|||||||
<cai-dict-tag :options="booleanList" :value="scope.row.admin" />
|
<cai-dict-tag :options="booleanList" :value="scope.row.admin" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
|
||||||
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-info"
|
||||||
|
v-if="scope.row.traceId && scope.row.admin===false"
|
||||||
|
@click="handleConsumerLog(scope.row)"
|
||||||
|
>分销记录
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
@@ -100,6 +117,7 @@
|
|||||||
:limit.sync="queryParams.pageSize"
|
:limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
|
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
|
||||||
<recharge-order-info v-if="rechargeOrderInfoVisible" ref="rechargeOrderInfo" />
|
<recharge-order-info v-if="rechargeOrderInfoVisible" ref="rechargeOrderInfo" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -116,17 +134,19 @@ import {
|
|||||||
yesOrNoList
|
yesOrNoList
|
||||||
} from '@/constant/statusMap'
|
} from '@/constant/statusMap'
|
||||||
import RechargeOrderInfo from "@/views/cai/rechargeOrder/recharge-order-info";
|
import RechargeOrderInfo from "@/views/cai/rechargeOrder/recharge-order-info";
|
||||||
|
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "RechargeOrder",
|
name: "RechargeOrder",
|
||||||
components:{
|
components:{
|
||||||
RechargeOrderInfo
|
RechargeOrderInfo,ConsumeLogInfo
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
|
genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
|
||||||
payStatusList,
|
payStatusList,
|
||||||
rechargeOrderInfoVisible: false,
|
rechargeOrderInfoVisible: false,
|
||||||
|
consumeLogInfoVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
@@ -148,7 +168,8 @@ export default {
|
|||||||
payStatus: undefined,
|
payStatus: undefined,
|
||||||
usercode: undefined,
|
usercode: undefined,
|
||||||
mobile: undefined,
|
mobile: undefined,
|
||||||
orderNo: undefined
|
orderNo: undefined,
|
||||||
|
traceId: undefined
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -181,6 +202,12 @@ export default {
|
|||||||
this.single = selection.length!==1
|
this.single = selection.length!==1
|
||||||
this.multiple = !selection.length
|
this.multiple = !selection.length
|
||||||
},
|
},
|
||||||
|
handleConsumerLog(row) {
|
||||||
|
this.consumeLogInfoVisible = true
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.consumeLogInfo.traceIdInit(row.traceId)
|
||||||
|
})
|
||||||
|
},
|
||||||
handleInfo(row) {
|
handleInfo(row) {
|
||||||
this.rechargeOrderInfoVisible = true
|
this.rechargeOrderInfoVisible = true
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
|
|||||||
@@ -46,6 +46,9 @@
|
|||||||
<el-descriptions-item label="appid">
|
<el-descriptions-item label="appid">
|
||||||
{{info.appid}}
|
{{info.appid}}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="链路号">
|
||||||
|
{{info.traceId}}
|
||||||
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="第三方回调数据" :span="3">
|
<el-descriptions-item label="第三方回调数据" :span="3">
|
||||||
{{info.returnContent}}
|
{{info.returnContent}}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
@@ -63,7 +66,7 @@ import {
|
|||||||
platformTypeList,
|
platformTypeList,
|
||||||
yesOrNoList
|
yesOrNoList
|
||||||
} from '@/constant/statusMap'
|
} from '@/constant/statusMap'
|
||||||
import { getRechargeOrder } from '@/api/cai/rechargeOrder'
|
import {getRechargeOrder, getRechargeOrderByTraceId} from '@/api/cai/rechargeOrder'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "UserInfo",
|
name: "UserInfo",
|
||||||
@@ -100,6 +103,12 @@ export default {
|
|||||||
this.info = response.data;
|
this.info = response.data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
traceIdInit(traceId){
|
||||||
|
this.open = true;
|
||||||
|
getRechargeOrderByTraceId(traceId).then(response => {
|
||||||
|
this.info = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -33,6 +33,14 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="链路号" prop="traceId">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.traceId"
|
||||||
|
placeholder="请输入链路号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
@@ -63,16 +71,23 @@
|
|||||||
<el-table-column label="礼物价格" align="center" prop="giftPrice"/>
|
<el-table-column label="礼物价格" align="center" prop="giftPrice"/>
|
||||||
<el-table-column label="礼物数量" align="center" prop="giftCount"/>
|
<el-table-column label="礼物数量" align="center" prop="giftCount"/>
|
||||||
<el-table-column label="礼物总额" align="center" prop="giftAmount"/>
|
<el-table-column label="礼物总额" align="center" prop="giftAmount"/>
|
||||||
|
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-info"
|
icon="el-icon-info"
|
||||||
v-if="scope.row.consumerLogId"
|
v-if="scope.row.traceId"
|
||||||
@click="handleConsumerLog(scope.row)"
|
@click="handleConsumerLog(scope.row)"
|
||||||
>分销记录
|
>分销记录
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-info"
|
||||||
|
@click="handleInfo(scope.row)"
|
||||||
|
>详情</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -85,6 +100,7 @@
|
|||||||
@pagination="getList"
|
@pagination="getList"
|
||||||
/>
|
/>
|
||||||
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
|
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
|
||||||
|
<user-gift-info v-if="userGiftInfoVisible" ref="userGiftInfo" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -92,16 +108,18 @@
|
|||||||
import {listUserGift} from "@/api/cai/userGift";
|
import {listUserGift} from "@/api/cai/userGift";
|
||||||
import {userGiftTypeList} from "@/constant/statusMap";
|
import {userGiftTypeList} from "@/constant/statusMap";
|
||||||
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
|
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
|
||||||
|
import UserGiftInfo from "@/views/cai/userGift/user-gift-info";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "UserGift",
|
name: "UserGift",
|
||||||
components: {
|
components: {
|
||||||
ConsumeLogInfo
|
ConsumeLogInfo,UserGiftInfo
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
userGiftTypeList,
|
userGiftTypeList,
|
||||||
consumeLogInfoVisible: false,
|
consumeLogInfoVisible: false,
|
||||||
|
userGiftInfoVisible: false,
|
||||||
// 遮罩层
|
// 遮罩层
|
||||||
loading: true,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
@@ -125,6 +143,7 @@ export default {
|
|||||||
toMobile: undefined,
|
toMobile: undefined,
|
||||||
fromUsercode: undefined,
|
fromUsercode: undefined,
|
||||||
fromMobile: undefined,
|
fromMobile: undefined,
|
||||||
|
traceId: undefined
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -160,9 +179,15 @@ export default {
|
|||||||
handleConsumerLog(row) {
|
handleConsumerLog(row) {
|
||||||
this.consumeLogInfoVisible = true
|
this.consumeLogInfoVisible = true
|
||||||
this.$nextTick(() => {
|
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)
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
101
src/views/cai/userGift/user-gift-info.vue
Normal file
101
src/views/cai/userGift/user-gift-info.vue
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog title="礼物流水详情" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
|
||||||
|
<el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
|
||||||
|
<el-descriptions-item label="类型">
|
||||||
|
<cai-dict-tag :options="userGiftTypeList" :value="info.type"/>
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="发生时间">
|
||||||
|
{{info.createTime}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="礼物">
|
||||||
|
<image-preview :src="info.giftImg" :width="50" :height="50"/>
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="赠送蜜瓜号">
|
||||||
|
{{info.fromUsercode}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="赠送手机号" :span="2">
|
||||||
|
{{info.fromMobile}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="接受蜜瓜号">
|
||||||
|
{{info.toUsercode}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="接受手机号" :span="2">
|
||||||
|
{{info.toMobile}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="礼物价格">
|
||||||
|
{{info.giftPrice}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="礼物数量">
|
||||||
|
{{info.giftCount}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="礼物总额">
|
||||||
|
{{info.giftAmount}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="链路号">
|
||||||
|
{{info.traceId}}
|
||||||
|
</el-descriptions-item>
|
||||||
|
</el-descriptions>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {userGiftTypeList} from '@/constant/statusMap'
|
||||||
|
import {getUserGift, getUserGiftByTraceId} from "@/api/cai/userGift";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "UserInfo",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
userGiftTypeList,
|
||||||
|
activeName:['base','account','userAlbums'],
|
||||||
|
CS: {
|
||||||
|
'text-align': 'center', //文本居中
|
||||||
|
'min-width': '250px', //最小宽度
|
||||||
|
'word-break': 'break-all' //过长时自动换行
|
||||||
|
},
|
||||||
|
LS: {
|
||||||
|
// 'color': '#000',
|
||||||
|
'text-align': 'center',
|
||||||
|
// 'font-weight': '600',
|
||||||
|
'height': '40px',
|
||||||
|
// 'background-color': 'rgba(255, 97, 2, 0.1)',
|
||||||
|
'min-width': '110px',
|
||||||
|
'word-break': 'keep-all'
|
||||||
|
},
|
||||||
|
open:false,
|
||||||
|
info:{},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
init(id){
|
||||||
|
this.open = true;
|
||||||
|
getUserGift(id).then(response => {
|
||||||
|
this.info = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
traceIdInit(traceId){
|
||||||
|
this.open = true;
|
||||||
|
getUserGiftByTraceId(traceId).then(response => {
|
||||||
|
this.info = response.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.el-row {
|
||||||
|
margin-bottom: -15px;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
/* .el-card {
|
||||||
|
min-width: 100%;
|
||||||
|
height: 80%; // 高度要设置百分比才可以
|
||||||
|
margin-right: 20px;
|
||||||
|
transition: all .5s;
|
||||||
|
}*/
|
||||||
|
</style>
|
||||||
Reference in New Issue
Block a user