Skip to content

J
jz_Travel
Commit 919226d6 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent cc5bd543
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 16 deletions
pages/jiuzhai/jz_MyOrder.vue
View file @ 919226d6
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
{{item.title}} {{item.title}}
</view> </view>
<view style="margin-left:10px;"> <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-down" @click.native.stop="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> <u-icon name="arrow-up" @click.native.stop="getShow(item)" v-else color="#2979ff" size="28"></u-icon>
</view> </view>
<view class="jz-Oright"> <view class="jz-Oright">
{{item.orderStateName=='占位'?'待付款':item.orderStateName}} {{item.orderStateName=='占位'?'待付款':item.orderStateName}}
...@@ -267,7 +267,6 @@ ...@@ -267,7 +267,6 @@
}, },
//取消订单 //取消订单
goCancel(item) { goCancel(item) {
console.log(item, 'item');
//未付款-调用后台取消 //未付款-调用后台取消
if ((item.paymentTime == null||item.paymentTime=='')&&item.orderState==2) { if ((item.paymentTime == null||item.paymentTime=='')&&item.orderState==2) {
this.apipost( this.apipost(
...@@ -275,7 +274,7 @@ ...@@ -275,7 +274,7 @@
ID: item.orderId ID: item.orderId
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.resultCode == 1) {
uni.showToast({ uni.showToast({
title: '操作成功', title: '操作成功',
icon: 'success', icon: 'success',
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 919226d6
...@@ -195,10 +195,10 @@ ...@@ -195,10 +195,10 @@
padding:0 45rpx; padding:0 45rpx;
} }
.jz_form .form-items{ .jz_form .form-items{
margin-bottom: 20rpx; margin-bottom: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
padding-bottom: 20rpx; padding-bottom: 30rpx;
border-bottom:1px solid #f5f5f5; border-bottom:1px solid #f5f5f5;
font-size: 28px; font-size: 28px;
font-weight: 500; font-weight: 500;
...@@ -320,6 +320,12 @@ ...@@ -320,6 +320,12 @@
line-height: 40rpx; line-height: 40rpx;
margin-right: 24rpx; margin-right: 24rpx;
} }
.jz_Reserve .jz_SureVal{
flex: 1;
font-size: 28rpx;
font-weight: 500;
width: 100%;
}
</style> </style>
<template> <template>
<view class="jz_Reserve" v-if="orderData"> <view class="jz_Reserve" v-if="orderData">
...@@ -369,32 +375,32 @@ ...@@ -369,32 +375,32 @@
<view class="jz_form"> <view class="jz_form">
<view class="form-items"> <view class="form-items">
<view class="label">订单编号</view> <view class="label">订单编号</view>
<view class="val"> <view class="jz_SureVal">
<text>{{orderData.model.OrderId}}</text> {{orderData.model.OrderId}}
</view> </view>
</view> </view>
<view class="form-items"> <view class="form-items">
<view class="label">下单日期</view> <view class="label">下单日期</view>
<view class="val"> <view class="jz_SureVal">
<text>{{orderData.model.CreateDate.replace('T',' ')}}</text> {{orderData.model.CreateDate.replace('T',' ')}}
</view> </view>
</view> </view>
<view class="form-items"> <view class="form-items">
<view class="label">下单日期</view> <view class="label">下单日期</view>
<view class="val"> <view class="jz_SureVal">
<text>{{orderData.model.CreateDate.replace('T',' ')}}</text> {{orderData.model.CreateDate.replace('T',' ')}}
</view> </view>
</view> </view>
<view class="form-items"> <view class="form-items">
<view class="label">游客姓名</view> <view class="label">游客姓名</view>
<view class="val"> <view class="jz_SureVal">
<text>{{orderData.model.ContactName}}</text> {{orderData.model.ContactName}}
</view> </view>
</view> </view>
<view class="form-items"> <view class="form-items">
<view class="label">联系电话</view> <view class="label">联系电话</view>
<view class="val"> <view class="jz_SureVal">
<text>{{orderData.model.ContactMobile}}</text> {{orderData.model.ContactMobile}}
</view> </view>
</view> </view>
</view> </view>
...@@ -524,6 +530,49 @@ ...@@ -524,6 +530,49 @@
goCancel(){ goCancel(){
if(this.submit||this.submitCancel) if(this.submit||this.submitCancel)
return; return;
//未付款-调用后台取消
if (this.orderData.model.OrderState==2) {
this.apipost(
"sellorder_post_B2BRemoveOrder", {
ID: this.orderData.model.OrderId
},
res => {
if (res.resultCode == 1) {
uni.showToast({
title: '操作成功',
icon: 'success',
})
uni.navigateTo({
url: "/pages/jiuzhai/jz_MyOrder"
});
}
},
err => {}
);
}
else{
let msg={
OrderId:this.orderData.model.OrderId,
UserId:uni.getStorageSync('mall_UserInfo').UserId
}
//已付款取消申请
this.apipost("sellorder_post_AppletUserCancelOrder", msg ,
res => {
if (res.resultCode == 1) {
uni.showToast({
title: '操作成功',
icon: 'success',
})
uni.navigateTo({
url: "/pages/jiuzhai/jz_MyOrder"
});
} else {
}
},
null
);
}
}, },
getWeek(date) { getWeek(date) {
var weekArray = new Array("日", "一", "二", "三", "四", "五", "六"); var weekArray = new Array("日", "一", "二", "三", "四", "五", "六");
......
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