Skip to content

J
jz_Travel
Commit 72998b00 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 6c0d235b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1413 additions and 1052 deletions
components/gridnav/index.vue
View file @ 72998b00
<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>
components/quicknav/index.vue
View file @ 72998b00
...@@ -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() {
...@@ -83,19 +91,19 @@ export default { ...@@ -83,19 +91,19 @@ export default {
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>
......
node_modules/uview-ui/components/u-index-list/u-index-list.vue
View file @ 72998b00
...@@ -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)
}
}); });
} }
} }
......
pages/guidecar/guidecarList.vue
View file @ 72998b00
...@@ -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"
......
pages/guidecar/index.vue
View file @ 72998b00
...@@ -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,21 +1048,19 @@ export default { ...@@ -1048,21 +1048,19 @@ export default {
that.getNLocation(); that.getNLocation();
} }
} }
},
});
// #endif // #endif
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
if (res.authSetting.location) {
if (that.latitude != "" && that.longitude != "") { if (that.latitude != "" && that.longitude != "") {
that.getYLocation(); that.getYLocation();
} else { } else {
that.getNLocation(); that.getNLocation();
} }
} else {
that.fetchAgainLocation();
}
// #endif // #endif
}, },
});
},
fetchAgainLocation() { fetchAgainLocation() {
let that = this; let that = this;
uni.getSetting({ uni.getSetting({
...@@ -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>
pages/guidecar/pickcarcity.vue
View file @ 72998b00
<template> <template>
<view class="pickcarcity" :style="{'height':contentHeight}"> <view class="pickcarcity" :style="{ height: contentHeight }">
<view class="qcity"> <view class="qcity">
<view class="ctrl-box"> <view class="ctrl-box">
<u-search <u-search
action-text="搜索" action-text="搜索"
:focus="true" :focus="true"
:show-action="true" :show-action="true"
radius="40" radius="40"
v-model="searchKey" v-model="searchKey"
...@@ -14,175 +13,202 @@ ...@@ -14,175 +13,202 @@
@change="changeHandler" @change="changeHandler"
></u-search> ></u-search>
</view> </view>
<view v-if="show==true"> <view v-if="show == true">
<scroll-view <scroll-view :scroll-y="true" style="height: calc(100vh - 50px)">
:scroll-y="true"
style="height: calc(100vh - 50px)">
<view class="txtype"> <view class="txtype">
<view class="list-cell" v-for="(x, index) in searchList" :key="index" @click="goback(x,2)"> <view
{{x.Name}} class="list-cell"
v-for="(x, index) in searchList"
:key="index"
@click="goback(x, 2)"
>
{{ x.Name }}
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="kaitong" v-if="show==false"> <view class="kaitong" v-if="show == false">
<div style='width: 100%;'><span style='color: #9A9A9A;font-size: 12px;'>已开通城市</span></div> <div style="width: 100%">
<view v-for="(item, index) in RegionList" :key="index" class="region" @click="goback(item,1)"> <span style="color: #9a9a9a; font-size: 12px">已开通城市</span>
{{item.RegionName}} </div>
<view
v-for="(item, index) in RegionList"
:key="index"
class="region"
@click="goback(item, 1)"
>
{{ item.RegionName }}
</view> </view>
</view> </view>
<div style='height: calc(100vh - 50px);' v-if="show==false"> <div style="height: calc(100vh - 50px)" v-if="show == false">
<u-index-list :scrollTop="scrollTop"> <u-index-list :scrollTop="scrollTop">
<view v-for="(item, index) in indexList" :key="index"> <view v-for="(item, index) in indexList" :key="index">
<u-index-anchor :index="item.ti" /> <u-index-anchor :index="item.ti" />
<view class="list-cell" v-for="(x,y) in item.children" :key='y' @click="goback(x,2)"> <view
{{x.Name}} class="list-cell"
v-for="(x, y) in item.children"
:key="y"
@click="goback(x, 2)"
>
{{ x.Name }}
</view> </view>
</view> </view>
</u-index-list> </u-index-list>
</div> </div>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
pageTitle: "取车城市", pageTitle: "取车城市",
scrollTop:0, scrollTop: 0,
contentHeight:0, contentHeight: 0,
mainColor:'', mainColor: "",
secondary:'', secondary: "",
RegionList:[], RegionList: [],
cityList:[], cityList: [],
searchList:[],//搜索出来的 searchList: [], //搜索出来的
searchKey: "", searchKey: "",
show:false, show: false,
indexList: [{ti:"A"}, {ti:"B"}, {ti:"C"}, {ti:"D"}, {ti:"E"}, {ti:"F"}, {ti:"G"},{ ti:"H"}, {ti:"I"}, {ti:"J"}, {ti:"K"}, {ti:"L"}, indexList: [
{ti:"M"}, {ti:"N"}, {ti:"O"}, {ti:"P"},{ ti:"Q"}, {ti:"R"}, {ti:"S"}, {ti:"T"}, {ti:"U"}, { ti: "A" },
{ti:"V"}, {ti:"W"}, {ti:"X"}, {ti:"Y"}, {ti:"Z"} { ti: "B" },
] { ti: "C" },
} { ti: "D" },
}, { ti: "E" },
onLoad(option){ { ti: "F" },
{ ti: "G" },
{ ti: "H" },
{ ti: "I" },
{ ti: "J" },
{ ti: "K" },
{ ti: "L" },
{ ti: "M" },
{ ti: "N" },
{ ti: "O" },
{ ti: "P" },
{ ti: "Q" },
{ ti: "R" },
{ ti: "S" },
{ ti: "T" },
{ ti: "U" },
{ ti: "V" },
{ ti: "W" },
{ ti: "X" },
{ ti: "Y" },
{ ti: "Z" },
],
};
}, },
created(){ onLoad(option) {},
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
this.init()//城市列表 this.init(); //城市列表
this.getSiteRegionList() this.getSiteRegionList();
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
methods: { methods: {
init(){ init() {
uni.showLoading({ uni.showLoading({
title: "加载中", title: "加载中",
}); });
this.request2( this.request2(
{ {
url: '/api/AppletGuideCar/GetAllList', url: "/api/AppletGuideCar/GetAllList",
data: {} data: {},
}, },
(res) => { (res) => {
this.cityList = res.data; this.cityList = res.data;
this.indexList.forEach(x=>{ this.indexList.forEach((x) => {
x.children=[]; x.children = [];
this.cityList.forEach(j=>{ this.cityList.forEach((j) => {
let obj={} let obj = {};
if(x.ti==j.PinYin.substr(0,1)){ if (x.ti == j.PinYin.substr(0, 1)) {
x.children.push(j) x.children.push(j);
} }
}) });
});
})
uni.hideLoading(); uni.hideLoading();
} }
); );
}, },
getSiteRegionList(){ getSiteRegionList() {
this.request2( this.request2(
{ {
url: '/api/AppletGuideCar/GetSiteRegionList', url: "/api/AppletGuideCar/GetSiteRegionList",
data: {} data: {},
}, },
(res) => { (res) => {
this.RegionList = res.data this.RegionList = res.data;
} }
); );
}, },
onPageScroll(e) { onPageScroll(e) {
this.scrollTop = e.scrollTop; this.scrollTop = e.scrollTop;
}, },
goback(item,type){ goback(item, type) {
let Name let Name;
if(type==1){ if (type == 1) {
Name=item.RegionName Name = item.RegionName;
}else{ } else {
Name=item.Name Name = item.Name;
} }
let pages = getCurrentPages(); // 当前页面 let pages = getCurrentPages(); // 当前页面
let beforePage let beforePage;
beforePage = pages[pages.length - 2]; // 前一个页面 beforePage = pages[pages.length - 2]; // 前一个页面
// console.log( beforePage.$vm) // console.log( beforePage.$vm)
setTimeout(()=>{ setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta:1, delta: 1,
success: function() { success: function () {
beforePage.$vm.getPickcar(Name); // 执行前一个页面的方法 beforePage.$vm.getPickcar(Name); // 执行前一个页面的方法
} },
}); });
},100) }, 100);
}, },
searchHandler(val){ searchHandler(val) {
if(val!=''){ if (val != "") {
this.searchList = [] this.searchList = [];
this.cityList.forEach(x=>{ this.cityList.forEach((x) => {
if(x.Name.indexOf(val)!=-1){ if (x.Name.indexOf(val) != -1) {
this.searchList.push(x) this.searchList.push(x);
} }
}) });
this.show=true this.show = true;
}else{ } else {
this.show=false this.show = false;
} }
}, },
changeHandler(val) { changeHandler(val) {
if (val == "") {
if(val==''){ this.show = false;
this.show=false
} }
}, },
},
} };
}
</script> </script>
<style> <style>
.pickcarcity{ .pickcarcity {
background: #FFFFFF; background: #ffffff;
} }
.pickcarcity .qcity{ .pickcarcity .qcity {
} }
.pickcarcity .list-cell { .pickcarcity .list-cell {
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
...@@ -193,21 +219,21 @@ ...@@ -193,21 +219,21 @@
line-height: 24px; line-height: 24px;
background-color: #fff; background-color: #fff;
position: relative; position: relative;
} }
.pickcarcity .anchor-text { .pickcarcity .anchor-text {
color: red; color: red;
} }
.pickcarcity .kaitong{ .pickcarcity .kaitong {
width: 100%; width: 100%;
padding: 15px; padding: 15px;
background: #FAF8F9; background: #faf8f9;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
} }
.pickcarcity .region{ .pickcarcity .region {
width: 200rpx; width: 200rpx;
height: 68rpx; height: 68rpx;
background: #fff; background: #fff;
...@@ -216,15 +242,13 @@ ...@@ -216,15 +242,13 @@
justify-content: center; justify-content: center;
margin-right: 30rpx; margin-right: 30rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.pickcarcity .ctrl-box { .pickcarcity .ctrl-box {
padding: 5px 10px; padding: 5px 10px;
} }
.pickcarcity .txtype{ .pickcarcity .txtype {
width: 100%; width: 100%;
background: #FFF; background: #fff;
height: calc(100vh - 50px); height: calc(100vh - 50px);
}
}
</style> </style>
pages/hotel/description.vue
View file @ 72998b00
<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>
......
pages/hotel/detail.vue
View file @ 72998b00
...@@ -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>
pages/jiuzhai/allorderdetails.vue
View file @ 72998b00
This diff is collapsed.
pages/jiuzhai/jz_LineDetail.vue
View file @ 72998b00
...@@ -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>
pages/restaurant/detail.vue
View file @ 72998b00
...@@ -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>
pages/ticketCoupons/components/recommed-hotel.vue
View file @ 72998b00
<template> <template>
<view> <view>
<view class="hotel-list-item" v-for="(item,index) in scenicArr" :key="index" @click="goHotelDetail(item.ID)"> <view
class="hotel-list-item"
v-for="(item, index) in scenicArr"
:key="index"
@click="goHotelDetail(item.ID)"
>
<view class="img-box"> <view class="img-box">
<image :src="item.CoverImg" mode="aspectFill"></image> <image :src="item.CoverImg" mode="aspectFill"></image>
</view> </view>
<view class="hotel-info"> <view class="hotel-info">
<view class="hotel-name">{{item.Name}}</view> <view class="hotel-name">{{ item.Name }}</view>
<view class="hotel-start"> <view class="hotel-start">
<!-- TODO：判定是否为星级酒店，如果是显示星级，不是，显示另外一种方式 --> <!-- TODO：判定是否为星级酒店，如果是显示星级，不是，显示另外一种方式 -->
<view class="rate" v-if="item.ScoreNum>=1&&item.ScoreNum<=5"> <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> <u-rate
<text style="margin-left: 20rpx;vertical-align: top;">{{item.ScoreNum}} active-color="#FEB969"
<text v-if="item.ScoreNum===1||item.ScoreNum===2||item.ScoreNum===3||item.ScoreNum===4||item.ScoreNum===5">.0</text> 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> </text>
</view> </view>
<!-- <view class="other-rate" v-if="item.Star==9"> <!-- <view class="other-rate" v-if="item.Star==9">
...@@ -23,13 +45,21 @@ ...@@ -23,13 +45,21 @@
<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
text="亲子设施"
bg-color="#FFF"
border-color="#DFBE6E"
color="#DFBE6E"
size="mini"
></u-tag>
</view> </view>
<view class="price"> <view class="price">
<text>￥</text> <text>￥</text>
<text class="money">{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text> <text class="money">{{
$utils.getretailer() == true ? item.B2BPrice : item.SalesPrice
}}</text>
<text>起</text> <text>起</text>
</view> </view>
</view> </view>
...@@ -38,67 +68,65 @@ ...@@ -38,67 +68,65 @@
</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() {
return {
}
}, },
mounted(){ data() {
return {};
}, },
created(){ mounted() {},
console.log(this.scenicArr) created() {
console.log(this.scenicArr);
}, },
methods:{ methods: {
goHotelDetail(id){ goHotelDetail(id) {
// let myDayObj = JSON.stringify(this.dayObj); // let myDayObj = JSON.stringify(this.dayObj);
uni.navigateTo({ uni.navigateTo({
// url: "/pages/ticketCoupons/detail?id=" + id +'&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj) // url: "/pages/ticketCoupons/detail?id=" + id +'&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj)
url: "/pages/ticketCoupons/detail?id=" + id 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;
...@@ -107,39 +135,42 @@ ...@@ -107,39 +135,42 @@
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;
}
.hotel-list-item .hotel-info .hotel-start .rate {
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
line-height: 30rpx; line-height: 30rpx;
margin: 20rpx 0; margin: 20rpx 0;
} }
.hotel-list-item .hotel-info .hotel-start .other-rate{ .hotel-list-item .hotel-info .hotel-start .other-rate {
display: inline-block; display: inline-block;
position: relative; position: relative;
} }
.hotel-list-item .hotel-info .hotel-start .other-rate text{ .hotel-list-item .hotel-info .hotel-start .other-rate text {
position: relative;z-index: 2; position: relative;
z-index: 2;
font-size: 30rpx; font-size: 30rpx;
line-height: 30rpx; line-height: 30rpx;
font-weight: 500; font-weight: 500;
color: #111; color: #111;
} }
.hotel-list-item .hotel-info .hotel-start .other-rate .line{ .hotel-list-item .hotel-info .hotel-start .other-rate .line {
background-color: #DFBE6E; background-color: #dfbe6e;
height: 6px; height: 6px;
bottom: 2px; bottom: 2px;
left: 0; left: 0;
right: 0; right: 0;
position: absolute; position: absolute;
z-index: 1; z-index: 1;
} }
.hotel-list-item .hotel-info .localtion{ .hotel-list-item .hotel-info .localtion {
font-size: 24rpx; font-size: 24rpx;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
...@@ -152,15 +183,15 @@ ...@@ -152,15 +183,15 @@
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.hotel-list-item .hotel-info .price{ .hotel-list-item .hotel-info .price {
margin-top: 10rpx; margin-top: 10rpx;
font-weight: 500; font-weight: 500;
color: #000; color: #000;
font-size: 20rpx; font-size: 20rpx;
text-align: right; text-align: right;
} }
.hotel-list-item .hotel-info .price .money{ .hotel-list-item .hotel-info .price .money {
font-size: 36rpx; font-size: 36rpx;
} }
</style> </style>
pages/ticketCoupons/detail.vue
View file @ 72998b00
...@@ -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