32

@@ -560,10 +560,11 @@ class PersonalcenterController extends WeChatBaseController{
                     $where['a.pay_time'] = [['>=',$start_time],['<=',$end_time]];
                     $where['a.pay_time'] = [['>=',$start_time],['<=',$end_time]];
                 }
                 }
                 $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select();
                 $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select();
-                $indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> select();
+                $indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where($where) -> where("a.state =2 or a.state=3 or a.state=5") -> where("b.uid =".$uid) -> select();
             }else{
             }else{
                 $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();
                 $indent_goods = Db::name('indent') -> alias('a') -> field("a.*,b.indent_id,b.book_name,b.pricing,b.price,b.number,b.thumbnail") -> join('indent_goods b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();
-                $indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();
+                /*$indent_money = Db::name('indent') -> alias('a') -> field("a.id,b.*") -> join('money_income b','a.id=b.indent_id','LEFT') -> where('a.indent_type=2 and a.salesman_uid='.$uid) -> where("a.state =2 or a.state=3 or a.state=5") -> select();*/
+                $indent_money = Db::name('money_income') -> where("uid =".$uid) -> select();
             }
             }
 
 
             $total_money = 0;
             $total_money = 0;

@@ -130,7 +130,7 @@
                         <img src="__TMPL__/public/assets/images/72.png" alt="" />
                         <img src="__TMPL__/public/assets/images/72.png" alt="" />
                     </div>
                     </div>
                     <div class="log_nine_list_one_left_title">
                     <div class="log_nine_list_one_left_title">
-                        商场盈利
+                        商城盈利
                     </div>
                     </div>
                     <div class="log_nine_list_one_left_title_add">
                     <div class="log_nine_list_one_left_title_add">
                         （服务费扣点{$money_ratio.platform_ratio}）
                         （服务费扣点{$money_ratio.platform_ratio}）