页面修改

src/boot/utils.js

@@ -6,7 +6,8 @@ import md5 from 'js-md5'
 Vue.prototype.domainManager = function () {
   let domainUrl = '';
   domainUrl = "http://192.168.2.214:8082";
-  domainUrl = "http://192.168.0.110";
+  domainUrl = "http://127.0.0.1";
+  //domainUrl = "http://reborn.oytour.com";
   //let locationName = location.hostname;
   // if (locationName.indexOf('testerp.oytour') !== -1) {
   //     domainUrl = "http://testapi.oytour.com";
@@ -161,24 +162,28 @@ Vue.prototype.formatDate = function (year, month, day) {
 }
 
 //格式化日期二
-Vue.prototype.formatDate2=function(dateStr)
-{
-    var date=new Date(dateStr);
+Vue.prototype.formatDate2 = function (dateStr) {
+  var date = new Date(dateStr);
   return {
-        CYear:date.getFullYear(),
-        CMonth:(date.getMonth()+1),
-        CDay:date.getDate(),
+    CYear: date.getFullYear(),
+    CMonth: (date.getMonth() + 1),
+    CDay: date.getDate(),
   }
 }
 
 //添加月份
-Vue.prototype.AddMonth=function(dateStr,month)
-{
+Vue.prototype.AddMonth = function (dateStr, month) {
   var v = new Date(dateStr);
   if (v) {
     var t = new Date(v.getFullYear(), v.getMonth(), v.getDate(), v.getHours(), v.getMinutes(), v.getSeconds(), v.getMilliseconds());
     t.setMonth(v.getMonth() + month);
-        if (t.getDate() != v.getDate()) { t.setDate(0); }
+    if (t.getDate() != v.getDate()) {
+      t.setDate(0);
+    }
     return t;
   }
 }
+
+Vue.prototype.getUrlKey = function (name, url) {
+  return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(url) || [, ""])[1].replace(/\+/g, '%20')) || null
+}

src/components/search_sf/search_sf1.vue

@@ -273,7 +273,7 @@
           tl: "",
           ful: ""
         },
-        RB_Group_Id:0,
+        RB_Group_Id: 0,
       };
     },
     mounted() {
@@ -352,17 +352,22 @@
         this.showCompPannel = false;
       },
       goSearchHandler() {
-        if (this.searchKey == "") {
-          this.$q.notify({
-            color: "negative",
-            textColor: "#FFF",
-            icon: "report_problem",
-            message: "尊敬的客人，請選擇一個目的地吧",
-            position: "top",
-            timeout: 3000
-          });
-        }
-        this.CommonJump('/search', {})
+        // if (this.searchKey == "") {
+        //   this.$q.notify({
+        //     color: "negative",
+        //     textColor: "#FFF",
+        //     icon: "report_problem",
+        //     message: "尊敬的客人，請選擇一個目的地吧",
+        //     position: "top",
+        //     timeout: 3000
+        //   });
+        // }
+
+        this.CommonJump('/search', {
+          qsearchKey: this.searchKey,
+          qsearchDate: this.searchDate,
+          qsearchEndDate: this.searchEndDate,
+        })
       }
     }
   };

src/components/search_sf/search_sf2.vue

@@ -354,17 +354,21 @@
         this.showCompPannel = false;
       },
       goSearchHandler() {
-        if (this.searchKey == "") {
-          this.$q.notify({
-            color: "negative",
-            textColor: "#FFF",
-            icon: "report_problem",
-            message: "尊敬的客人，請選擇一個目的地吧",
-            position: "top",
-            timeout: 3000
-          });
-        }
-        this.CommonJump('/search', {})
+        // if (this.searchKey == "") {
+        //   this.$q.notify({
+        //     color: "negative",
+        //     textColor: "#FFF",
+        //     icon: "report_problem",
+        //     message: "尊敬的客人，請選擇一個目的地吧",
+        //     position: "top",
+        //     timeout: 3000
+        //   });
+        // }
+           this.CommonJump('/search', {
+          qsearchKey: this.searchKey,
+          qsearchDate: this.searchDate,
+          qsearchEndDate: this.searchEndDate,
+        })
       }
     }
   };

src/components/search_sf/search_sf3.vue

@@ -273,7 +273,7 @@
           tl: "",
           ful: ""
         },
-        RB_Group_Id:0,
+        RB_Group_Id: 0,
       };
     },
     mounted() {
@@ -302,7 +302,7 @@
       getAera() {
         this.apipost(
           "ws_get_GetSearchArea", {
-              RB_Group_Id:this.RB_Group_Id
+            RB_Group_Id: this.RB_Group_Id
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -357,17 +357,21 @@
         this.showCompPannel = false;
       },
       goSearchHandler() {
-        if (this.searchKey == "") {
-          this.$q.notify({
-            color: "negative",
-            textColor: "#FFF",
-            icon: "report_problem",
-            message: "尊敬的客人，請選擇一個目的地吧",
-            position: "top",
-            timeout: 3000
-          });
-        }
-        this.CommonJump('/search', {})
+        // if (this.searchKey == "") {
+        //   this.$q.notify({
+        //     color: "negative",
+        //     textColor: "#FFF",
+        //     icon: "report_problem",
+        //     message: "尊敬的客人，請選擇一個目的地吧",
+        //     position: "top",
+        //     timeout: 3000
+        //   });
+        // }
+        this.CommonJump('/search', {
+          qsearchKey: this.searchKey,
+          qsearchDate: this.searchDate,
+          qsearchEndDate: this.searchEndDate,
+        })
       }
     }
   };

src/pages/Search.vue

@@ -638,11 +638,13 @@
         </div>
       </div>
 
-      {{ShowType}}
+
       <template v-if="ShowType==0">
+        <!--豆腐格-->
         <searchBlock :DataList="DataList" :PageCount="PageCount"></searchBlock>
       </template>
       <template v-else>
+        <!--列表-->
         <searchList :DataList="DataList" :PageCount="PageCount"></searchList>
       </template>
 
@@ -863,8 +865,24 @@
         //行程列表
         DataList: [],
         PageCount: 0,
+        TotalCount: 0,
       };
     },
+    created() {
+      var qsearchKey = this.getUrlKey("qsearchKey", window.location.href);
+      var qsearchDate = this.getUrlKey("qsearchDate", window.location.href);
+      var qsearchEndDate = this.getUrlKey("qsearchEndDate", window.location.href);
+      if (qsearchKey) {
+        this.qMsg.searchKey = qsearchKey;
+      }
+      if (qsearchDate) {
+        this.qMsg.startDate = qsearchDate;
+      }
+      if (qsearchEndDate) {
+        this.qMsg.endDate = qsearchEndDate;
+      }
+
+    },
     mounted() {
       if (localStorage.baseifo) {
         var jObj = JSON.parse(localStorage.baseifo);
@@ -873,7 +891,6 @@
       } else {
         this.getAera()
       }
-
       document.addEventListener("click", this.clickHandler);
     },
     methods: {
@@ -916,16 +933,18 @@
           this.showSplitPannel = false;
         }
       },
-      chosenAreaHandler() {
+      chosenAreaHandler(name) {
         this.qMsg.searchKey = name;
         this.showSplitPannel = false;
       },
       goSearchHandler() {
+        console.log("this.qMsg",this.qMsg);
         this.apipost(
           "b2b_get_GetB2BTravelPageList", this.qMsg,
           res => {
             if (res.data.resultCode == 1) {
               this.PageCount = res.data.data.pageCount;
+              this.TotalCount = res.data.data.total;
               var tempArray = res.data.data.pageData;
               if (tempArray && tempArray.length > 0) {
                 tempArray.forEach(item => {
@@ -937,8 +956,7 @@
                       } else {
                         item.newCoverImg = "";
                       }
-                    } catch (e) {
-                    }
+                    } catch (e) {}
                   }
                 });
                 this.DataList = tempArray;