增加转桌功能，删除部分图片，修复订单列表显示价格不对问题

pagesOrder/detail/detail.vue

@@ -23,10 +23,15 @@
 				</template>
 				<template v-else>
 					<template v-if="orderDetail.info.status=='unpaid'">
+						
 						<view class="u-flex-1">
 							<my-button @tap="diancan" color="#fff" bgColor="rgb(57,53,52)" borderRadius="100rpx 0 0 100rpx" fontWeight="700" 
 								shape="circle" plain type="primary">加菜</my-button>
 						</view>
+						<view class="u-flex-1" style="border-right: 1px solid #fff;">
+							<my-button @tap="transformTable" borderRadius="0 0 0 0" shape="circle" fontWeight="700" 
+								type="primary">转桌</my-button>
+						</view>
 						<view class="u-flex-1">
 							<my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle" fontWeight="700" 
 								type="primary">结账</my-button>
@@ -37,6 +42,10 @@
 		</view>
 
 		<tuicai-vue @confirm="tuicaiConfirm" v-model:show="tuicai.show" :data="tuicai.selGoods"></tuicai-vue>
+		
+		<changeTable v-model="changeTableShow" :nowCartData="[]" :goodsList="orderDetail.info?orderDetail.info.detailMap:[]" :order="orderDetail.info"
+		@update="changeTableUpdate"
+		></changeTable>
 	</view>
 </template>
 
@@ -60,6 +69,12 @@
 	import { shopUserDetail } from '@/http/api/shopUser.js'
 	import { getShopInfo } from '@/http/api/shop.js'
 	
+	import changeTable from '@/components/change-table.vue'
+	const changeTableShow=ref(false)
+	function transformTable(){
+		changeTableShow.value=true
+	}
+	
 	const tuicai = reactive({
 		show: false,
 		isSeatFee: false,
@@ -128,6 +143,8 @@
 				item.unitPrice = uni.$utils.isGoodsPrice(item,user.value)
 			})
 		})
+		console.log('orderDetail.goodsList',orderDetail.goodsList);
+		console.log('orderDetail.info',orderDetail.info);
 		orderDetail.info = res
 	}
 
@@ -316,7 +333,13 @@
 		})
 	}
 
-	
+	function changeTableUpdate(allMerge){
+		if(allMerge===1){
+			uni.navigateBack()
+		}else{
+			getOrderDetail()
+		}
+	}
 </script>
 
 <style lang="scss" scoped>

pagesOrder/index/compoents/order-item.vue

@@ -147,7 +147,7 @@
 				$goodsMap[goods.productId] = goods.num * 1
 				goosZhonglei.value += 1
 			}
-			originAmount.value += goods.unitPrice
+			originAmount.value += goods.payAmount
 		}
 	}
 	goodsMapInit()