From 9063b92cdbdf3598133dfb89592a2394e4091c5b Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Sat, 21 Nov 2020 11:08:52 +0800
Subject: [PATCH] 充值有礼

---
 packageA/pages/chongzhi/chongzhi.wxml | 64 ++++++++++++++++++++++++++++++++++------------------------------
 packageA/pages/chongzhi/chongzhi.wxss |  4 ++++
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml
index 4759ffb..6869e11 100644
--- a/packageA/pages/chongzhi/chongzhi.wxml
+++ b/packageA/pages/chongzhi/chongzhi.wxml
@@ -1,8 +1,9 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
-<view class="container" style="background-color: {{ad_color?ad_color:'#e85f93'}};height: 100%;">
+<view class="container" style="background-color: {{ad_color?ad_color:'#f2f2f2'}};height: 100%;">
 	<!-- 封面 -->
 	<view class="banner-container" wx:if="{{imgAd}}">
 		  <image class="img-block" src="{{url + imgAd}}"  binderror="onerror" data-errimg="imgAd"></image>
+			<!-- <image class="img-block" src="../../../images/banner.jpg"  binderror="onerror" data-errimg="imgAd"></image> -->
 	</view>
 	<!-- 列表 -->
 	<view>
@@ -12,37 +13,40 @@
 			<view class="t-item {{currentIndex == 1 ? 'active':''}}" data-index="1">已核销</view>
 		</view>
 		<!-- 内容 -->
-		<view class="list" >
-			<block wx:for="{{list}}" >            
-				 <view class="l-item"  bindtap="goDetails" data-id="{{item.ID}}" >
-					<!-- 上 -->
-					<view class="{{currentIndex == 0 ? 'top flex':'flex'}}">
-						<!-- 左 -->
-						<!-- <view class="left">
-							<image class="img-block"></image>
-						</view> -->
-						<!-- 右 -->
-						<view class="right">
-							<view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view>
-							<view>
-								<view class="price fs24">零售价：￥{{item.PosPrice}}</view>
-								<view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}</view>
+		<view class="list">
+			<!-- <scroll-view scroll-y> -->
+				<block wx:for="{{list}}" >
+					 <view class="l-item"  bindtap="goDetails" data-id="{{item.ID}}" >
+						<!-- 上 -->
+						<view class="{{currentIndex == 0 ? 'top flex':'flex'}}">
+							<!-- 左 -->
+							<!-- <view class="left">
+								<image class="img-block"></image>
+							</view> -->
+							<!-- 右 -->
+							<view class="right">
+								<view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view>
+								<view>
+									<view class="price fs24">零售价：￥{{item.PosPrice}}</view>
+									<view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + item.EndDate}}</view>
+								</view>
 							</view>
 						</view>
-					</view>
-					<!-- 下 -->
-					<view class="bottom" wx:if="{{currentIndex == 0}}" >
-						<text wx:if="{{g_filter.is_acting(item.EndDate)}}" 
-						   catchtap="viewDetails" data-index="{{index}}"  class="btn" >立即使用</text>
-						<text  data-index="{{index}}"  class="btn details" >详情</text>
-					</view>
-					<view class="bottom" wx:if="{{currentIndex == 1}}" >
-						<text  data-index="{{index}}"  class="btn" >已核销</text>
-						<text  data-index="{{index}}"  class="btn details" >详情</text>
-					</view>
-					
-				</view>	
-		   </block>	
+						<!-- 下 -->
+						<view class="bottom" wx:if="{{currentIndex == 0}}" >
+							<text wx:if="{{g_filter.is_acting(item.EndDate)}}" 
+							   catchtap="viewDetails" data-index="{{index}}"  class="btn" >立即使用</text>
+							<text  data-index="{{index}}"  class="btn details" >详情</text>
+						</view>
+						<view class="bottom" wx:if="{{currentIndex == 1}}" >
+							<text  data-index="{{index}}"  class="btn" >已核销</text>
+							<text  data-index="{{index}}"  class="btn details" >详情</text>
+						</view>
+						
+					</view>	
+				</block>	
+			<!-- </scroll-view> -->
+			
 		   <view hidden="{{!noMore}}" class="no-more t-c" wx:if="{{list.length !== 0}}">- 已全部加载 -</view>									
 		</view>
 		
diff --git a/packageA/pages/chongzhi/chongzhi.wxss b/packageA/pages/chongzhi/chongzhi.wxss
index 309bf43..9b1b74c 100644
--- a/packageA/pages/chongzhi/chongzhi.wxss
+++ b/packageA/pages/chongzhi/chongzhi.wxss
@@ -6,6 +6,10 @@ page {
 	height: 100%;
 }
 
+.container {
+	display: block;
+}
+
 .banner-container {
 	height: 400rpx;
 }
--
libgit2 0.21.4