From 77f7eda10f3e8a1725a66a2a323d22e7901ad019 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 28 Jan 2021 15:18:22 +0800
Subject: [PATCH] =?UTF-8?q?1.28=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/CompanyStatementPool/editCpPool.html | 2 +-
 Application/Admin/View/CompanyStatementPool/editPcPool.html | 2 +-
 Application/Admin/View/SocietyInfo/lists.html               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/CompanyStatementPool/editCpPool.html b/Application/Admin/View/CompanyStatementPool/editCpPool.html
index 2de728052..70b8c583b 100644
--- a/Application/Admin/View/CompanyStatementPool/editCpPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editCpPool.html
@@ -264,7 +264,7 @@
                                 <notempty name="it['time']">
                                     <td rowspan="{$it['row']}">{$it['fine']-0}</td>
                                     <td rowspan="{$it['row']}">{$it['reward']-0}</td>
-                                    <td>
+                                    <td rowspan="{$it['row']}">
                                         <if condition="($com.is_reward_fine_split eq 0)">
                                             <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$it['withhold']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$it['game_name']}{$it['time']?$it['time']:$com['statement_info'][0]['time']}]">
                                             <input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$it['withhold']|default=0}" style="width: 40px;display: none">
diff --git a/Application/Admin/View/CompanyStatementPool/editPcPool.html b/Application/Admin/View/CompanyStatementPool/editPcPool.html
index cd398631f..68ee7b5fc 100644
--- a/Application/Admin/View/CompanyStatementPool/editPcPool.html
+++ b/Application/Admin/View/CompanyStatementPool/editPcPool.html
@@ -259,7 +259,7 @@
                                     <notempty name="it['time']">
                                         <td rowspan="{$it['row']}">{$it['fine']-0}</td>
                                         <td rowspan="{$it['row']}">{$it['reward']-0}</td>
-                                        <td>
+                                        <td rowspan="{$it['row']}">
                                             <if condition="($com.is_reward_fine_split eq 0)">
                                                 <input class="withhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$it['withhold']|default=0}" style="width: 40px;" name="withhold[{$com['id']}][{$it['game_name']}{$it['time']?$it['time']:$com['statement_info'][0]['time']}]">
                                                 <input class="oldwithhold" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$it['withhold']|default=0}" style="width: 40px;display: none">
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index c7c6e72db..3b74c4941 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -175,7 +175,7 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name ="listData">
-                    <td colspan="22" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="30" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="listData" id="data">
                         <tr  >