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

市场专员业绩管理bug修改

Application/Admin/Controller/MarketPercentageController.class.php

@@ -833,9 +833,9 @@ class MarketPercentageController extends ThinkController
 //            $pay_time = date("Y-m",strtotime('-1 month'));
         }
 
-//        var_dump("php cli.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die();
+//        var_dump("php ".ROOTTT."admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die();
 
-        exec("php admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
+        exec("php ".ROOTTT."admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
 
         $this->success('操作成功,后台正在计算中，请稍后再打开......');
     }
@@ -1042,7 +1042,7 @@ class MarketPercentageController extends ThinkController
 //            var_dump($data['config']);die();
 
             $this->assign('data',$data['config']);
-            $this->display("marketstaffsettle");
+            $this->display("edittaxratio");
 
         }
 

Application/Admin/View/MarketPercentage/personmarketstaffsettle.html

@@ -121,7 +121,7 @@
                                             <option value="">请选择时间</option>
                                             <volist name="list_data" id="s_data">
                                                 <if condition="$s_data['is_send_use'] eq 1">
-                                                <option value="{$s_data['pay_time']}" data-admin_id="{$s_data.admin_id}">{$s_data['pay_time']}($data['real_name']})</option>
+                                                <option value="{$s_data['pay_time']}" data-admin_id="{$s_data.admin_id}">{$s_data['pay_time']}({$data['real_name']})</option>
                                                 </if>
                                             </volist>
                                         </select>