渔家乐

components/uNavBar/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="background-color: #fff;">
 	<u-navbar :title="title" :bgColor="bgColor" :titleStyle="titleStyle">
 		<view class="u-nav-slot" slot="left" style="display: flex;">
 			<u-icon v-if="showIcon" name="arrow-left" size="44" :color="leftIconColor" @tap="toBack(backUrl)"></u-icon>

components/uNavBar1/index.vue

@@ -1,11 +1,11 @@
 <template>
-	<u-navbar class="nav" :title="title" :leftIconSize="36" bgColor="#ffffff" leftIconColor="#fff"
+	<u-navbar class="nav" :title="title" :leftIconSize="36" bgColor="#007A69" leftIconColor="#fff"
 		:titleStyle="titleStyle">
 		<view class="u-nav-slot" slot="left">
 			<u-icon name="arrow-left" size="44" color='#fff' @tap="toBack(backUrl)"></u-icon>
-			<u-line v-if="showHome" direction="column" color='#fff' :hairline="false" length="0"
+		<!-- 	<u-line v-if="showHome" direction="column" color='#fff' :hairline="false" length="0"
 				margin="0 15rpx"></u-line>
-			<u-icon v-if="showHome" name="home" color='#fff' size="48" @tap="toHome"></u-icon>
+			<u-icon v-if="showHome" name="home" color='#fff' size="48" @tap="toHome"></u-icon> -->
 		</view>
 	</u-navbar>
 </template>
@@ -34,7 +34,7 @@
 				titleStyle: {
 					fontSize: '36rpx',
 					fontWeight: "bold",
-					color: "#111111"
+					color: "#fff"
 				},
 				tabUrls: [
 					'/pages/index/index',
@@ -72,7 +72,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	::v-deep .u-nav-slot {
 		display: flex;
 		padding: 8rpx 16rpx;

pages.json

@@ -200,6 +200,30 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "Verification/record",
+					"style": {
+						"navigationBarTitleText": "核销记录",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Verification/recordCy",
+					"style": {
+						"navigationBarTitleText": "核销记录",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "Verification/success",
+					"style": {
+						"navigationBarTitleText": "核销结果",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				},
 				{
 					"path": "Verification/ems",
@@ -260,7 +284,8 @@
 					"path": "Mine/ordersList/details/details",
 					"style": {
 						"navigationBarTitleText": "订单详情",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
 					}
 				},
 				{

pagesHouse/Mine/ordersList/details/details.vue

@@ -6,7 +6,7 @@
 			<view class="head">
 				<text v-if="merchantType==10">{{FishJialeOcfg[infoMation.status]}}</text>
 				<text v-esle>{{FishJialeOcfg2[infoMation.orderStatus]}}</text>
-				<view class="time">
+				<view class="time" v-if="merchantType==4">
 					有效期：{{infoMation.activityStartTime&&infoMation.activityStartTime.substring(0,10)}}至{{infoMation.activityEndTime&&infoMation.activityEndTime.substring(0,10)}}
 				</view>
 			</view>
@@ -20,27 +20,29 @@
 					</view>
 				</view> -->
 				<view v-if="merchantType==10" class="dateAndType">
-					<u-icon name="calendar" size="32" color="#272636"></u-icon>
+					<u-icon name="calendar" size="40" color="#272636" style="display: flex;align-items: center;"></u-icon>
 					<text>{{infoMation.payTime}}出发/{{infoMation.orderType==3?'拼船':'包船'}}</text>
 				</view>
 				<view class="ticketInfo-hander">
 					<view class="image">
-						<image :src="infoMation.productImg|delArr" mode="aspectFill"></image>
+						<image :src="infoMation.coverImg" mode="aspectFill"></image>
 					</view>
 					<view class="right">
 						<view class="name">
-							{{infoMation.productName}}
+							{{infoMation.goodsName}}
 						</view>
 						<view class="tip">
-							周一至周日 · 无需预约
+							<text v-if='infoMation.orderType==3'>价格：￥{{infoMation.avePrice}}/人</text>
+							<text v-if='infoMation.orderType==2'>价格：￥{{infoMation.totalPrice}}/艘</text>
+							<text v-if='infoMation.orderType==1'>价格：￥{{infoMation.discountPrice}}/艘</text>
 						</view>
 						<view class="price">
-							<text>￥</text><text>{{infoMation.realityPay}}</text>
+							<text>数量：</text>X<text>{{infoMation.detailDto.length}}</text>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="foods">
+			<view class="foods" v-if="merchantType==4">
 				<view class="tit">
 					套餐明细
 				</view>
@@ -51,13 +53,13 @@
 				</view>
 			</view>
 			<!-- 游客信息 -->
-			<view class="orderInfo " style="padding-bottom: 30rpx;">
+			<view class="orderInfo yk" style="padding-bottom: 30rpx;">
 				<view class="tit">游客信息</view>
-				<u-cell :border="false" v-for="(i,index) in infoMation.aa">
-					<text slot="icon" class="txt">订单编号</text>
+				<u-cell :border="false" v-for="(i,index) in infoMation.detailDto">
+					<text slot="icon" class="txt">{{i.touristName}}</text>
 					>
-					<text slot="title" class="val">{{infoMation.orderCode}}</text>
-					<text slot="right-icon">复制</text>
+					<text slot="title" class="val">{{i.touristCode}}</text>
+					<text slot="right-icon">航班号:{{infoMation.boatNo||''}}</text>
 				</u-cell>
 			</view>
 			<!-- 订单信息 -->
@@ -102,17 +104,17 @@
 					<u-cell :border="false">
 						<text slot="icon" class="txt">下单时间</text>
 						>
-						<text slot="title" class="val">{{infoMation.realityPay}}</text>
+						<text slot="title" class="val">{{infoMation.linkName}}</text>
 					</u-cell>
 					<u-cell :border="false">
 						<text slot="icon" class="txt">联系方式</text>
 						>
-						<text slot="title" class="val">{{infoMation.realityPay}}</text>
+						<text slot="title" class="val">{{infoMation.linkPhone}}</text>
 					</u-cell>
 					<u-cell :border="false">
 						<text slot="icon" class="txt">支付方式</text>
 						>
-						<text slot="title" class="val">{{infoMation.phone}}</text>
+						<text slot="title" class="val">{{infoMation.payType==1?'微信':'支付宝'}}</text>
 					</u-cell>
 					<u-cell :border="false">
 						<text slot="icon" class="txt">总计</text>
@@ -124,7 +126,7 @@
 		</view>
 		<!-- 餐饮 -->
 		<view class="btns" v-if="merchantType==4&&infoMation.orderStatus==4">
-			<view class="detail del" @tap="hexiao()" v-if="infoMation.orderStatus==4">
+			<view class="detail del" @tap="hexiao2()" v-if="infoMation.orderStatus==4">
 				核销订单
 			</view>
 			<!-- <template v-else>
@@ -198,6 +200,13 @@
 			}
 		},
 		methods: {
+			init(){
+				if (this.merchantType == 10) {
+					this.info()
+				} else {
+					this.info2()
+				}
+			},
 			//渔家乐
 			info() {
 				this.$api.get('/api/fishering/personCenterOrderDetail/' + this.orderCode).then(res => {
@@ -237,10 +246,26 @@
 				})
 				// #endif
 			},
+			hexiao() {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定核销订单？',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.get('/scenic/order/orderWriteOff/'+this.infoMation.orderCode).then(res => {
+								if (res.data.code === 0) {
+									that.$showToast('订单已核销');
+									that.init();
+								} else that.$showToast(res.data.msg)
+							})
+						}
+					}
+				});
+			},
 			// 核销
-			hexiao(item) {
+			hexiao2() {
 				let that = this;
-				if (this.merchantType == 10) {} else {}
 				uni.showModal({
 					title: '提示',
 					content: '确定核销订单？',
@@ -387,6 +412,9 @@
 			font-weight: Regular;
 			margin: 0 20rpx 0 30rpx;
 		}
+		&.yk{
+			.txt,.icon,.val {font-size: 30rpx;color: #333;}
+		}
 
 	}
 
@@ -408,6 +436,8 @@
 			color: #333333;
 			line-height: 36rpx;
 			margin-bottom: 48rpx;
+			display: flex;
+			align-items: center;
 		}
 
 		.hander-titles {

pagesHouse/Mine/ordersList/index.vue

@@ -33,7 +33,7 @@
 						</view>
 					</view>
 					<!-- 待使用 -->
-					<view class="bottom" @click="handleDetail(item)" v-if="item.status==1">
+					<view class="bottom" @click="hexiao(item)" v-if="item.status==1">
 						<view class="detail s1">
 							核销订单
 						</view>
@@ -66,7 +66,7 @@
 						</view>
 					</view>
 					<!-- 待使用 -->
-					<view class="bottom" @click="handleDetail(item)" v-if="item.state==1">
+					<view class="bottom" @click="hexiao2(item)" v-if="item.state==1">
 						<view class="detail s1">
 							核销订单
 						</view>
@@ -158,18 +158,20 @@
 			}
 		},
 		onLoad(option) {
-			if (option.type) {
-				const type = parseInt(option.type);
+			if (option.typeTxt) {
+				const typeTxt = option.typeTxt;
 				//其他页面入参
-				// if (type == 0) {
-				// 	this.changeStatus(1)
-				// } else if (type == 4) {
-				// 	this.changeStatus(2)
-				// } else if (type == 3) {
-				// 	this.changeStatus(3)
-				// } else if (type == -3) {
-				// 	this.changeStatus(4)
-				// }
+				if (typeTxt =='待付款') {
+					this.changeStatus(1)
+				} else if (typeTxt =='待使用') {
+					this.changeStatus(2)
+				} else if (typeTxt =='已完成') {
+					this.changeStatus(3)
+				} else if (typeTxt == '退款售后') {
+					this.changeStatus(4)
+				}else if (typeTxt == '已取消') {
+					this.changeStatus(0)
+				}
 			} else {
 				if(this.merchantType==10){
 					this.getOrderList()
@@ -186,11 +188,44 @@
 					url: '/pagesHouse/Mine/ordersList/details/details?orderCode=' + item.orderCode
 				})
 			},
-			// 核销
-			handleDetail() {
-				uni.navigateTo({
-					url: '/pagesHouse/Verification/index'
-				})
+			hexiao(item) {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定核销订单？',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.get('/scenic/order/orderWriteOff/'+item.orderCode).then(res => {
+								if (res.data.code === 0) {
+									that.$showToast('订单已核销');
+									that.init();
+								} else that.$showToast(res.data.msg)
+							})
+						}
+					}
+				});
+			},
+			// 核销餐饮
+			hexiao2(item) {
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定核销订单？',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.post('/api/merchant/food/scenic/merchant/order/verifyOrderQrCode', {
+								merchantId: that.merchantId,
+								orderCode: item.orderCode,
+								type: 4
+							}).then(res => {
+								if (res.data.code === 0) {
+									that.$showToast('订单已核销');
+									that.init();
+								} else that.$showToast(res.data.msg)
+							})
+						}
+					}
+				});
 			},
 			init() {
 				this.pageIndex = 1;
@@ -263,18 +298,7 @@
 					} else that.$showToast(res.data.msg);
 				})
 			},
-			hexiao(item) {
-				// this.$api.post('/scenic/order/sailWriteOff',{
-				// 	orderType:item.orderType,
-				// 	touristList:this.data
-				// }).then(res=>{
-				// 	if(res.data.code==0){
-				// 		uni.redirectTo({
-				// 			url:"/pagesHouse/Verification/success?boatNo="+this.boatNo+'&price='+this.orderInfo.realPrice
-				// 		})
-				// 	}
-				// })
-			}
+			
 		}
 	}
 </script>
@@ -293,7 +317,7 @@
 	}
 
 	.pages {
-		background: #F9FAFC;
+		// background: #F9FAFC;
 		box-sizing: border-box;
 		padding-bottom: 50rpx;
 

pagesHouse/Verification/index.vue

@@ -7,8 +7,6 @@
 				<text>核销</text>
 			</view>
 		</view>
-		<view @tap="jj()">111</view>
-		<view @tap="dd()">222</view>
 	</view>
 </template>
 

pagesHouse/Verification/record.vue

@@ -114,6 +114,7 @@
 
 			image {
 				width: 80rpx;
+				min-width: 80rpx;
 				height: 80rpx;
 
 			}

pagesHouse/Verification/recordCy.vue

@@ -0,0 +1,151 @@
+<template>
+	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
+		<c-nav-bar title="核销记录"></c-nav-bar>
+		<view class="top">
+			<view class="time" @click="show=true">
+				<u-icon name="calendar" :label="dateStr" labelPos="right" labelColor="#666" color="#666" space="7px"
+					size="25px"></u-icon>
+				<u-icon name="arrow-down" color="#999" size="20px" style="margin-left: 20rpx;"></u-icon>
+			</view>
+			<view class="right">共{{totalNum}}单 收入¥{{totalAmount}}</view>
+		</view>
+		<view class="list">
+			<view class="item" v-for="(item,index) in data" :key="index">
+				<image :src="item.productImg|delArr"></image>
+				<view class="mid">
+					<text>{{item.productName}}</text>
+					<text>核销时间：{{item.writeOffTime}}</text>
+				</view>
+				<view class="price">¥{{item.realityPay}}</view>
+			</view>
+		</view>
+		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
+			visibleItemCount="6" mode="year-month"></u-datetime-picker>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dateStr: new Date().Format('yyyy年-MM月'),
+				date: new Date().Format('yyyy-MM'),
+				show: false,
+				k: '',
+				data: [],
+				value1: Number(new Date()),
+				merchantId: uni.getStorageSync('merchantId'),
+				totalAmount: 0,
+				totalNum: 0
+			}
+		},
+		filters: {
+			delArr(val) {
+				if (val) {
+					return val.split(',')[0]
+				}
+		
+			}
+		},
+		onLoad() {
+			this.getdata();
+		},
+		methods: {
+			getdata() {
+				this.$api.post('/api/merchant/food/getMerchantFoodWriteOffList', {
+					dateType:1,
+					merchantId: this.merchantId,
+					queryDate: this.date
+				}).then(res => {
+					if (res.data.code == 0) {
+						this.totalAmount = res.data.data.orderAmount;
+						this.totalNum = res.data.data.orders;
+						this.data=res.data.data.merchantOrderDTOS;
+					}
+					console.log(res)
+				})
+			},
+			confirmDate(e) {
+				// 创建一个Date对象并传入时间戳
+				const date = new Date(e.value);
+				// 使用Date对象的方法获取年、月、日、小时、分钟和秒
+				const year = date.getFullYear();
+				const month = ('0' + (date.getMonth() + 1)).slice(-2);
+				const day = ('0' + date.getDate()).slice(-2);
+				// 格式化时间
+				let formattedTime = "";
+				formattedTime = `${year}-${month}`;
+				this.dateStr = `${year}年-${month}月`
+				this.date = formattedTime;
+				this.show = false;
+				this.getdata()
+			},
+
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.page{
+		box-sizing: border-box;
+	}
+	.top {
+		padding: 24rpx 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.time {
+			display: flex;
+			align-items: center;
+			gap: 0 10rpx;
+		}
+
+		.right {
+			color: #999;
+			font-size: 24rpx;
+
+		}
+
+	}
+
+	.list {
+		padding: 0 30rpx;
+
+		.item {
+			padding: 30rpx 0;
+			border-bottom: 1rpx solid #EFEFEF;
+			display: flex;
+			justify-content: space-between;
+
+			image {
+				width: 136rpx;
+				min-width: 136rpx;
+				height: 136rpx;
+
+			}
+
+			.mid {
+				margin: 0 30rpx 0 20rpx;
+
+				text {
+					display: inline-block;
+					font-size: 28rpx;
+					color: #777;
+
+					&:first-child {
+						font-size: 30rpx;
+						color: #111;
+						font-weight: bold;
+						margin: 18rpx 0;
+					}
+				}
+			}
+
+			.price {
+				font-size: 32rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
+</style>

pagesHouse/home/bill.vue

@@ -14,23 +14,36 @@
 			<view class="money">
 				<view>
 					<text>收入金额</text>
-					<text class="in">+{{info.orderAmount||0}}</text>
-					<text>{{info.orders||0}}笔</text>
+					<text class="in">+{{merchantType==10?info.paymentAmount||0:info.orderAmount||0}}</text>
+					<text>{{merchantType==10?info.paymentCount:info.orders||0}}笔</text>
 				</view>
 				<view>
 					<text>退款金额</text>
-					<text>{{info.refundOrderAmount||0}}</text>
-					<text>{{info.refundOrders||0}}笔</text>
+					<text>{{merchantType==10?info.refundAmount:info.refundOrderAmount||0}}</text>
+					<text>{{merchantType==10?info.refundCount:info.refundOrders||0}}笔</text>
 				</view>
 			</view>
-			<view class="li" v-for="(item,index) in info.fishermanOrderDTOS" :key="index" @click="detail(item)">
+			<template v-if="merchantType==10">
+				<view class="li" v-for="(item,index) in info.pageData.list" :key="index" @click="detail(item)">
+					<view class="left">
+						<text>{{item.playDate}} {{item.playTime}}出发/{{item.orderType==2?'包船':'拼船'}}/{{item.boatNo}}</text>
+						<text>{{item.payTime}}</text>
+					</view>
+					<view class="right">+{{item.realPrice}}</text>
+					</view>
+				</view>
+			</template>
+			<template v-if="merchantType==4">
+			<view class="li" v-for="(item,index) in info.merchantOrderDTOS" :key="index" @click="detail(item)">
 				<view class="left">
-					<text>{{item.thingName}}</text>
+					<text>{{item.productName}}</text>
 					<text>{{item.orderTime}}</text>
 				</view>
-				<view class="right">+{{item.price}}</text>
+				<view class="right">+{{item.realityPay}}</text>
 				</view>
 			</view>
+			</template>
+			
 		</view>
 		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
 			mode="date"></u-datetime-picker>
@@ -54,10 +67,16 @@
 					refundOrders: 0,
 
 				},
+				merchantId: uni.getStorageSync('merchantId'),
+				merchantType: uni.getStorageSync('merchantType'),
 			}
 		},
 		onLoad() {
-			this.getList()
+			if(this.merchantType==10){
+				this.getList()
+			}else{
+				this.getList2()
+			}
 		},
 		methods: {
 			confirmDate(e) {
@@ -71,14 +90,43 @@
 				const formattedTime = `${year}-${month}-${day}`;
 
 				this.date = formattedTime;
-				this.getList();
+				if(this.merchantType==10){
+					this.getList()
+				}else{
+					this.getList2()
+				}
 				this.show = false;
 			},
+			//渔家乐
 			getList() {
-				this.$api.post('/merchant/merchantFisherman/home/getMerchantFishermanDeal', {
+				this.$api.get('/scenic/order/tradeBills', {
+					startDate: this.date,
+					endDate:'',
+					dateType: '1',
+					merchantId: uni.getStorageSync('merchantId')
+				}).then(res => {
+					console.log(res.data)
+					if (res.data.code === 0) {
+						this.info = res.data.data;
+					} else {
+						this.info = {
+							pageData:{
+								list:[]
+							},
+							paymentAmount: 0,
+							paymentCount: 0,
+							refundAmount: 0,
+							refundCount: 0,
+						}
+					}
+				})
+			},
+			//餐饮
+			getList2() {
+				this.$api.post('/api/merchant/food/getMerchantFoodDeal', {
 					dateTime: this.date,
 					dateType: '1',
-					fishermanId: uni.getStorageSync('merchantId')
+					merchantId: uni.getStorageSync('merchantId')
 				}).then(res => {
 					console.log(res.data)
 					if (res.data.code === 0) {
@@ -176,6 +224,7 @@
 				display: flex;
 				justify-content: space-between;
 				padding: 30rpx 0;
+				border-bottom: 1rpx solid #EFEFEF;
 
 				.left {
 					text {

pagesHouse/home/index.vue

@@ -4,7 +4,7 @@
 		<u-navbar bgColor="transparent">
 			<view class="u-nav-slot" slot="left" style="display: flex;" @tap="shShow=true">
 				<text>{{name}}</text>
-				<u-icon name="arrow-down" size="28" :bold="true" color="#fff"></u-icon>
+				<u-icon name="arrow-down" size="28" :bold="true" color="#111"></u-icon>
 			</view>
 		</u-navbar>
 		<u-picker :show="shShow" :columns="nameList" @close="shShow=false" @cancel="shShow=false" @confirm="confirm"
@@ -34,23 +34,23 @@
 
 			</view>
 			<view class="numberData">
-				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=0')">
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?typeTxt=待付款')">
 					<text>{{merchantType==10?info.unPayNum:info.todayObligationOrders}}</text>
 					<text>待付款</text>
 				</view>
-				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=4')">
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?typeTxt=待使用')">
 					<text>{{merchantType==10?info.unUseNum:info.todayPendingOrders||0}}</text>
 					<text>待使用</text>
 				</view>
-				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=3')">
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?typeTxt=已完成')">
 					<text>{{merchantType==10?info.completeNum:info.todayOrders||0}}</text>
 					<text>已完成</text>
 				</view>
-				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=-1')">
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?typeTxt=已取消')">
 					<text>{{merchantType==10?info.joinNum:info.todayCancelledOrders||0}}</text>
 					<text>{{merchantType==10?'拼团中':'已取消'}}</text>
 				</view>
-				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=-3')">
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?typeTxt=退款售后')">
 					<text>{{merchantType==10?info. refundNum:info.todayRefundOrders||0}}</text>
 					<text>退款售后</text>
 				</view>
@@ -60,13 +60,17 @@
 					<image :src="icons[0]"></image>
 					<text>商品管理</text>
 				</view>
-				<view @click="toHref('/pagesHouse/home/bill')">
+				<view @click="toHref('/pagesHouse/Verification/record')" v-if="merchantType==10">
 					<image :src="icons[1]"></image>
-					<text>交易账单</text>
+					<text>核销记录</text>
+				</view>
+				<view @click="toHref('/pagesHouse/Verification/recordCy')" v-if="merchantType==4">
+					<image :src="icons[1]"></image>
+					<text>核销记录</text>
 				</view>
-				<view @click="toHref('/pagesHouse/home/moneyBill')">
+				<view @click="toHref('/pagesHouse/home/bill')">
 					<image :src="icons[2]"></image>
-					<text>资金账单</text>
+					<text>交易账单</text>
 				</view>
 				<view @click="toHref('/pagesHouse/home/tj')">
 					<image :src="icons[3]"></image>
@@ -152,7 +156,7 @@
 				this.shShow = false;
 				let t = this.shList.find(d => d.merchantName == this.name);
 				if (t) {
-					this.merchantType=4;
+					this.merchantType=t.merchantType;
 					uni.setStorageSync('merchantType',t.merchantType);
 					if (t.merchantType != 2) { //酒店民宿
 						uni.setStorageSync('homestayId', '');
@@ -235,10 +239,7 @@
 </script>
 
 <style lang="less" scoped>
-	/deep/ .u-nav-slot {
-		width: auto!important;
-		background-color: none!important;
-	}
+	
 	.page {
 		background: #F3F4F4;
 		padding-bottom: 40rpx;
@@ -426,6 +427,7 @@
 			font-family: PingFang SC, PingFang SC;
 			font-weight: bold;
 			color: #333;
+			margin-right: 10rpx;
 		}
 	}
 </style>

pagesHouse/home/orderBillDetail.vue

@@ -3,13 +3,15 @@
 		<c-nav-bar title="账单详情"></c-nav-bar>
 		<view class="box">
 			<image src="https://i.ringzle.com/file/20240224/d2b9acd9522747ac89239dcde0894c93.png"></image>
-			<text class="tit">{{infoMation.thingName}}</text>
-			<text class="money">+<text>{{infoMation.price}}</text></text>
+			<text  class="tit" v-if="merchantType==10">{{infoMation.playDate}} {{infoMation.playTime}}出发/{{infoMation.orderType==2?'包船':'拼船'}}/{{infoMation.boatNo}}</text>
+			<text class="tit" v-else>{{infoMation.productName}}</text>
+			<text class="money">+<text>{{merchantType==10?infoMation.realPrice:infoMation.realityPay}}</text></text>
 		</view>
 		<view class="info">
 			<view class="li">
-				<text >当前状态</text>
-				<text>{{infoMation.state==''?'':status[infoMation.state]}}</text>
+				<text>当前状态</text>
+				<text>交易成功</text>
+				<!-- <text>{{infoMation.state==''?'':status[infoMation.state]}}</text> -->
 			</view>
 			<view class="li">
 				<text>创建时间</text>
@@ -25,7 +27,7 @@
 			</view> -->
 			<view class="li">
 				<text>商品名称</text>
-				<text>{{infoMation.thingName}}</text>
+				<text>{{merchantType==10?infoMation.goodsName:infoMation.thingName}}</text>
 			</view>
 		</view>
 	</view>
@@ -52,7 +54,8 @@
 					'3': '已完成',
 					'4': '待使用',
 					'5': '已预约'
-				}
+				},
+				merchantType: uni.getStorageSync('merchantType'),
 			}
 		},
 		onLoad(option) {

pagesHouse/home/tj.vue

@@ -43,9 +43,12 @@
 </template>
 
 <script>
+import { data } from '../../uni_modules/uview-ui/libs/mixin/mixin';
 	export default {
 		data() {
 			return {
+				merchantId: uni.getStorageSync('merchantId'),
+				merchantType: uni.getStorageSync('merchantType'),
 				total: '',
 				total2: '',
 				info: {
@@ -104,14 +107,22 @@
 			},
 			date(newval, oldval) {
 				if (newval != oldval) {
-					this.getBottomData();
-					this.gettopData()
+					if(this.merchantType==10){
+						this.getList()
+					}else{
+						this.gettopData();
+						this.getBottomData();
+					}
 				}
 			}
 		},
 		onLoad() {
-			this.gettopData();
-			this.getBottomData();
+			if(this.merchantType==10){
+				this.getList()
+			}else{
+				this.gettopData();
+				this.getBottomData();
+			}
 			//this.drawGameCharts(['1','2'], [11,2], [12.11]);
 		},
 		methods: {
@@ -134,8 +145,48 @@
 				this.date = formattedTime;
 				this.show = false;
 			},
+			//渔家乐
+			getList() {
+				this.$api.post('/scenic/order/dataStatistics', {
+					dateTime: this.date,
+					dateType: this.type + '',
+					merchantId: uni.getStorageSync('merchantId')
+				}).then(res => {
+					let x = [],
+						y = [],
+						z = [];
+					this.total = 0;
+					this.total2 = 0;
+					if (res.data.code === 0) {
+						this.info = res.data.data;
+						this.info.allOrderAmount=res.data.data.statistics.allOrderAmount;
+						this.info.allOrders=res.data.data.statistics.allOrders,
+						this.info.allRefundOrderAmount=res.data.data.statistics.allRefundOrderAmount,
+						this.info.allRefundOrders=res.data.data.statistics.allRefundOrders
+						//折线图
+						this.dataList = res.data.data.curve;
+						for (let i = 0; i < res.data.data.curve.length; i++) {
+							x.push(this.type == 1 ? res.data.data.curve[i].dateKey : (res.data.data.curve[i].dateKey + '月'));
+							y.push(res.data.data.curve[i].orderNums);
+							z.push(res.data.data.curve[i].refundOrderNums);
+							this.total += res.data.data.curve[i].orderNums;
+							this.total2 += res.data.data.curve[i].refundOrderNums
+						}
+					} else {
+						this.info = {
+							paymentAmount: 0,
+							paymentCount: 0,
+							refundAmount: 0,
+							refundCount: 0,
+						}
+					}
+					setTimeout(() => {
+						this.drawGameCharts(x, y, z);
+					}, 500)
+				})
+			},
 			gettopData() {
-				this.$api.post('/merchant/merchantFisherman/home/getMerchantFishermanBill', {
+				this.$api.post('/api/merchant/food/getMerchantFoodBill', {
 					dateTime: this.date,
 					dateType: this.type + '',
 					fishermanId: uni.getStorageSync('merchantId')
@@ -154,10 +205,10 @@
 				})
 			},
 			getBottomData() {
-				this.$api.post('/merchant/merchantFisherman/home/getMerchantFishermanCurveAnalyse', {
+				this.$api.post('/api/merchant/food/getMerchantFoodCurveAnalyse', {
 					dateTime: this.date,
 					dateType: this.type + '',
-					fishermanId: uni.getStorageSync('merchantId')
+					merchantId: uni.getStorageSync('merchantId')
 				}).then(res => {
 					let x = [],
 						y = [],