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 @@ ...@@ -155,7 +155,7 @@
<Text>按旅游费用总额的60%</Text> <Text>按旅游费用总额的60%</Text>
</view> </view>
</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-title">进度</view>
<view class="vip-box-unactive row"> <view class="vip-box-unactive row">
<view class="col"> <view class="col">
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
data(){ data(){
return{ return{
vipInfo:{ vipInfo:{
progressCount: 3, progressCount: 0,
OrderCount:3 OrderCount:3
}, },
} }
...@@ -200,6 +200,7 @@ export default { ...@@ -200,6 +200,7 @@ export default {
}, },
deep: true, deep: true,
immediate: true,
}, },
}, },
created() { created() {
......
components/cancelPrompt/cancelPrompt.vue
View file @ d75bc582
...@@ -230,41 +230,33 @@ export default { ...@@ -230,41 +230,33 @@ export default {
confirm(){ confirm(){
let that = this let that = this
if(this.submitCancel) return if(this.submitCancel) return
wx.showModal({ that.submitCancel = true
title: '提示', that.apipost(
content: '确定取消订单？', "GetCancelOrder_post", {
success: (tip) => { OrderNo: this.orderNo,
if (tip.confirm) { },
that.submitCancel = true (res) => {
that.apipost( that.submitCancel = false
"GetCancelOrder_post", { that.cancel()
OrderNo: this.orderNo, if (res.resultCode == 1) {
}, uni.showToast({
(res) => { title: "操作成功",
that.submitCancel = false icon: "success",
that.cancel() });
if (res.resultCode == 1) { if(that.type) that.$emit('success');
uni.showToast({ else uni.navigateTo({
title: "操作成功", url: `/pages/AggregateOrders/AggregateOrdersList?OrderStatus=5`,
icon: "success", });
}); }
if(that.type) that.$emit('success'); },
else uni.navigateTo({ (err) => {
url: `/pages/AggregateOrders/AggregateOrdersList?OrderStatus=5`, uni.showToast({
}); title: err.message,
} icon: "none",
}, });
(err) => { that.submitCancel = false
uni.showToast({ }
title: err.message, );
icon: "none",
});
that.submitCancel = false
}
);
}
}
})
} }
}, },
} }
......
pages/AggregateOrders/AggregateOrdersList.vue
View file @ d75bc582
...@@ -118,19 +118,20 @@ ...@@ -118,19 +118,20 @@
onLoad(options){ onLoad(options){
if(options.OrderTypeStr)this.msg.OrderTypeStr = options.OrderTypeStr if(options.OrderTypeStr)this.msg.OrderTypeStr = options.OrderTypeStr
if(options.OrderStatus)this.msg.OrderStatus = options.OrderStatus if(options.OrderStatus)this.msg.OrderStatus = options.OrderStatus
this.research()
}, },
created() { created() {
this.getOrderEnums() this.getOrderEnums()
this.init()
}, },
methods:{ methods:{
research(status){ research(status){
if(status) this.msg.OrderStatus = status; if(status)this.msg.OrderStatus = status;
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.msg.pageSize = 10; this.msg.pageSize = 10;
this.status = "loadmore"; this.status = "loadmore";
this.g = [];
this.page_count = 1; this.page_count = 1;
this.g = [];
this.init() this.init()
}, },
getOrderType(item){ getOrderType(item){
......
pages/airTicket/airTicketOrderDetail.vue
View file @ d75bc582
...@@ -6,10 +6,16 @@ ...@@ -6,10 +6,16 @@
<view class="title row items-center"> <view class="title row items-center">
<!-- #ifdef MP-DI --> <!-- #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==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> <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"> <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> </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> --> <!-- <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 --> <!-- #endif -->
...@@ -213,7 +219,7 @@ ...@@ -213,7 +219,7 @@
</view> </view>
</template> </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> <view style="padding-bottom: 20rpx;"></view>
</scroll-view> </scroll-view>
<view class="botton-box" :style="{paddingBottom:`${bottomSafeHeight}rpx`}"> <view class="botton-box" :style="{paddingBottom:`${bottomSafeHeight}rpx`}">
......
pages/jiuzhai/jz_SureOrder.vue
View file @ d75bc582
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
}else if(status==2){ }else if(status==2){
this.orderStatus.code = 1; this.orderStatus.code = 1;
this.orderStatus.text = "待出行"; this.orderStatus.text = "待出行";
this.showPayBtn = false; this.showPayBtn = true;
}else if(status==3){ }else if(status==3){
this.orderStatus.code = 1; this.orderStatus.code = 1;
this.orderStatus.text = "已完成"; this.orderStatus.text = "已完成";
...@@ -921,6 +921,14 @@ ...@@ -921,6 +921,14 @@
this.orderStatus.code = -1; this.orderStatus.code = -1;
this.orderStatus.text = "已取消"; this.orderStatus.text = "已取消";
this.showPayBtn = false; 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 // #endif
// #ifdef MP-AG // #ifdef MP-AG
......
pages/user-center/userVip-center.vue
View file @ d75bc582
...@@ -94,13 +94,13 @@ ...@@ -94,13 +94,13 @@
import tabbars from "@/components/tabbar/index"; import tabbars from "@/components/tabbar/index";
import auth from "@/components/auth/index.vue"; import auth from "@/components/auth/index.vue";
import userHeader from "./components/userHeader.vue"; import userHeader from "./components/userHeader.vue";
// import vipUserHeader from "./components/vipUserHeader.vue"; import vipUserHeader from "./components/vipUserHeader.vue";
export default { export default {
components: { components: {
tabbars, tabbars,
auth, auth,
userHeader, userHeader,
// vipUserHeader vipUserHeader
}, },
data() { data() {
return { return {
......
pages/visa/visa_SureOrder.vue
View file @ d75bc582
...@@ -861,7 +861,7 @@ ...@@ -861,7 +861,7 @@
}else if(status==2){ }else if(status==2){
this.orderStatus.code = 1; this.orderStatus.code = 1;
this.orderStatus.text = "待出行"; this.orderStatus.text = "待出行";
this.showPayBtn = false; this.showPayBtn = true;
}else if(status==3){ }else if(status==3){
this.orderStatus.code = 1; this.orderStatus.code = 1;
this.orderStatus.text = "已完成"; this.orderStatus.text = "已完成";
...@@ -870,6 +870,14 @@ ...@@ -870,6 +870,14 @@
this.orderStatus.code = -1; this.orderStatus.code = -1;
this.orderStatus.text = "已取消"; this.orderStatus.text = "已取消";
this.showPayBtn = false; 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 // #endif
// #ifdef MP-AG // #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