切换导航条
此项目
正在载入...
登录
anyv
/
xkeasy
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
anyv
6 years ago
提交
204be70ebc0067b0bd577565fb1ac0d05c406e7d
1 个父辈
9c5bbcd7
master
...
liuzhen
wangxiaogang
1 个管道 的构建
通过
耗费 2 秒
5
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
10 行增加
和
4 行删除
app/portal/controller/IndexController.php
app/portal/controller/PersonalcenterController.php
public/themes/simpleboot3/portal/personalcenter/my_wallet.html
app/portal/controller/IndexController.php
查看文件 @
204be70
...
...
@@ -213,7 +213,7 @@ class IndexController extends WeChatBaseController
$data_salesman_goods
=
Db
::
name
(
'goods'
)
->
alias
(
'a'
)
->
field
(
"a.*,b.name"
)
->
join
(
'classification b'
,
'a.classify_id = b.id'
,
'LEFT'
)
->
where
(
$where
)
->
select
()
->
toArray
();
}
else
{
$book_name
=
$book_name
[
'book_name'
];
$data_salesman_goods
=
Db
::
name
(
'goods'
)
->
alias
(
'a'
)
->
field
(
"a.*,b.name"
)
->
join
(
'classification b'
,
'a.classify_id = b.id'
,
'LEFT'
)
->
where
(
$where
)
->
where
(
'book_name'
,
'like'
,
"%"
.
$book_name
.
"%"
)
->
select
()
->
toArray
();
$data_salesman_goods
=
Db
::
name
(
'goods'
)
->
alias
(
'a'
)
->
field
(
"a.*,b.name"
)
->
join
(
'classification b'
,
'a.classify_id = b.id'
,
'LEFT'
)
->
where
(
$where
)
->
where
(
'
is_out'
,
1
)
->
where
(
'
book_name'
,
'like'
,
"%"
.
$book_name
.
"%"
)
->
select
()
->
toArray
();
}
if
(
!
empty
(
$data_salesman_goods
)){
foreach
(
$data_salesman_goods
as
$key
=>
$val
){
...
...
app/portal/controller/PersonalcenterController.php
查看文件 @
204be70
...
...
@@ -372,6 +372,9 @@ class PersonalcenterController extends WeChatBaseController{
$uid
=
cmf_get_current_user_id
();
$balance
=
Db
::
name
(
'my_user'
)
->
where
(
"uid"
,
$uid
)
->
find
();
$b_money
=
$balance
[
'balance'
];
$b_money
=
sprintf
(
"%.2f"
,
$b_money
);
$this
->
assign
(
'b_money'
,
$b_money
);
$balance
[
'balance'
]
=
$balance
[
'balance'
]
-
$balance
[
'balance'
]
*
0.006
;
$balance
[
'balance'
]
=
sprintf
(
"%.2f"
,
$balance
[
'balance'
]);
$money_income
=
Db
::
name
(
"money_income"
)
->
where
(
'uid'
,
$uid
)
->
select
();
...
...
@@ -379,6 +382,9 @@ class PersonalcenterController extends WeChatBaseController{
foreach
(
$money_income
as
$key
=>
$val
){
$cumulative_money
+=
$val
[
'money'
];
}
$cumulative_moneyss
=
$cumulative_money
;
$cumulative_moneyss
=
sprintf
(
"%.2f"
,
$cumulative_moneyss
);
$this
->
assign
(
'cumulative_moneyss'
,
$cumulative_moneyss
);
$cumulative_money
=
$cumulative_money
-
$cumulative_money
*
0.006
;
$cumulative_money
=
sprintf
(
"%.2f"
,
$cumulative_money
);
$money_ratio
=
Db
::
name
(
'money_ratio'
)
->
where
(
'id'
,
1
)
->
find
();
...
...
@@ -675,7 +681,7 @@ class PersonalcenterController extends WeChatBaseController{
foreach
(
$indent_money
as
$key
=>
$val
){
$total_money
+=
$val
[
'money'
];
}
$total_money
=
$total_money
-
$total_money
*
0.006
;
//
$total_money = $total_money-$total_money*0.006;
$this
->
assign
(
'total_money'
,
$total_money
);
//显示学校年级
...
...
public/themes/simpleboot3/portal/personalcenter/my_wallet.html
查看文件 @
204be70
...
...
@@ -81,7 +81,7 @@
<!-- 账户余额 -->
<div
class=
"log_nine_money"
>
<div
class=
"nine_money_one"
>
账户余额(元)
</div>
<div
class=
"nine_money_two"
>
{$b
alance
}
</div>
<div
class=
"nine_money_two"
>
{$b
_money
}
</div>
</div>
<div
class=
"nine_money_explain"
>
<div
class=
"nine_money_explain_one"
>
...
...
@@ -89,7 +89,7 @@
<img
src=
"__TMPL__/public/assets/images/61.png"
alt=
""
/>
</div>
<div
class=
"nine_money_explain_title"
>
累计收益:{$cumulative_money}
累计收益:{$cumulative_money
ss
}
</div>
</div>
<div
class=
"nine_money_explain_one"
>
...
...
请
注册
或
登录
后发表评论