页面修改

src/components/searchdata/list.vue

@@ -74,7 +74,7 @@
               </div>
               <div class="group-detail">
                 <i class="iconfont iconaddress"></i>
-                <span>巴黎省</span>
+                <span>{{item.countryName}}</span>
               </div>
               <div class="group-detail">
                 <i class="iconfont icontime"></i>

src/pages/Search.vue

@@ -593,7 +593,7 @@
           </q-input>
         </div>
         <div class="col-2" style="margin-left:10px;">
-          <q-select filled v-model="priceSort" :options="navs" emit-value map-options />
+          <q-select filled v-model="sortNum" :options="sortArray" emit-value map-options />
         </div>
         <div class="col-2" style="margin-left:10px;">
           <span style="margin-top:15px;display:inline-block;cursor:pointer;" @click="fullHeight = true">更多篩選條件</span>
@@ -656,7 +656,7 @@
             class="keyword-input">
         </div>
         <div class="sortDiv">
-          <q-select filled style="width:50%" v-model="priceSort" :options="navs" emit-value map-options />
+          <q-select filled style="width:50%" v-model="sortNum" :options="sortArray" emit-value map-options />
           <div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div>
         </div>
       </div>
@@ -773,7 +773,7 @@
     },
     data() {
       return {
-        priceSort: 1,
+        sortNum: 1, //排序
         dayNum: ['11天'],
         flight: ['长荣'],
         StartWeek: ['星期一'],
@@ -798,7 +798,7 @@
         //地区数据
         areas: [],
         crtAreaIndex: 0,
-        navs: [{
+        sortArray: [{
           label: '依推薦程度',
           value: 1
         }, {
@@ -960,9 +960,8 @@
         }
         if (this.qMsg.maxTripDay != '') {
           maxTripDay = parseFloat(this.qMsg.maxTripDay);
-          if(minTripDay>maxTripDay)
-          {
-              return false;
+          if (minTripDay > maxTripDay) {
+            return false;
           }
         }
         let msg = {
@@ -978,13 +977,20 @@
           maxPrice: maxPrice,
           startDate: this.qMsg.startDate,
           endDate: this.qMsg.endDate,
-          orderByDate: this.orderindex == 1 ? (this.ordertype == 0 ? 2 : 1) : 0,
-          orderByPrice: this.orderindex == 2 ? (this.ordertype == 0 ? 2 : 1) : 0,
+          orderByDate: this.sortNum == 4 ? 1 : (this.sortNum == 5 ? 2 : 0),
+          orderByPrice: this.sortNum == 2 ? 1 : (this.sortNum == 3 ? 2 : 0),
+          orderByDay:this.sortNum == 6 ? 1 : (this.sortNum == 7 ? 2 : 0),
           priceOrderByField: 4,
           companyId: 0,
-          orderBySales: this.orderindex == 3 ? (this.ordertype == 0 ? 2 : 1) : 0,
+          orderBySales: 0,
           startCityId: this.qMsg.startCityId
         }
+        if (localStorage.b2bUser) {
+          var b2bUser = JSON.parse(window.localStorage.getItem('b2bUser'))
+          if (b2bUser) {
+            msg.priceOrderByField = 2;
+          }
+        }
         console.log("this.msg", msg);
         this.apipost(
           "b2b_get_GetB2BTravelPageList", msg,
@@ -1017,5 +1023,3 @@
   };
 
 </script>
-
-<style></style>

src/pages/details.vue

@@ -73,26 +73,24 @@
   .quick-banner-block.yellow .quick-item>.active {
     background-color: rgba(102, 162, 121, .82);
   }
-  .detail_loadingDiv{
+
+  .detail_loadingDiv {
     position: fixed;
-    width:100%;
-    height:100%;
-    z-index:999;
-    display:flex;
+    width: 100%;
+    height: 100%;
+    z-index: 999;
+    display: flex;
     align-items: center;
     justify-content: center;
-    background:rgba(0,0,0,0.5);
+    background: rgba(0, 0, 0, 0.5);
   }
+
 </style>
 <template>
   <q-page ref="orderview">
     <!-- loading -->
     <div class="detail_loadingDiv" v-if="isLoading">
-      <q-spinner
-        color="primary"
-        size="3em"
-        :thickness="10"
-      />
+      <q-spinner color="primary" size="3em" :thickness="10" />
     </div>
     <template v-if="isShow">
       <!-- 顶部大图 -->
@@ -102,8 +100,10 @@
       <template v-for="(item,index) in TripConfig.TripConfig.SortList">
         <!-- 行程資訊 -->
         <!-- TripListStyle 1月历 2列表 -->
-        <tripList v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==2" :key="index+100" :plugData="dataList.priceList"></tripList>
-        <tripcalendar v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==1" :key="index+200" :dateData="dataList.priceList" :priceInfo="dataList.currentPriceInfo"></tripcalendar>
+        <tripList v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==2" :key="index+100"
+          :plugData="dataList.priceList"></tripList>
+        <tripcalendar v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==1" :key="index+200"
+          :dateData="dataList.priceList" :priceInfo="dataList.currentPriceInfo"></tripcalendar>
         <!-- 每日行程 -->
         <!-- TripDayStyle 1竖起排 2横起 -->
 
@@ -139,6 +139,7 @@
   import headStyle3 from "../components/trip/style3";
   import headStyle4 from "../components/trip/style4";
   import headStyle5 from "../components/trip/style5";
+
   //每日行程横放组件
   import headStyle6 from "../components/trip/style6";
   import diyForm from "../components/label_other/diy-form";
@@ -147,7 +148,6 @@
   //出團表 group -Start
   import tripList from "../components/trip/tripList";
   import tripcalendar from "../components/trip/tripcalendar"
-
   //出團表 group -End
 
   export default {
@@ -160,7 +160,7 @@
           preview: 0,
           tcid: 0,
           teamType: 0,
-          isGetPriceFlight:true,
+          isGetPriceFlight: true,
         },
         isShow: false,
         dataList: {},
@@ -169,7 +169,7 @@
         TripConfig: {},
         isShowNav: false,
         clickIndex: 1,
-        isLoading:false
+        isLoading: false
       };
     },
     components: {
@@ -200,9 +200,9 @@
     },
     methods: {
       getData() {
-        this.isLoading=true;
+        this.isLoading = true;
         this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, r => {
-          this.isLoading=false;
+          this.isLoading = false;
           if (r.data.resultCode == 1) {
             this.dataList = r.data.data;
             if (this.dataList.dayList && this.dataList.dayList.length > 0) {
@@ -230,7 +230,6 @@
         let newval = "#" + val
         document.querySelector(newval).scrollIntoView(true);
       },
-
     },
   };