Browse Source

派对加状态

lizhen_gitee 1 year ago
parent
commit
eb92296a50

+ 1 - 0
application/admin/lang/zh-cn/party/party.php

@@ -23,6 +23,7 @@ return [
     'Is_online 0'         => '离线',
     'Status'              => '派对状态',
     'Status -1'           => '封禁',
+    'Status 0'            => '待审',
     'Status 1'            => '正常',
     'Is_recommend'        => '是否推荐',
     'Is_recommend 1'      => '是',

+ 1 - 1
application/admin/model/party/Party.php

@@ -56,7 +56,7 @@ class Party extends Model
 
     public function getStatusList()
     {
-        return ['-1' => __('Status -1'), '1' => __('Status 1')];
+        return ['-1' => __('Status -1'),'0' => __('Status 0'), '1' => __('Status 1')];
     }
 
     public function getIsRecommendList()

+ 2 - 2
application/api/controller/Guild.php

@@ -178,7 +178,7 @@ class Guild extends Api
                 $guildInfo->status = 0;
 
                 //去派对建个房间
-                $party_info = $this->createParty($user_id,$guild_name,$guild_image,$guild_desc,$guild_notice,8,1,1);
+                $party_info = $this->createParty($user_id,$guild_name,$guild_image,$guild_desc,$guild_notice,8,1,1,$guildInfo['status']);
                 $guildInfo->party_id = $party_info['party_id'];
                 $guildInfo->easemob_room_id = $party_info['easemob_room_id'];
 
@@ -248,7 +248,7 @@ class Guild extends Api
     /**
      * 创建/进入派对
      */
-    private function createParty($user_id,$party_name,$party_logo,$guild_desc,$guild_notice,$seatnum = 8,$is_public = 1,$room_type = 1,$status = -1) {
+    private function createParty($user_id,$party_name,$party_logo,$guild_desc,$guild_notice,$seatnum = 8,$is_public = 1,$room_type = 1,$status = 0) {
 
         $partyModel = new \app\common\model\Party();
         // 判断派对是否存在

+ 1 - 1
public/assets/js/backend/party/party.js

@@ -40,7 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'guilderRate', title: __('Guilderrate')},
 //                        {field: 'naming', title: __('Naming')},
 //                        {field: 'is_online', title: __('Is_online'), searchList: {"1":__('Is_online 1'),"0":__('Is_online 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'status', title: __('Status'), searchList: {"-1":__('Status -1'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'status', title: __('Status'), searchList: {"-1":__('Status -1'),"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
                         {field: 'is_recommend', title: __('Is_recommend'), searchList: {"1":__('Is_recommend 1'),"0":__('Is_recommend 0')}, formatter: Table.api.formatter.normal},
                         {field: 'is_close', title: __('Is_close'), searchList: {"1":__('Is_close 1'),"0":__('Is_close 0')}, formatter: Table.api.formatter.normal},
 //                        {field: 'party_type', title: __('Party_type')},