Commit 16194a48 authored by zhengke's avatar zhengke

修改

parent 1e1c0599
......@@ -599,6 +599,10 @@
"path":"jz_LineDetail" //九寨-线路详情
},{
"path":"jz_Reserve" //线路-预定
},{
"path":"jz_MyOrder" //线路-我的订单
},{
"path":"jz_SureOrder" //线路-确认订单
},{
"path":"allorderList"//统一订单
}]
......
<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 :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>
......@@ -115,7 +115,7 @@
<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;">共计2</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>
......@@ -140,14 +140,19 @@
ChirdNum: 0, //儿童数量
},
price: 0,
currentPriceInfo: {}
currentPriceInfo: {},
total: 0,
YSeatNum:0,
ESeatNum: 0,
FSeatNum: 0,
sumSeat:0,
userInfo:{}
};
},
created() {},
onLoad(option) {
if (option.currentPriceInfo) {
this.currentPriceInfo = JSON.parse(option.currentPriceInfo);
}
},
methods: {
......@@ -176,6 +181,10 @@
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
......@@ -189,8 +198,70 @@
},
//去支付
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) {
uni.navigateTo({
url: "/pages/jiuzhai/jz_SureOrder"
});
} else {
}
},
null
);
}
}
};
......
<style>
.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;
justify-content: space-between;
}
</style>
<template>
<view class="jz_SureOrder">
<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></view>
<view></view>
</view>
</view>
</view>
</template>
<script>
</script>
<script>
export default {
components: {
},
data() {
return {
pageTitle: '订单详情',
msg:{
pageIndex:1,
pageSize:15,
MiniAppUserId:0
}
};
},
created() {
this.getOrderInfo();
},
onLoad(option) {
},
methods: {
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,'数据');
} else {
}
},
null
);
}
}
};
</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