From 204be70ebc0067b0bd577565fb1ac0d05c406e7d Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Fri, 5 Jul 2019 14:27:00 +0800
Subject: [PATCH] 5
---
app/portal/controller/IndexController.php | 2 +-
app/portal/controller/PersonalcenterController.php | 8 +++++++-
public/themes/simpleboot3/portal/personalcenter/my_wallet.html | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app/portal/controller/IndexController.php b/app/portal/controller/IndexController.php
index d30ec2d..f824682 100644
--- a/app/portal/controller/IndexController.php
+++ b/app/portal/controller/IndexController.php
@@ -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){
diff --git a/app/portal/controller/PersonalcenterController.php b/app/portal/controller/PersonalcenterController.php
index 07981bf..786eebb 100644
--- a/app/portal/controller/PersonalcenterController.php
+++ b/app/portal/controller/PersonalcenterController.php
@@ -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);
//显示学校年级
diff --git a/public/themes/simpleboot3/portal/personalcenter/my_wallet.html b/public/themes/simpleboot3/portal/personalcenter/my_wallet.html
index 67bea3c..132a451 100755
--- a/public/themes/simpleboot3/portal/personalcenter/my_wallet.html
+++ b/public/themes/simpleboot3/portal/personalcenter/my_wallet.html
@@ -81,7 +81,7 @@
<!-- 账户余额 -->
<div class="log_nine_money">
<div class="nine_money_one">账户余额(元）</div>
- <div class="nine_money_two">{$balance}</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_moneyss}
</div>
</div>
<div class="nine_money_explain_one">
--
libgit2 0.24.0