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

1

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