feat: 订单bug

pages.json

@@ -1,213 +1,220 @@
-{
-	"pages": [
-		//首页
-		{
-			"path": "pages/login/select",
-			"style": {
-				"navigationBarTitleText": "选择门店",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/home/condition",
-			"style": {
-				"navigationBarTitleText": "房情表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/home/details",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
-		},
-		// 登录
-		{
-			"path": "pages/login/index",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/login/forgot",
-			"style": {
-				"navigationBarTitleText": "忘记密码",
-				"navigationStyle": "custom"
-			}
-		},
-
-		//房态
-		{
-			"path": "pages/house/index",
-			"style": {
-				"navigationBarTitleText": "房态",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/house/createOrder",
-			"style": {
-				"navigationBarTitleText": "新增订单",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/house/breast",
-			"style": {
-				"navigationBarTitleText": "添加早餐",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/house/payAdd",
-			"style": {
-				"navigationBarTitleText": "添加收款",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/house/orderInfo",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"navigationStyle": "custom"
-			}
-		},
-
-		{
-			"path": "pages/house/stayCheck",
-			"style": {
-				"navigationBarTitleText": "入住登记",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/my/houseList",
-			"style": {
-				"navigationBarTitleText": "房型选择",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/statistics/index",
-			"style": {
-				"navigationBarTitleText": "统计",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/my/index",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/my/roomType",
-			"style": {
-				"navigationBarTitleText": "房间列表",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/HotelMerchandise/index",
-			"style": {
-				"navigationBarTitleText": "商品管理",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/HotelMerchandise/addCommodity",
-			"style": {
-				"navigationBarTitleText": "添加商品",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}
-
-	],
-	"subPackages": [{
-			"root": "pagesHouse",
-
-			"pages": [{
-					"path": "home/index",
-					"style": {
-						"navigationBarTitleText": "首页",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				}, {
-					"path": "home/orderList",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "home/bill",
-					"style": {
-						"navigationBarTitleText": "交易账单",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "home/moneyBill",
-					"style": {
-						"navigationBarTitleText": "资金账单",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "home/moneyBillDetail",
-					"style": {
-						"navigationBarTitleText": "账单详情",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "home/orderBillDetail",
-					"style": {
-						"navigationBarTitleText": "账单详情",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				}, {
-					"path": "home/tj",
-					"style": {
-						"navigationBarTitleText": "数据统计",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "Verification/index",
-					"style": {
-						"navigationBarTitleText": "核销",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "Verification/check",
-					"style": {
-						"navigationBarTitleText": "核销选择",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
+{
+	"pages": [
+		//首页
+		{
+			"path": "pages/login/select",
+			"style": {
+				"navigationBarTitleText": "选择门店",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/home/index",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/home/condition",
+			"style": {
+				"navigationBarTitleText": "房情表",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/home/details",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		// 登录
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/forgot",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"navigationStyle": "custom"
+			}
+		},
+
+		//房态
+		{
+			"path": "pages/house/index",
+			"style": {
+				"navigationBarTitleText": "房态",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/createOrder",
+			"style": {
+				"navigationBarTitleText": "新增订单",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/breast",
+			"style": {
+				"navigationBarTitleText": "添加早餐",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/payAdd",
+			"style": {
+				"navigationBarTitleText": "添加收款",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/orderInfo",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/house/orderDetails",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationStyle": "custom"
+			}
+		},
+
+		{
+			"path": "pages/house/stayCheck",
+			"style": {
+				"navigationBarTitleText": "入住登记",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/houseList",
+			"style": {
+				"navigationBarTitleText": "房型选择",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/statistics/index",
+			"style": {
+				"navigationBarTitleText": "统计",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/roomType",
+			"style": {
+				"navigationBarTitleText": "房间列表",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/HotelMerchandise/index",
+			"style": {
+				"navigationBarTitleText": "商品管理",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/HotelMerchandise/addCommodity",
+			"style": {
+				"navigationBarTitleText": "添加商品",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}
+
+	],
+	"subPackages": [{
+			"root": "pagesHouse",
+
+			"pages": [{
+					"path": "home/index",
+					"style": {
+						"navigationBarTitleText": "首页",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "home/orderList",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "home/bill",
+					"style": {
+						"navigationBarTitleText": "交易账单",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "home/moneyBill",
+					"style": {
+						"navigationBarTitleText": "资金账单",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "home/moneyBillDetail",
+					"style": {
+						"navigationBarTitleText": "账单详情",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "home/orderBillDetail",
+					"style": {
+						"navigationBarTitleText": "账单详情",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "home/tj",
+					"style": {
+						"navigationBarTitleText": "数据统计",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "Verification/index",
+					"style": {
+						"navigationBarTitleText": "核销",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Verification/check",
+					"style": {
+						"navigationBarTitleText": "核销选择",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				},
 				{
 					"path": "Verification/record",
@@ -232,20 +239,20 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
-				},
-				{
-					"path": "Verification/ems",
+				},
+				{
+					"path": "Verification/ems",
 					"style": {
 						"navigationBarTitleText": "核销结果",
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
-					}
+					}
 				},
 				{
 					"path": "Verification/detailsewm",
 					"style": {
 						"navigationBarTitleText": "订单详情"
-						
+
 					}
 				},
 				{
@@ -255,131 +262,131 @@
 						"enablePullDownRefresh": false
 						// "navigationStyle": "custom"
 					}
-				},
-				{
-					"path": "Verification/details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh": false
-						// "navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "Mine/index",
-					"style": {
-						"navigationBarTitleText": "我的",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "Mine/ordersList/index",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "Mine/ordersList/outcome",
-					"style": {
-						"navigationBarTitleText": "核销结果",
-						"enablePullDownRefresh": false
-						// "navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "Mine/ordersList/details/details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
+				},
+				{
+					"path": "Verification/details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false
+						// "navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Mine/index",
+					"style": {
+						"navigationBarTitleText": "我的",
 						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "Mine/PersonalEditing/PersonalEditing",
-					"style": {
-						"navigationBarTitleText": "编辑",
-						"enablePullDownRefresh": false
-					}
-				},
-				{
-					"path": "Mine/Businesses/Businesses",
-					"style": {
-						"navigationBarTitleText": "商户信息",
-						"enablePullDownRefresh": false
-					}
-				},
-				{
-					"path": "HotelMerchandise/index",
-					"style": {
-						"navigationBarTitleText": "商品管理",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				}
-
-			]
-		},
-		{
-			"root": "pagesMy",
-			"pages": [{
-					"path": "orderList/orderList",
-					"style": {
-						"navigationBarTitleText": "订单列表",
-						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#fff"
-					}
-				}, {
-					"path": "orderList/alreadyBook",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#fff"
-					}
-				}, {
-					"path": "orderList/textMessage",
-					"style": {
-						"navigationBarTitleText": "发送短信",
-						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#fff"
-					}
-				},
-				{
-					"path": "stayInfo/stayInfo",
-					"style": {
-						"navigationBarTitleText": "酒店民宿信息 ",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				}, {
-					"path": "stayInfo/roomPosition",
-					"style": {
-						"navigationBarTitleText": "酒店民宿信息 ",
-						"enablePullDownRefresh": false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "code/index",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "酒店民宿商家端",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-
-	},
-	"uniIdRouter": {},
-	"permission": {
-		"scope.userLocation": {
-			"desc": "你的位置信息将用于小程序位置接口的效果展示"
-		}
-	}
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Mine/ordersList/index",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Mine/ordersList/outcome",
+					"style": {
+						"navigationBarTitleText": "核销结果",
+						"enablePullDownRefresh": false
+						// "navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Mine/ordersList/details/details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Mine/PersonalEditing/PersonalEditing",
+					"style": {
+						"navigationBarTitleText": "编辑",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "Mine/Businesses/Businesses",
+					"style": {
+						"navigationBarTitleText": "商户信息",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "HotelMerchandise/index",
+					"style": {
+						"navigationBarTitleText": "商品管理",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+
+			]
+		},
+		{
+			"root": "pagesMy",
+			"pages": [{
+					"path": "orderList/orderList",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff"
+					}
+				}, {
+					"path": "orderList/alreadyBook",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff"
+					}
+				}, {
+					"path": "orderList/textMessage",
+					"style": {
+						"navigationBarTitleText": "发送短信",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff"
+					}
+				},
+				{
+					"path": "stayInfo/stayInfo",
+					"style": {
+						"navigationBarTitleText": "酒店民宿信息 ",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}, {
+					"path": "stayInfo/roomPosition",
+					"style": {
+						"navigationBarTitleText": "酒店民宿信息 ",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "code/index",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "酒店民宿商家端",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8"
+
+	},
+	"uniIdRouter": {},
+	"permission": {
+		"scope.userLocation": {
+			"desc": "你的位置信息将用于小程序位置接口的效果展示"
+		}
+	}
 }

pages/HotelMerchandise/index.vue

@@ -3,9 +3,9 @@
 		<c-nav-bar title="商品管理"></c-nav-bar>
 		<view class="tb">
 			<view class="tabs">
-				<view v-for="(item,index) in tabList" :key="index" @tap="changeTab1(index)">
+				<view v-for="(item,index) in tabList" :key="index" @tap="changeTab1(item,index)">
+					<!-- <text :class="index==current?'active':''">{{item.name}}({{mytotal}})</text> -->
 					<text :class="index==current?'active':''">{{item.name}}</text>
-					<text v-if="index==current">({{roomType.length}})</text>
 				</view>
 			</view>
 		</view>
@@ -28,7 +28,6 @@
 						批量操作
 					</view>
 				</view>
-
 			</view>
 
 
@@ -55,29 +54,29 @@
 				</view>
 			</view>
 		</view>
+
 		<!-- 房型选择 -->
-		<view class="type" v-for="item,index in roomType" :key="index">
+		<view class="type" v-for="(item,index) in roomType" :key="index">
 			<view class="left" v-if="Selected==true">
 				<view class="image">
-					<image @tap="selectPerson()"
-						:src="isSelect?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+					<image @tap="selectPerson(item,index)"
+						:src="selectedTags.includes(item)?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 					</image>
 				</view>
 			</view>
-			<!-- <view @click="goEditTypeInfo(item.houseBaseId)" style="width: 100%;"> -->
 			<view style="width: 100%;">
 				<view class="right">
 					<view class="right-left">
-						<image :src="item.cover" mode=""></image>
+						<image :src="item.coverImg" mode=""></image>
 					</view>
 					<view class="right-right">
 						<view class="top">
-							<text style="font-size: 30rpx; color: #333;">{{item.comboName}}</text>
+							<text style="font-size: 30rpx; color: #333;">{{item.name||item.goodsName}}</text>
 						</view>
 						<view class="under">
-							<view style="font-size: 24rpx; color: #777;">销量：{{item.saleNums}}</view>
+							<view style="font-size: 24rpx; color: #777;">销量：{{item.salesVolume||item.soldNum}}</view>
 							<view style="font-size: 36rpx; color: #FF4141; font-weight: Bold; margin-top: 16rpx;">
-								￥{{item.price}}</view>
+								￥{{item.discountPrice||item.normalPrice}}</view>
 						</view>
 					</view>
 				</view>
@@ -86,17 +85,18 @@
 
 					</view>
 					<view class="type-btn-right">
-						<view class="" @click="del(item)">
+						<view class="" @click="shanchu(item,index)">
 							删除
 						</view>
-						<view class="">
+						<view class="" @click="gaijia(item,index)">
 							改价格
 						</view>
-						<view class="" @click="Undered(item)" v-if="item.status==1">
-							下架
+						<view v-if="canyinmeishi" class="" @click="xiajia(item,index)">
+							{{fromData.status==0?'下架':'上架'}}
 						</view>
-						<view class="" @click="Undered(item)" v-else>
-							上架
+
+						<view v-if="!canyinmeishi" class="" @click="xiajia1(item,index)">
+							{{fromData.status==0?'上架':'下架'}}
 						</view>
 					</view>
 				</view>
@@ -109,94 +109,78 @@
 			<view class="bottom-btn">
 				<view class="left">
 					<view class="image">
-						<image @tap="selectPerson()"
-							:src="isSelect?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
+						<image
+							:src="selectedTags.length>0?'https://i.ringzle.com/file/20240228/c741a340e19642c59473e6f4a6d2f4be.png':'https://i.ringzle.com/file/20231027/db588133d67548fc82dfb0d128eac9a8.png'">
 						</image>
 					</view>
 					<view class="text">
-						已选：1
+						已选：{{selectedTags.length}}
 					</view>
 				</view>
 				<view class="right">
-					<view class="right-btn">
-						批量下架
+					<view v-if="canyinmeishi" class="right-btn" @click="piliangxiajia">
+						{{fromData.status==0?'批量下架':'批量上架'}}
 					</view>
-					<view class="right-btn" @click="Pricing()">
-						批量定价
+					<view v-if="!canyinmeishi" class="right-btn" @click="piliangxiajia">
+						{{fromData.status==0?'批量上架':'批量下架'}}
+					</view>
+					<view class="right-btn" @click="piliangshanchu">
+						批量删除
 					</view>
 				</view>
 			</view>
 		</view>
-		<!-- 新增按钮 -->
-		<view class="btn-btn" @click="addType()" v-else>
-			<view class="btn">
-				添加商品
-			</view>
-		</view>
 
-		<u-popup :show="showPricing" @close="close" :round="30">
-			<view class="pop-pop">
-				<view class="hander-one">
-					<view class="image">
-						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
-						</image>
-					</view>
-					<view class="text">
-						<view class="text1">
-							删除选中的商品
-						</view>
-						<view class="text2">
-							删除后的商品不可在前台继续售卖，是否继续
-						</view>
+
+		<!-- 改价弹出框 -->
+		<u-popup :show="showPricing" @close="closegaijia" @open="opengaijia" :round="10">
+			<view class="gaijiadiv">
+				<view class="toubu">
+					改价格
+					<view class="toubux" @click="closegaijia">
+						<u-icon name="close" color="#000000" size="40"></u-icon>
 					</view>
 				</view>
-				<view class="hander-two">
-					<view class="pop-btn-del" @click="showPricing=false">
-						取消
-					</view>
-					<view class="pop-btn-add" @click="GoOndel()">
-						继续提交
-					</view>
+				<view class="jiainput">
+					<u--input type='number' v-model="newprice" placeholder="请输入价格" border="surround"
+						clearable></u--input>
 				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="showPricingUnder" @close="close" :round="30">
-			<view class="pop-pop">
-				<view class="hander-one">
-					<view class="image">
-						<image src="https://i.ringzle.com/file/20240317/fdb4de4c4413429bb5a98b3f6c2bd856.png" mode="">
-						</image>
-					</view>
-					<view class="text">
-						<view class="text1" v-if="Shelves==false">
-							下架选中的商品
-						</view>
-						<view class="text1" v-else>
-							上架选中的商品
-						</view>
-						<view class="text2" v-if="Shelves==false">
-							下架后商品不可在前台继续售卖，是否继续？
-						</view>
-						<view class="text2" v-else>
-							确定上架售卖吗？是否继续？
-						</view>
-					</view>
-				</view>
-				<view class="hander-two">
-					<view class="pop-btn-del" @click="showPricingUnder=false">
+				<view class="queding">
+					<view class="queding1" @click="closegaijia">
 						取消
 					</view>
-					<view class="pop-btn-add" @click="GoOnUnder()">
-						继续提交
+					<view class="queding2" @click="quedingjiae">
+						确定
 					</view>
 				</view>
+
 			</view>
 		</u-popup>
+		<!-- 下架弹出框 -->
+		<u-modal :show="xiajiashow" :title="fromData.status==0?'下架选中的商品':'上架选中的商品'"
+			:content="fromData.status==0?'下架后商品不可在前台继续售卖，是否继续?':'上架后商品可在前台售卖，是否继续?'" showConfirmButton='true'
+			showCancelButton='true' @confirm='quedingxiajia' @cancel='quxiaoxiajia'></u-modal>
+
+		<!-- 下架弹出框渔家乐 -->
+		<u-modal :show="xiajiashow1" :title="fromData.status==1?'下架选中的商品':'上架选中的商品'"
+			:content="fromData.status==1?'下架后商品不可在前台继续售卖，是否继续?':'上架后商品可在前台售卖，是否继续?'" showConfirmButton='true'
+			showCancelButton='true' @confirm='quedingxiajia' @cancel='quxiaoxiajia'></u-modal>
+
+
+		<!-- 删除弹出框 -->
+		<u-modal :show="shanchushow" title="删除选中的商品" content='删除后的商品不可在前台继续售卖，是否继续?' showConfirmButton='true'
+			showCancelButton='true' @confirm='quedingshanchu' @cancel='quxiaoshanchu'></u-modal>
+
+
+
+
 		<view class="mainContain">
 			<!-- <view class="nodata" v-if='dataList.length==0'>
 				<NoData></NoData>
 			</view> -->
 		</view>
+
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -212,145 +196,449 @@
 			return {
 				h: uni.getSystemInfoSync().windowHeight,
 				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				newprice: '',
+				lsdata: {},
 				current: 0,
-				tabList: [{
-						name: '出售中'
-					},
-					{
-						name: '待上架'
-					},
-				],
+				canyinmeishi: false,
+				xiajiashow: false,
+				xiajiashow1: false,
+				shanchushow: false,
+				tabList: [],
 				homestayId: uni.getStorageSync('homestayId') || 0,
 				roomType: [],
-
-
+				selectedTags: [],
+				mytotal: 0,
 				isSelect: false,
 				Selected: false,
 				showPricing: false,
-				showPricingUnder: false,
-				Shelves: false,
 				areaShow: false,
 				list1: [{
-						name: '创建时间'
+						name: '创建时间',
+						id: 1,
 					},
 					{
-						name: '上架时间'
+						name: '价格从高到低',
+						id: 2,
 					},
 					{
-						name: '价格从高到低'
+						name: '价格从低到高',
+						id: 4,
 					},
 					{
-						name: '价格从低到高'
+						name: '销量从高到低',
+						id: 2,
 					},
-					// {
-					// 	name: '销量从高到低'
-					// },
 				],
 				areaShowIndex: null,
 				fromData: {
-					homestayId: uni.getStorageSync('homestayId'),
-					limit: 10,
+					merchantId: uni.getStorageSync('merchantId'), //商户id
+					limit: 99999,
 					page: 1,
-					order: '',
-					orderField: "",
-					status: 1
-				},
-				ids: [],
-				obj: {}
+					sortType: '', //选择条件：1创建时间 2销量从高到低 3价格从高到低 4价格从低到高
+					status: 0, //状态：0上架1下架
+				}
 			}
 		},
 		onLoad(option) {
-			console.log(option);
-			// if (uni.getStorageSync('merchantType') == 4) {
-			this.getRepast()
-			// } else {
-			// }
+
+
+			console.log('111111111111111111', uni.getStorageSync('merchantType'))
+			//this.getHousekeeping();
+			if (uni.getStorageSync('merchantType') == 4) {
+				this.canyinmeishi = true;
+				this.tabList = [{
+						name: '出售中',
+						id: 0
+					},
+					{
+						name: '待上架',
+						id: 1
+					},
+				]
+				this.getRepast(); //获取商品列表（餐饮美食）
+
+			} else {
+				this.canyinmeishi = false;
+				this.tabList = [{
+						name: '出售中',
+						id: 1
+					},
+					{
+						name: '待上架',
+						id: 0
+					},
+				]
+				this.fromData = {
+					merchantId: uni.getStorageSync('merchantId'), //商户id
+					limit: 99999,
+					page: 1,
+					sortType: '', //选择条件：1创建时间 2销量从高到低 3价格从高到低 4价格从低到高
+					status: 1, //状态：0上架1下架
+				}
+
+				this.yujialedata(); //获取商品列表（渔家乐）
+			}
+
 		},
 		methods: {
-			// 添加商品
-			addType() {
-				uni.navigateTo({
-					url: '/pages/HotelMerchandise/addCommodity'
+			getHousekeeping() {
+				this.$api.get('/sys/dict/type/all').then(res => {
+					let alldata = res.data.data.find((p) => p.dictType == 'food_type').dataList;
+					console.log('alldata', alldata)
 				})
 			},
-			close() {
-				this.showPricing = false
-				this.showPricingUnder = false
+
+			piliangxiajia() {
+				if (uni.getStorageSync('merchantType') == 4) {
+					if (this.selectedTags.length == 0) {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "请选择数据",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+
+					} else {
+						let namesArray = this.selectedTags.map(obj => obj.id);
+						let postdata = {
+							discountPrice: 0,
+							id: namesArray,
+							status: this.fromData.status == 1 ? 0 : 1,
+						};
+						this.$api.post('/scenic/goods/batchUpDownFrame', postdata).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.selectedTags = [];
+							this.Selected = false;
+							this.getRepast(); //获取商品列表
+						})
+					}
+
+				} else {
+					if (this.selectedTags.length == 0) {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "请选择数据",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+
+					} else {
+
+
+						let postdata = this.selectedTags.map((item, index, arr) => {
+							let json = {};
+							json.id = item.id;
+							json.merchantId = uni.getStorageSync('merchantId');
+							json.status = item.status == 0 ? 1 : 0;
+							return json
+						})
+						// let namesArray = this.selectedTags.map(obj => obj.id);
+						// let postdata = {
+						// 	id: namesArray,
+						// 	status: this.fromData.status,
+						// };
+						this.$api.post('/scenic/goods/batchUpDownFrame', postdata).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.selectedTags = [];
+							this.Selected = false;
+							this.yujialedata(); //获取商品列表（渔家乐）
+						})
+					}
+				}
+			},
+
+			piliangshanchu() {
+				if (uni.getStorageSync('merchantType') == 4) {
+
+					if (this.selectedTags.length == 0) {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "请选择数据",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+
+					} else {
+						let namesArray = this.selectedTags.map(obj => obj.id);
+
+						//status: this.fromData.status,
+						this.$api.del('/api/merchant/food/delProduct', namesArray).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.selectedTags = [];
+							this.Selected = false;
+							this.getRepast(); //获取商品列表
+						})
+					}
+
+				} else {
+					if (this.selectedTags.length == 0) {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "请选择数据",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+
+					} else {
+						let namesArray = this.selectedTags.map(obj => obj.id);
+
+						//status: this.fromData.status,
+						this.$api.del('/scenic/goods', namesArray).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.selectedTags = [];
+							this.Selected = false;
+							this.yujialedata(); //获取商品列表（渔家乐）
+						})
+					}
+				}
 			},
-			// 删除商品
-			del(item) {
-				// let ids = []
-				this.ids.push(item.id)
-				this.showPricing = true
+			shanchu(e, i) {
+				//console.log('111111111111111111', e, i)
+				this.lsdata = e;
+				this.shanchushow = true;
 			},
-			GoOndel() {
-				this.$api.del('/merchant/hotel/repast', this.ids).then(res => {
-					console.log(res);
-					if (res.data.code == 0) {
-						this.getRepast()
-						this.showPricing = false
-						this.ids = []
-					} else this.$showToast(res.data.msg);
-				})
+			quedingshanchu() {
+				if (uni.getStorageSync('merchantType') == 4) {
+					//（餐饮美食）
+					let postdata = [this.lsdata.id];
+					//status: this.fromData.status,
+					console.log('postdata', postdata)
+					this.$api.del('/api/merchant/food/delProduct', postdata).then(res => {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "成功",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+						this.quxiaoshanchu();
+						this.getRepast(); //获取商品列表
+					})
+
+				} else {
+					//（渔家乐）
+					let postdata = [this.lsdata.id];
+					//status: this.fromData.status,
+					console.log('postdata', postdata)
+					this.$api.del('/scenic/goods', postdata).then(res => {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "成功",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+						this.quxiaoshanchu();
+						this.yujialedata(); //获取商品列表（渔家乐）
+					})
+
+				}
 			},
-			// 上下架商品
-			Undered(item) {
-				this.ids.push(item.id)
-				this.showPricingUnder = true
-				if (item.status == 1) {
-					this.obj = {
-						ids: this.ids,
-						status: 0
-					}
+			quxiaoshanchu() {
+				// console.log('quxiaoxiajia',this.lsdata)
+				this.lsdata = {};
+				this.shanchushow = false;
+			},
+
+
+			gaijia(e, i) {
+				console.log('111111111111111111', e, i)
+				this.showPricing = true;
+				this.lsdata = e;
+			},
+			closegaijia() {
+				this.showPricing = false;
+				this.newprice = '';
+				this.lsdata = {};
+			},
+			quedingjiae() {
+				if (uni.getStorageSync('merchantType') == 4) {
+					//获取商品列表（餐饮美食）
+					//console.log('111111111111111111', this.newprice)
+					let postdata = {
+						discountPrice: this.newprice,
+						ids: [this.lsdata.id],
+						status: this.fromData.status,
+					};
+					//console.log('postdata', postdata)
+					this.$api.post('/api/merchant/food/updateDiscountPrice', postdata).then(res => {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "成功",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+						this.closegaijia();
+						this.getRepast(); //获取商品列表
+					})
+
 				} else {
-					this.Shelves = true
-					this.obj = {
-						ids: this.ids,
-						status: 1
+					//获取商品列表（渔家乐）
+					if (this.lsdata.goodsType == 1) {
+						let postdata = {
+							discountPrice: this.newprice,
+							id: this.lsdata.id,
+							status: this.fromData.status,
+						};
+						console.log('postdata', postdata)
+						this.$api.put('/scenic/goods', postdata).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.closegaijia();
+							this.yujialedata(); //获取商品列表（渔家乐）
+						})
+					} else {
+						let postdata = {
+							normalPrice: this.newprice,
+							id: this.lsdata.id,
+							status: this.fromData.status,
+						};
+						console.log('postdata', postdata)
+						this.$api.put('/scenic/goods', postdata).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.closegaijia();
+							this.yujialedata(); //获取商品列表（渔家乐）
+						})
 					}
+
 				}
+			},
+			opengaijia() {},
+
 
+			xiajia1(e, i) {
+				console.log('111111111111111111', e, i)
+				this.lsdata = e;
+				this.xiajiashow1 = true;
+			},
+			xiajia(e, i) {
+				console.log('111111111111111111', e, i)
+				this.lsdata = e;
+				this.xiajiashow = true;
+			},
+			quedingxiajia() {
+				if (uni.getStorageSync('merchantType') == 4) {
+					//获取商品列表（餐饮美食）
+					let postdata = {
+						discountPrice: this.lsdata.discountPrice,
+						ids: [this.lsdata.id],
+						status: this.fromData.status,
+					};
+					this.$api.post('/api/merchant/food/updateStatus', postdata).then(res => {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "下架成功",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+						this.quxiaoxiajia();
+						this.getRepast(); //获取商品列表
+					})
+				} else {
+					//获取商品列表（渔家乐）
+					let postdata = {
+						id: this.lsdata.id,
+						status: this.fromData.status == 1 ? 0 : 1,
+					};
+					this.$api.put('/scenic/goods', postdata).then(res => {
+						this.$refs.uToast.show({
+							type: 'success',
+							title: '',
+							message: "下架成功",
+							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+						})
+						this.quxiaoxiajia();
+						this.yujialedata();
+					})
+				}
+			},
+			quxiaoxiajia() {
+				// console.log('quxiaoxiajia',this.lsdata)
+				this.lsdata = {};
+				this.xiajiashow = false;
+				this.xiajiashow1 = false;
 			},
 
-			GoOnUnder() {
-				this.$api.post('/merchant/hotel/repast/batchPutAway', this.obj).then(res => {
-					console.log(res);
-					if (res.data.code == 0) {
-						this.getRepast()
-						this.showPricingUnder = false
-						this.ids = []
-					} else this.$showToast(res.data.msg);
+			selectPerson(e, i) {
+				if (this.selectedTags.includes(e)) {
+					this.selectedTags = this.selectedTags.filter(t => t !== e);
+				} else {
+					this.selectedTags.push(e);
+				}
+				console.log(' this.selectedTags', this.selectedTags)
+
+			},
+			yujialedata() {
+				this.$api.get('/scenic/goods/page', this.fromData).then(res => {
+					console.log(res.data.data.list);
+					this.roomType = res.data.data.list;
+					this.mytotal = res.data.data.total;
 				})
 			},
+
 			getRepast() {
-				this.Shelves = false
-				this.$api.get('/merchant/hotel/repast/page', this.fromData).then(res => {
-					console.log(res);
-					this.roomType = res.data.data.list
+				this.$api.get('/api/merchant/food/product/page', this.fromData).then(res => {
+					console.log(res.data.data.list);
+					this.roomType = res.data.data.list;
+					this.mytotal = res.data.data.total;
 				})
 			},
-
 			// 区域筛选
 			clickareaShow(e, i) {
-				console.log('111111111111111111', e, i)
-				this.areaShowIndex = i
+
+				this.areaShowIndex = i;
+				this.areaShow = false;
+				this.fromData.sortType = e.id;
+				this.fromData.page = 1;
+				this.getRepast();
 			},
 			// 上架时间
 			areaShowed() {
 				console.log(123);
 				this.areaShow = !this.areaShow
 			},
-			changeTab1(index) {
-				console.log(index);
-				this.current = index;
-				if (index == 0) {
-					this.fromData.status = 1
-					this.getRepast()
+			changeTab1(e, i) {
+				this.roomType = [];
+				this.selectedTags = [];
+				this.current = i;
+				this.fromData.status = e.id;
+				this.fromData.page = 1;
+
+				if (uni.getStorageSync('merchantType') == 4) {
+
+					this.getRepast(); //获取商品列表（餐饮美食）
+
 				} else {
-					this.fromData.status = 0
-					this.getRepast()
-				}
 
+					this.yujialedata(); //获取商品列表（渔家乐）
+				}
 			},
 			// 批量显示
 			showList() {
@@ -362,6 +650,74 @@
 </script>
 
 <style lang="scss" scoped>
+	.queding {
+		width: 750rpx;
+		height: 140rpx;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+
+		.queding1 {
+			width: 330rpx;
+			height: 88rpx;
+			background: #F0F2F5;
+			border-radius: 44rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 88rpx;
+			text-align: center;
+			font-style: normal;
+		}
+
+		.queding2 {
+			width: 330rpx;
+			height: 88rpx;
+			background: #007A69;
+			border-radius: 44rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 88rpx;
+			text-align: center;
+			font-style: normal;
+		}
+	}
+
+	.jiainput {
+		width: 690rpx;
+		height: 100rpx;
+		margin: 0 auto;
+	}
+
+	.gaijiadiv {
+		width: 750rpx;
+		height: 950rpx;
+
+		.toubu {
+			width: 750rpx;
+			height: 110rpx;
+			font-family: PingFang-SC, PingFang-SC;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #333333;
+			line-height: 110rpx;
+			text-align: center;
+			font-style: normal;
+			position: relative;
+
+			.toubux {
+				position: absolute;
+				top: 33rpx;
+				right: 30rpx;
+			}
+		}
+
+
+	}
+
 	.Doublactive {
 		// background-color: #F0F7F6 !important;
 		color: #007A69 !important;
@@ -630,73 +986,49 @@
 	}
 
 	.pop-pop {
-		height: 30vh;
+		height: 65vh;
 		padding: 46rpx 20rpx 0;
-		border-radius: 16rpx 16rpx 0 0;
 
 		.hander-one {
-
-			// display: flex;
-			// justify-content: space-between;
-			text-align: center;
-
-			.image {
-				margin: 0 auto;
-				width: 64rpx;
-				height: 64rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
+			display: flex;
+			justify-content: space-between;
 
 			.text {
+				font-size: 36rpx;
+				color: #333333;
+				font-weight: bold;
 
-				.text1 {
-					margin-top: 24rpx;
-					font-size: 32rpx;
-					color: #111111;
-					font-weight: bold;
-				}
-
-				.text2 {
-					font-size: 28rpx;
-					color: #999999;
-					font-weight: Regular;
-					margin: 23rpx 0 64rpx;
-				}
 			}
 
+			.del {}
 		}
 
 		.hander-two {
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
 			margin: 30rpx 0;
 
-			.pop-btn-del {
-				margin: 0 15rpx;
-				padding: 22rpx 136rpx;
-				font-size: 32rpx;
-				color: #111111;
+			.hander-two-text {
+				font-size: 30rpx;
+				color: #333333;
 				font-weight: Regular;
-				background-color: #F0F2F5;
-				border-radius: 50rpx;
 			}
 
-			.pop-btn-add {
-				border-radius: 50rpx;
-				margin: 0 15rpx;
-				background-color: #1372FF;
-				padding: 22rpx 100rpx;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				font-weight: Regular;
-			}
+			.hander-two-image {
+				display: flex;
+				align-items: center;
 
+				.image {
+					margin: 0 10rpx;
+					width: 30rpx;
+					height: 30rpx;
 
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
 		}
 
 		.hander-three {

pages/HotelMerchandise/index2.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/home/index.vue

@@ -220,16 +220,16 @@
 					onlyFromCamera: true,
 					success: (res) => {
 						console.log('扫描二维码成功,结果:' + res.result);
-						this.$api.get('/merchant/hotel/repast/writeOffOrder?orderCode=' + res.result)
+						let orderId = res.result
+						this.$api.get('/merchant/hotel/repast/writeOffOrder/' + res.result)
 							.then(res => {
+								console.log('0000', res);
 								if (res.data.code == 0) {
-									this.value = ''
 									uni.setStorageSync('list', res.data.data);
 									uni.navigateTo({
-										url: '/pagesHouse/Verification/details'
+										url: '/pages/house/orderDetails?orderId=' + orderId
 									})
 								} else {
-									this.value = ''
 									this.$showToast(res.data.msg)
 								}
 							})

pages/house/orderDetails.vue

@@ -0,0 +1,717 @@
+<template>
+	<view class="page" :style="{'min-height':h+'px','padding-top':(mt)+'px'}">
+		<c-nav-bar title="订单详情" showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
+		<view class="content" style="background-color: #F5F8FA;">
+			<view class="head">
+				<text class="status" v-if="list.orderStatus=='1'">未核销</text>
+				<text class="status" v-if="list.orderStatus=='-2'">待支付</text>
+				<text class="status" v-if="list.orderStatus=='2'">已核销</text>
+				<text class="status" v-if="list.orderStatus=='4'">已取消</text>
+				<text class="status" v-if="list.orderStatus=='5'">已退款</text>
+				<text>￥</text>
+				<text>{{list.orderAmount}}</text>
+			</view>
+			<view class="ticketInfo">
+				<view class="ticketInfo-hander">
+					<view class="images">
+						<image class="image" :src="list.cover" mode="aspectFill"></image>
+					</view>
+					<view class="" style="width: 100%; display: flex; flex-wrap: wrap; justify-content: space-between;">
+						<view class="name">
+							{{list.homestayName}}
+						</view>
+						<view class="date">
+							<text>
+								{{list.comboName}}</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="ticketInfo-demo">
+					<u-row customStyle="margin-bottom: 10px">
+						<u-col span="3">
+							<view class="demo-layout bg-purple">
+								套餐说明
+							</view>
+						</u-col>
+						<u-col span="9">
+							<view class="demo-layout bg-purple-light">
+								{{list.comboExplain}}
+							</view>
+						</u-col>
+					</u-row>
+				</view>
+			</view>
+
+
+
+
+			<!-- 订单信息 -->
+			<view class="orderInfo">
+				<view class="tit">订单信息</view>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">预约时间</text>
+					>
+					<text slot="title" class="val">{{list.repastTime}}</text>
+				</u-cell>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">预约人姓名</text>
+					>
+					<text slot="title" class="val">{{list.guestName}}</text>
+				</u-cell>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">预约手机号</text>
+					>
+					<text slot="title" class="val">{{list.guestPhone}}</text>
+				</u-cell>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">就餐人数</text>
+					>
+					<text slot="title" class="val">{{list.repastNum}}</text>
+				</u-cell>
+
+				<u-cell :border="false">
+					<text slot="icon" class="txt">订单编号</text>
+					>
+					<text slot="title" class="val">{{list.orderCode}}</text>
+					<text slot="right-icon" class="icon"
+						style="border: 1rpx solid #1372FF; border-radius: 50rpx; box-sizing: border-box; color: #1372FF;padding: 2rpx 10rpx; font-size: 22rpx; font-weight: Regular;"
+						@tap="copyOrderNo(list)">复制</text>
+				</u-cell>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">备注</text>
+					>
+					<text slot="title" class="val">{{list.remarks==null?'':list.remarks}}</text>
+				</u-cell>
+				<u-cell :border="false">
+					<text slot="icon" class="txt">合计金额</text>
+					>
+					<text slot="title" class="val">{{list.orderAmount}}</text>
+				</u-cell>
+			</view>
+
+		</view>
+		<view class="btns">
+			<template v-if="list.orderStatus==1">
+				<view class="" @click="toStatus0(list)"
+					style="color:#fff ; border-color: #1372FF; background-color: #1372FF; width: 100%;">
+					确定核销
+				</view>
+			</template>
+			<template v-if="list.orderStatus==-2||list.orderStatus==2||list.orderStatus==5||list.orderStatus==4">
+				<view class="" style="color:#fff ; border-color: #1372FF; background-color: #1372FF; width: 100%;"
+					@click="applyAfterSales(list)">
+					删除订单
+				</view>
+			</template>
+		</view>
+		<u-toast ref="uToast"></u-toast>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				titles: '订单详情',
+				h: uni.getSystemInfoSync().windowHeight,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				value: 1,
+				status: 1,
+				id: '',
+				list: {},
+				bedData: {},
+				id: '',
+				arriveTime: '',
+				arriveTimes: '',
+				leaveTime: '',
+				leaveTimes: '',
+				count: '',
+				orderId: '',
+				price: '',
+				form: {
+					initiator: 2,
+					orderCode: '',
+					status: ''
+				},
+				num: 0,
+				checkInTimeStart: '',
+				checkOutTime: '',
+				checkInRooms: 0,
+
+			}
+		},
+		onLoad(option) {
+			this.id = option.orderId
+			this.getList()
+		},
+		methods: {
+			copyOrderNo(no) {
+				let that = this;
+				// #ifdef H5
+				this.$copyText(no).then(res => {
+					this.$showToast('复制成功');
+				})
+				// #endif
+				// #ifdef MP-WEIXIN
+				uni.setClipboardData({
+					data: no,
+					success(res) {
+						that.$showToast('复制成功');
+					},
+					fail(err) {
+						that.$showToast('复制失败');
+					}
+				})
+				// #endif
+			},
+
+			// 获取详情
+			getList() {
+				this.$api.get(`/merchant/hotel/repast/getRepastOrderInfo/${this.id}`)
+					.then(res => {
+						this.list = res.data.data
+					})
+			},
+			// 删除
+			applyAfterSales(item) {
+				let ids = []
+				ids.push(item.id)
+				this.$api.del('/merchant/hotel/repast', ids).then(res => {
+					console.log(res);
+					if (res.data.code == 0) {
+						uni.navigateTo({
+							url: '/pagesMy/orderList/orderList'
+						})
+					} else this.$showToast(res.data.msg);
+				})
+			},
+			toStatus0(item) {
+				this.$api.get('/merchant/hotel/repast/writeOffOrder/orderCode' + item.orderCode)
+					.then(res => {
+						if (res.data.code == 0) {
+							uni.navigateTo({
+								url: '/pagesMy/orderList/orderList'
+							})
+						} else {
+							this.$showToast(res.data.msg)
+						}
+					})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.listItemed {
+		padding: 13rpx 0;
+		font-size: 26rpx;
+		color: #666;
+		align-items: center;
+
+		.name {
+			font-size: 28rpx;
+			color: #111111;
+			font-weight: bold;
+		}
+
+		.verityInfo {
+			margin: 30rpx 0;
+			line-height: 28rpx;
+			height: 28rpx;
+		}
+
+		.top {
+			margin-bottom: 30rpx;
+		}
+
+		.ticketType {
+			margin-left: 20rpx;
+			font-weight: 400;
+			color: #94A9C8;
+			line-height: 33rpx;
+			height: 33rpx;
+			font-size: 24rpx;
+			background: #F5F8FA;
+			border-radius: 8rpx;
+			padding: 4rpx;
+		}
+	}
+
+	.voucherCode_colse {
+		padding: 20rpx;
+
+		.title {
+
+			height: 80rpx;
+			font-weight: 600;
+			font-size: 31rpx;
+			color: #333;
+			padding: 20rpx 30rpx;
+			line-height: 80rpx;
+			background: #fff;
+			border-radius: 20rpx;
+		}
+
+		.title_info {
+			line-height: 80rpx;
+			font-weight: 600;
+			font-size: 34rpx;
+			color: #333;
+			padding: 0 10rpx;
+		}
+
+		.codeList {
+			// margin-top: 19rpx;
+			padding: 20rpx;
+			background: #fff;
+			border-radius: 20rpx;
+		}
+
+		.listItem {
+			display: flex;
+			justify-content: space-between;
+			padding: 13rpx 19rpx;
+			flex-direction: row;
+			font-size: 26rpx;
+			color: #666;
+			align-items: center;
+
+			.verityInfo {
+				margin: 30rpx 0;
+				line-height: 28rpx;
+				height: 28rpx;
+			}
+
+			.top {
+				margin-bottom: 30rpx;
+			}
+
+			.ticketType {
+				margin-left: 20rpx;
+				font-weight: 400;
+				color: #94A9C8;
+				line-height: 33rpx;
+				height: 33rpx;
+				font-size: 24rpx;
+				background: #F5F8FA;
+				border-radius: 8rpx;
+				padding: 4rpx;
+			}
+
+
+		}
+	}
+
+	.ci_bottom {
+		text-align: center;
+		width: 100%;
+		padding: 0 24rpx 30rpx;
+		box-sizing: border-box;
+		font-weight: 600;
+		font-size: 30rpx;
+		color: #111111;
+		// display: flex;
+		// justify-content: space-between;
+
+	}
+
+	.ci_code {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.voucherCode {
+		margin: 20rpx 23rpx 0;
+		padding: 44rpx 24rpx 20rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		z-index: 2;
+
+		.title {
+			font-weight: 600;
+			font-size: 34rpx;
+			color: #333;
+		}
+
+		.orange {
+			margin: 0 30rpx;
+			font-weight: Regular;
+			font-size: 24rpx;
+			color: #AAAAAA;
+		}
+	}
+
+	.bottom-list {
+		display: flex;
+		margin: 37rpx auto;
+		justify-content: center;
+
+		.image {
+			width: 36rpx;
+			height: 36rpx;
+			margin: 0 8rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.text {
+			font-size: 26rpx;
+			color: #999999;
+			font-weight: Regular;
+		}
+	}
+
+	.minus,
+	.plus {
+		display: flex;
+		align-items: center;
+		// width: 44rpx;
+		// height: 44rpx;
+		// line-height: 44rpx;
+		padding: 10rpx 10rpx;
+		// padding-left: 8rpx;
+
+		border: 1px solid #999;
+		border-radius: 6rpx;
+		text-align: center;
+	}
+
+	page {
+		box-sizing: border-box;
+		background-color: #F5F8FA;
+
+
+		.content {
+			position: relative;
+			z-index: 3;
+			padding-bottom: 160rpx;
+			background-color: content;
+
+			.hand-title {
+				position: absolute;
+				left: 20rpx;
+				top: 100rpx;
+				font-size: 24rpx;
+				color: #fff;
+			}
+		}
+
+	}
+
+
+	.ticketInfo-demo {
+		// border-bottom: 2rpx solid #EFEFEF;
+		margin-top: 40rpx;
+
+		.bg-purple {
+			font-size: 26rpx;
+			color: #808080;
+			font-weight: Regular;
+		}
+
+		.bg-purple-light {
+			font-size: 30rpx;
+			color: #111111;
+			font-weight: Regular;
+		}
+	}
+
+	.two-center-two {
+		box-sizing: border-box;
+
+		.tit {
+			font-size: 32rpx;
+			color: #333333;
+			margin: 20rpx 0;
+		}
+
+		.df-one {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: bold;
+
+			// .bg-purple-dark {
+			// 	margin-left: 140rpx;
+			// }
+
+			// .demo-layout {
+			// 	margin-left: 30rpx;
+			// }
+		}
+
+		.df-two {
+			border-bottom: 2rpx solid #EFEFEF;
+
+			.bg-purple {
+				// margin-right: 100rpx;
+				width: 182rpx;
+				margin-left: -13rpx;
+			}
+
+			.bg-purple-dark {
+				// margin-left: 50rpx;
+			}
+
+			.bg-purple,
+			.bg-purple-dark {
+				font-size: 26rpx;
+				color: #777777;
+				font-weight: Regular;
+				text-align: center;
+
+				text {
+					margin: 0 8rpx;
+				}
+			}
+
+			.bg-purple-light {
+				font-size: 24rpx;
+				color: #666666;
+				border: 1rpx solid #666666;
+				text-align: center;
+				border-radius: 50rpx;
+			}
+
+		}
+	}
+
+
+	.prices-content {
+		margin: 24rpx 0;
+
+		.txt1 {
+			font-size: 32rpx;
+			color: #111111;
+			font-weight: bold;
+		}
+
+		.txt2 {
+			margin: 12rpx 0;
+			font-size: 26rpx;
+			color: #777777;
+			font-weight: Regular;
+		}
+
+	}
+
+
+
+	.orderInfo {
+		box-sizing: border-box;
+		background-color: #fff;
+		border-radius: 16rpx;
+		width: 96%;
+		margin: 0 auto 20rpx;
+		padding: 0 0 30rpx;
+
+		.tit {
+			font-size: 32rpx;
+			color: #333;
+			padding-left: 30rpx;
+			padding-top: 40rpx;
+			font-weight: 600;
+			margin-bottom: 20rpx;
+		}
+
+		.txt {
+			font-size: 28rpx;
+			color: #666;
+			width: 140rpx;
+		}
+
+		.icon {
+			font-size: 28rpx;
+			color: #666;
+		}
+
+		.val {
+			font-size: 28rpx;
+			color: #333333;
+			margin: 0 20rpx 0 30rpx;
+			font-weight: Regular;
+		}
+
+	}
+
+	.ticketInfo {
+		box-sizing: border-box;
+		width: 96%;
+		margin: 0 auto 20rpx;
+		padding: 44rpx 24rpx 10rpx;
+		border-radius: 20rpx;
+		position: relative;
+		background-color: #fff;
+		z-index: 2;
+
+		.ticketInfo-hander {
+			display: flex;
+
+			.images {
+				width: 136rpx;
+				height: 136rpx;
+				border-radius: 12rpx;
+				margin-right: 20rpx;
+
+				.image {
+					border-radius: 12rpx;
+					// width: 100%;
+					// height: 100%;
+					width: 136rpx;
+					height: 136rpx;
+				}
+			}
+
+		}
+
+		.name {
+			font-size: 32rpx;
+			color: #333;
+			font-weight: bold;
+			width: 100%;
+		}
+
+		.date {
+			// padding: 20rpx 0 32rpx;
+			padding-top: 30rpx;
+			font-size: 28rpx;
+			color: #666666;
+			font-weight: Regular;
+		}
+
+
+
+		.topHead {
+			width: 96%;
+			margin: 0 auto;
+			background-color: #F5F8FA;
+			padding: 28rpx 0 28rpx 84rpx;
+			border-radius: 16rpx;
+			position: relative;
+
+			text {
+				position: absolute;
+				left: 0;
+				top: 0;
+				z-index: 1;
+				border-radius: 16rpx 0 0 16rpx;
+				width: 48rpx;
+				color: #fff;
+				font-size: 20rpx;
+				background-color: #484F61;
+				text-align: center;
+				height: 100%;
+				padding: 15rpx 10rpx 0;
+
+			}
+
+			.p {
+				font-size: 28rpx;
+				color: #333;
+
+				&:nth-of-type(1) {
+					font-weight: 600;
+					margin-bottom: 16rpx;
+				}
+			}
+
+
+		}
+
+		.code {
+			margin-top: 40rpx;
+			text-align: center;
+			position: relative;
+
+			.cover,
+			.sx {
+				position: absolute;
+				background-color: rgba(255, 255, 255, 0.5);
+				width: 340rpx;
+				height: 340rpx;
+				top: 66rpx;
+				left: 50%;
+				transform: translate(-50%, 0);
+			}
+
+			.sx {
+				width: 120rpx;
+				height: 120rpx;
+				top: 150rpx;
+				background: transparent;
+			}
+
+			.txt {
+				font-size: 28rpx;
+			}
+
+			image {
+				width: 340rpx;
+				height: 340rpx;
+				margin: 30rpx 0;
+			}
+		}
+	}
+
+	.head {
+		box-sizing: border-box;
+		padding: 34rpx 24rpx 60rpx;
+		display: flex;
+		position: relative;
+		z-index: 2;
+
+		text {
+			color: #111111;
+
+			&:nth-child(1),
+			&:nth-child(3) {
+				font-size: 44rpx;
+			}
+
+			&:nth-child(2) {
+				flex: 1;
+				text-align: right;
+				width: 100px;
+				font-size: 36rpx;
+			}
+		}
+	}
+
+
+	.btns {
+		box-sizing: border-box;
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		z-index: 4;
+		left: 0;
+		display: flex;
+		padding: 32rpx 32rpx 50rpx;
+		background-color: #fff;
+		gap: 0 20rpx;
+		box-shadow: 0 -8rpx 16rpx rgba(0, 0, 0, 0.06);
+
+
+		&>view {
+			width: calc(50% - 15rpx);
+			height: 80rpx;
+			border-radius: 46rpx;
+			// border: 1rpx solid #999999;
+			line-height: 80rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: Bold;
+			color: #111111;
+			background-color: #F6F6F6;
+		}
+	}
+</style>

pages/house/orderInfo.vue

@@ -137,14 +137,22 @@
 				orderId: '',
 				orderInfo: {
 					detailFormList: []
-				}
+				},
+				id: ''
 			}
 		},
 		onLoad(opt) {
 			if (opt.orderId) {
-				this.orderId = opt.orderId;
-				this.getOrderInfo()
+				if (opt.orderType == 201) {
+					this.id = opt.orderId;
+					this.getrepast()
+				} else {
+					this.orderId = opt.orderId;
+					this.getOrderInfo()
+				}
+
 			}
+
 		},
 		methods: {
 			// 获取数据
@@ -159,6 +167,18 @@
 					}
 				})
 			},
+			// 获取数据
+			getrepast() {
+				this.$api.get(`/merchant/hotel/repast${this.id}`).then((res) => {
+					if (res.data.code == 0) {
+						this.orderInfo = res.data.data
+						if (new Date(this.orderInfo.arriveDate).Format('yyyy-MM-dd') == new Date().Format(
+								'yyyy-MM-dd')) {
+							this.showRuzhu = true;
+						}
+					}
+				})
+			},
 			// 客房状态
 			getStatusText() {
 				if (this.orderInfo.orderStatus === -1) {

pagesHouse/HotelMerchandise/index.vue

@@ -161,7 +161,7 @@
 			:content="fromData.status==0?'下架后商品不可在前台继续售卖，是否继续?':'上架后商品可在前台售卖，是否继续?'" showConfirmButton='true'
 			showCancelButton='true' @confirm='quedingxiajia' @cancel='quxiaoxiajia'></u-modal>
 
-<!-- 下架弹出框渔家乐 -->
+		<!-- 下架弹出框渔家乐 -->
 		<u-modal :show="xiajiashow1" :title="fromData.status==1?'下架选中的商品':'上架选中的商品'"
 			:content="fromData.status==1?'下架后商品不可在前台继续售卖，是否继续?':'上架后商品可在前台售卖，是否继续?'" showConfirmButton='true'
 			showCancelButton='true' @confirm='quedingxiajia' @cancel='quxiaoxiajia'></u-modal>
@@ -201,7 +201,7 @@
 				current: 0,
 				canyinmeishi: false,
 				xiajiashow: false,
-					xiajiashow1: false,
+				xiajiashow1: false,
 				shanchushow: false,
 				tabList: [],
 				homestayId: uni.getStorageSync('homestayId') || 0,
@@ -394,30 +394,30 @@
 					}
 
 				} else {
-if (this.selectedTags.length == 0) {
-					this.$refs.uToast.show({
-						type: 'success',
-						title: '',
-						message: "请选择数据",
-						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
-					})
-
-				} else {
-					let namesArray = this.selectedTags.map(obj => obj.id);
-
-					//status: this.fromData.status,
-					this.$api.del('/scenic/goods', namesArray).then(res => {
+					if (this.selectedTags.length == 0) {
 						this.$refs.uToast.show({
 							type: 'success',
 							title: '',
-							message: "成功",
+							message: "请选择数据",
 							iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
 						})
-						this.selectedTags = [];
-						this.Selected = false;
-						this.yujialedata(); //获取商品列表（渔家乐）
-					})
-				}	
+
+					} else {
+						let namesArray = this.selectedTags.map(obj => obj.id);
+
+						//status: this.fromData.status,
+						this.$api.del('/scenic/goods', namesArray).then(res => {
+							this.$refs.uToast.show({
+								type: 'success',
+								title: '',
+								message: "成功",
+								iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+							})
+							this.selectedTags = [];
+							this.Selected = false;
+							this.yujialedata(); //获取商品列表（渔家乐）
+						})
+					}
 				}
 			},
 			shanchu(e, i) {
@@ -541,7 +541,7 @@ if (this.selectedTags.length == 0) {
 			opengaijia() {},
 
 
-xiajia1(e, i) {
+			xiajia1(e, i) {
 				console.log('111111111111111111', e, i)
 				this.lsdata = e;
 				this.xiajiashow1 = true;

pagesHouse/Verification/check.vue

@@ -34,7 +34,8 @@
 						身份证 {{i.touristCode}}
 					</view>
 				</view>
-				<u-icon name="minus-circle" size="36" color="#FEA400" @tap="jian(item)" v-if="i.remark!='book'"></u-icon>
+				<u-icon name="minus-circle" size="36" color="#FEA400" @tap="jian(item)"
+					v-if="i.remark!='book'"></u-icon>
 			</view>
 		</view>
 		<view class="btn">
@@ -51,40 +52,40 @@
 				date: new Date().Format('yyyy-MM-dd'),
 				show: false,
 				data: [],
-				merchantId:uni.getStorageSync('merchantId'),
-				playTime:'',
-				boatNo:'',
-				type:'',
-				orderInfo:{},
-				keyName:''
+				merchantId: uni.getStorageSync('merchantId'),
+				playTime: '',
+				boatNo: '',
+				type: '',
+				orderInfo: {},
+				keyName: ''
 			}
 		},
 		onLoad(opt) {
-			that=this;
-			this.playTime=opt.playTime||'';
-			this.boatNo=opt.boatNo||'';
+			that = this;
+			this.playTime = opt.playTime || '';
+			this.boatNo = opt.boatNo || '';
 			this.getOrderInfo();
 			//获取上次核销缓存
-			
+
 		},
 		methods: {
-			back(){
-				this.keyName=this.orderInfo.playDate+this.orderInfo.playTime+this.boatNo;
-				uni.setStorageSync(this.keyName,JSON.stringify(this.data));
+			back() {
+				this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
+				uni.setStorageSync(this.keyName, JSON.stringify(this.data));
 				//decodeURIComponent
 			},
-			getOrderInfo(){
-				this.$api.post('/scenic/order/queryStartOrderInfo',{
-					merchantId:this.merchantId,
-					boatNo:this.boatNo
-				}).then(res=>{
+			getOrderInfo() {
+				this.$api.post('/scenic/order/queryStartOrderInfo', {
+					merchantId: this.merchantId,
+					boatNo: this.boatNo
+				}).then(res => {
 					console.log(res.data)
-					if(res.data.code==0){
+					if (res.data.code == 0) {
 						console.log(res)
-						this.orderInfo=res.data.data;
-						this.keyName=this.orderInfo.playDate+this.orderInfo.playTime+this.boatNo;
+						this.orderInfo = res.data.data;
+						this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
 						console.log(uni.getStorageSync(this.keyName))
-						this.data=JSON.parse(uni.getStorageSync(this.keyName))||[];
+						this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
 						console.log(this.data)
 					}
 				})
@@ -94,7 +95,7 @@
 					success: (res) => {
 						console.log('扫码结果：' + res.result);
 						// 扫码成功后的操作，例如：
-						that.handleScanResult(res.result,type);
+						that.handleScanResult(res.result, type);
 					},
 					fail: (err) => {
 						console.error('扫码失败：' + err);
@@ -102,32 +103,31 @@
 				});
 			},
 			// 处理扫码结果的函数，可以根据实际需求进行扩展
-			handleScanResult(result,type) {
+			handleScanResult(result, type) {
 				// 例如：导航到某个页面，或者处理其他业务逻辑
-				let sendData={};
-				sendData.playDate=this.orderInfo.playDate;
-				sendData.playTime=this.orderInfo.playTime;
-				sendData.playLength=this.orderInfo.playLength||1;
-				sendData.merchantId=this.orderInfo.merchantId;
-				sendData.orderType=this.orderInfo.orderType;
-				sendData.type=type;
-				sendData.writeOffCode="70";
+				let sendData = {};
+				sendData.playDate = this.orderInfo.playDate;
+				sendData.playTime = this.orderInfo.playTime;
+				sendData.playLength = this.orderInfo.playLength || 1;
+				sendData.merchantId = this.orderInfo.merchantId;
+				sendData.orderType = this.orderInfo.orderType;
+				sendData.type = type;
+				sendData.writeOffCode = "70";
 				console.log(sendData)
-				
-				this.$api.post('/scenic/order/scanCode',sendData).then(res=>{
+
+				this.$api.post('/scenic/order/scanCode', sendData).then(res => {
 					console.log(res.data)
-					if(res.data.code==0){
-						console.log(this.data.findIndex(item=>{
-							item.touristCode==res.data.data.touristCode
+					if (res.data.code == 0) {
+						console.log(this.data.findIndex(item => {
+							item.touristCode == res.data.data.touristCode
 						}))
-						if(this.data.findIndex((item)=>{
-							return item.touristCode==res.data.data.touristCode
-						})>-1){
+						if (this.data.findIndex((item) => {
+								return item.touristCode == res.data.data.touristCode
+							}) > -1) {
 							this.$showToast('该核验码已扫')
-						}else{
+						} else {
 							this.data.push(res.data.data)
 						}
-						
 					}
 				})
 			},
@@ -136,17 +136,18 @@
 					url: '/pagesHouse/Verification/check'
 				})
 			},
-			hexiao(){
-				if(this.data.length==0){
+			hexiao() {
+				if (this.data.length == 0) {
 					this.$showToast('请选择核销人')
 				}
-				this.$api.post('/scenic/order/sailWriteOff',{
-					orderType:this.orderInfo.orderType,
-					touristList:this.data
-				}).then(res=>{
-					if(res.data.code==0){
+				this.$api.post('/scenic/order/sailWriteOff', {
+					orderType: this.orderInfo.orderType,
+					touristList: this.data
+				}).then(res => {
+					if (res.data.code == 0) {
 						uni.redirectTo({
-							url:"/pagesHouse/Verification/success?boatNo="+this.boatNo+'&price='+this.orderInfo.realPrice
+							url: "/pagesHouse/Verification/success?boatNo=" + this.boatNo + '&price=' +
+								this.orderInfo.realPrice
 						})
 					}
 				})
@@ -162,27 +163,27 @@
 	}
 
 	.btn {
-		    position: fixed;
-		    bottom: 0;
-		    left: 0;
-		    z-index: 1;
-		    padding: 16rpx 30rpx 36rpx 30rpx;
-		    width: 100%;
-		    box-sizing: border-box;
-		    background: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 1;
+		padding: 16rpx 30rpx 36rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+		background: #fff;
 
 		text {
 			display: block;
-			    background-color: #007A69;
-			    color: #007A69;
-			    color: #fff;
-			    height: 88rpx;
-			    line-height: 88rpx;
-			    border-radius: 44rpx;
-			    text-align: center;
-			    font-size: 32rp;
-			    font-weight: bold;
-			    box-sizing: border-box;
+			background-color: #007A69;
+			color: #007A69;
+			color: #fff;
+			height: 88rpx;
+			line-height: 88rpx;
+			border-radius: 44rpx;
+			text-align: center;
+			font-size: 32rp;
+			font-weight: bold;
+			box-sizing: border-box;
 
 
 		}

pagesMy/orderList/orderList.vue

@@ -146,8 +146,10 @@
 					if (res.data.code == 0) {
 						this.dataList = res.data.data.list
 						this.dataList.forEach((i, index) => {
-							this.dataList[index].arriveDate = i.arriveDate.slice(0, 10)
-							this.dataList[index].leaveDate = i.leaveDate.slice(0, 10)
+							if (i.orderType == 2) {
+								this.dataList[index].arriveDate = i.arriveDate.slice(0, 10)
+								this.dataList[index].leaveDate = i.leaveDate.slice(0, 10)
+							}
 						})
 						console.log(this.dataList, 'this.dataList');
 					} else {
@@ -170,8 +172,10 @@
 					if (res.data.code == 0) {
 						this.dataList = res.data.data.list
 						this.dataList.forEach((i, index) => {
-							this.dataList[index].arriveDate = i.arriveDate.slice(0, 10)
-							this.dataList[index].leaveDate = i.leaveDate.slice(0, 10)
+							if (i.orderType == 2) {
+								this.dataList[index].arriveDate = i.arriveDate.slice(0, 10)
+								this.dataList[index].leaveDate = i.leaveDate.slice(0, 10)
+							}
 						})
 					} else {
 						uni.showToast({
@@ -182,9 +186,18 @@
 				}))
 			},
 			handleDetail(item) {
-				uni.navigateTo({
-					url: '/pages/house/orderInfo?orderId=' + item.id
-				})
+				if (item.orderType == 2) {
+					uni.navigateTo({
+						url: '/pages/house/orderInfo?orderId=' + item.id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/house/orderDetails?orderId=' + item.id
+					})
+				}
+
+
+
 			},
 			changeTab(index) {
 				console.log(index, 'index------');