From dd2922d3facbfba5add501f35de5649b80b6cf05 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:22:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
sub_pages/customer/self/collect.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/sub_pages/customer/self/collect.vue b/sub_pages/customer/self/collect.vue
index 6328131..1c3c90d 100644
--- a/sub_pages/customer/self/collect.vue
+++ b/sub_pages/customer/self/collect.vue
@@ -234,23 +234,37 @@
<view class="trade-list-container">
<view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']" v-for="(dto,index) of list"
:key="index">
- <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']"
+ <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'',dto.status!=='UP'?'component-status-zero':'']"
:src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
<view class="flex1">
<view class="flex" @click.stop="toDetail(dto)">
<view class="title">
- <span class="m-r-5" style="display: inline-block;"
- v-if="dto.categoryStr">{{dto.categoryStr||''}}</span>
+ <!-- <span class="m-r-5" style="display: inline-block;" -->
+ <!-- v-if="dto.categoryStr">{{dto.categoryStr||''}}</span> -->
<span v-if="dto.levelStr" class="m-r-5"
style="display: inline-block;">{{ dto.levelStr || '' }}</span>
{{ dto.name || '-' }}
</view>
+
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <view class="price m-l-a m-r-0 component-price-new">
+ ￥{{ dto.priceMember || dto.price || '-' }}/扎<span class="tip">会员价</span>
+ <view class="component-price-old">
+ ￥{{dto.price}}/扎
+ </view>
+ </view>
+ <!-- #endif -->
+ <!-- #ifndef PUB_CUSTOMER_DEV -->
<view class="price m-l-a m-r-0">
￥{{ dto.price || '-' }}/扎
</view>
+ <!-- #endif -->
</view>
<view class="flex">
<view class="desc p-t-12 flex" @click.stop="toDetail(dto)">
+
+ <view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view>
+
<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
<view class="m-r-15">颜色:{{ dto.color || '-' }}</view>
</view>
--
Gitblit v1.9.3