From ab63e2e4a9e04ae517ec1f6651233c8c875d9967 Mon Sep 17 00:00:00 2001
From: season <season.su@yolipai.com>
Date: Mon, 15 Jun 2020 23:29:52 +0800
Subject: [PATCH] 判断null或者空的话

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

diff --git a/pages/user/coupons/coupons.wxml b/pages/user/coupons/coupons.wxml
index 2aea6bb..61da795 100644
--- a/pages/user/coupons/coupons.wxml
+++ b/pages/user/coupons/coupons.wxml
@@ -63,7 +63,7 @@
       <view wx:else>
         <view class="text">有效期:不限</view>
       </view>
-      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(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>
diff --git a/pages/user/integral/query/index.wxml b/pages/user/integral/query/index.wxml
index 20fc0db..9f291dc 100644
--- a/pages/user/integral/query/index.wxml
+++ b/pages/user/integral/query/index.wxml
@@ -63,8 +63,8 @@
             <view class='time'>{{details.BillDate}}</view>
           </view>
         </view>
-        <view class="val" style='color:{{(details.InIntegral!="0")?"green":""}}'>
-           {{(details.OutIntegral==0)?"+":"-"}}{{(details.InIntegral==0)?filter.getNum(details.OutIntegral):filter.getNum(details.InIntegral)}}积分  </view>
+        <view class="val" style='color:{{(details.InOutInt>0)?"green":""}}'>
+           {{(details.InOutInt>0)?"+":""}}{{filter.getNum(details.InOutInt)}}积分  </view>
       </view>
   </block>
 
--
libgit2 0.21.4