Browse Source

我的好友列表,重写

lizhen_gitee 10 months ago
parent
commit
9b1f5c6b42
2 changed files with 27 additions and 9 deletions
  1. 11 9
      application/api/controller/Userfollow.php
  2. 16 0
      application/extra/keyworld.php

+ 11 - 9
application/api/controller/Userfollow.php

@@ -81,13 +81,13 @@ class Userfollow extends Api
 
         //亲密度列表
         $intimacy = Db::name('user_intimacy')->alias('ui')
-            ->field(['ui.id','ui.uid','ui.other_uid','ui.value','ui.level','
-            u.nickname as u_nickname','u.avatar as u_avatar','ua.requesttime as ua_requesttime','
-            ou.nickname as ou_nickname','ou.avatar as ou_avatar','oua.requesttime as oua_requesttime'])
+            ->field(['ui.id','ui.uid','ui.other_uid','ui.value','ui.level',
+                'u.nickname as u_nickname','u.avatar as u_avatar','u.is_active as u_is_active',/*'ua.requesttime as ua_requesttime',*/
+                'ou.nickname as ou_nickname','ou.avatar as ou_avatar','ou.is_active as ou_is_active '/*,'oua.requesttime as oua_requesttime'*/])
             ->join('user u'         ,'ui.uid = u.id','LEFT')
-            ->join('user_active ua' ,'ui.uid = ua.user_id','LEFT')
+//            ->join('user_active ua' ,'ui.uid = ua.user_id','LEFT')
             ->join('user ou'        ,'ui.other_uid = ou.id','LEFT')
-            ->join('user_active oua','ui.other_uid = oua.user_id','LEFT')
+//            ->join('user_active oua','ui.other_uid = oua.user_id','LEFT')
             ->where('(ui.uid = '.$this->auth->id.') or (ui.other_uid = '.$this->auth->id.')')
             ->where('ui.value','gt','0.1')
             ->order('ui.value desc, ui.id desc')->select();
@@ -102,18 +102,20 @@ class Userfollow extends Api
                         'id'               => $val['other_uid'],
                         'nickname'         => $val['ou_nickname'],
                         'avatar'           => $val['ou_avatar'],
-                        'requesttime'      => $val['oua_requesttime'],
+//                        'requesttime'      => $val['oua_requesttime'],
+                        'is_active'         => $val['ou_is_active'],
                         'intimacy'         => $val['value'],
-                        'requesttime_text' => get_last_time($val['oua_requesttime']),
+//                        'requesttime_text' => get_last_time($val['oua_requesttime']),
                     ];
                 }else{
                     $newval = [
                         'id'               => $val['uid'],
                         'nickname'         => $val['u_nickname'],
                         'avatar'           => $val['u_avatar'],
-                        'requesttime'      => $val['ua_requesttime'],
+//                        'requesttime'      => $val['ua_requesttime'],
+                        'is_active'         => $val['u_is_active'],
                         'intimacy'         => $val['value'],
-                        'requesttime_text' => get_last_time($val['ua_requesttime']),
+//                        'requesttime_text' => get_last_time($val['ua_requesttime']),
                     ];
                 }
                 $result[] = $newval;

+ 16 - 0
application/extra/keyworld.php

@@ -25,4 +25,20 @@ return array (
   21 => '肉棍',
   22 => '鸡巴',
   23 => '阴道',
+  24 => '微信',
+  25 => '电话',
+  26 => '联系方式',
+  27 => 'qq',
+  28 => '枪支弹药',
+  29 => '白粉',
+  30 => '1',
+  31 => '2',
+  32 => '3',
+  33 => '4',
+  34 => '5',
+  35 => '6',
+  36 => '7',
+  37 => '8',
+  38 => '9',
+  39 => '0',
 );