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
fe4f446e
Commit
fe4f446e
authored
Nov 05, 2016
by
xiabin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
b84a5c0c
99eb96c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
20 deletions
+38
-20
index.php
src/frontend/views/my-income/index.php
+13
-10
index.php
src/frontend/views/my-member/index.php
+16
-9
style.css
src/frontend/web/css/style.css
+9
-1
No files found.
src/frontend/views/my-income/index.php
View file @
fe4f446e
...
@@ -43,7 +43,9 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
...
@@ -43,7 +43,9 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<ul
class=
"user-list-main"
id=
"userList"
>
<ul
class=
"user-list-main"
id=
"userList"
>
<?php
foreach
(
$data
as
$row
)
{
?>
<?php
foreach
(
$data
as
$row
)
{
?>
<li>
<li>
<div
class=
"reg-time"
><a
href=
"
<?=
\common\models\Course
::
url
(
$row
[
'order'
][
'course_id'
])
?>
"
target=
"_blank"
></a>
课程:
<?=
$row
[
'order'
][
'course'
][
'name'
]
?>
<span>
价格 ¥
<?=
$row
[
'order'
][
'credit'
]
?>
</span></div>
<div
class=
"reg-time"
>
<a
href=
"
<?=
\common\models\Course
::
url
(
$row
[
'order'
][
'course_id'
])
?>
"
target=
"_blank"
></a>
课程:
<?=
$row
[
'order'
][
'course'
][
'name'
]
?>
<span>
价格 ¥
<?=
$row
[
'order'
][
'credit'
]
?>
</span></div>
<div
class=
"user-detail-box"
>
<div
class=
"user-detail-box"
>
<div
class=
"txt"
>
<div
class=
"txt"
>
<p>
用户:
<?=
$row
[
'order'
][
'user'
][
'username'
]
?>
/
<?=
$row
[
'order'
][
'user'
][
'telephone'
]
?>
</p>
<p>
用户:
<?=
$row
[
'order'
][
'user'
][
'username'
]
?>
/
<?=
$row
[
'order'
][
'user'
][
'telephone'
]
?>
</p>
...
@@ -60,18 +62,19 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
...
@@ -60,18 +62,19 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<?php
}
?>
<?php
}
?>
</ul>
</ul>
<script
type=
'text/javascript'
>
$
(
"#userList li .reg-time"
).
click
(
function
(){
var
activeindex
=
$
(
"#userList li"
).
find
(
".reg-time"
).
index
(
this
);
$
(
"#userList li"
).
find
(
".user-detail-box"
).
eq
(
activeindex
).
toggle
();
$
(
"#userList li"
).
find
(
".reg-time span"
).
eq
(
activeindex
).
toggle
();
});
</script>
<div
class=
"text-center"
>
<div
class=
"text-center"
>
<?=
\yii\widgets\LinkPager
::
widget
([
'pagination'
=>
$pagination
])
?>
<?=
\yii\widgets\LinkPager
::
widget
([
'pagination'
=>
$pagination
])
?>
</div>
</div>
</div>
</div>
<?php
}
else
{
?>
<?php
}
else
{
?>
<div
class=
"empty-data"
style=
"margin-top:80px;"
>
您还没有卖出课程的记录!
</div>
<div
class=
"empty-data"
style=
"margin-top:80px;"
>
您还没有卖出课程的记录!
</div>
<?php
}
?>
<?php
}
?>
\ No newline at end of file
<script
type=
'text/javascript'
>
$
(
"#userList li .reg-time"
).
click
(
function
(){
var
activeindex
=
$
(
"#userList li"
).
find
(
".reg-time"
).
index
(
this
);
$
(
"#userList li"
).
find
(
".user-detail-box"
).
eq
(
activeindex
).
toggle
();
$
(
"#userList li"
).
find
(
".reg-time span"
).
eq
(
activeindex
).
toggle
();
$
(
"#userList li"
).
find
(
".reg-time b"
).
eq
(
activeindex
).
toggle
();
});
</script>
src/frontend/views/my-member/index.php
View file @
fe4f446e
...
@@ -38,8 +38,13 @@ $this->title = '我的会员';
...
@@ -38,8 +38,13 @@ $this->title = '我的会员';
<div
class=
"txt"
>
<div
class=
"txt"
>
<p>
来自:推广
</p>
<p>
来自:推广
</p>
<p>
时间:
<?=
date
(
'Y年m月d日'
,
$row
[
'user'
][
'created_at'
])
?>
</p>
<p>
时间:
<?=
date
(
'Y年m月d日'
,
$row
[
'user'
][
'created_at'
])
?>
</p>
<?php
if
(
!
empty
(
$row
[
'first_order'
]))
{
?>
<p>
首次购买:
<a
target=
"_blank"
href=
"
<?=
\common\models\Course
::
url
(
$row
[
'first_order'
][
'course_id'
],
true
)
?>
"
>
《
<?=
$row
[
'first_order'
][
'course'
][
'name'
]
?>
》
</a></p>
<?php
}
else
{
?>
<p>
首次购买:无
</p>
<?php
}
?>
</div>
</div>
<div
class=
"consume"
>
<div
class=
"consume"
style=
"padding-top: 20px;"
>
累计消费
<br/>
累计消费
<br/>
<?=
$row
[
'credit_total'
]
?>
<?=
$row
[
'credit_total'
]
?>
</div>
</div>
...
@@ -48,13 +53,7 @@ $this->title = '我的会员';
...
@@ -48,13 +53,7 @@ $this->title = '我的会员';
<?php
}
?>
<?php
}
?>
</ul>
</ul>
<?php
}
?>
<?php
}
?>
<script
type=
'text/javascript'
>
$
(
"#userList li .reg-time"
).
click
(
function
(){
var
activeindex
=
$
(
"#userList li"
).
find
(
".reg-time"
).
index
(
this
);
$
(
"#userList li"
).
find
(
".user-detail-box"
).
eq
(
activeindex
).
toggle
();
$
(
"#userList li"
).
find
(
".reg-time span"
).
eq
(
activeindex
).
toggle
();
});
</script>
<div
class=
"text-center hide"
>
<div
class=
"text-center hide"
>
<?=
\yii\widgets\LinkPager
::
widget
([
'pagination'
=>
$pagination
])
?>
<?=
\yii\widgets\LinkPager
::
widget
([
'pagination'
=>
$pagination
])
?>
...
@@ -62,4 +61,12 @@ $this->title = '我的会员';
...
@@ -62,4 +61,12 @@ $this->title = '我的会员';
</div>
</div>
<?php
}
else
{
?>
<?php
}
else
{
?>
<div
class=
"empty-data"
style=
"margin-top:80px;"
>
您还没有会员!
</div>
<div
class=
"empty-data"
style=
"margin-top:80px;"
>
您还没有会员!
</div>
<?php
}
?>
<?php
}
?>
\ No newline at end of file
<script
type=
'text/javascript'
>
$
(
"#userList li .reg-time"
).
click
(
function
(){
var
activeindex
=
$
(
"#userList li"
).
find
(
".reg-time"
).
index
(
this
);
$
(
"#userList li"
).
find
(
".user-detail-box"
).
eq
(
activeindex
).
toggle
();
$
(
"#userList li"
).
find
(
".reg-time span"
).
eq
(
activeindex
).
toggle
();
});
</script>
src/frontend/web/css/style.css
View file @
fe4f446e
...
@@ -1610,7 +1610,12 @@ textarea.input-r-control {
...
@@ -1610,7 +1610,12 @@ textarea.input-r-control {
right
:
0
;
right
:
0
;
top
:
0
;
top
:
0
;
padding
:
0
20px
;
padding
:
0
20px
;
color
:
red
;
}
.user-list-main
li
div
.reg-time
b
{
font-weight
:
normal
;
}
.user-list-main
li
div
.reg-time
b
i
{
padding-left
:
10px
;
}
}
.user-list-main
li
div
.user-detail-box
{
.user-list-main
li
div
.user-detail-box
{
...
@@ -1770,6 +1775,9 @@ textarea.input-r-control {
...
@@ -1770,6 +1775,9 @@ textarea.input-r-control {
.buy-recode-top
.col-md-4
{
.buy-recode-top
.col-md-4
{
border-bottom
:
1px
solid
#f3f3f3
;
border-bottom
:
1px
solid
#f3f3f3
;
}
}
.buy-recode-top
.col-md-4
:last-child
{
border-bottom
:
none
;
}
}
}
.menu-mask
{
.menu-mask
{
...
...
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