From c96340afa9983261ef4911f4aff106183a9ba6a1 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 1 Jul 2020 13:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=93=E5=91=98=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9=E7=AE=A1=E7=90=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php   | 6 +++---
 .../View/MarketPercentage/personmarketstaffsettle.html      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index c3f143269..03cb3ed95 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/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");
 
         }
 
diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
index fce25c938..851ede673 100644
--- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html
+++ b/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>