修复转桌问题，餐位费问题，台桌增加显示更多信息，修复添加耗材第二单位

pagesOrder/pay-order/pay-order.vue

@@ -392,7 +392,6 @@ async function init() {
 	}
 	Object.assign(order, orderRes);
 	pageData.goodsList = objToArrary(orderRes.detailMap);
-
 	// console.log("order===",order)
 	// console.log("pageData.user===",pageData.user)
 	// 获取用户信息
@@ -412,6 +411,7 @@ async function init() {
 	}
 	pageData.seatNum = order.seatNum;
 	seatFeeConfig.personCount = order.seatNum;
+	console.log('seatFeeConfig',seatFeeConfig);
 }
 
 /**
@@ -464,7 +464,7 @@ const pointDeductionRule = reactive({
 const seatFeeConfig = reactive({
 	pricePerPerson: pageData.shopInfo.tableFee || 0,
 	personCount: 0, //就餐人数
-	isEnabled: !pageData.shopInfo.isTableFee
+	isEnabled: !pageData.shopInfo.isTableFee,
 });
 //使用积分数量
 const userPoints = ref(0);
@@ -517,7 +517,7 @@ const orderExtraConfig = computed(() => {
 		memberDiscountRate: 1,
 		newUserDiscount: newUserDiscount.value,
 		fullReductionActivities: fullReductionActivities.value,
-		currentDinnerType: options.dinnerType,
+		currentDinnerType: options.dinnerType||order.dineMode,
 		isFreeDine: false, //霸王餐
 		freeDineConfig: freeDineConfig.value,
 		limitTimeDiscount: order.limitRate,
@@ -528,7 +528,7 @@ const orderExtraConfig = computed(() => {
 const orderCostSummary = computed(() => {
 	const costSummary = yskUtils.OrderPriceCalculator.calculateOrderCostSummary(
 		pageData.goodsList,
-		options.dinnerType,
+		(options.dinnerType||order.dineMode),
 		selCoupon.value,
 		activityList.value,
 		orderExtraConfig.value,
@@ -633,6 +633,7 @@ watch(
 );
 
 function getPayParam() {
+	const dinnerType=options.dinnerType||order.dineMode
 	let params = {
 		shopId: uni.getStorageSync('shopInfo').id || '',
 		orderId: order.id,
@@ -646,7 +647,7 @@ function getPayParam() {
 		roundAmount: 0, //抹零金额 减免多少钱
 		pointsDiscountAmount: orderCostSummary.value.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
 		pointsNum: orderCostSummary.value.pointUsed, //(扣除各类折扣 enable_deduction后使用)
-		seatNum: options.dinnerType == 'dine-in' ? seatFeeConfig.personCount : 0, //用餐人数
+		seatNum: dinnerType == 'dine-in' ? seatFeeConfig.personCount : 0, //用餐人数
 		newCustomerDiscountAmount: orderCostSummary.value.newUserDiscount, //新客立减
 		newCustomerDiscountId: orderCostSummary.value.newUserDiscount > 0 ? newUserDiscountRes.value.id : '',