Commit cc3f53b8 authored by 黄奎's avatar 黄奎

1

parent 6fcd69df
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view> <view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
</view> </view>
<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon> <coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
<template v-show="setting&&setting.is_show_auth==1"> <template v-if="setting&&setting.is_show_auth&& setting.is_show_auth==1">
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</template> </template>
<!-- <official-account></official-account> --> <!-- <official-account></official-account> -->
...@@ -425,12 +425,14 @@ ...@@ -425,12 +425,14 @@
let set = uni.getStorageSync("basedata") ? let set = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").mall.setting : {}; uni.getStorageSync("basedata").mall.setting : {};
this.setting = set;
if (!uni.getStorageSync("add_top_app")) { if (!uni.getStorageSync("add_top_app")) {
uni.setStorageSync("add_top_app", { uni.setStorageSync("add_top_app", {
add_top_app_show: 1, add_top_app_show: 1,
}); });
} }
this.setting = set;
this.add_show = uni.getStorageSync("add_top_app") ? this.add_show = uni.getStorageSync("add_top_app") ?
uni.getStorageSync("add_top_app").add_top_app_show : uni.getStorageSync("add_top_app").add_top_app_show :
1; 1;
...@@ -537,34 +539,7 @@ ...@@ -537,34 +539,7 @@
}, },
methods: { methods: {
getunilogin(res) {
let that = this;
//静默登录操作
uni.login({
provider: "weixin",
success: (info) => {
let obj = {
Name: res.userInfo.nickName,
Photo: res.userInfo.avatarUrl,
code: info.code,
};
that.getCode(obj);
},
fail: () => {
uni.showToast({
title: "微信登录授权失败",
icon: "none",
});
if (!that.u) {
that.u = {
nickName: "未登录",
avatarUrl: "",
};
that.showAuth = true;
}
},
});
},
//获取IsOpenReserve //获取IsOpenReserve
getIsOpenReserve() { getIsOpenReserve() {
this.request2({ this.request2({
...@@ -644,6 +619,34 @@ ...@@ -644,6 +619,34 @@
}, },
}); });
}, },
getunilogin(res) {
let that = this;
//静默登录操作
uni.login({
provider: "weixin",
success: (info) => {
let obj = {
Name: res.userInfo.nickName,
Photo: res.userInfo.avatarUrl,
code: info.code,
};
that.getCode(obj);
},
fail: () => {
uni.showToast({
title: "微信登录授权失败",
icon: "none",
});
if (!that.u) {
that.u = {
nickName: "未登录h",
avatarUrl: "",
};
that.showAuth = true;
}
},
});
},
//调用获取code //调用获取code
getCode(obj) { getCode(obj) {
var that = this; var that = this;
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<scroll-view scroll-y="true" style="height: 1px; flex: 1; box-sizing: border-box" @scroll="scroll"> <scroll-view scroll-y="true" style="height: 1px; flex: 1; box-sizing: border-box" @scroll="scroll">
<view class="jz_TopImg"> <view class="jz_TopImg">
<view class="media" :style="{ opacity: 100 - boxOption + '%' }"> <view class="media" :style="{ opacity: 100 - boxOption + '%' }">
<u-swiper :list="dataList.tempImgCover" :effect3d="false" :height="535" :interval="5000" <u-swiper :list="dataList.tempImgCover" :effect3d="false" :height="535" :interval="5000" :border-radius="0" @click="openPicture"
:border-radius="0" @click="openPicture" name="Url"></u-swiper> name="Url"></u-swiper>
<view class="media-info"> <view class="media-info">
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center">
<view class="mi-left"> <view class="mi-left">
...@@ -23,13 +23,11 @@ ...@@ -23,13 +23,11 @@
</view> </view>
</view> </view>
</view> </view>
<view class="sharebox" <view class="sharebox" v-if=" hideshare == false && shareData && shareData.IsShow && (shareData.Data.MaxShare>0|| shareData.Data.MyBuyCommission>0)"
v-if=" hideshare == false && shareData && shareData.IsShow && (shareData.Data.MaxShare>0|| shareData.Data.MyBuyCommission>0)" :style="{top:topheight+'px'}">
:style="{top:topheight+'px'}">
</view> </view>
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<view @click="goback" :style="[titleStyle, { opacity: '100% !important' }]" <view @click="goback" :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">
<u-icon name="arrow-left" size="44" color="#FFF" style="margin-top: 22rpx"></u-icon> <u-icon name="arrow-left" size="44" color="#FFF" style="margin-top: 22rpx"></u-icon>
</view> </view>
<!-- #endif --> <!-- #endif -->
...@@ -40,15 +38,13 @@ ...@@ -40,15 +38,13 @@
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
<!-- #endif --> <!-- #endif -->
</view> </view>
<view <view style="margin-left: 30rpx;text-align: left;width: 60vw;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; "
style="margin-left: 30rpx;text-align: left;width: 60vw;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; " class="name-ali">{{ dataList.title }}</view>
class="name-ali">{{ dataList.title }}</view>
</view> </view>
</view> </view>
<view class="jz_TopPrice"> <view class="jz_TopPrice">
<view class="jz_LineTitle"> <view class="jz_LineTitle">
<text class="jz_renmin">¥</text><text <text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text> <text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
</view> </view>
<view class="jz_MainTitle"> <view class="jz_MainTitle">
...@@ -70,8 +66,7 @@ ...@@ -70,8 +66,7 @@
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
"> ">
<text <text v-if="dataList.startCityName || (dataList.currentPriceInfo.priceUnion && dataList.currentPriceInfo.priceUnion.startCityName)">{{
v-if="dataList.startCityName || (dataList.currentPriceInfo.priceUnion && dataList.currentPriceInfo.priceUnion.startCityName)">{{
dataList.currentPriceInfo.priceUnion && dataList.currentPriceInfo.priceUnion.startCityName?dataList.currentPriceInfo.priceUnion.startCityName:dataList.startCityName dataList.currentPriceInfo.priceUnion && dataList.currentPriceInfo.priceUnion.startCityName?dataList.currentPriceInfo.priceUnion.startCityName:dataList.startCityName
}}</text>出发 }}</text>出发
</text> </text>
...@@ -87,19 +82,16 @@ ...@@ -87,19 +82,16 @@
"></span> "></span>
</span> </span>
</view> </view>
<view @click="showStartCities=true" <view @click="showStartCities=true" style="font-size: 12px;padding:5px;display: flex; align-items: center;" v-if="startCities && startCities.length>1">
style="font-size: 12px;padding:5px;display: flex; align-items: center;" <span style="width:4px;height: 4px;background-color: #ff3166;border-radius: 4px;display: inline-block;"></span>
v-if="startCities && startCities.length>1">
<span
style="width:4px;height: 4px;background-color: #ff3166;border-radius: 4px;display: inline-block;"></span>
<text style="margin:0 5px">选择其它出发城市</text> <text style="margin:0 5px">选择其它出发城市</text>
<u-icon name="arrow" color="#000" size="28"></u-icon> <u-icon name="arrow" color="#000" size="28"></u-icon>
</view> </view>
</view> </view>
<view style="display: flex; overflow-x: auto"> <view style="display: flex; overflow-x: auto">
<template v-for="(item, pindex) in dataList.priceList"> <template v-for="(item, pindex) in dataList.priceList">
<view class="jz_StartList" v-if="pindex < 3" :class="{ active: delMsg.tcid == item.tcid }" <view class="jz_StartList" v-if="pindex < 3" :class="{ active: delMsg.tcid == item.tcid }" @click="getDayInfo(item)"
@click="getDayInfo(item)" :key="pindex"> :key="pindex">
<view class="jz_StartTop">{{ getMonth(item.startDate) }} </view> <view class="jz_StartTop">{{ getMonth(item.startDate) }} </view>
<view class="jz_StartHoubu" v-if="item.remainNum > 0"> <view class="jz_StartHoubu" v-if="item.remainNum > 0">
<text></text> <text></text>
...@@ -112,8 +104,8 @@ ...@@ -112,8 +104,8 @@
</view> </view>
</view> </view>
</template> </template>
<view class="jz_StartList" v-if="dataList.priceList.length > 3" <view class="jz_StartList" v-if="dataList.priceList.length > 3" :class="{ active: delMsg.tcid == customerDate.tcid }"
:class="{ active: delMsg.tcid == customerDate.tcid }" @click="openDate"> @click="openDate">
<view class="jz_StartTop" v-if="customerDate.startDate"> <view class="jz_StartTop" v-if="customerDate.startDate">
{{ customerDate.startDate ? getMonth(customerDate.startDate) : "" }} {{ customerDate.startDate ? getMonth(customerDate.startDate) : "" }}
</view> </view>
...@@ -123,8 +115,7 @@ ...@@ -123,8 +115,7 @@
</view> </view>
<view style="color: #ff3166; font-size: 26rpx" v-if="customerDate.b2BPrice"> <view style="color: #ff3166; font-size: 26rpx" v-if="customerDate.b2BPrice">
¥{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</view> ¥{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</view>
<view v-if="!customerDate.startDate" <view v-if="!customerDate.startDate" style="height: 100%;width: 100%; display: flex; align-items: center;justify-content: center;">
style="height: 100%;width: 100%; display: flex; align-items: center;justify-content: center;">
<view style="font-size: 24rpx; color: #999999">更多<br />班期</view> <view style="font-size: 24rpx; color: #999999">更多<br />班期</view>
</view> </view>
</view> </view>
...@@ -132,15 +123,12 @@ ...@@ -132,15 +123,12 @@
</view> </view>
<view class="jz_TripDays" style="display: none"> <view class="jz_TripDays" style="display: none">
<span style="display: inline-block; position: relative"> <span style="display: inline-block; position: relative">
<text <text style="position: relative;z-index: 2;color: #1f1f1f;font-size: 36rpx;font-weight: bold;">摘要</text>
style="position: relative;z-index: 2;color: #1f1f1f;font-size: 36rpx;font-weight: bold;">摘要</text> <span style="width:40px;background-color:#dfbe6e;height: 6px;bottom: 2px;left: 0; right: 0;position: absolute;z-index: 1;"></span>
<span
style="width:40px;background-color:#dfbe6e;height: 6px;bottom: 2px;left: 0; right: 0;position: absolute;z-index: 1;"></span>
</span> </span>
<view class="jz_ZhaiTitle"> <text class="jz_Dian"></text>住宿 </view> <view class="jz_ZhaiTitle"> <text class="jz_Dian"></text>住宿 </view>
<view class="jz_ZhaiInner"> {{ dataList.nightNum }}晚酒店 </view> <view class="jz_ZhaiInner"> {{ dataList.nightNum }}晚酒店 </view>
<template <template v-if="dataList.feature && dataList.feature.shopRemarkText != null && dataList.feature.shopRemarkText != ''">
v-if="dataList.feature && dataList.feature.shopRemarkText != null && dataList.feature.shopRemarkText != ''">
<view class="jz_ZhaiTitle"> <text class="jz_Dian"></text>购物 </view> <view class="jz_ZhaiTitle"> <text class="jz_Dian"></text>购物 </view>
<view class="jz_ZhaiInner"> <view class="jz_ZhaiInner">
{{ dataList.feature.shopRemarkText }} {{ dataList.feature.shopRemarkText }}
...@@ -160,8 +148,7 @@ ...@@ -160,8 +148,7 @@
</view> </view>
<view class="jz_Zhankai" style="display: none">展开全部</view> <view class="jz_Zhankai" style="display: none">展开全部</view>
</view> </view>
<view class="jz_TripDays" <view class="jz_TripDays" v-if="dataList.currentPriceInfo.priceFlight &&dataList.currentPriceInfo.priceFlight.length > 0">
v-if="dataList.currentPriceInfo.priceFlight &&dataList.currentPriceInfo.priceFlight.length > 0">
<span style=" <span style="
display: inline-block; display: inline-block;
position: relative; position: relative;
...@@ -187,8 +174,7 @@ ...@@ -187,8 +174,7 @@
</span> </span>
<view class="jz_TripMain"> <view class="jz_TripMain">
<view> <view>
<view class="jz_Flight" v-for="(fItem, fIndex) in dataList.currentPriceInfo.priceFlight" <view class="jz_Flight" v-for="(fItem, fIndex) in dataList.currentPriceInfo.priceFlight" :key="fIndex">
:key="fIndex">
<view class="jz_FlightItem"> <view class="jz_FlightItem">
<view style="width: 150rpx"> <view style="width: 150rpx">
<view class="jz_FlightTitle">{{ fItem.departureAirPortName }}</view> <view class="jz_FlightTitle">{{ fItem.departureAirPortName }}</view>
...@@ -196,17 +182,14 @@ ...@@ -196,17 +182,14 @@
</view> </view>
<view class="jz_FlightIcon"> <view class="jz_FlightIcon">
<view style="display: flex; align-items: center; font-size: 24rpx"> <view style="display: flex; align-items: center; font-size: 24rpx">
<img v-if="fItem.trafficType == 1" style="width: 30rpx; height: 30rpx" <img v-if="fItem.trafficType == 1" style="width: 30rpx; height: 30rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/airfly.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/airfly.png" alt="" />
alt="" /> <img v-if="fItem.trafficType == 2" style="width: 30rpx; height: 30rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/train.png"
<img v-if="fItem.trafficType == 2" style="width: 30rpx; height: 30rpx" alt="" />
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/train.png"
alt="" />
<view style="margin-left: 10rpx">{{ fItem.flightNumber }}</view> <view style="margin-left: 10rpx">{{ fItem.flightNumber }}</view>
</view> </view>
<view class="jz_Arrow"> <view class="jz_Arrow">
<img style="width: 110rpx; height: 8rpx" <img style="width: 110rpx; height: 8rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/b_arrow.png" />
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/b_arrow.png" />
</view> </view>
<view class="jz_StartDate"> <view class="jz_StartDate">
{{ getFlightDay(fItem.startDate) }} {{ getFlightDay(fItem.startDate) }}
...@@ -221,8 +204,7 @@ ...@@ -221,8 +204,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="jz_TripDays" <view class="jz_TripDays" v-if="dataList.feature && dataList.feature.tripImageList && dataList.feature.tripImageList.length > 0">
v-if="dataList.feature && dataList.feature.tripImageList && dataList.feature.tripImageList.length > 0">
<span style=" <span style="
display: inline-block; display: inline-block;
position: relative; position: relative;
...@@ -247,8 +229,8 @@ ...@@ -247,8 +229,8 @@
"></span> "></span>
</span> </span>
<view class="jz_TripMain" style="margin:0 -22px;"> <view class="jz_TripMain" style="margin:0 -22px;">
<image v-for="x in dataList.feature.tripImageList" :src="x" mode="widthFix" <image v-for="x in dataList.feature.tripImageList" :src="x" mode="widthFix" @click='previewTravelPicHandler(x,dataList.feature.tripImageList)'
@click='previewTravelPicHandler(x,dataList.feature.tripImageList)' style="width: 100%"></image> style="width: 100%"></image>
</view> </view>
</view> </view>
<view class="jz_TripDays" v-if="dataList.dayList && dataList.dayList.length > 0"> <view class="jz_TripDays" v-if="dataList.dayList && dataList.dayList.length > 0">
...@@ -399,8 +381,7 @@ ...@@ -399,8 +381,7 @@
<view v-for="(x,i) in d" :key="i"> <view v-for="(x,i) in d" :key="i">
<view style="font-size: 32rpx;font-family: nav-font;font-weight: 600;display: flex;"> <view style="font-size: 32rpx;font-family: nav-font;font-weight: 600;display: flex;">
<text>第 {{(i+1)}} 天</text> <text>第 {{(i+1)}} 天</text>
<text <text style="flex:1;width:1px;margin-left:10px;font-family: microsoft yahei ui light; line-height: 1;">
style="flex:1;width:1px;margin-left:10px;font-family: microsoft yahei ui light; line-height: 1;">
{{x.title}} {{x.title}}
</text> </text>
</view> </view>
...@@ -428,8 +409,7 @@ ...@@ -428,8 +409,7 @@
<view class="right"> <view class="right">
<view class="tag-play"> <view class="tag-play">
<view class="subtitle" style="flex: 1;">景点/场馆</view> <view class="subtitle" style="flex: 1;">景点/场馆</view>
<view class="tag-play-box" <view class="tag-play-box" v-if="y.childItem.playTimeHour > 0 || y.childItem.playTimeMinutes > 0">
v-if="y.childItem.playTimeHour > 0 || y.childItem.playTimeMinutes > 0">
<view class="remark">推荐游玩</view> <view class="remark">推荐游玩</view>
<view class="play-time"> <view class="play-time">
<span v-if="y.childItem.playTimeHour > 0">{{ y.childItem.playTimeHour }} <span v-if="y.childItem.playTimeHour > 0">{{ y.childItem.playTimeHour }}
...@@ -445,8 +425,7 @@ ...@@ -445,8 +425,7 @@
<rich-text :nodes="y.childItem.description"></rich-text> <rich-text :nodes="y.childItem.description"></rich-text>
<view class="sec-images"> <view class="sec-images">
<template v-for="(z,zi) in y.childItem.imaArray"> <template v-for="(z,zi) in y.childItem.imaArray">
<image @click="previewImages(y.childItem.imaArray,zi)" :src="z.url" <image @click="previewImages(y.childItem.imaArray,zi)" :src="z.url" mode="aspectFill" v-if="zi<3" :key="zi"></image>
mode="aspectFill" v-if="zi<3" :key="zi"></image>
</template> </template>
</view> </view>
</view> </view>
...@@ -467,8 +446,7 @@ ...@@ -467,8 +446,7 @@
<rich-text :nodes="y.childItem.description"></rich-text> <rich-text :nodes="y.childItem.description"></rich-text>
<view class="sec-images"> <view class="sec-images">
<template v-for="(z,zi) in y.childItem.imaArray"> <template v-for="(z,zi) in y.childItem.imaArray">
<image @tap="previewImages(y.childItem.imaArray,zi)" :src="z.url" <image @tap="previewImages(y.childItem.imaArray,zi)" :src="z.url" mode="aspectFill" v-if="zi<3" :key="zi"></image>
mode="aspectFill" v-if="zi<3" :key="zi"></image>
</template> </template>
</view> </view>
</view> </view>
...@@ -487,8 +465,7 @@ ...@@ -487,8 +465,7 @@
<rich-text :nodes="y.childItem.description"></rich-text> <rich-text :nodes="y.childItem.description"></rich-text>
<view class="sec-images"> <view class="sec-images">
<template v-for="(z,zi) in y.childItem.imaArray"> <template v-for="(z,zi) in y.childItem.imaArray">
<image @tap="previewImages(y.childItem.imaArray,zi)" :src="z.url" <image @tap="previewImages(y.childItem.imaArray,zi)" :src="z.url" mode="aspectFill" v-if="zi<3" :key="zi"></image>
mode="aspectFill" v-if="zi<3" :key="zi"></image>
</template> </template>
</view> </view>
</view> </view>
...@@ -507,8 +484,7 @@ ...@@ -507,8 +484,7 @@
<rich-text :nodes="y.childItem.description"></rich-text> <rich-text :nodes="y.childItem.description"></rich-text>
<view class="sec-images"> <view class="sec-images">
<template v-for="(z,zi) in y.childItem.imaArray"> <template v-for="(z,zi) in y.childItem.imaArray">
<image @tap="previewImages(y.childItem.imaArray,zi)" :src="z.url" <image @tap="previewImages(y.childItem.imaArray,zi)" :src="z.url" mode="aspectFill" v-if="zi<3" :key="zi"></image>
mode="aspectFill" v-if="zi<3" :key="zi"></image>
</template> </template>
</view> </view>
</view> </view>
...@@ -519,11 +495,9 @@ ...@@ -519,11 +495,9 @@
</view> </view>
</view> </view>
<view style="padding-bottom: 22px;background-color: #FFF;" <view style="padding-bottom: 22px;background-color: #FFF;" v-if="dataList.feature.detailsImageList && d.length>0">
v-if="dataList.feature.detailsImageList && d.length>0"> <image :src="x" @click='previewTravelPicHandler(x,dataList.feature.detailsImageList)' mode="widthFix" style="width: 100%;height: auto;margin-bottom: 10px;"
<image :src="x" @click='previewTravelPicHandler(x,dataList.feature.detailsImageList)' mode="widthFix" v-for="x in dataList.feature.detailsImageList"></image>
style="width: 100%;height: auto;margin-bottom: 10px;"
v-for="x in dataList.feature.detailsImageList"></image>
</view> </view>
<view class="jz_TripDays" v-if="dataList.feature && dataList.feature.feeInclude"> <view class="jz_TripDays" v-if="dataList.feature && dataList.feature.feeInclude">
<span style=" <span style="
...@@ -612,8 +586,7 @@ ...@@ -612,8 +586,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
自费项目 自费项目
</view> </view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" <view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;background: #FFF;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;background: #FFF;">
{{x.itemName}} {{x.itemName}}
</view> </view>
</view> </view>
...@@ -621,8 +594,7 @@ ...@@ -621,8 +594,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
城市 城市
</view> </view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" <view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.cityName}} {{x.cityName}}
</view> </view>
</view> </view>
...@@ -630,8 +602,7 @@ ...@@ -630,8 +602,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
预估费用 预估费用
</view> </view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" <view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.estimatedCost}} {{x.estimatedCost}}
</view> </view>
</view> </view>
...@@ -639,8 +610,7 @@ ...@@ -639,8 +610,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
说明 说明
</view> </view>
<view v-for="(x,i) in dataList.selfpayingList" :key="i" <view v-for="(x,i) in dataList.selfpayingList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.explain}} {{x.explain}}
</view> </view>
</view> </view>
...@@ -735,8 +705,7 @@ ...@@ -735,8 +705,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
购物店名称 购物店名称
</view> </view>
<view v-for="(x,i) in dataList.shopList" :key="i" <view v-for="(x,i) in dataList.shopList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;background: #FFF;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;background: #FFF;">
{{x.shopName}} {{x.shopName}}
</view> </view>
</view> </view>
...@@ -744,8 +713,7 @@ ...@@ -744,8 +713,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
城市 城市
</view> </view>
<view v-for="(x,i) in dataList.shopList" :key="i" <view v-for="(x,i) in dataList.shopList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.cityName}} {{x.cityName}}
</view> </view>
</view> </view>
...@@ -753,8 +721,7 @@ ...@@ -753,8 +721,7 @@
<view style="padding:10px;background-color: #eaeaea;"> <view style="padding:10px;background-color: #eaeaea;">
参观时长 参观时长
</view> </view>
<view v-for="(x,i) in dataList.shopList" :key="i" <view v-for="(x,i) in dataList.shopList" :key="i" style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
style="white-space: nowrap;padding:10px;border-bottom:1px solid #eaeaea;">
{{x.visitTime}} {{x.visitTime}}
</view> </view>
</view> </view>
...@@ -849,13 +816,10 @@ ...@@ -849,13 +816,10 @@
<!-- <view class="jz_TripDays" style="width:100%;height:50rpx;background-color: transparent;"> <!-- <view class="jz_TripDays" style="width:100%;height:50rpx;background-color: transparent;">
</view> --> </view> -->
<u-popup v-model="showDateChosen" mode="bottom" border-radius="20" length="90%" <u-popup v-model="showDateChosen" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
:safe-area-inset-bottom="true"> <canlendar @finish="chosenDateResult" :defaultDate="currentPrice.startDate" :priceList="dataList.priceList"></canlendar>
<canlendar @finish="chosenDateResult" :defaultDate="currentPrice.startDate"
:priceList="dataList.priceList"></canlendar>
</u-popup> </u-popup>
<u-popup v-model="showOrderPreviwe" mode="bottom" border-radius="20" length="90%" <u-popup v-model="showOrderPreviwe" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
:safe-area-inset-bottom="true">
<view style=" <view style="
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -863,8 +827,8 @@ ...@@ -863,8 +827,8 @@
flex-direction: column; flex-direction: column;
"> ">
<view style="flex: 1; width: 100%; height: 1rpx"> <view style="flex: 1; width: 100%; height: 1rpx">
<canlendar @finish="chosenDateResult" :immediately="true" :defaultDate="currentPrice.startDate" <canlendar @finish="chosenDateResult" :immediately="true" :defaultDate="currentPrice.startDate" :priceList="dataList.priceList"
:priceList="dataList.priceList" title="确定日期和人数"></canlendar> title="确定日期和人数"></canlendar>
</view> </view>
<view style="background: #ecf1f4; padding: 20rpx 0"> <view style="background: #ecf1f4; padding: 20rpx 0">
<view class="line-flex" style="padding: 30rpx; background: #fff"> <view class="line-flex" style="padding: 30rpx; background: #fff">
...@@ -875,8 +839,7 @@ ...@@ -875,8 +839,7 @@
margin-left: 30rpx; margin-left: 30rpx;
flex: 1; flex: 1;
">18周岁以上</text> ">18周岁以上</text>
<u-number-box size="28" :min="1" :max="currentPrice.remainNum - etCount - etbCount" <u-number-box size="28" :min="1" :max="currentPrice.remainNum - etCount - etbCount" @change="crChange" v-model="crCount"></u-number-box>
@change="crChange" v-model="crCount"></u-number-box>
</view> </view>
<view class="line-flex" style="padding: 30rpx; background: #fff"> <view class="line-flex" style="padding: 30rpx; background: #fff">
<text style="font-size: 28rpx; color: #111; font-weight: 500">儿童(占床)</text> <text style="font-size: 28rpx; color: #111; font-weight: 500">儿童(占床)</text>
...@@ -886,8 +849,7 @@ ...@@ -886,8 +849,7 @@
margin-left: 30rpx; margin-left: 30rpx;
flex: 1; flex: 1;
">2-18周岁(不含)</text> ">2-18周岁(不含)</text>
<u-number-box size="28" :min="0" :max="currentPrice.remainNum - crCount - etbCount" <u-number-box size="28" :min="0" :max="currentPrice.remainNum - crCount - etbCount" @change="etChange" v-model="etCount"></u-number-box>
@change="etChange" v-model="etCount"></u-number-box>
</view> </view>
<view class="line-flex" style="padding: 30rpx; background: #fff"> <view class="line-flex" style="padding: 30rpx; background: #fff">
<text style="font-size: 28rpx; color: #111; font-weight: 500">儿童(不占床)</text> <text style="font-size: 28rpx; color: #111; font-weight: 500">儿童(不占床)</text>
...@@ -897,8 +859,7 @@ ...@@ -897,8 +859,7 @@
margin-left: 30rpx; margin-left: 30rpx;
flex: 1; flex: 1;
">2-18周岁(不含)</text> ">2-18周岁(不含)</text>
<u-number-box size="28" :min="0" :max="currentPrice.remainNum - crCount - etCount" <u-number-box size="28" :min="0" :max="currentPrice.remainNum - crCount - etCount" @change="etbChange" v-model="etbCount"></u-number-box>
@change="etbChange" v-model="etbCount"></u-number-box>
</view> </view>
<view class="line-flex" style="padding: 30rpx; background: #fff"> <view class="line-flex" style="padding: 30rpx; background: #fff">
<text style="font-size: 28rpx; color: #111; font-weight: 500">婴儿</text> <text style="font-size: 28rpx; color: #111; font-weight: 500">婴儿</text>
...@@ -908,8 +869,7 @@ ...@@ -908,8 +869,7 @@
margin-left: 30rpx; margin-left: 30rpx;
flex: 1; flex: 1;
">0-2周岁(不含)</text> ">0-2周岁(不含)</text>
<u-number-box size="28" @change="yeChange" :min="0" :max="crCount" <u-number-box size="28" @change="yeChange" :min="0" :max="crCount" v-model="yeCount"></u-number-box>
v-model="yeCount"></u-number-box>
</view> </view>
</view> </view>
<view class="jz_OrderDiv" style="box-shadow: none; width: 100%; padding: 20rpx"> <view class="jz_OrderDiv" style="box-shadow: none; width: 100%; padding: 20rpx">
...@@ -922,17 +882,15 @@ ...@@ -922,17 +882,15 @@
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center">
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<button open-type="contact" class="jz_ConButton"> <button open-type="contact" class="jz_ConButton">
<img style="width: 36rpx; height: 38rpx" <img style="width: 36rpx; height: 38rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png" alt="" />
alt="" />
<view style="color: #111111; font-size: 22rpx">客服</view> <view style="color: #111111; font-size: 22rpx">客服</view>
</button> </button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP-ALIPAY --> <!-- #ifdef MP-ALIPAY -->
<button class="jz_ConButton" style="margin-right: 20rpx"> <button class="jz_ConButton" style="margin-right: 20rpx">
<contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" <contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" icon="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png"
icon="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png" size="38rpx" :alipay-card-no="2088 + userId" :ext-info="appid">
size="38rpx" :alipay-card-no="2088 + userId" :ext-info="appid">
</contact-button> </contact-button>
<view style="color: #111111; font-size: 22rpx">客服</view> <view style="color: #111111; font-size: 22rpx">客服</view>
</button> </button>
...@@ -948,24 +906,21 @@ ...@@ -948,24 +906,21 @@
<view style="color: #ff3166; font-weight: bold"> <view style="color: #ff3166; font-weight: bold">
<text style="font-size: 22rpx">¥</text> <text style="font-size: 22rpx">¥</text>
<!-- b2b --> <!-- b2b -->
<text <text style="font-size: 40rpx;font-family: nav-font;">{{$utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice}}</text>
style="font-size: 40rpx;font-family: nav-font;">{{$utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice}}</text>
<text style="font-size: 22rpx">/起</text> <text style="font-size: 22rpx">/起</text>
</view> </view>
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center">
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<button @click="downloadTripPlanHandler" class="jz_ConButton" v-if="d.length>3"> <button @click="downloadTripPlanHandler" class="jz_ConButton" v-if="d.length>3">
<img style="width: 36rpx; height: 38rpx" <img style="width: 36rpx; height: 38rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1695376860000_131.png"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1695376860000_131.png" alt="" />
alt="" />
<view style="color: #111111; font-size: 22rpx">下载行程</view> <view style="color: #111111; font-size: 22rpx">下载行程</view>
</button> </button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP-ALIPAY --> <!-- #ifdef MP-ALIPAY -->
<button class="jz_ConButton" style="margin-right: 20rpx"> <button class="jz_ConButton" style="margin-right: 20rpx">
<contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" <contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" icon="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png"
icon="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/kefu.png" size="38rpx" :alipay-card-no="2088 + userId" :ext-info="appid">
size="38rpx" :alipay-card-no="2088 + userId" :ext-info="appid">
</contact-button> </contact-button>
<view style="color: #111111; font-size: 22rpx">客服</view> <view style="color: #111111; font-size: 22rpx">客服</view>
</button> </button>
...@@ -975,7 +930,7 @@ ...@@ -975,7 +930,7 @@
</view> </view>
</view> </view>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth&&is_show_auth==1" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<u-popup v-model="showStartCities" mode="bottom" border-radius="20" length="60%" :safe-area-inset-bottom="true"> <u-popup v-model="showStartCities" mode="bottom" border-radius="20" length="60%" :safe-area-inset-bottom="true">
<view style="display: flex;flex-direction: column;height:100%;width:100%;"> <view style="display: flex;flex-direction: column;height:100%;width:100%;">
<view style="font-size: 24px; font-weight: 700;padding: 20px;font-family: city-font;"> <view style="font-size: 24px; font-weight: 700;padding: 20px;font-family: city-font;">
...@@ -983,16 +938,13 @@ ...@@ -983,16 +938,13 @@
</view> </view>
<scroll-view scroll-y="true" style="width: 100%;height: 1px; flex: 1;"> <scroll-view scroll-y="true" style="width: 100%;height: 1px; flex: 1;">
<view style="padding:20px"> <view style="padding:20px">
<view @click="changeStartCity(x)" <view @click="changeStartCity(x)" :style="{'background': delMsg.cityId==x.StartCityId?'#DFBE6E':''}" style="padding:20px;display: flex;align-items: center;margin-bottom: 20px;box-shadow: 0px 0px 20px 0px rgba(76,87,125,0.2); border-radius: 8px;"
:style="{'background': delMsg.cityId==x.StartCityId?'#DFBE6E':''}" v-for="(x,i) in startCities">
style="padding:20px;display: flex;align-items: center;margin-bottom: 20px;box-shadow: 0px 0px 20px 0px rgba(76,87,125,0.2); border-radius: 8px;"
v-for="(x,i) in startCities">
<view style="font-size: 18px;font-family: city-font;width:1px;flex:1;">{{ x.StartCityName }} <view style="font-size: 18px;font-family: city-font;width:1px;flex:1;">{{ x.StartCityName }}
</view> </view>
<view style="color: #ff3166;"> <view style="color: #ff3166;">
<text class="jz_renmin">¥</text> <text class="jz_renmin">¥</text>
<text <text class="jz_B2bPrice">{{ $utils.getretailer()?(currentPrice.originalB2BPrice+x.BackAddPrice+x.GoAddPrice):(currentPrice.originalB2CPrice+x.BackAddPrice+x.GoAddPrice) }}</text>
class="jz_B2bPrice">{{ $utils.getretailer()?(currentPrice.originalB2BPrice+x.BackAddPrice+x.GoAddPrice):(currentPrice.originalB2CPrice+x.BackAddPrice+x.GoAddPrice) }}</text>
<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text> <text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
</view> </view>
</view> </view>
...@@ -1058,7 +1010,8 @@ ...@@ -1058,7 +1010,8 @@
topheight: 0, topheight: 0,
shareData: null, shareData: null,
isDownloading: false, isDownloading: false,
startCities: [] startCities: [],
is_show_auth: 0, //是否配置启用授权(1-开启)
}; };
}, },
created() {}, created() {},
...@@ -1096,7 +1049,12 @@ ...@@ -1096,7 +1049,12 @@
} }
this.getDetails(); this.getDetails();
this.U = uni.getStorageSync("mall_UserInfo"); this.U = uni.getStorageSync("mall_UserInfo");
let basedata = uni.getStorageSync("basedata");
//判断后台是否开启自动授权
if (basedata && basedata.mall && basedata.mall.setting && basedata.mall.setting && basedata.mall.setting.is_show_auth ==
1) {
this.is_show_auth = 1;
}
if (!this.U) { if (!this.U) {
this.U = { this.U = {
...@@ -1494,6 +1452,7 @@ ...@@ -1494,6 +1452,7 @@
avatarUrl: "", avatarUrl: "",
}; };
this.showAuth = true; this.showAuth = true;
this.is_show_auth = 1;
return; return;
} }
let myObj = {}; let myObj = {};
...@@ -2276,4 +2235,4 @@ ...@@ -2276,4 +2235,4 @@
height: 10vh; height: 10vh;
margin-right: 1px; margin-right: 1px;
} }
</style> </style>
\ No newline at end of file
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