From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 7b36437..5956672 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -32,20 +32,23 @@
<image class="img img100 m-r-6 br-4" :lazy-load="true"
:class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover"></image>
<view class="flex1">
- <view class="title" @click.stop="toDetail(dto)"><span class="m-r-5"
- style="display: inline-block;">{{dto.categoryStr||''}}</span><span
- v-if="dto.levelStr" class="m-r-5"
+ <view class="title" @click.stop="toDetail(dto)">
+ <!-- <span class="m-r-5"
+ style="display: inline-block;">{{dto.categoryStr||''}}</span> -->
+ <span
+ v-if="dto.levelStr" class="m-r-5 t-red"
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">
+ <view class="button-icons flex m-l-a m-r-0 m-t-8">
<uni-icons v-if="dto.num&&dto.num>=1" type="minus" size="32"
@click.stop="addnum(dto,-1)"></uni-icons>
<view class="curnums" @click.stop="updateItemNum(dto)"
@@ -120,7 +123,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