From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
 bicycle/unpackage/dist/dev/mp-weixin/pages/settlementDetails/settlementDetails.js |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/settlementDetails/settlementDetails.js b/bicycle/unpackage/dist/dev/mp-weixin/pages/settlementDetails/settlementDetails.js
index e40b72e..6657933 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/settlementDetails/settlementDetails.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/settlementDetails/settlementDetails.js
@@ -105,6 +105,11 @@
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 = (_vm.info.amount / 100).toFixed(2)
+  var m0 =
+    _vm.info.haveDisCount === 1
+      ? Number((_vm.info.disCountMoney / 100).toFixed(2))
+      : null
+  var m1 = _vm.info.duration ? String(_vm.info.duration) : null
   var l0 = _vm.__map(_vm.info.memberRidesResponseList, function (item, index) {
     var $orig = _vm.__get_orig(item)
     var g1 = item.rideStartTime.substring(5, 10)
@@ -134,6 +139,8 @@
     {
       $root: {
         g0: g0,
+        m0: m0,
+        m1: m1,
         l0: l0,
       },
     }
@@ -207,6 +214,9 @@
 //
 //
 //
+//
+//
+//
 var _default = {
   data: function data() {
     return {
--
Gitblit v1.9.3