From e01af6d359c42b57550957d0108bb23d14088cd0 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 08 四月 2024 15:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/pages/addition_subtraction/addition_subtraction.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/wx/pages/addition_subtraction/addition_subtraction.vue b/wx/pages/addition_subtraction/addition_subtraction.vue
index b2fcf38..82e2aa8 100644
--- a/wx/pages/addition_subtraction/addition_subtraction.vue
+++ b/wx/pages/addition_subtraction/addition_subtraction.vue
@@ -21,9 +21,15 @@
<view class="label">鎶曚繚骞撮緞锛�</view>
<view class="value">{{info.minAge}}鑷硔{info.maxAge}}鍛ㄥ瞾</view>
</view>
- <view class="box_head_info_list_item">
+ <view class="box_head_info_list_item" v-if="info.solutionType !== 1">
<view class="label">璐圭敤锛�</view>
- <view class="value">{{info.price}}鍏�</view>
+ <view class="value">
+ {{info.price}}鍏�
+ <text v-if="info.timeUnit === 0">/澶�</text>
+ <text v-if="info.timeUnit === 1">/鍗婃湀</text>
+ <text v-if="info.timeUnit === 2">/鏈�</text>
+ <text v-if="info.timeUnit === 3">/骞�</text>
+ </view>
</view>
</view>
</view>
@@ -130,7 +136,8 @@
computed: {
// 鎬婚噾棰�
totalPrice() {
- return (this.cyclePrice * (this.add.length + this.del.length)).toFixed(2)
+ // return (this.cyclePrice * (this.add.length + this.del.length)).toFixed(2)
+ return ((this.cyclePrice * this.add.length) - (this.cyclePrice * this.del.length)).toFixed(2)
}
},
methods: {
--
Gitblit v1.9.3