chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

渠道调整、提现充值手续费调整

Browse Source
This commit is contained in:
墨大叔 2024-07-29 10:33:34 +08:00
parent beba60aa92
commit 9540661a2c
11 changed files with 270 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/system/smUser.js
View File

@ -44,15 +44,6 @@ export function updateSmUser(data) {
}) })
} }
// 修改普通用户服务费
export function updateServiceRate(data) {
return request({
url: '/system/smUser/updateServiceRate',
method: 'put',
data: data
})
}
// 删除普通用户信息 // 删除普通用户信息
export function delSmUser(userId) { export function delSmUser(userId) {
return request({ return request({
@ -60,3 +51,11 @@ export function delSmUser(userId) {
method: 'delete' method: 'delete'
}) })
} }
// 重置用户服务费
export function resetSmUserService(userId) {
return request({
url: `/system/smUser/${userId}/resetService`,
method: 'put'
})
}

8
src/utils/constants.js
View File

@ -2,3 +2,11 @@
export const views = { export const views = {
user: 'user', user: 'user',
} }
// 收款账户类型
export const AccountType = {
BANK_CARD: "1", // 银行卡
WECHAT: "2", // 微信
ALI_PAY: "3", // 支付宝
OFFLINE_IMAGE: "4" // 线下收款
}

14
src/utils/mixins.js
View File

@ -65,7 +65,7 @@ export const $showColumns = {
}, },
} }
// 服务费 // 充值服务费
export const $serviceType = { export const $serviceType = {
computed: { computed: {
// 服务费单位 // 服务费单位
@ -76,3 +76,15 @@ export const $serviceType = {
} }
} }
} }
// 提现服务费
export const $withdrawServiceType = {
computed: {
// 提现服务费单位
withdrawServiceUnit() {
return (type) => {
return type === '2' ? '元' : '%';
}
}
}
}

95
src/views/ss/account/index.vue
View File

@ -78,6 +78,7 @@
:prop="column.key" :prop="column.key"
:align="column.align" :align="column.align"
:min-width="column.minWidth" :min-width="column.minWidth"
:width="column.width"
:sort-orders="orderSorts" :sort-orders="orderSorts"
:sortable="column.sortable" :sortable="column.sortable"
:show-overflow-tooltip="column.overflow" :show-overflow-tooltip="column.overflow"
@ -86,12 +87,18 @@
<template v-if="column.key === 'accountId'"> <template v-if="column.key === 'accountId'">
{{d.row[column.key]}} {{d.row[column.key]}}
</template> </template>
<template v-if="column.key === 'accountNo'"> <template v-else-if="column.key === 'accountNo'">
<template v-if="d.row.accountType === '4'"> <template v-if="d.row.accountType === AccountType.OFFLINE_IMAGE">
<image-preview :src="d.row.accountNo" :width="50" :height="50"/> <image-preview :src="d.row.accountNo" :width="50" :height="50"/>
</template> </template>
<template v-else-if="d.row.accountType === AccountType.BANK_CARD">
{{d.row.name}} / {{d.row.mobile}} / {{d.row.idCard}} / {{d.row.accountNo}}
</template>
<template v-else>{{d.row.accountNo}}</template> <template v-else>{{d.row.accountNo}}</template>
</template> </template>
<template v-else-if="column.key === 'accountType'">
<dict-tag :options="dict.type.account_type" :value="d.row.accountType"/>
</template>
<template v-else> <template v-else>
{{d.row[column.key]}} {{d.row[column.key]}}
</template> </template>
@ -126,29 +133,31 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改用户账户对话框 --> <!-- 添加或修改收款账户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户id" prop="userId"> <el-form-item label="用户" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户id" /> <user-input v-model="form.userId" :disabled="hasView(views.user)"/>
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="name"> <el-form-item label="账户类型" prop="accountType">
<el-select v-model="form.accountType" style="width: 100%">
<el-option v-for="dict in dict.type.account_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="name" v-if="form.accountType === AccountType.BANK_CARD">
<el-input v-model="form.name" placeholder="请输入姓名" /> <el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
<el-form-item label="身份证" prop="idCard"> <el-form-item label="手机号" prop="mobile" v-if="form.accountType === AccountType.BANK_CARD">
<el-input v-model="form.idCard" placeholder="请输入身份证" />
</el-form-item>
<el-form-item label="卡号" prop="accountNo">
<el-input v-model="form.accountNo" placeholder="请输入卡号" />
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号" /> <el-input v-model="form.mobile" placeholder="请输入手机号" />
</el-form-item> </el-form-item>
<el-form-item label="卡面信息json" prop="cardInfo"> <el-form-item label="身份证" prop="idCard" v-if="form.accountType === AccountType.BANK_CARD">
<el-input v-model="form.cardInfo" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.idCard" placeholder="请输入身份证" />
</el-form-item> </el-form-item>
<el-form-item label="是否默认账户" prop="isDefault"> <el-form-item label="收款码" prop="accountNo" v-if="form.accountType === AccountType.OFFLINE_IMAGE">
<el-input v-model="form.isDefault" placeholder="请输入是否默认账户" /> <image-upload v-model="form.accountNo" :limit="1"/>
</el-form-item>
<el-form-item label="账户" prop="accountNo" v-else>
<el-input v-model="form.accountNo" placeholder="请输入账户（微信openId/银行卡号/支付宝账号）" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -162,6 +171,8 @@
<script> <script>
import { listAccount, getAccount, delAccount, addAccount, updateAccount } from "@/api/ss/account"; import { listAccount, getAccount, delAccount, addAccount, updateAccount } from "@/api/ss/account";
import { $showColumns, $view } from '@/utils/mixins' import { $showColumns, $view } from '@/utils/mixins'
import UserInput from '@/components/Business/SmUser/UserInput.vue'
import { AccountType } from '@/utils/constants'
// 默认排序字段 // 默认排序字段
const defaultSort = { const defaultSort = {
@ -171,7 +182,14 @@ const defaultSort = {
export default { export default {
name: "Account", name: "Account",
computed: {
AccountType() {
return AccountType
}
},
components: { UserInput },
mixins: [$showColumns, $view], mixins: [$showColumns, $view],
dicts: ['account_type'],
props: { props: {
query: { query: {
type: Object, type: Object,
@ -184,11 +202,10 @@ export default {
return { return {
// 字段列表 // 字段列表
columns: [ columns: [
{key: 'accountId', visible: true, label: '账户id', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'accountId', visible: true, label: '账户id', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
{key: 'userName', visible: true, label: '用户名称', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'userName', visible: true, label: '用户名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'accountType', visible: true, label: '账户类型', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'accountType', visible: true, label: '账户类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'accountNo', visible: true, label: '收款账户', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'accountNo', visible: true, label: '收款账户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'isDefault', visible: true, label: '是否默认账户', minWidth: null, sortable: true, overflow: false, align: 'center'},
], ],
// 排序方式 // 排序方式
orderSorts: ['ascending', 'descending', null], orderSorts: ['ascending', 'descending', null],
@ -204,7 +221,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 用户账户表格数据 // 收款账户表格数据
accountList: [], accountList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
@ -231,6 +248,24 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
userId: [
{ required: true, message: "用户不能为空", trigger: "blur" }
],
accountType: [
{ required: true, message: "账户类型不能为空", trigger: "blur" }
],
accountNo: [
{ required: true, message: "账户不能为空", trigger: "blur" }
],
mobile: [
{ required: true, message: "手机号不能为空", trigger: "blur" }
],
idCard: [
{ required: true, message: "身份证不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "姓名不能为空", trigger: "blur" }
],
} }
}; };
}, },
@ -253,7 +288,7 @@ export default {
} }
this.getList(); this.getList();
}, },
/** 查询用户账户列表 */ /** 查询收款账户列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listAccount(this.queryParams).then(response => { listAccount(this.queryParams).then(response => {
@ -271,16 +306,12 @@ export default {
reset() { reset() {
this.form = { this.form = {
accountId: null, accountId: null,
userId: null, userId: this.query.userId,
accountType: null, accountType: null,
name: null, name: null,
idCard: null, idCard: null,
accountNo: null, accountNo: null,
mobile: null, mobile: null,
createTime: null,
createBy: null,
cardInfo: null,
isDefault: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -304,7 +335,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加用户账户"; this.title = "添加收款账户";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -313,7 +344,7 @@ export default {
getAccount(accountId).then(response => { getAccount(accountId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改用户账户"; this.title = "修改收款账户";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -339,7 +370,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const accountIds = row.accountId || this.ids; const accountIds = row.accountId || this.ids;
this.$modal.confirm('是否确认删除用户账户编号为"' + accountIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除收款账户编号为"' + accountIds + '"的数据项？').then(function() {
return delAccount(accountIds); return delAccount(accountIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();

139
src/views/system/channel/index.vue
View File

@ -26,17 +26,17 @@
<!-- v-hasPermi="['system:channel:add']"--> <!-- v-hasPermi="['system:channel:add']"-->
<!-- >新增</el-button>--> <!-- >新增</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['system:channel:edit']" <!-- v-hasPermi="['system:channel:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="danger"--> <!-- type="danger"-->
@ -64,16 +64,33 @@
<el-table v-loading="loading" :data="channelList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="channelList" @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="name"/> <el-table-column label="渠道名称" align="center" prop="name"/>
<el-table-column label="是否启用" align="center" prop="enabled"> <el-table-column label="启用充值" align="center" prop="enabled">
<template slot-scope="d"> <template slot-scope="d">
<el-switch v-model="d.row.enabled" @change="(nv) => {onChangeEnabled(d.row, nv)}"/> <el-switch v-model="d.row.enabled" @change="(nv) => {onChangeEnabled(d.row, nv)}"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="服务费费率" align="center" prop="serviceRate"> <el-table-column label="设备服务费" align="center" prop="serviceRate">
<template slot-scope="d">{{d.row.serviceRate | money}}%</template> <template slot-scope="d">
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate | money}} {{serviceUnit(d.row.serviceType)}}
</template>
</el-table-column> </el-table-column>
<el-table-column label="成本率" align="center" prop="costRate"> <el-table-column label="充值成本率" align="center" prop="costRate">
<template slot-scope="d">{{d.row.costRate | money}}%</template> <template slot-scope="d">{{d.row.costRate | money}} %</template>
</el-table-column>
<el-table-column label="启用提现" align="center" prop="withdrawEnabled">
<template slot-scope="d">
<el-switch v-model="d.row.withdrawEnabled" @change="(nv) => {onChangeWithdrawEnabled(d.row, nv)}"/>
</template>
</el-table-column>
<el-table-column label="提现服务费" align="center" prop="withdrawServiceRate">
<template slot-scope="d">
<dict-tag :options="dict.type.withdraw_service_type" :value="d.row.withdrawServiceType"/>
{{d.row.withdrawServiceRate | money}} {{withdrawServiceUnit(d.row.withdrawServiceType)}}
</template>
</el-table-column>
<el-table-column label="提现成本率" align="center" prop="withdrawCostRate">
<template slot-scope="d">{{d.row.withdrawCostRate | money}} %</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" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@ -105,19 +122,50 @@
<!-- 添加或修改充值渠道对话框 --> <!-- 添加或修改充值渠道对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="7em">
<el-form-item label="渠道名称" prop="name"> <form-col :span="span" label="渠道名称" prop="name">
<el-input v-model="form.name" placeholder="请输入渠道名称" disabled readonly/> <el-input v-model="form.name" placeholder="请输入渠道名称" disabled readonly/>
</el-form-item> </form-col>
<el-form-item label="是否启用" prop="enabled"> <form-col :span="span" label="启用充值" prop="enabled">
<el-switch v-model="form.enabled" /> <el-switch v-model="form.enabled" />
</el-form-item> </form-col>
<el-form-item label="服务费率" prop="serviceRate"> <form-col :span="span" label="设备服务费" prop="serviceRate">
<el-input-number v-model="form.serviceRate" controls-position="right" placeholder="请输入服务费费率%" :min="0" :precision="2"/> % <el-input v-model.number="form.serviceRate" :min="0" type="number">
</el-form-item> <template #prepend>
<el-form-item label="成本率" prop="costRate"> <el-select v-model="form.serviceType" style="width: 10em">
<el-input-number v-model="form.costRate" controls-position="right" placeholder="请输入服务费费率%" :min="0" :precision="2"/> % <el-option v-for="dict in dict.type.service_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-form-item> </el-select>
</template>
<template #append>
{{serviceUnit(form.serviceType)}}
</template>
</el-input>
</form-col>
<form-col :span="span" label="充值成本率" prop="costRate">
<el-input v-model.number="form.costRate" placeholder="请输入充值成本率" :min="0">
<template #append>%</template>
</el-input>
</form-col>
<form-col :span="span" label="启用提现" prop="withdrawEnabled">
<el-switch v-model="form.withdrawEnabled" />
</form-col>
<form-col :span="span" label="提现服务费" prop="withdrawServiceRate">
<el-input v-model.number="form.withdrawServiceRate" :min="0" type="number">
<template #prepend>
<el-select v-model="form.withdrawServiceType" style="width: 10em">
<el-option v-for="dict in dict.type.withdraw_service_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</template>
<template #append>
{{withdrawServiceUnit(form.withdrawServiceType)}}
</template>
</el-input>
</form-col>
<form-col :span="span" label="提现成本率" prop="withdrawCostRate">
<el-input v-model.number="form.withdrawCostRate" placeholder="请输入充值成本率" :min="0">
<template #append>%</template>
</el-input>
</form-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -129,11 +177,15 @@
<script> <script>
import { listChannel, getChannel, delChannel, addChannel, updateChannel } from "@/api/system/channel"; import { listChannel, getChannel, delChannel, addChannel, updateChannel } from "@/api/system/channel";
import { $serviceType, $withdrawServiceType } from '@/utils/mixins'
export default { export default {
name: "Channel", name: "Channel",
mixins: [$serviceType, $withdrawServiceType],
dicts: ['withdraw_service_type', 'service_type'],
data() { data() {
return { return {
span: 24,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -169,14 +221,23 @@ export default {
{required: true, message: '渠道名称不能为空', target: 'blur'} {required: true, message: '渠道名称不能为空', target: 'blur'}
], ],
enabled: [ enabled: [
{required: true, type: 'boolean', message: '是否启用不能为空', target: 'blur'} {required: true, type: 'boolean', message: '充值是否启用不能为空', target: 'blur'}
], ],
serviceRate: [ serviceRate: [
{required: true, type: 'number', message: '服务费率不能为空', target: 'blur'} {required: true, type: 'number', message: '设备服务费率不能为空', target: 'blur'}
], ],
costRate: [ costRate: [
{required: true, type: 'number', message: '成本率不能为空', target: 'blur'} {required: true, type: 'number', message: '充值成本率不能为空', target: 'blur'}
], ],
withdrawEnabled: [
{required: true, type: 'boolean', message: '提现是否启用不能为空', target: 'blur'}
],
withdrawServiceRate: [
{required: true, type: 'number', message: '提现服务费率不能为空', target: 'blur'}
],
withdrawCostRate: [
{required: true, type: 'number', message: '提现成本率不能为空', target: 'blur'}
]
} }
}; };
@ -185,13 +246,27 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
parseNumber(val) {
if (val == null) {
return null;
}
return parseFloat(val);
},
// 更新是否启用 // 更新是否启用
onChangeEnabled(row, enabled) { onChangeEnabled(row, enabled) {
if (row == null) { if (row == null) {
return this.$message.warning("参数错误"); return this.$message.warning("参数错误");
} }
updateChannel({channelId: row.channelId, enabled: enabled}).then(res => { updateChannel({channelId: row.channelId, enabled: enabled}).catch(() => {
this.getList(); row.enabled = !enabled;
})
},
onChangeWithdrawEnabled(row, enabled) {
if (row == null) {
return this.$message.warning("参数错误");
}
updateChannel({channelId: row.channelId, withdrawEnabled: enabled}).catch(() => {
row.withdrawEnabled = !enabled;
}) })
}, },
/** 查询充值渠道列表 */ /** 查询充值渠道列表 */

2
src/views/system/device/detail.vue
View File

@ -72,7 +72,7 @@
<store-link :name="deviceData.storeName" :id="deviceData.storeId"/> <store-link :name="deviceData.storeName" :id="deviceData.storeId"/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="服务费"> <el-descriptions-item label="服务费">
<template v-if="deviceData.serviceRate == null">跟随用户</template> <template v-if="deviceData.serviceRate == null || deviceData.serviceType == null">跟随用户</template>
<template v-else> <template v-else>
<dict-tag :options="dict.type.service_type" :value="deviceData.serviceType" size="mini"/> <dict-tag :options="dict.type.service_type" :value="deviceData.serviceType" size="mini"/>
{{deviceData.serviceRate}} {{serviceUnit(deviceData.serviceType)}} {{deviceData.serviceRate}} {{serviceUnit(deviceData.serviceType)}}

2
src/views/system/device/index.vue
View File

@ -175,7 +175,7 @@
</el-table-column> </el-table-column>
<el-table-column label="服务费" align="center" prop="serviceRate" > <el-table-column label="服务费" align="center" prop="serviceRate" >
<template slot-scope="d"> <template slot-scope="d">
<template v-if="d.row.serviceRate == null">跟随用户</template> <template v-if="d.row.serviceRate == null || d.row.serviceType == null">跟随用户</template>
<template v-else> <template v-else>
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/> <dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}} {{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}}

76
src/views/system/smUser/components/serviceRateForm.vue
View File

@ -1,76 +0,0 @@
<template>
<el-dialog title="修改服务费" :visible.sync="show" width="500px" append-to-body @open="open" @close="onCancel">
<el-form ref="serviceRateForm" :model="form" label-width="6em">
<el-form-item label="服务费费率" prop="serviceRate">
<el-input v-model="form.serviceRate" placeholder="请输入服务费费率" type="number">
<template #append>%</template>
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="onSubmit">确 定</el-button>
<el-button @click="onCancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { getSmUser, updateServiceRate } from '@/api/system/smUser'
export default {
name: 'serviceRateForm',
props: {
userId: {
type: String,
default: null,
},
show: {
type: Boolean,
default: false,
}
},
data() {
return {
form: {}
}
},
methods: {
onSubmit() {
this.$refs["serviceRateForm"].validate(valid => {
if (valid) {
this.$confirm("是否将其应用于该用户的所有设备？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.form.freshDevice = true;
this.updateRate();
}).catch(() => {
this.form.freshDevice = false;
this.updateRate();
})
}
});
},
onCancel() {
this.$emit("update:show", false);
},
updateRate() {
updateServiceRate(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.onCancel();
this.$emit('success');
});
},
open() {
getSmUser(this.userId).then(res => {
this.form = {
userId: res.data.userId,
serviceRate: res.data.serviceRate,
freshDevice: false
}
});
}
}
}
</script>

2
src/views/system/smUser/detail.vue
View File

@ -20,7 +20,7 @@
<el-descriptions-item label="总收入">{{userData.totalIncome | money | defaultValue}} 元</el-descriptions-item> <el-descriptions-item label="总收入">{{userData.totalIncome | money | defaultValue}} 元</el-descriptions-item>
<el-descriptions-item label="总提现">{{userData.withDrawlAmount | money | defaultValue}} 元</el-descriptions-item> <el-descriptions-item label="总提现">{{userData.withDrawlAmount | money | defaultValue}} 元</el-descriptions-item>
<el-descriptions-item label="服务费费率"> <el-descriptions-item label="服务费费率">
<template v-if="userData.serviceRate == null">跟随渠道</template> <template v-if="userData.serviceRate == null || userData.serviceType == null">跟随渠道</template>
<template v-else> <template v-else>
<dict-tag :options="dict.type.service_type" :value="userData.serviceType" size="mini"/> <dict-tag :options="dict.type.service_type" :value="userData.serviceType" size="mini"/>
{{userData.serviceRate}} {{serviceUnit(userData.serviceType)}} {{userData.serviceRate}} {{serviceUnit(userData.serviceType)}}

77
src/views/system/smUser/index.vue
View File

@ -33,6 +33,26 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备服务费类型" prop="serviceType" label-width="8em">
<el-select v-model="queryParams.serviceType" placeholder="请选择设备服务费类型" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.service_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="提现服务费类型" prop="withdrawServiceType" label-width="8em">
<el-select v-model="queryParams.withdrawServiceType" placeholder="请选择提现服务费类型" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.withdraw_service_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
@ -104,12 +124,19 @@
{{d.row.balance | money}} 元 {{d.row.balance | money}} 元
</template> </template>
<template v-else-if="column.key === 'serviceRate'"> <template v-else-if="column.key === 'serviceRate'">
<template v-if="d.row.serviceRate == null">跟随渠道</template> <template v-if="d.row.serviceRate == null || d.row.serviceType == null">跟随渠道</template>
<template v-else> <template v-else>
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/> <dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}} {{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}}
</template> </template>
</template> </template>
<template v-else-if="column.key === 'withdrawServiceRate'">
<template v-if="d.row.withdrawServiceRate == null || d.row.withdrawServiceType == null">跟随渠道</template>
<template v-else>
<dict-tag :options="dict.type.withdraw_service_type" :value="d.row.withdrawServiceType"/>
{{d.row.withdrawServiceRate}} {{withdrawServiceUnit(d.row.withdrawServiceType)}}
</template>
</template>
<template v-else-if="column.key === 'status'"> <template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.sm_user_status" :value="d.row.status"/> <dict-tag :options="dict.type.sm_user_status" :value="d.row.status"/>
</template> </template>
@ -190,10 +217,10 @@
<el-input v-model="form.phonenumber" placeholder="请输入手机号" :maxlength="11" show-word-limit <el-input v-model="form.phonenumber" placeholder="请输入手机号" :maxlength="11" show-word-limit
clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input> clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
</form-col> </form-col>
<form-col :span="span * 2" label="服务费" prop="serviceRate"> <form-col :span="span * 2" label="设备服务费" prop="serviceRate" label-width="7em">
<el-input v-model="form.serviceRate" placeholder="请输入服务费" type="number"> <el-input v-model="form.serviceRate" placeholder="请输入设备服务费" type="number">
<template #prepend> <template #prepend>
<el-select v-model="form.serviceType" placeholder="请选择服务费收取方式" style="width: 10em"> <el-select v-model="form.serviceType" placeholder="请选择设备服务费收取方式" style="width: 10em">
<el-option <el-option
v-for="dict in dict.type.service_type" v-for="dict in dict.type.service_type"
:key="dict.value" :key="dict.value"
@ -205,6 +232,21 @@
<template #append>{{serviceUnit(form.serviceType)}}</template> <template #append>{{serviceUnit(form.serviceType)}}</template>
</el-input> </el-input>
</form-col> </form-col>
<form-col :span="span * 2" label="提现服务费" prop="withdrawServiceRate" label-width="7em">
<el-input v-model="form.withdrawServiceRate" placeholder="请输入提现服务费" type="number">
<template #prepend>
<el-select v-model="form.withdrawServiceType" placeholder="请选择提现服务费收取方式" style="width: 10em">
<el-option
v-for="dict in dict.type.withdraw_service_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</template>
<template #append>{{withdrawServiceUnit(form.withdrawServiceType)}}</template>
</el-input>
</form-col>
<form-col :span="span * 2" label="备注" prop="remark"> <form-col :span="span * 2" label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" :maxlength="500" show-word-limit type="textarea"/> <el-input v-model="form.remark" placeholder="请输入备注" :maxlength="500" show-word-limit type="textarea"/>
</form-col> </form-col>
@ -222,9 +264,16 @@
</template> </template>
<script> <script>
import { listSmUser, getSmUser, addSmUser, updateSmUser, delSmUser, updateServiceRate } from '@/api/system/smUser' import {
import ServiceRateForm from '@/views/system/smUser/components/serviceRateForm.vue' listSmUser,
import { $serviceType, $showColumns } from '@/utils/mixins' getSmUser,
addSmUser,
updateSmUser,
delSmUser,
updateServiceRate,
resetSmUserService
} from '@/api/system/smUser'
import { $serviceType, $showColumns, $withdrawServiceType } from '@/utils/mixins'
import UserLink from '@/components/Business/SmUser/UserLink.vue' import UserLink from '@/components/Business/SmUser/UserLink.vue'
const defaultSort = { const defaultSort = {
@ -234,9 +283,9 @@ const defaultSort = {
export default { export default {
name: "SmUser", name: "SmUser",
mixins: [$showColumns, $serviceType], mixins: [$showColumns, $serviceType, $withdrawServiceType],
components: { UserLink, ServiceRateForm }, components: { UserLink },
dicts: ['sm_user_status', 'user_type', 'sys_user_sex', 'service_type'], dicts: ['sm_user_status', 'user_type', 'sys_user_sex', 'service_type', 'withdraw_service_type'],
computed: { computed: {
serviceUnit() { serviceUnit() {
return (type) => { return (type) => {
@ -259,7 +308,8 @@ export default {
{key: 'rechargeAmount', visible: true, label: '充值金额', align: 'center', minWidth: null, sortable: true}, {key: 'rechargeAmount', visible: true, label: '充值金额', align: 'center', minWidth: null, sortable: true},
{key: 'withDrawlAmount', visible: true, label: '提现金额', align: 'center', minWidth: null, sortable: true}, {key: 'withDrawlAmount', visible: true, label: '提现金额', align: 'center', minWidth: null, sortable: true},
{key: 'balance', visible: true, label: '账户余额', align: 'center', minWidth: null, sortable: true}, {key: 'balance', visible: true, label: '账户余额', align: 'center', minWidth: null, sortable: true},
{key: 'serviceRate', visible: true, label: '服务费', align: 'center', minWidth: null, sortable: true}, {key: 'serviceRate', visible: true, label: '设备服务费', align: 'center', minWidth: null, sortable: true},
{key: 'withdrawServiceRate', visible: true, label: '提现服务费', align: 'center', minWidth: null, sortable: true},
{key: 'storeCount', visible: true, label: '店铺数量', align: 'center', minWidth: null, sortable: false}, {key: 'storeCount', visible: true, label: '店铺数量', align: 'center', minWidth: null, sortable: false},
{key: 'deviceCount', visible: true, label: '设备数量', align: 'center', minWidth: null, sortable: false}, {key: 'deviceCount', visible: true, label: '设备数量', align: 'center', minWidth: null, sortable: false},
{key: 'deviceAdmin', visible: false, label: '设备管理员', align: 'center', minWidth: null, sortable: false}, {key: 'deviceAdmin', visible: false, label: '设备管理员', align: 'center', minWidth: null, sortable: false},
@ -338,10 +388,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.loading = true; this.loading = true;
updateServiceRate({ resetSmUserService(row.userId).then(res => {
userId: row.userId,
serviceRate: null
}).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success("重置成功"); this.$message.success("重置成功");
} }

7
src/views/system/withdraw/index.vue
View File

@ -62,11 +62,16 @@
{{d.row.arrivalAmount | money}} 元 {{d.row.arrivalAmount | money}} 元
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手续费" align="center"> <el-table-column label="服务费" align="center">
<template slot-scope="d"> <template slot-scope="d">
{{d.row.serviceCharge | money}} 元 {{d.row.serviceCharge | money}} 元
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="渠道成本" align="center">
<template slot-scope="d">
{{d.row.channelCost | money}} 元
</template>
</el-table-column>
<el-table-column label="时间" align="center" prop="createTime" width="180"/> <el-table-column label="时间" align="center" prop="createTime" width="180"/>
<el-table-column label="到账时间" align="center" prop="payTime" width="180"/> <el-table-column label="到账时间" align="center" prop="payTime" width="180"/>
<el-table-column label="打款渠道" align="center"> <el-table-column label="打款渠道" align="center">