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

src/components/DependentTravel/CustomizedTourism.vue

@@ -263,7 +263,7 @@
                                                      <img v-if="!img.url" src="../../assets/img/default.png" style="width:200px;height:133px;float:left;" alt="">
                                                     <img v-else  :src="img.url" style="width:200px;height:133px;float:left;" alt="">
                                                     <div style="float:left;margin-left:20px;width:719px">
-                                                        <p><span style="color:#5F95E8;font-size:16px;margin-bottom:13px">{{Scen.childItem.couponsName}}</span></p>
+                                                        <p style="margin-bottom:13px"><span style="color:#5F95E8;font-size:16px;">{{Scen.childItem.couponsName}}</span></p>
                                                         <p v-if="Scen.childItem.description" v-html="Scen.childItem.description"></p>
                                                     </div>
                                     

src/components/LocalTour/LocalTourList.vue

+<template>
+  <div class="LocalTourList">
+    <div class="w1200">
+        
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      
+    }
+  },
+  mounted() {
+    
+    
+  },
+  methods: {
+    
+    }
+}
+</script>
+
+<style>
+
+</style>

src/components/global/newHead.vue

@@ -173,11 +173,17 @@
           </li>
           <!-- 当地游 -->
           <li :class="{_active: navActive === 3}">
-            <div @click="handleSelect('/OneDayTour', 3), navActive = 3">
+            <div @click="handleSelect('/Localtourhome', 3), navActive = 3">
               <span>当地游</span>
               <span class="__splice">|</span>
             </div>
           </li>
+          <!-- <li :class="{_active: navActive === 3}">
+            <div @click="handleSelect('/OneDayTour', 3), navActive = 3">
+              <span>当地游</span>
+              <span class="__splice">|</span>
+            </div>
+          </li> -->
           <!-- 酒店 -->
           <li :class="{_active: navActive === 4}">
             <div @click="handleSelect('/', 4), navActive = 4">

src/router.js

@@ -380,7 +380,24 @@ export default new Router({
             title: "首页"
           }
         },
-        
+        {
+          path: "/Localtourhome",
+          name: "Localtourhome",
+          component: resolve =>
+            require(["@/components/LocalTour/Localtourhome.vue"], resolve),
+          meta: {
+            title: "当地游"
+          }
+        },
+        {
+          path: "/LocalTourList",
+          name: "LocalTourList",
+          component: resolve =>
+            require(["@/components/LocalTour/LocalTourList.vue"], resolve),
+          meta: {
+            title: "当地游列表"
+          }
+        },
       ]
     },