From 81ea86bb257dd208513d00c29337aa7e430d9d80 Mon Sep 17 00:00:00 2001
From: season <season.su@yolipai.com>
Date: Tue, 16 Jun 2020 10:41:31 +0800
Subject: [PATCH] 代金券列表查询字段 优化

---
 pages/user/coupons/query/index.wxml | 2 +-
 pages/user/integral/integral.wxml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/user/coupons/query/index.wxml b/pages/user/coupons/query/index.wxml
index af3319f..763f94c 100644
--- a/pages/user/coupons/query/index.wxml
+++ b/pages/user/coupons/query/index.wxml
@@ -102,7 +102,7 @@
       <view wx:else>
         <view class="text">有效期: 不限</view>
       </view>
-      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null?"":",不包邮地区:"+region_list_name}}
+      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null || detail.UseObjectID==''?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
       </view>
     </view>
     </view>
diff --git a/pages/user/integral/integral.wxml b/pages/user/integral/integral.wxml
index bd352ff..ba47d3c 100644
--- a/pages/user/integral/integral.wxml
+++ b/pages/user/integral/integral.wxml
@@ -38,8 +38,8 @@
             <view class='time'>{{details.BillDate}}</view>
           </view>
         </view>
-        <view class="val" style='color:{{(details.InIntegral!="0")?"green":""}}'>
-          {{(details.OutIntegral==0)?"+":"-"}}{{(details.InIntegral==0)?details.OutIntegral:details.InIntegral}}积分 </view>
+        <view class="val" style='color:{{(details.InOutInt>0)?"green":""}}'>
+          {{(details.InOutInt>0)?"+":""}}{{filter.getNum(details.InOutInt)}}积分 </view>
         </view>
         <view style="clear:both"></view>
     </block>
--
libgit2 0.21.4