feat: 订单bug

pages/house/orderDetails.vue

@@ -21,8 +21,7 @@
 							{{list.homestayName}}
 						</view>
 						<view class="date">
-							<text>
-								{{list.comboName}}</text>
+							<text>{{list.comboName}}</text>
 						</view>
 					</view>
 				</view>
@@ -49,6 +48,11 @@
 			<!-- 订单信息 -->
 			<view class="orderInfo">
 				<view class="tit">订单信息</view>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">关联房间</text>
+					>
+					<text slot="title" class="val">{{list.roomNumber==null?'暂无':list.roomNumber}}</text>
+				</u-cell>
 				<u-cell :border="false">
 					<text slot="icon" class="txt">预约时间</text>
 					>
@@ -64,9 +68,20 @@
 					>
 					<text slot="title" class="val">{{list.guestPhone}}</text>
 				</u-cell>
-				<u-cell :border="false">
+
+				<u-cell :border="false" v-if="list.comboType==2">
 					<text slot="icon" class="txt">就餐人数</text>
 					>
+					<text slot="title" class="val">{{list.num}}</text>
+				</u-cell>
+				<u-cell :border="false" v-if="list.comboType==1">
+					<text slot="icon" class="txt">成人人数</text>
+					>
+					<text slot="title" class="val">{{list.num}}</text>
+				</u-cell>
+				<u-cell :border="false" v-if="list.comboType==1">
+					<text slot="icon" class="txt">儿童人数</text>
+					>
 					<text slot="title" class="val">{{list.repastNum}}</text>
 				</u-cell>
 

pagesMy/orderList/orderList.vue

@@ -28,8 +28,10 @@
 						<span class="title" v-if="item.orderType=='2'">{{item.houseBaseName}}-{{item.roomNumber}}</span>
 						<span class="title" v-else>{{item.comboName}}</span>
 						<span class='info'>
-							<span>{{item.guestName}}</span>
-							<span>{{item.guestPhone}}</span>
+							<span v-if="item.orderType==201">{{item.comboType==1?'套餐':'按人头'}}</span>
+							<span v-if="item.orderType==2">{{item.guestName}}</span>
+							<span v-if="item.orderType==201">{{item.guestName}} {{item.guestPhone}}</span>
+							<span v-if="item.orderType==2">{{item.guestPhone}}</span>
 							<span v-if="item.orderType=='2'">{{item.arriveDate}}到{{item.leaveDate}} </span>
 							<span v-else>{{item.repastTime}} </span>
 						</span>