Merge branch 'wuying' into 'master'

Wuying

See merge request !14

app.js

@@ -53,7 +53,7 @@ App({
 			if (userInfo) { // 判断有没有申请教练
 				wx.redirectTo({
 					url: '/pages/sign/apply/apply',
-				  })
+				})
 			}
 		}
 	},

app.json

@@ -6,6 +6,7 @@
     "pages/sign/bindTel/bindTel",
     "pages/sign/apply/apply",
     "pages/sign/applyResult/applyResult",
+
     "pages/tabbar/class/class",
     "pages/tabbar/financial/financial",
     "pages/tabbar/personal/personal",

pages/index/classManagement/classManagement.js

@@ -2,7 +2,9 @@ const app = getApp()
 import {
 	Base
 } from '../../../utils/base.js';
-const base = new Base()
+const base = new Base();
+const util = require('../../../utils/util');
+
 Page({
 
 	/**
@@ -17,21 +19,40 @@ Page({
 		list: [],
 		locked: false,
 		
-
+		isMoment: true, // 课程瞬间是否能点击
+		curTime: '', // 当前时间
 	},
 
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function (options) {
+		this.getDate()
 		this.setData({
 			// coach_id: '5',
 			class_id: options.class_id,
 			lesson_id: options.lesson_id,
-			classTime: options.classTime, // 上课时间
+			courseTime: options.classTime,
+			classTime: options.classTime.split(' ')[1], // 上课时间
 		})
 		this.getDetail()
 	},
+	getDate() {
+		let date = util.formatTime(new Date())
+		let newDate = new Date()
+		const hour = newDate.getHours()
+		const minute = newDate.getMinutes()
+		let time = date + ' ' + hour + ':' + minute
+		if (time > this.data.courseTime) {
+			this.setData({
+				isMoment: true
+			})
+		} else {
+			this.setData({
+				isMoment: false
+			})
+		}
+	},
 	getDetail() {
 		let params = {
 			url: 'coach/manage_lesson',
@@ -51,28 +72,40 @@ Page({
 		base.newRequest(params)
 	},
 	showButton: function (e) {
-		let child_id = e.currentTarget.dataset.id
-		let params = {
-			url: 'coach/sign',
-			data: {
-				coach_id: this.data.coach_id,
-				lesson_id: this.data.lesson_id,
-				child_id: child_id
-			},
-			callback:(data)=>{
-				base.toast('签到成功')
-				this.setData({
-					list: []
-				})
-				this.getDetail()
-			},
+		let time = this.data.courseTime.split('～')[0]
+		var new_date = new Date(); //新建一个日期对象，默认现在的时间
+		var old_date = new Date(time); //设置过去的一个时间点，"yyyy-MM-dd HH:mm:ss"格式化日期
+		var difftime = old_date - new_date; //上课时间与现在时间的时间差
+		if ((difftime/1000/60) < 1800) {
+			let child_id = e.currentTarget.dataset.id
+			let params = {
+				url: 'coach/sign',
+				data: {
+					coach_id: this.data.coach_id,
+					lesson_id: this.data.lesson_id,
+					child_id: child_id
+				},
+				callback:(data)=>{
+					base.toast('签到成功')
+					this.setData({
+						list: []
+					})
+					this.getDetail()
+				},
+			}
+			base.newRequest(params)
+		} else {
+			base.toast('请于开课前30分钟内签到')
 		}
-		base.newRequest(params)
 	},
 	gocourseInstant: function () {
-		wx.navigateTo({
-			url: '/pages/index/courseInstant/courseInstant',
-		})
+		if (this.data.isMoment) {
+			wx.navigateTo({
+				url: '/pages/index/courseInstant/courseInstant?lesson_id=' + this.data.lesson_id,
+			})
+		} else {
+			base.toast('请开课后上传课程瞬间')
+		}
 	},
 	goevaluation: function () {
 		wx.navigateTo({

pages/index/courseInstant/courseInstant.js

@@ -7,6 +7,7 @@ var qiniuUploader = require("../../../utils/qiniuUploader");
 
 Page({
 	data: {
+		lesson_id: '',
 		videoBox: [],
 		videoShow: true,
 		imgBox: [],
@@ -18,7 +19,25 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function (options) {
-
+		this.setData({
+			lesson_id: options.lesson_id ?  options.lesson_id : ''
+		})
+		if (this.data.lesson_id) {
+			this.getDetail()
+		}
+		
+	},
+	getDetail() {
+		let params = {
+			url: 'coach/getmoment',
+			data: {
+				lesson_id: this.data.lesson_id
+			},
+			callback:(data)=>{
+				console.log(data)
+			}
+		}
+		base.newRequest(params)
 	},
 	// 上传视频
 	chooseVideo: function () {
@@ -125,17 +144,18 @@ Page({
 		}
 		let arr = this.data.videoBox.concat(this.data.imgBox)
 		console.log(arr)
-		// let params = {
-		// 	url: 'coach/moment',
-		// 	data: {
-		// 		coach_id: '',
-		// 		lesson_id: this.data.lesson_id,
-		// 		class_moment: JSON.stringify(arr)
-		// 	},
-		// 	callback:(data)=>{
-		// 		base.toast('提交成功')
-		// 	}
-		// }
-		// base.newRequest(params)
+		let params = {
+			url: 'coach/moment',
+			type: 'POST',
+			data: {
+				coach_id: '5',
+				lesson_id: this.data.lesson_id,
+				class_moment: JSON.stringify(arr)
+			},
+			callback:(data)=>{
+				base.toast('提交成功')
+			}
+		}
+		base.newRequest(params)
 	}
 })
\ No newline at end of file

pages/tabbar/index/index.js

@@ -135,7 +135,7 @@ Page({
     },
     goclassManagement: function (e) {
         let item = e.currentTarget.dataset.item
-        let classTime = item.start_time + '～' + item.end_time
+        let classTime = this.data.curDate + ' ' + item.start_time + '～' + item.end_time
         wx.navigateTo({
             url: '/pages/index/classManagement/classManagement?classTime=' + classTime + '&class_id=' + item.class_id + '&lesson_id=' + item.id,
         })