From 39c58fe1a0469b99bd5ef0a24f6b254693826a18 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:01:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js
index cccb965..45518a3 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserDetailOrder.js
@@ -21,10 +21,10 @@
{title: '目的地', field: 'endAddress', visible: true, align: 'center', valign: 'middle'},
{title: '总行驶里程(公里)', field: 'mileageSum', visible: true, align: 'center', valign: 'middle'},
{title: '总行驶时间(分)', field: 'travelTimeSum', visible: true, align: 'center', valign: 'middle'},
- {title: '基础费用(元)', field: 'basicExpenses', visible: true, align: 'center', valign: 'middle'},
+ {title: '基础费用(元)', field: 'startPrice', visible: true, align: 'center', valign: 'middle'},
{title: '等待时间(5)分钟', field: 'waitTimePrice', visible: true, align: 'center', valign: 'middle'},
- {title: '里程费(8.0)公里', field: 'mileagePrice', visible: true, align: 'center', valign: 'middle'},
- {title: '恶劣天气', field: 'badWeather', visible: true, align: 'center', valign: 'middle'},
+ {title: '里程费(8.0)公里', field: 'longDistancePrice', visible: true, align: 'center', valign: 'middle'},
+ {title: '恶劣天气', field: 'badWeatherDistance', visible: true, align: 'center', valign: 'middle'},
{title: '支付金额', field: 'payMoney', visible: true, align: 'center', valign: 'middle'},
];
};
--
Gitblit v1.7.1