Merge branch 'dev' into test

src/views/modules/base/community/community.vue

@@ -147,16 +147,16 @@
 </template>
 
 <script>
-import CDialog from '@c/CDialog'
+    import CDialog from '@c/CDialog'
-import communityTable from './communityTable'
+    import communityTable from './communityTable'
-import buildTable from './buildTable'
+    import buildTable from './buildTable'
-import roomTable from './roomTable'
+    import roomTable from './roomTable'
-import { requestPost } from "@/js/dai/request";
+    import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
+    import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+    import { Loading } from 'element-ui' // 引入Loading服务
-
+
-let loading // 加载动画
+    let loading // 加载动画
-export default {
+    export default {
         data () {
             return {
                 filterText: '',
@@ -475,63 +475,63 @@ export default {
         components: {
             communityTable, buildTable, roomTable
         }
-}
+    }
 </script>
 <style lang="scss" scoped >
-.div_main {
+  .div_main {
     display: flex;
-}
+  }
-.scrollar {
+  .scrollar {
     margin-top: 10px;
-}
+  }
 
-.div_tree {
+  .div_tree {
     flex: 0 0 280px;
     background-color: #ffffff;
     border-radius: 5px;
     padding: 10px;
     overflow-y: hidden;
-}
+  }
-.filter_tree {
+  .filter_tree {
     overflow-x: auto;
-}
+  }
 
-.div_table {
+  .div_table {
     margin-left: 15px;
     // flex: 1;
     width: calc(100% - 300px);
     background-color: #ffffff;
     border-radius: 5px;
     padding: 10px;
-}
+  }
 
-.div_btn {
+  .div_btn {
     margin-top: 20px;
-}
+  }
 
-.row {
+  .row {
     padding: 10px;
-}
+  }
 </style>
 
 <style>
-/* .aui-content > .el-tabs > .el-tabs__content {
+  /* .aui-content > .el-tabs > .el-tabs__content {
     padding: 0px;
-} */
+  } */
 
-.el-tree-node:focus > .el-tree-node__content {
+  .el-tree-node:focus > .el-tree-node__content {
     /* background-color: #ccc !important; */
     color: #2195fe;
-}
+  }
 </style>
 <style lang="scss" scoped>
-.div_tree {
+  .div_tree {
     /deep/ .el-scrollbar__wrap {
       overflow-x: hidden !important;
     }
-}
+  }
 </style>
 
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
+  @import "@/assets/scss/modules/visual/communityManage.scss";
 </style>

src/views/modules/base/community/roomForm.vue

@@ -135,13 +135,13 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+    import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
+    import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost, requestGet } from '@/js/dai/request'
+    import { requestPost, requestGet } from '@/js/dai/request'
 
 
-let loading // 加载动画
+    let loading // 加载动画
-export default {
+    export default {
         data () {
             return {
                 formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
@@ -387,8 +387,8 @@ export default {
 
         },
         props: {}
-}
+    }
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
+  @import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>

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">