diff --git a/src/views/room/RoomSearchAdminView.vue b/src/views/room/RoomSearchAdminView.vue
index f70069e..697d631 100644
--- a/src/views/room/RoomSearchAdminView.vue
+++ b/src/views/room/RoomSearchAdminView.vue
@@ -214,6 +214,30 @@
                    id="removeBadge">下角标</a>
               </div>
             </div>
+
+            <div class="form-group">
+              <label class="col-sm-3 control-label">头像:</label>
+              <div class="col-sm-8">
+                <img src=""
+                     id="addAvatarImg"
+                     style="width:60px;height:90px"
+                     alt="">
+                <input type="file"
+                       id="addAvatar"
+                       name="uploadAvatar"
+                       accept="image/gif,image/jpeg,image/jpg,image/png">
+                <button class="btn btn-success"
+                        type="button"
+                        id="uploadAvatar">上传</button>
+                <input type="hidden"
+                       id="avatar"
+                       name="avatar"
+                       class="form-control" />
+                <a href="javascript:void(0)"
+                   id="removeAvatar">去除头像</a>
+              </div>
+            </div>
+
             <div class="form-group">
               <label class="col-sm-3 control-label">房间背景图:</label>
               <div class="col-sm-8">
@@ -237,7 +261,7 @@
               </div>
             </div>
 
-            <div class="form-group">
+            <!-- <div class="form-group">
               <label class="col-sm-3 control-label">是否有龙珠游戏:</label>
               <div class="col-sm-8">
                 <label class="radio-inline"><input type="radio"
@@ -247,7 +271,7 @@
                          name="hasDragonGame"
                          value="1" />是</label>
               </div>
-            </div>
+            </div> -->
 
             <div class="form-group">
               <label class="col-sm-3 control-label">是否开启纯净模式:</label>
@@ -261,7 +285,7 @@
               </div>
             </div>
 
-            <div class="form-group"
+            <!-- <div class="form-group"
                  id="close_box_group">
               <label class="col-sm-3 control-label">是否关闭转盘入口:</label>
               <div class="col-sm-8">
@@ -272,8 +296,8 @@
                          name="closeBox"
                          value="1" />是</label>
               </div>
-            </div>
-            <div class="form-group">
+            </div> -->
+            <!-- <div class="form-group">
               <label class="col-sm-3 control-label">是否有KTV权限:</label>
               <div class="col-sm-8">
                 <label class="radio-inline"><input type="radio"
@@ -283,7 +307,7 @@
                          name="hasKTVPriv"
                          value="1" />是</label>
               </div>
-            </div>
+            </div> -->
             <div class="form-group">
               <label class="col-sm-3 control-label">是否有相亲房权限:</label>
               <div class="col-sm-8">
@@ -296,7 +320,7 @@
               </div>
             </div>
 
-            <div class="form-group"
+            <!-- <div class="form-group"
                  id="close_recommend">
               <label class="col-sm-3 control-label">是否设置为卡片推荐位:</label>
               <div class="col-sm-8">
@@ -307,7 +331,7 @@
                          name="recommendStatus"
                          value="1" />是</label>
               </div>
-            </div>
+            </div> -->
           </form>
         </div>
         <div class="modal-footer">
@@ -510,6 +534,9 @@ export default {
               valign: 'middle',
               width: '5%',
               formatter: function (val, row, index) {
+                if ('' == val || undefined == val || null == val) {
+                  return '';
+                }
                 return "<img src='" + val + "' width='40' height='40'>"
                   + (row.isReview ? "<br>审核中" : "");
               }
@@ -613,32 +640,32 @@ export default {
                 }
               }
             },
-            {
-              field: 'room.hasDragonGame',
-              title: '龙珠游戏',
-              align: 'center',
-              valign: 'middle',
-              formatter: function (val, row, index) {
-                if (val) {
-                  return '有';
-                } else {
-                  return '没有';
-                }
-              }
-            },
-            {
-              field: 'room.hasKTVPriv',
-              title: 'KTV权限',
-              align: 'center',
-              valign: 'middle',
-              formatter: function (val, row, index) {
-                if (val) {
-                  return '有';
-                } else {
-                  return '没有';
-                }
-              }
-            },
+            // {
+            //   field: 'room.hasDragonGame',
+            //   title: '龙珠游戏',
+            //   align: 'center',
+            //   valign: 'middle',
+            //   formatter: function (val, row, index) {
+            //     if (val) {
+            //       return '有';
+            //     } else {
+            //       return '没有';
+            //     }
+            //   }
+            // },
+            // {
+            //   field: 'room.hasKTVPriv',
+            //   title: 'KTV权限',
+            //   align: 'center',
+            //   valign: 'middle',
+            //   formatter: function (val, row, index) {
+            //     if (val) {
+            //       return '有';
+            //     } else {
+            //       return '没有';
+            //     }
+            //   }
+            // },
             {
               field: 'room.canOpenBlindDate',
               title: '相亲房权限',
@@ -660,9 +687,7 @@ export default {
               valign: 'middle',
               formatter: function (val, row, index) {
                 var key = row.erbanNo;
-                console.log("列表key = " + key);
                 var canShow = row.room.canShow;
-                var uid = row.uid;
                 var str = "<button class='btn btn-sm btn-success opt-edit' style='margin-right: 4px;' data-id=" + key + ">编辑</button>";
                 if (canShow) {
                   str += "<button class='btn btn-sm btn-warning opt-show' data-id=" + key + ">不显示</button>";
@@ -877,22 +902,26 @@ export default {
             $('#badge').val(data.room.badge);
             $('#addImgUrl').attr('src', data.room.badge);
           }
+          if (data.room.avatar) {
+            $('#avatar').val(data.room.avatar);
+            $('#addAvatarImg').attr('src', data.room.avatar);
+          }
           if (data.room.backPic) {
             $('#backPic').val(data.room.backPic);
             $('#addBackPic').attr('src', data.room.backPic);
           }
-          var hasDragonGame = parseNum(data.room.hasDragonGame);
-          $("input:radio[name='hasDragonGame']")[hasDragonGame].checked = true;
+          //var hasDragonGame = parseNum(data.room.hasDragonGame);
+          //$("input:radio[name='hasDragonGame']")[hasDragonGame].checked = true;
 
           var isPureMode = parseNum(data.room.isPureMode);
           console.log("isPureMode", isPureMode)
           $("input:radio[name='isPureMode']")[isPureMode].checked = true;
 
-          var closeBox = parseNum(data.room.closeBox);
-          $("input:radio[name='closeBox']")[closeBox].checked = true;
+          //var closeBox = parseNum(data.room.closeBox);
+          //$("input:radio[name='closeBox']")[closeBox].checked = true;
 
-          var hasKTVPriv = parseNum(data.room.hasKTVPriv);
-          $("input:radio[name='hasKTVPriv']")[hasKTVPriv].checked = true;
+          //var hasKTVPriv = parseNum(data.room.hasKTVPriv);
+          //$("input:radio[name='hasKTVPriv']")[hasKTVPriv].checked = true;
 
           var hasBlindDateRoomPri = parseNum(data.room.canOpenBlindDate);
           $("input:radio[name='hasBlindDateRoomPri']")[hasBlindDateRoomPri].checked = true;
@@ -999,7 +1028,7 @@ export default {
         $('#uploadBtn').on('click', function () {
           var options = {
             type: 'post',
-            url: '/admin/roomAdmin/headBadge',
+            url: '/admin/roomAdmin/uploadBadge',
             dataType: 'json',
             success: function (json) {
               if (json.path) {
@@ -1017,7 +1046,7 @@ export default {
         $('#uploadBtn2').on('click', function () {
           var options = {
             type: 'post',
-            url: '/admin/roomAdmin/headBackground',
+            url: '/admin/roomAdmin/uploadBackground',
             dataType: 'json',
             success: function (json) {
               if (json.path) {
@@ -1032,6 +1061,24 @@ export default {
           }
           $("#editRoom").ajaxSubmit(options);
         })
+        $('#uploadAvatar').on('click', function () {
+          var options = {
+            type: 'post',
+            url: '/admin/roomAdmin/uploadAvatar',
+            dataType: 'json',
+            success: function (json) {
+              if (json.path) {
+                $('#avatar').val(json.path);
+                $('#addAvatarImg').attr("src", json.path);
+                console.log(json.path);
+              } else {
+                $("#tipMsg").text(json.msg);
+                $("#tipModal").modal('show');
+              }
+            }
+          }
+          $("#editRoom").ajaxSubmit(options);
+        })
         $('#save').on('click', function () {
           if ($('#editRoom').validationEngine('validate')) {
             $.ajax({
@@ -1043,13 +1090,14 @@ export default {
                 tagId: $('#tag').val(),
                 singleRoomSortId: $('#sortId').val(),
                 badge: $('#badge').val(),
+                avatar: $('#avatar').val(),
                 backPic: $('#backPic').val(),
-                hasDragonGame: $("input[name='hasDragonGame']:checked").val(),
+                //hasDragonGame: $("input[name='hasDragonGame']:checked").val(),
                 isPureMode: $("input[name='isPureMode']:checked").val(),
-                hasKTVPriv: $("input[name='hasKTVPriv']:checked").val(),
+                //hasKTVPriv: $("input[name='hasKTVPriv']:checked").val(),
                 hasBlindDateRoomPri: $("input[name='hasBlindDateRoomPri']:checked").val(),
-                closeBox: $("input[name='closeBox']:checked").val(),
-                recommendStatus: $("input[name='recommendStatus']:checked").val(),
+                //closeBox: $("input[name='closeBox']:checked").val(),
+                //recommendStatus: $("input[name='recommendStatus']:checked").val(),
               },
               success: function (res) {
                 if (res.code == 200) {
@@ -1070,6 +1118,11 @@ export default {
           $('#addUploadFile').val('');
           $('#badge').val('');
         })
+        $('#removeAvatar').on('click', function () {
+          $('#addAvatarImg').attr('src', '');
+          $('#avatar').val('');
+          $('#addAvatar').val('');
+        })
         $('#removeBackground').on('click', function () {
           $('#addBackPic').attr('src', '');
           $('#backPic').val('');