Merge branch 'test'

509975fb · clone · 3c06dcd2 · 0afecf43 · 509975fb
Commit 509975fb authored May 14, 2018 by clone
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Member.php application/api/controller/Member.php +2 -1

No files found.
--- a/application/api/controller/Member.php
+++ b/application/api/controller/Member.php
@@ -217,7 +217,6 @@ class Member extends Basic
        $data['status'] = 101;
        $data['data']   = array();

-        $this->user->startTrans();
        if ($phone) {
            $user_data = $this->user->findUserByPhone('*', $phone, true);
        } else {
@@ -228,6 +227,8 @@ class Member extends Basic

        switch ($type) {
            case 'add' :
+                $this->user->startTrans();
+
                if ($pwd == '') {
                    return $this->response(101, '密码为空');
                }