Commit 72998b00 authored by 罗超's avatar 罗超

1

parent 6c0d235b
<template> <template>
<div class="mynav" :style="{ background: bg }"> <div class="mynav" :style="{ background: `${bg}`, height: `${height}rpx` }">
<swiper :autoplay="false" :style="{ Height: height + 'rpx' }"> <swiper
:autoplay="false"
style="min-height: 140rpx"
:style="{ height: `${height}rpx` }"
>
<swiper-item v-for="(item, index) in cols" :key="index"> <swiper-item v-for="(item, index) in cols" :key="index">
<view :style="[formatStyle]"> <view :style="[formatStyle]">
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
...@@ -65,7 +69,6 @@ export default { ...@@ -65,7 +69,6 @@ export default {
created() { created() {
let tempArray = []; let tempArray = [];
this.height = this.navs.rows * this.height; this.height = this.navs.rows * this.height;
console.log(66, this.height);
this.navs.navs.forEach((x, i) => { this.navs.navs.forEach((x, i) => {
tempArray.push(x); tempArray.push(x);
if ( if (
...@@ -102,7 +105,7 @@ export default { ...@@ -102,7 +105,7 @@ export default {
}; };
</script> </script>
<style> <style scoped>
.mynva .grid-text { .mynva .grid-text {
font-size: 28rpx; font-size: 28rpx;
margin-top: 4rpx; margin-top: 4rpx;
...@@ -111,11 +114,19 @@ export default { ...@@ -111,11 +114,19 @@ export default {
.grid-text view { .grid-text view {
background: transparent !important; background: transparent !important;
} }
/* #ifdef MP-ALIPAY */
.mynav {
display: flex;
align-items: center;
justify-content: space-between;
}
.gridnav-box { .gridnav-box {
height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
} }
/* #endif */
</style> </style>
...@@ -13,10 +13,18 @@ ...@@ -13,10 +13,18 @@
> >
<img :src="navs.customerService.picUrl" /> <img :src="navs.customerService.picUrl" />
</button> </button>
<view class="nav-item" v-if="navs.tel.opened" @click="goPhone(navs.tel.number)"> <view
class="nav-item"
v-if="navs.tel.opened"
@click="goPhone(navs.tel.number)"
>
<img :src="navs.tel.picUrl" /> <img :src="navs.tel.picUrl" />
</view> </view>
<view class="nav-item" v-if="navs.web.opened" @click="goUrl(navs.web.url)"> <view
class="nav-item"
v-if="navs.web.opened"
@click="goUrl(navs.web.url)"
>
<img :src="navs.web.picUrl" /> <img :src="navs.web.picUrl" />
</view> </view>
<navigator <navigator
...@@ -59,7 +67,7 @@ export default { ...@@ -59,7 +67,7 @@ export default {
showArrow: true, showArrow: true,
showNavs: false, showNavs: false,
arrowImg: "", arrowImg: "",
currentParent: "" currentParent: "",
}; };
}, },
created() { created() {
...@@ -78,24 +86,24 @@ export default { ...@@ -78,24 +86,24 @@ export default {
goHome() { goHome() {
let t = getCurrentPages(); let t = getCurrentPages();
let crtPath = "/" + t[t.length - 1].route; let crtPath = "/" + t[t.length - 1].route;
uni.redirectTo({ url: "/pages/index/index" }); uni.redirectTo({ url: "/pages/index/index" });
}, },
goLink(url) { goLink(url) {
if (url && url.length > 0) { if (url && url.length > 0) {
uni.redirectTo({ uni.redirectTo({
url: url url: url,
}); });
} }
}, },
goPhone(num) { goPhone(num) {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: num phoneNumber: num,
}); });
}, },
goUrl(url) { goUrl(url) {
if (url && url.length > 0) { if (url && url.length > 0) {
uni.redirectTo({ uni.redirectTo({
url: "/pages/webbox/webbox?u=" + encodeURIComponent(url) url: "/pages/webbox/webbox?u=" + encodeURIComponent(url),
}); });
} }
}, },
...@@ -110,10 +118,12 @@ export default { ...@@ -110,10 +118,12 @@ export default {
uni.openLocation({ uni.openLocation({
latitude: loca[0], latitude: loca[0],
longitude: loca[1], longitude: loca[1],
scale: 28 scale: 28,
name: "",
address: "",
}); });
} },
} },
}; };
</script> </script>
......
...@@ -256,11 +256,17 @@ ...@@ -256,11 +256,17 @@
} }
this.scrollToAnchorIndex = index; this.scrollToAnchorIndex = index;
const anchor = this.children.find((item) => item.index === this.indexList[index]); const anchor = this.children.find((item) => item.index === this.indexList[index]);
console.log(anchor,this.scrollTop)
if (anchor) { if (anchor) {
this.$emit('select', anchor.index); this.$emit('select', anchor.index);
uni.pageScrollTo({ uni.pageScrollTo({
duration: 0, scrollTop: anchor.top + this.scrollTop,
scrollTop: anchor.top + this.scrollTop success:(res)=>{
console.log(1,res)
},
fail:(err)=> {
console.log(2,err)
}
}); });
} }
} }
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
:list="list" :list="list"
:is-scroll="false" :is-scroll="false"
:show-bar="false" :show-bar="false"
duration="0"
font-size="28" font-size="28"
:activeFontSize="34" :activeFontSize="34"
:bold="true" :bold="true"
......
...@@ -1020,10 +1020,10 @@ export default { ...@@ -1020,10 +1020,10 @@ export default {
openmap() { openmap() {
//打开地图选择详情地址 //打开地图选择详情地址
let that = this; let that = this;
// #ifdef MP-WEIXIN
uni.getSetting({ uni.getSetting({
success(res) { success(res) {
console.log("res是否开启授权", res); console.log("res是否开启授权", res);
// #ifdef MP-WEIXIN
if (!res.authSetting["scope.userLocation"]) { if (!res.authSetting["scope.userLocation"]) {
uni.authorize({ uni.authorize({
scope: "scope.userLocation", scope: "scope.userLocation",
...@@ -1048,20 +1048,18 @@ export default { ...@@ -1048,20 +1048,18 @@ export default {
that.getNLocation(); that.getNLocation();
} }
} }
// #endif
// #ifdef MP-ALIPAY
if (res.authSetting.location) {
if (that.latitude != "" && that.longitude != "") {
that.getYLocation();
} else {
that.getNLocation();
}
} else {
that.fetchAgainLocation();
}
// #endif
}, },
}); });
// #endif
// #ifdef MP-ALIPAY
if (that.latitude != "" && that.longitude != "") {
that.getYLocation();
} else {
that.getNLocation();
}
// #endif
}, },
fetchAgainLocation() { fetchAgainLocation() {
let that = this; let that = this;
...@@ -1077,6 +1075,7 @@ export default { ...@@ -1077,6 +1075,7 @@ export default {
if (tip.confirm) { if (tip.confirm) {
uni.openSetting({ uni.openSetting({
success: (data) => { success: (data) => {
console.log(data);
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
if (data.authSetting["scope.userLocation"]) { if (data.authSetting["scope.userLocation"]) {
uni.showToast({ uni.showToast({
...@@ -1412,6 +1411,7 @@ export default { ...@@ -1412,6 +1411,7 @@ export default {
opacity: 0.5; opacity: 0.5;
width: 1.3rem; width: 1.3rem;
height: 15rpx; height: 15rpx;
border-radius: 4rpx;
background-color: #dfbe6e; background-color: #dfbe6e;
} }
</style> </style>
This diff is collapsed.
<template> <template>
<view style="height: 100vh"> <view style="height: 100vh" v-if="hotelObj.HotelId > 0">
<view style="padding: 0 45rpx"> <view style="padding: 0 45rpx">
<u-tabs <u-tabs
:is-scroll="false" :is-scroll="false"
...@@ -163,12 +163,14 @@ export default { ...@@ -163,12 +163,14 @@ export default {
active: 0, active: 0,
scrollTop: 0, scrollTop: 0,
oldScrollTop: 0, oldScrollTop: 0,
id: 0,
hotelObj: {}, //酒店信息 hotelObj: {}, //酒店信息
}; };
}, },
onLoad(options) { onLoad(options) {
if (options.hotelObj) { if (options.hotelObj) {
this.hotelObj = JSON.parse(decodeURIComponent(options.hotelObj)); let obj = JSON.parse(decodeURIComponent(options.hotelObj));
this.getHotelDetail(parseInt(obj.id), obj.start, obj.end);
} }
}, },
created() { created() {
...@@ -204,6 +206,26 @@ export default { ...@@ -204,6 +206,26 @@ export default {
// this.clickItem = this.navs.navs[i]; // this.clickItem = this.navs.navs[i];
// }) // })
}, },
//获取酒店详情
getHotelDetail(id, start, end) {
let msg = {
HotelId: id,
StartDate: start,
EndDate: end,
};
this.request2(
{
url: "/api/Hotel/GetHotelInfo",
data: msg,
},
(res) => {
if (res.resultCode == 1) {
// console.log(res, '详情数据');
this.hotelObj = res.data;
}
}
);
},
}, },
}; };
</script> </script>
......
...@@ -77,29 +77,32 @@ ...@@ -77,29 +77,32 @@
</view> </view>
</view> </view>
</view> </view>
<!-- #ifdef MP-WEIXIN -->
<view <view
@click="goback" @click="goback"
:style="[titleStyle, { opacity: '100% !important' }]" :style="[titleStyle, { opacity: '100% !important' }]"
style="position: fixed; top: 0; left: 0; padding-left: 6rpx" style="position: fixed; top: 0; left: 0; padding-left: 6rpx"
> >
<!-- #ifdef MP-WEIXIN -->
<u-icon <u-icon
name="arrow-left" name="arrow-left"
size="44" size="44"
color="#FFF" color="#FFF"
style="margin-top: 22rpx" style="margin-top: 22rpx"
></u-icon> ></u-icon>
<!-- #endif -->
</view> </view>
<!-- #endif -->
</view> </view>
<view class="hotel-title" :style="[titleStyle]"> <view class="hotel-title" :style="[titleStyle]">
<view @click="goback"> <view @click="goback">
<!-- #ifdef MP-WEIXIN -->
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
<!-- #endif -->
</view> </view>
<view style="flex: 1; margin-left: 30rpx; text-align: left">{{ <view
dataList.HotelName style="flex: 1; margin-left: 30rpx; text-align: left"
}}</view> class="name-ali"
>{{ dataList.HotelName }}</view
>
</view> </view>
<view class="hotel-content"> <view class="hotel-content">
<view class="hotel-base"> <view class="hotel-base">
...@@ -356,7 +359,9 @@ export default { ...@@ -356,7 +359,9 @@ export default {
}, },
], ],
boxOption: 0, boxOption: 0,
titleStyle: {}, titleStyle: {
opacity: 0,
},
mainColor: "", mainColor: "",
showTimePopup: false, showTimePopup: false,
controls: false, controls: false,
...@@ -422,11 +427,6 @@ export default { ...@@ -422,11 +427,6 @@ export default {
this.Up = uni.getStorageSync("mall_UserInfo") this.Up = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserPageType ? uni.getStorageSync("mall_UserInfo").UserPageType
: 0; : 0;
// #ifdef MP-ALIPAY
if (my.canIUse("hideBackHome")) {
my.hideBackHome();
}
// #endif
}, },
onLoad(options) { onLoad(options) {
this.id = options.id; this.id = options.id;
...@@ -437,13 +437,12 @@ export default { ...@@ -437,13 +437,12 @@ export default {
that.titleStyle = { that.titleStyle = {
height: "45px", height: "45px",
paddingTop: `${res.statusBarHeight}px`, paddingTop: `${res.statusBarHeight}px`,
opacity: "0%", opacity: "0",
}; };
}, },
}); });
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
if (options.dayObj) { if (options.dayObj) {
// console.log(options.dayObj,'options.dayObj');
var tempDay = JSON.parse(options.dayObj); var tempDay = JSON.parse(options.dayObj);
this.roomMsg.StartDate = tempDay.start; this.roomMsg.StartDate = tempDay.start;
this.roomMsg.EndDate = tempDay.end; this.roomMsg.EndDate = tempDay.end;
...@@ -507,11 +506,12 @@ export default { ...@@ -507,11 +506,12 @@ export default {
goMap(name, lon, lat) { goMap(name, lon, lat) {
let newLon = parseFloat(lon); let newLon = parseFloat(lon);
let newLat = parseFloat(lat); let newLat = parseFloat(lat);
wx.openLocation({ uni.openLocation({
latitude: newLat, latitude: newLat,
longitude: newLon, longitude: newLon,
scale: 18, scale: 18,
name, name: name,
address: name,
success: (res) => {}, success: (res) => {},
fail: (err) => {}, fail: (err) => {},
}); });
...@@ -523,7 +523,11 @@ export default { ...@@ -523,7 +523,11 @@ export default {
}); });
}, },
openDescription() { openDescription() {
let hotelObj = JSON.stringify(this.dataList); let hotelObj = JSON.stringify({
id: this.id,
start: this.dayObj.start,
end: this.dayObj.end,
});
uni.navigateTo({ uni.navigateTo({
url: url:
"/pages/hotel/description?hotelObj=" + encodeURIComponent(hotelObj), "/pages/hotel/description?hotelObj=" + encodeURIComponent(hotelObj),
...@@ -648,9 +652,11 @@ export default { ...@@ -648,9 +652,11 @@ export default {
scroll(e) { scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5); this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
this.titleStyle.opacity = this.titleStyle.opacity =
(e.detail.scrollTop - 100 < 0 e.detail.scrollTop - 100 < 0
? 0 ? 0
: Math.floor(e.detail.scrollTop - 100)) + "%"; : Math.floor(e.detail.scrollTop - 100) / 100 > 1
? 1
: Math.floor(e.detail.scrollTop - 100) / 100;
this.$forceUpdate(); this.$forceUpdate();
}, },
enlarge(file) { enlarge(file) {
...@@ -701,6 +707,7 @@ export default { ...@@ -701,6 +707,7 @@ export default {
} }
); );
}, },
// #ifdef MP-WEIXIN
//分享朋友圈 //分享朋友圈
onShareTimeline() { onShareTimeline() {
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo")
...@@ -778,6 +785,7 @@ export default { ...@@ -778,6 +785,7 @@ export default {
: "", : "",
}; };
}, },
// #endif
}, },
}; };
</script> </script>
...@@ -1228,4 +1236,10 @@ export default { ...@@ -1228,4 +1236,10 @@ export default {
top: 0; top: 0;
opacity: 0; opacity: 0;
} }
.name-ali {
/* #ifdef MP-ALIPAY */
box-sizing: border-box;
padding-left: 30rpx;
/* #endif */
}
</style> </style>
This diff is collapsed.
...@@ -60,7 +60,9 @@ ...@@ -60,7 +60,9 @@
</view> </view>
<view class="top-title" :style="[titleStyle]"> <view class="top-title" :style="[titleStyle]">
<view @click="goback"> <view @click="goback">
<!-- #ifdef MP-WEIXIN -->
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
<!-- #endif -->
</view> </view>
<view <view
style=" style="
...@@ -71,6 +73,7 @@ ...@@ -71,6 +73,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
" "
class="name-ali"
>{{ dataList.title }}</view >{{ dataList.title }}</view
> >
</view> </view>
...@@ -1780,4 +1783,10 @@ export default { ...@@ -1780,4 +1783,10 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.name-ali {
/* #ifdef MP-ALIPAY */
box-sizing: border-box;
padding-left: 30rpx;
/* #endif */
}
</style> </style>
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
</view> </view>
<view class="restaurant-title" :style="[titleStyle]"> <view class="restaurant-title" :style="[titleStyle]">
<view @click="goback"> <view @click="goback">
<!-- #ifdef MP-WEIXIN -->
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
<!-- #endif -->
</view> </view>
<view <view
style=" style="
...@@ -45,6 +47,7 @@ ...@@ -45,6 +47,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
" "
class="name-ali"
>{{ details.Name }}</view >{{ details.Name }}</view
> >
</view> </view>
...@@ -448,7 +451,7 @@ export default { ...@@ -448,7 +451,7 @@ export default {
that.titleStyle = { that.titleStyle = {
height: "45px", height: "45px",
paddingTop: `${res.statusBarHeight}px`, paddingTop: `${res.statusBarHeight}px`,
opacity: "0%", opacity: "0",
}; };
}, },
}); });
...@@ -471,12 +474,12 @@ export default { ...@@ -471,12 +474,12 @@ export default {
goMap(name, lon, lat) { goMap(name, lon, lat) {
let newLon = parseFloat(lon); let newLon = parseFloat(lon);
let newLat = parseFloat(lat); let newLat = parseFloat(lat);
wx.openLocation({ uni.openLocation({
latitude: newLat, latitude: newLat,
longitude: newLon, longitude: newLon,
scale: 18, scale: 18,
name, name,
// address:"武侯区科华中路 2 号", address: name,
success: (res) => { success: (res) => {
// console.log(res) // console.log(res)
}, },
...@@ -516,9 +519,11 @@ export default { ...@@ -516,9 +519,11 @@ export default {
scroll(e) { scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5); this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
this.titleStyle.opacity = this.titleStyle.opacity =
(e.detail.scrollTop - 100 < 0 e.detail.scrollTop - 100 < 0
? 0 ? 0
: Math.floor(e.detail.scrollTop - 100)) + "%"; : Math.floor(e.detail.scrollTop - 100) / 100 > 1
? 1
: Math.floor(e.detail.scrollTop - 100) / 100;
this.$forceUpdate(); this.$forceUpdate();
}, },
...@@ -1144,4 +1149,10 @@ export default { ...@@ -1144,4 +1149,10 @@ export default {
.restaurant-detail .media .media-info .mi-left { .restaurant-detail .media .media-info .mi-left {
flex: 1; flex: 1;
} }
.name-ali {
// #ifdef MP-ALIPAY
box-sizing: border-box;
padding-left: 30rpx;
// #endif
}
</style> </style>
<template> <template>
<view> <view>
<view class="hotel-list-item" v-for="(item,index) in scenicArr" :key="index" @click="goHotelDetail(item.ID)"> <view
<view class="img-box"> class="hotel-list-item"
<image :src="item.CoverImg" mode="aspectFill"></image> v-for="(item, index) in scenicArr"
</view> :key="index"
<view class="hotel-info"> @click="goHotelDetail(item.ID)"
<view class="hotel-name">{{item.Name}}</view> >
<view class="hotel-start"> <view class="img-box">
<!-- TODO:判定是否为星级酒店,如果是显示星级,不是,显示另外一种方式 --> <image :src="item.CoverImg" mode="aspectFill"></image>
<view class="rate" v-if="item.ScoreNum>=1&&item.ScoreNum<=5"> </view>
<u-rate active-color="#FEB969" inactive-color="#FFF" :current="item.ScoreNum" active-icon="star" inactive-icon="star" disabled></u-rate> <view class="hotel-info">
<text style="margin-left: 20rpx;vertical-align: top;">{{item.ScoreNum}} <view class="hotel-name">{{ item.Name }}</view>
<text v-if="item.ScoreNum===1||item.ScoreNum===2||item.ScoreNum===3||item.ScoreNum===4||item.ScoreNum===5">.0</text> <view class="hotel-start">
</text> <!-- TODO:判定是否为星级酒店,如果是显示星级,不是,显示另外一种方式 -->
</view> <view class="rate" v-if="item.ScoreNum >= 1 && item.ScoreNum <= 5">
<!-- <view class="other-rate" v-if="item.Star==9"> <u-rate
active-color="#FEB969"
inactive-color="#FFF"
:current="item.ScoreNum"
active-icon="star"
inactive-icon="star"
disabled
></u-rate>
<text style="margin-left: 20rpx"
>{{ item.ScoreNum }}
<text
v-if="
item.ScoreNum === 1 ||
item.ScoreNum === 2 ||
item.ScoreNum === 3 ||
item.ScoreNum === 4 ||
item.ScoreNum === 5
"
>.0</text
>
</text>
</view>
<!-- <view class="other-rate" v-if="item.Star==9">
<text>温泉酒店</text> <text>温泉酒店</text>
<span class="line"></span> <span class="line"></span>
</view> </view>
...@@ -22,145 +44,154 @@ ...@@ -22,145 +44,154 @@
<text>精选民宿</text> <text>精选民宿</text>
<span class="line"></span> <span class="line"></span>
</view> --> </view> -->
</view> </view>
<view class="localtion">{{item.Address}}</view> <view class="localtion">{{ item.Address }}</view>
<view> <view>
<u-tag text="亲子设施" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini"></u-tag> <u-tag
</view> text="亲子设施"
<view class="price"> bg-color="#FFF"
<text></text> border-color="#DFBE6E"
<text class="money">{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text> color="#DFBE6E"
<text></text> size="mini"
</view> ></u-tag>
</view> </view>
</view> <view class="price">
</view> <text></text>
<text class="money">{{
$utils.getretailer() == true ? item.B2BPrice : item.SalesPrice
}}</text>
<text></text>
</view>
</view>
</view>
</view>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
scenicArr:{ scenicArr: {
type:Array, type: Array,
default:null default: null,
}, },
dayObj:{ dayObj: {
type:Object, type: Object,
default:null default: null,
}, },
searchObj:{ searchObj: {
type:Object, type: Object,
default:null default: null,
} },
}, },
data() { data() {
return { return {};
} },
}, mounted() {},
mounted(){ created() {
}, console.log(this.scenicArr);
created(){ },
console.log(this.scenicArr) methods: {
}, goHotelDetail(id) {
methods:{ // let myDayObj = JSON.stringify(this.dayObj);
goHotelDetail(id){ uni.navigateTo({
// let myDayObj = JSON.stringify(this.dayObj); // url: "/pages/ticketCoupons/detail?id=" + id +'&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj)
uni.navigateTo({ url: "/pages/ticketCoupons/detail?id=" + id,
// url: "/pages/ticketCoupons/detail?id=" + id +'&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj) });
url: "/pages/ticketCoupons/detail?id=" + id },
}); },
} };
}
}
</script> </script>
<style> <style>
.hotel-list-item{ .hotel-list-item {
margin: 30rpx 0; margin: 30rpx 0;
padding-bottom: 30rpx; padding-bottom: 30rpx;
/* border-bottom: 1rpx solid #E2E2E2; */ /* border-bottom: 1rpx solid #E2E2E2; */
display: flex; display: flex;
align-items: center; align-items: center;
} }
.hotel-list-item .img-box{ .hotel-list-item .img-box {
width: 220rpx; width: 220rpx;
height: 280rpx; height: 280rpx;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
margin-right: 30rpx; margin-right: 30rpx;
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2); box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
} }
.hotel-list-item .img-box image{ .hotel-list-item .img-box image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.hotel-list-item .hotel-info{ .hotel-list-item .hotel-info {
width: 1px; width: 1px;
flex: 1; flex: 1;
} }
.hotel-list-item .hotel-info .hotel-name{ .hotel-list-item .hotel-info .hotel-name {
/* width: 80%; */ /* width: 80%; */
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
line-height: 30rpx; line-height: 30rpx;
font-size: 30rpx; font-size: 30rpx;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.hotel-list-item .hotel-info .hotel-start{ .hotel-list-item .hotel-info .hotel-start {
/* width: 20%; */ /* width: 20%; */
/* margin:10rpx 0; */ /* margin:10rpx 0; */
} display: flex;
.hotel-list-item .hotel-info .hotel-start .rate{ align-items: center;
font-size: 30rpx; }
font-weight: 500; .hotel-list-item .hotel-info .hotel-start .rate {
color: #999999; font-size: 30rpx;
line-height: 30rpx; font-weight: 500;
margin: 20rpx 0; color: #999999;
} line-height: 30rpx;
.hotel-list-item .hotel-info .hotel-start .other-rate{ margin: 20rpx 0;
display: inline-block; }
position: relative; .hotel-list-item .hotel-info .hotel-start .other-rate {
} display: inline-block;
.hotel-list-item .hotel-info .hotel-start .other-rate text{ position: relative;
position: relative;z-index: 2; }
font-size: 30rpx; .hotel-list-item .hotel-info .hotel-start .other-rate text {
line-height: 30rpx; position: relative;
font-weight: 500; z-index: 2;
color: #111; font-size: 30rpx;
} line-height: 30rpx;
.hotel-list-item .hotel-info .hotel-start .other-rate .line{ font-weight: 500;
background-color: #DFBE6E; color: #111;
height: 6px; }
bottom: 2px; .hotel-list-item .hotel-info .hotel-start .other-rate .line {
left: 0; background-color: #dfbe6e;
right: 0; height: 6px;
position: absolute; bottom: 2px;
z-index: 1; left: 0;
} right: 0;
.hotel-list-item .hotel-info .localtion{ position: absolute;
font-size: 24rpx; z-index: 1;
font-weight: 400; }
color: #999999; .hotel-list-item .hotel-info .localtion {
line-height: 30rpx; font-size: 24rpx;
font-weight: 400;
text-overflow: -o-ellipsis-lastline; color: #999999;
overflow: hidden; line-height: 30rpx;
text-overflow: ellipsis;
display: -webkit-box; text-overflow: -o-ellipsis-lastline;
-webkit-line-clamp: 2; overflow: hidden;
-webkit-box-orient: vertical; text-overflow: ellipsis;
margin-bottom: 10rpx; display: -webkit-box;
} -webkit-line-clamp: 2;
.hotel-list-item .hotel-info .price{ -webkit-box-orient: vertical;
margin-top: 10rpx; margin-bottom: 10rpx;
font-weight: 500; }
color: #000; .hotel-list-item .hotel-info .price {
font-size: 20rpx; margin-top: 10rpx;
text-align: right; font-weight: 500;
} color: #000;
.hotel-list-item .hotel-info .price .money{ font-size: 20rpx;
font-size: 36rpx; text-align: right;
} }
.hotel-list-item .hotel-info .price .money {
font-size: 36rpx;
}
</style> </style>
...@@ -44,12 +44,15 @@ ...@@ -44,12 +44,15 @@
@click="goUrl('/pages/ticketCoupons/imgList')" @click="goUrl('/pages/ticketCoupons/imgList')"
></image> ></image>
</view> </view>
<view class="ticket-title" :style="[titleStyleFix]"> <view class="ticket-title-bar" :style="[titleStyle]">
<view @click="goback"> <view @click="goback">
<!-- #ifdef MP-WEIXIN -->
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
<!-- #endif -->
</view> </view>
<view <view
style="flex: 1;margin-left: 30rpx; text-align: left;'background-color':'#000';white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" style="flex: 1;margin-left: 30rpx; text-align: left;'background-color':'#000';white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
class="name-ali"
> >
{{ details.Name }} {{ details.Name }}
</view> </view>
...@@ -438,7 +441,6 @@ export default { ...@@ -438,7 +441,6 @@ export default {
Date: "", //日期 Date: "", //日期
details: {}, details: {},
titleStyle: {}, titleStyle: {},
titleStyleFix: {},
active: 0, active: 0,
mainColor: "", mainColor: "",
controls: false, //显示默认控件 controls: false, //显示默认控件
...@@ -551,16 +553,7 @@ export default { ...@@ -551,16 +553,7 @@ export default {
that.titleStyle = { that.titleStyle = {
height: "45px", height: "45px",
paddingTop: `${res.statusBarHeight}px`, paddingTop: `${res.statusBarHeight}px`,
opacity: "0%", opacity: "0",
};
that.titleStyleFix = {
height: "45px",
position: "fixed",
top: "0",
left: "0",
paddingTop: `${res.statusBarHeight}px`,
"background-color": "#f6f6f6",
opacity: "0%",
}; };
}, },
}); });
...@@ -670,15 +663,12 @@ export default { ...@@ -670,15 +663,12 @@ export default {
scroll(e) { scroll(e) {
this.titleStyle.opacity = this.titleStyle.opacity =
(e.detail.scrollTop - 100 < 0 e.detail.scrollTop - 100 < 0
? 0 ? 0
: Math.floor(e.detail.scrollTop - 100)) + "%"; : Math.floor(e.detail.scrollTop - 100) / 100 > 1
? 1
: Math.floor(e.detail.scrollTop - 100) / 100;
this.tooltipShow = false; this.tooltipShow = false;
this.titleStyleFix.opacity =
(e.detail.scrollTop - 100 < 0
? 0
: Math.floor(e.detail.scrollTop - 100)) + "%";
this.$forceUpdate(); this.$forceUpdate();
}, },
goback() { goback() {
...@@ -690,12 +680,12 @@ export default { ...@@ -690,12 +680,12 @@ export default {
goMap(name, lon, lat) { goMap(name, lon, lat) {
let newLat = parseFloat(lat); let newLat = parseFloat(lat);
let newLon = parseFloat(lon); let newLon = parseFloat(lon);
wx.openLocation({ uni.openLocation({
latitude: newLat, latitude: newLat,
longitude: newLon, longitude: newLon,
scale: 18, scale: 18,
name, name,
// address:"", address: name,
success: (res) => {}, success: (res) => {},
fail: (err) => {}, fail: (err) => {},
}); });
...@@ -847,7 +837,7 @@ export default { ...@@ -847,7 +837,7 @@ export default {
height: 500rpx; height: 500rpx;
} }
.ticket-title { .ticket-title-bar {
line-height: 45px !important; line-height: 45px !important;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
...@@ -1422,4 +1412,11 @@ export default { ...@@ -1422,4 +1412,11 @@ export default {
color: #dfbe6e; color: #dfbe6e;
background: rgba(223, 190, 110, 0.2); background: rgba(223, 190, 110, 0.2);
} }
.name-ali {
// #ifdef MP-ALIPAY
box-sizing: border-box;
padding-left: 30rpx;
// #endif
}
</style> </style>
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