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

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);
+
+    }
+
 }

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>