Merge branch 'test' into 'qa'

Test See merge request !558

Merge branch 'test' into 'qa'
Test See merge request !558
后端研发-苏明海
2 parents 61c7cf07 19e3421e
Showing 6 changed files with 69 additions and 52 deletions
packageA/pages/chongzhi/chongzhi.wxml
packageA/pages/chongzhi/chongzhi.wxss
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.wxss
pages/user/assistance/task_assistance.wxss
pages/user/deposit/prepaid/prepaid.wxml
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
-<view class="container">
+<view class="container" style="background-color: {{ad_color?ad_color:'#e85f93'}};height: 100%;">
 	<!-- 封面 -->
-	<view class="banner-container">
+	<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" style="background-color: {{ad_color?ad_color:'#ff9a00'}};">
-			<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>
@@ -3,13 +3,17 @@
 page {
 	/* background-color: #FA437E; */
+	height: 100%;
+}
+
+.container {
+	display: block;
 }
 .banner-container {
 	height: 400rpx;
 }
-
 .title {
 	background-color: white;
 	position: relative;
@@ -2,7 +2,7 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
 	<view>
-		<view class="banner-container">
+		<view class="banner-container" wx:if="{{show_img}}">
 			<image class="img-block" src="{{url+show_img}}" mode="widthFix"
 		       lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></view>
@@ -13,7 +13,7 @@
 					<view>你的美丽我来缔造</view>
 				</view>
 			</view>
-			<view style="background-color: {{ad_color?ad_color:'#fff'}};">			
+			<view >			
 				<view class="list-item flex" wx:for="{{result.givelist}}">									
 					<!-- 左图片 -->
 					<view class="avatar">
@@ -38,20 +38,21 @@
 		</view>		
 	</view>
-	<view class="btn-container" >	
-		<block wx:if="{{result.is_acting}}">		
-			<text wx:if="{{type==0}}" data-advance="{{result.Id}}"  data-money="{{result.BeginSum}}" 
-			   class="btn" bindtap="go_buy">立即充值</text>
-			<block wx:else>
-			  <text wx:if="{{result.AddType==0}}" class="btn" bindtap="onUse">立即使用</text>
-			  <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
-			</block>
-		</block>
-		<block wx:else>
-			 <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
-		</block>		
-	</view>
-
-	<qrcode id="qrcode"></qrcode>
+	<block wx:if="{{result.is_acting}}">		
+		<view class="btn-container" >					
+				<text wx:if="{{type==0}}" data-advance="{{result.Id}}"  data-money="{{result.BeginSum}}" 
+				   class="btn" bindtap="go_buy">立即充值</text>
+				<block wx:else>
+				  <text wx:if="{{result.AddType==0 || result.AddType=='0'}}" class="btn" bindtap="onUse">立即使用</text>
+				  <text wx:if="{{result.AddType==1 || result.AddType=='1'}}" class="btn" >已核销</text>
+				</block>		
+		</view>
+	</block>	
+	<block wx:else>
+		<view class="btn-container" wx:if="{{result.AddType=='1'}}" >	
+		   <text class="btn">已核销</text>
+		</view> 
+	</block>	
+	<qrcode id="qrcode"></qrcode>	
 </view>
@@ -143,4 +143,8 @@
 	width: 500rpx;
 	height: 500rpx;
 	margin: 0 auto;
+}
+
+.container{
+	display: block;min-height: 100%;width: 100%;position: absolute;left: 0;top: 0;z-index: 1;
 }
 \ No newline at end of file
@@ -251,4 +251,8 @@ line-height: 48rpx;
 .rel {
 	display: flex;
 	align-items: center;
-}
 \ No newline at end of file
+}
+
+image{
+	-webkit-touch-callout:none
+}
 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid">
-	<view class="coupon-container">
+	<view class="coupon-container" wx:if="{{perpaid.NewSum>0}}">
 			<image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image>
 			<image wx:if="{{idx % 4 == 1}}" class="picture" src="{{iurl+'miniapp/images/usermoney/red.png'}}"></image>
 			<image wx:if="{{idx % 4 == 2}}" class="picture" src="{{iurl+'miniapp/images/usermoney/yellow.png'}}"></image>
@@ -8,7 +8,7 @@
 				<view class="left"  catchtap="go_detail" data-id="{{perpaid.Id}}">
 					<view>{{perpaid.ItemName}}</view>
 					<view class="pdv20">充{{perpaid.BeginSum}}
-					   <text wx:if="{{perpaid.NewSum>0}}">送{{perpaid.NewSum}}元</text>
+					   <text>送{{perpaid.NewSum}}元</text>
 					</view>
 					<view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view>
 				</view>