Merge branch 'master' into xudh

Conflicts:
	src/widgets/WCheckIn/index.jsx

src/features/checkInSlice.js

@@ -18,7 +18,7 @@ const reducerCheckinCheck=(state,action,arg)=>{
                 for (let i = 0; i < config.length; i++) {
                     let item=config[i];
                     let DayNumber=parseInt(item.DayNumber);
-                    let RecordDay=parseInt(item.RecordDay.substring(i,i+1))>0?1:0;
+                    let RecordDay=parseInt(data.RecordDay.substring(i,i+1))>0?1:0;
                     let RewScore=parseInt(formatCash(item.RewardScore,true));
                     let SignInDay=parseInt(item.SignInDay);
                     RewardDay.push(DayNumber);

src/widgets/WCheckIn/index.jsx

@@ -125,7 +125,6 @@ const WCheckIn = ({close}) => {
             RewardDay.slice(4,7),
         ]
         let nDayNumber=checkInData.NextDayNumber;
-        nDayNumber=nDayNumber-1;
         if (nDayNumber>7)nDayNumber=7;
         let cbRecord=checkInData.cbRecord;
         let itemIndex=0;