From 7a82b930bf58c96543044be4c915b786dd8bba31 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 23 Dec 2019 19:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E6=9C=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=8D=E5=93=8D=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/RechargeSumController.class.php |  5 +----
 Application/Admin/View/RechargeSum/summation.html    | 12 ++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php
index f356c6e34..6c9946b7b 100644
--- a/Application/Admin/Controller/RechargeSumController.class.php
+++ b/Application/Admin/Controller/RechargeSumController.class.php
@@ -54,10 +54,7 @@ class RechargeSumController extends ThinkController
                     $rmap['game_id'] = $map['game_id'] = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')];
                 }
 
-                if (!empty($_REQUEST['server_id']) || !empty($_REQUEST['server_name'])) {
-                    if(isset($_REQUEST['server_name'])){
-                        $_REQUEST['server_id'] = M("server","tab_")->field("id")->where("server_name = '{$_REQUEST['server_name']}'")->find()["id"];
-                    }
+                if (!empty($_REQUEST['server_id'])) {
                     $rmap['tab_user_play.server_id'] = $map['server_id'] = $_REQUEST['server_id'];
                 }
                 if ($_REQUEST['bindcoin'] == 1) {
diff --git a/Application/Admin/View/RechargeSum/summation.html b/Application/Admin/View/RechargeSum/summation.html
index 37a19f460..c01990b4a 100644
--- a/Application/Admin/View/RechargeSum/summation.html
+++ b/Application/Admin/View/RechargeSum/summation.html
@@ -81,7 +81,7 @@
                 </select>
             </div>
             <div class="input-list input-list-server search_label_rehab">
-                <select id="server_name" name="server_name" class="select_gallery"  style="width:120px;">
+                <select id="server_id" name="server_id" class="select_gallery"  style="width:120px;">
                     <option value="">区服名称</option>
                 </select>
             </div>
@@ -321,7 +321,7 @@
             });
             $("#promote_level").change();
 
-            var game_server = "{:I('server_name')}";
+            var server_id = "{:I('server_id')}";
             $("#game_type").change(function(){
                 $.ajax({
                     url:"{:U('Ajax/getGmeServer')}",
@@ -331,11 +331,11 @@
                     success:function(data){
                         str = "<option value=''>请选择区服</option>";
                         for (var i in data){
-                            str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
+                            str += "<option value='"+data[i].server_id+"' "+(server_id && data[i].server_id == server_id?'selected':'')+">"+data[i].server_name+"</option>"
                         }
-                        $("#server_name").empty();
-                        $("#server_name").append(str);
-                        $("#server_name").select2();
+                        $("#server_id").empty();
+                        $("#server_id").append(str);
+                        $("#server_id").select2();
                     }
                 })
             });