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

市场专员业绩管理 重算调用脚本命令修改

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 ".ROOTTT."admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die();
+//        var_dump("cd ".ROOTTT.";php admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die();
 
-        exec("php ".ROOTTT."admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
+        exec("cd ".ROOTTT.";php admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
 
         $this->success('操作成功,后台正在计算中，请稍后再打开......');
     }

Application/Admin/View/MarketPercentage/index.html

@@ -70,7 +70,7 @@
             <div class="input-list input-list-game search_label_rehab">
                 <select id="relation_game_id" name="relation_game_id" class="select_gallery"  style="width:120px;">
                     <option value="" selected="">请选择游戏</option>
-                    <volist name=':get_game_list()' id='vo'>
+                    <volist name=':get_game_list(null,2)' id='vo'>
                         <option value="{$vo.relation_game_id}" <if condition="$vo.relation_game_id eq $_GET['relation_game_id']"></if>>{$vo.relation_game_name}</option>
                     </volist>
                 </select>