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

---
 Application/Mobile/View/User/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index 7ba63d50c..c105dc3d9 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -29,7 +29,7 @@
           <div class="forget"><a href="{:U('User/forget')}">忘记密码？</a></div>
           <button class="enter submit">登录</button>
      <if condition="I('get.pid') gt 0">
-         <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 手机注册 </a></div>
+       <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="{:U('User/register',array('pid'=>I('get.pid',0),'gid'=>I('get.gid',0)))}"> 手机注册 </a></div>
       <else/>
         <div class="promptly">还没有账号？<a style="margin-left: 10px;" href="{:U('User/step1')}"> 账号注册 </a>|<a href="{:U('User/register')}"> 手机注册 </a></div>
      </if>

From 1707d4d1627768a248fe59ed79ff4ec68d035e2e Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 10:56:02 +0800
Subject: [PATCH 2/2] ios13.1

---
 Application/Mobile/Controller/UserController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index 334fef288..48373ab45 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -402,7 +402,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);
                 }