Merge branch 'dev' into 'test'

Dev See merge request !602

Merge branch 'dev' into 'test'
Dev See merge request !602
后端研发-苏明海
2 parents 652fcbca 8d1ea610
Showing 9 changed files with 200 additions and 91 deletions
components/full_screen/full_screen.js
components/full_screen/full_screen.wxml
packageA/pages/checkin/checkin.js
packageA/pages/checkin/checkin.wxml
packageA/pages/checkin/checkin.wxs
packageA/pages/checkin/checkin.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/index/index/index.js
utils/auth.js
@@ -12,6 +12,7 @@ Component({
 	url:o.imghost,
 	full_screen:0,
 	is_full_screen_men:1,
+	hidden:0,
   },
   pageLifetimes:{
@@ -21,6 +22,13 @@ Component({
 	},
   },
+  ready: function () {
+	  var th=this;
+	  setTimeout(function(){
+		 th.setData({hidden:1,}) 
+	  },2600)
+  },
+ 
   properties: {},
   methods: {
     close_full_screen(){
 <!-- 全屏控制 -->
-<view hidden="{{!is_full_screen_men}}" class="full_screen" style="background-color: #fff;"></view>
+<view hidden="{{!is_full_screen_men || hidden}}" class="full_screen" style="background-color: #fff;"></view>
 <view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
 	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
 </view>
@@ -12,6 +12,9 @@ Page({
 		day: '',
 		weekArr: ['日', '一', '二', '三', '四', '五', '六'],
 		dateArr: [],
+		n_dateArr:[],  //本月的日期
+		s_dateArr:[],  //上月的日期
+		
 		firstDay: '',
 		lastDay: '',
 		param: null,
@@ -33,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
+					})
+				}
 		  },
 		});
 	},
@@ -52,10 +63,8 @@ Page({
 		this.setDate();
 		var res = wx.getSystemInfoSync();
 		this.setData({
-			param: res.windowHeight / 12,
-			
+			param: res.windowHeight / 12,			
 		})
-
 		// 判断会员是否授权登录，
 		// 没有登录则跳转到登录页，
@@ -103,14 +112,12 @@ Page({
 		});
 	},
-
 	// 点击"我的积分"和"去购物"进行跳转
 	goto(e) {
 		let url = e.target.dataset.url;
 		app.goto(url);
 	},
-	
 	// 点击显示签到规则
 	showRules() {
 		if(this.data.isShowRules) {
@@ -127,34 +134,87 @@ Page({
 	// 加载签到记录
 	loadCheckedRecord() {
-		let newDateArr = this.data.dateArr;
+        let newDateArr=[]; 
 		let list;
 		let bqlist;
-		if(this.data.res.qddaylist) {
+		//--判断什么日子是签到的,上个月的--
+		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];
+				if(this.check_is_qd(item,list)){
+					item.isCheckIn = true;
+				}else{
+					item.isCheckIn = false;
+				}
+			}
+		}	
+		newDateArr=newDateArr.concat(this.data.s_dateArr);			
+		//--判断什么日子是签到的，这个月的--
+		if(this.data.res && this.data.res.qddaylist) {
 			list = this.data.res.qddaylist.split(',');
-			for(let item of list) {
-				newDateArr[item-1].isCheckIn = true;
-			};
+			for(var i in this.data.n_dateArr){
+				var item=this.data.n_dateArr[i];
+				if(this.check_is_qd(item,list)){
+					item.isCheckIn = true;
+				}else{
+					item.isCheckIn = false;
+				}
+			}
 		}
-		if(this.data.res.curbqdaynum) {
+		newDateArr=newDateArr.concat(this.data.n_dateArr);
+	
+		//--判断什么日子是要补签的--
+		if(this.data.res && this.data.res.curbqdaynum) {
 			bqlist = this.data.res.curbqdaynum.split(',');
-			for(let item of bqlist) {
-				var date = new Date(item);
-				newDateArr[date.getDate()-1].isBq = true;
-			}
+			for(var i in newDateArr){
+				var item=newDateArr[i];
+				if(this.check_is_bq(item,bqlist)){
+					item.isBq = true;
+				}else{
+					item.isBq = false;
+				}
+			}			
 		}
 		this.setData({
 			dateArr: newDateArr
 		});
 	},
+	
+	//判断是不是同一个日期，签到的
+	check_is_qd(item,bqlist){
+		for(var i in bqlist){		
+			var c_item=JSON.parse(JSON.stringify(item));
+			if(c_item.num<10) c_item.num="0"+c_item.num;			
+			if(c_item.num==bqlist[i]){
+				return true;
+			}
+		}
+		return false;
+	},
+	
+	//判断是不是同一个日期,补签到的
+    check_is_bq(item,bqlist){
+		for(var i in bqlist){
+			if(item.date==bqlist[i]){
+				return true;
+			}
+		}
+		return false;
+	},
+
 	// 点击签到
 	checkInToday() {
 		const self = this;
 		// 获取今天的签到状态
-		let isCheckInToday = this.data.dateArr[this.data.day-1].isCheckIn;
+		//let isCheckInToday = this.data.dateArr[this.data.day-1].isCheckIn;
+		var ck=this.data.day;
+		if(parseInt(ck)<10) ck="0"+ck;	 
+		var isCheckInToday=this.data.res.qddaylist.indexOf(ck); 
+		
 		// 如果还没签到, 可以点击签到
-		if(!isCheckInToday) {
+		if(isCheckInToday==-1) {
 			app.request.promisePost('/api/weshop/qdrecord/saveQd', {
 				data: {
 					store_id: app.globalData.setting.stoid,
@@ -163,8 +223,16 @@ Page({
 			}).then(res => {
 				// 改变签到状态,由false置为true
 				// let newDateArr = self.data.dateArr;
-				// newDateArr[self.data.day-1].isCheckIn = true;
-				
+				// newDateArr[self.data.day-1].isCheckIn = true;	
+							
+				for(var i in self.data.dateArr) {
+					self.data.dateArr[i].isCheckIn=false;
+					self.data.dateArr[i].isBq=false;
+				}						
+				self.setData({
+					dateArr: self.data.dateArr
+				});				
+							
 				self.loadQd(function() {
 					wx.showToast({
 					  title: self.data.res.qdintro,
@@ -192,26 +260,29 @@ Page({
 				data: {
 					store_id: app.globalData.setting.stoid,
 					user_id: app.globalData.user_id,
-					daynum: self.data.res.getBQIntegral,
+					daynum: self.data.res.getBQIntegral1,
 					bqnum: self.data.res.getbqnum2,
-					bqintegral: self.data.res.getBQIntegral1,
+					bqintegral: self.data.res.getBQIntegral,
 				}
 			}).then(res => {
 				// 改变签到状态,由false置为true
-			// 	let newDateArr = self.data.dateArr;
-			// 	newDateArr[self.data.day-1].isCheckIn = true;
-					var bqlist = self.data.res.curbqdaynum.split(',').sort();
-					var list = [];
+			    // let newDateArr = self.data.dateArr;
+			    // newDateArr[self.data.day-1].isCheckIn = true;
+					//var bqlist = self.data.res.curbqdaynum.split(',').sort();
+					//var list = [];
+					/*--
 					for(let item of bqlist) {
 						var date = new Date(item);
 						list.push(date.getDate());
-					}
-					
-					self.data.dateArr[list[0]-1].isBq = false;
+					}--*/					
+												
+					for(var i in self.data.dateArr) {
+						self.data.dateArr[i].isCheckIn=false;
+						self.data.dateArr[i].isBq=false;
+					}						
 					self.setData({
 						dateArr: self.data.dateArr
-					});
-					
+					});					
 					self.loadQd(function() {
 						self.data.flag = true;
 							wx.showToast({
@@ -227,10 +298,6 @@ Page({
 		}
 	},
-	
-	
-
-
 	getDate: function() { //获取当月日期
 		var mydate = new Date();
 		var year = mydate.getFullYear();
@@ -240,7 +307,7 @@ Page({
 		this.data.month = months;
 		this.data.day = mydate.getDate(); 		//获取当月日期: 1~31
 		var fist = new Date(year, month, 1);
-		this.data.firstDay = fist.getDay();		//获取当月第一天
+		this.data.firstDay = fist.getDay();		//获取当月第一天		
 		var last = new Date(year, months, 0); //0表示当月最后一天
 		this.data.lastDay = last.getDate();   //获取当月最后一天
@@ -249,22 +316,43 @@ Page({
 			month: this.data.month,
 			day: this.data.day,
 			firstDay: this.data.firstDay,
-			lastDay: this.data.lastDay
+			lastDay: this.data.lastDay,
+			fist:fist
 		})
 		console.log("今天：" + this.data.day);
 	},
 	setDate: function() {
 		var day;
-		for (var i = 1; i < this.data.lastDay + 1; i++) {
-			day = {
-				num: i,
-			};
-			this.data.dateArr.push(day);
+		for(var i=0;i<this.data.firstDay;i++){
+			//获取前几天的时间数组
+			var arr_d=this.getNextDate(this.data.fist,i-this.data.firstDay)
+			day = {num: arr_d[1],date:arr_d[0]};
+			this.data.s_dateArr.push(day);
+		}
+			
+		for (var i = 1; i < this.data.lastDay + 1; i++) {			
+			var date=this.data.month+"";
+			if(this.data.month<10) date="0"+date;	
+			if(i<10) {
+				date=date+"-0"+i;
+			}else{
+				date=date+"-"+i;
+			}			
+			day = {num: i,date:date};
+			this.data.n_dateArr.push(day);
 		}
-		this.setData({
-			dateArr: this.data.dateArr,
-		});
 	},
+	//获取相隔是多少天的日期
+    getNextDate(date,day) {  
+	  var dd = date;
+	  dd.setDate(dd.getDate() + day);
+	  //var y = dd.getFullYear();
+	  var m = dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1;
+	  var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
+	  //return y + "-" + m + "-" + d;
+	  return [m + "-" + d,dd.getDate()];
+	}
+	
 })
@@ -2,64 +2,66 @@
 <wxs src="checkin.wxs" module="myUtil"></wxs>
 <view class="checkin-container">
 	<view class="rule-container flex">
-		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral"><image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分</view>
 		<view class="rule" bindtap="showRules">规则</view>
+		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral"><image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分</view>
+	
 	</view>
-	<view class="list flex">
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 0)-1].isCheckIn ? 'active':''}}">
+	<view class="list flex" wx:if="{{res}}">
+		<view class="list-item active}}">
 			<view class="circle">+{{res.cday1}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 0)}}日</view>
+			<view class="fs26">{{res.sday2}}</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 1)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.daynum}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 1)}}日</view>
+			<view class="fs26">今日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 2)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 1,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc1}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 2)}}日</view>
+			<view class="fs26">明日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 3)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 2,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc2}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 3)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 2)}}日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 4)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 3,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc3}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 4)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 3)}}日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 5)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 4,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc4}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 5)}}日</view>
+			<view class="fs26">{{myUtil.setDate(year, res.sday3, 4)}}日</view>
 		</view>
-		<view class="list-item {{dateArr[myUtil.setDate(year, res.sday2, 6)-1].isCheckIn ? 'active':''}}">
+		<view class="list-item {{myUtil.setDate_is_act(year, res.sday3, 5,res.qddaylist)? 'active':''}}">
 			<view class="circle">+{{res.tdayc5}}</view>
-			<view class="fs26">{{myUtil.setDate(year, res.sday2, 6)}}日</view>
+			<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>{{!dateArr[day-1].isCheckIn ? '立即签到':'今日已签到'}}
+			<text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}}
 		</view>
 		<view class="btn" bindtap="isLogin" wx:else>
 			<text class="iconfont icon-rili"></text>签到请登录
 		</view>
-		<view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-10分)</view>
+		<view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-{{res.getBQIntegral}}分)</view>
 	</view>
 	<!-- <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">
 		<view class="calendar-wrapper">
 			<view class="calendar-title">
 				<view>{{year}}年{{month}}月</view>
-				<view class="fs24" style="color:#999;">补签卡：{{res.getkbqnum}}</view>
+				<!-- 有补签，才要补签卡 -->
+				<view wx:if="{{res.getkbqnum}}" class="fs24" style="color:#999;font-weight:bold">补签卡：{{res.getkbqnum}}</view>
 			</view>
 			<view class="calendar">
 			 <!-- <view class="selectDate"> -->
@@ -76,7 +78,7 @@
 			 <view class="date">
 			   <block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key">
 					 <!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> -->
-			     <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
+			     <view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
 						 <view class="day">{{item.num}}</view>
 					 </view>
 			   </block>
 var myUtil = {
-	setDate: function(year, startDate, num) {
+	setDate_is_act: function(year, startDate, num,qdlist) {
 		var date = getDate(year + '-' + startDate);
 		date.setDate(date.getDate() + num);
 		date = getDate(date).getDate();
-		return date;
+		if(date<10) date="0"+date;
+		if(!qdlist) return false;
+		if(qdlist.indexOf(date)!=-1){
+			return true
+		}
+		return false;
 	},
-	// dateDiff: function(firstDate,secondDate) {
-	// 	var firstDate = new Date(firstDate);
-	// 	var secondDate = new Date(secondDate);
-	// 	var diff = Math.abs(firstDate.getTime() - secondDate.getTime());
-	// 	var result = parseInt(diff / (1000 * 60 * 60 * 24));
-	// 	return result;
-	// },
+	setDate:function(year, startDate, num){
+		var date = getDate(year + '-' + startDate);
+		date.setDate(date.getDate() + num);
+		date = getDate(date).getDate();
+		return date; 
+	}
 };
 module.exports = {
 	setDate: myUtil.setDate,
+	setDate_is_act: myUtil.setDate_is_act,
 };
 \ No newline at end of file
@@ -25,8 +25,8 @@ page,
 	background-color: #FFBC47;
 	color: #333;
 	font-size: 26rpx;
-	border-top-right-radius: 25rpx;
-	border-bottom-right-radius: 25rpx;
+	border-top-left-radius: 25rpx;
+	border-bottom-left-radius: 25rpx;
 	display: flex;
 	align-items: center;
 	padding-right: 20rpx;
@@ -34,7 +34,7 @@ page,
 }
 .rule {
 	padding: 10rpx 20rpx;
-	color: #FFBC47;
+	color: white;
 	font-size: 26rpx;
 }
@@ -2160,6 +2160,7 @@ Page({
   },
+  
   //------------处理门店---------------
   deal_pickup(e){
     var th=this;
@@ -4601,8 +4602,8 @@ Page({
       getApp().request.put('/api/weshop/users/update', {
         data: {
-          user_id,
-          def_pickup_id
+          user_id:user_id,
+          def_pickup_id:def_pickup_id
         },
         success: function(res) {
           if (res.data.code == 0) {
@@ -228,12 +228,15 @@ Page({
     var th = this	
 	var show=getApp().globalData.isLoad_ad;
-	if(show){
-	   var full_screen = this.selectComponent("#full_screen"); //组件的id
-	   full_screen.get_the_full_screen();	
+	var userInfo=getApp().globalData.userInfo;
+	//有加载过一次首页，就显示.或者有会员就显示
+	if(show || userInfo || getApp().globalData.user_id){
+	   var full_screen = th.selectComponent("#full_screen"); //组件的id
+	   full_screen.get_the_full_screen();		   
 	}else{
 	   getApp().globalData.isLoad_ad=1;	
-	}
+	}	
+		
   },
   //当隐藏的时候就关闭计时器
@@ -48,6 +48,7 @@ module.exports = {
       console.log("thirdLogin");
       console.log(e);
       a.request.get("/api/weshop/users/openidandkey", {
+		isShowLoading:0,
         data: {
           js_code: e,
           store_id: a.globalData.setting.stoid,
@@ -174,6 +175,7 @@ module.exports = {
     if (app_d.user_id != "" && app_d.user_id != null) {
       var ab = this.app().request;
       ab.get("/api/weshop/users/get/" + oo.stoid + "/" + app_d.user_id, {
+		isShowLoading:0,
         success: function (e) {
           app_d.userInfo = e.data.data;
           "function" == typeof t && t(e.data.data);