diff --git a/dist.zip b/dist.zip deleted file mode 100644 index c337e0d..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/api/form.js b/src/api/form.js index 617d3f3..d4e920b 100644 --- a/src/api/form.js +++ b/src/api/form.js @@ -83,7 +83,7 @@ export const payAgentUser = { // 更新密钥 upGoogleCaptcha: (data) => { return request({ - url: '/system/user/upGoogleCaptcha?userId='+data.userId, + url: '/system/user/upGoogleCaptcha?userId=' + data.userId, method: 'PUT', headers: { Authorization: "Bearer " + getToken(), @@ -811,6 +811,13 @@ export const payDfOrder = { * 商户代付订单管理 */ export const payOutOrder = { + //点击审核 + orderReview: (data) => { + return request({ + url: '/order/TransferOrder/orderReview?' + qs.stringify(data), + method: 'post', + }) + }, // 获取该卡商绑定的银行卡列表（区分代收代付） getCarddealerCardList: (query) => { return request({ diff --git a/src/views/carddealer/carddealer/index.vue b/src/views/carddealer/carddealer/index.vue index 5770ccf..7230e44 100644 --- a/src/views/carddealer/carddealer/index.vue +++ b/src/views/carddealer/carddealer/index.vue @@ -637,9 +637,6 @@ export default { debug: true, }, methods: { - sortNum(a, b) {//排序方法 - return a - b; - }, tableRowClassName({ row, rowIndex }) { if (row.limitReceiveStatus == 1) { return "greenOrder"; @@ -710,16 +707,17 @@ export default { this.form = response.data; type == 'limitReceiveStatus' ? this.form.limitReceiveStatus = row.limitReceiveStatus : this.form.status = row.status payCard.updateInfo(this.form).then((res) => { - if (type == 'limitReceiveStatus') { - if (row.limitReceiveStatus == 1) { - this.infoList.unshift(...this.infoList.splice(rowIndex, 1)) - } - if (row.limitReceiveStatus == 2) { - this.getList() - } - } + // if (type == 'limitReceiveStatus') { + // if (row.limitReceiveStatus == 1) { + // this.infoList.unshift(...this.infoList.splice(rowIndex, 1)) + // } + // if (row.limitReceiveStatus == 2) { + // this.getList() + // } + // } if (res.code === 200) { this.$message.success("编辑成功"); + this.getList() } }); }); @@ -736,33 +734,18 @@ export default { this.allList = response.data }); }, - timerHandler(queryParams) { - listCarddealer(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => { - this.infoList = response.rows; - // this.infoList = this.infoList.sort(this.sortNum)//调用排序方法 - for (var i = 0; i < this.infoList.length; i++) { - if (this.infoList[i].limitReceiveStatus == 1) { - this.ceshi = this.infoList[i] //声明一个对象保存符合要求的数据 - this.infoList.splice(i, 1)//先把符合条件的数据从当前数组中删除 - this.infoList.unshift(this.ceshi)//通过unshift函数把符合要求的数据放到第一位 - } - } - this.total = Number(response.total); - }); - }, /** 查询码商列表 */ getList() { this.loading = true; listCarddealer(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => { this.infoList = response.rows; - // this.infoList = this.infoList.sort(this.sortNum)//调用排序方法 - for (var i = 0; i < this.infoList.length; i++) { - if (this.infoList[i].limitReceiveStatus == 1) { - this.ceshi = this.infoList[i] //声明一个对象保存符合要求的数据 - this.infoList.splice(i, 1)//先把符合条件的数据从当前数组中删除 - this.infoList.unshift(this.ceshi)//通过unshift函数把符合要求的数据放到第一位 - } - } + // for (var i = 0; i < this.infoList.length; i++) { + // if (this.infoList[i].limitReceiveStatus == 1) { + // this.ceshi = this.infoList[i] //声明一个对象保存符合要求的数据 + // this.infoList.splice(i, 1)//先把符合条件的数据从当前数组中删除 + // this.infoList.unshift(this.ceshi)//通过unshift函数把符合要求的数据放到第一位 + // } + // } this.total = Number(response.total); this.loading = false; this.startTimer(this.queryParams) @@ -914,6 +897,7 @@ export default { amount: amount, googleCode: this.form.googleCode, type: this.form.type, + remark:this.form.remark }).then((response) => { this.msgSuccess("操作成功"); this.openBalance = false; @@ -925,6 +909,7 @@ export default { amount: amount, googleCode: this.form.googleCode, type: this.form.type, + remark:this.form.remark }).then((response) => { this.msgSuccess("操作成功"); this.openBalance = false; diff --git a/src/views/merchant/merchant/index.vue b/src/views/merchant/merchant/index.vue index fdac2b3..46c87be 100644 --- a/src/views/merchant/merchant/index.vue +++ b/src/views/merchant/merchant/index.vue @@ -84,11 +84,29 @@ + + + + @@ -228,6 +246,9 @@ + + +
保 存 @@ -301,6 +322,17 @@ + + + + + + + + + {{ form.googleCaptcha }} 重 置 @@ -436,6 +468,8 @@ export default { form: {}, // 表单校验 rules: { + whetherReviewApi:[{ required: true, message: "请选择是否api提单审核", trigger: "blur" }], + whetherReview:[{ required: true, message: "请选择是否手动提单审核", trigger: "blur" }], code: [{ required: true, message: "请输入谷歌验证码", trigger: "blur" }], ipWhiteList: [{ required: true, message: "请输入IP", trigger: "blur" }], payapiWhitelistIp: [{ required: true, message: "请输入代付IP", trigger: "blur" }], @@ -531,13 +565,21 @@ export default { this.$forceUpdate() }, // 状态有效无效 - switchStatusChange(row) { + switchStatusChange(row, type) { + this.reset() const id = row.id || this.ids; this.form = row; - this.form.status = row.status; + if (type == 'status') { + this.form.status = row.status; + } else if (type == 'whetherReview') { + this.form.whetherReview = row.whetherReview; + } else { + this.form.whetherReviewApi = row.whetherReviewApi; + } updateMerchant(this.form).then((res) => { if (res.code === 200) { this.$message.success("编辑成功"); + this.getList() } }); }, @@ -634,7 +676,7 @@ export default { // 余额 handleBalance(row) { this.reset(); - this.title = "修改佣金"; + this.title = "修改余额"; this.form.id = row.id; this.openBalance = true; }, @@ -769,6 +811,7 @@ export default { type: this.form.type, amount: amount, googleCode: this.form.googleCode, + remark: this.form.remark, }).then((response) => { this.msgSuccess("操作成功"); this.openBalance = false; diff --git a/src/views/order/TransferOrder/index.vue b/src/views/order/TransferOrder/index.vue index 8a09c05..87f23f5 100644 --- a/src/views/order/TransferOrder/index.vue +++ b/src/views/order/TransferOrder/index.vue @@ -42,6 +42,13 @@ + + + + + + @@ -106,7 +113,7 @@ - + + + + + @@ -182,6 +201,9 @@ {{ detailInfoList.orderNo }} + + {{ detailInfoList.batchNo }} + {{ detailInfoList.merchantOrderNo }} @@ -217,6 +239,18 @@ {{ detailInfoList.cardNumber }} + + + + + {{ detailInfoList.orderStatus == 1 ? '待支付' : detailInfoList.orderStatus == 2 ? '支付成功' : '支付失败' }} @@ -369,8 +403,8 @@ export default { orderSource: null, orderStatus: null, platformChannelId: null, - downstreamMerchantOrderNo: null - + downstreamMerchantOrderNo: null, + batchNo: null }, showAll: [ { @@ -651,8 +685,8 @@ export default { orderSource: this.queryParams.orderSource, orderStatus: this.queryParams.orderStatus, platformChannelId: this.queryParams.platformChannelId, - downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo - + downstreamMerchantOrderNo: this.queryParams.downstreamMerchantOrderNo, + batchNo: this.queryParams.batchNo } listTransferOrder(this.addSESDateRange(queryParams, this.dateRange, 'type')).then(response => { this.infoList = response.rows; @@ -792,30 +826,41 @@ export default {