Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Application/Admin/Controller/FinancialSummarySetController.class.php

@@ -414,8 +414,8 @@ class FinancialSummarySetController extends \Think\Controller
                       ")
                     ->where($map)
                     ->find();
-        $moneyarry['wx'] += $dbres['wx_count'];
-        $moneyarry['gfzfb'] += $dbres['zfb_count'];
+        $moneyarry['wx'] += $dbres['wx_count']*100;
+        $moneyarry['gfzfb'] += $dbres['zfb_count']*100;
     }
     //玩家购买平台币
     protected function getDepositPayWay(&$moneyarry)
@@ -454,8 +454,8 @@ class FinancialSummarySetController extends \Think\Controller
                             ")
                         ->where($map)
                         ->find();
-        $moneyarry['wx'] += $dbres['wx_count'];
-        $moneyarry['gfzfb'] += $dbres['zfb_count'];
+        $moneyarry['wx'] += $dbres['wx_count']*100;
+        $moneyarry['gfzfb'] += $dbres['zfb_count']*100;
     }
     public function addDb()
     {

Application/Admin/View/StatementMangement/rewardManageSave.html

@@ -68,14 +68,20 @@
             <input type="hidden" name="id" value="{$data.id}" />
             <li>
                 <label>奖惩类型</label>
-                <select id="reward_type" name="reward_type" class="select_gallery">
+                <?php if ($data):?>
+                <input type="hidden" name="reward_type" value="{$data['reward_type']}">
+                <?php endif;?>
+                <select id="reward_type" name="reward_type" class="select_gallery" <?php if ($data):?> disabled<?php endif;?>>
                 <option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
                 <option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
                 </select>
             </li>
             <li>
                 <label>公司类型</label>
-                <select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()">
+                <?php if ($data):?>
+                <input type="hidden" name="company_type" value="{$data['company_type']}">
+                <?php endif;?>
+                <select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()" <?php if ($data):?> disabled<?php endif;?>>
                 <option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
                 <option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
                 </select>