订单管理更新

pagesOrder/detail/detail.vue

@@ -2,11 +2,11 @@
 	<view class="min-page bg-gray u-font-28 u-p-30">
 		<user-vue :orderInfo="orderDetail.info" :user="user"></user-vue>
 		<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
-			<text class="color-666">桌位号：</text>
-			<text class="font-bold">{{orderDetail.info.tableName}}</text>
+			<text class="">桌位号：</text>
+			<text class="">{{orderDetail.info.tableName}}</text>
 		</view>
 		<goods-list @printOrder="onPrintOrder" @tuikuan="onTuikuan" :orderInfo="orderDetail.info"
-			:data="orderDetail.goodsList" :seatFee="orderDetail.seatFee.totalAmount" @tuicai="onTuiCai"></goods-list>
+			:data="orderDetail.goodsList" :seatFee="orderDetail.seatFee" @tuicai="onTuiCai"></goods-list>
 		<template v-if="orderDetail.seatFee.totalNumber&&orderDetail.seatFee.totalAmount">
 			<extra-vue @tuicai="onSeatFeeTuicai" @tuikuan="onSeatFeeTuiKuan" :orderInfo="orderDetail.info"
 				:data="orderDetail.seatFee"></extra-vue>
@@ -88,24 +88,23 @@
 			id,
 			productId,
 			productSkuId,
-			productName,
-			productSkuName,
+			name,
 			cartId,
-			num,
-			priceAmount,
-			price
+			number,
+			totalAmount,
+			salePrice
 		} = seatFee
 		go.to('PAGES_ORDER_TUIKUAN', {
-			id,
-			cartId,
+			id:orderDetail.info.id,
+			cartId:seatFee.id,
 			productId,
 			productSkuId,
-			productName,
-			num,
+			productName:name,
+			num:number,
 			number: 0,
-			productSkuName: productSkuName || '',
-			priceAmount,
-			price
+			productSkuName: '',
+			priceAmount:totalAmount,
+			price:salePrice
 		})
 	}
 
@@ -120,8 +119,8 @@
 			cartId: tuicai.selGoods.hasOwnProperty('cartId') ? tuicai.selGoods.cartId : tuicai.selGoods.id,
 			tableId: orderDetail.info.tableId,
 		})
-		tuicai.selGoods.status = 'return'
 		tuicai.show = false
+		init()
 	}
 
 
@@ -263,11 +262,12 @@
 				}
 
 			}
-			orderDetail.seatFee = {
-				name: '餐位费',
+			orderDetail.seatFee = res.seatInfo|| {
+				name: '客座费',
 				number: res.seatCount,
 				totalNumber: res.seatCount,
-				totalAmount: res.seatAmount
+				totalAmount: res.seatAmount,
+				status:''
 			}
 			orderDetail.goodsList = Object.entries(goodsMap).map(([key, value]) => ({
 				info: value,