Merge branch 'dev_zyx' into dev

Application/Admin/View/Finance/index.html

@@ -133,13 +133,13 @@
 
           <th ><div class="tooltip">游戏现金流水<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）</span></span></div></th>
 
-          <th ><div class="tooltip">平台币支出<span class="tooltiptext"><span style="margin-left: -10px">平台币游戏支付流水</span></span></div></th>
+          <th ><div class="tooltip">平台币收入<span class="tooltiptext"><span style="margin-left: -10px">指示为玩家充值平台币流水，计入总流水</span></span></div></th>
-
-          <th ><div class="tooltip">平台币收入<span class="tooltiptext"><span style="margin-left: -10px">平台币收入流水</span></span></div></th>
 
           <th ><div class="tooltip">内充流水<span class="tooltiptext"><span style="margin-left: -10px">管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员）），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除</span></span></div></th>
 
-          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币收入+内充流水</span></span></div></th>
+          <th ><div class="tooltip">平台币支出<span class="tooltiptext"><span style="margin-left: -10px">指示为玩家充值消耗平台，不计入总流水</span></span></div></th>
+
+          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">现金流水+平台币流水+内充流水</span></span></div></th>
 
           <th >操作</th>
         </tr>
@@ -161,9 +161,9 @@
             <tr>
               <td >{$data.count_date}</td>
               <td >{$data.cash_count}</td>
-              <td >{$data.balance_coin_count}</td>
               <td >{$data.balance_coin_deposit}</td>
               <td >{$data.inside_cash_count}</td>
+              <td >{$data.balance_coin_count}</td>
               <td >{$data.all_count}</td>
               <td >
                 <a href="{:U('Finance/gameFinance',