|
|
@@ -343,7 +343,7 @@
|
|
|
</view>
|
|
|
<div class="app-footer">
|
|
|
<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com middle blue" :class="active">取消</button>
|
|
|
-
|
|
|
+ <button @click="cancelBookOrderFn(detailInfo)" v-if="detailInfo.status == 2 && detailInfo.book == 1" class="admin-button-com middle blue" :class="active">取消</button>
|
|
|
<!-- #ifdef MP-WEIXIN -->
|
|
|
<button class="admin-button-com middle blue" open-type="share">分享</button>
|
|
|
<!-- #endif -->
|
|
|
@@ -414,7 +414,7 @@ import { getOrderProduct,giveItem } from "@/api/order-item";
|
|
|
import productMins from "@/mixins/product";
|
|
|
import { ORDER_STATUS } from "@/utils/declare";
|
|
|
import BLE from "@/mixins/BLE";
|
|
|
-import { cloudPrintOrder, cancelOrder,confirmReachFn } from "@/api/order";
|
|
|
+import { cloudPrintOrder, cancelOrder,cancelBookOrderInfo,confirmReachFn } from "@/api/order";
|
|
|
import { hasHitNavigate } from "@/api/map";
|
|
|
import { getWeixinId } from "@/api/invite";
|
|
|
import { IMGHOST } from '@/config'
|
|
|
@@ -444,7 +444,6 @@ export default {
|
|
|
freeShipModal: false,
|
|
|
loading: false,
|
|
|
settlePrice:0,
|
|
|
- showCancelBtn: true,
|
|
|
getappIdList: {},
|
|
|
title:'新订单',
|
|
|
giveTargetId:0,
|
|
|
@@ -752,13 +751,23 @@ export default {
|
|
|
modalCancel() {
|
|
|
this.freeShipModal = false;
|
|
|
},
|
|
|
+ cancelBookOrderFn(){
|
|
|
+ let that = this
|
|
|
+ that.$util.confirmModal({content:'确认取消?'},() => {
|
|
|
+ cancelBookOrderInfo({id:info.id}).then((res) => {
|
|
|
+ if(res.code == 1){
|
|
|
+ this.detailInfo.status = 5
|
|
|
+ this.$msg("取消成功")
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
cancelOrderFn(info) {
|
|
|
let that = this
|
|
|
that.$util.confirmModal({content:'确认取消?'},() => {
|
|
|
var params = {orderId:info.id}
|
|
|
cancelOrder(params).then((res) => {
|
|
|
if(res.code == 1){
|
|
|
- this.showCancelBtn = false
|
|
|
this.detailInfo.status = 5
|
|
|
this.$msg("取消成功")
|
|
|
}
|