commit

app/admin/controller/user/User.php

@@ -333,7 +333,7 @@ class User extends AuthController
         $f[] = Form::input('card_id', '身份证号', $user->getData('card_id'));
         $f[] = Form::textarea('mark', '用户备注', $user->getData('mark'));
         $f[] = Form::radio('is_promoter', '推广员', $user->getData('is_promoter'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
-        $f[] = Form::select('spread_uid', '推荐人', (string)$user->getData('spread_uid'))->options(array_merge([['value' => 0, 'label' => '无']], UserModel::where('uid', '<>', $uid)->field('uid as value,nickname as label')->select()->toArray()))->filterable(true);
+        $f[] = Form::select('spread_uid', '推荐人', (string)$user->getData('spread_uid'))->options(array_merge([['value' => 0, 'label' => '无']], UserModel::where('uid', '<>', $uid)->field('uid as value,phone as label')->select()->toArray()))->filterable(true);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));

app/models/user/User.php

@@ -598,6 +598,7 @@ class User extends BaseModel
     {
         $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: 1;//获取后台分销类型
         if (self::be(['account' => $account])) return self::setErrorInfo('用户已存在');
+        self::beginTrans();
         $phone = $account;
         $data['account'] = $account;
         $data['pwd'] = md5($password);
@@ -623,7 +624,6 @@ class User extends BaseModel
         $data['province'] = '';
         $data['country'] = '';
         $data['is_promoter'] = $storeBrokerageStatu != 1 ? 1 : 0;
-        self::beginTrans();
         $res2 = WechatUser::create($data);
         $data['uid'] = $res2->uid;
         $res1 = self::create($data);

app/models/user/UserSpread.php

@@ -64,7 +64,7 @@ class UserSpread extends BaseModel
 
         $user = User::where('uid', $uid)->find();
         $spread_user = User::get($spread_uid);
-        if (!$user || !$spread_user || !$spread_user['is_promoter']) {
+        if (!$user || !$spread_user) {
             return true;
         }
         //首先获取绑定方式