Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !33

pages/index/classManagement/classManagement.js

@@ -22,6 +22,8 @@ Page({
 		
 		isMoment: true, // 课程瞬间是否能点击
 		curTime: '', // 当前时间
+
+		isrefresh: false
 	},
 
 	/**
@@ -39,6 +41,17 @@ Page({
 		})
 		this.getDetail()
 	},
+	onShow() {
+		this.setData({
+			isrefresh: this.data.isrefresh? this.data.isrefresh : false
+		})
+		if (this.data.isrefresh) {
+			this.getDetail()
+			this.setData({
+				isrefresh: false
+			})
+		}
+	},
 	getDate() {
 		let date = util.formatTime(new Date())
 		let newDate = new Date()
@@ -115,6 +128,7 @@ Page({
 		let class_single_id = e.currentTarget.dataset.class_single_id
 		let course_id = e.currentTarget.dataset.course_id
 		console.log(course_id)
+		console.log(class_single_id)
 		wx.navigateTo({
 			url: '/pages/index/evaluation/evaluation?child_id=' + child_id + '&class_id=' + class_id + '&class_single_id=' + class_single_id + '&course_id=' + course_id,
 		})

pages/index/evaluation/evaluation.js

@@ -115,7 +115,6 @@ Page({
         badge_ids: this.data.badge_ids.toString(),
         class_id: this.data.class_id,
         class_single_id: this.data.class_single_id,
-        // coach_id : 5,
         coach_id: app.globalData.coach_id,
       },
       type: 'POST',
@@ -123,16 +122,16 @@ Page({
         let params = {
           url: 'coach/comment_save',
           data: {
-            // coach_id : 5,
             coach_id: app.globalData.coach_id,
             lesson_id: this.data.class_single_id,
             child_id: this.data.child_id,
             comment_score: JSON.stringify(obj),
-            commnet: this.data.value
+            comment: this.data.value
           },
           type: 'POST',
           callback: (data) => {
             base.toast('保存成功')
+            base.goBack(2)
           }
         }
         base.newRequest(params)