Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 7fd61a42 160faa85
Showing 3 changed files with 56 additions and 74 deletions
components/full_screen/full_screen.wxss
packageA/pages/checkin/checkin.js
packageA/pages/checkin/checkin.wxml
@@ -5,7 +5,7 @@
 	width: 100%;
 	height: 100%;
 	background-position: center;
-	background-size: cover;
+	background-size: 100% 100%;
 	background-repeat: no-repeat;
 }
 // packageA//pages/checkin/checkin.js
 const app = getApp();
-
+let self;
 Page({
 	/**
@@ -25,12 +25,12 @@ Page({
 		checkInNums: 0,		  //补签次数
 		isCheckInDay: '',
-		
 		flag: true,
+		isLogin: false,
+		
 	},
 	loadQd(callback) {
-		let self = this;
 		app.request.get('/api/weshop/qdrecord/getUser/'+ app.globalData.setting.stoid + '/' + app.globalData.user_id, {
 		  success: function (res) {
 				if(callback) callback();
@@ -46,17 +46,62 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function(options) {
-		let self = this;
+		console.log('执行onload');
+		self = this;
 		this.getDate();
 		this.setDate();
 		var res = wx.getSystemInfoSync();
 		this.setData({
 			param: res.windowHeight / 12,
+			
 		})
+
+		
+		// 判断会员是否授权登录，
+		// 没有登录则跳转到登录页，
+		// 已登录则设置已登录状态，请求加载签到数据
+		this.isLogin().then(function() {
+			console.log('loginnnn',app.globalData.userInfo);
+			self.setData({
+				isLogin: true
+			});
+			self.loadQd();
+		});
-		this.loadQd();
 	},
+	
+	onShow() {
+		if(app.globalData.userInfo instanceof Object) {
+			if(this.data.isLogin) {
+				return;
+			} else {
+				this.setData({
+					isLogin: true
+				});
+				this.loadQd();
+			};
+		}
+	},
+	
+	onHide() {
+		console.log('执行onHide');
+	},
+	
+	// 是否登录
+	isLogin() {
+		return new Promise(function(resolve, reject) {
+			let user_info = getApp().globalData.userInfo;
+			if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+				wx.navigateTo({
+					url: '/pages/togoin/togoin',
+				})
+				return false;
+			} else {
+				resolve();
+			};
+		});
+	},
 	// 点击"我的积分"和"去购物"进行跳转
@@ -219,73 +264,7 @@ Page({
 		}
 		this.setData({
 			dateArr: this.data.dateArr,
-			// firstDay: this.data.firstDay
 		});
 	},
-	// prevMonth: function() { //上一月
-	// 	var months = "";
-	// 	var years = "";
-	// 	if (this.data.month == 1) {
-	// 		years = this.data.year - 1
-	// 		this.data.month = 12;
-	// 		months = this.data.month;
-	// 	} else {
-	// 		years = this.data.year;
-	// 		months = this.data.month - 1;
-	// 	}
-
-	// 	var first = new Date(years, months - 1, 1);
-	// 	this.data.firstDay = first.getDay();
-	// 	var last = new Date(years, months, 0);
-	// 	this.data.lastDay = last.getDate();
-
-	// 	this.setData({
-	// 		month: months,
-	// 		year: years,
-	// 		firstDay: this.data.firstDay,
-	// 		lastDay: this.data.lastDay
-	// 	})
-
-	// 	this.data.dateArr = [];
-	// 	for (var i = 1; i < this.data.lastDay + 1; i++) {
-	// 		this.data.dateArr.push(i);
-	// 	}
-	// 	this.setData({
-	// 		dateArr: this.data.dateArr
-	// 	})
-	// },
-	
-	// nextMonth: function() { //下一月
-	// 	var months = "";
-	// 	var years = "";
-	// 	if (this.data.month == 12) {
-	// 		this.data.month = 0;
-	// 		months = this.data.month;
-	// 		years = this.data.year + 1;
-	// 	} else {
-	// 		months = this.data.month + 1;
-	// 		years = this.data.year;
-	// 	}
-	// 	var months = this.data.month + 1;
-	// 	var first = new Date(years, months - 1, 1);
-	// 	this.data.firstDay = first.getDay();
-	// 	var last = new Date(years, months, 0);
-	// 	this.data.lastDay = last.getDate();
-	// 	this.setData({
-	// 		month: months,
-	// 		year: years,
-	// 		firstDay: this.data.firstDay,
-	// 		lastDay: this.data.lastDay
-	// 	})
-
-	// 	this.data.dateArr = [];
-	// 	for (var i = 1; i < this.data.lastDay + 1; i++) {
-	// 		this.data.dateArr.push(i);
-	// 	}
-	// 	this.setData({
-	// 		dateArr: this.data.dateArr
-	// 	})
-	// },
-
 })
@@ -38,9 +38,12 @@
 	</view>
 	<view class="btn-container">
-		<view class="btn" bindtap="checkInToday">
+		<view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}">
 			<text class="iconfont icon-rili"></text>{{!dateArr[day-1].isCheckIn ? '立即签到':'今日已签到'}}
 		</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>
@@ -103,7 +106,7 @@
 		<view class="popup-wrapper">
 			<view class="popup">
 				<view class="popup-title">签到规则</view>
-				<view class="popup-content">1.每日签到领积分</view>
+				<view class="popup-content">{{res.qdrules}}</view>
 			</view>
 			<view class="popup-close">
 				<text class="btn-close" bindtap="showRules">X</text>