Commit 1323b164 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent 2ed5de71
...@@ -10,7 +10,7 @@ $this->beginPage() ?> ...@@ -10,7 +10,7 @@ $this->beginPage() ?>
<html lang="<?=\Yii::$app->language?>"> <html lang="<?=\Yii::$app->language?>">
<head> <head>
<meta charset="<?=\Yii::$app->charset?>"> <meta charset="<?=\Yii::$app->charset?>">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" >
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?=($this->title ? Html::encode($this->title).'-' : '')?>云涯</title> <title><?=($this->title ? Html::encode($this->title).'-' : '')?>云涯</title>
<?php $this->head() ?> <?php $this->head() ?>
......
...@@ -54,8 +54,7 @@ $this->registerCss('[v-cloak] {display:none;}'); ...@@ -54,8 +54,7 @@ $this->registerCss('[v-cloak] {display:none;}');
<html lang="<?= \Yii::$app->language ?>"> <html lang="<?= \Yii::$app->language ?>">
<head> <head>
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0, user-scalable=no, width=device-width" name="viewport"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" >
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?= $this->title ? Html::encode($this->title) . '-' : '' ?>云涯</title> <title><?= $this->title ? Html::encode($this->title) . '-' : '' ?>云涯</title>
<?= Html::csrfMetaTags() ?> <?= Html::csrfMetaTags() ?>
......
...@@ -16,8 +16,7 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -16,8 +16,7 @@ $baseUrl = \yii\helpers\Url::base();
<html lang="<?= Yii::$app->language ?>"> <html lang="<?= Yii::$app->language ?>">
<meta charset="<?= Yii::$app->charset ?>"> <meta charset="<?= Yii::$app->charset ?>">
<meta name="copyright" content="云涯"> <meta name="copyright" content="云涯">
<meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0, user-scalable=no, width=device-width" name="viewport"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" >
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>"> <link rel="shortcut icon" href="<?= AppAsset::getStaticUrl('img/favicon.ico') ?>">
<?= Html::csrfMetaTags() ?> <?= Html::csrfMetaTags() ?>
...@@ -29,7 +28,17 @@ $baseUrl = \yii\helpers\Url::base(); ...@@ -29,7 +28,17 @@ $baseUrl = \yii\helpers\Url::base();
<?php if (Yii::$app->user->isGuest) : ?> <?php if (Yii::$app->user->isGuest) : ?>
<div class="navbar-main navbar-static-top clearfix"> <div class="navbar-main navbar-static-top clearfix">
<div id="main-logo" class="logo pull-left logo-home"><a href="<?= $baseUrl . "/user-center/" ?>">云涯</a></div> <div id="main-logo" class="logo pull-left logo-home">
<a href="<?= $baseUrl . "/user-center/" ?>" class="clearfix">
<div class="logo-yunya pull-left">
<div class="parallelogram"></div>
<div class="parallelogram2"></div>
<div class="parallelogram3"></div>
</div>
<div class="logo-text pull-right">云涯</div>
</a>
</div>
<!-- <!--
<ul class="c-menu-item pull-left"> <ul class="c-menu-item pull-left">
<li class="active"><a href="#">首页</a></li> <li class="active"><a href="#">首页</a></li>
......
...@@ -12,8 +12,14 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -12,8 +12,14 @@ $this->beginContent('@app/views/layouts/center.php');
<div class="tp-sidebar"> <div class="tp-sidebar">
<div class="logo"> <div class="logo">
<a href="<?= \yii\helpers\Url::base() ?>"> <a href="<?= \yii\helpers\Url::base() ?>" class="clearfix" style="padding-left: 80px;">
<span class="clearfix"><img src="<?= AppAsset::getStaticUrl('img/logo.png') ?>"> <b>云涯</b></span> <div class="logo-yunya pull-left">
<div class="parallelogram"></div>
<div class="parallelogram2"></div>
<div class="parallelogram3"></div>
</div>
<div class="logo-text pull-left">云涯</div>
<!--<span class="clearfix"><img src="<?/*= AppAsset::getStaticUrl('img/logo.png') */?>"> <b>云涯</b></span>-->
</a> </a>
</div> </div>
<div class="side-menu"> <div class="side-menu">
......
...@@ -17,21 +17,16 @@ a,a:hover,a:link { ...@@ -17,21 +17,16 @@ a,a:hover,a:link {
box-shadow: 0 0 30px rgba(0,0,0,.05); box-shadow: 0 0 30px rgba(0,0,0,.05);
} }
.logo { .logo {
line-height: 60px;
margin-left: 30px; margin-left: 30px;
} }
.logo a { .logo a {
color: #333; color: #333;
} }
.logo-home a { .logo-home a {
display: block; display: inline-block;
width: 80px;
height: 60px;
background: url(../img/logo_white.png) left top no-repeat;
font-size: 14px; font-size: 14px;
line-height: 60px;
text-indent: 35px;
color: #107fbd; color: #107fbd;
vertical-align: top;
} }
.yun-login-btn { .yun-login-btn {
margin-right: 30px; margin-right: 30px;
...@@ -281,3 +276,59 @@ a,a:hover,a:link { ...@@ -281,3 +276,59 @@ a,a:hover,a:link {
margin-right: 15px; margin-right: 15px;
} }
} }
/* css3 logo*/
.logo-yunya {
display: inline-block;
position: relative;
width: 22px;
height: 60px;
overflow: hidden;
}
.parallelogram {
position: absolute;
top: 21px;
left: 0;
width: 12px;
height: 18px;
background-color: rgba(29,32,136,.8);
-webkit-transform: skewY(22deg);
-moz-transform: skewY(22deg);
-o-transform: skewY(22deg);
transform: skewY(22deg);
z-index: 2;
}
.parallelogram2 {
position: absolute;
top: 16px;
left: 6px;
width: 12px;
height: 18px;
background-color: rgba(64,131,175,.8);
-webkit-transform: skewY(-22deg);
-moz-transform: skewY(-22deg);
-o-transform: skewY(-22deg);
transform: skewY(-22deg);
z-index: 1;
}
.parallelogram3 {
position: absolute;
top: 25px;
left: 10px;
width: 12px;
height: 18px;
background-color: rgba(239,178,43,.8);
-webkit-transform: skewY(-22deg);
-moz-transform: skewY(-22deg);
-o-transform: skewY(-22deg);
transform: skewY(-22deg);
z-index: 3;
}
.logo-text {
display: inline-block;
height: 60px;
line-height: 60px;
padding-left: 10px;
}
\ No newline at end of file
...@@ -1713,4 +1713,59 @@ textarea.input-r-control { ...@@ -1713,4 +1713,59 @@ textarea.input-r-control {
background-color: rgb(0, 0, 0); background-color: rgb(0, 0, 0);
opacity: 0.5; opacity: 0.5;
z-index: 4; z-index: 4;
}
/*css3 logo*/
.logo-yunya {
position: relative;
display: inline-block;
width: 22px;
height: 60px;
overflow: hidden;
}
.parallelogram {
position: absolute;
top: 21px;
left: 0;
width: 12px;
height: 18px;
background-color: rgba(76,80,189,.8);
-webkit-transform: skewY(22deg);
-moz-transform: skewY(22deg);
-o-transform: skewY(22deg);
transform: skewY(22deg);
z-index: 2;
}
.parallelogram2 {
position: absolute;
top: 16px;
left: 6px;
width: 12px;
height: 18px;
background-color: rgba(103,167,209,.8);
-webkit-transform: skewY(-22deg);
-moz-transform: skewY(-22deg);
-o-transform: skewY(-22deg);
transform: skewY(-22deg);
z-index: 1;
}
.parallelogram3 {
position: absolute;
top: 25px;
left: 10px;
width: 12px;
height: 18px;
background-color: rgba(239,178,43,.8);
-webkit-transform: skewY(-22deg);
-moz-transform: skewY(-22deg);
-o-transform: skewY(-22deg);
transform: skewY(-22deg);
z-index: 3;
}
.logo-text {
display: inline-block;
height: 60px;
line-height: 60px;
color: #fff;
padding-left: 10px;
} }
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<img v-if="videoInfo.freeTime == 0" :src="videoInfo.previewUrl" width="100%" height="auto"> <img v-if="videoInfo.freeTime == 0" :src="videoInfo.previewUrl" width="100%" height="auto">
<div class="play-mask-box"> <div class="play-mask-box">
<div v-if="videoInfo.freeTime >0" class="look-video"> <div v-if="videoInfo.freeTime >0" class="look-video">
<p>本课程可试看{{videoInfo.freeTime}}分钟</p> <p>本课程可试看{{videoInfo.freeTime}}分钟...</p>
</div> </div>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<template v-if="videoInfo.isMe"> <template v-if="videoInfo.isMe">
<div v-if="showIsMeTips" class="play-mask-box"> <div v-if="showIsMeTips" class="play-mask-box">
<div class="look-video"> <div class="look-video">
<p>您发布的课程,无需购买可直接观看。</p> <p>您发布的课程,无需购买可直接观看</p>
</div> </div>
</div> </div>
</template> </template>
......
...@@ -6,7 +6,7 @@ module.exports = { ...@@ -6,7 +6,7 @@ module.exports = {
var freeTimeTipIdx = 0; var freeTimeTipIdx = 0;
$(form.free_time).focus(function() { $(form.free_time).focus(function() {
freeTimeTipIdx = layer.tips("请认真填写,视频通过审核后试看时间不可再修改。", this, { freeTimeTipIdx = layer.tips("请认真填写,视频通过审核后试看时间不可再修改。", this, {
tips: 2, tips: 2,
time: 0 time: 0
}); });
......
...@@ -49,7 +49,7 @@ var vm = new Vue({ ...@@ -49,7 +49,7 @@ var vm = new Vue({
//validClass: "", //validClass: "",
submitHandler: function() { submitHandler: function() {
var data = $(form).serialize(); var data = $(form).serialize();
var idx = layer.msg("正在提交..", {icon:16, shade: [0.2,'#000'], time:0}); var idx = layer.msg("正在提交...", {icon:16, shade: [0.2,'#000'], time:0});
$.post("/my-course/submit", data, function(t) { $.post("/my-course/submit", data, function(t) {
layer.close(idx); layer.close(idx);
......
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