Merge branch 'jeffrey/fix/point_03_29' into jeffrey/fix/style_edit_0331

pages/integral/integral.js

@@ -24,6 +24,7 @@ Page({
     setPhone: '',
     current: '',
     integralNum: 0,
+    isQuery: false,
     phone: '********',
     // phone: '15888282621',
     mobile: '********',
@@ -113,8 +114,10 @@ Page({
                 setPhone: getMobileCache(),
                 mobile: getMobileCache(),
                 integralNum: arr.data,
+                isQuery:true,
                 codeNum: arr.code,
             })
+            this.getCouponList()
            
         }
     }).catch(error=>{
@@ -385,6 +388,7 @@ getphoneClick() {
                 var reg = /^(\d{3})\d{4}(\d{4})$/;
                 this.setData({
                    integralNum: arr.data,
+                   isQuery:true,
                    setPhone: getMobileCache(),
                    phone: getMobileCache().replace(reg, "$1****$2"),
                    codeNum: arr.code,
@@ -560,6 +564,7 @@ shuaxinClick() {
             var reg = /^(\d{3})\d{4}(\d{4})$/;
             this.setData({
                integralNum: arr.data,
+               isQuery:true,
                setPhone:  getMobileCache(),
                phone: getMobileCache().replace(reg, "$1****$2"),
             })
@@ -699,6 +704,7 @@ paymentClick() {
                         this.data.integralNum -= this.data.total
                         this.setData({
                             integralNum: this.data.integralNum,
+                            isQuery:true,
                             total: 0,
                             listStatus: false,
                             listTrue: [],

pages/integral/integral.wxml

@@ -25,7 +25,8 @@
         </view>
         <view class="query-integral" wx:if="{{phone !== '********'}}">
           <view class="query-integral-text"><text>我的移动积分</text></view>
-          <view class="query-integral-num">{{integralNum}}</view>
+          <view class="query-integral-num" wx:if="{{isQuery}}">{{integralNum}}</view>
+          <view class="query-integral-num" wx:if="{{!isQuery}}">未查询</view>
           <text style="padding-left: 16rpx;font-size: 32rpx;" class="query-iconfont query-iconshuaxin" catchtap="shuaxinClick">刷新</text>
         </view>
       </view>