Merge branch 'wuying' into 'master'

Wuying

See merge request !48

pages/index/classDetail/classDetail.wxml

@@ -26,7 +26,7 @@
 		<view class="status">
 			<view class="evaluation" data-id="{{item.child_id}}" data-class_single_id="{{item.class_single_id}}"  catchtap="goperformance" wx:if="{{item.is_leave == 0 && item.sign_status == 1}}">运动评价</view>
 			<view class="leave" wx:else>已请假</view>
-			<view class="unread" wx:if="{{ !item.class_moment }}"></view>
+			<!-- <view class="unread" wx:if="{{ !item.class_moment }}"></view> -->
 		</view>
 	</view>
 </view>
\ No newline at end of file

pages/index/courseInstant/courseInstant.js

@@ -123,7 +123,6 @@ Page({
 					that.setData({
 						imgBox: imgs
 					});
-					console.log(that.data.imgBox)
 				})
 			},
 			fail() {
@@ -143,10 +142,14 @@ Page({
 	// 预览图片
 	previewImg: function (e) {
 		var index = e.currentTarget.dataset.index
+		var arr = []
+		for (var i=0;i<this.data.imgBox.length;i++) {
+			arr.push(this.data.imgBox[i].url)
+		}
 		var imgs = this.data.imgBox
 		wx.previewImage({
 			current: imgs[index].url,
-			urls: this.data.imgBox
+			urls: arr
 		})
 	},
 	save() {
@@ -174,5 +177,9 @@ Page({
 			}
 		}
 		base.newRequest(params)
+	},
+
+	paly() { // 播放视频
+		
 	}
 })
\ No newline at end of file

pages/index/courseInstant/courseInstant.wxml

-<view class="video">
+<view wx:if="{{type != 'check'}}">
+	<view class="video">
+		<view class="head">
+			<text class="title">运动工程</text>
+		</view>
+		<view class="imgBox flex-h">
+			<view class="img videoBox" wx:for="{{videoBox}}" wx:for-item="item" wx:key="idx">
+				<video src="{{item.url}}" data-index="{{index}}" bindplay='paly'></video>
+			</view>
+		</view>
+	</view>
+	<view class="video">
+		<view class="head">
+			<text class="title">精彩瞬间</text>
+		</view>
+		<view class="imgBox flex-h flex-hw">
+			<view class="img" wx:for="{{imgBox}}" wx:for-item="item" wx:key="idx">
+				<image src="{{item.url}}" data-index="{{index}}" mode="aspectFill" bindtap="previewImg"></image>
+			</view>
+		</view>
+	</view>
+</view>
+<view wx:else>
+	<view class="video">
 		<view class="head">
 			<text class="title">拍摄运动工程</text>
 			<text class="up">（可上传1个视频）</text>
@@ -14,8 +37,8 @@
 				<text class='iconfont iconshipin'></text>
 			</view>
 		</view>
-</view>
-<view class="video">
+	</view>
+	<view class="video">
 		<view class="head">
 			<text class="title">记录精彩瞬间</text>
 			<text class="up">（最多可上传9张照片）</text>
@@ -27,11 +50,14 @@
 					<text class='iconfont iconguanbi'></text>
 				</view>
 			</view>
-		<view class='addBox flex-h flex-vc flex-hc' bindtap="chooseImg" wx:if="{{imgBox.length < 9 && type != 'check' }}">
+			<view class='addBox flex-h flex-vc flex-hc' bindtap="chooseImg"
+				wx:if="{{imgBox.length < 9 && type != 'check' }}">
 				<text class='iconfont iconxiangji'></text>
 			</view>
 		</view>
-</view>
-<view class="button" wx:if="{{type != 'check'}}">
+	</view>
+	<view class="button" wx:if="{{type != 'check'}}">
 		<view class="submit" catchtap="save">提交</view>
+	</view>
+
 </view>
\ No newline at end of file

pages/my/parents/parents.js

@@ -24,7 +24,6 @@ Page({
     let params = {
       url: 'coach/reply',
       data: {
-        // coach_id : 4,
         coach_id: app.globalData.coach_id
       },
       callback: (data) => {