Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

physical-merchants/settleAccounts/detail-popup/detail-popup.vue

@@ -157,21 +157,24 @@
 								{{item.discountName}}
 							</view>
 							<view class="font13 mart5 fcor666">
-								截止时间:{{item.useEndTime | formatDate }}
+								截止时间:{{item.useEndTime | formatDate }} <text class="fcorred paddleft5" v-if="item.useEndTime<(new Date()).getTime()">已过期</text>
+								
 							</view>
 						</view>
-						<view class=""  v-if="item.discountCondition<=totalPrice">
+						<!-- 截止时间:{{item.useEndTime}}-- {{(new Date()).getTime() }} -->
-							
+						<view class=""  v-if="(item.discountCondition<=totalPrice)&&(item.useEndTime>(new Date()).getTime())&&totalPrice!=0">
 								<radio  class="radio-ca" :checked="yhqType == item.id" :value="item.id+''" color="#FF1A34" />
-							
 						</view>
 					</view>
-					<view v-if="item.discountCondition>totalPrice&&item.discountType == 1"  class="paddtop10  mart10 border-t font14">
+					
-						<view class="fotred  fontwig6 ">不可用原因</view> 
+					<template v-if="(item.useEndTime>(new Date()).getTime())">
-						<view class="fcor666">
+						<view v-if="item.discountCondition>totalPrice&&item.discountType == 1"  class="paddtop10  mart10 border-t font14">
-							使用门槛为{{item.discountCondition}}元，还差{{ parseFloat((item.discountCondition-totalPrice).toFixed(2)) }}元才能使用
+							<view class="fotred  fontwig6 ">不可用原因</view> 
+							<view class="fcor666">
+								使用门槛为{{item.discountCondition}}元，还差{{ parseFloat((item.discountCondition-totalPrice).toFixed(2)) }}元才能使用
+							</view>
 						</view>
-					</view>
+					</template>
 				</view>
 				
 			</radio-group>