.gitignore

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

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

@@ -1,13 +1,8 @@
 <!--
  * @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
+ * @LastEditTime: 2019-10-16 08:56:44
  * @Description: 在线沟通
  -->
 <template>

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

@@ -1,13 +1,8 @@
 <!--
  * @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
+ * @LastEditTime: 2019-10-16 08:56:48
  * @Description: 智能门禁
  -->
 <template>

yarn.lock

@@ -1491,13 +1491,8 @@ aws4@^1.8.0:
 
 axios@^0.19.0:
   version "0.19.0"
-<<<<<<< HEAD
-  resolved "https://registry.npm.taobao.org/axios/download/axios-0.19.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
-  integrity sha1-jgm/89kSLhM/e4EByPvdAO09Krg=
-=======
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
   integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
   dependencies:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
@@ -2710,13 +2705,8 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
 
 debug@=3.1.0:
   version "3.1.0"
-<<<<<<< HEAD
-  resolved "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=
-=======
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
   dependencies:
     ms "2.0.0"
 
@@ -3846,13 +3836,8 @@ flush-write-stream@^1.0.0:
 
 follow-redirects@1.5.10:
   version "1.5.10"
-<<<<<<< HEAD
-  resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=
-=======
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
   integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
   dependencies:
     debug "=3.1.0"
 
@@ -4684,13 +4669,8 @@ is-buffer@^1.1.5:
 
 is-buffer@^2.0.2:
   version "2.0.4"
-<<<<<<< HEAD
-  resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha1-PlcvI8hBGlz9lVfISeNmXgspBiM=
-=======
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
 
 is-callable@^1.1.4:
   version "1.1.4"
@@ -8611,13 +8591,8 @@ vm-browserify@^1.0.1:
 
 vue-count-to@^1.0.13:
   version "1.0.13"
-<<<<<<< HEAD
-  resolved "https://registry.npm.taobao.org/vue-count-to/download/vue-count-to-1.0.13.tgz#3e7573ea6e64c2b2972f64e0a2ab2e23c7590ff3"
-  integrity sha1-PnVz6m5kwrKXL2TgoqsuI8dZD/M=
-=======
   resolved "https://registry.yarnpkg.com/vue-count-to/-/vue-count-to-1.0.13.tgz#3e7573ea6e64c2b2972f64e0a2ab2e23c7590ff3"
   integrity sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ==
->>>>>>> acc153eb6390a00eb842c4742c63bfe53c756873
 
 vue-eslint-parser@^2.0.3:
   version "2.0.3"
@@ -8666,8 +8641,8 @@ vue-router@^3.0.3:
 
 vue-seamless-scroll@^1.1.17:
   version "1.1.17"
-  resolved "https://registry.yarnpkg.com/vue-seamless-scroll/-/vue-seamless-scroll-1.1.17.tgz#08e45b155f467730309ea4a9893e05e7d682ab17"
-  integrity sha512-morpkbNkYZzlCtgSCDA/7PT5vRlqRVimaT82vFPDUyxmAD85jZ2vYOl+DRMwv+aD/eYcIBEv9qoYr4z8vL4zNA==
+  resolved "https://registry.npm.taobao.org/vue-seamless-scroll/download/vue-seamless-scroll-1.1.17.tgz#08e45b155f467730309ea4a9893e05e7d682ab17"
+  integrity sha1-CORbFV9GdzAwnqSpiT4F59aCqxc=
   dependencies:
     comutils "^1.1.9"