pull

.env.test

@@ -0,0 +1,3 @@
+NODE_ENV=production
+BABEL_ENV=production
+VUE_APP_SECRET=test

.gitignore

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

dist/chunk-180cf130.ab81abf30660ac414583.5265.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-180cf130"],{"2a36":function(n,t,c){"use strict";var u=c("66cf"),a=c.n(u);a.a},"66cf":function(n,t,c){},"9dcb":function(n,t,c){"use strict";c.r(t);var u=function(){var n=this,t=n.$createElement,c=n._self._c||t;return c("div",{staticClass:"not-found"},[n._v("\n  404 not-found\n")])},a=[],e=(c("2a36"),c("2877")),o={},s=Object(e["a"])(o,u,a,!1,null,"426fc778",null);t["default"]=s.exports}}]);

dist/chunk-5ee79808.ab81abf30660ac414583.5265.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5ee79808"],{"9ed6":function(e,s,t){"use strict";t.r(s);var r=function(){var e=this,s=e.$createElement,t=e._self._c||s;return t("div",{staticClass:"login"},[t("el-form",{ref:"formRule",staticClass:"login-form",attrs:{model:e.formRule,rules:e.rules}},[t("h1",{staticClass:"login-form-label"},[e._v("绘享云大数据展示平台")]),t("el-form-item",{attrs:{prop:"user"}},[t("el-input",{attrs:{placeholder:"请输入用户名"},model:{value:e.formRule.user,callback:function(s){e.$set(e.formRule,"user",s)},expression:"formRule.user"}})],1),t("el-form-item",{attrs:{prop:"pwd"}},[t("el-input",{attrs:{"show-password":"",placeholder:"请输入登录密码"},model:{value:e.formRule.pwd,callback:function(s){e.$set(e.formRule,"pwd",s)},expression:"formRule.pwd"}})],1),t("el-form-item",[t("el-button",{directives:[{name:"loading",rawName:"v-loading",value:e.isLoading,expression:"isLoading"}],staticStyle:{width:"100%"},attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("登录")])],1)],1)],1)},i=[],o=(t("6762"),t("2fdb"),{data:function(){return{formRule:{user:"",pwd:""},rules:{user:[{required:!0,message:"请输入账号"}],pwd:[{required:!0,message:"请输入密码"}]},whiteUser:["wisdomcity","wisdomcity2019"],isLoading:!1}},methods:{onSubmit:function(){var e=this;this.$refs["formRule"].validate((function(s){if(!s)return!1;e.isLoading=!0,e.whiteUser.includes(e.formRule.user)?(sessionStorage.setItem("token","fdsfas41234123fdsf4132423vsvd134"),setTimeout((function(){e.isLoading=!1,e.$router.push({path:"/index"})}),1)):(e.isLoading=!1,e.$message({message:"您输入的账号或者密码有误，请重新输入正确的账号和密码！",type:"warning"}))}))}}}),a=o,n=(t("9ee0"),t("2877")),l=Object(n["a"])(a,r,i,!1,null,"1b8c030c",null);s["default"]=l.exports},"9ee0":function(e,s,t){"use strict";var r=t("ad3d"),i=t.n(r);i.a},ad3d:function(e,s,t){}}]);

dist/chunk-6dbbeaca.ab81abf30660ac414583.5265.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6dbbeaca"],{"5e7a":function(t,n,e){},"78ad":function(t,n,e){"use strict";var a=e("5e7a"),o=e.n(a);o.a},efb6:function(t,n,e){"use strict";e.r(n);var a=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"no-login"},[e("el-alert",{staticClass:"no-login-label",attrs:{title:"您没有登录权限，请联系管理员申请权限",type:"warning","show-icon":"",center:""}}),e("el-row",{staticClass:"no-login-btn"},[e("el-button",{attrs:{type:"primary"},on:{click:t.goLogin}},[t._v("返回登录页面")])],1)],1)},o=[],i={methods:{goLogin:function(){this.$router.push({path:"/login"})}}},s=i,l=(e("78ad"),e("2877")),c=Object(l["a"])(s,a,o,!1,null,null,null);n["default"]=c.exports}}]);

dist/chunk-bcf5f8d6.ab81abf30660ac414583.5265.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-bcf5f8d6"],{"43aa":function(t,e,i){"use strict";var a=i("d857"),n=i.n(a);n.a},d857:function(t,e,i){},fd7d:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"title"},[i("div",{staticClass:"lf"},[t._v("让物业管理更简单")]),i("div",{staticClass:"cent"},[t._v("绘享云")]),i("div",{staticClass:"lr"},[i("span",{staticClass:"time"},[t._v(t._s(t.time))]),i("span",{staticClass:"date"},[t._v(t._s(t.date))]),i("span",{staticClass:"day"},[t._v(t._s(t.day))])])])},n=[],s={data:function(){return{time:"00:00:00",date:"0000/00/00",day:"星期",timerFn:null}},mounted:function(){this.setTimeTrainingRotation()},beforeDestroy:function(){clearTimeout(this.timerFn)},methods:{fillZero:function(t){return t<10?"0"+t:t},getDateValue:function(){var t=new Date,e=t.getFullYear(),i=this.fillZero(t.getMonth()+1),a=t.getDate();this.date=e+"/"+i+"/"+a},getTimeValue:function(){clearTimeout(this.timerFn);var t=new Date,e=this.fillZero(t.getHours()),i=this.fillZero(t.getMinutes()),a=this.fillZero(t.getSeconds());this.time=e+":"+i+":"+a},getDayValue:function(){var t=new Date,e=["星期天","星期一","星期二","星期三","星期四","星期五","星期六"];this.day=e[t.getDay()]},setTimeTrainingRotation:function(){var t=this;this.getDateValue(),this.getTimeValue(),this.getDayValue(),this.timerFn=setTimeout((function(){t.setTimeTrainingRotation()}),1e3)}}},l=s,o=(i("43aa"),i("2877")),r=Object(o["a"])(l,a,n,!1,null,"b4437612",null);e["default"]=r.exports}}]);

dist/css/chunk-180cf130.6cd01843.css

@@ -1 +0,0 @@
-.not-found[data-v-426fc778]{font-size:32px;font-weight:700;text-align:center;padding:200px 0}

dist/css/chunk-5ee79808.ff4527d3.css

@@ -1 +0,0 @@
-.login[data-v-1b8c030c]{color:#fff}.login .login-form[data-v-1b8c030c]{width:20.83333vw;padding:2.08333vw;background:#959fcd;position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border-radius:.52083vw}.login .login-form .login-form-label[data-v-1b8c030c]{padding-bottom:3.7037vh;font-size:2.96296vh;text-align:center}

dist/css/chunk-6dbbeaca.4c8dde50.css

@@ -1 +0,0 @@
-.no-login{color:#fff;margin:auto}.no-login .no-login-label{border-radius:0}.no-login .no-login-btn{padding-top:200px;margin:auto;text-align:center}

dist/css/chunk-bcf5f8d6.61430d25.css

@@ -1 +0,0 @@
-.title[data-v-b4437612]{background:url(../img/dbl@3x.6e85983f.png) no-repeat;background-size:100% 100%;height:5.55556vh;position:relative;text-align:center;color:#39d6fe;font-size:1.2963vh}.title .lf[data-v-b4437612]{position:absolute;left:8.02083vw;top:.92593vh}.title .cent[data-v-b4437612]{font-size:2.96296vh;font-weight:700;padding-top:1.2037vh;background:-webkit-gradient(linear,left bottom,left top,from(#1765ff),color-stop(0,#1765ff),color-stop(54.93164%,#49d9fe),color-stop(80.32227%,#8fefff));background:linear-gradient(0deg,#1765ff,#1765ff 0,#49d9fe 54.93164%,#8fefff 80.32227%);-webkit-background-clip:text;background-clip:text;color:transparent}.title .lr[data-v-b4437612]{position:absolute;right:3.64583vw;top:.55556vh}.title .lr .time[data-v-b4437612]{font-size:1.66667vh;font-weight:700;padding-right:1.5625vw}.title .lr .date[data-v-b4437612]{padding-right:.52083vw}

package.json

@@ -3,9 +3,12 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "test": "vue-cli-service build --mode test",
+    "lint": "vue-cli-service lint",
+    "test:e2e": "vue-cli-service test:e2e",
+    "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
     "axios": "^0.19.0",
@@ -17,6 +20,7 @@
     "vue": "^2.6.10",
     "vue-count-to": "^1.0.13",
     "vue-router": "^3.0.3",
+    "vue-seamless-scroll": "^1.1.17",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
@@ -24,6 +28,7 @@
     "@vue/cli-plugin-eslint": "^3.11.0",
     "@vue/cli-service": "^3.11.0",
     "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "^1.0.0-beta.20",
     "babel-eslint": "^10.0.1",
     "eslint": "^5.16.0",
     "eslint-plugin-cypress": "^2.6.1",

public/index.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-24 17:50:53
- * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-10-08 15:46:17
+ * @LastEditors: mozhuangru
+ * @LastEditTime: 2019-10-14 09:15:53
  * @Description:
  -->
 <!DOCTYPE html>

src/config/index.js

@@ -3,7 +3,7 @@
  * @LastEditors: WuWei
  * @Description: 全局参数设置
  * @Date: 2019-03-12 09:40:46
- * @LastEditTime: 2019-06-14 11:24:44
+ * @LastEditTime: 2019-10-14 10:55:38
  */
 const REQUEST_MATCHING_HASH = `/9ad134a361f8d778` // 【9ad134a361f8d778 = 前端服务，用于后端接口匹配】
 

src/main.js

@@ -1,8 +1,8 @@
 /*
  * @Author: WangQiBiao
  * @Date: 2019-09-24 17:50:53
- * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-09-26 18:02:26
+ * @LastEditors: mozhuangru
+ * @LastEditTime: 2019-10-13 16:51:21
  * @Description:
  */
 import Vue from 'vue'
@@ -17,7 +17,6 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import '@/assets/css/element-variables.scss'
 Vue.use(ElementUI)
-
 // 引入全局过滤器
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])

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

@@ -33,9 +33,9 @@
       display: flex;
       align-items: center;
       padding-bottom: halfH(12);
-      animation: bubble 20s linear infinite;
-      backface-visibility: hidden;
-      animation-fill-mode: forwards;
+      // animation: bubble 20s linear infinite;
+      // backface-visibility: hidden;
+      // animation-fill-mode: forwards;
       .list-item-txt{
         font-size: halfH(14);
       }

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>
@@ -14,7 +19,8 @@
     </div>
     <div class="linst-line"></div>
     <div class="list">
-      <div class="list-item" v-for="(item, idx) in dialogData" :key="idx">
+      <vueSeamless :data="dialogData" :class-option="optionScroll" class="list">
+        <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.replace('提交了', '')}}</span>
@@ -27,6 +33,7 @@
           <TagCom v-if="item.label === '待受理'" type="accept">待受理</TagCom>
         </div>
       </div>
+      </vueSeamless>
     </div>
   </div>
 </template>
@@ -35,7 +42,16 @@ import TitleCom from '@/components/title'
 import TagCom from '@/components/tag'
 import echarts from 'echarts'
 import { api } from '@/api'
+import vueSeamless from 'vue-seamless-scroll'
+
 export default {
+  computed: {
+    optionScroll () {
+      return {
+        step: 0.5
+      }
+    }
+  },
   data () {
     return {
       dialogData: []
@@ -43,7 +59,8 @@ export default {
   },
   components: {
     TitleCom,
-    TagCom
+    TagCom,
+    vueSeamless
   },
   mounted () {
     this.init()

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

@@ -33,12 +33,12 @@
       display: flex;
       align-items: center;
       padding-bottom: halfH(12);
-      animation: bubble 20s linear infinite;
-      backface-visibility: hidden;
-      animation-fill-mode: forwards;
-      -webkit-animation: bubble 20s linear infinite;
-      -webkit-backface-visibility: hidden;
-      -webkit-animation-fill-mode: forwards;
+      // animation: bubble 20s linear infinite;
+      // backface-visibility: hidden;
+      // animation-fill-mode: forwards;
+      // -webkit-animation: bubble 20s linear infinite;
+      // -webkit-backface-visibility: hidden;
+      // -webkit-animation-fill-mode: forwards;
       .list-item-txt{
         font-size: halfH(14);
       }

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>
@@ -16,7 +21,8 @@
       </div>
     </div>
     <div class="list">
-      <div class="list-item" v-for="(item, idx) in faceData.list" :key="idx">
+      <vueSeamless :data="faceData.list" :class-option="optionScroll" class="list">
+        <div class="list-item" v-for="(item, idx) in faceData.list" :key="idx">
         <div class="list-item-lf">
           <TagCom type="time">{{item.createAt}}</TagCom>
           <span class="list-item-txt">{{item.content}}</span>
@@ -25,6 +31,7 @@
           <TagCom type="house">{{item.label}}</TagCom>
         </div>
       </div>
+      </vueSeamless>
     </div>
   </div>
 </template>
@@ -32,7 +39,16 @@
 import TitleCom from '@/components/title'
 import TagCom from '@/components/tag'
 import { api } from '@/api'
+import vueSeamless from 'vue-seamless-scroll'
+
 export default {
+  computed: {
+    optionScroll () {
+      return {
+        step: 0.5
+      }
+    }
+  },
   data () {
     return {
       faceData: {}
@@ -40,7 +56,8 @@ export default {
   },
   components: {
     TitleCom,
-    TagCom
+    TagCom,
+    vueSeamless
   },
   mounted () {
     this.init()

src/views/index/components/income/index.vue

@@ -2,7 +2,7 @@
  * @Author: WangQiBiao
  * @Date: 2019-09-26 10:57:30
  * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-12 15:57:25
+ * @LastEditTime: 2019-10-13 16:02:12
  * @Description: 收入统计
  -->
 <template>
@@ -77,7 +77,7 @@ export default {
             label: {
               normal: {
                 // formatter: '{b|{b}}\n{c}',
-                formatter: '{per|{d}%}',
+                formatter: '{b|{b}}\n{per|{d}%}',
                 fontSize: 10,
                 lineHeight: 14,
                 rich: {

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

@@ -2,12 +2,12 @@
  * @Author: WangQiBiao
  * @Date: 2019-09-26 08:46:04
  * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-12 09:04:28
+ * @LastEditTime: 2019-10-13 17:09:06
  * @Description: 近1年应实收统计
  -->
 <template>
   <div class="paid-in">
-    <TitleCom>近1年应实收统计</TitleCom>
+    <TitleCom>近12个月实收统计</TitleCom>
     <div class="map">
       <div class="map-item" id="paid"></div>
       <div class="map-item">
@@ -49,7 +49,7 @@ export default {
         })
       }
       var option = {
-        name: '近1年应实收统计',
+        name: '近12个月实收统计',
         legendHoverLink: true,
         grid: {
           top: 26,

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

@@ -33,9 +33,9 @@
       display: flex;
       align-items: center;
       padding-bottom: halfH(12);
-      animation: bubble 20s linear infinite;
-      backface-visibility: hidden;
-      animation-fill-mode: forwards;
+      // animation: bubble 20s linear infinite;
+      // backface-visibility: hidden;
+      // animation-fill-mode: forwards;
       .list-item-txt{
         font-size: halfH(14);
       }

src/views/index/components/parking/index.vue

@@ -2,7 +2,7 @@
  * @Author: WangQiBiao
  * @Date: 2019-09-25 10:20:36
  * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-09 11:43:05
+ * @LastEditTime: 2019-10-13 16:57:19
  * @Description: 智能停车
  -->
 <template>
@@ -16,7 +16,8 @@
       </div>
     </div>
     <div class="list">
-      <div class="list-item" v-for="(item, idx) in parkData.list" :key="idx">
+      <vueSeamless :data="parkData.list" :class-option="optionScroll" class="list">
+        <div class="list-item" v-for="(item, idx) in parkData.list" :key="idx">
         <div class="list-item-lf">
           <TagCom type="time">{{item.createAt}}</TagCom>
           <span class="list-item-txt">{{item.content}}</span>
@@ -25,6 +26,7 @@
           <TagCom type="house">{{item.label}}</TagCom>
         </div>
       </div>
+      </vueSeamless>
     </div>
   </div>
 </template>
@@ -32,7 +34,16 @@
 import TitleCom from '@/components/title'
 import TagCom from '@/components/tag'
 import { api } from '@/api'
+import vueSeamless from 'vue-seamless-scroll'
+
 export default {
+  computed: {
+    optionScroll () {
+      return {
+        step: 0.5
+      }
+    }
+  },
   data () {
     return {
       parkData: {}
@@ -40,7 +51,8 @@ export default {
   },
   components: {
     TitleCom,
-    TagCom
+    TagCom,
+    vueSeamless
   },
   mounted () {
     api.getTrafficRecord({

src/views/index/components/title/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 09:19:42
- * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-09-26 17:49:53
+ * @LastEditors: mozhuangru
+ * @LastEditTime: 2019-10-14 09:16:27
  * @Description: 头部
  -->
 <template>

vue.config.js

@@ -1,16 +1,16 @@
 /*
  * @Author: WangQiBiao
- * @LastEditors: mozhuangru
+ * @LastEditors: WuWei
  * @Description: 配置文件
  * @Date: 2019-03-02 14:21:27
- * @LastEditTime: 2019-10-12 10:40:15
+ * @LastEditTime: 2019-10-14 15:19:34
  */
 const path = require('path')
 
 const resolve = dir => {
   return path.join(__dirname, dir)
 }
-const BASE_URL = process.env.NODE_ENV === 'production' ? '/screen' : '/'
+const BASE_URL = process.env.NODE_ENV === 'production' ? '/screen' : process.env.VUE_APP_SECRET === 'test' ? '/screen' : '/'
 const ramdom = parseInt(Math.random() * 10000) // 随机数
 
 module.exports = {

yarn.lock

@@ -991,6 +991,14 @@
   resolved "https://registry.npm.taobao.org/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vue%2Fpreload-webpack-plugin%2Fdownload%2F%40vue%2Fpreload-webpack-plugin-1.1.1.tgz#18723530d304f443021da2292d6ec9502826104a"
   integrity sha1-GHI1MNME9EMCHaIpLW7JUCgmEEo=
 
+"@vue/test-utils@^1.0.0-beta.20":
+  version "1.0.0-beta.29"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz#c942cf25e891cf081b6a03332b4ae1ef430726f0"
+  integrity sha512-yX4sxEIHh4M9yAbLA/ikpEnGKMNBCnoX98xE1RwxfhQVcn0MaXNSj1Qmac+ZydTj6VBSEVukchBogXBTwc+9iA==
+  dependencies:
+    dom-event-types "^1.0.0"
+    lodash "^4.17.4"
+
 "@vue/web-component-wrapper@^1.2.0":
   version "1.2.0"
   resolved "https://registry.npm.taobao.org/@vue/web-component-wrapper/download/@vue/web-component-wrapper-1.2.0.tgz#bb0e46f1585a7e289b4ee6067dcc5a6ae62f1dd1"
@@ -1483,8 +1491,13 @@ 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"
@@ -2259,6 +2272,11 @@ compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
+comutils@^1.1.9:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/comutils/-/comutils-1.1.19.tgz#3e07f306abf48e83726511713a72b20565034443"
+  integrity sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2692,8 +2710,13 @@ 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"
 
@@ -2915,6 +2938,11 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
+dom-event-types@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.0.0.tgz#5830a0a29e1bf837fe50a70cd80a597232813cae"
+  integrity sha512-2G2Vwi2zXTHBGqXHsJ4+ak/iP0N8Ar+G8a7LiD2oup5o4sQWytwqqrZu/O6hIMV0KMID2PL69OhpshLO0n7UJQ==
+
 dom-serializer@0:
   version "0.2.1"
   resolved "https://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.2.1.tgz?cache=0&sync_timestamp=1564710970695&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb"
@@ -3818,8 +3846,13 @@ 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"
 
@@ -4651,8 +4684,13 @@ 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"
@@ -8573,8 +8611,13 @@ 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"
@@ -8621,6 +8664,13 @@ vue-router@^3.0.3:
   resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.1.3.tgz#e6b14fabc0c0ee9fda0e2cbbda74b350e28e412b"
   integrity sha1-5rFPq8DA7p/aDiy72nSzUOKOQSs=
 
+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==
+  dependencies:
+    comutils "^1.1.9"
+
 vue-style-loader@^4.1.0:
   version "4.1.2"
   resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"