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
bc4d47ba
Commit
bc4d47ba
authored
Oct 27, 2016
by
杨培
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
课堂中心显示课堂名称
parent
95b928f6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
10 deletions
+35
-10
Classes.php
src/common/models/Classes.php
+1
-1
MyIncomeController.php
src/frontend/controllers/MyIncomeController.php
+2
-3
MyMemberController.php
src/frontend/controllers/MyMemberController.php
+23
-0
classCenter.php
src/frontend/views/layouts/classCenter.php
+5
-1
webpack.config.js
src/frontend/web/webpack.config.js
+4
-5
No files found.
src/common/models/Classes.php
View file @
bc4d47ba
...
...
@@ -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
();
}
/**
...
...
src/frontend/controllers/MyIncomeController.php
View file @
bc4d47ba
...
...
@@ -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
()
]
];
...
...
src/frontend/controllers/MyMemberController.php
View file @
bc4d47ba
...
...
@@ -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
()
]
];
}
/**
* 我的会员
...
...
src/frontend/views/layouts/classCenter.php
View file @
bc4d47ba
...
...
@@ -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
?>
"
>
...
...
src/frontend/web/webpack.config.js
View file @
bc4d47ba
...
...
@@ -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://de
v.qdn
.pp.cc/'
),
__QINIU_URL__
:
JSON
.
stringify
(
'http://de
img.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://de
v.qdn
.pp.cc/'
),
__QINIU_URL__
:
JSON
.
stringify
(
'http://de
img.c
.pp.cc/'
),
}),
]);
// config.devtool = 'source-map'
...
...
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