Merge branch 'feature/addsearch' into dev

# Conflicts:
#	src/views/modules/base/community/community.vue
#	src/views/modules/base/community/roomForm.vue

src/views/modules/communityParty/regionalParty/activitysForm.vue

@@ -223,7 +223,7 @@
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
-import Tinymce from '@c/tinymce/index.vue'
+import Tinymce from '@c/tinymce2/index.vue'
 
 var map
 var search

src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@@ -46,7 +46,7 @@
             </div>
 
             <div class="icon_roomstate">
-              <div>出租</div>
+              <div>{{item.rentFlag}}</div>
             </div>
 
             <div class="icon_category">