Merge remote-tracking branch 'origin/yingdi2.0' into yingdi2.0

src/router/index.js

@@ -63,6 +63,7 @@ const routes = [
     component: () => import('v/index/login/Index.vue'),
     children: [...indexLogin]
   },
+
   {
     path: '/Info',
     name: 'Info',

src/views/base/active/Active.vue

@@ -61,7 +61,7 @@
       </div>
     </div>
 
-    <div class="active-list" v-if="activeList.length>0">
+    <div class="active-list" v-if="activeList.length>0"left-area>
       <div class="active-list-item" v-for="(item, index) in activeList" :key="index"
            :style="{
         '-webkit-animation-delay': (index+1)*0.1+'s',

src/views/base/myInfo/index.vue

@@ -81,7 +81,6 @@
       window.removeEventListener("resize", this.onResize, true);
     },
     methods: {
-
       ToSignUp(index) {
         console.log(index, 'index')
         this.campindex_type = index;