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/consumptionDetails/consumptionDetails.js | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.js b/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.js
index 55d4c18..0978f21 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.js
@@ -106,15 +106,18 @@
var _c = _vm._self._c || _h
var l0 = _vm.__map(_vm.list, function (item, index) {
var $orig = _vm.__get_orig(item)
- var g0 = item.type === 0 ? (item.money / 100).toFixed(2) : null
- var g1 =
- item.type === 1 || item.type === 2 || item.type === 3
- ? (item.money / 100).toFixed(2)
- : null
+ var g0 = [0, 4].includes(item.type)
+ var g1 = g0 ? (item.money / 100).toFixed(2) : null
+ var g2 = [1, 2, 3].includes(item.type)
+ var g3 = g2 ? (item.money / 100).toFixed(2) : null
+ var g4 = [0, 4].includes(item.type)
return {
$orig: $orig,
g0: g0,
g1: g1,
+ g2: g2,
+ g3: g3,
+ g4: g4,
}
})
_vm.$mp.data = Object.assign(
@@ -185,6 +188,9 @@
//
//
//
+//
+//
+//
var _default = {
data: function data() {
return {
--
Gitblit v1.9.3