Skip to content

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

1

parent 6c0d235b
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
<style lang="scss" scoped> <style lang="scss" scoped>
.allorderdetails{ .allorderdetails {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background: #FFFFFF; background: #ffffff;
.box-top{ .box-top {
width: 100%; width: 100%;
height: 65px; height: 65px;
background: #FFFFFF; background: #ffffff;
box-shadow: 0px 1px 8px 0px rgba(76, 76, 76, 0.13); box-shadow: 0px 1px 8px 0px rgba(76, 76, 76, 0.13);
border-radius: 0px 0px 30px 30px; border-radius: 0px 0px 30px 30px;
padding: 0 20px; padding: 0 20px;
...@@ -15,44 +15,43 @@ ...@@ -15,44 +15,43 @@
font-size: 20px; font-size: 20px;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
image{ image {
width: 27px;height: 27px;margin-right: 10px; width: 27px;
height: 27px;
margin-right: 10px;
} }
} }
.box-top2{ .box-top2 {
width: 100%; width: 100%;
padding:0 20px; padding: 0 20px;
margin-top: 20px; margin-top: 20px;
.box-top2-text{ .box-top2-text {
font-size: 16px; font-size: 16px;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
line-height: 22px; line-height: 22px;
} }
} }
.order_xu{ .order_xu {
width: 100%; width: 100%;
height: 14px; height: 14px;
border-bottom: 1px dashed #E6E6E6; border-bottom: 1px dashed #e6e6e6;
} }
.box-center{ .box-center {
width: 100%; width: 100%;
padding: 0 20px; padding: 0 20px;
.hotelbox{ .hotelbox {
display: flex; display: flex;
margin-top: 15px; margin-top: 15px;
.hotelbox-r{ .hotelbox-r {
width: calc(100vw - 50px - 80px); width: calc(100vw - 50px - 80px);
font-size: 12px; font-size: 12px;
.text-t{ .text-t {
width: 100%; width: 100%;
} }
} }
} }
.box-top-car{ .box-top-car {
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -62,17 +61,17 @@ ...@@ -62,17 +61,17 @@
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
margin-top: 15px; margin-top: 15px;
.onetext{ .onetext {
// overflow: hidden;white-space: nowrap;text-overflow: ellipsis; // overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
width: calc((100vw - 40px - 40px)/2); width: calc((100vw - 40px - 40px) / 2);
text-align: center; text-align: center;
} }
.box-top-c{ .box-top-c {
width: 113px; width: 113px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.box-top-ct{ .box-top-ct {
width: 30px; width: 30px;
height: 21px; height: 21px;
border-radius: 2px; border-radius: 2px;
...@@ -80,7 +79,7 @@ ...@@ -80,7 +79,7 @@
font-size: 12px; font-size: 12px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #DFBE6E; color: #dfbe6e;
text-align: center; text-align: center;
line-height: 21px; line-height: 21px;
margin-bottom: 4px; margin-bottom: 4px;
...@@ -88,40 +87,39 @@ ...@@ -88,40 +87,39 @@
} }
} }
} }
.box-c-car{ .box-c-car {
width: 100%; width: 100%;
border-radius: 8px; border-radius: 8px;
box-shadow: 0px 1px 8px 0px rgba(76, 76, 76, 0.13); box-shadow: 0px 1px 8px 0px rgba(76, 76, 76, 0.13);
padding: 0 15px; padding: 0 15px;
margin-top: 15px; margin-top: 15px;
.box-c-caritem{ .box-c-caritem {
width: 100%; width: 100%;
min-height:40px; min-height: 40px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.box-c-caritem-l{ .box-c-caritem-l {
font-size: 12px; font-size: 12px;
color: rgba(8, 9, 14, 0.6); color: rgba(8, 9, 14, 0.6);
width: 130rpx; width: 130rpx;
} }
.box-c-caritem-r{ .box-c-caritem-r {
font-size: 14px; font-size: 14px;
color: #08090E; color: #08090e;
font-weight: bold; font-weight: bold;
width: 1; width: 1;
flex:1; flex: 1;
text-align: right; text-align: right;
} }
.box-c-caritem-r2{ .box-c-caritem-r2 {
font-size: 14px; font-size: 14px;
color: #08090E; color: #08090e;
font-weight: bold; font-weight: bold;
} }
} }
} }
.xian{ .xian {
width: 100%; width: 100%;
height: 1px; height: 1px;
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
...@@ -139,7 +137,7 @@ ...@@ -139,7 +137,7 @@
border-top: 1px solid #f5f5f5; border-top: 1px solid #f5f5f5;
background: #fff; background: #fff;
} }
.kefu{ .kefu {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -153,224 +151,432 @@ ...@@ -153,224 +151,432 @@
top: 0; top: 0;
opacity: 0; opacity: 0;
} }
} }
</style> </style>
<template> <template>
<view class="allorderdetails"> <view class="allorderdetails">
<view class="box-top"> <view class="box-top">
<image v-if="OrderInfo.OrderStatus==1 || OrderInfo.OrderStatus==2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/orderdfk.png" ></image> <image
<image v-if="OrderInfo.OrderStatus==4 || OrderInfo.OrderStatus==5" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/orderquxiao.png" ></image> v-if="OrderInfo.OrderStatus == 1 || OrderInfo.OrderStatus == 2"
<image v-if="OrderInfo.OrderStatus==3" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/orderwancheng.png" ></image> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/orderdfk.png"
<span>{{OrderInfo.OrderStatusName}}</span> ></image>
<image
v-if="OrderInfo.OrderStatus == 4 || OrderInfo.OrderStatus == 5"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/orderquxiao.png"
></image>
<image
v-if="OrderInfo.OrderStatus == 3"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/orderwancheng.png"
></image>
<span>{{ OrderInfo.OrderStatusName }}</span>
</view> </view>
<view class="box-top2"> <view class="box-top2">
<view style="display: flex;align-items: center;justify-content: space-between;"> <view
<span class='box-top2-text'>{{OrderInfo.OrderTypeName}}</span> style="
<view style="display: flex;align-items: center;"> display: flex;
<span class='box-top2-text' style='font-size: 12px;font-weight: normal;'>{{OrderInfo.OrderNo}}</span> align-items: center;
<view style='margin-left: 5px;'> justify-content: space-between;
<u-button size="mini" shape="circle" @click="paste(OrderInfo.OrderNo)">复制</u-button> "
>
<span class="box-top2-text">{{ OrderInfo.OrderTypeName }}</span>
<view style="display: flex; align-items: center">
<span
class="box-top2-text"
style="font-size: 12px; font-weight: normal"
>{{ OrderInfo.OrderNo }}</span
>
<view style="margin-left: 5px">
<u-button
size="mini"
shape="circle"
@click="paste(OrderInfo.OrderNo)"
>复制</u-button
>
</view> </view>
</view> </view>
</view> </view>
<view class="order_xu"></view> <view class="order_xu"></view>
</view> </view>
<!-- 酒店 --> <!-- 酒店 -->
<view class="box-center" v-if="OrderInfo.OrderType == 1"> <view class="box-center" v-if="OrderInfo.OrderType == 1">
<view v-for="(x,y) in OrderInfo.HotelList" :key ='y'> <view v-for="(x, y) in OrderInfo.HotelList" :key="y">
<view class="hotelbox"> <view class="hotelbox">
<image :src="getIconLink(x.HotelImage)" style="width: 80px;height: 80px;border-radius: 8px;margin-right: 10px;"></image> <image
:src="getIconLink(x.HotelImage)"
style="
width: 80px;
height: 80px;
border-radius: 8px;
margin-right: 10px;
"
></image>
<view class="hotelbox-r"> <view class="hotelbox-r">
<view class="text-t">{{x.HotelName}}</view> <view class="text-t">{{ x.HotelName }}</view>
<view>数量:{{x.RoomNumber}}</view> <view>数量:{{ x.RoomNumber }}</view>
<view>单价:￥{{x.Unit_Price}}元</view> <view>单价:￥{{ x.Unit_Price }}元</view>
</view> </view>
</view> </view>
<view class="box-c-car"> <view class="box-c-car">
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">入店时间</view> <view class="box-c-caritem-l">入店时间</view>
<view class="box-c-caritem-r">{{x.StartDate}}</view> <view class="box-c-caritem-r">{{ x.StartDate }}</view>
</view> </view>
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">离店时间</view> <view class="box-c-caritem-l">离店时间</view>
<view class="box-c-caritem-r">{{x.EndDate}}</view> <view class="box-c-caritem-r">{{ x.EndDate }}</view>
</view> </view>
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">到店时间</view> <view class="box-c-caritem-l">到店时间</view>
<view class="box-c-caritem-r">{{x.ArrivalTime}}</view> <view class="box-c-caritem-r">{{ x.ArrivalTime }}</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 餐厅 --> <!-- 餐厅 -->
<view class="box-center" v-if="OrderInfo.OrderType == 2"> <view class="box-center" v-if="OrderInfo.OrderType == 2">
<view v-for="(x,y) in OrderInfo.DiningList" :key ='y'> <view v-for="(x, y) in OrderInfo.DiningList" :key="y">
<view class="hotelbox"> <view class="hotelbox">
<image :src="getIconLink(x.DiningImg)" style="width: 80px;height: 80px;border-radius: 8px;margin-right: 10px;"></image> <image
:src="getIconLink(x.DiningImg)"
style="
width: 80px;
height: 80px;
border-radius: 8px;
margin-right: 10px;
"
></image>
<view class="hotelbox-r"> <view class="hotelbox-r">
<view class="text-t">{{x.MealName}}</view> <view class="text-t">{{ x.MealName }}</view>
<view>数量:{{x.PeopleNumber}}</view> <view>数量:{{ x.PeopleNumber }}</view>
<view>单价:￥{{x.Unit_Price}}元</view> <view>单价:￥{{ x.Unit_Price }}元</view>
<view>就餐时间:{{x.Date}}</view> <view>就餐时间:{{ x.Date }}</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 门票 --> <!-- 门票 -->
<view class="box-center" v-if="OrderInfo.OrderType == 3"> <view class="box-center" v-if="OrderInfo.OrderType == 3">
<view v-for="(x,y) in OrderInfo.TicketList" :key ='y'> <view v-for="(x, y) in OrderInfo.TicketList" :key="y">
<view class="hotelbox"> <view class="hotelbox">
<image :src="getIconLink(x.TicketImg)" style="width: 80px;height: 80px;border-radius: 8px;margin-right: 10px;"></image> <image
:src="getIconLink(x.TicketImg)"
style="
width: 80px;
height: 80px;
border-radius: 8px;
margin-right: 10px;
"
></image>
<view class="hotelbox-r"> <view class="hotelbox-r">
<view class="text-t">{{x.TicketName}}</view> <view class="text-t">{{ x.TicketName }}</view>
<view>数量:{{x.PeopleNumber}}</view> <view>数量:{{ x.PeopleNumber }}</view>
<view>单价:￥{{x.Unit_Price}}元</view> <view>单价:￥{{ x.Unit_Price }}元</view>
<view>入园时间:{{x.Date}}</view> <view>入园时间:{{ x.Date }}</view>
</view> </view>
</view> </view>
<view v-if="x.GuestList.length>0" class="box-c-caritem-r" style="text-align: left;font-weight: bold;">携带以下全部证件 直接进园</view> <view
<view class="box-c-car" v-if="x.GuestList.length>0"> v-if="x.GuestList.length > 0"
<view class="box-c-caritem" v-for="(n,m) in x.GuestList" :key='m' :style="{'justify-content': 'space-between','border-bottom':x.GuestList.length-1 !=m? '1px solid #E2E2E2':''}"> class="box-c-caritem-r"
<view class="box-c-caritem-r2" >{{n.Name}}</view> style="text-align: left; font-weight: bold"
<view class="box-c-caritem-r2" >{{n.IdCard.substring(0,5)}}***{{n.IdCard.substring(n.IdCard.length-4,n.IdCard.length)}}</view> >携带以下全部证件 直接进园</view
<view class="box-c-caritem-r2" >{{n.Mobile}}</view> >
<view class="box-c-car" v-if="x.GuestList.length > 0">
<view
class="box-c-caritem"
v-for="(n, m) in x.GuestList"
:key="m"
:style="{
'justify-content': 'space-between',
'border-bottom':
x.GuestList.length - 1 != m ? '1px solid #E2E2E2' : '',
}"
>
<view class="box-c-caritem-r2">{{ n.Name }}</view>
<view class="box-c-caritem-r2"
>{{ n.IdCard.substring(0, 5) }}***{{
n.IdCard.substring(n.IdCard.length - 4, n.IdCard.length)
}}</view
>
<view class="box-c-caritem-r2">{{ n.Mobile }}</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 专车 --> <!-- 专车 -->
<view class="box-center" v-if="OrderInfo.OrderType == 4"> <view class="box-center" v-if="OrderInfo.OrderType == 4">
<view v-for="(x,y) in OrderInfo.CarList" :key ='y'> <view v-for="(x, y) in OrderInfo.CarList" :key="y">
<view class="box-top-car"> <view class="box-top-car">
<div class='onetext'>{{x.StartCityName}}</div> <div class="onetext">{{ x.StartCityName }}</div>
<view class="box-top-c"> <view class="box-top-c">
<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix" style="width: 30px;height: auto;"></image> --> <!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix" style="width: 30px;height: auto;"></image> -->
<image v-if="OrderInfo.IsGoBack == 2" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zhuanghuan.png" mode="aspectFill" style="width: 18px;height: 18px;"></image> <image
<image v-if="OrderInfo.IsGoBack == 1 && y==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/gocar.png" mode="aspectFill" style="width: 18px;height: 18px;"></image> v-if="OrderInfo.IsGoBack == 2"
<image v-if="OrderInfo.IsGoBack == 1 && y==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/returncar.png" mode="aspectFill" style="width: 18px;height: 18px;"></image> src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zhuanghuan.png"
</view> mode="aspectFill"
<div class='onetext'>{{x.ArriveCityName}}</div> style="width: 18px; height: 18px"
></image>
<image
v-if="OrderInfo.IsGoBack == 1 && y == 0"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/gocar.png"
mode="aspectFill"
style="width: 18px; height: 18px"
></image>
<image
v-if="OrderInfo.IsGoBack == 1 && y == 1"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/returncar.png"
mode="aspectFill"
style="width: 18px; height: 18px"
></image>
</view>
<div class="onetext">{{ x.ArriveCityName }}</div>
</view> </view>
<view class="box-c-car"> <view class="box-c-car">
<view class="box-c-caritem"> <view class="box-c-caritem">
<view class="box-c-caritem-l">上车地点</view> <view class="box-c-caritem-l">上车地点</view>
<view class="box-c-caritem-r" @click="goopenlocation(x.DepartLonlat)" style="display: flex;align-items: flex-start;justify-content: flex-end;"> <view
class="box-c-caritem-r"
@click="goopenlocation(x.DepartLonlat, x.DepartAddress)"
style="
display: flex;
align-items: flex-start;
justify-content: flex-end;
"
>
<u-icon name="location-o" size="34"></u-icon> <u-icon name="location-o" size="34"></u-icon>
{{x.DepartAddress}} {{ x.DepartAddress }}
</view> </view>
</view> </view>
<view class="box-c-caritem"> <view class="box-c-caritem">
<view class="box-c-caritem-l">下车地点</view> <view class="box-c-caritem-l">下车地点</view>
<view class="box-c-caritem-r" @click="goopenlocation(x.ArriveLonlat)" style="display: flex;align-items: flex-start;justify-content: flex-end;"> <view
class="box-c-caritem-r"
@click="goopenlocation(x.ArriveLonlat, x.ArriveAddress)"
style="
display: flex;
align-items: flex-start;
justify-content: flex-end;
"
>
<u-icon name="location-o" size="34"></u-icon> <u-icon name="location-o" size="34"></u-icon>
{{x.ArriveAddress}} {{ x.ArriveAddress }}
</view> </view>
</view> </view>
<view class="xian"></view> <view class="xian"></view>
<view class="box-c-caritem"> <view class="box-c-caritem">
<view class="box-c-caritem-l">出行时间</view> <view class="box-c-caritem-l">出行时间</view>
<view class="box-c-caritem-r">{{x.Date}} {{x.DepartureTime}}</view> <view class="box-c-caritem-r"
>{{ x.Date }} {{ x.DepartureTime }}</view
>
</view> </view>
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">单价</view> <view class="box-c-caritem-l">单价</view>
<view class="box-c-caritem-r">￥{{x.Unit_Price}}元</view> <view class="box-c-caritem-r">￥{{ x.Unit_Price }}元</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="box-center" v-if="OrderInfo.OrderType == 4"> <view class="box-center" v-if="OrderInfo.OrderType == 4">
<view class="box-c-car"> <view class="box-c-car">
<view class="box-c-caritem" v-if="OrderInfo.CarList[0].PeopleNumber>0"> <view
class="box-c-caritem"
v-if="OrderInfo.CarList[0].PeopleNumber > 0"
>
<view class="box-c-caritem-l">成人</view> <view class="box-c-caritem-l">成人</view>
<view class="box-c-caritem-r">{{OrderInfo.CarList[0].PeopleNumber}}人</view> <view class="box-c-caritem-r"
>{{ OrderInfo.CarList[0].PeopleNumber }}人</view
>
</view> </view>
<view class="box-c-caritem" v-if="OrderInfo.CarList[0].ChildNumber>0"> <view class="box-c-caritem" v-if="OrderInfo.CarList[0].ChildNumber > 0">
<view class="box-c-caritem-l">儿童</view> <view class="box-c-caritem-l">儿童</view>
<view class="box-c-caritem-r">{{OrderInfo.CarList[0].ChildNumber}}人</view> <view class="box-c-caritem-r"
>{{ OrderInfo.CarList[0].ChildNumber }}人</view
>
</view> </view>
</view> </view>
</view> </view>
<view class="box-center"> <view class="box-center">
<view class="box-c-car"> <view class="box-c-car">
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">联系人</view> <view class="box-c-caritem-l">联系人</view>
<view class="box-c-caritem-r">{{OrderInfo.Consignee}}</view> <view class="box-c-caritem-r">{{ OrderInfo.Consignee }}</view>
</view> </view>
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">联系电话</view> <view class="box-c-caritem-l">联系电话</view>
<view class="box-c-caritem-r">{{OrderInfo.Mobile}}</view> <view class="box-c-caritem-r">{{ OrderInfo.Mobile }}</view>
</view> </view>
<view class="box-c-caritem" v-if="OrderInfo.BuyerMessage && OrderInfo.BuyerMessage!=''"> <view
class="box-c-caritem"
v-if="OrderInfo.BuyerMessage && OrderInfo.BuyerMessage != ''"
>
<view class="box-c-caritem-l">留言</view> <view class="box-c-caritem-l">留言</view>
<view class="box-c-caritem-r">{{OrderInfo.BuyerMessage}}</view> <view class="box-c-caritem-r">{{ OrderInfo.BuyerMessage }}</view>
</view> </view>
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">创建时间</view> <view class="box-c-caritem-l">创建时间</view>
<view class="box-c-caritem-r">{{OrderInfo.CreateDate}}</view> <view class="box-c-caritem-r">{{ OrderInfo.CreateDate }}</view>
</view> </view>
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">付款方式</view> <view class="box-c-caritem-l">付款方式</view>
<view class="box-c-caritem-r">{{OrderInfo.PaymentWayName}}</view> <view class="box-c-caritem-r">{{ OrderInfo.PaymentWayName }}</view>
</view> </view>
<!-- <view class="box-c-caritem" > <!-- <view class="box-c-caritem" >
<view class="box-c-caritem-l">应收</view> <view class="box-c-caritem-l">应收</view>
<view class="box-c-caritem-r">￥{{OrderInfo.PreferPrice}}元</view> <view class="box-c-caritem-r">￥{{OrderInfo.PreferPrice}}元</view>
</view> --> </view> -->
<view class="box-c-caritem" > <view class="box-c-caritem">
<view class="box-c-caritem-l">金额</view> <view class="box-c-caritem-l">金额</view>
<view class="box-c-caritem-r"><span style='color:#F20707'>￥{{OrderInfo.Income}}元</span></view> <view class="box-c-caritem-r"
><span style="color: #f20707"
>￥{{ OrderInfo.Income }}元</span
></view
>
</view> </view>
</view> </view>
</view> </view>
<view style='width: 100%;height: 80px;'></view> <view style="width: 100%; height: 80px"></view>
<view class="btn-box" > <view class="btn-box">
<view class="kefu" style="position: relative;" > <view class="kefu" style="position: relative">
<u-icon name="service-o" color="#111" size="24rpx"></u-icon> <u-icon name="service-o" color="#111" size="24rpx"></u-icon>
<span style='margin-left: 3px;'>客服</span> <span style="margin-left: 3px">客服</span>
<button open-type="contact" class="contButton" ></button> <button open-type="contact" class="contButton"></button>
</view> </view>
<view class="item" v-if="OrderInfo.OrderStatus==1 "> <view class="item" v-if="OrderInfo.OrderStatus == 1">
<u-button shape="circle" size="medium" @click.stop="queren(OrderInfo)" :custom-style="customStyle2" >待付款</u-button> <u-button
</view> shape="circle"
<view class="item" v-if="OrderInfo.OrderStatus==3|| OrderInfo.OrderStatus==4||OrderInfo.OrderStatus==5"> size="medium"
<u-button shape="circle" size="medium" @click.stop="onemoreorder(OrderInfo)" :custom-style="customStyle2" >再来一单</u-button> @click.stop="queren(OrderInfo)"
</view> :custom-style="customStyle2"
<view @click.stop="getCancel(OrderInfo)" class="item" v-if="OrderInfo.IsApplyForCancel!=1 && (OrderInfo.OrderStatus==1||OrderInfo.OrderStatus==2 ||OrderInfo.OrderStatus==3)&& getquxiao(OrderInfo)"> >待付款</u-button
<u-button shape="circle" size="medium" :custom-style="customStyle" >取消订单</u-button> >
</view>
<view
class="item"
v-if="
OrderInfo.OrderStatus == 3 ||
OrderInfo.OrderStatus == 4 ||
OrderInfo.OrderStatus == 5
"
>
<u-button
shape="circle"
size="medium"
@click.stop="onemoreorder(OrderInfo)"
:custom-style="customStyle2"
>再来一单</u-button
>
</view>
<view
@click.stop="getCancel(OrderInfo)"
class="item"
v-if="
OrderInfo.IsApplyForCancel != 1 &&
(OrderInfo.OrderStatus == 1 ||
OrderInfo.OrderStatus == 2 ||
OrderInfo.OrderStatus == 3) &&
getquxiao(OrderInfo)
"
>
<u-button shape="circle" size="medium" :custom-style="customStyle"
>取消订单</u-button
>
</view> </view>
<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;" v-if="OrderInfo.OrderStatus == 4"> <view
class="item"
style="
line-height: 34px;
font-size: 16px;
color: gray;
font-weight: 600;
"
v-if="OrderInfo.OrderStatus == 4"
>
已取消 已取消
</view> </view>
<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;" v-if="OrderInfo.OrderStatus == 5"> <view
class="item"
style="
line-height: 34px;
font-size: 16px;
color: gray;
font-weight: 600;
"
v-if="OrderInfo.OrderStatus == 5"
>
待处理 待处理
</view> </view>
</view> </view>
<u-popup v-model="showModal" mode="center" length="80%"> <u-popup v-model="showModal" mode="center" length="80%">
<view style='display: flex;flex-direction: column;align-items: center;background: #fff;'> <view
<view style="display: flex;align-items: center;justify-content: center;height:70px ;"> style="
display: flex;
flex-direction: column;
align-items: center;
background: #fff;
"
>
<view
style="
display: flex;
align-items: center;
justify-content: center;
height: 70px;
"
>
<Text>是否取消订单？</Text> <Text>是否取消订单？</Text>
</view> </view>
<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='OrderInfo.OrderStatus!=1'> <view
<Text style='margin-left: 10px;margin-top: 5px;'>备注</Text> style="
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="Cancelmsg.Remark" placeholder="输入备注" /> display: flex;
</view> flex-direction: column;
<view style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;"> height: 80px;
<view style="width: 50%;display: flex;align-items: center;justify-content: center" @click="showModal=false"> margin-left: 15px;
width: 100%;
"
v-if="OrderInfo.OrderStatus != 1"
>
<Text style="margin-left: 10px; margin-top: 5px">备注</Text>
<input
class="uni-input inputM"
style="margin-left: 10px; margin-top: 5px"
v-model="Cancelmsg.Remark"
placeholder="输入备注"
/>
</view>
<view
style="
display: flex;
flex-direction: row;
align-items: center;
height: 50px;
border-top: 1px solid #f5f5f5;
width: 100%;
"
>
<view
style="
width: 50%;
display: flex;
align-items: center;
justify-content: center;
"
@click="showModal = false"
>
<Text>取消</Text> <Text>取消</Text>
</view> </view>
<view style="width: 50%;color: #2979ff;display: flex;align-items: center;justify-content: center" @click="confirm"> <view
style="
width: 50%;
color: #2979ff;
display: flex;
align-items: center;
justify-content: center;
"
@click="confirm"
>
<Text>确定</Text> <Text>确定</Text>
</view> </view>
</view> </view>
...@@ -380,228 +586,249 @@ ...@@ -380,228 +586,249 @@
</template> </template>
<script> <script>
export default{ export default {
data(){ data() {
return{ return {
pageTitle: "我的订单", pageTitle: "我的订单",
mainColor: '', mainColor: "",
OrderId:0, OrderId: 0,
OrderInfo:{},//详情数据 OrderInfo: {}, //详情数据
customStyle: { customStyle: {
marginLeft: "20px", marginLeft: "20px",
padding: "0 30rpx", padding: "0 30rpx",
}, },
customStyle2:{ customStyle2: {
marginLeft: "20px", marginLeft: "20px",
padding: "0 30rpx", padding: "0 30rpx",
background: '#111111', background: "#111111",
color:'#FFF' color: "#FFF",
}, },
Cancelmsg:{ Cancelmsg: {
OrderId:0, OrderId: 0,
Type:0, Type: 0,
Remark:'', Remark: "",
}, },
showModal:false, showModal: false,
} };
}, },
onLoad(options) { onLoad(options) {
if(options && options.OrderId){ if (options && options.OrderId) {
this.OrderId = options.OrderId; this.OrderId = options.OrderId;
this.getMyOrderInfo() this.getMyOrderInfo();
} }
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
methods:{ methods: {
getMyOrderInfo(){ getMyOrderInfo() {
this.request2({ this.request2(
url: '/api/AppletOrder/GetMyDmcOrderInfo', {
data: {OrderId:this.OrderId} url: "/api/AppletOrder/GetMyDmcOrderInfo",
data: { OrderId: this.OrderId },
}, },
res => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.OrderInfo = res.data this.OrderInfo = res.data;
} }
}, },
err => { (err) => {}
}
); );
}, },
goopenlocation(x){ goopenlocation(x, addr) {
console.log(y);
uni.openLocation({ uni.openLocation({
latitude: Number(x.split(',')[1]) , latitude: Number(x.split(",")[1]),
longitude: Number(x.split(',')[0]), longitude: Number(x.split(",")[0]),
name: addr,
address: addr,
success: function () { success: function () {
console.log('success'); console.log("success");
},
fail: function (err) {
console.log(err);
}, },
fail:function(err){
console.log(err)
}
}); });
}, },
getIconLink(url){//https的处理 getIconLink(url) {
let str= '' //https的处理
if (url && url != '') { let str = "";
if (url.indexOf('https') != -1) { if (url && url != "") {
str = url if (url.indexOf("https") != -1) {
str = url;
} else { } else {
str = url.replace(/^http:\/\//i,'https://'); str = url.replace(/^http:\/\//i, "https://");
} }
return str; return str;
} }
}, },
getquxiao(item){//判断是否显示取消 getquxiao(item) {
let show = true //判断是否显示取消
if(item.OrderType==1){//酒店 let show = true;
show = this.getquxiaoshow(item.HotelList) if (item.OrderType == 1) {
}else if(item.OrderType==2){//餐食 //酒店
show = this.getquxiaoshow(item.DiningList) show = this.getquxiaoshow(item.HotelList);
} else if (item.OrderType == 2) {
}else if(item.OrderType==3){//景点 //餐食
show = this.getquxiaoshow(item.TicketList) show = this.getquxiaoshow(item.DiningList);
}else if(item.OrderType==4){//专车 } else if (item.OrderType == 3) {
show = this.getquxiaoshow(item.CarList) //景点
} show = this.getquxiaoshow(item.TicketList);
return show } else if (item.OrderType == 4) {
//专车
show = this.getquxiaoshow(item.CarList);
}
return show;
}, },
getquxiaoshow(list){ getquxiaoshow(list) {
let show = true; let show = true;
list.map(x=>{ list.map((x) => {
if(new Date() >= new Date(x.Date)){ if (new Date() >= new Date(x.Date)) {
show = false; show = false;
return return;
} }
}) });
return show return show;
}, },
getCancel(e){//取消订单 getCancel(e) {
//取消订单
this.showModal = true; this.showModal = true;
this.Cancelmsg.Remark = '', (this.Cancelmsg.Remark = ""), (this.Cancelmsg.OrderId = e.OrderId);
this.Cancelmsg.OrderId = e.OrderId;
this.Cancelmsg.Type = e.OrderStatus; this.Cancelmsg.Type = e.OrderStatus;
}, },
getCancel(e,index){//取消订单 getCancel(e, index) {
//取消订单
this.showModal = true; this.showModal = true;
this.Cancelmsg.Remark = '', (this.Cancelmsg.Remark = ""), (this.index = index);
this.index = index;
this.item = e; this.item = e;
this.Cancelmsg.OrderId = e.OrderId; this.Cancelmsg.OrderId = e.OrderId;
this.Cancelmsg.Type = e.OrderStatus; this.Cancelmsg.Type = e.OrderStatus;
}, },
queren(data){ queren(data) {
let url='/api/WeChatPay/GetDmcPayInfo' let url = "/api/WeChatPay/GetDmcPayInfo";
let GoodsName = '' let GoodsName = "";
if(data.OrderType==1){ if (data.OrderType == 1) {
GoodsName = data.HotelList[0].HotelName GoodsName = data.HotelList[0].HotelName;
}else if(data.OrderType==2){ } else if (data.OrderType == 2) {
GoodsName = data.DiningList[0].MealName GoodsName = data.DiningList[0].MealName;
}else if(data.OrderType==3){ } else if (data.OrderType == 3) {
GoodsName = data.TicketList[0].TicketName GoodsName = data.TicketList[0].TicketName;
}else if(data.OrderType==4){ } else if (data.OrderType == 4) {
GoodsName = data.CarList[0].DepartAddress+'-'+data.CarList[0].ArriveCityName GoodsName =
} data.CarList[0].DepartAddress + "-" + data.CarList[0].ArriveCityName;
GoodsName = GoodsName.slice(0, 10) }
this.request2({ GoodsName = GoodsName.slice(0, 10);
this.request2(
{
url: url, url: url,
data: { data: {
OrderId:data.OrderId, OrderId: data.OrderId,
GoodsName:GoodsName, GoodsName: GoodsName,
OrderPayType:1, OrderPayType: 1,
OpenId:uni.getStorageSync('mall_UserInfo').OpenId, OpenId: uni.getStorageSync("mall_UserInfo").OpenId,
} },
}, },
res => { (res) => {
let orderInfo = JSON.parse(res.data); let orderInfo = JSON.parse(res.data);
console.log(orderInfo) console.log(orderInfo);
this.Pay(orderInfo) this.Pay(orderInfo);
} }
); );
}, },
Pay(orderInfo){ Pay(orderInfo) {
let that=this; let that = this;
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', provider: "wxpay",
timeStamp: orderInfo.timeStamp, timeStamp: orderInfo.timeStamp,
nonceStr: orderInfo.nonceStr, nonceStr: orderInfo.nonceStr,
package: orderInfo.package, package: orderInfo.package,
signType: orderInfo.signType, signType: orderInfo.signType,
paySign: orderInfo.sign, paySign: orderInfo.sign,
success: function(res) { success: function (res) {
console.log('success', res); console.log("success", res);
uni.showToast({ uni.showToast({
title: "支付成功" title: "支付成功",
}) });
// that.getMyOrderInfo() // that.getMyOrderInfo()
uni.redirectTo({ uni.redirectTo({
url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.OrderInfo.PreferPrice url:
"/pages/jiuzhai/paysuccess?PreferPrice=" +
that.OrderInfo.PreferPrice,
}); });
}, },
fail: function(err) { fail: function (err) {
console.log('fail:', err); console.log("fail:", err);
uni.showToast({ uni.showToast({
title: "支付失败", title: "支付失败",
icon:'none' icon: "none",
})
}
}); });
}, },
confirm(){//确认取消 });
let that = this },
if (that.Cancelmsg.Type != 1 && that.Cancelmsg.Remark == '') { confirm() {
//确认取消
let that = this;
if (that.Cancelmsg.Type != 1 && that.Cancelmsg.Remark == "") {
uni.showToast({ uni.showToast({
title: '备注不能为空', title: "备注不能为空",
icon: 'none' icon: "none",
}) });
return return;
} }
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: [], tmplIds: [],
complete(res) { complete(res) {
that.request2({ that.request2(
url: '/api/AppletOrder/CancelAppletMyOrder', {
data: that.Cancelmsg url: "/api/AppletOrder/CancelAppletMyOrder",
data: that.Cancelmsg,
}, },
(res) => { (res) => {
that.showModal = false; that.showModal = false;
that.getMyOrderInfo() that.getMyOrderInfo();
} }
); );
}
})
}, },
onemoreorder(data){//再来一单的处理 });
},
onemoreorder(data) {
//再来一单的处理
if(data.OrderType==1){//酒店 if (data.OrderType == 1) {
//酒店
uni.navigateTo({ uni.navigateTo({
url: '/pages/hotel/list?Name='+data.HotelList[0].HotelName, url: "/pages/hotel/list?Name=" + data.HotelList[0].HotelName,
}) });
}else if(data.OrderType==2){//餐厅 } else if (data.OrderType == 2) {
//餐厅
uni.navigateTo({ uni.navigateTo({
url: '/pages/restaurant/list?Name='+data.DiningList[0].DiningName, url: "/pages/restaurant/list?Name=" + data.DiningList[0].DiningName,
}) });
}else if(data.OrderType==3){//门票 } else if (data.OrderType == 3) {
//门票
uni.navigateTo({ uni.navigateTo({
url: '/pages/ticketCoupons/list?Name='+data.TicketList[0].TitekCounponName, url:
}) "/pages/ticketCoupons/list?Name=" +
}else if(data.OrderType==4){//车 data.TicketList[0].TitekCounponName,
});
} else if (data.OrderType == 4) {
//车
let obj = { let obj = {
StartCityId:data.CarList[0].StartCityId, StartCityId: data.CarList[0].StartCityId,
StartCityType:data.CarList[0].StartCityType, StartCityType: data.CarList[0].StartCityType,
ArriveCityId:data.CarList[0].ArriveCityId, ArriveCityId: data.CarList[0].ArriveCityId,
ArriveCityType:data.CarList[0].ArriveCityType, ArriveCityType: data.CarList[0].ArriveCityType,
StartCityName:data.CarList[0].StartCityName, StartCityName: data.CarList[0].StartCityName,
ArriveCityName:data.CarList[0].ArriveCityName, ArriveCityName: data.CarList[0].ArriveCityName,
} };
console.log(obj) console.log(obj);
uni.navigateTo({ uni.navigateTo({
url: '/pages/guidecar/index?obj='+encodeURIComponent(JSON.stringify(obj)), url:
}) "/pages/guidecar/index?obj=" +
encodeURIComponent(JSON.stringify(obj)),
});
} }
}, },
paste(value) { paste(value) {
...@@ -609,8 +836,8 @@ ...@@ -609,8 +836,8 @@
data: value, data: value,
}); });
}, },
} },
} };
</script> </script>
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