From 03d26aca1b656c03dc4280f85acb1132bd87639d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 23:57:43 +0800
Subject: [PATCH] update 会员信息、兑换商品等

---
 sub_pages/customer/trade/trade.vue |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index e99cd81..e706b98 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -19,7 +19,7 @@
 				</u-input>
 			</view>
 		</view>
-		<view class="canteen-items" :style="{'min-height':hidefooter?'':'calc(100vh - 160rpx)'}">
+		<view class="canteen-items" :style="{'min-height':hidefooter?'':'calc(100vh - 340rpx)'}">
 			<view v-if="(!list||list.length==0)&&true" style="width: 100%;min-height: 200rpx;">
 				&nbsp;
 			</view>
@@ -54,13 +54,24 @@
 								</image>
 							</view>
 							<view class="cateen_infos list">
-								<view class="title">{{item.name}}</view>
-								<view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+								<view class="title">{{item.name}}</view>
+								<!-- #ifdef PUB_CUSTOMER_DEV -->
+								
+								<view class="price">
+									<view>会员价</view>
+									<view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
+								</view>								
+								<view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+								
+								<!-- #endif -->
+								<!-- #ifndef PUB_CUSTOMER_DEV -->
+								<view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+								<!-- #endif -->
 								<view class="desc">在售 {{item.stock||'0'}} 扎</view>
 							</view>
 
 						</view>
-						<view style="padding-bottom:100rpx">
+						<view style="padding-bottom:40rpx">
 						</view>
 					</view>
 					<footer-msg v-if="!hidefooter" :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
@@ -72,7 +83,7 @@
 
 
 
-		<view style="min-height:200rpx" v-if="!hidefooter">
+		<view style="min-height:100rpx" v-if="!hidefooter">
 		</view>
 		<common-footer flg="1" v-if="!hidefooter">></common-footer>
 
@@ -358,8 +369,8 @@
 			min-width: 178rpx;
 			background: #EEF7F5;
 			border-radius: 8rpx;
-			min-height: calc(100vh - 300rpx);
-			max-height: calc(100vh - 300rpx);
+			min-height: calc(100vh - 270rpx);
+			max-height: calc(100vh - 270rpx);
 			overflow-y: scroll;
 			margin-right: 16rpx;
 
@@ -455,7 +466,7 @@
 			.canteen-item-container {
 				width: 100%;
 				min-height: 300rpx;
-				max-height: calc(100vh - 200rpx);
+				max-height: calc(100vh - 270rpx);
 				overflow-y: scroll;
 			}
 

--
Gitblit v1.9.3