Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/pages/detailHotal.vue

@@ -372,19 +372,19 @@
             @click="CommonJump('/index', {})"
           />
           <q-breadcrumbs-el label="日本" class="cursor-pointer" />
-          <q-breadcrumbs-el>
+          <!-- <q-breadcrumbs-el>
             <span>
               <span class="cursor-pointer">{{ hotelSummary.hotelStateProvince }} </span>
               <span class="q-mr-sm"></span>
             </span>
-          </q-breadcrumbs-el>
+          </q-breadcrumbs-el> -->
           <q-breadcrumbs-el
             v-if="$q.platform.is.desktop"
-            :label="hotelSummary.address"
+            :label="hotelSummary.hotelName"
             class="text-grey-6 ellipsis"
           />
         </q-breadcrumbs>
-        <div class="text-grey-6 f12">Product No. # </div>
+        <div class="text-grey-6 f12">Product No. # {{dataList.hotelId}}</div>
       </div>
       <div class="row rounded-borders bg-white overflow-hidden relative">
         <q-img class="col-5 cursor-pointer" :src="hotelDetails.hotelImageUrl1" :ratio="16/9" @click="showImageHandler(hotelDetails.hotelImageUrl1)"/>
@@ -457,7 +457,6 @@
           }"
         >
           <div class="product-price f30 bold" v-if="MinPrice > 0">
-            <!-- CNY：{{ dataList. }} -->
             CNY：{{ moneyFormat(MinPrice, 0) }}
             <span class="f16 text-grey-6 normal">起</span>
           </div>
@@ -510,7 +509,7 @@
       <hotel-map></hotel-map>
     </div> -->
     <div
-      class="q-pa-lg bg-grey-3 q-mt-lg text-grey-9"
+      class="q-pa-lg bg-grey-3 text-grey-9"
       ref="pricelist"
     >
       <div
@@ -1222,6 +1221,7 @@ export default {
         (res) => {
           this.$q.loading.hide();
           if (res.data.resultCode == 1) {
+            this.dataList = res.data.data
             this.hotelDetails = res.data.data.hotelDetails;
             this.hotelSummary = res.data.data.hotelSummary;
             this.roomReviewRating = Number(this.hotelDetails.roomReviewRating);

src/pages/detailsCar.vue

@@ -58,20 +58,14 @@
             class="cursor-pointer"
             @click="CommonJump('/index', {})"
           />
-          <q-breadcrumbs-el label="日本" class="cursor-pointer" />
-          <q-breadcrumbs-el>
-            <span v-for="(x, i) in citys" :key="i">
-              <span class="cursor-pointer">{{ x }} </span>
-              <span v-if="i + 1 != citys.length" class="q-mr-sm">，</span>
-            </span>
-          </q-breadcrumbs-el>
+          <q-breadcrumbs-el :label="dataList.CityList2[0].CountryName" class="cursor-pointer" />
           <q-breadcrumbs-el
             v-if="$q.platform.is.desktop"
-            :label="dataList.title"
+            :label="dataList.Name"
             class="text-grey-6 ellipsis"
           />
         </q-breadcrumbs>
-        <div class="text-grey-6 f12">Product No. # {{ dataList.id }}</div>
+        <div class="text-grey-6 f12">Product No. # {{ dataList.Id }}</div>
       </div>
       <div style="padding-bottom: calc((100% - 0px) / 3); position: relative">
         <div
@@ -120,7 +114,6 @@
       <div
         class="q-py-lg"
         :class="{ row: $q.platform.is.desktop, column: $q.platform.is.mobile }"
-        style="border-bottom: 1px solid #eee"
       >
         <div class="col q-mr-lg">
           <div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
@@ -184,21 +177,6 @@
           />
         </div>
       </div>
-      <div class="q-mt-lg" v-if="dataList.productRecommend">
-        <div
-          class="q-mt-sm"
-          v-for="(x, i) in dataList.productRecommend.split('\n')"
-          :key="i"
-        >
-          <q-icon
-            name="iconfont iconhongqi"
-            color="primary"
-            size="16px"
-            class="q-mr-md"
-          />
-          {{ x }}
-        </div>
-      </div>
     </div>
     <div
       class="bg-white"
@@ -234,7 +212,7 @@
     </div>
     <div
       v-if="dataList"
-      class="q-pa-lg bg-grey-3 q-mt-lg text-grey-9"
+      class="q-pa-lg bg-grey-3 text-grey-9"
       ref="pricelist"
     >
       <div