Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
e756e2d8
Commit
e756e2d8
authored
Oct 24, 2016
by
杨培
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/test' into test
# Conflicts: # src/common/models/Classes.php
parents
5c616ff0
f210652e
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
61 additions
and
79 deletions
+61
-79
.gitignore
.gitignore
+2
-0
BrowseRecord.php
src/common/models/BrowseRecord.php
+0
-1
Classes.php
src/common/models/Classes.php
+0
-1
Comments.php
src/common/models/Comments.php
+0
-1
Consume.php
src/common/models/Consume.php
+0
-2
Course.php
src/common/models/Course.php
+0
-1
CourseTeacher.php
src/common/models/CourseTeacher.php
+0
-2
Courseware.php
src/common/models/Courseware.php
+5
-1
Favorite.php
src/common/models/Favorite.php
+0
-1
Income.php
src/common/models/Income.php
+0
-1
Member.php
src/common/models/Member.php
+0
-1
Orders.php
src/common/models/Orders.php
+0
-1
SettleAccountWeixin.php
src/common/models/SettleAccountWeixin.php
+0
-1
SettleOrders.php
src/common/models/SettleOrders.php
+0
-2
Support.php
src/common/models/Support.php
+0
-1
Teacher.php
src/common/models/Teacher.php
+0
-1
Weixin.php
src/common/models/Weixin.php
+0
-2
m160927_121625_courseware_init.php
src/console/migrations/m160927_121625_courseware_init.php
+2
-0
HomeController.php
src/frontend/controllers/HomeController.php
+14
-6
PayController.php
src/frontend/controllers/PayController.php
+1
-2
QiniuCallbackController.php
src/frontend/controllers/QiniuCallbackController.php
+1
-1
SiteController.php
src/frontend/controllers/SiteController.php
+7
-12
TestController.php
src/frontend/controllers/TestController.php
+0
-2
UserCenterController.php
src/frontend/controllers/UserCenterController.php
+1
-4
LoginForm.php
src/frontend/models/LoginForm.php
+1
-1
PasswordResetRequestForm.php
src/frontend/models/PasswordResetRequestForm.php
+1
-1
ResetPasswordForm.php
src/frontend/models/ResetPasswordForm.php
+1
-2
SignupForm.php
src/frontend/models/SignupForm.php
+1
-1
center.php
src/frontend/views/layouts/center.php
+1
-1
centerHeader.php
src/frontend/views/layouts/centerHeader.php
+1
-1
classCenter.php
src/frontend/views/layouts/classCenter.php
+0
-3
main.php
src/frontend/views/layouts/main.php
+3
-3
userCenter.php
src/frontend/views/layouts/userCenter.php
+0
-2
edit.php
src/frontend/views/my-course/edit.php
+1
-1
publish.php
src/frontend/views/my-course/publish.php
+1
-1
resetPassword.php
src/frontend/views/site/resetPassword.php
+0
-1
resetPasswordSuccess.php
src/frontend/views/site/resetPasswordSuccess.php
+0
-2
tokenInput.php
src/frontend/views/site/tokenInput.php
+1
-2
browseRecord.php
src/frontend/views/user-center/browseRecord.php
+2
-1
video-play.vue
src/frontend/web/js/home/components/video-play.vue
+12
-7
index.js
src/frontend/web/js/home/index.js
+1
-1
webpack.config.js
src/frontend/web/webpack.config.js
+1
-1
No files found.
.gitignore
View file @
e756e2d8
...
...
@@ -31,4 +31,6 @@ phpunit.phar
# vagrant runtime
/.vagrant
# *-local.php
*-local.php
src/common/models/BrowseRecord.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\redis\ActiveRecord
;
...
...
src/common/models/Classes.php
View file @
e756e2d8
...
...
@@ -5,7 +5,6 @@ namespace common\models;
use
common\libs\Utils
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\db\ActiveRecord
;
/**
...
...
src/common/models/Comments.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\db\ActiveRecord
;
...
...
src/common/models/Consume.php
View file @
e756e2d8
...
...
@@ -2,8 +2,6 @@
namespace
common\models
;
use
Yii
;
/**
* This is the model class for table "consume".
*
...
...
src/common/models/Course.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\helpers\HtmlPurifier
;
...
...
src/common/models/CourseTeacher.php
View file @
e756e2d8
...
...
@@ -2,8 +2,6 @@
namespace
common\models
;
use
Yii
;
/**
* This is the model class for table "course_teacher".
*
...
...
src/common/models/Courseware.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\db\ActiveRecord
;
...
...
@@ -14,6 +13,8 @@ use yii\db\ActiveRecord;
* @property integer $course_id
* @property integer $type
* @property string $name
* @property string $src_stand
* @property string $src_free
* @property integer $status
* @property string $size
* @property int $time
...
...
@@ -52,6 +53,7 @@ class Courseware extends ActiveRecord
[[
'user_id'
,
'course_id'
,
'type'
,
'status'
,
'size'
,
'time'
],
'integer'
],
[[
'name'
],
'string'
,
'max'
=>
128
],
[[
'format'
],
'string'
,
'max'
=>
16
],
[[
'src_stand'
,
'src_free'
],
'default'
,
'value'
=>
''
],
[[
'comment_count'
,
'favorite_count'
,
'support_count'
,
'play_count'
],
'default'
,
'value'
=>
0
],
];
...
...
@@ -68,6 +70,8 @@ class Courseware extends ActiveRecord
'course_id'
=>
'Course ID'
,
'type'
=>
'课件类型 默认0'
,
'name'
=>
'Name'
,
'src_stand'
=>
'Src Stand'
,
'src_free'
=>
'Src Free'
,
'status'
=>
'0 未审核 1 审核通过 2 审核不通过 3 锁定 '
,
'size'
=>
'文件大小 kb'
,
'time'
=>
'视频时间 秒'
,
...
...
src/common/models/Favorite.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\db\ActiveRecord
;
...
...
src/common/models/Income.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\redis\ActiveRecord
;
...
...
src/common/models/Member.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\db\ActiveRecord
;
...
...
src/common/models/Orders.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\Pagination
;
use
yii\db\ActiveRecord
;
...
...
src/common/models/SettleAccountWeixin.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\db\ActiveRecord
;
...
...
src/common/models/SettleOrders.php
View file @
e756e2d8
...
...
@@ -2,8 +2,6 @@
namespace
common\models
;
use
Yii
;
/**
* This is the model class for table "settle_orders".
*
...
...
src/common/models/Support.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\redis\ActiveRecord
;
...
...
src/common/models/Teacher.php
View file @
e756e2d8
...
...
@@ -2,7 +2,6 @@
namespace
common\models
;
use
Yii
;
use
yii\behaviors\TimestampBehavior
;
use
yii\data\ActiveDataProvider
;
use
yii\db\ActiveRecord
;
...
...
src/common/models/Weixin.php
View file @
e756e2d8
...
...
@@ -2,8 +2,6 @@
namespace
common\models
;
use
Yii
;
/**
* This is the model class for table "weixin".
*
...
...
src/console/migrations/m160927_121625_courseware_init.php
View file @
e756e2d8
...
...
@@ -20,6 +20,8 @@ class m160927_121625_courseware_init extends Migration
'course_id'
=>
$this
->
integer
()
->
notNull
()
->
unsigned
(),
'type'
=>
$this
->
smallInteger
()
->
notNull
()
->
defaultValue
(
0
)
->
unsigned
()
->
comment
(
'课件类型 默认0'
),
'name'
=>
$this
->
string
(
128
)
->
notNull
(),
'src_stand'
=>
$this
->
string
(
128
)
->
notNull
(),
'src_free'
=>
$this
->
string
(
128
)
->
notNull
(),
'status'
=>
$this
->
smallInteger
()
->
notNull
()
->
defaultValue
(
0
)
->
comment
(
'0 未审核, 1 审核通过, 2 审核不通过, 3 锁定'
),
'size'
=>
$this
->
integer
(
10
)
->
notNull
()
->
unsigned
()
->
comment
(
'文件大小/bytes'
),
'time'
=>
$this
->
smallInteger
(
8
)
->
unsigned
()
->
notNull
()
->
comment
(
'视频时间/秒'
),
...
...
src/frontend/controllers/HomeController.php
View file @
e756e2d8
...
...
@@ -3,6 +3,7 @@
namespace
frontend\controllers
;
use
common\libs\alipay\AliPay
;
use
common\libs\Utils
;
use
common\libs\WeixinPay
;
use
common\models\BrowseRecord
;
use
common\models\Classes
;
...
...
@@ -14,14 +15,11 @@ use common\models\Orders;
use
common\models\Support
;
use
common\models\User
;
use
dosamigos\qrcode\QrCode
;
use
GuzzleHttp\Client
;
use
Yii
;
use
common\libs\Utils
;
use
yii\base\InvalidParamException
;
use
yii\filters\AccessControl
;
use
yii\helpers\ArrayHelper
;
use
yii\helpers\Html
;
use
yii\helpers\Url
;
use
yii\web\ForbiddenHttpException
;
class
HomeController
extends
\yii\web\Controller
...
...
@@ -135,20 +133,30 @@ class HomeController extends \yii\web\Controller
$coursewareInfo
[
'intro'
]
=
$course
->
intro
;
$coursewareInfo
[
'courseName'
]
=
$course
->
name
;
$coursewareInfo
[
'teachers'
]
=
ArrayHelper
::
toArray
(
$teachers
);
$coursewareInfo
[
'videoUrl'
]
=
Yii
::
$app
->
qiniu
->
getUrl
(
'video'
,
$coursewareInfo
[
'name'
]);
$coursewareInfo
[
'isGuest'
]
=
Yii
::
$app
->
user
->
isGuest
;
$coursewareInfo
[
'isSupport'
]
=
(
Support
::
findByUserIdAndCoursewareId
(
$userId
,
$coursewareInfo
[
'id'
])
===
NULL
?
FALSE
:
TRUE
);
$coursewareInfo
[
'isFavorite'
]
=
(
Favorite
::
findByUserIdAndCoursewareId
(
$userId
,
$coursewareInfo
[
'id'
])
===
NULL
?
FALSE
:
TRUE
);
$coursewareInfo
[
'isShop'
]
=
FALSE
;
if
(
!
Yii
::
$app
->
user
->
isGuest
)
{
$coursewareInfo
[
'userAvatar'
]
=
User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
);
$order
=
Orders
::
findByUserIdAndCourseId
(
$userId
,
$courseId
);
$coursewareInfo
[
'isShop'
]
=
(
$order
!==
NULL
and
$order
->
status
===
Orders
::
PAID
?
TRUE
:
FALSE
);
}
if
(
$coursewareInfo
[
'isShop'
]){
$coursewareInfo
[
'videoUrl'
]
=
Yii
::
$app
->
qiniu
->
getUrl
(
'video'
,
$coursewareInfo
[
'src_stand'
]);
}
else
{
$coursewareInfo
[
'videoUrl'
]
=
Yii
::
$app
->
qiniu
->
getUrl
(
'video'
,
$coursewareInfo
[
'src_free'
]);
}
unset
(
$coursewareInfo
[
'src_stand'
]);
unset
(
$coursewareInfo
[
'src_free'
]);
$coursewareInfo
[
'price'
]
=
$course
->
price
;
$coursewareInfo
[
'classId'
]
=
$course
->
class_id
;
$coursewareInfo
[
'className'
]
=
Classes
::
findOne
([
'id'
=>
$course
->
class_id
])
->
name
;
$coursewareInfo
[
'isMobile'
]
=
Yii
::
$app
->
deviceDetect
->
isMobile
();
//处理讲师头像
foreach
(
$coursewareInfo
[
'teachers'
]
as
$key
=>
$value
){
$coursewareInfo
[
'teachers'
][
$key
][
'avatar'
]
=
User
::
getAvatarUrl
(
$value
[
'avatar'
]);
}
return
$this
->
render
(
'video'
,
[
'coursewareInfo'
=>
$coursewareInfo
]);
...
...
@@ -402,7 +410,7 @@ class HomeController extends \yii\web\Controller
"out_trade_no"
=>
$number
,
//订单号
"subject"
=>
"购买课程-
{
$courseBaseInfo
[
'name'
]
}
"
,
//订单名称
"total_fee"
=>
$price
,
//付款金额
"body"
=>
'云崖
购买
'
,
//商品描述
"body"
=>
'云崖'
,
//商品描述
'return_url'
=>
Yii
::
$app
->
request
->
hostInfo
.
'/pay/alipay-return-url'
);
...
...
src/frontend/controllers/PayController.php
View file @
e756e2d8
...
...
@@ -17,7 +17,6 @@ use common\models\Course;
use
common\models\Income
;
use
common\models\Member
;
use
common\models\Orders
;
use
dosamigos\qrcode\formats\Wifi
;
use
GuzzleHttp\Client
;
use
yii\log\Logger
;
use
yii\web\Controller
;
...
...
@@ -186,7 +185,7 @@ class PayController extends Controller
'device_info'
=>
"WEB"
,
'nonce_str'
=>
$data
[
'nonce_str'
],
'sign'
=>
''
,
'body'
=>
'
最课堂
-课程购买'
,
'body'
=>
'
云涯
-课程购买'
,
'out_trade_no'
=>
$order_id
,
'total_fee'
=>
$order
->
credit
*
100
,
'spbill_create_ip'
=>
$_SERVER
[
'SERVER_ADDR'
],
...
...
src/frontend/controllers/QiniuCallbackController.php
View file @
e756e2d8
...
...
@@ -7,9 +7,9 @@
*/
namespace
frontend\controllers
;
use
common\models\UploadPools
;
use
Yii
;
use
yii\web\Response
;
use
common\models\UploadPools
;
class
QiniuCallbackController
extends
\yii\web\Controller
{
...
...
src/frontend/controllers/SiteController.php
View file @
e756e2d8
<?php
namespace
frontend\controllers
;
use
common\libs\Geetest
;
use
common\libs\Message
;
use
common\libs\Utils
;
use
common\models\User
;
use
frontend\models\TokenInputForm
;
use
Yii
;
use
yii\base\InvalidParamException
;
use
yii\helpers\HtmlPurifier
;
use
yii\web\BadRequestHttpException
;
use
yii\web\Controller
;
use
yii\filters\VerbFilter
;
use
yii\filters\AccessControl
;
use
frontend\models\ContactForm
;
use
frontend\models\LoginForm
;
use
frontend\models\PasswordResetRequestForm
;
use
frontend\models\ResetPasswordForm
;
use
frontend\models\SignupForm
;
use
frontend\models\ContactForm
;
use
frontend\models\TokenInputForm
;
use
Yii
;
use
yii\filters\AccessControl
;
use
yii\helpers\HtmlPurifier
;
use
yii\web\Controller
;
/**
* Site controller
...
...
@@ -85,7 +80,7 @@ class SiteController extends Controller
'maxLength'
=>
6
,
'minLength'
=>
6
,
'transparent'
=>
TRUE
,
'padding'
=>
10
,
'padding'
=>
5
,
],
];
...
...
src/frontend/controllers/TestController.php
View file @
e756e2d8
...
...
@@ -11,8 +11,6 @@ namespace frontend\controllers;
use
common\libs\Utils
;
use
GuzzleHttp\Client
;
use
GuzzleHttp\Psr7\Request
;
use
yii\log\Logger
;
use
yii\web\Controller
;
class
TestController
extends
Controller
...
...
src/frontend/controllers/UserCenterController.php
View file @
e756e2d8
...
...
@@ -15,13 +15,10 @@ use common\models\BrowseRecord;
use
common\models\Favorite
;
use
common\models\Orders
;
use
common\models\UploadPools
;
use
common\models\User
;
use
yii\base\ErrorException
;
use
yii\base\Exception
;
use
Yii
;
use
yii\filters\AccessControl
;
use
yii\helpers\Html
;
use
yii\web\Controller
;
use
Yii
;
class
UserCenterController
extends
Controller
{
...
...
src/frontend/models/LoginForm.php
View file @
e756e2d8
...
...
@@ -2,9 +2,9 @@
namespace
frontend\models
;
use
common\libs\Utils
;
use
common\models\User
;
use
Yii
;
use
yii\base\Model
;
use
common\models\User
;
/**
* Login form
...
...
src/frontend/models/PasswordResetRequestForm.php
View file @
e756e2d8
...
...
@@ -3,9 +3,9 @@ namespace frontend\models;
use
common\libs\Message
;
use
common\libs\SendMsg
;
use
common\models\User
;
use
Yii
;
use
yii\base\Model
;
use
common\models\User
;
use
yii\log\Logger
;
/**
...
...
src/frontend/models/ResetPasswordForm.php
View file @
e756e2d8
<?php
namespace
frontend\models
;
use
yii\base\Model
;
use
yii\base\InvalidParamException
;
use
common\models\User
;
use
yii\base\Model
;
/**
* Password reset form
...
...
src/frontend/models/SignupForm.php
View file @
e756e2d8
...
...
@@ -3,9 +3,9 @@ namespace frontend\models;
use
common\libs\Utils
;
use
common\models\Member
;
use
common\models\User
;
use
Yii
;
use
yii\base\Model
;
use
common\models\User
;
use
yii\log\Logger
;
/**
...
...
src/frontend/views/layouts/center.php
View file @
e756e2d8
<?php
use
frontend\assets\AppAsset
;
use
yii\helpers\Html
;
use
yii\web\View
;
use
frontend\assets\AppAsset
;
/* @var $this \yii\web\View */
/* @var $content string */
...
...
src/frontend/views/layouts/centerHeader.php
View file @
e756e2d8
...
...
@@ -8,5 +8,5 @@
?>
<div
class=
"tp-head navbar-fixed-top clearfix"
>
<div
class=
"menu-btn fl"
><a
href=
"javascript:;"
><i
class=
"icon-menu"
></i></a></div>
<div
class=
"avatar fr"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
.
'user-center'
?>
"
><img
src=
"
<?=
\common\models\User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
)
?>
"
></a></div>
<div
class=
"avatar fr"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
.
'user-center
/
'
?>
"
><img
src=
"
<?=
\common\models\User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
)
?>
"
></a></div>
</div>
src/frontend/views/layouts/classCenter.php
View file @
e756e2d8
<?php
use
yii\helpers\Html
;
use
yii\web\View
;
use
frontend\assets\AppAsset
;
/* @var $this \yii\web\View */
/* @var $content string */
...
...
src/frontend/views/layouts/main.php
View file @
e756e2d8
...
...
@@ -3,8 +3,8 @@
/* @var $this \yii\web\View */
/* @var $content string */
use
yii\helpers\Html
;
use
frontend\assets\AppAsset
;
use
yii\helpers\Html
;
AppAsset
::
register
(
$this
);
$baseUrl
=
\yii\helpers\Url
::
base
();
...
...
@@ -47,8 +47,8 @@ $baseUrl = \yii\helpers\Url::base();
<?php
else
:
?>
<div
class=
"navbar-main navbar-static-top clearfix"
>
<div
id=
"main-logo"
class=
"logo pull-left"
><a
href=
"
<?=
$baseUrl
.
"/user-center"
?>
"
>
云崖
</a></div>
<div
class=
"avatar pull-right"
><a
href=
"
user-center
"
><img
src=
"
<?=
\common\models\User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
)
?>
"
></a></div>
<div
id=
"main-logo"
class=
"logo pull-left"
><a
href=
"
<?=
$baseUrl
.
"/user-center
/
"
?>
"
>
云崖
</a></div>
<div
class=
"avatar pull-right"
><a
href=
"
<?=
\yii\helpers\Url
::
base
()
.
'/user-center/'
?>
"
><img
src=
"
<?=
\common\models\User
::
getAvatarUrl
(
Yii
::
$app
->
user
->
identity
->
avatar
)
?>
"
></a></div>
</div>
<?php
endif
;
?>
...
...
src/frontend/views/layouts/userCenter.php
View file @
e756e2d8
<?php
use
yii\helpers\Html
;
use
yii\web\View
;
use
frontend\assets\AppAsset
;
/* @var $this \yii\web\View */
...
...
src/frontend/views/my-course/edit.php
View file @
e756e2d8
...
...
@@ -13,7 +13,7 @@ $this->title = '编辑课程信息';
AppAsset
::
addScript
(
$this
,
'@web/assets/course_edit.js'
);
AppAsset
::
addCss
(
$this
,
'@web/assets/css/course_publish.css'
);
?>
<div
class=
"send-class"
id=
"publishMain"
xmlns:v-el=
"http://www.w3.org/1999/xhtml"
>
<div
class=
"send-class"
id=
"publishMain"
>
<div
class=
"tit"
>
编辑课程信息
</div>
<form
method=
"post"
name=
"courseEdit"
>
...
...
src/frontend/views/my-course/publish.php
View file @
e756e2d8
...
...
@@ -13,7 +13,7 @@ $this->title = '发布课程';
AppAsset
::
addScript
(
$this
,
'@web/assets/course_publish.js'
);
AppAsset
::
addCss
(
$this
,
'@web/assets/css/course_publish.css'
);
?>
<div
class=
"send-class"
id=
"publishMain"
xmlns:v-el=
"http://www.w3.org/1999/xhtml"
>
<div
class=
"send-class"
id=
"publishMain"
>
<div
class=
"tit"
>
发布课程
</div>
<form
method=
"post"
name=
"coursePublish"
>
...
...
src/frontend/views/site/resetPassword.php
View file @
e756e2d8
...
...
@@ -4,7 +4,6 @@
/* @var $form yii\bootstrap\ActiveForm */
/* @var $model \frontend\models\ResetPasswordForm */
use
yii\helpers\Html
;
use
yii\bootstrap\ActiveForm
;
$this
->
title
=
'Reset password'
;
...
...
src/frontend/views/site/resetPasswordSuccess.php
View file @
e756e2d8
...
...
@@ -6,8 +6,6 @@
* Time: 下午5:08
*/
use
yii\helpers\Html
;
$this
->
title
=
'密码设置成功'
;
...
...
src/frontend/views/site/tokenInput.php
View file @
e756e2d8
...
...
@@ -7,9 +7,8 @@
*/
use
yii\captcha\Captcha
;
use
yii\helpers\Html
;
use
yii\bootstrap\ActiveForm
;
use
yii\captcha\Captcha
;
$this
->
title
=
'输入验证码'
;
\frontend\assets\AppAsset
::
addScript
(
$this
,
'@web/assets/token_input.js'
);
...
...
src/frontend/views/user-center/browseRecord.php
View file @
e756e2d8
...
...
@@ -5,8 +5,9 @@
* Date: 2016/9/29
* Time: 上午9:59
*/
use
\
frontend\assets\AppAsset
;
use
frontend\assets\AppAsset
;
use
yii\widgets\LinkPager
;
$baseUrl
=
\yii\helpers\Url
::
base
();
$this
->
title
=
'浏览记录'
;
...
...
src/frontend/web/js/home/components/video-play.vue
View file @
e756e2d8
...
...
@@ -9,20 +9,20 @@
</div>
</div>
<div
v-show=
"videoShow"
class=
"video-main"
>
<div
class=
"video-main"
>
<video
id=
"my-video-play"
class=
"video-js vjs-default-skin vjs-big-play-centered"
controls
preload=
"auto"
>
<source
:src=
"coursewareInfo.videoUrl"
type=
"video/mp4"
/>
<source
:src=
"coursewareInfo.videoUrl"
/>
</video>
</div>
<div
class=
"video-detail-info"
>
<div
v-for=
"(index,item) in coursewareInfo.teachers"
class=
"video-teacher"
>
<a
data-toggle=
"modal"
data-target=
"
{{
{
'#teacherInfo'
+
index
}}
}
"><img
:src="
getFullPic
(
item
.
avatar
)
"></a>
:src="
item
.
avatar
"></a>
<p><a href="
javascript
:;
" data-toggle="
modal
" data-target="
#
myModal2
">{{item.name
}}
</a></p>
</div>
<div class="
video
-
sm
-
info
pull
-
right
">
<div class="
video
-
sm
-
info
pull
-
right
"
style="
width
:
100
%
"
>
<p class="
mb
-
right
">
<a href="
javascript
:;
"><i class="
icon
-
comment
-
empty
"></i>{{coursewareInfo.comment_count
}}
</a>
<a @click="
favorite
" href="
javascript
:;
"><i
...
...
@@ -100,7 +100,7 @@
</div>
<div class="
modal
-
body
">
<div class="
teacher
-
info
text
-
center
">
<img :src="
getFullPic
(
item
.
avatar
)
">
<img :src="
item
.
avatar
">
<h3>{{item.name
}}
</h3>
<p class="
teacher
-
detail
">{{{item.intro
}}
}
</p>
</div>
...
...
@@ -248,12 +248,13 @@
this.isMobile = this.coursewareInfo.isMobile;
this.isWeixin = Utils.isWeixin();
videojs("
my
-
video
-
play
", {
"
techOrder
": ['html5','flash'],
"
controls
": true,
"
autoplay
": false,
"
language
": "
zh
-
CN
",
poster: this.coursewareInfo.previewUrl
}
).ready(function () {
var myPlayer = this
;
self.videoShow = true
;
var rate = 9 / 16;
$('#my-video-play').css('width', '100%');
var wVideo = $('.video-detail-info').width();
...
...
@@ -264,11 +265,15 @@
var hVideo = wVideo * rate;
$('#my-video-play').css('height', hVideo);
}
;
self.videoShow = true;
}
);
}
}
</script>
src/frontend/web/js/home/index.js
View file @
e756e2d8
...
...
@@ -7,7 +7,7 @@ var courseLists = require('./components/course-lists.vue');
var
classInfo
=
JSON
.
parse
(
$
(
'#class-info'
).
val
());
//logo定制
var
html
=
'<a href="'
+
__BASE_URL__
+
'user-center'
+
'">'
+
classInfo
.
name
+
'</a>'
var
html
=
'<a href="'
+
__BASE_URL__
+
'user-center
/
'
+
'">'
+
classInfo
.
name
+
'</a>'
$
(
'#main-logo'
).
empty
().
html
(
html
);
//注册定制
var
href
=
$
(
'#main-sign'
).
attr
(
"href"
)
...
...
src/frontend/web/webpack.config.js
View file @
e756e2d8
...
...
@@ -75,7 +75,7 @@ var config = {
// {from: __dirname + '/resource', to: 'resource'},
{
from
:
lib_dir
+
'/layer'
,
to
:
'layer'
},
{
from
:
img_dir
,
to
:
'img'
},
{
from
:
lib_dir
+
'/videojs/video-js.swf'
,
to
:
'
libs/
videojs/'
},
{
from
:
lib_dir
+
'/videojs/video-js.swf'
,
to
:
'videojs/'
},
{
from
:
lib_dir
+
'/plupload'
,
to
:
'plupload'
},
// {from: manage_dir + '/dist', to: 'manage/dist'},
// {from: manage_dir + '/plugins', to: 'manage/plugins'},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment