Skip to content

J
jz_Travel
Commit 281db386 authored by 罗超's avatar 罗超
Browse files
Options

1

parent f6129446
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 741 additions and 682 deletions
pages/jiuzhai/jz_LineDetail.vue
View file @ 281db386
...@@ -981,7 +981,7 @@ export default { ...@@ -981,7 +981,7 @@ export default {
that.titleStyle = { that.titleStyle = {
height: "45px", height: "45px",
paddingTop: `${res.statusBarHeight}px`, paddingTop: `${res.statusBarHeight}px`,
opacity: "0%", opacity: "0",
}; };
}, },
}); });
...@@ -1042,11 +1042,13 @@ export default { ...@@ -1042,11 +1042,13 @@ 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;
console.log("1051", this.titleStyle.opacity);
this.$forceUpdate(); this.$forceUpdate();
}, },
//获取详情 //获取详情
...@@ -1055,14 +1057,11 @@ export default { ...@@ -1055,14 +1057,11 @@ export default {
"b2b_get_GetB2BTravelInfoNoDesV1", "b2b_get_GetB2BTravelInfoNoDesV1",
this.delMsg, this.delMsg,
(res) => { (res) => {
console.log(res, "详情");
if (res.resultCode == 1) { if (res.resultCode == 1) {
res.data.tempImgCover = JSON.parse(res.data.imgCover); res.data.tempImgCover = JSON.parse(res.data.imgCover);
// let tempPrice= res.data.priceList.filter(x=>x.remainNum>0) // let tempPrice= res.data.priceList.filter(x=>x.remainNum>0)
// res.data.priceList=tempPrice // res.data.priceList=tempPrice
this.dataList = res.data; this.dataList = res.data;
this.scenicNum = 0; this.scenicNum = 0;
this.dataList.dayList.forEach((x) => { this.dataList.dayList.forEach((x) => {
x.dayArray.forEach((y) => { x.dayArray.forEach((y) => {
...@@ -1098,21 +1097,31 @@ export default { ...@@ -1098,21 +1097,31 @@ export default {
this.finishFirstLoad = true; this.finishFirstLoad = true;
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
this.dataList.feature.feeInclude = parseHtml( if (this.dataList.feature.feeInclude) {
this.dataList.feature.feeInclude this.dataList.feature.feeInclude = parseHtml(
); this.dataList.feature.feeInclude
this.dataList.feature.feeNonInclude = parseHtml( );
this.dataList.feature.feeNonInclude }
); if (this.dataList.feature.feeNonInclude) {
this.dataList.feature.importantTip = parseHtml( this.dataList.feature.feeNonInclude = parseHtml(
this.dataList.feature.importantTip this.dataList.feature.feeNonInclude
); );
this.dataList.feature.warmTip = parseHtml( }
this.dataList.feature.warmTip if (this.dataList.feature.importantTip) {
); this.dataList.feature.importantTip = parseHtml(
this.dataList.feature.visaRemark = parseHtml( this.dataList.feature.importantTip
this.dataList.feature.visaRemark );
); }
if (this.dataList.feature.warmTip) {
this.dataList.feature.warmTip = parseHtml(
this.dataList.feature.warmTip
);
}
if (this.dataList.feature.visaRemark) {
this.dataList.feature.visaRemark = parseHtml(
this.dataList.feature.visaRemark
);
}
// #endif // #endif
} else { } else {
} }
......
pages/restaurant/components/buyNotice.vue
View file @ 281db386
<template> <template>
<view class="buy-notice-restaurant"> <view class="buy-notice-restaurant">
<view class="meal-info"> <view class="meal-info">
<image :src="mealData.MealPic" mode="aspectFit" class="MealPic"></image> <image :src="mealData.MealPic" mode="aspectFit" class="MealPic"></image>
<view class="right"> <view class="right">
<view class="name">{{mealData.MealName}}</view> <view class="name">{{ mealData.MealName }}</view>
<view class="sale">已售 {{mealData.SaleCount}}</view> <view class="sale">已售 {{ mealData.SaleCount }}</view>
</view> </view>
</view> </view>
<view class="ticket-title"> <view class="ticket-title">
套餐内容 套餐内容
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view class="meal-con"> <view class="meal-con">
<text v-if="mealData.MealDesc">{{mealData.MealDesc}}</text> <text v-if="mealData.MealDesc">{{ mealData.MealDesc }}</text>
<text v-else class="zanwu">暂无</text> <text v-else class="zanwu">暂无</text>
</view> </view>
<view class="ticket-title"> <view class="ticket-title">
购买须知 购买须知
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view class="buy-notice-con"> <view class="buy-notice-con">
<rich-text :nodes="mealData.OtherTag" v-if="mealData.OtherTag"></rich-text> <rich-text
<text v-else class="zanwu">暂无</text> :nodes="mealData.OtherTag"
</view> v-if="mealData.OtherTag"
<view class="btn-box"> ></rich-text>
<view class="price"> <text v-else class="zanwu">暂无</text>
<text class="price-pre">￥</text> </view>
{{$utils.getretailer()==true? mealData.LPriceB:mealData.LPriceC}} <view class="btn-box">
</view> <view class="price">
<view class="btn" @click="subscribe"> <text class="price-pre">￥</text>
立即预订 {{ $utils.getretailer() == true ? mealData.LPriceB : mealData.LPriceC }}
</view> </view>
</view> <view class="btn" @click="subscribe"> 立即预订 </view>
</view> </view>
</view>
</template> </template>
<script> <script>
export default{ // #ifdef MP-ALIPAY
props:{ import parseHtml from "../../../plugin/htmlparse.js";
mealData:{ // #endif
type:Object, export default {
default:{} props: {
} mealData: {
}, type: Object,
data(){ default: {},
return{ },
},
} mounted() {
}, // #ifdef MP-ALIPAY
methods:{ this.mealData.OtherTag = parseHtml(this.mealData.OtherTag);
subscribe(){ // #endif
this.$emit("success") },
} methods: {
} subscribe() {
} this.$emit("success");
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.buy-notice-restaurant{ .buy-notice-restaurant {
height: 70vh; height: 70vh;
padding: 45rpx 45rpx 120rpx 45rpx; padding: 45rpx 45rpx 120rpx 45rpx;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
.meal-info{ .meal-info {
display: flex; display: flex;
padding-bottom: 50rpx; padding-bottom: 50rpx;
border-bottom: 1rpx solid #E7E7E7; border-bottom: 1rpx solid #e7e7e7;
.MealPic{ .MealPic {
width: 129rpx; width: 129rpx;
height: 129rpx; height: 129rpx;
background-color: #DFBE6E; background-color: #dfbe6e;
border-radius: 20rpx; border-radius: 20rpx;
} }
.right{ .right {
flex-grow: 5; flex-grow: 5;
margin-left: 35rpx; margin-left: 35rpx;
.name{ .name {
font-size: 34rpx; font-size: 34rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #1B1D1E; color: #1b1d1e;
} }
.sale{ .sale {
width: 120rpx; width: 120rpx;
height: 40rpx; height: 40rpx;
background-color: #ECF1F4; background-color: #ecf1f4;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
text-align: center; text-align: center;
line-height: 38rpx; line-height: 38rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
} }
} }
.ticket-title { .ticket-title {
// width: 70rpx; // width: 70rpx;
height: 50rpx; height: 50rpx;
font-size: 34rpx; font-size: 34rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #1F1F1F; color: #1f1f1f;
background-color: transparent; background-color: transparent;
// line-height: 44rpx; // line-height: 44rpx;
position: relative; position: relative;
margin: 40rpx 0; margin: 40rpx 0;
.ticket-title-bg { .ticket-title-bg {
width: 70rpx; width: 70rpx;
height: 10rpx; height: 10rpx;
background-color: #DFBE6E; background-color: #dfbe6e;
border-radius: 4px; border-radius: 4px;
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 6rpx; bottom: 6rpx;
z-index: 1; z-index: 1;
opacity: 0.6; opacity: 0.6;
} }
} }
.meal-con{ .meal-con {
white-space: pre-wrap; white-space: pre-wrap;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
} }
.buy-notice-con{ .buy-notice-con {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 600; font-weight: 600;
color: #111111; color: #111111;
} }
.btn-box{ .btn-box {
position: fixed; position: fixed;
right: 55rpx; right: 55rpx;
bottom:100rpx; bottom: 100rpx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
.price{ .price {
font-size: 40rpx; font-size: 40rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #D91818; color: #d91818;
// line-height: 38rpx; // line-height: 38rpx;
.price-pre{ .price-pre {
font-size: 22rpx; font-size: 22rpx;
} }
} }
.btn{ .btn {
width: 300rpx; width: 300rpx;
height: 80rpx; height: 80rpx;
background-color: #111111; background-color: #111111;
border-radius: 20rpx; border-radius: 20rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #FFFFFF; color: #ffffff;
text-align: center; text-align: center;
line-height: 78rpx; line-height: 78rpx;
margin-left: 45rpx; margin-left: 45rpx;
} }
} }
} }
.zanwu{ .zanwu {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
} }
</style> </style>
pages/restaurant/order.vue
View file @ 281db386
This diff is collapsed.
plugin/api.js
View file @ 281db386
...@@ -2,8 +2,8 @@ export default { ...@@ -2,8 +2,8 @@ export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
Vue.prototype.host2 = "http://192.168.20.17:8020" // Vue.prototype.host2 = "http://192.168.20.17:8020"
// Vue.prototype.host2 = "https://erpmallapi.oytour.com" Vue.prototype.host2 = "https://erpmallapi.oytour.com"
//Vue.prototype.host3 = "http://192.168.20.24" //Vue.prototype.host3 = "http://192.168.20.24"
Vue.prototype.host3 = "https://reborn.oytour.com" Vue.prototype.host3 = "https://reborn.oytour.com"
...@@ -182,7 +182,14 @@ export default { ...@@ -182,7 +182,14 @@ export default {
let appObj = {}; let appObj = {};
let appType = 2; let appType = 2;
switch (appType) { switch (appType) {
case 2: //旅小友 case 1: //旅小友-支付宝
appObj = {
AppId: '2021002181604459',
TenantId: 12,
MallBaseId: 2,
};
break;
case 2: //旅小友-微信
appObj = { appObj = {
AppId: 'wxcf0727a7c78b501e', AppId: 'wxcf0727a7c78b501e',
TenantId: 12, TenantId: 12,
......
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