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

src/components/FreeTravel/FreeHome.vue

@@ -885,6 +885,7 @@
       </div>
     </div>
   </div>
+  <a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
   </div>
 </template>
 <script>
@@ -899,6 +900,7 @@ export default {
         'cheliang',
         'menpiao',
       ],
+      blankUrl:'',
       inputActive: false,
       activeId: 'meals',
       dataList: [],
@@ -949,6 +951,26 @@ export default {
     this.getCCList()
   },
   methods: {
+    searchKey(){
+      this.apiJavaPost(
+        "/api/kkday/commodityList",
+        {
+          "locale": "zh-cn",
+          "state": "CN" ,
+          "sort": "PASC",
+          "keywords": str
+        },
+        res => {
+          if (res.data.resultCode === 1) {
+            let data = res.data.data.prods;
+            console.log(data)
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
     scrollbar(dom, type) {
       if (type == 1) {
         this.$refs[dom].scrollLeft = this.$refs[dom].scrollLeft - 300
@@ -1011,6 +1033,12 @@ export default {
       );
     },
     goDetails(obj, type){
+      let dom = document.querySelector("#blankLink")
+      let fullPath = `/FreeDetail?id=${type ? obj.pkg_no : obj.prod_url_no}`;
+      dom.href=`http://${window.location.host}/#${fullPath}`
+      //console.log(that.$refs.blankLink.click())
+      dom.click()
+      return
       console.log(obj)
       this.$router.push({ 
         name: "FreeDetail",

src/components/FreeTravel/FreeList.vue

@@ -347,6 +347,9 @@
   top: 0;
   transition: all linear .5s;
   cursor: pointer;
+  height: 286px;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 .shangpinliebiao-item:hover{
   top: -10px;
@@ -499,15 +502,15 @@
       <div class="hot-p" v-if="dataHotList.length > 0">
         <div class="hot-p-item">
           <p class="f24 hot-p-item-tit"><strong>TOP{{dataHotList.length > 2 ? 3 : dataHotList.length}}</strong> 目的地热销产品</p>
-          <div v-for="(item, index) in dataHotList" v-if="index < 3" @click="goDetails(item)" class="__cp">
+          <div v-for="(item, index) in dataHotList" v-if="index < 3" >
             <p class="f20 hot-p-item-tit-s">
               <span class="hot-p-item-tit-s-line"></span>
               <strong>{{item.name}}</strong>
               <!-- <span class="f14 c88 __cp see-more">查看更多</span> -->
             </p>
             <el-row :gutter="20">
-              <el-col :span="6"  v-for="(sItem, sIndex) in item.data" v-if="sIndex < 4" :key="sIndex">
-                <div class="pro-item" >
+              <el-col :span="6"  v-for="(sItem, sIndex) in item.data" v-if="sIndex < 4"  class="__cp" :key="sIndex" >
+                <div class="pro-item" @click="goDetails(sItem)">
                   <span class="pro-item-tag bgc-b cff" :class="`bgc-b${sItem.prod_type == 'M01' ? 1 : sItem.prod_type == 'M04' ? 2 : sItem.prod_type == 'M05' ? 3 : 4}`">{{sItem.prod_type == 'M01' ? '一日游' : sItem.prod_type == 'M04' ? '交通' : sItem.prod_type == 'M05' ? '门票' : '其他'}}</span>
                   <div class="pro-item-top">
                     <img :onerror="defaultImg" :src="KkdayDomain + sItem.prod_img_url" alt="">
@@ -520,7 +523,7 @@
                       <!-- <p class="c88 f12">最早可订日期：2019年8月20日</p> -->
                     </div>
                     <div class="c88 f12">
-                      {{sItem.order_count + Math.round(Math.random()*99)}}人已购买
+                      {{sItem.order_count}}人已购买
                     </div>
                   </div>
                 </div>
@@ -600,7 +603,7 @@
                   <!-- <p class="c88 f12">最早可订日期：2019年8月20日</p> -->
                 </div>
                 <div class="c88 f12">
-                  {{item.order_count + Math.round(Math.random()*99)}}人已购买
+                  {{item.order_count}}人已购买
                 </div>
               </div>
             </div>
@@ -623,6 +626,7 @@
         </div>
       </div>
     </div>
+    <a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
   </div>
 </template>
 <script>
@@ -630,6 +634,7 @@ export default {
    data () {
     return {
       defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
+      blankUrl: '',
       newCityCheck: [],
       paixu1: false,
       paixu2: false,
@@ -929,6 +934,13 @@ export default {
       });
     },
     goDetails(obj){
+      console.log(obj)
+      let dom = document.querySelector("#blankLink")
+      let fullPath = `/FreeDetail?id=${obj.prod_url_no}`;
+      dom.href=`http://${window.location.host}/#${fullPath}`
+      //console.log(that.$refs.blankLink.click())
+      dom.click()
+      return
       this.$router.push({ 
         name: "FreeDetail",
         query: {

src/components/FreeTravel/FreeList2.vue

@@ -358,6 +358,9 @@
   top: 0;
   transition: all linear .5s;
   cursor: pointer;
+  height: 286px;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 .shangpinliebiao-item:hover{
   top: -10px;
@@ -515,7 +518,7 @@
             <img :src="require('@/assets/img/weather/'+ weatherList[0].cond_code_d +'.png')" alt="">
             <div class="f16 cff">
               <p class="PingFangR">{{weatherList[0].tmp_min}}℃-{{weatherList[0].tmp_max}}℃</p>
-              <p class="f14">{{weatherList[0].cond_txt_d}}，{{weatherList[0].date.substring(5, 7)}}月{{weatherList[0].date.substring(8, 10)}}日</p>
+              <p class="f14">{{weatherList[0].cond_txt_d}}，{{weatherList[0].date.substring(5, 7)}}-{{weatherList[0].date.substring(8, 10)}}</p>
             </div>
           </div>
           <div v-else class="today-tq today-tq2">
@@ -523,7 +526,7 @@
               <img :src="require('@/assets/img/weather/'+ item.cond_code_d +'.png')" alt="">
               <div class="f16 c33">
                 <p class="PingFangR">{{item.tmp_min}}℃-{{item.tmp_max}}℃</p>
-                <p class="f14">{{item.cond_txt_d}}，{{item.date.substring(5, 7)}}月{{item.date.substring(8, 10)}}日</p>
+                <p class="f14">{{item.cond_txt_d}}，{{item.date.substring(5, 7)}}-{{item.date.substring(8, 10)}}</p>
               </div>
             </div>
           </div>
@@ -634,7 +637,7 @@
                   <!-- <p class="c88 f12">最早可订日期：2019年8月20日</p> -->
                 </div>
                 <div class="c88 f12">
-                  {{item.order_count + Math.round(Math.random()*99)}}人已购买
+                  {{item.order_count}}人已购买
                 </div>
               </div>
             </div>
@@ -659,6 +662,7 @@
         </div>
       </div>
     </div>
+    <a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
   </div>
 </template>
 <script>
@@ -666,6 +670,7 @@ export default {
    data () {
     return {
       tianqiShow: false,
+      blankUrl: '',
       defaultImg: 'this.src="' + require('assets/img/juan/error.png') + '"',
       ccIdNew: null,
       newCityCheck: [],
@@ -998,6 +1003,12 @@ export default {
       }
     },
     goDetails(obj){
+      let dom = document.querySelector("#blankLink")
+      let fullPath = `/FreeDetail?id=${obj.prod_url_no}`;
+      dom.href=`http://${window.location.host}/#${fullPath}`
+      //console.log(that.$refs.blankLink.click())
+      dom.click()
+      return
       this.$router.push({ 
         name: "FreeDetail",
         query: {