From e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 10:32:33 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2
---
sub_pages/customer/self/history.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sub_pages/customer/self/history.vue b/sub_pages/customer/self/history.vue
index 7026ddf..5b9e6dd 100644
--- a/sub_pages/customer/self/history.vue
+++ b/sub_pages/customer/self/history.vue
@@ -222,7 +222,7 @@
<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)">
@@ -236,7 +236,7 @@
<!-- #ifdef PUB_CUSTOMER_DEV -->
<view class="price m-l-a m-r-0 component-price-new">
- ￥{{ dto.priceMember || dto.price || '-' }}/扎<span class="tip">会员价</span>
+ <span class="tip">会员价</span>￥<span class="p">{{ dto.priceMember || dto.price || '-' }}</span>/扎
<view class="component-price-old">
￥{{dto.price}}/扎
</view>
--
Gitblit v1.9.3