个人主页，首页显示魅力等级财富等级

application/api/controller/Index.php

@@ -56,12 +56,15 @@ class Index extends Api
             'user.charm_level',
 
             'wallet.vip_endtime',
+            'power.meili',
+            'power.caifu',
 
             'wealth.image as wealth_image',
             'charm.image  as charm_image',
         ];
         $list = Db::name('user')->alias('user')->field($field)
             ->join('user_wallet wallet','user.id = wallet.user_id','LEFT')
+            ->join('user_power power','user.id = power.user_id','LEFT')
             ->join('wealth_level wealth','user.wealth_level = wealth.level','LEFT')
             ->join('charm_level charm','user.charm_level = charm.level','LEFT')
             ->where($where)
@@ -73,6 +76,15 @@ class Index extends Api
         foreach($list as $key => &$val){
             $val['age'] = birthtime_to_age($val['birthday']);
             $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+
+            if($val['meili'] == 0){
+                $val['charm_level'] = '';
+                $val['charm_image'] = '';
+            }
+            if($val['caifu'] == 0){
+                $val['wealth_level'] = '';
+                $val['wealth_image'] = '';
+            }
         }
 
         $this->success(1,$list);
@@ -114,12 +126,15 @@ class Index extends Api
             'user.charm_level',
 
             'wallet.vip_endtime',
+            'power.meili',
+            'power.caifu',
 
             'wealth.image as wealth_image',
             'charm.image  as charm_image',
         ];
         $list = Db::name('user')->alias('user')->field($field)
             ->join('user_wallet wallet','user.id = wallet.user_id','LEFT')
+            ->join('user_power power','user.id = power.user_id','LEFT')
             ->join('wealth_level wealth','user.wealth_level = wealth.level','LEFT')
             ->join('charm_level charm','user.charm_level = charm.level','LEFT')
             ->where($where)
@@ -131,6 +146,15 @@ class Index extends Api
         foreach($list as $key => &$val){
             $val['age'] = birthtime_to_age($val['birthday']);
             $val['is_vip'] = $val['vip_endtime'] > time() ? 1 : 0;
+
+            if($val['meili'] == 0){
+                $val['charm_level'] = '';
+                $val['charm_image'] = '';
+            }
+            if($val['caifu'] == 0){
+                $val['wealth_level'] = '';
+                $val['wealth_image'] = '';
+            }
         }
 
         $this->success(1,$list);

application/api/controller/Usercenter.php

@@ -223,7 +223,7 @@ class Usercenter extends Api
         $userinfo['active_info'] = $this->user_activeinfo($uid);
 
         //用户权限
-        //$userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
+        $user_power = Db::name('user_power')->where('user_id',$uid)->find();
 
         //此用户与我的亲密度 信息
         $userinfo['intimacy_info'] = $this->get_intimacy_info($uid);
@@ -233,8 +233,7 @@ class Usercenter extends Api
         $userinfo['nickname_remark'] = !empty($nickname_remark) ? $nickname_remark : '';
 
         //vip如果开了隐私保护，需要隐藏距离
-        $weizhi = $this->user_power($userinfo['id'],'weizhi');
-        if($weizhi == 0){
+        if($user_power['weizhi'] == 0){
             $userinfo['cityname'] = '';
         }
 
@@ -251,7 +250,7 @@ class Usercenter extends Api
 
         //礼物墙
         $userinfo['gift_wall'] = [];
-        if($this->user_power($uid,'giftwall')==1){
+        if($user_power['giftwall'] == 1){
             $gift_wall = Db::name('gift_user_typing')->alias('log')
                 ->join('gift', 'gift.id = log.gift_id', 'LEFT')
                 ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
@@ -267,8 +266,18 @@ class Usercenter extends Api
         $userinfo['usersite_matchinfo_switch'] = config('site.usersite_matchinfo_switch');
 
         //财富等级,魅力等级
-        $userinfo['wealth_info'] = Db::name('wealth_level')->where('level',$userinfo['wealth_level'])->find();
-        $userinfo['charm_info']  = Db::name('charm_level')->where('level',$userinfo['charm_level'])->find();
+        if($user_power['meili'] == 1){
+            $userinfo['charm_image']  = Db::name('charm_level')->where('level',$userinfo['charm_level'])->value('image');
+        }else{
+            $userinfo['charm_image'] = '';
+            $userinfo['charm_level'] = '';
+        }
+        if($user_power['caifu'] == 1){
+            $userinfo['wealth_image'] = Db::name('wealth_level')->where('level',$userinfo['wealth_level'])->value('image');
+        }else{
+            $userinfo['wealth_image'] = '';
+            $userinfo['wealth_level'] = '';
+        }
 
         $this->success('success',$userinfo);
 

application/common/library/Auth.php

@@ -539,9 +539,41 @@ class Auth
         //价格显示开关
         $userinfo['usersite_matchinfo_switch'] = config('site.usersite_matchinfo_switch');
 
+        //用户权限
+        $user_power = Db::name('user_power')->where('user_id',$this->id)->find();
+
+        //vip如果开了隐私保护，需要隐藏距离
+        if($user_power['weizhi'] == 0){
+            $userinfo['cityname'] = '';
+        }
+
+        //礼物墙
+        $userinfo['gift_wall'] = [];
+        if($user_power['giftwall'] == 1){
+            $gift_wall = Db::name('gift_user_typing')->alias('log')
+                ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+                ->field('log.id,log.gift_name,sum(log.number) as number,gift.image')
+                ->where(['log.user_to_id' => $this->id])
+                ->group('log.gift_id')
+                ->order('gift.price desc')
+                ->select();
+            $gift_wall = list_domain_image($gift_wall,['image']);
+            $userinfo['gift_wall'] = $gift_wall;
+        }
+
         //财富等级,魅力等级
-        $userinfo['wealth_info'] = Db::name('wealth_level')->where('level',$this->wealth_level)->find();
-        $userinfo['charm_info']  = Db::name('charm_level')->where('level',$this->charm_level)->find();
+        if($user_power['meili'] == 1){
+            $userinfo['charm_image']  = Db::name('charm_level')->where('level',$userinfo['charm_level'])->value('image');
+        }else{
+            $userinfo['charm_image'] = '';
+            $userinfo['charm_level'] = '';
+        }
+        if($user_power['caifu'] == 1){
+            $userinfo['wealth_image'] = Db::name('wealth_level')->where('level',$userinfo['wealth_level'])->value('image');
+        }else{
+            $userinfo['wealth_image'] = '';
+            $userinfo['wealth_level'] = '';
+        }
 
         return $userinfo;
     }