From a1d2c50998b8c4c0e6eb32d2a92134942e436f57 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 2 Mar 2021 18:23:10 +0800
Subject: [PATCH] 积分签到的修复

---
 packageA/pages/checkin/checkin.js   | 24 ++++++++++++++++--------
 packageA/pages/checkin/checkin.wxml |  8 ++++----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 76da363..587ac97 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -36,11 +36,19 @@ Page({
 	loadQd(callback) {
 		app.request.get('/api/weshop/qdrecord/getUser/'+ app.globalData.setting.stoid + '/' + app.globalData.user_id, {
 		  success: function (res) {
-				if(callback) callback();
-				self.setData({
-					res: res.data.data
-				});
-				self.loadCheckedRecord();
+			    if(res.data.code==0){
+					if(callback) callback();
+					self.setData({
+						res: res.data.data
+					});
+					self.loadCheckedRecord();
+				}else{
+					wx.showToast({
+					  title: "网络繁忙，请重试",
+					  icon: 'none',
+					  duration: 2000
+					})
+				}
 		  },
 		});
 	},
@@ -130,7 +138,7 @@ Page({
 		let list;
 		let bqlist;
 		//--判断什么日子是签到的,上个月的--
-		if(this.data.res.qdsdaylist) {
+		if(this.data.res && this.data.res.qdsdaylist) {
 			list = this.data.res.qdsdaylist.split(',');
 			for(var i in this.data.s_dateArr){
 				var item=this.data.s_dateArr[i];
@@ -143,7 +151,7 @@ Page({
 		}	
 		newDateArr=newDateArr.concat(this.data.s_dateArr);			
 		//--判断什么日子是签到的，这个月的--
-		if(this.data.res.qddaylist) {
+		if(this.data.res && this.data.res.qddaylist) {
 			list = this.data.res.qddaylist.split(',');
 			for(var i in this.data.n_dateArr){
 				var item=this.data.n_dateArr[i];
@@ -157,7 +165,7 @@ Page({
 		newDateArr=newDateArr.concat(this.data.n_dateArr);
 	
 		//--判断什么日子是要补签的--
-		if(this.data.res.curbqdaynum) {
+		if(this.data.res && this.data.res.curbqdaynum) {
 			bqlist = this.data.res.curbqdaynum.split(',');
 			for(var i in newDateArr){
 				var item=newDateArr[i];
diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml
index e3dafd1..04b5b9b 100644
--- a/packageA/pages/checkin/checkin.wxml
+++ b/packageA/pages/checkin/checkin.wxml
@@ -7,7 +7,7 @@
 	
 	</view>
 	
-	<view class="list flex">
+	<view class="list flex" wx:if="{{res}}">
 		<view class="list-item active}}">
 			<view class="circle">+{{res.cday1}}</view>
 			<view class="fs26">{{res.sday2}}</view>
@@ -37,8 +37,9 @@
 			<view class="fs26">{{myUtil.setDate(year, res.sday3, 5)}}日</view>
 		</view>
 	</view>
+	<view wx:else style="height: 100rpx;"></view>
 	
-	<view class="btn-container">
+	<view class="btn-container" wx:if="{{res}}">
 		<view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}">
 			<text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}}
 		</view>
@@ -52,8 +53,7 @@
 	<!-- <view class="current">
 		<view class="f-vc">当前连续签到：<text class="days fs34">{{res.getlxnum}}</text> 天</view>
 		<view class="f-vc">当前积分：<text class="fs34">{{integral}}</text></view>
-	</view> -->
-	
+	</view> -->	
 	<!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
 	
 	<view class="calendar-container">
--
libgit2 0.21.4