From 703cf868b9eb27de577a15cf89e2dd64e894b60c Mon Sep 17 00:00:00 2001 From: j1ack <1209452658@qq.com> Date: Mon, 24 Jul 2023 18:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 1 - src/views/order/payOrder/csOrder.vue | 4 ++++ src/views/order/payOrder/index.vue | 11 ++++++++--- .../platform/platformWaterDetail/index.vue | 11 +++++++++-- 正式kakapay.zip => 测试kakapay.zip | Bin 13597918 -> 13599413 bytes 5 files changed, 21 insertions(+), 6 deletions(-) rename 正式kakapay.zip => 测试kakapay.zip (94%) diff --git a/src/router/index.js b/src/router/index.js index 04a4142..cddeda5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,7 +39,6 @@ export const constantRoutes = [ } ] }, - { path: '/login', component: (resolve) => require(['@/views/login'], resolve), diff --git a/src/views/order/payOrder/csOrder.vue b/src/views/order/payOrder/csOrder.vue index ad5f12e..005cd32 100644 --- a/src/views/order/payOrder/csOrder.vue +++ b/src/views/order/payOrder/csOrder.vue @@ -269,6 +269,9 @@ +
+ {{ form.sameMarkDescribe }} +
保 存 @@ -512,6 +515,7 @@ export default { const id = row.orderNo; getPayOrder(id).then((response) => { this.form = response.data; + this.form.sameMarkDescribe = row.sameMarkDescribe let a = response.data.reqAmount let b = response.data.reqAmount this.form.reqAmount = this.NumberDiv(a, 100) diff --git a/src/views/order/payOrder/index.vue b/src/views/order/payOrder/index.vue index a4c9d0c..faaa845 100644 --- a/src/views/order/payOrder/index.vue +++ b/src/views/order/payOrder/index.vue @@ -86,7 +86,8 @@ 搜索 重置 - 导出 + 导出
@@ -139,7 +140,8 @@