From b3560b43455098c6b24de760ab1a3aa6b743a2df Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 18 Feb 2020 16:06:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/FinancialSummarySetController.class.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/FinancialSummarySetController.class.php b/Application/Admin/Controller/FinancialSummarySetController.class.php
index 6d08cb495..2f49c500a 100644
--- a/Application/Admin/Controller/FinancialSummarySetController.class.php
+++ b/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()
     {

From e55bfcb2d87454f8f3190dc8fef530bd2c5eee57 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Tue, 18 Feb 2020 16:14:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatementMangement/rewardManageSave.html  | 160 +++++++++---------
 1 file changed, 83 insertions(+), 77 deletions(-)

diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html
index d9fdcfe6f..43b9f5f22 100644
--- a/Application/Admin/View/StatementMangement/rewardManageSave.html
+++ b/Application/Admin/View/StatementMangement/rewardManageSave.html
@@ -25,7 +25,7 @@
     </style>
     <style>
         .select2-container--default .select2-selection--single {
-                color: #000;
+            color: #000;
             resize: none;
             border-width: 1px;
             border-style: solid;
@@ -41,7 +41,7 @@
             height:26px;
         }
         .select2-container--default .select2-search--dropdown .select2-search__field {
-          height:26px;line-height:26px;font-size:12px;
+            height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
     </style>
@@ -62,22 +62,28 @@
             charset="UTF-8"></script>
 
     <form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
-            class="form-horizontal form_info_ml" id="form">
+          class="form-horizontal form_info_ml" id="form">
         <div class="formtitle"><span>奖惩编辑</span></div>
         <ul class="form_info ">
             <input type="hidden" name="id" value="{$data.id}" />
             <li>
                 <label>奖惩类型</label>
-                <select id="reward_type" name="reward_type" class="select_gallery">
-                    <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>
+                <?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()">
-                    <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>
+                <?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>
             </li>
             <li>
@@ -93,22 +99,22 @@
             <?php foreach ($data['accounts'] as $k => $account):?>
             <?php if ($k == 0):?>
             <li class="user-account">
-                    <label>涉及账号</label>
-                    <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
+                <label>涉及账号</label>
+                <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
                     <option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
                     <option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
-                    </select>
-                    <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
-                    <button type="button" class="bnt_add">✚</button>
+                </select>
+                <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
+                <button type="button" class="bnt_add">✚</button>
             </li>
             <?php else:?>
             <li class="user-account">
-                    <label>涉及账号</label>
-                    <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
+                <label>涉及账号</label>
+                <select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)">
                     <option value="1" <?php if ($account['user_type'] == 1):?>selected<?php endif;?>>推广员</option>
                     <option value="2" <?php if ($account['user_type'] == 2):?>selected<?php endif;?>>玩家</option>
-                    </select>
-                    <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
+                </select>
+                <input type="text" class="txt table_text_input" name="account[]" value="{$account['account']}" placeholder="账号">
                 <button type="button" class="bnt_remove">✖</button>
             </li>
             <?php endif;?>
@@ -153,72 +159,72 @@
             </li>
         </ul>
     </form>
-		
-		<div class="common_settings">
-			<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-			<form class="addShortcutIcon">
-				<input type="hidden" name="title" value="{$m_title}">
-				<input type="hidden" name="url" value="AuthManager/index">
-			</form>
-			<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
-		</div>
-		
+
+    <div class="common_settings">
+        <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+        <form class="addShortcutIcon">
+            <input type="hidden" name="title" value="{$m_title}">
+            <input type="hidden" name="url" value="AuthManager/index">
+        </form>
+        <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
+    </div>
+
 </block>
 <block name="script">
     <script type="text/javascript">
-    highlight_subnav('{:U('StatementMangement/rewardManageList')}');
-    $(".bnt_add").bind("click",function(){
+        highlight_subnav('{:U('StatementMangement/rewardManageList')}');
+        $(".bnt_add").bind("click",function(){
             var a=  '<li class="user-account"><label>涉及账号</label><select name="user_type[]" class="select_gallery user_type" onchange="userAccountChange(this)"><option value="1">推广员</option><option value="2">玩家</option></select><input type="text" class="txt table_text_input" name="account[]" value="" placeholder="账号"><button type="button" class="bnt_remove">✖</button>';
             $(".user-account:last").after(a);
         });
-    $(document).on('click', '.bnt_remove', function(){
-        $(this).parents('li').remove();
-    });
-    var date = new Date();
-    var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
-    $("#reward_time").datetimepicker({
-        format : "yyyy-mm-dd hh:ii",
-        autoclose : true,
-        todayBtn : true,
-        todayHighlight : true,
-        startDate : monthStart,
-        language : 'zh-CN',
-        startView : 2,//月视图
-        showMeridian : true,
-        pickerPosition : "bottom-left",
-        minuteStep : 5
-    });
-
-    /* $('#reward_time').datetimepicker({
-        language:"zh-CN",
-        hour: 13,
-        minute: 15,
-        setStartDate:'2020-02-01',
-        todayHighlight : true,
-        todayBtn:true
-    });*/
-    var company_id = '{$data["company_id"]}';
-    function companyTypeChange()
-    {
-        var companyType = $('#company_type').val();
-        $.ajax({
-            url:"{:U('StatementMangement/getCompanys')}",
-            dataType:'JSON',
-            data: {'type':companyType},
-            success:function(response){
-                var companyData = '';
-                $.each(response.info, function(index, item){
-                    if (company_id == item.id) {
-                        companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
-                    } else {
-                        companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
-                    }
-                });
-                $('#company_id').html(companyData);
-            }
+        $(document).on('click', '.bnt_remove', function(){
+            $(this).parents('li').remove();
         });
-    }
+        var date = new Date();
+        var monthStart = date.getFullYear()+'-0'+(date.getMonth()+1)+'-01';
+        $("#reward_time").datetimepicker({
+            format : "yyyy-mm-dd hh:ii",
+            autoclose : true,
+            todayBtn : true,
+            todayHighlight : true,
+            startDate : monthStart,
+            language : 'zh-CN',
+            startView : 2,//月视图
+            showMeridian : true,
+            pickerPosition : "bottom-left",
+            minuteStep : 5
+        });
+
+        /* $('#reward_time').datetimepicker({
+            language:"zh-CN",
+            hour: 13,
+            minute: 15,
+            setStartDate:'2020-02-01',
+            todayHighlight : true,
+            todayBtn:true
+        });*/
+        var company_id = '{$data["company_id"]}';
+        function companyTypeChange()
+        {
+            var companyType = $('#company_type').val();
+            $.ajax({
+                url:"{:U('StatementMangement/getCompanys')}",
+                dataType:'JSON',
+                data: {'type':companyType},
+                success:function(response){
+                    var companyData = '';
+                    $.each(response.info, function(index, item){
+                        if (company_id == item.id) {
+                            companyData += "<option value='"+item.id+"' selected >"+item.name+"</option>";
+                        } else {
+                            companyData += "<option value='"+item.id+"' >"+item.name+"</option>";
+                        }
+                    });
+                    $('#company_id').html(companyData);
+                }
+            });
+        }
 
-    companyTypeChange();
+        companyTypeChange();
     </script>
 </block>
\ No newline at end of file