Skip to content

S
shop-new
提交 191a0075 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

Merge branch 'dev_hxz' into test

上级 c969b0c3 09a910fa
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1295 行增加 和 263 行删除
src/api/module/bankcard.js
浏览文件 @ 191a0075
import request from '@/utils/request' import request from '@/utils/request'
// 查询bankcard列表 // 查询bankcard列表
export function listBankcard(query) { // export function listBankcard(query) {
return request({ // return request({
url: '/system/bankcard/list', // url: '/system/bankcard/list',
method: 'get', // method: 'get',
params: query // params: query
}) // })
} // }
// 查询银行名称列表 // 查询银行名称列表
export function listBankname(query) { // export function listBankname(query) {
// return request({
// url: '/system/bankcard/getBankList',
// method: 'get',
// params: query
// })
// }
// 查询bankcard详细
// export function getBankcard (id) {
// return request({
// url: '/system/bankcard/edit?id='+id,
// method: 'get'
// })
// }
// 修改bankcard
// export function updateBankcard(data) {
// return request({
// url: '/system/bankcard/edit',
// method: 'post',
// data: data
// })
// }
// 删除bankcard
// export function delBankcard(ids) {
// return request({
// url: '/system/bankcard/delete',
// method: 'delete',
// data:{id:ids}
// })
// }
// 我的资产 页面 所有数据
export function getMyAssetListData(data) {
return request({
url: '/local/assets/list',
method: 'post',
data: data
})
}
// 获取 主体信息
export function getOrganizationData(query) {
return request({ return request({
url: '/system/bankcard/getBankList', url: '/local/getOrganization',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询bankcard详细 // 新增 银行卡 信息
export function getBankcard (id) { export function addBankcardData(data) {
return request({ return request({
url: '/system/bankcard/edit?id='+id, url: '/system/bank/add',
method: 'get' method: 'post',
data: data
}) })
} }
// 获取 银行卡 详情
export function getBankDetailsData(data) {
return request({
url: '/system/bank/detail',
method: 'post',
data: data
})
}
// 新增bankcard // 获取商户银行卡列表
export function addBankcard(data) { export function getBankcardListData(data) {
return request({ return request({
url: '/system/bankcard/add', url: '/system/bank/list',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改bankcard // 账户 删除
export function updateBankcard(data) { export function delBankcardData(data) {
return request({ return request({
url: '/system/bankcard/edit', url: '/system/bank/delete',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 删除bankcard // 收支明细 列表
export function delBankcard(ids) { export function getBalanceList(data) {
return request({ return request({
url: '/system/bankcard/delete', url: '/local/asset/getSellerBalanceLogList',
method: 'delete', method: 'post',
data:{id:ids} data: data
}) })
}
// 提现记录 列表
export function getWithdrawData(data) {
return request({
url: '/system/withdrawlog/list',
method: 'post',
data: data
})
}
// 提现记录 详情
export function getWithdrawlogDetailsData(data) {
return request({
url: '/system/withdrawlog/info',
method: 'post',
data: data
})
}
// 导出商品明细
export function exportGoodsDetailsData(data) {
return request({
url: '/system/withdrawlog/exportWithdrawOrderGoods',
method: 'post',
data: data
})
}
// 获取 所有物流信息
export function getExpressListData(query) {
return request({
url: '/system/order/expressList',
method: 'get',
params: query
})
}
// 上传 发票 图片
export function upLoadImg (data) {
return request({
url: '/system/goodsNew/uploadImage',
method: 'post',
data: data
});
}
// 补充发票
export function addInvoiceData (data) {
return request({
url: '/system/withdrawlog/updateInvoice',
method: 'post',
data: data
});
} }
src/views/system/asset/balance/index.vue
浏览文件 @ 191a0075
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small"> <el-form class="form-params" :model="queryParams" :inline="true" size="small">
<el-form-item label="关联订单单号：" prop="order_sn"> <el-form-item label="关联订单单号：" prop="order_sn">
<el-input <el-input
v-model="queryParams.order_sn" v-model="queryParams.order_sn"
placeholder="请输入关联订单单号" placeholder="请输入关联订单单号"
clearable clearable
style="width:230px"
/></el-form-item> /></el-form-item>
<el-form-item label="查询时间" prop="searchTime"> <el-form-item label="查询时间" prop="searchTime">
...@@ -22,8 +23,8 @@ ...@@ -22,8 +23,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="变动类型" prop="refund_type"> <el-form-item label="变动类型" prop="change_type">
<el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable > <el-select v-model="queryParams.change_type" placeholder="全部类型" clearable style="width:130px">
<el-option label="全部类型" :value="0"></el-option> <el-option label="全部类型" :value="0"></el-option>
<el-option label="增加" :value="1" ></el-option> <el-option label="增加" :value="1" ></el-option>
<el-option label="减少" :value="2"></el-option> <el-option label="减少" :value="2"></el-option>
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-table v-loading="loading" :height="tableHeight" :data="assetList"> <el-table v-loading="loading" :height="tableHeight" :data="balanceList">
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>--> <!-- <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>-->
<!-- </template>--> <!-- </template>-->
...@@ -45,12 +46,21 @@ ...@@ -45,12 +46,21 @@
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="流水订单号" align="center" prop="BalanceSn"/> <el-table-column label="流水订单号" align="center" prop="balance_sn"></el-table-column>
<el-table-column label="变动金额" align="center" prop="ChangeMoney"/> <el-table-column label="变动金额" align="center" prop="change_money" width="130">
<el-table-column label="变动类型" align="center" :formatter="formatType" prop="ChangeType"/> <template slot-scope="scope">
<el-table-column label="变动描述" align="center" :formatter="formatType" prop="ChangeType1"/> <span>{{ scope.row.change_money / 100 }}</span>
<el-table-column label="变动时间" align="center" :formatter="formatTime" prop="AddTime"/> </template>
<el-table-column label="关联订单单号" align="center" prop="Des"/> </el-table-column>
<el-table-column label="变动类型" align="center" prop="change_type" width="130">
<template slot-scope="scope">
<span v-if="scope.row.change_type == 1">增加</span>
<span v-if="scope.row.change_type == 2">减少</span>
</template>
</el-table-column>
<el-table-column label="变动描述" align="center" prop="des"></el-table-column>
<el-table-column label="变动时间" align="center" :formatter="formatTime" prop="add_time"></el-table-column>
<el-table-column label="关联订单单号" align="center" prop="links_des"></el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<div class="footer_pagination"> <div class="footer_pagination">
...@@ -69,13 +79,7 @@ ...@@ -69,13 +79,7 @@
</div> </div>
</template> </template>
<script> <script>
import { import { getBalanceList } from '@/api/module/bankcard'
listAsset,
getAsset,
delAsset,
addAsset,
updateAsset
} from '@/api/module/asset'
import { import {
dateFormat dateFormat
} from '@/utils' } from '@/utils'
...@@ -90,16 +94,17 @@ ...@@ -90,16 +94,17 @@
sellerId: 0, sellerId: 0,
order_sn: '', order_sn: '',
searchTime: [], searchTime: [],
refund_type: '' change_type: ''
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
assetList: [], balanceList: [],
}; };
}, },
created() { created() {
this.queryParams.sellerId = this.$store.state.user.sellerid // this.queryParams.sellerId = this.$store.state.user.sellerid
/** 查询 收支明细 列表 */
this.getList(); this.getList();
this.$nextTick(() => { this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
...@@ -108,7 +113,7 @@ ...@@ -108,7 +113,7 @@
watch: { watch: {
fullHeight(val) { fullHeight(val) {
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 120; this.tableHeight = val - formHeight - 100;
} }
}, },
methods: { methods: {
...@@ -117,28 +122,27 @@ ...@@ -117,28 +122,27 @@
let params = { let params = {
page: this.currentPage, page: this.currentPage,
limit: this.pageSize, limit: this.pageSize,
seller_id: this.seller_id,
} }
if(this.queryParams.order_sn != '') { if(this.queryParams.order_sn != '') {
params['order_sn'] = this.queryParams.order_sn params['order_sn'] = this.queryParams.order_sn
} }
if(this.queryParams.refund_type == '') { if(this.queryParams.change_type == '') {
params['refund_type'] = 0 params['change_type'] = 0
}else { }else {
params['refund_type'] = this.queryParams.refund_type params['change_type'] = this.queryParams.change_type
} }
if( this.queryParams.searchTime && this.queryParams.searchTime.length == 2) { if( this.queryParams.searchTime && this.queryParams.searchTime.length == 2) {
params['created_start_time'] = new Date(this.queryParams.searchTime[0]).getTime() / 1000; params['start_time'] = new Date(this.queryParams.searchTime[0]).getTime() / 1000;
params['created_end_time'] = new Date(this.queryParams.searchTime[1]).getTime() / 1000; params['end_time'] = new Date(this.queryParams.searchTime[1]).getTime() / 1000;
} }
listAsset(params).then(res => { getBalanceList(params).then(res => {
if(res.code == 1) { if(res.code == 1) {
this.assetList = res.data.list; this.balanceList = res.data.list;
this.total = res.data.total; this.total = res.data.count;
}else { }else {
let msg = res.message ? res.message : '查询失败' let msg = res.message ? res.message : '查询失败'
this.$message({type: 'error', message: msg}); this.$message({type: 'error', message: msg});
...@@ -149,10 +153,10 @@ ...@@ -149,10 +153,10 @@
/** 重置 搜索条件 */ /** 重置 搜索条件 */
resetQuery() { resetQuery() {
this.queryParams = { // 查询参数 this.queryParams = { // 查询参数
sellerId: 0, sellerId: 0,
order_sn: '', order_sn: '',
searchTime: [], searchTime: [],
refund_type: '' change_type: ''
} }
this.currentPage = 1 this.currentPage = 1
this.pageSize = 20 this.pageSize = 20
...@@ -171,20 +175,9 @@ ...@@ -171,20 +175,9 @@
handleQuery() { handleQuery() {
}, },
/********************************** */ /** 时间格式化 */
formatType(row) {
var types = row.ChangeType
var optDes = ''
if (types == 1) {
optDes = "增加"
} else if (types == 2) {
optDes = "减少"
}
return optDes
},
//格式化时间
formatTime(row) { formatTime(row) {
let Time = row.AddTime; let Time = row.add_time;
let newtime = ""; let newtime = "";
if (Time > 0) { if (Time > 0) {
newtime = dateFormat(Time * 1000, "Y-m-d H:i:s"); newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
...@@ -194,7 +187,7 @@ ...@@ -194,7 +187,7 @@
//格式化价格 //格式化价格
formatMoney(row) { formatMoney(row) {
var nm = 0; var nm = 0;
var money = row.ChangeMoney; var money = row.change_money;
if (money > 0) { if (money > 0) {
nm = money / 1000 nm = money / 1000
} }
......
src/views/system/asset/explain/index.vue 0 → 100644
浏览文件 @ 191a0075
<template>
<div class="app-container">
<el-card class="box-card explain">
<div class="pre-details">
<p>1、账户资产说明</p>
<p>（1）、当前余额：是指您当前账户里面的余额，该部分余额包含【可提现余额】和【提现中的金额】</p>
<p>（2）、可提现余额：是指您可以操作提现的余额</p>
<p>（3）、提现中的金额：是指您当前进行中的提现金额，提现中的金额在完成打款前会暂时冻结，直到打款完成</p>
<p>三者的关系：当前余额=可提现余额+提现中的金额</p>
</div>
<div class="pre-details">
<p>2、相关名词说明</p>
<p>（1）、结算：指订单完成并过售后期，订单金额结算到您的可提现余额账户中</p>
<p>（2）、提现：指您操作提现，将可提现余额账户中的钱提现至您的银行卡中</p>
</div>
<div class="pre-details">
<p>3、提现账户管理</p>
<p>（1）、提现账户必须为企业对公账户，且对公账户名称与认证的主体一致</p>
<p>（2）、提现账户不支持个人账户，不支持支付宝账户</p>
<p>（3）、对公账户最多只能添加三个</p>
</div>
<div class="pre-details">
<p>4、提现要求</p>
<p>（1）、提供正确、合规的企业对公账户</p>
<p>（2）、提供提现金额对应订单商品的发票及明细</p>
<p>（3）、提现金额最低要求为100元，如果您的可提现账户余额不足100元，则暂无法提现</p>
</div>
<div class="pre-details">
<p>5、订单结算</p>
<p>（1）、订单自发货日期，10天后自动确认收货，15天后过售后期，订单金额自动结算到可提现余额账户中</p>
<p>（2）、售后中的订单、失效订单等订单不会结算</p>
</div>
<div class="pre-details">
<p>6、操作提现</p>
<p>（1）、在【我的资产】中，点击提现按钮，根据提示验证支付密码及手机验证码，验证通过后即可提现</p>
<p>（2）、操作提现时，提现的金额为全部的可提现余额，不允许手动输入金额</p>
<p>（3）、操作提现时，会产生提现手续费，手续费收取标准请参照本文第5条</p>
<p>（4）、实际到账金额=提现金额-提现手续费，请以实际到账为准</p>
</div>
<div class="pre-details">
<p>7、提现周期</p>
<p>（1）、工作日当日12:00之前提交的提现，1-5个工作日内安排打款，工作日当日12:00之后提现的金额，次日开始，1-5个工作日安排打款，节假日顺延</p>
<p>（2）、银行卡到账时间：打款后0-2个工作日到账 （具体请咨询所属银行）</p>
</div>
<div class="pre-details">
<p>8、提现收续费收取标准</p>
<p>
<img width="712px" src="@/assets/image/withdraw-charges.png" alt="">
</p>
</div>
<div class="pre-details">
<p>9、提现流程</p>
<p>
<img width="712px" src="@/assets/image/withdraw-process.png" alt="">
</p>
</div>
<div class="pre-details">
<p>10、发票信息</p>
<p>（1）、发票抬头：北京胜天半子科技有限公司</p>
<p>（2）、纳税人识别号：911016513F1ECWX</p>
</div>
<div class="pre-details">
<p>11、联系我们</p>
<p>（1）、客服电话：4000-188-199</p>
<p>（2）、公司地址：北京市丰台区诺德中心一期四号楼21层</p>
</div>
</el-card>
</div>
</template>
<script>
export default {
name: "Explain",
data() {
return {}
}
}
</script>
<style scoped>
/deep/.explain .el-card__body {
height: 100%;
/*padding: 30px 20px;*/
overflow: auto;
color: #333;
font-size: 14px;
}
.pre-details {
margin: 40px 50px;
}
</style>
src/views/system/asset/wddetails.vue 0 → 100644
浏览文件 @ 191a0075
差异被折叠。
src/views/system/asset/withdraw/index.vue
浏览文件 @ 191a0075
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div class="card-header-title">
<p style="font-size: 18px; float:left;">提现申请</p> <span class="blue-block blue-block-goods-title"></span>操作提现
</div>
<el-form ref="form" :model="form" size="small" :rules="rules" label-width="150px" class="ruleFormshop">
<el-form-item label="当前余额：">
{{sellerinfo.Balance}} 元
</el-form-item>
<el-form-item label="可提现金额：">
{{drawableCash}} 元
</el-form-item>
<el-form-item label="提现中的金额：">
{{sellerinfo.FrozenMoney}} 元
</el-form-item>
<!-- <el-form-item label="手续费：">-->
<!-- 当前手续费为{{newFee}}元-->
<!-- </el-form-item>-->
<el-form-item label="提现至：" prop="bank_id">
<el-select v-model="form.bank_id" placeholder="选择到账银行卡" style="width:420px;">
<el-option v-for="item in banklist" :key="item.Id"
:label="item.bank_name ? item.bank_name : item.bank_account_name"
:value="item.id"></el-option>
</el-select>
<p class="withdraw-tip">
您还没有账户，<span>去添加</span>
</p>
</el-form-item>
<el-form-item label="提现金额：" prop="amount">
<el-input v-model="form.amount"
@blur="onInputBlur($event)"
placeholder="提现金额大于等于100"
style="width:420px;"/>
<p class="withdraw-tip">
不允许手动输入，提现金额必须为全部的可提现余额，<br/>
手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）
</p>
</el-form-item>
<el-form-item label="支付密码：" prop="pwd">
<el-input v-model="form.pwd" type="password" placeholder="请输入提现密码" style="width:420px;"/>
<p class="withdraw-tip">
忘记支付密码？重新设定
</p>
</el-form-item>
<el-form-item label="短信验证码：" prop="verifycode" class="spe-code-con-item">
<el-input v-model="form.verifycode" placeholder="验证码" style="width:420px;">
<template slot="append">
<span v-show="show" @click="getCheckCodeFn">获取验证码</span>
<span v-show="!show" class="count">{{count}} s</span>
</template>
</el-input>
</el-form-item>
</el-form>
<div class="footer-btn">
<el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div> </div>
<el-row>
<el-col :span="24" class="card-box">
<!-- <span>商户信息</span> -->
<el-form ref="form" :model="form" :rules="rules" label-width="150px" class="ruleFormshop">
<el-form-item label="当前余额">
{{sellerinfo.Balance}}元
</el-form-item>
<el-form-item label="提现中的金额">
{{sellerinfo.FrozenMoney}}元
</el-form-item>
<el-form-item label="可提现金额">
{{drawableCash}}元
</el-form-item>
<el-form-item label="手续费">
当前手续费为{{newFee}}元
</el-form-item>
<el-form-item label="银行卡" prop="bank_id">
<el-select v-model="form.bank_id" placeholder="选择到账银行卡" style="width:260px;">
<el-option v-for="item in banklist" :key="item.Id"
:label="item.bank_name ? item.bank_name : item.bank_account_name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="提现金额" prop="amount">
<el-input v-model="form.amount"
@blur="onInputBlur($event)"
placeholder="提现金额大于等于100"
style="width:260px;"/>
</el-form-item>
<el-form-item label="短信验证码" prop="verifycode" class="spe-code-con-item">
<el-input v-model="form.verifycode" placeholder="验证码" style="width:260px;">
<template slot="append">
<span v-show="show" @click="getCheckCodeFn">获取验证码</span>
<span v-show="!show" class="count">{{count}} s</span>
</template>
</el-input>
</el-form-item>
<el-form-item label="支付密码" prop="pwd">
<el-input v-model="form.pwd" type="password" placeholder="请输入提现密码" style="width:260px;"/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm" :disabled="inSureCashOut">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</el-form-item>
</el-form>
</el-col>
</el-row>
</el-card> </el-card>
</div> </div>
</template> </template>
...@@ -300,17 +314,61 @@ ...@@ -300,17 +314,61 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped > <style scoped>
/deep/ .el-card__body{
height: 100%;
overflow: hidden;
}
.ruleFormshop { .ruleFormshop {
width: 500px; height: calc(100% - 110px);
margin: 20px 0 0 120px; padding: 20px;
overflow-y: auto;
}
.ruleFormshop .el-form-item {
margin-bottom: 26px;
} }
/deep/ .spe-code-con-item .el-input-group__append { /deep/ .spe-code-con-item .el-input-group__append {
cursor: pointer; cursor: pointer;
} }
/deep/ .el-card__body{
height :calc(100% - 50px); .card-header-title {
overflow-y: scroll; height: 45px;
line-height: 35px;
font-size: 18px;
color: #000;
font-weight: bold;
border-bottom: 1px solid #eee;
}
.blue-block {
display: inline-block;
width: 5px;
height: 24px;
background: #3A84FF;
margin: 0 9px 0 0;
border-radius: 2px;
vertical-align: middle;
}
.footer-btn {
width: calc(100% + 40px);
margin-left: -20px;
padding-top: 20px;
height:65px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
box-shadow: 0 -8px 9px 1px rgba(51, 51, 51, 0.06);
}
.withdraw-tip {
font-size:12px;
color: #999;
margin: 5px;
line-height: 26px;
} }
</style> </style>
src/views/system/asset/withdrawlog/index.vue
浏览文件 @ 191a0075
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small"> <el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small">
<el-form-item label="提现时间" prop="searchTime"> <el-form-item label="提现时间" prop="cashTime">
<el-date-picker <el-date-picker
v-model="queryParams.searchTime" v-model="queryParams.cashTime"
type="daterange" type="daterange"
align="left" align="left"
unlink-panels unlink-panels
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="提现状态" prop="refund_type"> <el-form-item label="提现状态" prop="pay_status">
<el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable > <el-select v-model="queryParams.pay_status" placeholder="全部类型" clearable >
<el-option label="全部类型" :value="0"></el-option> <el-option label="全部类型" :value="-1"></el-option>
<el-option label="打款中" :value="1" ></el-option> <el-option label="打款中" :value="0" ></el-option>
<el-option label="提现成功" :value="2"></el-option> <el-option label="提现成功" :value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -35,13 +35,23 @@ ...@@ -35,13 +35,23 @@
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提现流水单号" align="center" prop="ReflectSn"/> <el-table-column label="提现流水单号" align="center" prop="sn" width="240"></el-table-column>
<el-table-column label="提现时间" :formatter="formatTime" align="center" prop="AddTime"/> <el-table-column label="提现时间" :formatter="formatTime" align="center" prop="created_time"></el-table-column>
<el-table-column label="提现金额" :formatter="formatFee" align="center" prop="ReflectMoney"/> <el-table-column label="提现金额" :formatter="formatFee" align="center" prop="amount"></el-table-column>
<el-table-column label="手续费" :formatter="formatFee" align="center" prop="Fee"/> <el-table-column label="手续费" :formatter="formatFee" align="center" prop="service_fee"></el-table-column>
<el-table-column label="实际到账金额" :formatter="formatFee" align="center" prop="AfterReflectMoney"/> <el-table-column label="实际到账金额" :formatter="formatFee" align="center" prop="real_amount"></el-table-column>
<el-table-column label="提现状态" align="center" :formatter="formatType" prop="Status"/> <el-table-column label="提现状态" align="center" prop="pay_status">
<el-table-column label="开票状态" align="center" prop="kpzt"></el-table-column> <template slot-scope="scope">
<span v-if="scope.row.pay_status == 0">打款中</span>
<span v-if="scope.row.pay_status == 1">提现成功</span>
</template>
</el-table-column>
<el-table-column label="开票状态" align="center" prop="invoice_status">
<template slot-scope="scope">
<span v-if="scope.row.invoice_status == 0">未开票</span>
<span v-if="scope.row.invoice_status == 1">已开票</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="viewDetails(scope.row)">详情</el-button> <el-button type="text" @click="viewDetails(scope.row)">详情</el-button>
...@@ -57,50 +67,46 @@ ...@@ -57,50 +67,46 @@
<!-- <el-table-column label="提现审核说明" align="center" prop="Des"/>--> <!-- <el-table-column label="提现审核说明" align="center" prop="Des"/>-->
</el-table> </el-table>
<pagination <!-- 分页 -->
v-show="total>0" <div class="footer_pagination">
:total="total" <el-pagination
:page.sync="queryParams.page" background
:limit.sync="queryParams.limit" @size-change="handleSizeChange"
@pagination="getList" @current-change="handleCurrentChange"
/> :current-page="currentPage"
:page-sizes="[20, 40, 60, 80, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import { import { getWithdrawData } from '@/api/module/bankcard'
listWithdrawlog,
getWithdrawlog,
delWithdrawlog,
addWithdrawlog,
updateWithdrawlog
} from '@/api/module/withdrawlog'
import { dateFormat } from '@/utils' import { dateFormat } from '@/utils'
export default { export default {
name: "withdrawlog", name: "withdrawlog",
data() { data() {
return { return {
sellerId: 0,
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
// 查询参数 // 查询参数
queryParams: { // 查询参数 queryParams: { // 查询参数
sellerId: 0, sellerId: 0,
searchTime: [], cashTime: [],
refund_type: '' pay_status: ''
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
withdrawlogList: [], withdrawlogList: [],
}; };
}, },
created() { created() {
this.sellerId = this.$store.state.user.sellerid; /** 查询 提现记录 列表 */
this.getList(); this.getList();
this.$nextTick(() => { this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
...@@ -109,14 +115,27 @@ ...@@ -109,14 +115,27 @@
watch: { watch: {
fullHeight(val) { fullHeight(val) {
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 120; this.tableHeight = val - formHeight - 100;
} }
}, },
methods: { methods: {
// 列表 /** 查询 提现记录 列表 */
getList() { getList() {
this.queryParams.sellerId = this.sellerId; let params = {
listWithdrawlog(this.queryParams).then(response => { page: this.currentPage,
limit: this.pageSize,
}
if (this.queryParams.pay_status === 0 || this.queryParams.pay_status === 1) {
params['pay_status'] = this.queryParams.pay_status
}
if( this.queryParams.cashTime && this.queryParams.cashTime.length == 2) {
params['start_time'] = new Date(this.queryParams.cashTime[0]).getTime() / 1000;
params['end_time'] = new Date(this.queryParams.cashTime[1]).getTime() / 1000;
}
getWithdrawData(params).then(response => {
if (response) { if (response) {
this.withdrawlogList = response.data.data; this.withdrawlogList = response.data.data;
this.total = response.data.count; this.total = response.data.count;
...@@ -125,16 +144,20 @@ ...@@ -125,16 +144,20 @@
} }
}); });
}, },
// 详情 /** 详情 跳转 */
viewDetails(row) { viewDetails(row) {
const indexId = row.id ? row.id : 0;
this.$router.push({
path: '/system/asset/wddetails',
query: { withdrawId: indexId }
});
}, },
/** 重置 搜索条件 */ /** 重置 搜索条件 */
resetQuery() { resetQuery() {
this.queryParams = { // 查询参数 this.queryParams = { // 查询参数
sellerId: 0, sellerId: 0,
searchTime: [], cashTime: [],
refund_type: '' pay_status: ''
} }
this.currentPage = 1 this.currentPage = 1
this.pageSize = 20 this.pageSize = 20
...@@ -149,60 +172,45 @@ ...@@ -149,60 +172,45 @@
this.getList() this.getList()
}, },
//------------------------- /** 格式化价格 返回原数据是 分，除以100 */
//格式化状态
formatType(row) {
var types = row.Status
var optDes = ''
if (types == 1) {
optDes = "提现成功"
} else if (types == 2) {
optDes = "提现失败"
} else if (types == 0) {
optDes = "提现申请中"
}
return optDes
},
//格式化价格
formatFee(row, s, value, i) { formatFee(row, s, value, i) {
var nm = 0 let nm = 0,
var money = value money = value
if (money > 0) { if (money > 0) {
nm = money / 100 nm = money / 100
} }
return nm return nm
}, },
//格式化时间 /** 格式化时间 */
formatTime(row) { formatTime(row) {
var Time = row.AddTime var Time = row.created_time
var newtime = "" var newtime = ""
if (Time > 0) { if (Time > 0) {
newtime = dateFormat(Time * 1000, "Y-m-d H:i:s"); newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
} }
return newtime return newtime
}, },
/** 查询商户提现列表 */
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; // this.open = false;
this.reset(); // this.reset();
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { // this.form = {
id: null, // id: null,
reflect_sn: null, // reflect_sn: null,
reflect_money: null, // reflect_money: null,
status: 0, // status: 0,
des: null, // des: null,
seller_bank_id: null, // seller_bank_id: null,
add_time: null, // add_time: null,
fee: null, // fee: null,
seller_id: null, // seller_id: null,
after_reflect_money: null // after_reflect_money: null
}; // };
this.resetForm("form"); // this.resetForm("form");
}, },
} //methods结束 } //methods结束
...@@ -212,4 +220,10 @@ ...@@ -212,4 +220,10 @@
.form-params .el-form-item { .form-params .el-form-item {
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
/* 分页 */
.footer_pagination {
text-align: center;
margin-top: 15px;
}
</style> </style>
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 191a0075
...@@ -379,9 +379,9 @@ ...@@ -379,9 +379,9 @@
if(res.data) { if(res.data) {
urlObj.url = res.data.image_url; urlObj.url = res.data.image_url;
this.goodsImgFileList.push(urlObj); this.goodsImgFileList.push(urlObj);
this.goodsImgFileList.forEach(item=> { // this.goodsImgFileList.forEach(item=> {
this.goodsInfoForm.imgs.push(item.url) // this.goodsInfoForm.imgs.push(item.url)
}) // })
this.$message({type:'success',message:'图片上传成功'}); this.$message({type:'success',message:'图片上传成功'});
// 只清除一次，不浪费哦 // 只清除一次，不浪费哦
if(this.goodsImgFileList.length === 1) { if(this.goodsImgFileList.length === 1) {
......
src/views/system/order/index.vue
浏览文件 @ 191a0075
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
}, },
// 表格合并 列单元格 // 表格合并 列单元格
arraySpanMethod({ row, column, rowIndex, columnIndex }) { arraySpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex > 4) { // 用于设置要合并开始的列号 if (columnIndex > 3) { // 用于设置要合并开始的列号
if (rowIndex === 0) { // 用于设置合并开始的行号 if (rowIndex === 0) { // 用于设置合并开始的行号
return { return {
rowspan: 100,　　　　　// 合并的行数 rowspan: 100,　　　　　// 合并的行数
......
src/views/system/retreat/edit.vue
浏览文件 @ 191a0075
...@@ -475,12 +475,12 @@ ...@@ -475,12 +475,12 @@
console.log("确定的类型",type); console.log("确定的类型",type);
let params = { let params = {
order_refund_sn: 0 order_refund_sn: this.asGoodId
}; };
// type为1，则为，仅退款的 同意退款 操作 // type为1，则为，仅退款的 同意退款 操作
if(this.onlyIsAgree == 1) { if(this.onlyIsAgree == 1) {
params.order_refund_sn = this.asGoodId
// 1、为了更好提示，2、预防后期接口解耦 // 1、为了更好提示，2、预防后期接口解耦
agreeRefundData(params).then(res=> { agreeRefundData(params).then(res=> {
let msg = '' let msg = ''
...@@ -520,7 +520,7 @@ ...@@ -520,7 +520,7 @@
// type 为3，则为，退货退款的 同意退货退款,发送地址 // type 为3，则为，退货退款的 同意退货退款,发送地址
if(this.onlyIsAgree == 3) { if(this.onlyIsAgree == 3) {
// console.log('地址信息：',this.order_refund_address); debugger
if( this.order_refund_address == '' ) { if( this.order_refund_address == '' ) {
this.$message({type:'warning',message: '请选择地址信息'}); this.$message({type:'warning',message: '请选择地址信息'});
return return
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论