From 8888a5d464633ee4700ef74d44b1d4291781f332 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 21 Nov 2020 14:49:12 +0800
Subject: [PATCH] 预存详情页面的背景颜色去掉，还有顶部图片的空就不显示

---
 packageA/pages/chongzhi/chongzhi.wxml               |  2 +-
 packageA/pages/chongzhiDetails/chongzhiDetails.wxml | 35 ++++++++++++++++++-----------------
 packageA/pages/chongzhiDetails/chongzhiDetails.wxss |  4 ++++
 pages/user/assistance/task_assistance.wxss          |  6 +++++-
 pages/user/deposit/prepaid/prepaid.wxml             |  4 ++--
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml
index 6869e11..bc2e4ed 100644
--- a/packageA/pages/chongzhi/chongzhi.wxml
+++ b/packageA/pages/chongzhi/chongzhi.wxml
@@ -1,5 +1,5 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
-<view class="container" style="background-color: {{ad_color?ad_color:'#f2f2f2'}};height: 100%;">
+<view class="container" style="background-color: {{ad_color?ad_color:'#e85f93'}};height: 100%;">
 	<!-- 封面 -->
 	<view class="banner-container" wx:if="{{imgAd}}">
 		  <image class="img-block" src="{{url + imgAd}}"  binderror="onerror" data-errimg="imgAd"></image>
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index 170d1e7..055d1fe 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -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>
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss
index 70cfcf9..606542a 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss
@@ -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
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index d878741..2fb2965 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -251,4 +251,8 @@ line-height: 48rpx;
 .rel {
 	display: flex;
 	align-items: center;
-}
\ No newline at end of file
+}
+
+image{
+	-webkit-touch-callout:none
+}
diff --git a/pages/user/deposit/prepaid/prepaid.wxml b/pages/user/deposit/prepaid/prepaid.wxml
index 687197b..513af7c 100644
--- a/pages/user/deposit/prepaid/prepaid.wxml
+++ b/pages/user/deposit/prepaid/prepaid.wxml
@@ -1,5 +1,5 @@
 <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>
--
libgit2 0.21.4