Merge branch 'dev_znz' into 'master'

zb-0519

See merge request !14

src/wx/pages/classDetails/classDetails.wxml

@@ -2,7 +2,8 @@
 <custom-navi text="课程详情" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
 <view class='classDetails'>
 	<view class="top">
-		<image src="{{frontImage}}" mode="widthFix" style="width:100%"></image>
+		<image src="{{frontImage}}" mode="widthFix" style="width:100%" wx:if="{{showPlay!=1}}"></image>
+		<video src="{{playUrl}}" wx:if="{{showPlay==1}}"></video>
 	</view>
 	<view class="title">
 		<view class="courseTitle">
@@ -47,8 +48,8 @@
 				<block wx:for="{{mediaList}}">
 					<view class="catalog">
 						<text bindtap='videoplay'>{{item.title}}</text>
-            <image src='/img/suo1.png' class='suo' wx:if="{{!haveBuy&&price>0}}" ></image>
-            <image src='/img/sanjiao.png' class='suo' wx:if="{{haveBuy||price==0}}" bindtap="learn" data-id="{{item.id}}"></image>
+						<image src='/img/suo1.png' class='suo' wx:if="{{!haveBuy&&price>0}}"></image>
+						<image src='/img/sanjiao.png' class='suo' wx:if="{{haveBuy||price==0}}" bindtap="learn" data-id="{{item.id}}"></image>
 					</view>
 				</block>
 			</view>
@@ -56,31 +57,17 @@
 	</view>
 	<view class="bottom_btn">
 		<view class="share">
-      <button open-type="share"></button>
+			<button open-type="share"></button>
 			<image src="/img/share.png"></image>
 			课程分享
 		</view>
 		<!-- 单个课程 -->
 		<view class="buyBtn" wx:if="{{courseId==0 && haveBuy==false && price > 0}}" bindtap="learn" data-id="{{mediaId}}">课程金额：{{price}}</view>
-    <view class="buyBtn" wx:elif="{{courseId==0}}" bindtap="learn" data-id="{{mediaId}}">学习</view>
+		<view class="buyBtn" wx:elif="{{courseId==0}}" bindtap="learn" data-id="{{mediaId}}">学习</view>
 
-    <!-- 合集课程 -->
+		<!-- 合集课程 -->
 		<view class="buyBtn" wx:if="{{courseId>0 && haveBuy==false && price > 0}}" bindtap="learn" data-id="{{mediaId}}">课程金额：{{price}}</view>
-    <view class="buyBtn" wx:elif="{{courseId>0}}">请点击目录学习</view>
-	</view>
-</view>
-<view class='play' wx:if="{{showPlay==1}}">
-	<video class='video' src="{{playUrl}}"></video>
-	<view style='font-size:14px;padding-left:5px;margin-top:10px;'>
-		<image src='../../img/sanjiao.png'></image>课程简介
-	</view>
-	<view style='font-size:14px;padding-left:5px;margin-top:5px;'>
-		{{detailComment}}
-	</view>
-
-	<!-- <view class='backplay' bindtap='backplay'>返回</view> -->
-	<view class="backButton" style="text-align:center;">
-		<van-button type="warning" bind:click="backplay" size='large'>返回</van-button>
+		<view class="buyBtn" wx:elif="{{courseId>0}}">请点击目录学习</view>
 	</view>
 </view>
 <view class='fufeilook' wx:if="{{showPay==1}}">

src/wx/pages/classDetails/classDetails.wxss

@@ -9,6 +9,11 @@ page {
   margin-bottom: 20px;
 }
 
+.classDetails .top video {
+  width: 100%;
+  max-height: 500px;
+}
+
 .classDetails .title {
   padding: 0 5%;
 }
@@ -185,38 +190,6 @@ page {
   background: linear-gradient(to right, #e85c6d, #fb689b);
 }
 
-.play {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: #fff;
-}
-
-.play>video {
-  width: 100%;
-  max-height: 500px;
-}
-
-.play>view>image {
-  width: 10px;
-  height: 10px;
-}
-
-.play .backButton {
-  position: absolute;
-  width: 100%;
-  height: 40px;
-  bottom: 0;
-  left: 0;
-  font-size: 14px;
-}
-
-.play .van-button--large {
-  height: 40px;
-}
-
 .backplay {
   position: fixed;
   bottom: 0;