From 213b1523982cee4e0091d999e743417d8378b2e5 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 9 Jul 2020 16:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E6=AC=BE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Common/Common/extend.php           | 16 +++++++++-------
 Application/Payment/View/ExcelPayment/add.html |  2 ++
 Application/Payment/View/Payment/lists.html    |  8 +++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 0c70a79d8..526108922 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -414,6 +414,12 @@ function set_pagination($count, $row,$request='') {
 function set_pagination_all($count, $row,$request='') {
 
 	$aside = '<script>function pagechange(that){url = location.href.replace(".html","").replace(/(&|\/)row(=|\/)\d*/gi,"").replace(/\/p\/\d*/gi,"");if(url.indexOf("?")>0){url += "&row="+that.value;}else{url += "?row="+that.value;} window.location.href = url;}</script><select id="pagechange" name="row" onchange="pagechange(this)">';
+    
+    if($row == 999999){
+        $aside .= '<option value="999999" selected>全部显示</option>';
+    }else{
+        $aside .= '<option value="999999">全部显示</option>';
+    }
     if($row == 10){
         $aside .= '<option value="10" selected>每页10条</option>';
     }else{
@@ -425,15 +431,11 @@ function set_pagination_all($count, $row,$request='') {
         $aside .= '<option value="50">每页50条</option>';
     }
     if($row == 100){
-        $aside .= '<option value="100" selected>每页100条</option>';
-    }else{
-        $aside .= '<option value="100">每页100条</option>';
-    }
-    if($row == 999999){
-        $aside .= '<option value="999999" selected>全部显示</option></select>';
+        $aside .= '<option value="100" selected>每页100条</option></select>';
     }else{
-        $aside .= '<option value="999999">全部显示</option></select>';
+        $aside .= '<option value="100">每页100条</option></select>';
     }
+   
     $count=$count?$count:0;
     $row=$row?$row:10;
 	if ($count > $row) {
diff --git a/Application/Payment/View/ExcelPayment/add.html b/Application/Payment/View/ExcelPayment/add.html
index bbda65fb3..2ef263e20 100644
--- a/Application/Payment/View/ExcelPayment/add.html
+++ b/Application/Payment/View/ExcelPayment/add.html
@@ -80,6 +80,7 @@
                     <th>市场员</th>
                     <th>下游性质</th>
                     <th>产品</th>
+                    <th>产品类型</th>
                     <th>结算时间</th>
                     <th>推广流水</th>
                     <th>分成比例</th>
@@ -103,6 +104,7 @@
                     <td>秦汉风云</td>
                     <td>策略</td>
                     <td>2020.6.22-2020.6.28	5626</td>
+                    <td>5626</td>
                     <td>1%</td>
                     <td>0%</td>
                     <td>0</td>
diff --git a/Application/Payment/View/Payment/lists.html b/Application/Payment/View/Payment/lists.html
index b07a6e550..f293b060f 100644
--- a/Application/Payment/View/Payment/lists.html
+++ b/Application/Payment/View/Payment/lists.html
@@ -168,9 +168,11 @@
     </div>
 
     <div class="butnbox" >
-        <div class="butnlist jscheckbutn" style="margin-left: 2px">
-            <a class='butn' id='doPayment'>批量打款</a>
-        </div>
+        <if condition="session('payment_user.is_payment') eq 1">
+            <div class="butnlist jscheckbutn" style="margin-left: 2px">
+                <a class='butn' id='doPayment'>批量打款</a>
+            </div>
+        </if>
     </div>
 
     <!-- 数据列表 -->