Merge pull request '1.28功能提交' (#121) from feature/add_item into release

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

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">

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">

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  >

Application/Payment/View/Payment/lists.html

@@ -166,7 +166,7 @@
 
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="pay_status" name="pay_status" class="select_gallery" >
-                    <option value="">结算单类型</option>
+                    <option value="">打款状态</option>
                     <volist name="PayStatus" id="vo">
                         <option value="{$key}" <if condition="isset($_GET['pay_status']) && $key eq I('pay_status')">selected</if> >{$vo}</option>
                     </volist>