From 18d59ca85b2bc9ccac4a90203c3b2486acf3b113 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 12 九月 2024 09:19:55 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
sub_pages/customer/shopping/shopping.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 7b36437..cbc0c31 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -38,7 +38,7 @@
style="display: inline-block;">{{ dto.levelStr || '' }}</span>{{ dto.name || '-' }}
</view>
<view class="price" @click.stop="toDetail(dto)">
- {{ dto.price || '-' }}元/扎
+ {{ dto.priceMember || dto.price || '-' }}元/扎
</view>
<view class="flex">
<view class="desc flex p-t-5" @click.stop="toDetail(dto)">
@@ -120,7 +120,7 @@
this.list && this.list.forEach(dto => {
dto.flowerList && dto.flowerList.forEach(item => {
if (this.ids.indexOf(item.id) >= 0) {
- totalprice += item.price * item.num
+ totalprice += (item.priceMember || item.price || 0) * item.num
}
})
})
--
Gitblit v1.9.3