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

src/components/FreeTravel/FreeHome.vue

@@ -1016,7 +1016,7 @@ export default {
             let data = res.data.data.Countries
             let deleteIdiot = []
             data.map(x=>{
-              if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门") {
+              if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门" && x.Country_Name !== "港澳") {
                 deleteIdiot.push(x)
               }
             })

src/components/FreeTravel/FreeList.vue

@@ -295,7 +295,7 @@
   display: flex;
 }
 .shaixuan-top{
-  border:1px dashed rgba(220,220,220,1);
+  border-bottom:1px dashed rgba(220,220,220,1);
 }
 .shaixuan-top>div:nth-child(2){
   flex: 1;
@@ -565,8 +565,10 @@
             <el-date-picker
               size="mini"
               v-model="value"
-              type="date"
+              type="daterange"
               :picker-options="pickerOptions0"
+              @change="changeDate"
+              value-format="yyyyMMdd"
               placeholder="选择日期">
             </el-date-picker>
           </div>
@@ -644,9 +646,6 @@ export default {
       "locale": "zh-cn",
       "state":"CN" ,
       "sort": "PASC",
-      "cat_main_keys": [
-          "TAG_4"
-        ],
         "page_size": 16,
         "start": 0,
       },
@@ -847,6 +846,18 @@ export default {
     this.scrollobj.addEventListener('scroll', this.handleScroll);
   },
   methods: {
+    changeDate(){
+      let date = this.value ? this.value : ""
+      console.log(this.value)
+      if (date) {
+        this.msg.date_from = date[0]
+        this.msg.date_to = date[1]
+      } else {
+        delete this.msg.date_from
+        delete this.msg.date_to
+      }
+      this.getList()
+    },
     // 选中小标签 加载数据
     setChangeTag(item){
       delete this.msg.cat_main_keys;
@@ -872,7 +883,7 @@ export default {
        
         this.getList()
       } else {
-        this.msg.cat_main_keys = ["TAG_4"]
+        delete this.msg.cat_main_keys
         delete this.msg.cat_sub_keys
         this.getList()
       }
@@ -968,7 +979,7 @@ export default {
             let data = res.data.data.Countries
             let deleteIdiot = []
             data.map(x=>{
-              if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门") {
+              if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门" && x.Country_Name !== "港澳") {
                 deleteIdiot.push(x)
               }
             })
@@ -1005,6 +1016,8 @@ export default {
       }
       this.msg.sort = "HDESC"
       this.laoding2 = true;
+      delete this.msg.date_from
+      delete this.msg.date_to
       //http://efficient.oytour.com/api/kkday/commodityList
       this.apiJavaPost(
         "/api/kkday/commodityList",

src/components/FreeTravel/FreeList2.vue

@@ -536,8 +536,10 @@
             <el-date-picker
               size="mini"
               v-model="value"
-              type="date"
+              type="daterange"
               :picker-options="pickerOptions0"
+              value-format="yyyyMMdd"
+              @change="changeDate"
               placeholder="选择日期">
             </el-date-picker>
           </div>
@@ -831,6 +833,18 @@ export default {
     this.getCCList(1)
   },
   methods: {
+    changeDate(){
+      let date = this.value ? this.value : ""
+      console.log(this.value)
+      if (date) {
+        this.msg.date_from = date[0]
+        this.msg.date_to = date[1]
+      } else {
+        delete this.msg.date_from
+        delete this.msg.date_to
+      }
+      this.getList()
+    },
     changeMainTag(e){
       console.log(e)
       if(e.length > 0) {
@@ -971,7 +985,7 @@ export default {
             let data = res.data.data.Countries
             let deleteIdiot = []
             data.map(x=>{
-              if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门") {
+              if(x.Country_Name !== "台湾" && x.Country_Name !== "香港" && x.Country_Name !== "澳门" && x.Country_Name !== "港澳") {
                 deleteIdiot.push(x)
               }
             })