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

src/components/FreeTravel/FreeHome.vue

@@ -159,7 +159,6 @@
   height: 280px;
   background:linear-gradient(180deg,rgba(0,0,0,0.57),rgba(0,0,0,-0.38));
   border-radius:6px;
-  margin-right: 20px;
   overflow: hidden;
 }
 .FreeHome .fh-city .city-m>img{
@@ -674,7 +673,7 @@
               <span @click.stop="goList2(item, 'menpiao')">门票</span>
               <span @click.stop="goList2(item, 'canshi')">餐食</span>
               <span @click.stop="goList2(item, 'yiri')">一日游</span>
-              <img @click.stop="goList2(item)" src="../../assets/img/freeHome/more_s.png" alt="">
+              <img @click.stop="goList2(item, 'all')" src="../../assets/img/freeHome/more_s.png" alt="">
             </div>
           </div>
         </div>
@@ -979,7 +978,7 @@ export default {
       this.$router.push({ 
         name: "FreeList2",
         query: {
-          tag: 1,
+          tag: type,
           id: obj.number,
           type: 2,
           name: obj.name,

src/components/FreeTravel/FreeList2.vue

@@ -813,6 +813,20 @@ export default {
     this.ccId = this.$route.query.id;
     this.ccName = this.$route.query.name;
     this.CCListActive = this.$route.query.CCListActive;
+    if(this.$route.query.tag) {
+      if (this.$route.query.tag == 'menpiao') {
+        this.msg.cat_main_keys = ["TAG_2"]
+        this.typeTagIndex = 0
+      } else if (this.$route.query.tag == 'canshi'){
+        this.msg.cat_sub_keys = ["TAG_2_5"]
+        this.typeTagIndex = 3
+      } else if (this.$route.query.tag == 'yiri'){
+        this.msg.cat_main_keys = ["TAG_4"]
+        this.typeTagIndex = 1
+      } else if (this.$route.query.tag == 'all'){
+        
+      }
+    }
     this.getList()
     this.getCCList(1)
   },
@@ -914,7 +928,6 @@ export default {
     // 获取列表
     getList(type, id){
       let query = this.$route.query;
-      console.log(query)
       if(query.type == 1) {
         this.msg.country_keys = [query.id]
       } else {