Commit be566b3d authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents 0dec3699 bf12641e
...@@ -382,6 +382,10 @@ ...@@ -382,6 +382,10 @@
"path":"components/guidecarDraw" "path":"components/guidecarDraw"
},{ },{
"path":"guidercarCommentList" "path":"guidercarCommentList"
},{
"path":"specialCarReserve"//专车预定
},{
"path":"map"
}] }]
}, },
{ {
...@@ -526,6 +530,14 @@ ...@@ -526,6 +530,14 @@
"path":"jz_LineDetail" //九寨-线路详情 "path":"jz_LineDetail" //九寨-线路详情
},{ },{
"path":"jz_Reserve" //线路-预定 "path":"jz_Reserve" //线路-预定
},{
"path":"jz_MyOrder" //线路-我的订单
},{
"path":"jz_SureOrder" //线路-确认订单
},{
"path":"allorderList"//统一订单
},{
"path":"allorderdetails"//统一订单详情
}] }]
}, },
//相亲分包 //相亲分包
...@@ -694,6 +706,9 @@ ...@@ -694,6 +706,9 @@
} }
},{ },{
"path": "imgList" "path": "imgList"
},
{
"path": "policyDetail"
} }
] ]
} }
......
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
<view style='margin-left: 3px;width: calc(100vw - 60px - 80px);'>{{x.Description}} <view style='margin-left: 3px;width: calc(100vw - 60px - 80px);'>{{x.Description}}
</view> </view>
</view> </view>
<view class="s-b-box-r" v-if="x.ProductState==1"> <view class="s-b-box-r" v-if="x.ProductState==1" @click="yuding(x)">
预定 预定
</view> </view>
...@@ -545,10 +545,7 @@ ...@@ -545,10 +545,7 @@
topdateList: [], topdateList: [],
DepartList: [], //出发点数组 DepartList: [], //出发点数组
ArriveList: [], //到达点数组 ArriveList: [], //到达点数组
timeList: [], //时间数组 alltime: [],//时间数组
alltime: ['不限', '00:00-03:00', '03:00-06:00', '06:00-09:00', '09:00-12:00',
'12:00-15:00', '15:00-18:00', '18:00-21:00', '21:00-24:00'
],
popuplist: [{ popuplist: [{
name: '出发地点' name: '出发地点'
}, { }, {
...@@ -568,7 +565,7 @@ ...@@ -568,7 +565,7 @@
}, },
onLoad(options) { onLoad(options) {
console.log(222)
if (options && options.carMsg) { if (options && options.carMsg) {
//对象解码 //对象解码
this.carMsg = JSON.parse(decodeURIComponent(options.carMsg)) this.carMsg = JSON.parse(decodeURIComponent(options.carMsg))
...@@ -588,7 +585,12 @@ ...@@ -588,7 +585,12 @@
}, },
methods: { methods: {
yuding(x){
uni.navigateTo({
url: '/pages/guidecar/specialCarReserve?Id='+x.Id +'&Date='+this.msg.Q_Date
})
},
popupchange(e) { //tab事件 popupchange(e) { //tab事件
this.popupcurrent = e; this.popupcurrent = e;
}, },
...@@ -761,7 +763,10 @@ ...@@ -761,7 +763,10 @@
this.DepartList = res.data.DepartList; this.DepartList = res.data.DepartList;
this.ArriveList = res.data.ArriveList; this.ArriveList = res.data.ArriveList;
this.DepartList.unshift('不限') this.DepartList.unshift('不限')
this.ArriveList.unshift('不限') this.ArriveList.unshift('不限')
this.alltime =['不限', '00:00-03:00', '03:00-06:00', '06:00-09:00', '09:00-12:00',
'12:00-15:00', '15:00-18:00', '18:00-21:00', '21:00-24:00'
]
}, },
err => { err => {
uni.hideLoading() uni.hideLoading()
...@@ -778,6 +783,10 @@ ...@@ -778,6 +783,10 @@
this.init(); this.init();
this.screenshow = false; this.screenshow = false;
this.$forceUpdate() this.$forceUpdate()
this.DepartList= [], //出发点数组
this.ArriveList= [], //到达点数组
this.alltime= [],//时间数组
this.getSelectCarSiteList()
}, },
queren(){ queren(){
this.msg.StartCityName = this.SMsg.depart; this.msg.StartCityName = this.SMsg.depart;
......
...@@ -281,10 +281,11 @@ ...@@ -281,10 +281,11 @@
} }
let carDate = new Date(); let carDate = new Date();
let carMonth = (carDate.getMonth() + 1)<10?'0'+(carDate.getMonth() + 1):(carDate.getMonth() + 1); let carMonth = (carDate.getMonth() + 1)<10?'0'+(carDate.getMonth() + 1):(carDate.getMonth() + 1);
this.carMsg.Q_Date = carDate.getFullYear() +'-'+carMonth+'-'+carDate.getDate(); let carDays = (carDate.getDate() )<10?'0'+(carDate.getDate() ):(carDate.getDate());
this.carMsg.Q_Date = carDate.getFullYear() +'-'+carMonth+'-'+carDays;
let carday = carDate.getDay(); let carday = carDate.getDay();
this.startDate = carDate.getFullYear() +'-'+carMonth+'-'+carDate.getDate();//从啥时候开始 this.startDate = carDate.getFullYear() +'-'+carMonth+'-'+carDays;//从啥时候开始
this.showcardate = carMonth+'-'+carDate.getDate(); this.showcardate = carMonth+'-'+carDays;
this.showweek = this.getweek(carday) //得到定制专车的周几 this.showweek = this.getweek(carday) //得到定制专车的周几
}, },
...@@ -295,6 +296,16 @@ ...@@ -295,6 +296,16 @@
this.amapPlugin = new amap.AMapWX({ this.amapPlugin = new amap.AMapWX({
key: this.key key: this.key
}); });
if(options && options.obj){
let carMsg = JSON.parse(decodeURIComponent(options.obj))
this.carMsg.StartCityId = carMsg.StartCityId
this.carMsg.StartCityType = carMsg.StartCityType
this.carMsg.ArriveCityId = carMsg.ArriveCityId
this.carMsg.ArriveCityType = carMsg.ArriveCityType
this.carMsg.StartCityName = carMsg.StartCityName
this.carMsg.ArriveCityName = carMsg.ArriveCityName
this.active = 1
}
}, },
methods: { methods: {
godingche(){//跳入订车页面 godingche(){//跳入订车页面
......
<template>
<view class="map">
<map id="navmap" style="width: 100%;height: 600px;" :markers="markers" :latitude="src_latitude" :longitude="src_longitude"
:hidden="false">
</map>
<view class="liststyle" v-if="details.type==1">
<view v-for='(x,y) in upcar' :key='y' class="liststyle-item" @click="goback(x)">
<view class="list-item1" :style="{color:details.SelectID == x.Id?mainColor:'#1B1D1E','font-weight':details.SelectID == x.Id?'bold':'400'}">{{x.Name}}</view>
<view class="list-item-t" :style="{color:details.SelectID == x.Id?mainColor:'#1B1D1E'}">{{x.SubName}}</view>
</view>
</view>
<view class="liststyle" v-if="details.type==2">
<view v-for='(x,y) in downcar' :key='y' class="liststyle-item" @click="goback(x)">
<view class="list-item1" :style="{color:details.SelectID == x.Id?mainColor:'#1B1D1E','font-weight':details.SelectID == x.Id?'bold':'400'}">{{x.Name}}</view>
<view class="list-item-t" :style="{color:details.SelectID == x.Id?mainColor:'#1B1D1E'}">{{x.SubName}}</view>
</view>
</view>
</view>
</template>
<script>
export default{
data(){
return{
pageTitle: "选择地点",
src_latitude:'30.628043',
src_longitude:'104.137580',
markers: [],
details:{},
upcar:[],
downcar:[],
mainColor:'',
}
},
onReady(){
let MapContext = wx.createMapContext('navmap', this);
let that = this;
},
onLoad(options) {
this.mainColor = this.$uiConfig.mainColor;
if(options && options.obj){
this.details = JSON.parse(decodeURIComponent(options.obj))
this.getdizhiList()
if(this.details.type==1){
this.pageTitle='选择出发点'
}else{
this.pageTitle='选择到达点'
}
}
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
methods:{
getdizhiList(){
this.upcar = []
this.downcar = []
this.details.SiteList.forEach(x=>{
if(x.Type == 1){
this.upcar.push(x)
}else{
this.downcar.push(x)
}
})
this.markers = [];
if(this.details.type == 1){
this.src_latitude = this.upcar[0].Lonlat.split(',')[1];
this.src_longitude = this.upcar[0].Lonlat.split(',')[0];
this.upcar.map(x=>{
let obj = {
id: x.Id,
iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png',
width: 22,
height: 33,
latitude:x.Lonlat.split(',')[1],
longitude:x.Lonlat.split(',')[0],
title:x.Name
}
this.markers.push(obj)
})
}else{
this.src_latitude = this.downcar[0].Lonlat.split(',')[1];
this.src_longitude = this.downcar[0].Lonlat.split(',')[0];
this.downcar.map(x=>{
let obj = {
id: x.Id,
iconPath: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dcdtbiaoji.png',
width: 22,
height: 33,
latitude:x.Lonlat.split(',')[1],
longitude:x.Lonlat.split(',')[0],
title:x.Name
}
this.markers.push(obj)
})
}
},
goback(x){
let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面
let that = this
uni.navigateBack({
success: function() {
beforePage.$vm.getbackData(that.details.type,x.Id); // 执行前一个页面的方法
}
});
}
}
}
</script>
<style>
.map{
width: 100%;
height: 100vh;
position: relative;
}
.liststyle{
width: 100%;
max-height: 165px;
position: absolute;
left: 0;
bottom: 0;
background: #FFF;
border-radius: 10px 10px 0px 0px;
padding: 10px 15px;
}
.liststyle-item{
padding: 5px 0;
font-size: 14px;
color: #1B1D1E;
border-bottom: 1px solid #E2E2E2;
}
.list-item{
}
.list-item-t{
font-size: 11px;margin-top: 3px;color: #999999;
}
</style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -307,8 +307,9 @@ ...@@ -307,8 +307,9 @@
} }
.jz_ConButton{ .jz_ConButton{
background-color: #fff; background-color: #fff;
height:45px; height:40px;
line-height: 20px; line-height: 18px;
margin-top:3px;
} }
.jz_ConButton::after{ .jz_ConButton::after{
border: none!important; border: none!important;
...@@ -319,7 +320,7 @@ ...@@ -319,7 +320,7 @@
<div class="jz_LineDetail"> <div class="jz_LineDetail">
<view class="jz_TopImg"> <view class="jz_TopImg">
<swiper indicator-dots :autoplay="false" :interval="1000" style="height:100%;"> <swiper indicator-dots :autoplay="false" :interval="1000" style="height:100%;">
<block v-for="(item, index) in getCoverImg(dataList.imgCover)" :key="index"> <block v-for="(item,cindex) in getCoverImg(dataList.imgCover)" :key="cindex">
<swiper-item> <swiper-item>
<!--<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url" <!--<video @click="startPlay(item)" style="width:100%;height:100%" id="myVideo" v-if="item.type==1" :src="item.pic_url"
:autoplay="false" loop muted show-play-btn :enable-progress-gesture="true" :autoplay="false" loop muted show-play-btn :enable-progress-gesture="true"
...@@ -369,7 +370,7 @@ ...@@ -369,7 +370,7 @@
</span> </span>
</view> </view>
<view style="display:flex;overflow-x: auto;"> <view style="display:flex;overflow-x: auto;">
<view class="jz_StartList" v-for="item in dataList.priceList" @click="getDayInfo(item)"> <view class="jz_StartList" v-for="(item,pindex) in dataList.priceList" @click="getDayInfo(item)" :key="pindex">
<view class="jz_StartTop">{{getMonth(item.startDate)}}{{item.remainNum}}</view> <view class="jz_StartTop">{{getMonth(item.startDate)}}{{item.remainNum}}</view>
<view class="jz_StartHoubu"> <view class="jz_StartHoubu">
{{item.isSubstitution==1?'可候补':'不可候补'}} {{item.isSubstitution==1?'可候补':'不可候补'}}
...@@ -418,20 +419,20 @@ ...@@ -418,20 +419,20 @@
</span> </span>
<view class="jz_TripMain"> <view class="jz_TripMain">
<view class="jz_TripLine"></view> <view class="jz_TripLine"></view>
<view v-for="(item,index) in dataList.dayList"> <view v-for="(item,index) in dataList.dayList" :key="index">
<view class="jz_TripTitle"> <view class="jz_TripTitle">
<view class="jz_TripLeft">第{{getDays(index+1)}}天</view> <view class="jz_TripLeft">第{{getDays(index+1)}}天</view>
<view class="jz_TripRight"></view> <view class="jz_TripRight"></view>
</view> </view>
<view class="jz_RightInner"> <view class="jz_RightInner">
<view v-for="subItem in item.dayArray" v-if="subItem.type==7"> <view v-for="(subItem,SubIndex) in item.dayArray" v-if="subItem.type==7" :key="SubIndex">
<view class="jz_Place"> <view class="jz_Place">
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text>{{subItem.childItem.title}}</text> <text>{{subItem.childItem.title}}</text>
</view> </view>
</view> </view>
<template v-for="subItem in item.dayArray" v-if="subItem.type==2"> <template v-for="(subItem,index2) in item.dayArray" v-if="subItem.type==2">
<view class="jz_ImgDiv"> <view class="jz_ImgDiv" :key="index2">
<img mode="aspectFill" :src="subItem.childItem.imaArray[0].url" alt=""> <img mode="aspectFill" :src="subItem.childItem.imaArray[0].url" alt="">
</view> </view>
<view class="jz_Place" style="align-items: center;"> <view class="jz_Place" style="align-items: center;">
...@@ -452,16 +453,16 @@ ...@@ -452,16 +453,16 @@
</template> </template>
<view class="jz_Place">温馨提示</view> <view class="jz_Place">温馨提示</view>
<view class="jz_Rermark"> <view class="jz_Rermark">
<template v-for="subItem in item.dayArray" v-if="subItem.type==6"> <template v-for="(subItem,sIndex) in item.dayArray" v-if="subItem.type==6">
{{subItem.childItem.descriptionText}} <text :key="sIndex">{{subItem.childItem.descriptionText}}</text>
</template> </template>
</view> </view>
<view class="jz_Place"> <view class="jz_Place">
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text class="jz_Canyin">餐饮</text> <text class="jz_Canyin">餐饮</text>
<text class="jz_CanInner"> <text class="jz_CanInner">
<template v-for="subItem in item.dayArray" v-if="subItem.type==4"> <template v-for="(subItem,sIndex2) in item.dayArray" v-if="subItem.type==4">
<text style="margin-right:20px;" v-if="subItem.childItem.useDinnerType=='1'">{{subItem.childItem.dinnerName}}</text> <text style="margin-right:20px;" :key="sIndex2" v-if="subItem.childItem.useDinnerType=='1'">{{subItem.childItem.dinnerName}}</text>
<text style="margin-right:20px;" v-if="subItem.childItem.useDinnerType=='2'">{{subItem.childItem.dinnerName}}</text> <text style="margin-right:20px;" v-if="subItem.childItem.useDinnerType=='2'">{{subItem.childItem.dinnerName}}</text>
<text v-if="subItem.childItem.useDinnerType=='3'">{{subItem.childItem.dinnerName}}</text> <text v-if="subItem.childItem.useDinnerType=='3'">{{subItem.childItem.dinnerName}}</text>
</template> </template>
...@@ -471,8 +472,8 @@ ...@@ -471,8 +472,8 @@
<view class="jz_ComDian"></view> <view class="jz_ComDian"></view>
<text class="jz_Canyin">酒店</text> <text class="jz_Canyin">酒店</text>
<text class="jz_CanInner"> <text class="jz_CanInner">
<template v-for="subItem in item.dayArray" v-if="subItem.type==3"> <template v-for="(subItem,sIndex3) in item.dayArray" v-if="subItem.type==3">
<text>{{subItem.childItem.hotelName}}<text v-if="index!=dataList.dayList.length-1" style="margin:0 5px;">/</text></text> <text :key="sIndex3">{{subItem.childItem.hotelName}}<text v-if="index!=dataList.dayList.length-1" style="margin:0 5px;">/</text></text>
</template> </template>
<text v-if="index!=dataList.dayList.length-1">或同级</text> <text v-if="index!=dataList.dayList.length-1">或同级</text>
</text> </text>
...@@ -594,8 +595,16 @@ ...@@ -594,8 +595,16 @@
}, },
//立即预定 //立即预定
goReserce(){ goReserce(){
let myCurrentInfo = this.dataList.currentPriceInfo;
myCurrentInfo.startCityName = this.dataList.startCityName;
let imgCover = JSON.parse(this.dataList.imgCover);
if(imgCover.length>0){
myCurrentInfo.CoverImg = imgCover[0].Url;
}
let myCurr = JSON.stringify(myCurrentInfo);
console.log(myCurrentInfo,'myCurrentInfo');
uni.navigateTo({ uni.navigateTo({
url: "/pages/jiuzhai/jz_Reserve" url: "/pages/jiuzhai/jz_Reserve?currentPriceInfo="+encodeURIComponent(myCurr)
}); });
} }
}, },
......
<style>
.jz_MyOrder {
height: 100vh;
background-color: #ECF1F4;
}
/* .jz_MyOrderMain{
background-color: #ECF1F4;
}
*/
.jz_OrderList {
width: 100%;
min-height: 334rpx;
background-color: #fff;
border-radius: 20px;
padding: 30px;
margin-bottom: 15px;
position: relative;
}
.jz_OrderList:first-child {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.jz_OrderTop {
display: flex;
align-items: center;
position: relative;
padding-bottom: 27rpx;
border-bottom: 1px solid #E6E6E6;
}
.jz_Oleft {
color: #111111;
font-size: 32rpx;
font-weight: bold;
width: 70%;
height: 25px;
overflow: hidden;
}
.jz-Oright {
color: #111111;
font-size: 24rpx;
position: absolute;
right: 0;
}
.jz_MyOrder_img {
width: 100rpx;
height: 100rpx;
margin-top: 20px;
border-radius: 20rpx;
overflow: hidden;
}
.jz_MyOrder_img img {
width: 100%;
height: 100%;
}
.jz_XiaDan {
margin-left: 25rpx;
color: #333333;
font-size: 24rpx;
margin-top: 20px;
}
.jz_Zailai {
position: absolute;
right: 40rpx;
bottom: 40rpx;
background-color: #111111;
border-radius: 16px;
width: 150rpx;
height: 60rpx;
text-align: center;
color: #fff;
line-height: 60rpx;
font-size: 24rpx;
}
.isShowAll {
height: auto;
}
</style>
<template>
<view class="jz_MyOrder">
<u-tabs :list="list" :is-scroll="false" :current="current" :active-color="mainColor" @change="change"></u-tabs>
<u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty>
<template v-else>
<view class="jz_MyOrderMain" style="height: calc(100vh - 44px);overflow: hidden;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="jz_OrderList" v-for="(item,index) in dataList" :key="index">
<view class="jz_OrderTop">
<view class="jz_Oleft" :class="{'isShowAll':!item.isShowHalf}">
{{item.title}}
</view>
<view style="margin-left:10px;">
<u-icon name="arrow-down" @click="getShow(item)" v-if="item.isShowHalf" color="#2979ff" size="28"></u-icon>
<u-icon name="arrow-up" @click="getShow(item)" v-else color="#2979ff" size="28"></u-icon>
</view>
<view class="jz-Oright">
{{item.orderStateName}}
</view>
</view>
<view style="display:flex;">
<view class="jz_MyOrder_img">
<img mode='aspectFill' :src="getFirstImg(item.imgCover)" alt="" />
</view>
<view class="jz_XiaDan">
<view>下单时间:{{item.createDate}}</view>
<view style="margin-top:22rpx;">付款总额:¥{{item.preferPrice}}</view>
</view>
</view>
<view class="jz_Zailai" @click="gojz_List">再来一单</view>
</view>
</scroll-view>
</view>
</template>
</view>
</template>
<script>
export default {
components: {
},
data() {
return {
pageTitle: '我的订单',
msg: {
pageIndex: 1,
pageSize: 15,
MiniAppUserId: 0
},
mainColor: "",
list: [{
name: '全部'
}, {
name: '待付款'
}, {
name: '未使用'
}],
current: 0,
dataList: [],
page_count: 0,
loadText: {
loadmore: "轻轻上拉,加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
status: "加载中",
};
},
created() {
this.getOrderInfo();
},
onLoad(option) {
this.mainColor = this.$uiConfig.mainColor;
},
methods: {
change(val) {
},
//获取第一张图
getFirstImg(obj) {
if (obj) {
let objArr = JSON.parse(obj);
return objArr[0].Url;
}
},
getShow(item) {
item.isShowHalf = !item.isShowHalf;
this.$forceUpdate();
},
//跳转
gojz_List() {
uni.navigateTo({
url: "/pages/jiuzhai/jz_Line"
});
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.getOrderInfo();
} else {
this.status = "nomore";
}
},
getOrderInfo() {
this.userInfo = uni.getStorageSync('mall_UserInfo');
this.msg.MiniAppUserId = this.userInfo.UserId
this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg,
res => {
if (res.resultCode == 1) {
console.log(res, '数据');
this.dataList = this.dataList.concat(res.data.pageData);
this.dataList.forEach(x => {
x.isShowHalf = true;
})
this.page_count = res.data.pageCount;
} else {
}
},
null
);
}
}
};
</script>
<style> <style>
.jz_ReserTop {
width: 100%;
min-height: 300rpx;
box-shadow: 0px 2px 15px 0px rgba(76, 76, 76, 0.13);
background-color: #fff;
border-bottom-left-radius: 60rpx;
border-bottom-right-radius: 60rpx;
padding: 40rpx;
}
.jz_ReserTitle {
color: #111111;
font-weight: bold;
font-size: 36rpx;
}
.jz_ReserIn {
color: #999999;
font-size: 24rpx;
}
.jz_ReseQue {
color: #DFBE6E;
font-size: 24rpx;
padding-top: 30rpx;
border-top: 1px solid #E7E7E7;
margin-top: 20px;
}
.jz_ReseQue img {
width: 16px;
height: 14px;
position: relative;
top: 2px;
margin-right: 5px;
}
.jz_ReseOrder {
padding: 40rpx;
}
.jz_ReDix {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.jz_RedixTitle {
width: 90px;
flex-shrink: 0;
}
.jz_OrderDiv {
position: fixed;
width: 90%;
height: 100rpx;
background-color: #fff;
margin: auto;
bottom: 20px;
padding: 20rpx;
left: 40rpx;
display: flex;
justify-content: space-between;
align-items: center;
box-shadow: 0px 10px 30px 0px rgba(36, 36, 36, 0.2);
border-radius: 16px;
z-index: 999;
}
.jz_OrderReNow {
width: 150rpx;
height: 80rpx;
background-color: #111111;
text-align: center;
line-height: 80rpx;
color: #fff;
font-weight: bold;
font-size: 28rpx;
border-radius: 16rpx;
}
</style> </style>
<template> <template>
<view class="jz_Reserve"> <view class="jz_Reserve">
<view class="jz_ReserTop">
<view class="jz_ReserTitle">
{{currentPriceInfo.title}}
</view>
<view class="jz_ReserIn" style="margin:33rpx 0 18rpx 0">
{{currentPriceInfo.startCityName}}出发 {{currentPriceInfo.startDate}}
</view>
<view class="jz_ReseQue">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zuanshi.png" />即时确认:本产品付款后可快速确认,放心期待您的旅行
</view>
</view>
<view class="jz_ReseOrder">
<view class="jz_ReDix">
<view class="jz_RedixTitle">成人:</view>
<u-number-box v-model="orderMsg.ManNum" :input-width="300" :input-height="60" @change="changeMan()"></u-number-box>
</view>
<view class="jz_ReDix">
<view class="jz_RedixTitle">儿童不占床:</view>
<u-number-box v-model="orderMsg.ChirdNoBedNum" :input-width="300" :input-height="60" @change="changeChirdNoBedNum()"></u-number-box>
</view>
<view class="jz_ReDix">
<view class="jz_RedixTitle">儿童占床:</view>
<u-number-box v-model="orderMsg.ChirdNeedBedNum" :input-width="300" :input-height="60" @change="changeChirdNeedBedNum()"></u-number-box>
</view>
<view class="jz_ReDix">
<view class="jz_RedixTitle">婴儿:</view>
<u-number-box v-model="orderMsg.BabyNum" :input-width="300" :input-height="60" @change="changeBabyNum()"></u-number-box>
</view>
</view>
<view class="jz_OrderDiv">
<view style="color:#FF3166;font-weight:bold;">
<text style="font-size:22rpx;">¥</text>
<text style="font-size:40rpx;margin:0 20rpx 0 5rpx;">{{price}}</text>
<text style="color:#6E6E6E;font-size:24rpx;">共计{{total}}</text>
</view>
<view style="display:flex;margin-top:-2px;">
<view class="jz_OrderReNow" @click="goPay()">下单</view>
</view>
</view>
</view> </view>
</template> </template>
<script> <script>
</script> export default {
components: {
<style> },
</style> data() {
return {
pageTitle: '订单填写',
orderMsg: {
ManNum: 0, //成人
ChirdNoBedNum: 0, //儿童不占床
ChirdNeedBedNum: 0, //儿童占床
BabyNum: 0, //婴儿
ChirdNum: 0, //儿童数量
},
price: 0,
currentPriceInfo: {},
total: 0,
YSeatNum:0,
ESeatNum: 0,
FSeatNum: 0,
sumSeat:0,
userInfo:{}
};
},
created() {},
onLoad(option) {
if (option.currentPriceInfo) {
this.currentPriceInfo = JSON.parse(decodeURIComponent(option.currentPriceInfo))
}
},
methods: {
//改变成人
changeMan(e) {
this.orderMsg.ManNum = e.value;
this.calcMoney();
},
//改变儿童不占床
changeChirdNoBedNum(e) {
this.orderMsg.ChirdNoBedNum = e.value;
this.calcMoney();
},
//改变儿童占床
changeChirdNeedBedNum(e) {
this.orderMsg.ChirdNeedBedNum = e.value;
this.calcMoney();
},
//改变婴儿
changeBabyNum(e) {
this.orderMsg.BabyNum = e.value;
this.calcMoney();
},
//计算价格
calcMoney() {
console.log("orderMsg", this.orderMsg)
var price = this.currentPriceInfo.b2BMemberPrice;
this.orderMsg.ChirdNum = parseInt(this.orderMsg.ChirdNoBedNum) + parseInt(this.orderMsg.ChirdNeedBedNum);
//计算总人数
this.total = parseInt(this.orderMsg.ManNum) + parseInt(this.orderMsg.ChirdNum);
this.sumSeat = this.total;
let money = price * this.orderMsg.ManNum
money += price * this.orderMsg.ChirdNum
money += this.currentPriceInfo.babyChargePrice * this.orderMsg.ChirdNeedBedNum
money += this.currentPriceInfo.babyPrice * this.orderMsg.BabyNum
money += this.currentPriceInfo.childNeedPrice * this.orderMsg.ChirdNeedBedNum
if (this.orderMsg.ChirdNoBedNum > 0) {
money -= this.currentPriceInfo.childNoNeedPrice * this.orderMsg.ChirdNoBedNum
}
this.price = money
},
//去支付
goPay() {
this.userInfo = uni.getStorageSync('mall_UserInfo');
let msg = {
OrderId: 0,
TCID: this.currentPriceInfo.tcid,
CustomerType: 1,
GroupType: 1,
ContactName: '陕西中旅南二环分公司',
ContactMobile: '18602977416',
CustomerId: '49',
DepartureCityId: 262,
IsIntermodal: 2,
Unit_Price: this.currentPriceInfo.b2BMemberPrice,
TC_Price: this.currentPriceInfo.b2BMemberPrice,
ManNum: this.orderMsg.ManNum,
ChirdNum: this.orderMsg.ChirdNum,
ChirdNeedBedNum: this.orderMsg.ChirdNeedBedNum,
BabyNum: this.orderMsg.BabyNum,
OldPeopleNum: 0,
SingleRoomNum: 0,
PreferPrice: this.price,
YSeatNum: this.total,
ESeatNum: 0,
FSeatNum: 0,
Commission: 0, //todo 提成
ClientSource: 2,
BrandId: 0,
TradeWay: 0,
PlatformOrder: '',
GuestNum: this.orderMsg.ManNum + this.orderMsg.ChirdNum,
IsChildrenTour: this.currentPriceInfo.isSupportChildren,
IsBirdDiscount: this.zaoniao > 0 ? 1 : 2,
PredictRoomNum: 1,
BigRoomNum: 0,
TripleRoomNum: 0,
TradeDate: this.currentPriceInfo.startDate,
CostType: 0,
MinOrderPrice: 0,
Remarks: '',
VisaNum: this.orderMsg.ManNum + this.orderMsg.ChirdNum,
SafeNum: this.orderMsg.ManNum + this.orderMsg.ChirdNum,
AirticketNum: 0,
ReturnArriveCityId: 262,
IsReturnIntermodal: 2,
GoCityTime: '',
BackCityTime: '',
ScenicRefundArr: [],
CommissionSharePeople: 0,
CommissionShareMoney: 0,
OrderSource: 2,
MiniAppUserId:this.userInfo.UserId
}
this.apipost("sellorder_post_SetOrderInfoForB2B", msg,
res => {
if (res.resultCode == 1) {
let data = res.data;
data.CoverImg = this.currentPriceInfo.CoverImg;
let myData = JSON.stringify(data);
uni.navigateTo({
url: "/pages/jiuzhai/jz_SureOrder?orderData="+encodeURIComponent(myData)
});
} else {
}
},
null
);
}
}
};
</script>
<style>
.jz_SureOrder{
position: relative;
}
.jz_SureTop{
width: 100%;
box-shadow: 0px 2px 15px 0px rgba(76, 76, 76, 0.13);
background-color: #fff;
border-bottom-left-radius: 60rpx;
border-bottom-right-radius: 60rpx;
padding: 40rpx;
}
.jz_SureDfk{
color:#111111;
font-size:40rpx;
font-weight: bold;
margin-left:26rpx;
}
.jz_SureContent{
width:90%;
margin:auto;
min-height: 100px;
}
.jz_SureCommodity{
padding:30rpx 0;
display: flex;
border-bottom:1px solid #E6E6E6;
}
.jzSureMoney{
color:#333333;
font-weight: bold;
font-size:20rpx;
}
.jz_SuOrder_img{
width: 100rpx;
height: 100rpx;
border-radius: 20rpx;
overflow: hidden;
flex-shrink: 0;
}
.jz_SuOrder_img img{
width:100%;
height:100%;
}
.jz_OrderNum{
color:#8F8F90;
font-size:24rpx;
margin-right:50rpx;
}
.jz_GoodName{
color:#333333;
font-size:28rpx;
width:70%;
margin-left:15px;
font-weight:bold;
}
.jz_OrderBold{
color:#08090E;
font-weight:bold;
}
.jz_PayDiv{
position: absolute;
width:90%;
margin:auto;
bottom:30rpx;
display:flex;
justify-content: space-between;
}
.jz_CancleBtn{
width:310rpx;
height:80rpx;
border:1px solid #111111;
border-radius: 16rpx;
color:#111111;
font-weight: bold;
text-align: center;
line-height: 80rpx;
font-size: 28rpx;
}
</style>
<template>
<view class="jz_SureOrder" style="height:100vh;">
<view class="jz_SureTop">
<view style="display:flex;align-items: center;">
<img style="width:53rpx;height:53rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dfk.png" alt="" />
<text class="jz_SureDfk">待付款</text>
</view>
</view>
<view class="jz_SureContent">
<view class="jz_SureCommodity">
<view class="jz_SuOrder_img">
<img mode="aspectFill" :src="orderData.CoverImg" alt="" />
</view>
<view style="display:flex;justify-content: space-between;">
<view class="jz_GoodName">
{{orderData.GoodsName}}
</view>
<view class="jzSureMoney">
<text style="font-size:20rpx;margin-right:10rpx;">¥</text>
<text style="font-size:28rpx;">{{orderData.PreferPrice}}</text>
</view>
</view>
</view>
<view class="jz_SureCommodity">
<view class="jz_OrderNum">订单编号</view>
<view class="jz_OrderBold">{{orderData.OrderNo}}</view>
</view>
<view class="jz_SureCommodity">
<view class="jz_OrderNum">下单时间</view>
<view class="jz_OrderBold">{{orderData.CreateDate}}</view>
</view>
<view class="jz_SureCommodity">
<view class="jz_OrderNum">支付方式</view>
<view class="jz_OrderBold"></view>
</view>
<view class="jz_SureCommodity" style="justify-content: space-between;">
<view class="jz_OrderNum">商品总额</view>
<view><text style="margin-right:10rpx;">¥</text>{{orderData.PreferPrice}}</view>
</view>
<view class="jz_SureCommodity" style="justify-content: flex-end;">
<view style="color:#08090E;font-size:28rpx;">实付款:</view>
<view style="color:#F20707;font-weight: bold;">
<text style="font-size:22rpx;margin-right:10rpx;">¥</text>
<text style="font-size:28rpx;">{{orderData.PreferPrice}}</text>
</view>
</view>
<view class="jz_PayDiv">
<view class="jz_CancleBtn">取消</view>
<view class="jz_CancleBtn" @click="goZhifu()" style="background-color: #111111;color:#fff;">去付款</view>
</view>
</view>
</view>
</template>
<script>
</script>
<script>
export default {
components: {
},
data() {
return {
pageTitle: '订单详情',
msg:{
pageIndex:1,
pageSize:15,
MiniAppUserId:0
},
orderData:{}
};
},
created() {
},
onLoad(option) {
if(option.orderData){
this.orderData= JSON.parse(decodeURIComponent(option.orderData))
}
console.log(this.orderData,'this.orderData');
},
methods: {
//支付
goZhifu(){
let url='/api/WeChatPay/GetTravlePayInfo'
let GoodsName = this.orderData.GoodsName;
GoodsName = GoodsName.slice(0, 10)
this.request2({
url: url,
data: {
OrderId:this.orderData.OrderId,
GoodsName:GoodsName,
OrderPayType:1,
OpenId:uni.getStorageSync('mall_UserInfo').OpenId,
}
},
res => {
let orderInfo = JSON.parse(res.data);
console.log(orderInfo)
this.goPay(orderInfo)
}
);
},
goPay(orderInfo){
let that=this;
uni.requestPayment({
provider: 'wxpay',
timeStamp: orderInfo.timeStamp,
nonceStr: orderInfo.nonceStr,
package: orderInfo.package,
signType: orderInfo.signType,
paySign: orderInfo.sign,
success: function(res) {
console.log('success', res);
uni.showToast({
title: "支付成功"
})
//todo
},
fail: function(err) {
console.log('fail:', err);
uni.showToast({
title: "支付失败"
})
}
});
}
}
};
</script>
...@@ -220,7 +220,6 @@ ...@@ -220,7 +220,6 @@
this.active = i; this.active = i;
}, },
previewImage(i) { previewImage(i) {
console.log(i)
uni.previewImage({ uni.previewImage({
urls: this.detailData.BannerList, urls: this.detailData.BannerList,
current: i, current: i,
......
This diff is collapsed.
...@@ -24,15 +24,6 @@ ...@@ -24,15 +24,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <u-collapse >
<u-collapse-item :title="item.Name" v-for="(item) in dataList" >
<u-collapse v-if="item.ChildrenList">
<u-collapse-item :title="_item.Name" v-for="(_item) in item.ChildrenList" >
</u-collapse-item>
</u-collapse>
</u-collapse-item>
</u-collapse> -->
</view> </view>
</template> </template>
......
This diff is collapsed.
<template>
<view class="subscribeTicket">
<view>
<z-calendar ref="calendar" :datePrice="datePrice" :curryear='curryear' :currmonth='currmonth'
howManyMonth="6" mode="2" @changeDate="changeDate" @changeMonth="changeMonth"
:defaultSelect="date"></z-calendar>
</view>
</view>
</template>
<script>
import zCalendar from './njzz-calendar/njzz-calendar.vue'
export default {
components: {
zCalendar
},
props: {
date: {
type: String,
default: ""
},
TicketID: {
type: Number,
default: 0
}
},
data() {
return {
curryear: 0,
currmonth: 0,
datePrice: [
],
}
},
watch: {
date(val, oldVal) {
console.log(val, oldVal)
let newMonth = val.split('-')[1]
let oldMonth = oldVal.split('-')[1]
if(newMonth!=oldMonth&&oldMonth!=undefined){
console.log(newMonth!=oldMonth)
this.getGoodsDateList()
}
}
},
mounted() {
let year = new Date().getFullYear(); //年
let month = new Date().getMonth() + 1; //月
if(month<10){
month = ('0' + month)
}
this.curryear= year
this.currmonth= month
console.log('sub')
this.getGoodsDateList()
},
methods: {
getGoodsDateList() {
this.request2({
url: '/api/AppletDining/GetMonthTicketList',
data: {
TicketID: this.TicketID,
BuyDate: this.date
}
},
res => {
let data = res.data;
let datePrice = [];
data.forEach(x => {
let obj = {}
obj.date = x.Year+'-'+x.Month+'-'+x.Day;
if(x.IsHavePrice===1){
obj.price = x.HPriceB;
}else{
obj.price = "";
}
datePrice.push(obj)
})
this.datePrice = datePrice
console.log(this.datePrice)
}
);
},
changeMonth(nowMonth){
let Month = nowMonth.year+'-'+nowMonth.month;
this.getGoodsDateList(Month)
},
}
}
</script>
<style lang="scss" scoped>
.subscribeTicket {
height: 70vh;
padding: 45rpx 45rpx 90rpx;
}
</style>
...@@ -2,34 +2,7 @@ ...@@ -2,34 +2,7 @@
<view class="content"> <view class="content">
<scroll-view :scroll-y="true" style="height: 100%;"> <scroll-view :scroll-y="true" style="height: 100%;">
<view class="header"> <view class="header">
<!-- <view class="bar"></view>
<view class="set text-gray">
<text @click="close" style="font-size:40upx;">返回</text>
<text @click="reset" style="font-size:35upx;color:#DDDDDD">清空</text>
</view> -->
<!-- <view class="in-and-out">
<view class="item" v-if="start.length > 0">
<view style="font-size:30upx;color:#C0C0C0">入住日期</view>
<view style="font-weight: bold;margin-top:10upx;font-size:36upx">{{ startDay }}</view>
<view style="font-size:24upx;margin-top:10upx">{{ startWeek }}</view>
</view>
<view class="item text" v-if="start.length == 0">
<view>入住日期</view>
</view>
<view class="item">
<view class="count-border" :class="day == 0 ? 'gray' : 'orange'">
<view class="count" style="font-size:26upx;line-height:26upx;">{{ day }}</view>
</view>
</view>
<view class="item text" v-if="end.length == 0">
<view>离店日期</view>
</view>
<view class="item" v-if="end.length > 0">
<view style="font-size:30upx;color:#C0C0C0">离店日期</view>
<view style="font-weight: bold;margin-top:10upx;font-size:36upx">{{ endDay }}</view>
<view style="font-size:24upx;margin-top:10upx">{{ endWeek }}</view>
</view>
</view> -->
<view style="font-size: 32rpx;color:#111;text-align: center;padding:30rpx 0;"> <view style="font-size: 32rpx;color:#111;text-align: center;padding:30rpx 0;">
<text>选择日期</text> <text>选择日期</text>
</view> </view>
...@@ -61,12 +34,12 @@ ...@@ -61,12 +34,12 @@
]" :style="{ width: (dayWidth - 10) / 7 + 'px',borderRadius:line == end[0] && index == end[1]?'0px 6px 6px 0px':'',backgroundColor:line == end[0] && index == end[1]?'#111':'',color:line == end[0] && index == end[1]?'#FFFFFF':''}"> ]" :style="{ width: (dayWidth - 10) / 7 + 'px',borderRadius:line == end[0] && index == end[1]?'0px 6px 6px 0px':'',backgroundColor:line == end[0] && index == end[1]?'#111':'',color:line == end[0] && index == end[1]?'#FFFFFF':''}">
<view style="padding-top:2px;padding-bottom:2px;">{{ item }}</view> <view style="padding-top:2px;padding-bottom:2px;">{{ item }}</view>
<view class="select-style" v-if="line == start[0] && index == start[1]">入住</view> <!-- <view class="select-style" v-if="line == start[0] && index == start[1]">入住</view>
<view class="select-style" v-if="line == end[0] && index == end[1]">离店</view> <view class="select-style" v-if="line == end[0] && index == end[1]">离店</view>
<view style="font-size:12px;padding-bottom: 3px;" v-if="priceStauts.length > 0"> <view style="font-size:12px;padding-bottom: 3px;" v-if="priceStauts.length > 0">
<view v-if="priceStauts[line][index]>0">{{ priceStauts[line][index] }}</view> <view v-if="priceStauts[line][index]>0">{{ priceStauts[line][index] }}</view>
<view v-if="priceStauts[line][index] <0">无房</view> <view v-if="priceStauts[line][index] <0">无房</view>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -74,7 +47,7 @@ ...@@ -74,7 +47,7 @@
<view class="submit"> <view class="submit">
<button class="sub-btn" :disabled="!isSub" @click="submit"> <button class="sub-btn" :disabled="!isSub" @click="submit">
<text v-if="isSub">确定</text> <text v-if="isSub">确定</text>
<text v-if="!isSub">请选择入住日期</text> <text v-if="!isSub">请选择日期</text>
</button> </button>
</view> </view>
</scroll-view> </scroll-view>
......
This diff is collapsed.
<template>
<view class="uni-calendar-item__weeks-box" :class="{
'uni-calendar-item--disable':weeks.disable,
'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
'uni-calendar-item--before-checked':weeks.beforeMultiple,
'uni-calendar-item--multiple': weeks.multiple,
'uni-calendar-item--after-checked':weeks.afterMultiple,
}"
@click="choiceDate(weeks)">
<view class="uni-calendar-item__weeks-box-item">
<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
<text class="uni-calendar-item__weeks-box-text" :class="{
'uni-calendar-item--isDay-text': weeks.isDay,
'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
'uni-calendar-item--before-checked':weeks.beforeMultiple,
'uni-calendar-item--multiple': weeks.multiple,
'uni-calendar-item--after-checked':weeks.afterMultiple,
'uni-calendar-item--disable':weeks.disable,
}">{{weeks.date}}</text>
<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
'uni-calendar-item--isDay-text':weeks.isDay,
'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
'uni-calendar-item--before-checked':weeks.beforeMultiple,
'uni-calendar-item--multiple': weeks.multiple,
'uni-calendar-item--after-checked':weeks.afterMultiple,
}">今天</text>
<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
'uni-calendar-item--isDay-text':weeks.isDay,
'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
'uni-calendar-item--before-checked':weeks.beforeMultiple,
'uni-calendar-item--multiple': weeks.multiple,
'uni-calendar-item--after-checked':weeks.afterMultiple,
'uni-calendar-item--disable':weeks.disable,
}">{{weeks.isDay?'今天': (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
'uni-calendar-item--extra':weeks.extraInfo.info,
'uni-calendar-item--isDay-text':weeks.isDay,
'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
'uni-calendar-item--before-checked':weeks.beforeMultiple,
'uni-calendar-item--multiple': weeks.multiple,
'uni-calendar-item--after-checked':weeks.afterMultiple,
'uni-calendar-item--disable':weeks.disable,
}">{{weeks.extraInfo.info}}</text>
</view>
</view>
</template>
<script>
export default {
props: {
weeks: {
type: Object,
default () {
return {}
}
},
calendar: {
type: Object,
default: () => {
return {}
}
},
selected: {
type: Array,
default: () => {
return []
}
},
lunar: {
type: Boolean,
default: false
}
},
methods: {
choiceDate(weeks) {
this.$emit('change', weeks)
}
}
}
</script>
<style lang="scss" scoped>
.uni-calendar-item__weeks-box {
flex: 1;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: column;
justify-content: center;
align-items: center;
}
.uni-calendar-item__weeks-box-text {
font-size: $uni-font-size-base;
color: $uni-text-color;
}
.uni-calendar-item__weeks-lunar-text {
font-size: $uni-font-size-sm;
color: $uni-text-color;
}
.uni-calendar-item__weeks-box-item {
position: relative;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: column;
justify-content: center;
align-items: center;
width: 100rpx;
height: 100rpx;
}
.uni-calendar-item__weeks-box-circle {
position: absolute;
top: 5px;
right: 5px;
width: 8px;
height: 8px;
border-radius: 8px;
background-color: $uni-color-error;
}
.uni-calendar-item--disable {
background-color: rgba(249, 249, 249, $uni-opacity-disabled);
color: $uni-text-color-disable;
}
.uni-calendar-item--isDay-text {
color: $uni-color-primary;
}
.uni-calendar-item--isDay {
background-color: $uni-color-primary;
opacity: 0.8;
color: #fff;
}
.uni-calendar-item--extra {
color: $uni-color-error;
opacity: 0.8;
}
.uni-calendar-item--checked {
background-color: $uni-color-primary;
color: #fff;
opacity: 0.8;
}
.uni-calendar-item--multiple {
background-color: $uni-color-primary;
color: #fff;
opacity: 0.8;
}
.uni-calendar-item--before-checked {
background-color: #ff5a5f;
color: #fff;
}
.uni-calendar-item--after-checked {
background-color: #ff5a5f;
color: #fff;
}
</style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -92,14 +92,17 @@ ...@@ -92,14 +92,17 @@
<u-loading mode="flower" size="48"></u-loading> <u-loading mode="flower" size="48"></u-loading>
<Text style="color: #fff; margin-top: 10rpx;">加载中...</Text> <Text style="color: #fff; margin-top: 10rpx;">加载中...</Text>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import rangeSlider from "./components/range-slider.vue" // import rangeSlider from "./components/range-slider.vue"
import canlendar from "./components/time/index.vue" // import canlendar from "./components/time/index.vue"
import Cascade from "./components/cascade.vue" // import Cascade from "./components/cascade.vue"
export default { export default {
data() { data() {
return { return {
dataList:[],//列表数据 dataList:[],//列表数据
...@@ -153,9 +156,9 @@ ...@@ -153,9 +156,9 @@
} }
}, },
components: { components: {
rangeSlider, // rangeSlider,
canlendar, // canlendar,
Cascade // Cascade
}, },
created() { created() {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
...@@ -165,6 +168,10 @@ ...@@ -165,6 +168,10 @@
this.getList();// 获取景点门票类型 this.getList();// 获取景点门票类型
}, },
methods: { methods: {
openBuyNotice(){
console.log(1,this.$refs.popup)
this.$refs.popup.open()
},
lower(e) { lower(e) {
if (this.msg.pageIndex < this.page_count) { if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++; this.msg.pageIndex++;
......
This diff is collapsed.
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