From 941f27e2e3324b7448764705e13ca9455c2c132d Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 21 Apr 2020 15:32:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=9A=84=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/TimingController.class.php      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index a1aae43d4..9a800890b 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -325,4 +325,22 @@ class TimingController extends AdminController {
 
     }
 
+    public function getTogetherUserAccount() {
+
+        if (I('user_id','')) {
+            $user_id = I('user_id','');
+        } else {
+            return false;
+        }
+
+        $data = M('user','tab_')->field('account')->where(['id'=>$user_id])->find();
+//        var_dump($data);
+        if (!$data) {
+            return false;
+        }
+
+        $this->ajaxReturn($data);
+
+    }
+
 }

From 63e4789069ac4aba6d9346a1ae874f1260e438b0 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 21 Apr 2020 17:44:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=20=E6=B1=87=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Game/edit.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 27a7ca79f..4db4ca49f 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -718,6 +718,7 @@
                                     <select name="pay_config[zfb]">
                                             <option value="gf" <?php echo $data['pay_config']['zfb'] == 'gf' ? "selected" : ''; ?>>官方</option>
                                         <option value="sq" <?php echo $data['pay_config']['zfb'] == 'sq' ? "selected" : ''; ?>>双乾</option>
+                                        <option value="heepay" <?php echo $data['pay_config']['zfb'] == 'heepay' ? "selected" : ''; ?>>汇付宝</option>
 
                                     </select>
                                 </span>