From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.js b/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.js
index b930775..7a75b68 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.js
@@ -104,14 +104,42 @@
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
- var g0 = (_vm.info.amount / 100).toFixed(2)
+ var m0 = Number((_vm.info.amount / 100).toFixed(2))
+ var g0 = !(m0 > _vm.price) ? (_vm.info.amount / 100).toFixed(2) : null
var l0 = _vm.__map(_vm.info.memberRidesResponseList, function (item, index) {
var $orig = _vm.__get_orig(item)
var g1 = !item.rideEndTime ? item.rideStartTime.substring(5, 10) : null
var g2 = !item.rideEndTime ? item.rideStartTime.substring(11, 16) : null
var g3 = !!item.rideEndTime ? item.rideStartTime.substring(5, 10) : null
- var g4 = !!item.rideEndTime ? item.rideStartTime.substring(11, 16) : null
- var g5 = !!item.rideEndTime ? item.rideEndTime.substring(11, 16) : null
+ var g4 = !!item.rideEndTime ? item.rideEndTime.substring(5, 10) : null
+ var g5 =
+ !!item.rideEndTime && g3 === g4
+ ? item.rideStartTime.substring(5, 10)
+ : null
+ var g6 =
+ !!item.rideEndTime && g3 === g4
+ ? item.rideStartTime.substring(11, 16)
+ : null
+ var g7 =
+ !!item.rideEndTime && g3 === g4
+ ? item.rideEndTime.substring(11, 16)
+ : null
+ var g8 =
+ !!item.rideEndTime && !(g3 === g4)
+ ? item.rideStartTime.substring(5, 10)
+ : null
+ var g9 =
+ !!item.rideEndTime && !(g3 === g4)
+ ? item.rideStartTime.substring(11, 16)
+ : null
+ var g10 =
+ !!item.rideEndTime && !(g3 === g4)
+ ? item.rideEndTime.substring(5, 10)
+ : null
+ var g11 =
+ !!item.rideEndTime && !(g3 === g4)
+ ? item.rideEndTime.substring(11, 16)
+ : null
return {
$orig: $orig,
g1: g1,
@@ -119,12 +147,19 @@
g3: g3,
g4: g4,
g5: g5,
+ g6: g6,
+ g7: g7,
+ g8: g8,
+ g9: g9,
+ g10: g10,
+ g11: g11,
}
})
_vm.$mp.data = Object.assign(
{},
{
$root: {
+ m0: m0,
g0: g0,
l0: l0,
},
@@ -199,15 +234,23 @@
//
//
//
+//
+//
+//
+//
+//
+//
var _default = {
data: function data() {
return {
id: '',
+ price: 0,
info: {}
};
},
onLoad: function onLoad(option) {
this.id = option.id;
+ this.price = Number(option.price);
this.getInfo();
},
methods: {
--
Gitblit v1.9.3