5

@@ -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();
             $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{
         }else{
             $book_name = $book_name['book_name'];
             $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)){
         if(!empty($data_salesman_goods)){
             foreach ($data_salesman_goods as $key => $val){
             foreach ($data_salesman_goods as $key => $val){

@@ -372,6 +372,9 @@ class PersonalcenterController extends WeChatBaseController{
 
 
         $uid = cmf_get_current_user_id();
         $uid = cmf_get_current_user_id();
         $balance = Db::name('my_user') -> where("uid",$uid) -> find();
         $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'] = $balance['balance'] - $balance['balance']*0.006;
         $balance['balance'] = sprintf("%.2f", $balance['balance']);
         $balance['balance'] = sprintf("%.2f", $balance['balance']);
         $money_income = Db::name("money_income") -> where('uid',$uid) -> select();
         $money_income = Db::name("money_income") -> where('uid',$uid) -> select();
@@ -379,6 +382,9 @@ class PersonalcenterController extends WeChatBaseController{
         foreach ($money_income as $key => $val){
         foreach ($money_income as $key => $val){
             $cumulative_money += $val['money'];
             $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 = $cumulative_money-$cumulative_money*0.006;
         $cumulative_money = sprintf("%.2f",$cumulative_money);
         $cumulative_money = sprintf("%.2f",$cumulative_money);
         $money_ratio = Db::name('money_ratio') -> where('id',1) -> find();
         $money_ratio = Db::name('money_ratio') -> where('id',1) -> find();
@@ -675,7 +681,7 @@ class PersonalcenterController extends WeChatBaseController{
             foreach ($indent_money as $key => $val){
             foreach ($indent_money as $key => $val){
                 $total_money += $val['money'];
                 $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);
             $this -> assign('total_money',$total_money);
 
 
             //显示学校年级
             //显示学校年级

@@ -81,7 +81,7 @@
     <!-- 账户余额 -->
     <!-- 账户余额 -->
     <div class="log_nine_money">
     <div class="log_nine_money">
         <div class="nine_money_one">账户余额(元）</div>
         <div class="nine_money_one">账户余额(元）</div>
-        <div class="nine_money_two">{$balance}</div>
+        <div class="nine_money_two">{$b_money}</div>
     </div>
     </div>
     <div class="nine_money_explain">
     <div class="nine_money_explain">
         <div class="nine_money_explain_one">
         <div class="nine_money_explain_one">
@@ -89,7 +89,7 @@
                 <img src="__TMPL__/public/assets/images/61.png" alt="" />
                 <img src="__TMPL__/public/assets/images/61.png" alt="" />
             </div>
             </div>
             <div class="nine_money_explain_title">
             <div class="nine_money_explain_title">
-                累计收益：{$cumulative_money}
+                累计收益：{$cumulative_moneyss}
             </div>
             </div>
         </div>
         </div>
         <div class="nine_money_explain_one">
         <div class="nine_money_explain_one">