Authored by shuaiguo

Merge branch 'refs/heads/develop'

... ... @@ -42,7 +42,8 @@
:onSelect="selectRow"
@on-page-change="fetchData">
<template slot="footer" class="btns">
<i-button type="primary" @click="onBatchDelete">批量删除</i-button>
<!-- <i-button type="primary" @click="onBatchReject">批量驳回</i-button>-->
<i-button type="primary" @click="onBatchRefund">批量退款</i-button>
</template>
</LayoutTable>
<Modal
... ... @@ -361,6 +362,20 @@ export default {
this.fetchData();
this.ids = [];
},
async onBatchReject() {
if(!this.ids.length)
this.$Message.warning('请勾选驳回条目');
await api._get('/ufoPlatform/refundRecord/reject', {ids:this.ids.toString()});
this.fetchData();
this.ids = [];
},
async onBatchRefund() {
if(!this.ids.length)
this.$Message.warning('请勾选退款条目');
await api._get('/ufoPlatform/refundRecord/makePaid', {ids:this.ids.toString()});
this.fetchData();
this.ids = [];
},
async onExport() {
this.$Loading.start();
let param = {...this.filter};
... ... @@ -430,4 +445,4 @@ export default {
display: flex;
justify-content: flex-end;
}
</style>
\ No newline at end of file
</style>
... ...
... ... @@ -36,76 +36,93 @@
:data="data"
@on-page-change="onPageChange">
</LayoutTable>
<!--弹出框展示商家详情-->
<div class="popup-detail-wrapper" :class="{ show: isShowDetail}">
<i-card class="popup-detail-container">
<p slot="title">商家详情</p>
<!--弹出框展示商家详情-->
<div class="popup-detail-wrapper" :class="{ show: isShowDetail}">
<i-card class="popup-detail-container">
<p slot="title">商家详情</p>
<i-button slot="extra" class="btn-close" @click="closePopup">X</i-button>
<div class="pop-detail-content">
<i-row>
<i-col span="4" class="detail-title">UID</i-col>
<i-col span="8">{{detail.uid || '&nbsp;'}}</i-col>
<i-col span="4" class="detail-title">商家类型</i-col>
<i-col span="8">{{['','入驻卖家', '超级入驻', '', '普通卖家'][detail.entryType]}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">商家名称</i-col>
<i-col span="8">{{detail.certName || '--'}}</i-col>
<i-col span="4" class="detail-title">手机号</i-col>
<i-col span="8">{{detail.mobile || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">招商人员</i-col>
<i-col span="8">{{detail.investName || '--'}}</i-col>
<i-col span="4" class="detail-title">违规次数</i-col>
<i-col span="8">{{detail.breakRuleTimes || '0'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">账户余额</i-col>
<i-col span="8" style="color: red;">{{detail.money || '0.00'}}</i-col>
<i-col span="4" class="detail-title">入驻状态</i-col>
<i-col span="8">{{detail.validStatusDesc || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">入驻时间</i-col>
<i-col span="8">{{detail.enterTime || '--'}}</i-col>
<i-col span="4" class="detail-title">退出入驻时间</i-col>
<i-col span="8">{{detail.quitTime || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">身份证号</i-col>
<i-col span="20">{{detail.certNo || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title no-border-right" style="min-height: 150px;line-height: 150px;">身份证照片</i-col>
<i-col span="20" class="border-left" style="min-height: 150px;">
<img v-if="detail.idCardFrontUrl" class="cert-image" :src="detail.idCardFrontUrl">
<img v-if="detail.idCardBackUrl" class="cert-image" :src="detail.idCardBackUrl">
</i-col>
</i-row>
</div>
</i-card>
</div>
<!--弹出框绑定招商人员-->
<div class="popup-invist-wrapper" :class="{ show: isShowInvest}">
<i-card class="popup-invist-container">
<p slot="title">绑定招商人</p>
<i-button slot="extra" class="btn-close" @click="closePopup">X</i-button>
<div class="pop-detail-content">
<div class="popup-invist-content">
<i-row>
<i-col span="4" class="detail-title">UID</i-col>
<i-col span="8">{{detail.uid || '&nbsp;'}}</i-col>
<i-col span="4" class="detail-title">商家类型</i-col>
<i-col span="8">{{['','入驻卖家', '超级入驻', '', '普通卖家'][detail.entryType]}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">商家名称</i-col>
<i-col span="8">{{detail.certName || '--'}}</i-col>
<i-col span="4" class="detail-title">手机号</i-col>
<i-col span="8">{{detail.mobile || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">招商人员</i-col>
<i-col span="8">{{detail.investName || '--'}}</i-col>
<i-col span="4" class="detail-title">违规次数</i-col>
<i-col span="8">{{detail.breakRuleTimes || '0'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">账户余额</i-col>
<i-col span="8" style="color: red;">{{detail.money || '0.00'}}</i-col>
<i-col span="4" class="detail-title">入驻状态</i-col>
<i-col span="8">{{detail.validStatusDesc || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">入驻时间</i-col>
<i-col span="8">{{detail.enterTime || '--'}}</i-col>
<i-col span="4" class="detail-title">退出入驻时间</i-col>
<i-col span="8">{{detail.quitTime || '--'}}</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title">身份证号</i-col>
<i-col span="20">{{detail.certNo || '--'}}</i-col>
<i-col class="invist-title" span="8">招商人员</i-col>
<i-col span="16">
<input type="text" v-model="investInfo.investName" placeholder="请输入招商人" style="width: 80%">
</i-col>
</i-row>
<i-row>
<i-col span="4" class="detail-title no-border-right" style="min-height: 150px;line-height: 150px;">身份证照片</i-col>
<i-col span="20" class="border-left" style="min-height: 150px;">
<img v-if="detail.idCardFrontUrl" class="cert-image" :src="detail.idCardFrontUrl">
<img v-if="detail.idCardBackUrl" class="cert-image" :src="detail.idCardBackUrl">
<i-col span="24" style="text-align: center;">
<i-button type="success" @click="submitInvist">保存</i-button>
</i-col>
</i-row>
</div>
</i-card>
</div>
<!--弹出框绑定招商人员-->
<div class="popup-invist-wrapper" :class="{ show: isShowInvest}">
<i-card class="popup-invist-container">
<p slot="title">绑定招商人</p>
<i-button slot="extra" class="btn-close" @click="closePopup">X</i-button>
<div class="popup-invist-content">
<i-row>
<i-col class="invist-title" span="8">招商人员</i-col>
<i-col span="16">
<input type="text" v-model="investInfo.investName" placeholder="请输入招商人" style="width: 80%">
</i-col>
</i-row>
<i-row>
<i-col span="24" style="text-align: center;">
<i-button type="success" @click="submitInvist">保存</i-button>
</i-col>
</i-row>
</div>
</i-card>
</div>
</div>
<!--弹出框展示卖家升级-->
<Modal
v-model="isShowPlus"
title="升级入驻卖家PLUS"
:footer-hide='true'
width="500"
>
<Form>
<FormItem>
确定升级,确认以后不能撤销
</FormItem>
<FormItem class="btn-container">
<Button type="default" class="btn" @click="onPlusCancel">取消</Button>
<Button type="primary" class="btn" @click="onPlusSubmit">确认</Button>
</FormItem>
</Form>
</Modal>
</LayoutContent>
</template>
... ... @@ -138,6 +155,8 @@ export default {
nowSelectedRow: {},
isShowDetail: false, // 显示详情弹框
isShowInvest: false, // 显示绑定招商人员
isShowPlus: false, // 显示卖家升级框
applyPlusUid: '', // 升级卖家uid
columns: [{
title: 'UID',
key: 'uid',
... ... @@ -208,6 +227,30 @@ export default {
title: '入驻状态',
align: 'center',
key: 'validStatusDesc',
width: 90
}, {
title: '操作人',
align: 'center',
key: 'operatorName',
width: 90
}, {
title: '操作时间',
align: 'center',
key: 'updateTime',
width: 90
}, {
title: '操作',
align: 'center',
width: 100,
render: (h, {row}) => {
return (
<div>
{(row.entryType === 1) ?
(<i-button type="default" size="small" onClick={() => this.onPopupPlusModal(row)}>卖家升级</i-button>) :
<i-button type="text" size="small">-</i-button>}
</div>
);
}
}, /*{
title: '招商人员',
align: 'center',
... ... @@ -352,7 +395,6 @@ export default {
api._post('/ufoPlatform/storedSeller/saveInvestUser', this.investInfo).then(result => {
if (result.code === 200) {
// this.nowSelectedRow.investName = this.investInfo.investName;
this.closePopup();
this.fetchData(this.filter, this.page);
this.$Modal.info({
... ... @@ -385,6 +427,33 @@ export default {
validStatus: parseInt(params.validStatus) >= 0 ? params.validStatus : void 0,
entryType: parseInt(params.entryType) >= 0 ? params.entryType : void 0,
};
},
onPopupPlusModal(row) {
this.isShowPlus = true;
this.applyPlusUid = row.uid;
},
async onPlusSubmit() {
this.isShowPlus = false;
this.$Loading.start();
const result = await api._get('/ufoPlatform/storedSeller/applyEntryPlus', {
uid: this.applyPlusUid
});
if (result.code === 200) {
// 升级成功重新获取数据刷新页面
this.fetchData(this.filter, this.page);
result.message && this.$Message.success(result.message);
this.$Loading.finish();
} else {
result.message && this.$Message.warning(result.message);
this.$Loading.error();
}
},
onPlusCancel() {
this.isShowPlus = false;
}
},
};
... ... @@ -438,6 +507,16 @@ export default {
margin: 100px auto;
}
.btn-container {
margin-top: 60px;
}
.btn {
width: 45%;
height: 34px;
margin-right: 15px;
}
.ivu-row:hover {
background-color: lightblue;
}
... ...