.gitignore

@@ -1,6 +1,11 @@
 .DS_Store
 node_modules
+<<<<<<< HEAD
+
+
+=======
 /dist
+>>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
 # local env files
 .env.local
 .env.*.local

src/views/index/components/communication/index.scss

@@ -4,7 +4,7 @@
   background: url('./images/logo@3x.png') no-repeat;
   background-size: 100% 100%;
   width: halfW(356);
-  height: halfH(510);
+  height: halfH(500);
   color: #fff;
   .map{
     display: flex;

src/views/index/components/communication/index.vue

@@ -1,8 +1,13 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 14:10:08
+<<<<<<< HEAD
+ * @LastEditors: WangQiBiao
+ * @LastEditTime: 2019-10-16 07:05:00
+=======
  * @LastEditors: mozhuangru
  * @LastEditTime: 2019-10-13 16:56:30
+>>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
  * @Description: 在线沟通
  -->
 <template>
@@ -18,7 +23,7 @@
         <div class="list-item" v-for="(item, idx) in dialogData" :key="idx">
         <div class="list-item-lf">
           <TagCom type="time">{{item.createAt}}</TagCom>
-          <span class="list-item-txt">{{item.content}}</span>
+          <span class="list-item-txt">{{item.content.replace('提交了', '')}}</span>
         </div>
         <div class="list-item-lr">
           <TagCom v-if="item.label === '建议'" type="advice">建议</TagCom>

src/views/index/components/entrance-guard/index.scss

@@ -3,7 +3,7 @@
 .entrance-guard{
   background: url('./images/logo@3x.png') no-repeat;
   background-size: 100% 100%;
-  height: halfH(388);
+  height: halfH(378);
   color: #fff;
   padding: 0 halfH(22);
   overflow: hidden;

src/views/index/components/entrance-guard/index.vue

@@ -1,8 +1,13 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 10:20:36
+<<<<<<< HEAD
+ * @LastEditors: WangQiBiao
+ * @LastEditTime: 2019-10-13 14:35:26
+=======
  * @LastEditors: mozhuangru
  * @LastEditTime: 2019-10-13 16:51:49
+>>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
  * @Description: 智能门禁
  -->
 <template>

src/views/index/components/paid-in/index.scss

@@ -3,7 +3,7 @@
   background: url('./images/logo@3x.png') no-repeat;
   background-size: 100% 100%;
   width: 100%;
-  height: halfH(463);
+  height: halfH(443);
   position: relative;
   .map{
     display: flex;

src/views/index/components/parking/index.scss

@@ -3,7 +3,7 @@
 .parking{
   background: url('./images/logo@3x.png') no-repeat;
   background-size: 100% 100%;
-  height: halfH(388);
+  height: halfH(378);
   color: #fff;
   padding: 0 halfH(22);
   overflow: hidden;

src/views/index/components/repair/index.scss

@@ -4,7 +4,7 @@
   background: url('./images/logo@3x.png') no-repeat;
   background-size: 100% 100%;
   width: halfW(356);
-  height: halfH(266);
+  height: halfH(256);
   color: #fff;
   .rate{
     display: flex;

src/views/index/components/statistical/index.scss

@@ -1,7 +1,7 @@
 @import "@/assets/css/function.scss";
 @import "@/assets/css/mixin.scss";
 .statistical{
-  padding: halfH(35) halfW(20) 0;
+  padding: halfH(26) halfW(20) 0;
   @include clearBox;
   display: flex;
   &>.item{