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 = ''; + $aside .= ''; }else{ - $aside .= ''; + $aside .= ''; } + $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 @@ 市场员 下游性质 产品 + 产品类型 结算时间 推广流水 分成比例 @@ -103,6 +104,7 @@ 秦汉风云 策略 2020.6.22-2020.6.28 5626 + 5626 1% 0% 0 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 @@
-
- 批量打款 -
+ + +