From 039f96923a06aed753c4f26fca01703b14d65f7b Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Thu, 19 Aug 2021 15:26:10 +0800
Subject: [PATCH] 优惠券修改

---
 packageB/pages/coupons/query/index.wxml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packageB/pages/coupons/query/index.wxml b/packageB/pages/coupons/query/index.wxml
index e88b128..1e06d8f 100644
--- a/packageB/pages/coupons/query/index.wxml
+++ b/packageB/pages/coupons/query/index.wxml
@@ -63,23 +63,22 @@
 			<block wx:if="{{detail.isby}}">
 				<view class="coupon">
 					<view class="flex">
-						<view class="c-l"><text class="rmb fs40">20</text></view>
+						<view class="c-l"><text class="fs40">包邮券</text></view>
 						<view class="c-r dash">
 							<view class="flex jc_sb ai_c">
 								<view class="pdr20">
 									<view class="fs28 ellipsis-1x">包邮券</view>
 									<view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
 								</view>
-								<view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.CashRepNo}}">{{filter.showBtnText(currentIndex)}}</text></view>
+								<view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
 							</view>
 							<view class="c-time">
-								<text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{  time.format_time(detail.use_end_time)}}</text>
+								<text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
 								<text wx:else>有效期:不限</text>
 							</view>
 						</view>
 					</view>
 				</view>
-				<!-- <view class="c-info arrow-down"> -->
 				<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
 					<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
 				</view>
@@ -100,7 +99,7 @@
 								</view>
 							</view>
 							<view class="c-time">
-								<text  wx:if="{{detail.ValidDate!=null}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
+								<text  wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
 								<text wx:else>有效期:不限</text>
 							</view>
 						</view>
@@ -154,15 +153,22 @@
 <view class="popup-container" hidden="{{!showQr}}">
 	<view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
 	<view class="popup">
-		<view class="popup-title">{{filter.getNum(details[useIndex].Sum)}}元微券</view>
-		<view class="pdt20 c-fe0000"><text class="rmb fs80">{{filter.getNum(details[useIndex].Sum)}}</text></view>
+		<view class="popup-title">
+			<block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
+			<block wx:else>
+				{{filter.getNum(details[useIndex].Sum)}}元微券
+			</block>
+		</view>
+		<view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view>
 		<!-- <img src="" alt="" class="img-qr"/> -->
 		<view class="qr-container">
 		  <canvas class="qrcode" canvas-id="qrcode"/>
 		</view>
-		<view class="pdt20 pdb10 fs26">{{details[useIndex].CashRepNo}}</view>
+		<view class="pdt20 pdb10 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
+		<view class="pdt20 pdb10 fs26" wx:else>{{details[useIndex].no}}</view>
 		<view class="pdv30 c-7b fs26 bdt">
-			<text  wx:if="{{details[useIndex].ValidDate!=null}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
+			<text  wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
+			<text  wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
 			<text wx:else>有效期:不限</text>
 		</view>
 	</view>
--
libgit2 0.21.4