Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/global/newHead.vue

@@ -260,17 +260,17 @@
             </div>
           </li> -->
           <!-- 积分商城 -->
-          <li :class="{_active: navActive === 8}">
+          <!-- <li :class="{_active: navActive === 8}">
             <div @click="handleSelect('/IntegralMall', 8), navActive = 8">
               <span>积分商城</span>
               <span class="__splice">|</span>
             </div>
-          </li>
+          </li> -->
           <!-- 活动中心 -->
           <!-- <li :class="{_active: navActive === 9}" style="width: auto;">
             <div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
               <img style="z-index: -1;position: absolute;top: -27px;" src="../../assets/img/task/nav_bg.png" alt="">
-              <img src="../../assets/img/task/nav_text.png" alt="">
+              <li src="../../assets/img/task/nav_text.png" alt="">
             </div>
           </li> -->
         </ul>

src/views/index.vue

@@ -8,7 +8,7 @@
         <newHead/>
         <div :style='{"min-height":minHeight+"px"}'>
             <transition name="slide">
-            <router-view :changeCity='changeCity'></router-view>
+                <router-view :changeCity='changeCity'></router-view>
             </transition>
         </div>
         <foot />
@@ -43,6 +43,9 @@ export default {
         },
     },
     mounted () {
+        if (this.$route.name === 'index') {
+            this.$router.push({path: 'Home'})
+        }
         //this.loadSize()
         //this.goUrl('2-1')
         this.minHeight=document.documentElement.clientHeight-171
@@ -69,7 +72,7 @@ export default {
             console.log(index)
             let path=''
             if(index=='2-1'){
-                path='/heel'
+                path='/Home'
             }
             if(index=='3'){
                 path='/TicketHome'