Commit a1d2c50998b8c4c0e6eb32d2a92134942e436f57
1 parent
4f3ba8ec
积分签到的修复
Showing
2 changed files
with
20 additions
and
12 deletions
packageA/pages/checkin/checkin.js
| ... | ... | @@ -36,11 +36,19 @@ Page({ |
| 36 | 36 | loadQd(callback) { |
| 37 | 37 | app.request.get('/api/weshop/qdrecord/getUser/'+ app.globalData.setting.stoid + '/' + app.globalData.user_id, { |
| 38 | 38 | success: function (res) { |
| 39 | - if(callback) callback(); | |
| 40 | - self.setData({ | |
| 41 | - res: res.data.data | |
| 42 | - }); | |
| 43 | - self.loadCheckedRecord(); | |
| 39 | + if(res.data.code==0){ | |
| 40 | + if(callback) callback(); | |
| 41 | + self.setData({ | |
| 42 | + res: res.data.data | |
| 43 | + }); | |
| 44 | + self.loadCheckedRecord(); | |
| 45 | + }else{ | |
| 46 | + wx.showToast({ | |
| 47 | + title: "网络繁忙，请重试", | |
| 48 | + icon: 'none', | |
| 49 | + duration: 2000 | |
| 50 | + }) | |
| 51 | + } | |
| 44 | 52 | }, |
| 45 | 53 | }); |
| 46 | 54 | }, |
| ... | ... | @@ -130,7 +138,7 @@ Page({ |
| 130 | 138 | let list; |
| 131 | 139 | let bqlist; |
| 132 | 140 | //--判断什么日子是签到的,上个月的-- |
| 133 | - if(this.data.res.qdsdaylist) { | |
| 141 | + if(this.data.res && this.data.res.qdsdaylist) { | |
| 134 | 142 | list = this.data.res.qdsdaylist.split(','); |
| 135 | 143 | for(var i in this.data.s_dateArr){ |
| 136 | 144 | var item=this.data.s_dateArr[i]; |
| ... | ... | @@ -143,7 +151,7 @@ Page({ |
| 143 | 151 | } |
| 144 | 152 | newDateArr=newDateArr.concat(this.data.s_dateArr); |
| 145 | 153 | //--判断什么日子是签到的，这个月的-- |
| 146 | - if(this.data.res.qddaylist) { | |
| 154 | + if(this.data.res && this.data.res.qddaylist) { | |
| 147 | 155 | list = this.data.res.qddaylist.split(','); |
| 148 | 156 | for(var i in this.data.n_dateArr){ |
| 149 | 157 | var item=this.data.n_dateArr[i]; |
| ... | ... | @@ -157,7 +165,7 @@ Page({ |
| 157 | 165 | newDateArr=newDateArr.concat(this.data.n_dateArr); |
| 158 | 166 | |
| 159 | 167 | //--判断什么日子是要补签的-- |
| 160 | - if(this.data.res.curbqdaynum) { | |
| 168 | + if(this.data.res && this.data.res.curbqdaynum) { | |
| 161 | 169 | bqlist = this.data.res.curbqdaynum.split(','); |
| 162 | 170 | for(var i in newDateArr){ |
| 163 | 171 | var item=newDateArr[i]; | ... | ... |
packageA/pages/checkin/checkin.wxml
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | |
| 8 | 8 | </view> |
| 9 | 9 | |
| 10 | - <view class="list flex"> | |
| 10 | + <view class="list flex" wx:if="{{res}}"> | |
| 11 | 11 | <view class="list-item active}}"> |
| 12 | 12 | <view class="circle">+{{res.cday1}}</view> |
| 13 | 13 | <view class="fs26">{{res.sday2}}</view> |
| ... | ... | @@ -37,8 +37,9 @@ |
| 37 | 37 | <view class="fs26">{{myUtil.setDate(year, res.sday3, 5)}}日</view> |
| 38 | 38 | </view> |
| 39 | 39 | </view> |
| 40 | + <view wx:else style="height: 100rpx;"></view> | |
| 40 | 41 | |
| 41 | - <view class="btn-container"> | |
| 42 | + <view class="btn-container" wx:if="{{res}}"> | |
| 42 | 43 | <view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}"> |
| 43 | 44 | <text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}} |
| 44 | 45 | </view> |
| ... | ... | @@ -52,8 +53,7 @@ |
| 52 | 53 | <!-- <view class="current"> |
| 53 | 54 | <view class="f-vc">当前连续签到：<text class="days fs34">{{res.getlxnum}}</text> 天</view> |
| 54 | 55 | <view class="f-vc">当前积分：<text class="fs34">{{integral}}</text></view> |
| 55 | - </view> --> | |
| 56 | - | |
| 56 | + </view> --> | |
| 57 | 57 | <!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> --> |
| 58 | 58 | |
| 59 | 59 | <view class="calendar-container"> | ... | ... |