diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index bfca4df..b036f03 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -84,6 +84,7 @@ class Guild extends adminApi
            //当日流水
            $list[$k]['today_money'] = model('Guild')->getTodayMoney($v['id'],$search_stime,$search_etime);
            $list[$k]['is_show'] = $v['is_show'];
+           $list[$k]['is_show_str'] = $v['is_show'] == 1 ? '显示' : '隐藏';
            $list[$k]['status'] = $v['status'];
            $list[$k]['status_str'] = $v['status'] == 1 ? '正常' : '解散';
            $list[$k]['createtime'] = date('Y-m-d H:i:s',$v['createtime']);
@@ -102,7 +103,21 @@ class Guild extends adminApi
         $reslut['list'] = $list;
         return  V(1,"成功", $reslut);
     }
-
+    /*
+     * 工会显示状态修改
+     */
+    public function guild_show_status_edit(){
+        $id = input('id',0);
+        $guild = model('Guild')->getOne(['id'=>$id]);
+        if (!$guild) {
+            return V(0, "数据不存在");
+        }
+        if ($guild) {
+            $status = $guild['is_show'] == 1 ? 0 : 1;
+        }
+        $res = db::name('vs_guild')->where('id',$id)->update(['is_show'=>$status]);;
+        return V(1,"成功", $res);
+    }
     /**
      * 工会添加
      * @param guild_special_id  靓号  guild_special_id
diff --git a/application/adminapi/controller/RoomEmoji.php b/application/adminapi/controller/RoomEmoji.php
index 92aee25..d548b47 100644
--- a/application/adminapi/controller/RoomEmoji.php
+++ b/application/adminapi/controller/RoomEmoji.php
@@ -70,6 +70,7 @@ class RoomEmoji extends adminApi
         $pid = input('pid', 0, 'intval');
         $name = input('name', '', 'trim');
         $img = input('image', '', 'trim');
+        $animate_image = input('animate_image', '', 'trim');
         $sort = input('sort', 0, 'intval');
         $type_id = input('type_id', 0);
         $status = input('status', 1, 'intval');
@@ -86,6 +87,7 @@ class RoomEmoji extends adminApi
             'pid' => $pid,
             'name' => $name,
             'image' => $img,
+            'animate_image' => $animate_image,
             'sort' => $sort,
             'type_id' => $type_id,
             'status' => $status,
@@ -101,6 +103,7 @@ class RoomEmoji extends adminApi
         $id = input('id', 0, 'intval');
         $name = input('name', '', 'trim');
         $img = input('image', '', 'trim');
+        $animate_image = input('animate_image', '', 'trim');
         $sort = input('sort', 0, 'intval');
         $type_id = input('type_id', 0);
         $status = input('status', 1, 'intval');
@@ -113,6 +116,9 @@ class RoomEmoji extends adminApi
         if($img){
             $data['image'] = $img;
         }
+        if($animate_image){
+            $data['animate_image'] = $animate_image;
+        }
         if($sort){
             $data['sort'] = $sort;
         }
diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php
index 3b38e81..6eab916 100644
--- a/application/api/model/Guild.php
+++ b/application/api/model/Guild.php
@@ -28,6 +28,7 @@ class Guild extends Model
             ->field('id,guild_special_id,user_id,guild_name,cover,num,intro,createtime,income')
             ->where(['is_show'=>1,'delete_time'=>0])
             ->where($where)
+            ->order('num desc')
             ->page($page, $page_limit)
             ->select();
         $count = Db::name('vs_guild')
diff --git a/application/api/model/RoomEmoji.php b/application/api/model/RoomEmoji.php
index 594b50f..b18577c 100644
--- a/application/api/model/RoomEmoji.php
+++ b/application/api/model/RoomEmoji.php
@@ -33,7 +33,7 @@ class RoomEmoji extends Model
             $where['pid'] = $pid;
         }
         $list = db($this->table)
-            ->field('id,pid,type_id,name,image')
+            ->field('id,pid,type_id,name,image,animate_image')
             ->where(['status'=>1,'deletetime'=>0])
             ->where($where)
             ->order('sort desc,id desc')