Commit d0c270fb authored by 沈良进's avatar 沈良进

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

parents ecb03b20 57da16b4
...@@ -372,19 +372,19 @@ ...@@ -372,19 +372,19 @@
@click="CommonJump('/index', {})" @click="CommonJump('/index', {})"
/> />
<q-breadcrumbs-el label="日本" class="cursor-pointer" /> <q-breadcrumbs-el label="日本" class="cursor-pointer" />
<q-breadcrumbs-el> <!-- <q-breadcrumbs-el>
<span> <span>
<span class="cursor-pointer">{{ hotelSummary.hotelStateProvince }} </span> <span class="cursor-pointer">{{ hotelSummary.hotelStateProvince }} </span>
<span class="q-mr-sm"></span> <span class="q-mr-sm"></span>
</span> </span>
</q-breadcrumbs-el> </q-breadcrumbs-el> -->
<q-breadcrumbs-el <q-breadcrumbs-el
v-if="$q.platform.is.desktop" v-if="$q.platform.is.desktop"
:label="hotelSummary.address" :label="hotelSummary.hotelName"
class="text-grey-6 ellipsis" class="text-grey-6 ellipsis"
/> />
</q-breadcrumbs> </q-breadcrumbs>
<div class="text-grey-6 f12">Product No. # </div> <div class="text-grey-6 f12">Product No. # {{dataList.hotelId}}</div>
</div> </div>
<div class="row rounded-borders bg-white overflow-hidden relative"> <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)"/> <q-img class="col-5 cursor-pointer" :src="hotelDetails.hotelImageUrl1" :ratio="16/9" @click="showImageHandler(hotelDetails.hotelImageUrl1)"/>
...@@ -457,7 +457,6 @@ ...@@ -457,7 +457,6 @@
}" }"
> >
<div class="product-price f30 bold" v-if="MinPrice > 0"> <div class="product-price f30 bold" v-if="MinPrice > 0">
<!-- CNY:{{ dataList. }} -->
CNY:{{ moneyFormat(MinPrice, 0) }} CNY:{{ moneyFormat(MinPrice, 0) }}
<span class="f16 text-grey-6 normal"></span> <span class="f16 text-grey-6 normal"></span>
</div> </div>
...@@ -510,7 +509,7 @@ ...@@ -510,7 +509,7 @@
<hotel-map></hotel-map> <hotel-map></hotel-map>
</div> --> </div> -->
<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" ref="pricelist"
> >
<div <div
...@@ -1222,6 +1221,7 @@ export default { ...@@ -1222,6 +1221,7 @@ export default {
(res) => { (res) => {
this.$q.loading.hide(); this.$q.loading.hide();
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data
this.hotelDetails = res.data.data.hotelDetails; this.hotelDetails = res.data.data.hotelDetails;
this.hotelSummary = res.data.data.hotelSummary; this.hotelSummary = res.data.data.hotelSummary;
this.roomReviewRating = Number(this.hotelDetails.roomReviewRating); this.roomReviewRating = Number(this.hotelDetails.roomReviewRating);
......
...@@ -58,20 +58,14 @@ ...@@ -58,20 +58,14 @@
class="cursor-pointer" class="cursor-pointer"
@click="CommonJump('/index', {})" @click="CommonJump('/index', {})"
/> />
<q-breadcrumbs-el label="日本" class="cursor-pointer" /> <q-breadcrumbs-el :label="dataList.CityList2[0].CountryName" 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 <q-breadcrumbs-el
v-if="$q.platform.is.desktop" v-if="$q.platform.is.desktop"
:label="dataList.title" :label="dataList.Name"
class="text-grey-6 ellipsis" class="text-grey-6 ellipsis"
/> />
</q-breadcrumbs> </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>
<div style="padding-bottom: calc((100% - 0px) / 3); position: relative"> <div style="padding-bottom: calc((100% - 0px) / 3); position: relative">
<div <div
...@@ -120,7 +114,6 @@ ...@@ -120,7 +114,6 @@
<div <div
class="q-py-lg" class="q-py-lg"
:class="{ row: $q.platform.is.desktop, column: $q.platform.is.mobile }" :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="col q-mr-lg">
<div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div> <div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
...@@ -184,21 +177,6 @@ ...@@ -184,21 +177,6 @@
/> />
</div> </div>
</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>
<div <div
class="bg-white" class="bg-white"
...@@ -234,7 +212,7 @@ ...@@ -234,7 +212,7 @@
</div> </div>
<div <div
v-if="dataList" 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" ref="pricelist"
> >
<div <div
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment