Merge branch 'feature/add_item' of wmtx/platform into release

市场业绩bug修正

Application/Admin/Controller/MarketPercentageController.class.php

@@ -20,7 +20,7 @@ class MarketPercentageController extends ThinkController
         $_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
         $_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
         $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
-        $_REQUEST['company_id']?($map['company_id'] = $_REQUEST['company_id']):'';
+        ($_REQUEST['company_id']||$_REQUEST['company_id']=='0')?($map['company_id'] = $_REQUEST['company_id']):'';
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
@@ -141,6 +141,7 @@ class MarketPercentageController extends ThinkController
         if ($_REQUEST['export']) {
 
             $title = ['pay_time' => '时间',
+                'company_name'=>'推广公司',
                 'promote_account' => '会长账号',
                 'company_belong' => '内外团',
                 'real_name' => '所属市场专员',
@@ -365,11 +366,13 @@ class MarketPercentageController extends ThinkController
             }
 
             if(!$value['market_check']) {
-                $data[$key]['market_check_detail'] = "市场部未确认（{$admin}）<br>".date("Y-m-d H:m:s",time());
+                $data[$key]['market_check_detail'] = "-----";
+//（{$admin}）<br>".date("Y-m-d H:m:s",time());
             }
 
             if (!$value['finance_check']) {
-                $data[$key]['finance_check_detail'] = "财务部未审批（{$admin}）<br>".date("Y-m-d H:m:s",time());
+                $data[$key]['finance_check_detail'] = "-----";
+//（{$admin}）<br>".date("Y-m-d H:m:s",time());
             }
 
             if ($_REQUEST['export']) {

Application/Admin/View/MarketPercentage/marketstaffsettle.html

@@ -182,8 +182,8 @@
                                 <td>{$data['commission']|default='0.00'}</td>
                                 <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>
                                 <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>
-                                <td><if condition="$data.market_check eq 0"><span style="color: red"></if>{$data['market_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
-                                <td><if condition="$data.finance_check eq 0"><span style="color: red"></if>{$data['finance_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
+                                <td><if condition="$data.market_check eq 0"><span ></if>{$data['market_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
+                                <td><if condition="$data.finance_check eq 0"><span ></if>{$data['finance_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
                             </tr>
                         </volist>
                         <td colspan="4">合计</td>