1.28功能提交

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/103

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -283,6 +283,7 @@ class CompanyStatementPoolController extends ThinkController
         $this->assign("title",$statement_num);
         $this->assign("pool_status",$pool_info['verify_status']);
         $this->assign("is_payment",$pool_info['is_payment']);
+        $this->assign('show_verify',1);
         if($infolist[0]['company_type'] == 3){
             //上游
             $this->viewCpPool($infolist,$is_export);

Application/Admin/Controller/OldCountController.class.php

@@ -358,7 +358,7 @@ class OldCountController extends \Think\Controller
     public function oldRewardChange() {
 
         $data = M("company_lack_statement_info","tab_")
-            ->where("(fine > 0 or reward > 0) and company_type = 2")
+            ->where("(fine > 0 or reward > 0) and company_type != 2")
             ->select();
 
         foreach ($data as $key => $value) {

Application/Admin/View/CompanyStatementPool/editPcPool.html

@@ -104,7 +104,7 @@
                         <th>合作产品名称</th>
                         <th>平台总额(元)</th>
                         <th>退款</th>
-                        <th>下游内团分成比例</th>
+                        <th>分成比例</th>
                         <th>补点比例</th>
                         <th>税费费率</th>
                         <th>分成金额/元</th>

Application/Admin/View/CompanyStatementPool/viewCpPool.html

@@ -255,7 +255,7 @@
                             <td></td>
                         </if>
                     </tr>
-                    <if condition="$is_export">
+                    <if condition="$is_export and $show_verify">
                         <tr>
                             <td >初审状态:</td>
                             <td>

Application/Admin/View/CompanyStatementPool/viewPcPool.html

@@ -102,7 +102,7 @@
                         <th>合作产品名称</th>
                         <th>平台总额(元)</th>
                         <th>退款</th>
-                        <th>下游内团分成比例</th>
+                        <th>分成比例</th>
                         <th>补点比例</th>
                         <th>税费费率</th>
                         <th>分成金额/元</th>
@@ -243,7 +243,7 @@
                             <td></td>
                         </if>
                     </tr>
-                    <if condition="$is_export">
+                    <if condition="$is_export and $show_verify">
                         <tr>
                             <td >初审状态:</td>
                             <td>

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -365,7 +365,7 @@
                             </tr>
                         </if>
 
-                        <if condition="$is_export">
+                        <if condition="$is_export and $show_verify">
                             <tr>
                                 <td >初审状态:</td>
                                 <td>