Browse Source

亲密度限制用户能做什么

lizhen_gitee 11 months ago
parent
commit
3da295aeb0

+ 1 - 1
application/api/controller/Baseconfig.php

@@ -22,7 +22,7 @@ class Baseconfig extends Api
             'changyongyu'            => config('site.changyongyu'),//常用语温馨提示
             'zhanghaozhuxiao'            => config('site.zhanghaozhuxiao'),//账号注销
             'tuiguang_rule'            => config('site.tuiguang_rule'),//邀请推广须知
-            'match_bg_music'            => config('site.match_bg_music'),//音视频匹配背景音乐
+            'match_bg_music'            => localpath_to_netpath(config('site.match_bg_music')),//音视频匹配背景音乐
         ];
 
         $this->success('success',$config);

+ 20 - 17
application/api/controller/Match.php

@@ -611,10 +611,9 @@ class Match extends Api
 
         $level = 0; //当前等级
         $level_name = ''; //当前等级名称
-
         $qinmi_sum = 0; //当前亲密度
-        $next_level_diff = 0; //距下一等级亲密度差值
 
+        $next_level_diff = 0; //距下一等级亲密度差值
         $next_level_name = 0; //下一等级名称
         $next_level_value = 0;//下一等级亲密度值
 
@@ -626,23 +625,27 @@ class Match extends Api
         if ($user_intimacy_info) {
             //当前亲密度
             $qinmi_sum = $user_intimacy_info['value'];
-            if ($list) {
-                //当前等级信息
-                $level_info = Db::name('intimacy_level')->where(['value' => ['elt', $user_intimacy_info['value']]])->order('level desc')->find();
-                if ($level_info) {
-                    $level      = $level_info['level'];
-                    $level_name = $level_info['name'];
-                }
-                //下一等级信息
-                $next_level_info = Db::name('intimacy_level')->where(['value' => ['gt', $user_intimacy_info['value']]])->order('value')->find();
-                if ($next_level_info) {
-                    $next_level_name  = $next_level_info['name'];
-                    $next_level_value = $next_level_info['value'];
-                    $next_level_diff = $next_level_info['value'] - $user_intimacy_info['value'];
-                }
+
+            //当前等级信息
+            $level_info = Db::name('intimacy_level')->where(['value' => ['elt', $user_intimacy_info['value']]])->order('level desc')->find();
+            if ($level_info) {
+                $level      = $level_info['level'];
+                $level_name = $level_info['name'];
+            }
+            //下一等级信息
+            $next_level_info = Db::name('intimacy_level')->where(['value' => ['gt', $user_intimacy_info['value']]])->order('value')->find();
+            if ($next_level_info) {
+                $next_level_name  = $next_level_info['name'];
+                $next_level_value = $next_level_info['value'];
+                $next_level_diff = $next_level_info['value'] - $user_intimacy_info['value'];
             }
+
         } else {
-            $next_level = Db::name('intimacy_level')->order('value')->find();
+            $level = 1; //当前等级
+            $level_name = '初级'; //当前等级名称
+            $qinmi_sum = 0; //当前亲密度
+
+            $next_level = Db::name('intimacy_level')->where('level',2)->find();
             $next_level_diff = $next_level['value'];
             $next_level_name = $next_level['name'];
             $next_level_value = $next_level['value'];

+ 13 - 0
application/api/controller/Usercenter.php

@@ -116,6 +116,7 @@ class Usercenter extends Api
         $level = 0; //当前等级
         $level_name = ''; //当前等级名称
         $qinmi_sum = 0; //当前亲密度
+        $level_info = [];
 
         if ($this->auth->id > $user_id) { //大的在后
             $where['uid'] = $user_id;
@@ -137,11 +138,23 @@ class Usercenter extends Api
                 $level_name = $level_info['name'];
             }
 
+        }else{
+            $level = 1; //当前等级
+            $level_name = '初级'; //当前等级名称
+            $qinmi_sum = 0; //当前亲密度
+
+            $level_info = Db::name('intimacy_level')->where('level',1)->find();
         }
 
+
+        unset($level_info['id']);
+        unset($level_info['name']);
+        unset($level_info['level']);
+        unset($level_info['value']);
         $data['level'] = $level; //当前等级
         $data['level_name'] = $level_name; //当前等级名称
         $data['qinmi_sum'] = $qinmi_sum; //当前亲密度
+        $data['level_info'] = $level_info; //当前亲密度
 
         return $data;
     }