修改过期积分展示样式

src/pages/coupons/coupons.js

@@ -47,7 +47,7 @@ wxService.page({
         this.getCouponList(1,20,1)
       }else if( current == 1){
         // 失效
-        this.getCouponList(1,30,0)
+        this.getCouponList(1,20,0)
       }
     },
     // 点击切换
@@ -67,7 +67,7 @@ wxService.page({
         this.getCouponList(1,20,1)
       }else if( current == 1){
         // 失效
-        this.getCouponList(1,30,0)
+        this.getCouponList(1,20,0)
       }
     },
   /**
@@ -80,7 +80,7 @@ wxService.page({
   onShow () {
     // 可使用 已失效
     this.getCouponList(1,20,1)
-    this.getCouponList(1,30,0)
+    this.getCouponList(1,20,0)
   },
   handelPresentCouponDetail(e) {
     let {cardno} = e.currentTarget.dataset

src/pages/integralWater/integralWater.js

@@ -43,12 +43,22 @@ wxService.page({
       this.data.memberPoint.total = data.point ? data.point : 0;
       this.data.memberPoint.expirePoint = data.pointWillExpired ? data.pointWillExpired : 0;
       let expireDate = data.pointExpiredTime ? data.pointExpiredTime : '';
+      if (expireDate){
+        let dateStr = expireDate.replace(/-/g, '/');
+        let da = new Date(dateStr);
+        let year = da.getFullYear();
+        let month = (da.getMonth() + 1) < 10 ? '0' + (da.getMonth() + 1) : da.getMonth() + 1;
+        let day = da.getDate() < 10 ? '0' + da.getDate() : da.getDate();
+        expireDate = `${year}年${month}月${day}日`
+      }
+
       this.data.memberPoint.expireDate = expireDate;
       this.setData({
         memberPoint: this.data.memberPoint
       });
     });
   },
+
   /**
    * 生命周期函数--监听页面显示
    */

src/pages/integralWater/integralWater.wxml

@@ -32,7 +32,7 @@
   <view wx:if="{{integralList.length}}">
     <view class="integral-tips">
       <view class="tips-detail">显示你最近30笔变动明细</view>
-      <span class="tips-much">这么多积分</span><span class="tips-gomall" bindtap="handleGoIntegralMall"> 去积分商城看看>>> </span>
+      <text class="tips-much">这么多积分</text><text class="tips-gomall" bindtap="handleGoIntegralMall"> 去积分商城看看>>> </text>
     </view>
     <!--积分列表-->
     <view>

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js

@@ -66,6 +66,16 @@ wxService.page({
       this.data.memberPoint.total = data.point ? data.point : 0;
       this.data.memberPoint.expirePoint = data.pointWillExpired ? data.pointWillExpired : 0;
       let expireDate = data.pointExpiredTime ? data.pointExpiredTime : '';
+      
+      if (expireDate) {
+        let dateStr = expireDate.replace(/-/g, '/');
+        let da = new Date(dateStr);
+        let year = da.getFullYear();
+        let month = (da.getMonth() + 1) < 10 ? '0' + (da.getMonth() + 1) : da.getMonth() + 1;
+        let day = da.getDate() < 10 ? '0' + da.getDate() : da.getDate();
+        expireDate = `${year}年${month}月${day}日`
+      }
+
       this.data.memberPoint.expireDate = expireDate;
       this.setData({
         memberPoint: this.data.memberPoint

src/subPackage/page/pages/recordList/recordList.wxss

@@ -66,3 +66,12 @@ page{
   align-items: center;
   justify-content: flex-end;
 }
+
+.empty{
+  padding: 30rpx;
+  padding-top: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #999999;
+}
\ No newline at end of file