diff --git a/.env.development b/.env.development index f79180a..466e777 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 商户管理系统 ENV = 'development' # 开发环境 - VUE_APP_BASE_API = 'http://192.168.31.182:8888' + VUE_APP_BASE_API = 'http://newpay-admin.weirui0755.com/stage-api' # 后台本地 # VUE_APP_BASE_API = 'http://newpay-admin.weirui0755.com/stage-api' diff --git a/src/App.vue b/src/App.vue index f745239..c9fdd75 100644 --- a/src/App.vue +++ b/src/App.vue @@ -32,6 +32,29 @@ export default { diff --git a/src/views/pay/payOrder/my-date-picker.vue b/src/views/pay/payOrder/my-date-picker.vue index 35ded9c..7b69307 100644 --- a/src/views/pay/payOrder/my-date-picker.vue +++ b/src/views/pay/payOrder/my-date-picker.vue @@ -18,7 +18,12 @@ export default { }, data () { return { - dateRange: [], + systemDate: '', + systemDate2: '', + + dateRange: [ + + ], pickerOptions: { shortcuts: [ { @@ -106,6 +111,33 @@ export default { } }; }, + created() { + this.addDate() + }, + methods: { + // 获取今天 + addDate() { + let nowDate = new Date(); + let date = { + year: nowDate.getFullYear(), + month: nowDate.getMonth() + 1, + date: nowDate.getDate(), + } + if (date.date <= 9) { + this.systemDate = date.year + '-' + 0 + date.month + '-' + 0 + date.date; + } else { + this.systemDate = date.year + '-' + 0 + date.month + '-' + date.date; + } + if (date.date <= 9) { + this.systemDate2 = date.year + '-' + 0 + date.month + '-' + 0 + (date.date-1); + } else { + this.systemDate2 = date.year + '-' + 0 + date.month + '-' + date.date; + } + + this.dateRange=[ this.systemDate2 + ' ' + '00' + ':' + '00' + ':' + '00',this.systemDate+ ' ' + '23' + ':' + '59' + ':' + '59'] + this.$forceUpdate() + }, + }, }; diff --git a/src/views/pay/payOrder/orderReport.vue b/src/views/pay/payOrder/orderReport.vue index eaf33e0..422ddd5 100644 --- a/src/views/pay/payOrder/orderReport.vue +++ b/src/views/pay/payOrder/orderReport.vue @@ -17,15 +17,23 @@ + + - - - + + + + + + + @@ -57,7 +65,7 @@ diff --git a/src/views/pay/payOrder/payDaiFuWater.vue b/src/views/pay/payOrder/payDaiFuWater.vue index f8b3cda..ffee2df 100644 --- a/src/views/pay/payOrder/payDaiFuWater.vue +++ b/src/views/pay/payOrder/payDaiFuWater.vue @@ -69,10 +69,9 @@ - + - + @@ -101,10 +100,14 @@ 导出 - + + @@ -113,46 +116,29 @@ - - - - - + + + - + - - - - + + - + @@ -167,15 +153,9 @@ {{ scope.row.isPayment == 'yes' ? '已发起' : '未发起' }} - - - - + + @@ -190,13 +170,18 @@ {{ scope.row.sourceType == 's_manual' ? '手工提单' : 'API下发' }} - @@ -240,11 +225,139 @@ 取 消 + + + + +
+
+ + {{ detailInfoList.accountNo }} + + + {{ detailInfoList.acctId }} + + + {{ detailInfoList.acctName }} + + + {{ detailInfoList.bankBranchName }} + + + {{ detailInfoList.bankCode }} + + + {{ detailInfoList.bankName }} + + + {{ detailInfoList.batchNo }} + + + {{ detailInfoList.transitCount }} + + + {{ detailInfoList.transitTotal }} + + + {{ detailInfoList.channelType }} + + + {{ detailInfoList.updateTime }} + +
+
+ + + {{ detailInfoList.userType == 'store' ? '商户' : '代理商' }} + + + + {{ detailInfoList.createTime }} + + + + {{ detailInfoList.flagCard == 'public_account' ? '公户' : '私户' }} + + + + + {{ detailInfoList.isPayment == 'yes' ? '是' : '否' }} + + + + {{ detailInfoList.storeName }} + + + {{ detailInfoList.nickName }} + + + {{ detailInfoList.noOrder }} + + + {{ detailInfoList.notifyUrl }} + + + {{ detailInfoList.orderMsg }} + + + {{ detailInfoList.orderStatusName }} + + + {{ detailInfoList.outChannelName }} + +
+
+ + {{ detailInfoList.outTradeNo }} + + + {{ detailInfoList.payChannelName }} + + + {{ detailInfoList.payType }} + + + {{ detailInfoList.paymentCount }} + + + {{ detailInfoList.paymentTotal }} + + + {{ detailInfoList.realTotal }} + + + {{ detailInfoList.storeId }} + + + {{ detailInfoList.storeNo }} + + + {{ detailInfoList.tranAmt }} + + + {{ detailInfoList.tranFee }} + + + {{ detailInfoList.transactionId }} + + +
+ +
+ + \ No newline at end of file diff --git a/src/views/pay/payOrder/payOrderWater.vue b/src/views/pay/payOrder/payOrderWater.vue index 70aedfc..e74040e 100644 --- a/src/views/pay/payOrder/payOrderWater.vue +++ b/src/views/pay/payOrder/payOrderWater.vue @@ -20,10 +20,10 @@ - + + + - - - - - - - - - + + + 详情 - 手工处理 + 补发通知 + @@ -207,15 +217,14 @@
- + {{ detailInfoList.orderNo }} - + {{ detailInfoList.orderStatus == 'pay_unpaid' ? '未支付' : detailInfoList.orderStatus == 'pay_success' ? '支付成功' : @@ -224,7 +233,7 @@ - {{ detailInfoList.sourceType == 's_manual' ? '手工提单' : 'API下发' }} + {{ detailInfoList.sourceType == 's_manual' ? '手工提单' : 'API充值' }} {{ detailInfoList.storeId }} @@ -268,10 +277,9 @@ {{ detailInfoList.storeNo }} - + {{ detailInfoList.storeSettle == 'yes' ? '已结算' : detailInfoList.storeSettle == 'no' || !detailInfoList.storeSettle ? '未结算' : detailInfoList.storeSettle == 'error' ? '结算失败' : '部分结算' }} @@ -281,11 +289,10 @@ {{ detailInfoList.storeSettleTime }} - + {{ detailInfoList.storeType == 'my_store' ? '代理自己商户' : detailInfoList.storeType == 'directly_under' ? '平台直属商户' : '代理下级商户' }} @@ -303,7 +310,7 @@ - +
@@ -331,9 +338,8 @@ {{ detailInfoList.bankId }} - + {{ detailInfoList.cardType == 'debit_card' ? '借记卡' : '贷记卡' }} @@ -381,8 +387,7 @@
- +
无
@@ -592,6 +597,43 @@ export default { this.init(); }, methods: { + // 通知 + handleSayReissueNotice(row) { + this.loading = true; + // payOrder.paymentReissueNotice(row.keyId).then((response) => { + // if (response.code == 200) { + // this.$message.success('补发成功') + // this.loading = false; + // } + // }).catch(() => { + // this.loading = false; + // }); + payOrder.reissueNotice(row.keyId).then((response) => { + if (response.code == 200) { + this.$message.success('补发成功') + this.loading = false; + } + }).catch(() => { + this.loading = false; + }); + }, + tableRowClassName({ row, rowIndex }) { + if (row.orderStatus == 'pay_unpaid') { + return "yellowOrder"; + } + if (row.orderStatus == 'pay_success') { + return "greenOrder"; + } + if (row.orderStatus == 'pay_failure') { + return "redOrder"; + } + if (row.orderStatus == 'pay_processing') { + return "blueOrder"; + } + if (row.orderStatus == 'pay_closed') { + return "greyOrder"; + } + }, // 预览图片 previewImage(abUrl) { this.srcList[0] = abUrl; @@ -665,7 +707,7 @@ export default { // 取消按钮 cancel() { this.open = false; - this.isShowDetail=false + this.isShowDetail = false this.reset(); }, // 表单重置 @@ -724,4 +766,12 @@ export default { ::v-deep .el-dialog:not(.is-fullscreen) { margin-top: 10vh !important; } + +::v-deep .el-table tbody tr:hover>td { + background-color: rgba(0, 0, 0, 0) !important +} + +::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell { + background: none !important; +} \ No newline at end of file diff --git a/src/views/pay/payOrder/paySettleWater.vue b/src/views/pay/payOrder/paySettleWater.vue index 834d5b5..1d3a9d6 100644 --- a/src/views/pay/payOrder/paySettleWater.vue +++ b/src/views/pay/payOrder/paySettleWater.vue @@ -16,6 +16,10 @@ + + + @@ -41,6 +45,7 @@ +