diff --git a/src/views/recharge/RechargeDiamondGiveDetailView.vue b/src/views/recharge/RechargeDiamondGiveDetailView.vue
index 55efd5e..9c40759 100644
--- a/src/views/recharge/RechargeDiamondGiveDetailView.vue
+++ b/src/views/recharge/RechargeDiamondGiveDetailView.vue
@@ -75,7 +75,7 @@
               </div>
             </div>
           </form>
-          <div id="mapObjHtml">
+          <div id="mapObjHtml" style="display:none">
             <span
               style="
                 margin-right: 10px;
@@ -125,6 +125,33 @@ export default {
       $(function () {
         userRegion();
         $("#table").bootstrapTable("destroy");
+        var picker1 = $("#startTime").datetimepicker({
+          format: "yyyy-mm-dd hh:ii:00",
+          todayBtn: true,
+          autoclose: true,
+        });
+        var picker2 = $("#endTime").datetimepicker({
+          format: "yyyy-mm-dd hh:ii:00",
+          todayBtn: true,
+          autoclose: true,
+        });
+        picker1.on("changeDate", function () {
+          var date = $("#startTime").datetimepicker("getDate");
+          picker2.datetimepicker("setStartDate", date);
+        });
+        picker2.on("changeDate", function () {
+          var date = $("#endTime").datetimepicker("getDate");
+          picker1.datetimepicker("setEndDate", date);
+        });
+
+        //导出功能
+        $("#btnExport").on("click", function () {
+          $("#searchForm").submit();
+        });
+
+        // 查询刷新
+        $("#btnSearch").on("click", function () {
+          
         $("#table").bootstrapTable({
           columns: [
             {
@@ -239,34 +266,8 @@ export default {
             console.log("load fail");
           },
         });
-
-        var picker1 = $("#startTime").datetimepicker({
-          format: "yyyy-mm-dd hh:ii:00",
-          todayBtn: true,
-          autoclose: true,
-        });
-        var picker2 = $("#endTime").datetimepicker({
-          format: "yyyy-mm-dd hh:ii:00",
-          todayBtn: true,
-          autoclose: true,
-        });
-        picker1.on("changeDate", function () {
-          var date = $("#startTime").datetimepicker("getDate");
-          picker2.datetimepicker("setStartDate", date);
-        });
-        picker2.on("changeDate", function () {
-          var date = $("#endTime").datetimepicker("getDate");
-          picker1.datetimepicker("setEndDate", date);
-        });
-
-        //导出功能
-        $("#btnExport").on("click", function () {
-          $("#searchForm").submit();
-        });
-
-        // 查询刷新
-        $("#btnSearch").on("click", function () {
           TableHelper.doRefresh("#table");
+          $('#mapObjHtml').show();
         });
 
         //用户地区
diff --git a/src/views/room/RoomTabHomeView.vue b/src/views/room/RoomTabHomeView.vue
index f25ea29..3ada624 100644
--- a/src/views/room/RoomTabHomeView.vue
+++ b/src/views/room/RoomTabHomeView.vue
@@ -90,13 +90,14 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_type" class="col-sm-3 control-label"
+              <label for="homeType" class="col-sm-3 control-label"
                 >房间类型：<font color="red">*</font>：</label
               >
               <div class="col-sm-9">
-                <select name="type" id="modal_type" class="form-control">
-                  <option value="1">客服房间</option>
-                  <option value="2">热门房间</option>
+                <select name="type" id="homeType" class="form-control">
+                  <option value="0">普通</option>
+                  <option value="1">热门房间</option>
+                  <option value="2">客服房间</option>
                 </select>
               </div>
             </div>
@@ -304,23 +305,40 @@ export default {
               formatter: formatTime,
             },
             {
-              field: "isHourTop1",
-              title: "小时榜top1",
+              field: "hourTop",
+              title: "小时榜排名",
               align: "center",
               valign: "middle",
               width: "10%",
+            },
+            {
+              field: "hotValue",
+              title: "热力值",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+            },
+            {
+              field: "regionFlag",
+              title: "地区旗帜",
+              align: "center",
+              width: "5%",
               formatter: function (val, row, index) {
-                return val ? "是" : "否";
+                return "<img src='" + val + "' width='40' height='40'>";
               },
             },
             {
-              field: "isHourTop1",
-              title: "周榜top1",
+              field: "homeType",
+              title: "房间类型",
               align: "center",
               valign: "middle",
               width: "10%",
               formatter: function (val, row, index) {
-                return val ? "是" : "否";
+                return val == 1
+                  ? "热门房间"
+                  : val == 0
+                  ? "普通房间"
+                  : "客服房间";
               },
             },
             {
@@ -404,7 +422,7 @@ export default {
           var roomUid = $("#roomUid").val();
           var seq = $("#modal_seq").val();
           var isTop = $("#modal_isTop").val();
-          var type = $("#modal_type").val();
+          var homeType = $("#homeType").val();
           var iconContent = $("#modal_iconContent").val();
           var topStart = $("#modal_topStart").val();
           var topEnd = $("#modal_topEnd").val();
@@ -416,6 +434,7 @@ export default {
               data: {
                 id: id,
                 roomUid: roomUid,
+                homeType: homeType,
                 seq: seq,
                 isTop: isTop,
                 iconContent: iconContent,
@@ -449,7 +468,7 @@ export default {
           $("#id").val(null);
           $("#modal_seq").val(0);
           $("#modal_isTop").val(0);
-          $("#modal_type").val(0);
+          $("#homeType").val(0);
           $("#modal_topStart").val("");
           $("#modal_topEnd").val("");
           $("#modal_isShow").val(0);
@@ -466,7 +485,7 @@ export default {
                   $("#id").val(id);
                   $("#modal_seq").val(json.seq);
                   $("#modal_isTop").val(json.isTop ? 1 : 0);
-                  $("#modal_type").val(json.type);
+                  $("#homeType").val(json.type);
                   $("#modal_topStart").val(formatTime(json.topStart));
                   $("#modal_topEnd").val(formatTime(json.topEnd));
                   $("#modal_isShow").val(json.isShow ? 1 : 0);