From 0f7134c838583be1e647c6f810797773fc183495 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 2 Jan 2020 11:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC=20?=
 =?UTF-8?q?=E5=8C=BA=E6=9C=8D=E5=90=8D=E7=A7=B0=E6=94=B9=E5=8C=BA=E6=9C=8D?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SpendController.class.php       |  6 +++---
 Application/Admin/View/Spend/lists.html              | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index a90a2a13f..ce71bec6c 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -43,9 +43,9 @@ class SpendController extends ThinkController
         if (isset($_REQUEST['game_type']) && $_REQUEST['game_type']) {
             $map['sdk_version'] = $_REQUEST['game_type'];
         }
-        if (isset($_REQUEST['server_name'])) {
-            $map['server_name'] = $_REQUEST['server_name'];
-            unset($_REQUEST['server_name']);
+        if (isset($_REQUEST['server_id'])) {
+            $map['server_id'] = $_REQUEST['server_id'];
+            unset($_REQUEST['server_id']);
         }
         if (isset($_REQUEST['pay_order_number'])) {
             $map['pay_order_number'] = array('like', trim($_REQUEST['pay_order_number']));
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index 39ac2ed7b..6f0014198 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -76,7 +76,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>
@@ -568,7 +568,7 @@
         });
         $("#promote_level").change();
 
-        var game_server = "{:I('server_name')}";
+        var game_server = "{:I('server_id')}";
         $("#game_type").change(function(){
             $.ajax({
                 url:"{:U('Ajax/getGmeServer')}",
@@ -578,11 +578,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+"' "+(game_server && data[i].server_id == game_server?'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();
                 }
             })
         });