diff --git a/jsowell-ui/src/views/financial/financeDetail-旧.vue b/jsowell-ui/src/views/financial/financeDetail-旧.vue new file mode 100644 index 000000000..e84273de2 --- /dev/null +++ b/jsowell-ui/src/views/financial/financeDetail-旧.vue @@ -0,0 +1,554 @@ + + + + diff --git a/jsowell-ui/src/views/financial/financeDetail.vue b/jsowell-ui/src/views/financial/financeDetail.vue index e84273de2..7ed42bcb2 100644 --- a/jsowell-ui/src/views/financial/financeDetail.vue +++ b/jsowell-ui/src/views/financial/financeDetail.vue @@ -1,201 +1,150 @@ @@ -228,7 +198,7 @@ import { withdraw, selectAdapayMember, queryAdapayAccountBalance, - WithdrawalHistory + WithdrawalHistory, } from "@/api/adapayMember/adapayMember"; import { getOrderReportDetail } from "@/api/order/order"; import { getDay } from "@/utils/common"; @@ -286,7 +256,25 @@ export default { pageSize: 10, }, payoutInformation: [], - getTotal: 0 + getTotal: 0, + profitSharing: false, + temporary: [ + { + tradeDate: "2025-02-18", + billStatus: "提现申请中", + receivableAmount: "313.92", + withdrawAbleAmount: "1371.99", + feeAmount: "1.83", + aaa: "1059.92", + bbb: "1059.92", + withdrawCode: "0021110738083352290123776", + applicationTime: "2025-02-19 08:31:00", + }, + ], + sharingType: [ + { label: "直接分润", value: "1" }, + { label: "间接分润", value: "2" }, + ], }; }, methods: { @@ -375,8 +363,7 @@ export default { console.log("getMerchantOrderReport", response); if (response.data) { this.merchantOrderReport = response.data.merchantOrderReport; - if (response.data.pageResponse === null) - return (this.reportList = []); + if (response.data.pageResponse === null) return (this.reportList = []); this.reportList = response.data.pageResponse.list; this.reportTotal = response.data.pageResponse.total; } else { @@ -395,15 +382,14 @@ export default { console.log("点击提交按钮之前执行 params", params); withdraw(params).then((response) => { console.log("res 提现金额", response); - if (response.code !== 200) - return this.$modal.msgError(response.msg); + if (response.code !== 200) return this.$modal.msgError(response.msg); this.$modal.msgSuccess("操作成功"); // 重新查询当前 显示的可提现金额 this.getAdapayBalance(); }); this.dialogVisible = false; }) - .catch((_) => { }); + .catch((_) => {}); }, // 点击提交按钮 submit() { @@ -446,17 +432,28 @@ export default { }, already() { this.recordDialog = true; - this.getHistory() + this.getHistory(); }, //提现记录 getHistory() { - console.log('etWithdrawnParameters', this.getWithdrawnParameters); + console.log("etWithdrawnParameters", this.getWithdrawnParameters); WithdrawalHistory(this.getWithdrawnParameters).then((response) => { console.log("提现记录", response); this.payoutInformation = response.data.list; this.getTotal = response.data.total; }); - } + }, + // 分润流水弹框 + getProfitSharing(scope) { + console.log("点击分润流水", scope); + this.profitSharing = true; + }, + // 关闭分润流水弹框 + turnOffProfitSharing() { + this.profitSharing = false; + this.orderList = []; + this.queryParams = {}; + }, }, created() { this.defaultDate(); @@ -467,88 +464,69 @@ export default { diff --git a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue index 4c8912d3d..1a7fcd87e 100644 --- a/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue +++ b/jsowell-ui/src/views/pile/basic/components/remoteUpgrade.vue @@ -25,7 +25,7 @@ - +