私家团 出发地

src/components/searchProductdata/kkday.vue

@@ -6,12 +6,12 @@
     <!-- 移动端 -->
     <div v-if="$q.platform.is.mobile">
       <div class="flex">
-        <div @click="showAddress = true" class="nav-item">
+        <!-- <div @click="showAddress = true" class="nav-item">
           目的地<i
             class="iconfont iconarrowdown text-grey-6"
             style="margin-top: 3px; margin-left: 4px"
           ></i>
-        </div>
+        </div> -->
         <div @click="showCategory = true" class="nav-item">
           商品類別<i
             class="iconfont iconarrowdown text-grey-6"
@@ -24,6 +24,12 @@
             style="margin-top: 3px; margin-left: 4px"
           ></i>
         </div>
+        <div @click="showCity = true" class="nav-item">
+          出发地<i
+            class="iconfont iconarrowdown text-grey-6"
+            style="margin-top: 3px; margin-left: 4px"
+          ></i>
+        </div>
         <div @click="showPrice = true" class="nav-item">
           價錢/时间<i
             class="iconfont iconarrowdown text-grey-6"
@@ -34,14 +40,14 @@
       <popup mode="top" v-model="showAddress">
         <q-card flat class="rounded-borders q-py-md">
           <div class="text-subtitle1 text-weight-bold q-mx-md">篩選目的地</div>
-          <q-input
+          <!-- <q-input
             v-model="msg.searchKey"
             type="text"
             standout
             placeholder="蒐索關鍵字"
             class="q-ma-md"
             @blur="changeAddrSearchHandler"
-          />
+          /> -->
           <!-- <q-tree
           ref="area"
           :nodes="areaList"
@@ -72,6 +78,25 @@
             :ticked="ticked"
           />
         </q-card  ></popup>
+        
+      <popup mode="top" v-model="showCity">
+        <q-card flat class="rounded-borders q-py-md q-mt-lg">
+          <div class="text-subtitle1 text-weight-bold q-mx-md">出发地</div>
+          <div
+            class="addr-list q-px-md q-py-sm row items-center"
+            v-for="(y, yi) in CityList"
+            :key="yi"
+          >
+            <q-checkbox v-model="y.checked" size="xs" @input="changeTripDayHandler(1)" />
+            <span
+              class="col text-grey-8 text-subtitle2 text-regular q-mt-xs"
+              style="font-weight: 400"
+            >
+              {{ y.CityName }}
+            </span>
+          </div>
+        </q-card  >
+      </popup>
       <popup mode="top" v-model="showDate">
         <q-card flat class="rounded-borders q-mt-lg overflow-hidden">
           <div class="q-my-sm q-mx-lg f20 bold">旅程時間</div>
@@ -138,10 +163,11 @@
           type="text"
           standout
           placeholder="蒐索關鍵字"
-          class="q-ma-md"
+          class="q-mx-md q-mt-md"
           @blur="handleSearchKey"
         />
       </q-card>
+      
       <q-card flat class="rounded-borders q-py-md q-mt-lg">
         <div class="text-subtitle1 text-weight-bold q-mx-md">所有類別</div>
         <q-tree
@@ -155,7 +181,32 @@
           :ticked="ticked"
         />
       </q-card>
-
+      <q-card flat class="rounded-borders q-mt-lg">
+        <q-expansion-item
+          expand-separator
+          label="出发地"
+          class="text-subtitle1 text-weight-bold rounded-borders"
+        >
+          <div
+            class="addr-list q-px-md q-py-sm row items-center"
+            v-for="(y, yi) in CityList"
+            :key="yi"
+          >
+            <q-checkbox v-model="y.checked" size="xs" @input="changeTripDayHandler(1)" />
+            <span
+              class="col text-grey-8 text-subtitle2 text-regular q-mt-xs"
+              style="font-weight: 400"
+            >
+              {{ y.CityName }}
+            </span>
+          </div>
+        </q-expansion-item>
+      </q-card>
+      <q-card flat class="rounded-borders q-py-md q-mt-lg">
+        <q-checkbox class="q-mx-md" v-model="msg.TeamType" :true-value="1" 
+        false-value="" label="私家团" 
+        @input="handleSearchKey"/>
+      </q-card>
       <q-card flat class="rounded-borders q-mt-lg row no-padding">
         <div
           class="q-px-md q-py-sm"
@@ -254,6 +305,9 @@
             @click="chosenSortHandler(x)"
             >{{ x.label }}</q-chip
           >
+          <q-checkbox v-if="$q.platform.is.mobile" class="q-mx-md" v-model="msg.TeamType" :true-value="1" 
+          false-value="" label="私家团" 
+          @input="handleSearchKey"/>
         </div>
       </div>
       <div class="q-mt-lg" v-if="!$q.loading.isActive && DataList && DataList.length > 0">
@@ -405,6 +459,7 @@ export default {
   components: { popup },
   data() {
     return {
+      showCity: false,
       showAddress: false,
       showCategory: false,
       showDate: false,
@@ -501,6 +556,7 @@ export default {
         min: 1,
         max: 30000,
       },
+      CityList: [],
     };
   },
   created() {
@@ -571,15 +627,24 @@ export default {
       });
       return result;
     },
-    changeTripDayHandler() {
+    changeTripDayHandler(type) {
       this.$forceUpdate();
       let arr = [];
-      this.dayArray.forEach((item) => {
-        if (item.checked) {
-          arr.push(item.id);
-        }
-      });
-      this.msg.dayNumList = arr;
+      if(!type){
+        this.dayArray.forEach((item) => {
+          if (item.checked) {
+            arr.push(item.id);
+          }
+        });
+        this.msg.dayNumList = arr;
+      }else{
+        this.CityList.forEach((item) => {
+          if (item.checked) {
+            arr.push(item.CityId);
+          }
+        });
+        this.msg.StartCityList = arr
+      }
       this.msg.pageIndex = 1;
       this.goSearchHandler();
     },
@@ -610,12 +675,19 @@ export default {
       if (this.msg.SeriesIds && this.msg.SeriesIds.length > 0) {
         SeriesIdList = this.msg.SeriesIds.split(",");
       }
-      console.log("SeriesIdList",SeriesIdList);
+      console.log("SeriesIdList=====",SeriesIdList);
       this.apipost(
         "b2c_get_GetB2CQueryCondition",
         this.msg,
         (res) => {
           if (res.data.resultCode == 1) {
+            let arrList = function(list){
+              list.forEach(x=>{
+                x.checked = false
+              })
+            }
+            arrList(res.data.data.CityList)
+            this.CityList = res.data.data.CityList
             var jObj = res.data.data.LineList;
             jObj.forEach((x) => {
               x.checked = false;
@@ -733,6 +805,7 @@ export default {
             this.PageCount = res.data.data.pageCount;
             this.TotalCount = res.data.data.count;
             var tempArray = res.data.data.pageData.list;
+            
             if (tempArray && tempArray.length > 0) {
               this.DataList = tempArray;
               this.renderSearchInfo(res.data.data.pageData.condition);

src/pages/SearchProduct.vue

@@ -1410,7 +1410,9 @@ export default {
         dayNumList: [], // 天数
         webSiteCategoryIds: "", // 分类Id
         placeIds: "", // 目的地城市Id
-        orderBy: 0 // 排序  0默认   1价格升序   2价格降序
+        orderBy: 0, // 排序  0默认   1价格升序   2价格降序
+        TeamType: '',//私家团
+        StartCityList: [],
       },
       ShowType: 0, //显示样式(0-豆腐格，1-列表)
       //行程列表
@@ -1650,6 +1652,8 @@ export default {
         dayNumList: this.dayNum,
         SeriesIds:this.qMsg.SeriesIds,
         LineIds:this.qMsg.LineIds,
+        TeamType:this.qMsg.TeamType,
+        StartCityList: [],
       };
       if (localStorage.b2bUser) {
         var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser"));