修改天气图标，加搜索

src/components/FreeTravel/FreeHome.vue

@@ -638,10 +638,13 @@
 .loading-box{
   min-height:400px
 }
+.FreeHome .el-select-dropdown__item{
+  white-space: initial;
+}
 </style>
 <template>
-  <div v-loading="loading">
-    <div class="FreeHome commonF" @click="inputActive = false" >
+  <div v-loading="loading" class="commonF">
+    <div class="FreeHome " @click="inputActive = false" >
     <div>
       <div class="fh-tit">
         <img :onerror="defaultImg" src="../../assets/img/freeHome/top-tex.png" alt="">
@@ -649,13 +652,39 @@
       <div class="fh-search-box">
         <div class="fh-search-box-input">
           <div>
+            <!-- <el-select
+                v-model="changeId"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="输入目的地/景点/关键字，搜索您需要的信息.."
+                :remote-method="searchKey"
+                @focus="inputActive = true, changeId = '', queryStr = '', searchList = []"
+                @change='getSelect'
+                :loading="loading2">
+                <el-option
+                    v-for="item in searchList"
+                    :key="item.prod_no"
+                    :label="item.prod_name"
+                    :value="item">
+                    <div v-if="item.type == 2">
+                      <i style="padding-right: 15px" class="iconfont icon-lvseqizi"></i>
+                      <span class="PingFangR">{{ item.prod_name.replace(/KKday/g, '印象之旅') }}</span>
+                    </div>
+                    <div v-else>
+                      <span style="float: left; width: 370px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.prod_name.replace(/KKday/g, '印象之旅') }}</span>
+                      <span style="float: right">{{ item.countries[0].name + item.countries[0].cities[0].name }}</span>
+                      <i style="float: right;color: rgb(204, 204, 204)" class="iconfont icon-ico_dingwei"></i>
+                    </div>
+                </el-option>
+            </el-select> -->
             <input type="text" @click.stop="inputActive = true" placeholder="输入目的地/景点/关键字，搜索您需要的信息..">
           </div>
-          <div>
+          <div @click="goList">
             搜索
           </div>
         </div>
-        <div v-show="inputActive" class="inputActive" @click.stop>
+        <div v-show="inputActive && queryStr == ''" class="inputActive" @click.stop>
           <el-row v-if="CCList.length>0 ">
             <el-col :span="6">
               <div class="city-tag __cp" v-for="(item, index) in CCList" @click="CCListActive = index" :class="{'active': CCListActive == index}" :key="index" >
@@ -691,37 +720,7 @@
             </div>
           </div>
         </div>
-        <!-- <div class="city-s">
-          <div>
-            <span>日本</span>
-          </div>
-        </div>
-        <div class="city-s city-m" @click="goList()">
-          <div>
-            <span>东京</span>
-            <div class="city-m-b">
-              <span class="active">门票</span>
-              <span>餐食</span>
-              <span>一日游</span>
-            </div>
-          </div>
-        </div>
-        <div class="city-s">
-          <div>
-            <span>日本</span>
-          </div>
-        </div>
-        <div class="city-s">
-          <div>
-            <span>日本</span>
-          </div>
-        </div> -->
       </div>
-      <!-- <div class="more-city">
-        <div>
-          更多城市选择
-        </div>
-      </div> -->
       <div>
         <div class="fh-tejia">
           <p>当季特价</p>
@@ -892,6 +891,11 @@
 export default {
   data () {
     return {
+      changeId: "",
+      queryStr: "",
+      queryStr2: "",
+      searchList: [],
+      loading2: false,
       loading: false,
       scrollobj: null,
       navs:[
@@ -916,23 +920,23 @@ export default {
         src: "http://imgfile.oytour.com/New/Upload/Cloud/2019-08/20190821052335633.jpg",
         id: 1,
         number: "A01-003-00001"
-      },{
+       },{
         name: '京都',
         src: "http://imgfile.oytour.com/New/Upload/Cloud/2019-08/20190821052335636.jpg",
         id: 2,
         number: "A01-003-00003",
-      },{
+       },{
         name: '大阪',
         src: "http://imgfile.oytour.com/New/Upload/Cloud/2019-08/20190821052335628.jpg",
         id: 3,
         number: "A01-003-00002"
 
-      },{
+       },{
         name: '首尔',
         src: "http://imgfile.oytour.com/New/Upload/Cloud/2019-08/20190821052335683.jpg",
         id: 0,
         number: 'A01-004-00001'
-      },{
+       },{
         name: '曼谷',
         src: "http://imgfile.oytour.com/New/Upload/Cloud/2019-08/20190821052335631.jpg",
         id: 4,
@@ -951,25 +955,57 @@ 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
-      );
+    getSelect(e){
+      if (e.prod_no && e.type == 2) {
+        let dom = document.querySelector("#blankLink")
+        let fullPath = `/FreeList?id=${e.prod_no}&name=${e.prod_name}&CCListActive=${0}&type=${1}`;
+        dom.href=`http://${window.location.host}/#${fullPath}`
+        dom.click()
+      } else if (e.prod_no && !e.type){
+        this.goDetails(e)
+      }
+      this.changeId = ''
+      this.queryStr = ''
+      this.searchList = []
+    },
+    searchKey(query){
+      this.queryStr2 = query
+      if (query !== '') {
+        this.queryStr = query
+        this.loading2 = true;
+        this.apiJavaPost(
+          "/api/kkday/commodityList",
+          {
+            "locale": "zh-cn",
+            "state": "CN" ,
+            "sort": "PASC",
+            "keywords": query
+          },
+          res => {
+            if (res.data.resultCode === 1) {
+              let data = res.data.data.prods;
+              let no1 = data.length > 0 ? data[0].countries : ''
+              this.loading2 = false;
+              if (no1){
+                let obj = {
+                  type: 2,
+                  prod_name: no1 ? no1[0].name : '',
+                  prod_no: no1 ? no1[0].id : '',
+                }
+                data.unshift(obj)
+              }
+              this.searchList = data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      } else {
+        this.queryStr = ""
+        this.searchList = [];
+        this.loading2 = false; 
+      }
     },
     scrollbar(dom, type) {
       if (type == 1) {
@@ -1048,7 +1084,14 @@ export default {
       });
     },
     goList(){
-      this.$router.push({ name: "FreeList" });
+      if(this.queryStr2 == '') return
+      console.log(this.queryStr2)
+      let dom = document.querySelector("#blankLink")
+      let fullPath = `/FreeList2?keywords=${this.queryStr2}`;
+      dom.href=`http://${window.location.host}/#${fullPath}`
+      //console.log(that.$refs.blankLink.click())
+      dom.click()
+      this.queryStr2 = ""
     },
     getDataCanList(){
       this.apiJavaPost(

src/components/FreeTravel/FreeList.vue

@@ -449,7 +449,7 @@
         <div class="city-right-tag">
           <p class="f14 cff">共{{newCityList.Cities.length}}个旅游点</p>
           <el-tabs type="card" @tab-click="handleClick">
-            <el-tab-pane v-for="(item, index) in newCityList.Cities" :label="item.City_Name" :key="index" :name="item.City_Name"></el-tab-pane>
+            <el-tab-pane v-for="(item, index) in newCityList.Cities" v-if="item.City_Name !== ''" :label="item.City_Name" :key="index" :name="item.City_Name"></el-tab-pane>
           </el-tabs>
         </div>
         <div class="contet-nav">
@@ -854,9 +854,15 @@ export default {
     this.ccId = this.$route.query.id;
     this.ccName = this.$route.query.name;
     this.CCListActive = this.$route.query.CCListActive;
+    let query = this.$route.query;
+    if(query.type == 1) {
+      this.msg.country_keys = [query.id]
+    } else {
+      this.msg.city_keys = [query.id]
+    }
     this.getList()
     this.getHotList()
-    this.getCCList(1)
+    this.getCCList(this.$route.query.name)
     this.scrollobj=document.getElementsByClassName('el-scrollbar__wrap')[0];
     this.scrollobj.addEventListener('scroll', this.handleScroll);
   },
@@ -999,7 +1005,7 @@ export default {
       });
     },
     //获取国家  城市
-    getCCList(t){
+    getCCList(name){
       //http://efficient.oytour.com/api/kkday/searchCity
       this.apiJavaPost(
         "/api/kkday/searchCity",
@@ -1008,7 +1014,7 @@ export default {
           if (res.data.resultCode === 1) {
             let data = res.data.data.Countries
             let deleteIdiot = []
-            data.map(x=>{
+            data.map((x, index)=>{
               if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门" && x.Country_Name !== "港澳") {
                 x.Cities.map(y=>{
                   if(y.City_Name == "渖阳") {
@@ -1016,11 +1022,17 @@ export default {
                   }
                   if(y.City_Name == "所有城市") {
                     y.City_Name = ""
+                    y.hide = true
                   }
                 })
                 deleteIdiot.push(x)
               }
             })
+            deleteIdiot.map((x, index)=>{
+              if (x.Country_Name == name){
+                this.CCListActive = index
+              }
+            })
             this.CCList = deleteIdiot
             this.changeCon(this.CCListActive)
           } else {
@@ -1101,12 +1113,6 @@ export default {
     // 获取列表
     getList(type, id){
       this.dataList = [];
-      let query = this.$route.query;
-      if(query.type == 1) {
-        this.msg.country_keys = [query.id]
-      } else {
-        this.msg.city_keys = [query.id]
-      }
       if (type) {
         this.msg.country_keys = [id]
       }

src/components/FreeTravel/FreeList2.vue

@@ -482,9 +482,9 @@
       <div class="fl-top">
         <div class="fl-ad">
           <span class="fl-adname">{{ccName}}</span>
-          <span class="f14 __cp change-ad" v-if="!addShow" @click="addShow = !addShow">切换地点 <span class="el-icon-caret-bottom"></span> </span>
+          <span class="f14 __cp change-ad" v-if="!addShow" @click="addShow = !addShow">{{keywords ? '选择地点' : '切换地点'}} <span class="el-icon-caret-bottom"></span> </span>
           <div v-else class="fl-ad-box inputActive2">
-            <p><span class="f14 __cp"  @click="addShow = !addShow">切换地点 <span class="el-icon-caret-bottom"></span> </span></p>
+            <p><span class="f14 __cp"  @click="addShow = !addShow">{{keywords ? '选择地点' : '切换地点'}} <span class="el-icon-caret-bottom"></span> </span></p>
             <div class="fl-ad-cont">
               <div class="search">
                 <span class="el-icon-close __cp" @click="addShow = !addShow"></span>
@@ -532,8 +532,8 @@
           </div>
         </div>
         <div class="tianqi-box"  v-else>
-          <div v-if="!tianqiShow" class="today-tq cff">
-            暂无该城市天气
+          <div v-if="!tianqiShow" class="today-tq cff" style="padding-left: 45px;">
+            {{keywords ? '未选择城市' : '暂无该城市天气'}}
           </div>
         </div>
         <div class="contet-nav">
@@ -816,7 +816,7 @@ export default {
             checkd: false,
           },
         ]
-      },{
+       },{
         name: "餐饮美食",
         checkd: false,
         id: "TAG_0",
@@ -833,7 +833,7 @@ export default {
             checkd: false,
           },
         ]
-      },{
+       },{
         name: "活动",
         checkd: false,
         id: "TAG_1",
@@ -855,7 +855,7 @@ export default {
             checkd: false,
           },
         ]
-      },{
+       },{
         name: "体验",
         checkd: false,
         id: "TAG_3",
@@ -889,29 +889,37 @@ export default {
         ]
       }],
       weatherList: [],
+      keywords: '',
     }
   },
   mounted() {
-    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'){
-        
+    if (this.$route.query.keywords) {
+      this.keywords = this.$route.query.keywords
+      this.msg.keywords = this.$route.query.keywords
+      delete this.msg.cat_main_keys
+      this.getList(3)
+    } else {
+      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.getCCWeather()
     }
-    this.getList()
-    this.getCCList(1)
-    this.getCCWeather()
+    this.getCCList()
   },
   methods: {
     //获取天气
@@ -1060,8 +1068,10 @@ export default {
       } else {
         this.msg.city_keys = [query.id]
       }
-      if (type) {
+      if (type == 2) {
         this.msg.city_keys = [id]
+      } else if (type == 3) {
+        delete this.msg.city_keys
       }
       this.msg.sort = this.priceSort
       this.laoding = true;

src/views/loginold.vue

@@ -296,6 +296,7 @@ export default {
             this.loginF(msg);
         },
         loginF(msg){  // 登录方法
+         msg.platform = 0;
             this.apipost('b2b_post_Login',msg,r=>{
                 if(r.data.resultCode==1){
                     let userInfo = r.data.data;

src/views/newLogin.vue

@@ -345,6 +345,7 @@ export default {
       this.loginF(msg);
     },
     loginF(msg) {
+      msg.platform = 0;
       // 登录方法
       this.apipost(
         "b2b_post_Login",