Skip to content

T
tl_estate
Commit 21708f90 authored by hujun's avatar hujun
Browse files
Options

解决冲突

parent 7ab5442b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
application/api/controller/Member.php
View file @ 21708f90
......@@ -232,19 +232,11 @@ class Member extends Basic
if (!empty($user_data->id) && ($user_data->status != -1)) {
return $this->response(101, '该手机号已注册');
}
<<<<<<< HEAD
if ($this->request->param('code') == $code && $code != '') {
$referrer_source = $this->request->param('referrer_source');
$referrer_id = $this->request->param('referrer_id');
=======
if ($this->request->param('code') == $code && $code != '') {
$referrer_source = $this->request->param('referrer_source');
$referrer_id = $this->request->param('referrer_id');
>>>>>>> test
if (!isset($user_data->status) && ($user_data->status != -1)) {
if ($referrer_source == 20) {
//经纪人id 计算佣金的字段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment