Skip to content

J
jz_Travel
Commit d75bc582 authored by youjie's avatar youjie
Browse files
Options

no message

parent 8c8223df
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 47 deletions
components/cancelPrompt/cancelProgress.vue
View file @ d75bc582
......@@ -155,7 +155,7 @@
<Text>按旅游费用总额的60%</Text>
</view>
</view>
<view class="vip-box" v-if="order.OrderStatus==5">
<view class="vip-box" v-if="datas.OrderStatus==5">
<view class="vip-title">进度</view>
<view class="vip-box-unactive row">
<view class="col">
......@@ -180,7 +180,7 @@ export default {
data(){
return{
vipInfo:{
progressCount: 3,
progressCount: 0,
OrderCount:3
},
}
......@@ -200,6 +200,7 @@ export default {
},
deep: true,
immediate: true,
},
},
created() {
......
components/cancelPrompt/cancelPrompt.vue
View file @ d75bc582
......@@ -230,41 +230,33 @@ export default {
confirm(){
let that = this
if(this.submitCancel) return
wx.showModal({
title: '提示',
content: '确定取消订单？',
success: (tip) => {
if (tip.confirm) {
that.submitCancel = true
that.apipost(
"GetCancelOrder_post", {
OrderNo: this.orderNo,
},
(res) => {
that.submitCancel = false
that.cancel()
if (res.resultCode == 1) {
uni.showToast({
title: "操作成功",
icon: "success",
});
if(that.type) that.$emit('success');
else uni.navigateTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderStatus=5`,
});
}
},
(err) => {
uni.showToast({
title: err.message,
icon: "none",
});
that.submitCancel = false
}
);
}
}
})
that.submitCancel = true
that.apipost(
"GetCancelOrder_post", {
OrderNo: this.orderNo,
},
(res) => {
that.submitCancel = false
that.cancel()
if (res.resultCode == 1) {
uni.showToast({
title: "操作成功",
icon: "success",
});
if(that.type) that.$emit('success');
else uni.navigateTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderStatus=5`,
});
}
},
(err) => {
uni.showToast({
title: err.message,
icon: "none",
});
that.submitCancel = false
}
);
}
},
}
......
pages/AggregateOrders/AggregateOrdersList.vue
View file @ d75bc582
......@@ -118,19 +118,20 @@
onLoad(options){
if(options.OrderTypeStr)this.msg.OrderTypeStr = options.OrderTypeStr
if(options.OrderStatus)this.msg.OrderStatus = options.OrderStatus
this.research()
},
created() {
this.getOrderEnums()
this.init()
},
methods:{
research(status){
if(status) this.msg.OrderStatus = status;
if(status)this.msg.OrderStatus = status;
this.msg.pageIndex = 1;
this.msg.pageSize = 10;
this.status = "loadmore";
this.g = [];
this.page_count = 1;
this.g = [];
this.init()
},
getOrderType(item){
......
pages/airTicket/airTicketOrderDetail.vue
View file @ d75bc582
......@@ -6,10 +6,16 @@
<view class="title row items-center">
<!-- #ifdef MP-DI -->
<u-icon v-if="order.OrderStatus==1" name='clock' custom-prefix="tffont" size="44"></u-icon>
<u-icon v-if="order.OrderStatus==2||order.OrderStatus==3" name='checkmark' custom-prefix="tffont" size="44"></u-icon>
<u-icon v-if="order.OrderStatus==2||order.OrderStatus==3||order.OrderStatus==5" name='checkmark' custom-prefix="tffont" size="44"></u-icon>
<u-icon v-if="order.OrderStatus==4" name='close-circle-o' custom-prefix="tffont" size="44"></u-icon>
<text class="q-ml-sm col bold">
{{(order.OrderStatus==1?'待支付':(order.OrderStatus==2?'待出行':order.OrderStatus==4?'已取消':order.OrderStatus==3?'已完成':order.OrderStatus==5?'售后':''))}}
<template v-if="order.OrderStatus<5">
{{(order.OrderStatus==1?'待支付':(order.OrderStatus==2?'待出行':order.OrderStatus==4?'已取消':order.OrderStatus==3?'已完成':order.OrderStatus==5?'售后':''))}}
</template>
<template v-else>
<template v-if="order.AfterSalesOrderStatus<3">待退款</template>
<template v-if="order.AfterSalesOrderStatus==3">已原路退回</template>
</template>
</text>
<!-- <u-count-down :timestamp="endts" v-if="order.OrderStatus==1" color="#ffffffdd" separator-color="#ffffffdd" :show-days="false" bg-color="transparent"></u-count-down> -->
<!-- #endif -->
......@@ -213,7 +219,7 @@
</view>
</template>
<cancelProgress v-if="order.OrderStatus==2" :datas="order" type="1"></cancelProgress>
<cancelProgress v-if="order.OrderStatus==2||order.OrderStatus==5" :datas="order" type="1"></cancelProgress>
<view style="padding-bottom: 20rpx;"></view>
</scroll-view>
<view class="botton-box" :style="{paddingBottom:`${bottomSafeHeight}rpx`}">
......
pages/jiuzhai/jz_SureOrder.vue
View file @ d75bc582
......@@ -912,7 +912,7 @@
}else if(status==2){
this.orderStatus.code = 1;
this.orderStatus.text = "待出行";
this.showPayBtn = false;
this.showPayBtn = true;
}else if(status==3){
this.orderStatus.code = 1;
this.orderStatus.text = "已完成";
......@@ -921,6 +921,14 @@
this.orderStatus.code = -1;
this.orderStatus.text = "已取消";
this.showPayBtn = false;
}else if(status==5&&this.orderData.AfterSalesOrderStatus<3){
this.orderStatus.code = 0;
this.orderStatus.text = "待退款";
this.showPayBtn = false;
}else if(status==5&&this.orderData.AfterSalesOrderStatus==3){
this.orderStatus.code = -1;
this.orderStatus.text = "已原路退回";
this.showPayBtn = false;
}
// #endif
// #ifdef MP-AG
......
pages/user-center/userVip-center.vue
View file @ d75bc582
......@@ -94,13 +94,13 @@
import tabbars from "@/components/tabbar/index";
import auth from "@/components/auth/index.vue";
import userHeader from "./components/userHeader.vue";
// import vipUserHeader from "./components/vipUserHeader.vue";
import vipUserHeader from "./components/vipUserHeader.vue";
export default {
components: {
tabbars,
auth,
userHeader,
// vipUserHeader
vipUserHeader
},
data() {
return {
......
pages/visa/visa_SureOrder.vue
View file @ d75bc582
......@@ -861,7 +861,7 @@
}else if(status==2){
this.orderStatus.code = 1;
this.orderStatus.text = "待出行";
this.showPayBtn = false;
this.showPayBtn = true;
}else if(status==3){
this.orderStatus.code = 1;
this.orderStatus.text = "已完成";
......@@ -870,6 +870,14 @@
this.orderStatus.code = -1;
this.orderStatus.text = "已取消";
this.showPayBtn = false;
}else if(status==5&&this.orderData.AfterSalesOrderStatus<3){
this.orderStatus.code = 0;
this.orderStatus.text = "待退款";
this.showPayBtn = false;
}else if(status==5&&this.orderData.AfterSalesOrderStatus==3){
this.orderStatus.code = -1;
this.orderStatus.text = "已原路退回";
this.showPayBtn = false;
}
// #endif
// #ifdef MP-AG
......
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