commit

app/admin/controller/water/WaterDefault.php

@@ -178,10 +178,10 @@ class WaterDefault extends AuthController
         if ($data['lacing5'] > 0) $data['lacing'] .= ','.$data['lacing5'];
 
         if ($data['fula1'] > 0) $data['fula'] = $data['fula1'];
-        if ($data['fula2'] > 0) $data['fula'] = $data['fula2'];
-        if ($data['fula3'] > 0) $data['fula'] = $data['fula3'];
-        if ($data['fula4'] > 0) $data['fula'] = $data['fula4'];
-        if ($data['fula5'] > 0) $data['fula'] = $data['fula5'];
+        if ($data['fula2'] > 0) $data['fula'] .= ','.$data['fula2'];
+        if ($data['fula3'] > 0) $data['fula'] .= ','.$data['fula3'];
+        if ($data['fula4'] > 0) $data['fula'] .= ','.$data['fula4'];
+        if ($data['fula5'] > 0) $data['fula'] .= ','.$data['fula5'];
         if (!$validate->check($data)) {
             return Json::fail($validate->getError());
         }

app/models/user/User.php

@@ -122,6 +122,7 @@ class User extends BaseModel
             return self::edit([
                 'nickname' => $wechatUser['nickname'] ?: '',
                 'avatar' => $wechatUser['headimgurl'] ?: '',
+                'phone' => $wechatUser['phone'],
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
             ], $uid, 'uid');
@@ -129,6 +130,7 @@ class User extends BaseModel
             $data = [
                 'nickname' => $wechatUser['nickname'] ?: '',
                 'avatar' => $wechatUser['headimgurl'] ?: '',
+                'phone' => $wechatUser['phone'],
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
 //                'spread_uid' => 0,
@@ -224,7 +226,8 @@ class User extends BaseModel
             'add_ip' => request()->ip(),
             'last_time' => time(),
             'last_ip' => request()->ip(),
-            'user_type' => $routineUser['user_type']
+            'user_type' => $routineUser['user_type'],
+            'phone' => $routineUser['phone'],
         ]);
         $res = $res1 && $res2 && UserSpread::setSpread($routineUser['uid'], $spread_uid);
         self::checkTrans($res);