Commit 7c137d0e authored by 汪波's avatar 汪波

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

parents 4fd94352 a72f7b1e
...@@ -30,7 +30,7 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -30,7 +30,7 @@ $this->beginContent('@app/views/layouts/center.php');
<li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'browse-record') ? 'class = "active"' : '' ?>> <li <?= (Yii::$app->controller->id === 'user-center' and Yii::$app->controller->action->id === 'browse-record') ? 'class = "active"' : '' ?>>
<a href="<?= $baseUrl . '/user-center/browse-record' ?>"><i class="icon-visibility"></i>浏览记录</a> <a href="<?= $baseUrl . '/user-center/browse-record' ?>"><i class="icon-visibility"></i>浏览记录</a>
</li> </li>
<li><a href="<?=$baseUrl .'/my-course'?>"><i class="icon-school"></i>我的课堂</a></li> <li><a href="<?=$baseUrl .'/classes-info'?>"><i class="icon-school"></i>我的课堂</a></li>
<li><a href="<?=$baseUrl .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a></li> <li><a href="<?=$baseUrl .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a></li>
<!-- <!--
<li><a href="<?/*=$baseUrl .'/my-course'*/?>"><i class="icon-school"></i>我的课堂</a></li> <li><a href="<?/*=$baseUrl .'/my-course'*/?>"><i class="icon-school"></i>我的课堂</a></li>
......
...@@ -27,15 +27,17 @@ var vm = new Vue({ ...@@ -27,15 +27,17 @@ var vm = new Vue({
}, },
ready: function() { ready: function() {
var self = this; var self = this;
this.$on("video-uploaded", function(name, data) { this.$on("video-uploaded", function(name, data) {
self.vuid = data.uuid; self.vuid = data.uuid;
}); });
this.$on("thumb-uploaded", function(name, data) { this.$on("thumb-uploaded", function(name, data) {
self.previewKey = data.uuid; self.previewKey = data.uuid;
}); });
$.validator.addMethod('courseName',function (value, element, param) {
return value.indexOf('云涯');
});
var validator = $(form).validate({ var validator = $(form).validate({
//debug: true, //debug: true,
//errorClass: "", //errorClass: "",
...@@ -43,7 +45,8 @@ var vm = new Vue({ ...@@ -43,7 +45,8 @@ var vm = new Vue({
ignore: "", ignore: "",
rules: { rules: {
name: { name: {
required: true required: true,
courseName:true
}, },
preview: { preview: {
required: true required: true
...@@ -54,7 +57,8 @@ var vm = new Vue({ ...@@ -54,7 +57,8 @@ var vm = new Vue({
}, },
messages: { messages: {
name: { name: {
required: "请填写标题" required: "请填写标题",
courseName:'课堂名称不允许出现“云涯”二字。'
}, },
preview: { preview: {
required: "必须上传缩略图" required: "必须上传缩略图"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="add-box-main"> <div class="add-box-main">
<div class="tit">基本信息</div> <div class="tit">基本信息</div>
<avatar-upload :uptoken="publicToken"></avatar-upload> <avatar-upload :avatar="avatarsrc" :uptoken="publicToken"></avatar-upload>
<input id="avatar" type="hidden" <input id="avatar" type="hidden"
v-model="avatar"> v-model="avatar">
......
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