commit

app/common.php

@@ -637,6 +637,7 @@ if (!function_exists('do_request')) {
                         'nickname' => $v['nickname'],
                         'avatar' => $v['avatar'],
                         'uid' => $v['uid'],
+                        'phone' => $v['phone'],
                         'price' => \app\models\store\StoreOrder::where('uid', $v['uid'])->where('paid', 1)->where($where)->sum('pay_price'),
                         'count' => \app\models\store\StoreOrder::where('uid', $v['uid'])->where('paid', 1)->where($where)->sum('total_num')
                     ];

app/models/user/User.php

@@ -122,16 +122,16 @@ class User extends BaseModel
         }
         if ($userInfo->spread_uid) {
             return self::edit([
-                'nickname' => $wechatUser['nickname'] ?: '',
-                'avatar' => $wechatUser['headimgurl'] ?: '',
+//                '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');
         } else {
             $data = [
-                'nickname' => $wechatUser['nickname'] ?: '',
-                'avatar' => $wechatUser['headimgurl'] ?: '',
+//                '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,
@@ -532,7 +532,7 @@ class User extends BaseModel
             ->where('o.is_del', 0)->where('o.is_system_del', 0)->alias('o')->fetchSql(true)->select();
         $model = $model->join("(" . $sql . ") p", 'u.uid = p.uid', 'LEFT');
         $model = $model->where('u.uid', 'IN', $uid);
-        $model = $model->field("u.uid,u.nickname,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_count as childCount,u.pay_count as orderCount,p.numberCount");
+        $model = $model->field("u.uid,u.nickname,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_count as childCount,u.pay_count as orderCount,p.numberCount,u.phone");
         if (strlen(trim($keyword))) $model = $model->where('u.nickname|u.phone', 'like', "%$keyword%");
         $model = $model->group('u.uid');
         $model = $model->order($orderBy);

crmeb/traits/JwtAuthModelTrait.php

@@ -29,7 +29,7 @@ trait JwtAuthModelTrait
             'aud' => $host,
             'iat' => $time,
             'nbf' => $time,
-            'exp' => strtotime('+ 3hour'),
+            'exp' => strtotime('+ 3day'),
         ];
         $params['jti'] = compact('id', 'type');
         $token = JWT::encode($params, Config::get('app.app_key', 'default'));