From 241345cd03dd0ee8718346e7c90a8a59ea1955b5 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 18 Nov 2020 11:00:42 +0800
Subject: [PATCH] 预存充值的优化

---
 packageA/pages/chongzhi/chongzhi.wxml               | 11 +++++++++--
 packageA/pages/chongzhiDetails/chongzhiDetails.js   |  5 ++---
 packageA/pages/chongzhiDetails/chongzhiDetails.wxml | 17 +++++++++++------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packageA/pages/chongzhi/chongzhi.wxml b/packageA/pages/chongzhi/chongzhi.wxml
index 682e711..5c43a66 100644
--- a/packageA/pages/chongzhi/chongzhi.wxml
+++ b/packageA/pages/chongzhi/chongzhi.wxml
@@ -29,9 +29,16 @@
 						</view>
 					</view>
 					<!-- 下 -->
-					<view class="bottom" wx:if="{{currentIndex == 0  && g_filter.is_acting(item.EndDate) }}" >
-						<text catchtap="viewDetails" data-index="{{index}}"  class="btn" >立即使用</text>
+					<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>	
 						
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js
index bb6bf1f..7c83e5f 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.js
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js
@@ -32,8 +32,7 @@ Page({
 			return false;			
 		}
 		
-		
-		
+				
 		getApp().request.get("/api/wx/weappSendlist/page", {
 		  data: {
 		    store_id: os.stoid,
@@ -76,7 +75,7 @@ Page({
                 var endtime = result.EndDate.replace(reg, '/');  
 				var end=new Date(endtime);
 				result.is_acting=1;
-				if(end<now) 	result.is_acting=0;
+				if(end<now)  result.is_acting=0;
 				
 				
 			    var givelist=result.givelist;
diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
index 972c3a3..ccfd7e4 100644
--- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
+++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml
@@ -37,13 +37,18 @@
 		</view>		
 	</view>
 	
-	<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.is_acting}}" class="btn" bindtap="onUse">立即使用</text>
-		  <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
+	<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>
--
libgit2 0.21.4