Commit 3f361c70 authored by 汪波's avatar 汪波

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

parents 0da7f893 1b194c25
......@@ -89,7 +89,7 @@ class Classes extends ActiveRecord
public static function getUserClass($userId)
{
return self::find()->select('id, status')->where(['user_id'=>$userId])->asArray()->one();
return self::find()->select('id, status, name')->where(['user_id'=>$userId])->asArray()->one();
}
/**
......
......@@ -19,6 +19,7 @@ class MyIncomeController extends \yii\web\Controller
{
public $layout = 'classCenter';
public $classStatus;
/**
* @inheritdoc
......@@ -28,7 +29,6 @@ class MyIncomeController extends \yii\web\Controller
return [
'access' => [
'class' => AccessControl::className(),
//'only' => ['index', 'publish', 'submit'],
'rules' => [
[
'allow' => true,
......@@ -36,8 +36,7 @@ class MyIncomeController extends \yii\web\Controller
]
],
'except' => ['wxbind-request', 'wxbind-callback']
],
'classes' => [
], [
'class' => ClassesFilter::className()
]
];
......
......@@ -3,12 +3,35 @@
namespace frontend\controllers;
use common\models\Member;
use frontend\components\ClassesFilter;
use Yii;
use yii\filters\AccessControl;
class MyMemberController extends \yii\web\Controller
{
public $layout = 'classCenter';
public $classStatus;
/**
* @inheritdoc
*/
public function behaviors()
{
return [
'access' => [
'class' => AccessControl::className(),
'rules' => [
[
'allow' => true,
'roles' => ['@']
]
]
], [
'class' => ClassesFilter::className()
]
];
}
/**
* 我的会员
......
......@@ -280,13 +280,13 @@ function actionResetPasswordSuccess()
/**
* 设置登录后回调url
* @param $url
* @throws \yii\web\ForbiddenHttpException
*/
public
function actionSetReturnUrl($url)
function actionSetReturnUrl()
{
if (Yii::$app->request->isAjax) {
$url = Yii::$app->request->post('returnUrl');
Yii::$app->user->setReturnUrl($url);
Utils::ajaxResponse(TRUE);
} else {
......
......@@ -9,7 +9,11 @@ $this->beginContent('@app/views/layouts/center.php');
?>
<div class="tp-sidebar">
<div class="logo"><a href="/"><img src="<?= Yii::$app->assetManager->baseUrl ?>/img/logo.png"></a></div>
<div class="logo">
<?php if (!empty(Yii::$app->controller->classStatus)) { ?>
<a href="<?=\yii\helpers\Url::to(['home/index', 'classId'=>Yii::$app->controller->classStatus['id']])?>" target="_blank"><?=Yii::$app->controller->classStatus['name']?></a>
<?php } ?>
</div>
<div class="side-menu">
<!-- Contenedor -->
<ul id="accordion" class="accordion" data-route="<?=Yii::$app->controller->id?>_<?=Yii::$app->requestedAction->id?>">
......
......@@ -199,10 +199,19 @@
window.location.href = url;
},
login(){
var returnUrl = __BASE_URL__ + 'home/video?courseId=' + this.coursewareInfo.course_id + '&pay=1';
var returnUrl = __BASE_URL__ + 'home/video?pay=1&courseId=' + this.coursewareInfo.course_id;
returnUrl = encodeURI(returnUrl);
var url = __BASE_URL__ + 'site/set-return-url?url=' + returnUrl;
$.getJSON(url, function () {
window.location.href = __BASE_URL__ + 'site/login';
$.ajax({
type:'POST',
url:url,
data: {
returnUrl:returnUrl
},
dataType: "json",
success:function () {
window.location.href = __BASE_URL__ + 'site/login';
}
}).error(function () {
layer.alert('设置登录回调url错误', {'icon': 2, 'title': '提示'})
});
......
......@@ -103,7 +103,7 @@ if (process.env.NODE_ENV === 'production') {
new webpack.DefinePlugin({
__BASE_URL__: JSON.stringify('http://c.pp.cc/'),
__CDN_URL__: JSON.stringify('http://c.pp.cc/'),
__QINIU_URL__: JSON.stringify('http://of805nn40.bkt.clouddn.com/'),
__QINIU_URL__: JSON.stringify('http://img.c.pp.cc/'),
}),
new webpack.optimize.UglifyJsPlugin({
compress: {
......@@ -117,7 +117,7 @@ if (process.env.NODE_ENV === 'production') {
new webpack.DefinePlugin({
__BASE_URL__: JSON.stringify('http://dev.zuiketang.com/'),
__CDN_URL__: JSON.stringify('http://dev.zuiketang.com/'),
__QINIU_URL__: JSON.stringify('http://dev.qdn.pp.cc/'),
__QINIU_URL__: JSON.stringify('http://deimg.c.pp.cc/'),
}),
new webpack.optimize.UglifyJsPlugin({
compress: {
......@@ -125,14 +125,13 @@ if (process.env.NODE_ENV === 'production') {
}
}),
new webpack.optimize.OccurenceOrderPlugin()
])
;
]);
} else {
config.plugins = config.plugins.concat([
new webpack.DefinePlugin({
__BASE_URL__: JSON.stringify('http://dev.zuiketang.com/'),
__CDN_URL__: JSON.stringify('http://dev.zuiketang.com/'),
__QINIU_URL__: JSON.stringify('http://dev.qdn.pp.cc/'),
__QINIU_URL__: JSON.stringify('http://deimg.c.pp.cc/'),
}),
]);
// config.devtool = 'source-map'
......
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