From 5525ed0398c496b43a09377d0c59d143e7ff3e98 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 19:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
sub_pages/customer/shopping/shopping.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 7b36437..7507fce 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -38,12 +38,13 @@
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)">
<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
<view class="m-r-15">颜色:{{ dto.color || '-' }}</view>
+ <view class="m-r-15">限购数量:{{ dto.limited || '-' }}</view>
</view>
<view class="button-icons flex m-l-a m-r-0">
<uni-icons v-if="dto.num&&dto.num>=1" type="minus" size="32"
@@ -120,7 +121,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