From acf2ff131016f1f7e68a6a0cd46d2a9b96077324 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 10:47:52 +0800
Subject: [PATCH] ios13.1

---
 Application/Mobile/Controller/UserController.class.php | 8 +++++---
 Application/Mobile/View/User/register.html             | 9 +--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index abc338ad7..4a9c24b41 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -219,7 +219,6 @@ class UserController extends BaseController
 
     public function bindingPromote($promoteId, $account)
     {
-        Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- ' . $promoteId.'INFO');
         if ($promoteId > 0) {
             $wherePromote['id'] = $promoteId;
             $promoteData = M('Promote', 'tab_')->field('id,account')->where($wherePromote)->find();
@@ -230,7 +229,6 @@ class UserController extends BaseController
                 $whereUser['mobile_phone'] = $account;
                 $userData = M('User', 'tab_')->where($whereUser)->find();
 
-                Log::write('cxj_login:' . date('Y-m-d H:i:s') . ' ---- userData' . json_encode($userData) .'INFO');
                 if (!empty($userData)) {
                     if (empty($userData['promote_id'])) {
                         $saveData['promote_id'] = $promoteId;
@@ -405,7 +403,11 @@ class UserController extends BaseController
                 $pgInfo = strval(cookie('pgInfo'));
                 Log::write('register:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($_POST) . ' --- ' . $pgInfo, 'INFO');
                 if (isset($_POST['promote_id']) && !empty($_POST['promote_id'])) {
-                    $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $_POST['promote_account'], $sex, $nickname, $head_img);
+                    Log::write('cxj_register:' . date('Y-m-d H:i:s') . ' ---- post' . json_encode($_POST) .' --- INFO');
+                    $thisPromoteAccount = M('promote', 'tab_')->where(array('id' => $_POST['promote_id']))->getField('account');
+                    $thisPromoteAccount = !empty($thisPromoteAccount) ? $thisPromoteAccount : '自然注册';
+                    $promoteAccount = isset($_POST['promote_account']) ? $_POST['promote_account'] : $thisPromoteAccount;
+                    $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $promoteAccount, $sex, $nickname, $head_img);
                 } else {
                     $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, '', '', $sex, $nickname, $head_img);
                 }
diff --git a/Application/Mobile/View/User/register.html b/Application/Mobile/View/User/register.html
index 70db4d9d5..3dab79e91 100644
--- a/Application/Mobile/View/User/register.html
+++ b/Application/Mobile/View/User/register.html
@@ -59,14 +59,7 @@
           var tis = this,that = $(tis);
           if (that.hasClass('disabled')) {return false;}  
           var mobile = $.trim($('#mobile').val());
-          var promoteId = parseInt("{:I('get.pid',0)}");
-          var gameId = parseInt("{:I('get.gid',0)}");
-          var data = {};
-          if (promoteId > 0 && gameId > 0) {
-              data = {'phone':mobile,'promote_id':promoteId,'game_id':gameId};
-          } else {
-              data = {'phone':mobile};
-          }
+          var data = {'phone':mobile};
           if (mobile) {
             if (/^1[0-9]{10}$/.test(mobile)) {
                 $.ajax({