Commit b8eb654f authored by 杨培's avatar 杨培

Merge remote-tracking branch 'origin/dev' into dev

parents caaf0eb0 1afa0d85
...@@ -36,7 +36,7 @@ class SignupForm extends Model ...@@ -36,7 +36,7 @@ class SignupForm extends Model
[['password', 'rePassword'], 'required'], [['password', 'rePassword'], 'required'],
['password', 'string', 'min' => 6], ['password', 'string', 'min' => 6],
['rePassword', 'string', 'min' => 6], ['rePassword', 'string', 'min' => 6],
['rePassword', 'compare', 'compareAttribute' => 'password'], ['rePassword', 'compare', 'compareAttribute' => 'password','message'=>'密码不一致'],
['from', 'integer'], ['from', 'integer'],
['verifyCode', 'required'], ['verifyCode', 'required'],
['verifyCode', 'captcha','message'=>'验证码不正确'] ['verifyCode', 'captcha','message'=>'验证码不正确']
...@@ -49,7 +49,9 @@ class SignupForm extends Model ...@@ -49,7 +49,9 @@ class SignupForm extends Model
public function attributeLabels() public function attributeLabels()
{ {
return [ return [
'verifyCode'=>'' 'verifyCode'=>'',
'password'=>'',
'rePassword'=>'',
]; ];
} }
......
...@@ -36,7 +36,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -36,7 +36,7 @@ $baseUrl = \yii\helpers\Url::base();
<div class="parallelogram2"></div> <div class="parallelogram2"></div>
<div class="parallelogram3"></div> <div class="parallelogram3"></div>
</div> </div>
<div class="logo-text pull-right">云涯</div> <div class="logo-text pull-left">云涯</div>
</a> </a>
</div> </div>
<!-- <!--
......
...@@ -18,21 +18,109 @@ ...@@ -18,21 +18,109 @@
<link href="http://vjs.zencdn.net/5.0.2/video-js.css" rel="stylesheet"> <link href="http://vjs.zencdn.net/5.0.2/video-js.css" rel="stylesheet">
<script src="http://vjs.zencdn.net/ie8/1.1.0/videojs-ie8.min.js"></script> <script src="http://vjs.zencdn.net/ie8/1.1.0/videojs-ie8.min.js"></script>
<script src="http://vjs.zencdn.net/5.0.2/video.js"></script> <script src="http://vjs.zencdn.net/5.0.2/video.js"></script>
<script src="http://lib.sinaapp.com/js/jquery/1.9.1/jquery-1.9.1.min.js"></script>
<style>
/*审核中视频样式*/
.video-main {
position: relative;
height: 500px;
width: 100%;
background-color: #444;
color: #fff;
text-align: center;
}
.video-main i {
display: block;
font-size: 48px;
padding-top: 170px;
padding-bottom: 40px;
}
.video-main > p {
font-size: 16px;
margin-top: 40px;
line-height: 1.8;
}
/*videojs reset*/
.vjs-big-play-centered .vjs-big-play-button {
z-index: 2!important;
}
.video-js .vjs-mute-control, .video-js .vjs-volume-menu-button, .vjs-icon-volume-high {
font-size: 12px;
}
.video-js .vjs-big-play-button, .video-js .vjs-play-control, .vjs-icon-play {
font-size: 13px;
}
.video-js .vjs-fullscreen-control {
position: absolute;
right: 0;
bottom: 0;
}
.video-js .vjs-control-bar {
background-color: transparent!important;
bottom: 6px!important;
}
.video-js .vjs-progress-control {
position: absolute!important;
width: 100%!important;
left: 0!important;
bottom: 26px!important;
}
.vjs-fullscreen-control {
position: absolute!important;
right: 0!important;
bottom: 0!important;
}
.vjs-icon-fullscreen-enter, .video-js .vjs-fullscreen-control {
font-size: 12px;
}
.vjs-remaining-time {
position: absolute!important;
right: 50px;
}
.video-js .vjs-play-progress {
background-color: #f12b24!important;
}
</style>
</head> </head>
</head> </head>
<body> <body>
<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264" poster="http://img.c.pp.cc/preview/53/5c/de/YeTMnlVXEeeX2500.jpg-l.preview" data-setup="{}"> <div style="width:100%;height:100%" class="video-main">
<source src="http://vdn.c.pp.cc/free/21/c9/e1/71O8rEzYiOUxp2N3p8k9.mp4?e=1477984337&token=Tm34_10r5kYLrUProU3Rx82HXCOnYuF8MhirB_YR:c2sU88scg6ePLF8l2UEXdglXCtU=" type="video/mp4"> <video id="my-video-play" class="video-js vjs-default-skin vjs-big-play-centered" preload="none" width="640" height="264"
<track kind="captions" src="../shared/example-captions.vtt" srclang="en" label="English"></track> poster="http://img.c.pp.cc/preview/53/5c/de/YeTMnlVXEeeX2500.jpg-l.preview" data-setup="{}">
<!-- Tracks need an ending tag thanks to IE9 --> <source
<track kind="subtitles" src="../shared/example-captions.vtt" srclang="en" label="English"></track> src="http://vdn.c.pp.cc/free/21/c9/e1/71O8rEzYiOUxp2N3p8k9.mp4?e=1477984337&token=Tm34_10r5kYLrUProU3Rx82HXCOnYuF8MhirB_YR:c2sU88scg6ePLF8l2UEXdglXCtU="
<!-- Tracks need an ending tag thanks to IE9 --> >
<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p> <!-- Tracks need an ending tag thanks to IE9 -->
</video> </video>
</body> </div>
</body>
<script>
window.VIDEOJS_NO_BASE_THEME = true;
var rate = 9 / 16;
var w = $('.video-main').width();
var h = w * rate;
var myPlayer = videojs("my-video-play", {
"controls": true,
"autoplay": false,
"language": "zh-CN",
"width": w,
"height": h,
}).ready(function () {
$('#my-video-play').css('width', '100%');
var wVideo = $('#my-video-play').width();
var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo);
window.onresize = function () {
var wVideo = $('#my-video-play').width();
var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo);
};
});
</script>
</html> </html>
...@@ -25,7 +25,7 @@ a,a:hover,a:link { ...@@ -25,7 +25,7 @@ a,a:hover,a:link {
.logo-home a { .logo-home a {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
color: #107fbd; color: #333;
vertical-align: top; vertical-align: top;
} }
.yun-login-btn { .yun-login-btn {
......
...@@ -851,7 +851,11 @@ a,a:hover,a:link { ...@@ -851,7 +851,11 @@ a,a:hover,a:link {
padding-right: 15px; padding-right: 15px;
} }
.yun-login-btn { .yun-login-btn {
padding-right: 15px; margin-right: 15px;
}
.video-detail-phone,
.video-detail-phone > .video-sm-info {
height: 0;
} }
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
审核结果将以短信形式通知您</p> 审核结果将以短信形式通知您</p>
</div> </div>
</div> </div>
<div class="video-detail-info"> <div :class="{'video-detail-info':true,'video-detail-phone':coursewareInfo.teachers.length == 0}">
<div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher"> <div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher">
<a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img <a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img
:src="item.avatar"></a> :src="item.avatar"></a>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
data-toggle="modal" disabled="disabled">已购买 data-toggle="modal" disabled="disabled">已购买
</button> </button>
<button v-else <button v-else
class="btn btn-danger m-l-20 mb-left" @click="isMeTips" class="btn btn-danger m-l-20 mb-left"
>购买 ¥{{coursewareInfo.price}} >购买 ¥{{coursewareInfo.price}}
</button> </button>
</template> </template>
...@@ -195,6 +195,10 @@ ...@@ -195,6 +195,10 @@
} }
}, },
methods: { methods: {
isMeTips(){
layer.alert('您发布的课程,无需购买可直接观看。', {'icon': 1, 'title': '提示'})
},
payClick(){ payClick(){
if(!this.coursewareInfo.isGuest){ if(!this.coursewareInfo.isGuest){
if(this.isMobile == false && this.isWeixin == false){ if(this.isMobile == false && this.isWeixin == false){
...@@ -222,12 +226,21 @@ ...@@ -222,12 +226,21 @@
}); });
}, },
mobileAliPay(courseId){ mobileAliPay(courseId){
var url = __BASE_URL__ + 'home/pay?courseId=' + courseId; if(!this.coursewareInfo.isGuest){
window.location.href = url; var url = __BASE_URL__ + 'home/pay?courseId=' + courseId;
window.location.href = url;
}else{
this.login();
}
}, },
weixinJsPay(courseId){ weixinJsPay(courseId){
var url = __BASE_URL__ + 'weixin-js-pay/index?courseId=' + courseId; if(!this.coursewareInfo.isGuest){
window.location.href = url; var url = __BASE_URL__ + 'weixin-js-pay/index?courseId=' + courseId;
window.location.href = url;
}else{
this.login();
}
}, },
login(){ login(){
var returnUrl = __BASE_URL__ + 'home/video?pay=1&courseId=' + this.coursewareInfo.course_id; var returnUrl = __BASE_URL__ + 'home/video?pay=1&courseId=' + this.coursewareInfo.course_id;
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
var h = w * rate; var h = w * rate;
var myPlayer = videojs("my-video-play", { var myPlayer = videojs("my-video-play", {
"techOrder": ['html5', 'flash'], "techOrder": ['html5', 'flash'],
"customControlsOnMobile":true,
"controls": true, "controls": true,
"autoplay": false, "autoplay": false,
"language": "zh-CN", "language": "zh-CN",
...@@ -88,7 +89,7 @@ ...@@ -88,7 +89,7 @@
var hVideo = wVideo * rate; var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo); $('#my-video-play').css('height', hVideo);
}; };
}) });
//没购买显示 //没购买显示
if (this.videoInfo.isShop == false) { if (this.videoInfo.isShop == false) {
myPlayer.on('play', function () { myPlayer.on('play', function () {
......
...@@ -12,7 +12,7 @@ var Utils = { ...@@ -12,7 +12,7 @@ var Utils = {
while (s.length < size) s = "0" + s; while (s.length < size) s = "0" + s;
return s; return s;
}, },
secondsToHms(seconds){ secondsToHms:function(seconds){
var hour = Math.floor(seconds/3600); var hour = Math.floor(seconds/3600);
var min = Math.floor(seconds/60); var min = Math.floor(seconds/60);
var sec = Math.floor(seconds % 60); var sec = Math.floor(seconds % 60);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment