增加部分公共样式

修改部分公共组件代码
修改台桌，代课下单逻辑代码
增加支付页面
修改用户列表页面

jeepay-ui-uapp-merchant/pagesCreateOrder/order-detail/components/list.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
+	<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="data.length">
 		<view class="u-font-32">
 			<text>共</text>
 			<text class="color-main font-bold"> {{goodsNumber}}</text>
@@ -39,7 +39,7 @@
 				</view>
 				<view>
 					<text>小计￥</text>
-					<text class="font-bold u-font-32">16.00</text>
+					<text class="font-bold u-font-32">{{allPrice}}</text>
 				</view>
 			</view>
 
@@ -47,10 +47,12 @@
 				<view></view>
 				<view>
 					<text>总计￥</text>
-					<text class="font-bold u-font-32">16.00</text>
+					<text class="font-bold u-font-32">{{allPrice}}</text>
 				</view>
 			</view>
-			<my-button type="cancel" :color="color.ColorMain">重新打印</my-button>
+			<view class="u-m-t-30">
+				<my-button type="cancel" :color="color.ColorMain">重新打印</my-button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -86,7 +88,9 @@
 		width: 70rpx;
 		height: 70rpx;
 	}
-
+	.border-bottom{
+		border-color: rgb(240, 240, 240);
+	}
 	.tag {
 		padding: 2rpx 8rpx;
 		border-radius: 8rpx;

jeepay-ui-uapp-merchant/pagesCreateOrder/order-detail/components/order.vue

@@ -2,7 +2,7 @@
 	<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
 		<view class="u-flex u-row-between">
 			<view>订单状态</view>
-			<view>未支付</view>
+			<view>{{returnStatus(data.status)}}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>订单类型</view>
@@ -10,7 +10,7 @@
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>桌位号</view>
-			<view>A6</view>
+			<view>{{table.name}}</view>
 		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>就餐人数</view>
@@ -28,10 +28,6 @@
 			<view>下单时间</view>
 			<view>2024-08-31 15:54:40</view>
 		</view>
-		<view class="u-flex u-row-between u-m-t-20">
-			<view>下单时间</view>
-			<view>2024-08-31 15:54:40</view>
-		</view>
 		<view class="u-flex u-row-between u-m-t-20">
 			<view>订单编号</view>
 			<view>2024083115544056362</view>
@@ -44,6 +40,23 @@
 </template>
 
 <script setup>
+	const props = defineProps({
+		data: {
+			type: Object,
+			default: () => {}
+		},
+		table:{
+			type: Object,
+			default: () => {}
+		}
+	})
+	
+	const statusMap={
+		unpaid:'未支付'
+	}
+	function returnStatus(status){
+		return statusMap[status]||''
+	}
 </script>
 
 <style lang="scss" scoped>