shish 2 жил өмнө
parent
commit
eb75739791

+ 4 - 0
ghsApp/src/api/order/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 import https from "@/plugins/luch-request_0.0.7/request";
 
 
+export const cancelBookOrderInfo = data => {
+	return https.get("/order/cancel-book-order", data)
+}
+
 export const getInfoByOrderSn = data => {
 export const getInfoByOrderSn = data => {
 	return https.get("/order/get-info-by-order-sn", data)
 	return https.get("/order/get-info-by-order-sn", data)
 }
 }

+ 13 - 4
ghsApp/src/pagesOrder/detail.vue

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