Skip to content

J
jz_Travel
Commit 721f7d5c authored by Mac's avatar Mac
Browse files
Options

1

parent db3caa25
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 910 additions and 11 deletions
pages.json
View file @ 721f7d5c
......@@ -382,6 +382,10 @@
"path":"components/guidecarDraw"
},{
"path":"guidercarCommentList"
},{
"path":"specialCarReserve"//专车预定
},{
"path":"map"
}]
},
{
......@@ -595,6 +599,8 @@
"path":"jz_LineDetail" //九寨-线路详情
},{
"path":"jz_Reserve" //线路-预定
},{
"path":"allorderList"//统一订单
}]
},
//相亲分包
......
pages/guidecar/bookaCarList.vue
View file @ 721f7d5c
......@@ -430,7 +430,7 @@
<view style='margin-left: 3px;width: calc(100vw - 60px - 80px);'>{{x.Description}}
</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>
......@@ -545,10 +545,7 @@
topdateList: [],
DepartList: [], //出发点数组
ArriveList: [], //到达点数组
timeList: [], //时间数组
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'
],
alltime: [],//时间数组
popuplist: [{
name: '出发地点'
}, {
......@@ -568,7 +565,7 @@
},
onLoad(options) {
console.log(222)
if (options && options.carMsg) {
//对象解码
this.carMsg = JSON.parse(decodeURIComponent(options.carMsg))
......@@ -588,7 +585,12 @@
},
methods: {
yuding(x){
uni.navigateTo({
url: '/pages/guidecar/specialCarReserve?Id='+x.Id +'&Date='+this.msg.Q_Date
})
},
popupchange(e) { //tab事件
this.popupcurrent = e;
},
......@@ -761,7 +763,10 @@
this.DepartList = res.data.DepartList;
this.ArriveList = res.data.ArriveList;
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 => {
uni.hideLoading()
......@@ -778,6 +783,10 @@
this.init();
this.screenshow = false;
this.$forceUpdate()
this.DepartList= [], //出发点数组
this.ArriveList= [], //到达点数组
this.alltime= [],//时间数组
this.getSelectCarSiteList()
},
queren(){
this.msg.StartCityName = this.SMsg.depart;
......
pages/guidecar/index.vue
View file @ 721f7d5c
......@@ -281,10 +281,11 @@
}
let carDate = new Date();
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();
this.startDate = carDate.getFullYear() +'-'+carMonth+'-'+carDate.getDate();//从啥时候开始
this.showcardate = carMonth+'-'+carDate.getDate();
this.startDate = carDate.getFullYear() +'-'+carMonth+'-'+carDays;//从啥时候开始
this.showcardate = carMonth+'-'+carDays;
this.showweek = this.getweek(carday) //得到定制专车的周几
},
......
pages/guidecar/map.vue 0 → 100644
View file @ 721f7d5c
<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>
pages/guidecar/specialCarReserve.vue 0 → 100644
View file @ 721f7d5c
This diff is collapsed.
pages/jiuzhai/allorderList.vue 0 → 100644
View file @ 721f7d5c
<style lang="scss" scoped>
.allorderList{
width: 100%;
height: 100vh;
background: #ECF1F4;
.orderList{
width: 100%;
border-radius: 10px;
background: #FFF;
padding: 20px;
margin-top: 10px;
}
.orderList-top{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
color: #111111;
}
.order_xu{
width: 100%;
height: 14px;
border-bottom: 1px dashed #E6E6E6;
}
.order_center{
width: 100%;
margin-top: 15px;
.car-o{
width: calc(100vw - 40px);
font-size: 14px;
color: #111111;
font-weight: bold;
display: flex;
align-items: center;
overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
}
.car-w{
width: 100%;
font-size: 12px;
color: #333333;
font-size: 500;
margin-top: 5px;
}
.hotelbox{
display: flex;
.hotelbox-r{
width: calc(100vw - 40px - 60px);
font-size: 12px;
.text-t{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
}
}
}
.zailaiyidan{
width: 75px;
height: 30px;
background: #111111;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px;
color: #FFF;
}
}
</style>
<template>
<view class="allorderList">
<u-tabs :list="statusList" :current="current" name="Name" @change="change" :active-color="mainColor" bg-color="#FFF" bar-height='4'
height="100"></u-tabs>
<view style="height: calc(100vh - 50px); background: #fff;" v-if="g.length == 0">
<u-empty text="暂无相关订单" mode="order"></u-empty>
</view>
<view v-if="g.length > 0" style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden;padding-bottom: 20px;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="orderList" v-for="(item, index) in g" :key="index">
<view class="orderList-top">
<span style='font-size: 16px;font-weight: 800;'>{{item.OrderTypeName}} <span style='font-size: 12px;font-weight: normal;'>({{item.OrderNo}})</span></span>
<span style='font-size: 12px;'>{{item.OrderStatusName}}</span>
</view>
<view class="order_xu"></view>
<view class="order_center" v-if="item.OrderType == 1">
<view v-for="(x,y) in item.HotelList" :key='y' >
<view class="hotelbox">
<image :src="x.HotelImage" style="width: 50px;height: 50px;border-radius: 8px;margin-right: 10px;"></image>
<view class="hotelbox-r">
<view class="text-t">{{x.HotelName}}</view>
<view>数量:{{x.RoomNumber}}</view>
<view>单价:￥{{x.Unit_Price}}元</view>
</view>
</view>
<view class="order_xu"></view>
</view>
</view>
<view class="order_center" v-if="item.OrderType == 4">
<view v-for="(x,y) in item.CarList" :key='y' >
<view class="car-o" >
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/zhuanghuan.png" mode="aspectFill" style="width: 18px;height: 18px;"></image>
<span style='margin-left: 10px;'>{{x.StartCityName}}</span>
<span style='margin: 0 3px;'>-</span>
<span>{{x.ArriveCityName}}</span>
</view>
<view class="car-w">
上车地点:{{x.DepartAddress}}
</view>
<view class="car-w">
下车地点:{{x.ArriveAddress}}
</view>
<view class="car-w">
出发时间:{{x.Date}} {{x.DepartureTime}}
</view>
<view class="car-w">
总张数:{{x.PeopleNumber+x.ChildNumber}}人 单价:￥{{x.Unit_Price.toFixed(2)}}元
</view>
<view class="order_xu"></view>
</view>
</view>
<view style="font-size: 14px;color: #111111;margin-top: 10px;text-align: right;">
应付:￥{{item.PreferPrice}}元
</view>
<view style="display: flex;justify-content: flex-end;margin-top: 5px;">
<view class="zailaiyidan">
再来一单
</view>
</view>
</view>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#ECF1F4" />
</scroll-view>
</view>
</view>
</template>
<script>
export default{
data(){
return{
pageTitle: "我的订单",
mainColor: '',
statusList:[],
current:0,
msg:{
pageIndex:1,
pageSize:20,
StartTime:'',
EndTime:'',
OrderId:0,
OrderNo:'',
OrderType:0,
OrderStatus:0,
},
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
page_count: 1,
status: "loadmore",
g: [],
}
},
onLoad(options){
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") ?
wx.getStorageSync("basedata").bar_title : [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.mainColor = this.$uiConfig.mainColor;
},
created() {
this.getOrderStatusList()
},
methods:{
getOrderStatusList(){//获取订单状态枚举列表
this.request2({
url: '/api/AppletOrder/GetOrderStatusEnumList',
data: {}
},
res => {
if (res.resultCode == 1) {
this.statusList = res.data
this.statusList.unshift({Name:'全部',Id:0})
}
this.init();
},
err => {
}
);
},
change(e){//tab切换等数据
this.current = e;
this.msg.OrderStatus = this.statusList[e].Id;
this.msg.pageIndex = 1;
this.g = [];
this.init();
},
init(){
uni.showLoading({
title: '加载中...'
})
this.request2({
url: '/api/AppletOrder/GetMyDmcOrderCommonPageList',
data: this.msg
},
res => {
uni.hideLoading()
if (res.resultCode == 1) {
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
},
err => {
uni.hideLoading()
}
);
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
}
}
</script>
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