From 12f4cda85099373f418b791ce7ea4f692b9ea334 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 31 Dec 2020 16:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E6=88=B7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementSetController.class.php   | 17 +++++++-----
 Application/Admin/View/Deposit/lists.html     | 18 +++++++------
 Application/Admin/View/Spend/lists.html       | 19 ++++++++------
 Application/Admin/View/TestOrder/lists.html   | 26 +++++++++++--------
 4 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 87a6f0520..b3c5ed1d1 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -84,9 +84,11 @@ class CompanyStatementSetController extends Controller {
 	
 					$this->promoteCompanyStatement(0,$stime);
 					echo "∟----推广公司周结统计ok".PHP_EOL;
-	
-					$this->promoteUserPool(0,$stime);
-					echo "∟----推广个人周结ok".PHP_EOL;
+					if(!IS_SUBSITE){
+						$this->promoteUserPool(0,$stime);
+						echo "∟----推广个人周结ok".PHP_EOL;
+					}
+					
 				}
 				if($company == "cp"){
 					$this->cpStatement(0,$stime);
@@ -115,10 +117,11 @@ class CompanyStatementSetController extends Controller {
 					$this->promoteCompanyStatement(2,$stime);
 					$this->officeCompanyStatement($stime); //官方结算
 					echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL;
-
-					$this->promoteUserPool(1,$stime);
-					$this->promoteUserPool(2,$stime);
-					echo "∟----推广个人月结&补点统计ok".PHP_EOL;
+					if(!IS_SUBSITE){
+						$this->promoteUserPool(1,$stime);
+						$this->promoteUserPool(2,$stime);
+						echo "∟----推广个人月结&补点统计ok".PHP_EOL;
+					}
 				}
 				if($company == "cp"){
 					$this->cpStatement(1,$stime);
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index e268f6b63..5ce0ad3b6 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -83,14 +83,16 @@
                     <option value="0">下单未付款</option>
                 </select>
             </div>
-            <div class="input-list search_item input-list-gamenoticestatus">
-                <select id="merchant_id" name="merchant_id" class="select_gallery">
-                    <option value="">请选择商户</option>
-                    <volist name=":getMerchantList()" id="vo">
-                        <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
-                    </volist>
-                </select>
-            </div>
+            <if condition="!IS_SUBSITE">
+                <div class="input-list search_item input-list-gamenoticestatus">
+                    <select id="merchant_id" name="merchant_id" class="select_gallery">
+                        <option value="">请选择商户</option>
+                        <volist name=":getMerchantList()" id="vo">
+                            <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+                        </volist>
+                    </select>
+                </div>
+            </if>
 <!--            <div class="input-list search_item input-list-gamenoticestatus">-->
 <!--                <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">-->
 <!--                    <option value="">请选择推广员等级</option>-->
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 55caeff52..fb8bf063a 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -178,14 +178,17 @@
                     <option value="2">聚合平台</option>
                 </select>
             </div>
-            <div class="input-list search_item input-list-gamenoticestatus">
-                <select id="merchant_id" name="merchant_id" class="select_gallery">
-                    <option value="0">请选择商户</option>
-                    <volist name=":getMerchantList()" id="vo">
-                        <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
-                    </volist>
-                </select>
-            </div>
+            <if condition="!IS_SUBSITE">
+                <div class="input-list search_item input-list-gamenoticestatus">
+                    <select id="merchant_id" name="merchant_id" class="select_gallery">
+                        <option value="0">请选择商户</option>
+                        <volist name=":getMerchantList()" id="vo">
+                            <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+                        </volist>
+                    </select>
+                </div>
+            </if>
+
 
             <div class="input-list search_item input-list-gamenoticestatus">
                 <select id="is_check" name="is_check" class="select_gallery">
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index dbc396b7b..ba4c405e4 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -93,14 +93,16 @@
           <option value="17" <if condition="$_GET['pay_way']  eq '17'">selected</if>>易宝支付</option>
         </select>
       </div>
-      <div class="input-list search_item input-list-gamenoticestatus">
-        <select id="merchant_id" name="merchant_id" class="select_gallery">
-          <option value="0">请选择商户</option>
-          <volist name=":getMerchantList()" id="vo">
-            <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
-          </volist>
-        </select>
-      </div>
+      <if condition="!IS_SUBSITE">
+        <div class="input-list search_item input-list-gamenoticestatus">
+          <select id="merchant_id" name="merchant_id" class="select_gallery">
+            <option value="0">请选择商户</option>
+            <volist name=":getMerchantList()" id="vo">
+              <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+            </volist>
+          </select>
+        </div>
+      </if>
       <div class="input-list input-list-server search_label_rehab">
         <select id="platform_type" name="platform_type" class="select_gallery"  style="width:120px;">
           <option value="0">所属平台</option>
@@ -116,9 +118,11 @@
                   array_merge(array('xlsname'=>'测试游戏订单查看导出'),I('get.')))}">导出</a>
         </if>-->
       </div>
-      <div class="input-list">
-        <a class="sch-btn" href="javascript:;" id="upstream"  style="width: 80px">订单录入</a>
-      </div>
+      <if condition="!IS_SUBSITE">
+        <div class="input-list">
+          <a class="sch-btn" href="javascript:;" id="upstream"  style="width: 80px">订单录入</a>
+        </div>
+      </if>
     </div>
   </div>