切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
anyv
6 years ago
提交
57014ee08b35e136b184caaacce13c109c3d757c
1 个父辈
991d205a
1 个管道 的构建
通过
耗费 1 秒
4
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
122 行增加
和
25 行删除
app/portal/controller/PersonalcenterController.php
public/themes/simpleboot3/portal/personalcenter/income_record.html
simplewind/cmf/controller/WeChatBaseController.php
app/portal/controller/PersonalcenterController.php
查看文件 @
57014ee
...
...
@@ -578,7 +578,21 @@ class PersonalcenterController extends WeChatBaseController{
$aaaa
=
array_merge
(
$res
,
$my_res
);
$bb
=
array_column
(
$aaaa
,
'create_time'
);
$cc
=
array_multisort
(
$bb
,
SORT_DESC
,
$aaaa
);
$this
->
assign
(
'res'
,
$aaaa
);
if
(
count
(
$res
)
!=
0
||
count
(
$my_res
)
!=
0
){
foreach
(
$aaaa
as
$key
=>
$val
){
if
(
$val
[
'indent_type'
]
==
1
){
$pingtai
[]
=
$val
;
}
else
{
$yewu
[]
=
$val
;
}
}
$this
->
assign
(
'pingtai'
,
$pingtai
);
$this
->
assign
(
'yewu'
,
$yewu
);
}
else
{
$this
->
assign
(
'pingtai'
,
array
());
$this
->
assign
(
'yewu'
,
array
());
}
// $this -> assign('res',$aaaa);
// $this -> assign('my_res',$my_res);
return
$this
->
fetch
();
...
...
public/themes/simpleboot3/portal/personalcenter/income_record.html
查看文件 @
57014ee
...
...
@@ -60,6 +60,41 @@
.mui-pciker-list
li
.highlight
{
color
:
#FF7700
;
}
.wire
{
width
:
100%
;
height
:
0.16rem
;
background
:
#fff
;
}
.qiehuan_tab
{
padding-top
:
0.16rem
;
display
:
flex
;
display
:
-webkit-flex
;
justify-content
:
space-around
;
align-items
:
center
;
}
.qiehuan_left
{
width
:
2rem
;
height
:
0.6rem
;
font-size
:
0.28rem
;
background
:
#fff
;
color
:
#333
;
border-radius
:
0.5rem
;
text-align
:
center
;
line-height
:
0.6rem
;
box-shadow
:
0
0.06rem
0.12rem
rgba
(
255
,
255
,
255
,
1
);
;
}
.qiehuan_lefts
{
background
:
linear-gradient
(
328deg
,
rgba
(
255
,
78
,
0
,
1
)
0%
,
rgba
(
255
,
157
,
45
,
1
)
100%
);
box-shadow
:
0
0.06rem
0.12rem
rgba
(
255
,
128
,
0
,
0.24
);
box-sizing
:
border-box
;
color
:
rgba
(
255
,
255
,
255
,
1
);
}
.b
{
display
:
none
;
}
</style>
<body>
<!-- 顶部 -->
...
...
@@ -80,30 +115,63 @@
<div
class=
"time_btn"
onclick=
"my_search()"
>
搜索
</div>
</div>
<div
class=
"record_Box"
>
<ul>
<volist
name=
"res"
id=
"vo"
>
<li>
<div
class=
"recordImg"
>
<img
src=
"{$vo.avatar}"
alt=
""
>
</div>
<div
class=
"recordTxt"
>
<div
class=
"recordTxt1 one-txt-cut"
>
{$vo.user_name}购买了{$vo.book_name}
</div>
<if
condition=
"$vo.indent_type eq 1"
>
<div
class=
"recordTxt2"
>
平台订单
</div>
</if>
<if
condition=
"$vo.indent_type eq 2"
>
<div
class=
"recordTxt2"
>
业务员订单
</div>
</if>
<p
class=
"recordTxt3"
>
{$vo.create_time|date="Y-m-d H:i:s",###}
</p>
</div>
<div
class=
"recordNum"
>
佣金+{$vo.total_money}
</div>
</li>
</volist>
</ul>
<div
class=
"wire"
></div>
<!--切换tab-->
<div
class=
"qiehuan_tab"
>
<div
class=
"qiehuan_left qiehuan_lefts"
>
平台收入
</div>
<div
class=
"qiehuan_left"
>
团购收入
</div>
</div>
<!--列表数据内容-->
<div
class=
"a"
>
<div
class=
"record_Box"
>
<ul>
<volist
name=
"pingtai"
id=
"vo"
>
<li>
<div
class=
"recordImg"
>
<img
src=
"{$vo.avatar}"
alt=
""
>
</div>
<div
class=
"recordTxt"
>
<div
class=
"recordTxt1 one-txt-cut"
>
{$vo.user_name}购买了{$vo.book_name}
</div>
<if
condition=
"$vo.indent_type eq 1"
>
<div
class=
"recordTxt2"
>
平台收入
</div>
</if>
<if
condition=
"$vo.indent_type eq 2"
>
<div
class=
"recordTxt2"
>
团购收入
</div>
</if>
<p
class=
"recordTxt3"
>
{$vo.create_time|date="Y-m-d H:i:s",###}
</p>
</div>
<div
class=
"recordNum"
>
佣金+{$vo.total_money}
</div>
</li>
</volist>
</ul>
</div>
</div>
<div
class=
"b"
>
<div
class=
"record_Box"
>
<ul>
<volist
name=
"yewu"
id=
"vo"
>
<li>
<div
class=
"recordImg"
>
<img
src=
"{$vo.avatar}"
alt=
""
>
</div>
<div
class=
"recordTxt"
>
<div
class=
"recordTxt1 one-txt-cut"
>
{$vo.user_name}购买了{$vo.book_name}
</div>
<if
condition=
"$vo.indent_type eq 1"
>
<div
class=
"recordTxt2"
>
平台收入
</div>
</if>
<if
condition=
"$vo.indent_type eq 2"
>
<div
class=
"recordTxt2"
>
团购收入
</div>
</if>
<p
class=
"recordTxt3"
>
{$vo.create_time|date="Y-m-d H:i:s",###}
</p>
</div>
<div
class=
"recordNum"
>
佣金+{$vo.total_money}
</div>
</li>
</volist>
</ul>
</div>
</div>
<!-- 底部更多 -->
<div
class=
"in_what"
>
—— 已经到底了哦 ——
</div>
<script
src=
"__TMPL__/public/assets/js/base.js"
></script>
...
...
@@ -112,6 +180,21 @@
<script
src=
"__TMPL__/public/assets/js/city.data-3.js"
></script>
<script
src=
"__TMPL__/public/assets/js/jquery.js"
></script>
<script>
//团购切换tab
$
(
".qiehuan_left"
).
click
(
function
(){
var
index
=
$
(
this
).
index
();
console
.
log
(
index
)
$
(
this
).
addClass
(
"qiehuan_lefts"
).
siblings
().
removeClass
(
"qiehuan_lefts"
);
if
(
index
==
0
){
$
(
".a"
).
css
(
"display"
,
"block"
);
$
(
".b"
).
css
(
"display"
,
"none"
)
}
else
{
$
(
".a"
).
css
(
"display"
,
"none"
);
$
(
".b"
).
css
(
"display"
,
"block"
)
}
})
</script>
<script>
/**
*点击搜索
*/
...
...
simplewind/cmf/controller/WeChatBaseController.php
查看文件 @
57014ee
...
...
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
*/
public
function
checkWeChatUserLogin
()
{
/*$user = Db::name('user')->where('id',2
7
)->find();
/*$user = Db::name('user')->where('id',2
9
)->find();
cmf_update_current_user($user);*/
$userId
=
cmf_get_current_user_id
();
if
(
empty
(
$userId
))
{
...
...
请
注册
或
登录
后发表评论