表情包功能上传

application/adminapi/controller/RoomEmoji.php

@@ -50,10 +50,12 @@ class RoomEmoji extends adminApi
             ->count();
         $list = Db::name($this->table)
             ->where($where)
+            ->where(['deletetime' => 0])
             ->order('sort desc,id desc')
             ->page($page, $limit)
             ->select();
         foreach ($list as &$item) {
+            $item['type_str'] = Db::name($this->table_type)->where('id', $item['type_id'])->value('type_name');
             $item['createtime'] = date('Y-m-d H:i:s', $item['createtime']);
             $item['status_str'] = $item['status'] == 1 ? '显示' : '隐藏';
         }