feat: 框架

http/baseApi.js

@@ -1,11 +1,11 @@
-// const BaseApi = 'http://192.168.2.190:8080' //汪瑶
+const BaseApi = 'http://192.168.2.190:8080' //汪瑶
 // const BaseApi = 'http://192.168.2.205:8080' //汪辉
 //const BaseApi = 'http://192.168.2.19:8080' //李勇
 // const BaseApi = 'http://192.168.3.13:8080' //徐涛
 // const BaseApi = 'http://192.168.2.39:8080' //肖添伟
 // const BaseApi = 'http://192.168.3.6:8080' //朱壮波
 
-const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器
+// const BaseApi = 'https://i.ringzle.com/island-cloud-server' //测试服务器
 
 export {
 	BaseApi

pages.json

@@ -153,6 +153,14 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "Verification/handiwork",
+					"style": {
+						"navigationBarTitleText": "我要核销",
+						"enablePullDownRefresh": false
+						// "navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "Mine/index",
 					"style": {
@@ -168,6 +176,20 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "Mine/ordersList/details/details",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "Mine/PersonalEditing/PersonalEditing",
+					"style": {
+						"navigationBarTitleText": "编辑",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="page" :style="{'min-height':h+'px'}">
+
+		<view class="from-content">
+			<view class="one-image" @click="upImage">
+				<view class="user">
+					店铺标志
+				</view>
+				<view class="image">
+					<image src="https://i.ringzle.com/file/20240224/2c5f3ed11f1a47519f0a68cb60f0d9a9.png" mode="">
+					</image>
+					<!-- <image :src="dto.headUrl" mode="aspectFill"></image> -->
+				</view>
+			</view>
+			<view class="one-realName">
+				<view class="realName">
+					店铺名称
+				</view>
+				<!-- <u--input v-model="realName" border="none" pl ></u--input> -->
+				<view class="right">
+					<input type="text" v-model="dto.realName" border="none" placeholder="请输入昵称" />
+				</view>
+			</view>
+			<view class="one-mobile">
+				<view class="mobile">
+					联系电话
+				</view>
+				<view class="right">
+					<input type="text" v-model="dto.modifyPhone" border="none" placeholder="请输入手机号"
+						style="height: 48rpx;" />
+				</view>
+			</view>
+			<view class="one-mobile">
+				<view class="mobile">
+					商家地址
+				</view>
+				<view class="right">
+					浙江省舟山市嵊泗县菜园镇东海路89号
+				</view>
+
+			</view>
+
+			<view class="one" @click="nav">
+				<view class="">
+					营业执照
+				</view>
+				<view class="">
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+			<view class="one">
+				<view class="">
+					统一社会信用代码
+				</view>
+				<view class="">
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+
+		</view>
+
+		<view class="from-content">
+			<view class="title">
+				店铺照片
+			</view>
+			<view class="">
+				照片
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				h: uni.getSystemInfoSync().windowHeight - 87,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				titleHeader: '个人信息',
+				fileList: [],
+				dto: {
+					realName: '黄沙村渔家乐', //昵称
+					modifyPhone: '18755113256', //手机号
+					headUrl: '', // 头像
+					idCode: '', // 证件号
+					id: ''
+				},
+				picList: [],
+				objList: {}
+			}
+		},
+		onLoad() {
+
+		},
+
+		methods: {
+			// 上传头像
+			upImage() {
+				uni.chooseImage({
+					sourceType: ['album'], //从相册选择
+					success: chooseImageRes => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: 'https://i.ringzle.com/island-cloud-server/oss/file/upload', // 仅为示例，非真实的接口地址
+							filePath: tempFilePaths[0],
+							name: 'file',
+							header: {
+								token: wx.getStorageSync('access_token')
+							},
+							success: res => {
+								// uploadFile上传成功后，根据和后台的约定msgCode判断接口调用状态
+								let data = JSON.parse(res.data);
+								this.dto.headUrl = data.data.url
+							}
+						});
+					},
+					fail: err => {
+						this.myToast('图片上传失败', 'none');
+					}
+				});
+
+			},
+
+
+		}
+
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		box-sizing: border-box;
+		padding: 30rpx;
+		// padding-top: 150rpx;
+
+	}
+
+	.from-content {
+		.title {
+			margin: 40rpx 0 36rpx;
+			font-size: 30rpx;
+			font-weight: Regular;
+			color: #111111;
+		}
+
+
+		.one-image {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+
+			.image {
+				width: 124rpx;
+				height: 124rpx;
+				border-radius: 100rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 100rpx;
+				}
+
+			}
+
+
+			.user {
+				margin-top: 24rpx;
+				font-size: 30rpx;
+				color: #111;
+				font-weight: Regular;
+			}
+
+		}
+
+		.one-realName {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			height: 120rpx;
+			line-height: 120rpx;
+			border-bottom: 1rpx solid #EFEFEF;
+
+			.realName {
+				width: 188rpx;
+				height: 120rpx;
+				font-size: 30rpx;
+				color: #333333;
+				font-weight: Regular;
+			}
+
+			.right {
+				text-align: right;
+				width: 100%;
+				font-size: 30rpx;
+				color: #666666;
+				font-weight: Regular;
+				// display: flex;
+				// justify-content: space-between;
+			}
+		}
+
+		.one-mobile {
+			display: flex;
+			width: 100%;
+			align-items: center;
+			height: 120rpx;
+			line-height: 120rpx;
+			border-bottom: 1rpx solid #EFEFEF;
+
+			.right {
+				width: 100%;
+				text-align: right;
+				font-size: 30rpx;
+				color: #666666;
+				font-weight: Regular;
+			}
+
+			.mobile {
+				width: 188rpx;
+				height: 120rpx;
+				font-size: 30rpx;
+				color: #333333;
+				font-weight: Regular;
+			}
+
+			.replacement {
+				border-radius: 50rpx;
+				width: 80rpx;
+				height: 48rpx;
+				line-height: 48rpx;
+				border: 1rpx solid #025EA7;
+				color: #025EA7;
+				font-weight: Regular;
+				font-size: 24rpx;
+				text-align: center;
+			}
+		}
+
+		.one {
+			height: 120rpx;
+			line-height: 120rpx;
+			display: flex;
+			border-bottom: 1rpx solid #EFEFEF;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 30rpx;
+			color: #333333;
+			font-weight: Regular;
+		}
+	}
+
+	.btn {
+		margin: 120rpx auto;
+		width: 650rpx;
+		height: 88rpx;
+		display: flex;
+		background-color: #01B9F9;
+		line-height: 88rpx;
+		border-radius: 50rpx;
+
+		.btn-btn {
+			margin: 0 auto;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			font-weight: Regular;
+		}
+	}
+</style>

pagesHouse/Mine/index.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class="al_name_edit">
 					<text>{{name}}</text>
-					<view class="ane_edit" @tap="toTurn('/pagesMy/handerUser/handerUser',true)">
+					<view class="ane_edit" @tap="toTurn('/pagesHouse/Mine/PersonalEditing/PersonalEditing',true)">
 						<text>编辑</text>
 						<image src="https://i.ringzle.com/file/20240129/e824a765b6c24ac6aafbb49b12c23aa9.png"></image>
 					</view>
@@ -35,10 +35,10 @@
 			</view>
 		</view>
 
-		<view class="wallet box">
+		<view class="wallet box ">
 			<view class="w_left">
 				<view class="wl_top">
-					<image src="https://i.ringzle.com/file/20240129/60f0d414e1494b8a9feeef2a8e627934.png"></image>
+					<image src="https://i.ringzle.com/file/20240225/337c4c20cbc94bdcb4f17b6058a9d39f.png"></image>
 					<text>钱包余额</text>
 				</view>
 				<view class="wl_price"><span>￥</span><text>{{price.toFixed(2)}}</text></view>
@@ -46,6 +46,47 @@
 			<view class="w_right" @tap="toTurn('/pagesMy/wallet/index',true)">去结算</view>
 		</view>
 
+		<view class="one" @click="nav">
+			<view class="">
+				营业执照
+			</view>
+			<view class="">
+				<u-icon name="arrow-right"></u-icon>
+			</view>
+		</view>
+
+		<view class="" style="padding: 24rpx; background-color: #fff; margin: 0 20rpx ; border-radius: 16rpx;">
+			<view class="one-input">
+				<u-row customStyle="margin-bottom: 10px">
+					<u-col span="8">
+						<view class="demo-layout bg-purple-light">
+							<view class="one2">
+								<!-- {{myList.islandName}} -->
+								黄沙村渔家乐
+							</view>
+							<view class="two2">
+								<!-- {{myList.areaDetail}} -->
+								舟山市嵊泗县嵊山镇前卫村后岗
+							</view>
+						</view>
+					</u-col>
+					<u-col span="4" @click="navigation">
+						<view class="demo-layout bg-purple">
+							<!-- 	<view class="one1">
+						<image src="https://i.ringzle.com/file/20240129/4496f5e1754649ed8a78a2ca9de26e4c.png"
+							mode="aspectFit"></image>
+					</view> -->
+							<!-- <view class="two1">
+						<text> 地图/周边 ></text>
+					</view> -->
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+
+
+
 		<Tabbares :tabbarid="2"></Tabbares>
 	</view>
 </template>
@@ -192,6 +233,19 @@
 
 		}
 
+		.one {
+			// padding: ;
+			margin: 0 40rpx;
+			height: 120rpx;
+			line-height: 120rpx;
+			display: flex;
+			// border-bottom: 1rpx solid #EFEFEF;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 36rpx;
+			color: #111111;
+			font-weight: bold;
+		}
 
 		.box {
 			width: calc(100% - 40rpx);
@@ -202,6 +256,82 @@
 			position: relative;
 		}
 
+		.bg-img {
+			background-color: #F0F8F6 !important;
+		}
+
+		.one-input {
+			box-sizing: border-box;
+			// width: 100%;
+			height: 128rpx;
+			background: #F0F8F6;
+			// line-height: 128rpx;
+			border-radius: 16rpx;
+			padding: 0 20rpx;
+			margin: 0 20rpx;
+
+			.bg-purple-light {
+
+				// display: flex;
+				.one2 {
+					// height: 36rpx !important;
+					font-size: 26rpx;
+					color: #000000;
+					margin: 12rpx 6rpx;
+					font-weight: bold;
+				}
+
+				.two2 {
+					font-size: 24rpx;
+					color: #666666;
+					// height: 36rpx !important;
+					margin: 6rpx 6rpx;
+					font-weight: Regular;
+				}
+			}
+
+			.bg-purple {
+				// align-items: center;
+				// display: flex;
+				text-align: center;
+				// text-align: right;
+				font-size: 24rpx;
+				color: #808080;
+				background-image: url('https://i.ringzle.com/file/20240129/dcf2338517e344c697ef7cd853ce2234.png');
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+				width: 240rpx;
+				height: 128rpx;
+
+
+				.one1 {
+					margin: auto 110rpx;
+					padding-top: 30rpx;
+					width: 46rpx;
+					height: 46rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						// width: 46rpx;
+						// height: 46rpx;
+					}
+
+				}
+
+				.two1 {
+
+					margin: 4rpx 12rpx;
+					font-size: 22rpx;
+					color: #007A69;
+
+					text {
+						margin-left: 30rpx;
+					}
+				}
+			}
+		}
+
 		.wallet {
 			margin-top: 32rpx;
 			padding: 34rpx 40rpx 30rpx 31rpx;
@@ -255,16 +385,35 @@
 
 			.w_right {
 				margin-top: 16rpx;
-				width: 164rpx;
-				height: 72rpx;
-				background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
+				width: 156rpx;
+				height: 60rpx;
+				// background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
+				background-color: #007A69;
+				border-radius: 36rpx;
+				line-height: 60rpx;
+				text-align: center;
+				font-size: 26rpx;
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				color: #FFFFFF;
+			}
+
+			.w_right-image {
+				margin-top: 16rpx;
+				width: 156rpx;
+				// height: 60rpx;
+				// background: linear-gradient(270deg, #D6F6ED 0%, #FFFFFF 100%);
+				background-color: #007A69;
+				background-image: url('https://i.ringzle.com/file/20240225/b918fbd7e3424908a10497c4e4f71fda.png');
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
 				border-radius: 36rpx;
-				line-height: 72rpx;
+				// line-height: 60rpx;
 				text-align: center;
 				font-size: 26rpx;
 				font-family: PingFang-SC, PingFang-SC;
 				font-weight: bold;
-				color: #007750;
+				color: #FFFFFF;
 			}
 		}
 

pagesHouse/Mine/ordersList/details/details.vue

@@ -0,0 +1,476 @@
+<template>
+	<!-- <view class="page" :style="{'min-height':h+'px'}"> -->
+	<view class="page">
+		<view class="" style="height: 100%; padding-bottom: 260rpx;">
+			<view class="head">
+				<text v-if='list.state==0' class="orange">待支付</text>
+				<text v-else-if='list.state==1' class="red">已支付</text>
+				<text v-else-if='list.state==-1' class="red">已取消</text>
+				<text v-else-if='list.state==-2' class="green">退款中</text>
+				<text v-else-if='list.state==3' class="green">已完成</text>
+				<text v-else-if='list.state==-3' class="green">已退款</text>
+				<text v-else-if='list.state==4' class="red">待使用</text>
+				<text v-else-if='list.state==5' class="green">已预约</text>
+				<text v-else :class="statusClass[list.state]">{{status[list.state]}}</text>
+				<!-- <text>￥</text> -->
+				<!-- <text>{{list.totalPrice}}</text> -->
+			</view>
+
+			<view class="ticketInfo">
+				<view class="hander-titles">
+					<view class="image">
+						<image src="https://i.ringzle.com/file/20240225/0db2e93d80054b459c6e40466fa852c0.png" mode="">
+						</image>
+					</view>
+					<view class="names">
+						{{list.fishermanName}}
+					</view>
+					<view class="rights">
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+				</view>
+				<view class="ticketInfo-hander">
+					<view class="image">
+						<image :src="list.pic" mode="aspectFill"></image>
+					</view>
+					<view class="" style="width: 100%; display: flex; flex-wrap: wrap; justify-content: space-between;">
+						<view class="name" style="display: flex; justify-content: space-between;">
+							<view class="">
+								{{list.thingName}}
+							</view>
+							<view class="" style="display: flex;align-items: center;;" @click="cardBtn(list)">
+								<!-- <text style="color: #01B9F9; font-size: 26rpx ; font-weight: 500;">
+							</text><u-icon name="arrow-right" color="#808080" size="26rpx"></u-icon> -->
+								￥{{list.totalPrice}}
+							</view>
+						</view>
+						<view class="date">
+							<view class="">
+								价格：<text>￥{{list.totalPrice}}/人</text>
+							</view>
+							<view class="">
+								数量：<text>X{{list.num}}</text>
+							</view>
+						</view>
+
+					</view>
+				</view>
+
+				<view class="ticketInfo-demo">
+
+				</view>
+			</view>
+			<!-- 订单信息 -->
+			<view class="orderInfo " style="padding-bottom: 30rpx;">
+				<view class="tit">订单信息</view>
+
+				<u-cell :border="true">
+					<text slot="icon" class="txt">订单编号</text>
+					>
+					<text slot="title" class="val">{{list.orderCode}}</text>
+					<text slot="right-icon" class="icon"
+						style="border: 1rpx solid #007A69; border-radius: 50rpx; box-sizing: border-box; color: #007A69;padding: 2rpx 10rpx; font-size: 22rpx; font-weight: Regular;"
+						@tap="copyOrderNo(list)">复制</text>
+				</u-cell>
+
+				<u-cell :border="true">
+					<text slot="icon" class="txt">下单时间</text>
+					>
+					<text slot="title" class="val">{{list.orderTime}}</text>
+				</u-cell>
+				<u-cell :border="true">
+					<text slot="icon" class="txt">联系人</text>
+					>
+					<text slot="title" class="val">{{list.userName}}</text>
+				</u-cell>
+				<u-cell :border="true">
+					<text slot="icon" class="txt">联系方式</text>
+					>
+					<text slot="title" class="val">{{list.phone}}</text>
+
+				</u-cell>
+				<u-cell :border="true">
+					<text slot="icon" class="txt">支付方式</text>
+					>
+					<text slot="title" class="val">微信支付</text>
+				</u-cell>
+			</view>
+		</view>
+		<view class="btns">
+			<template @click="handleDetail(list)" v-if="list.state==4||list.state==5">
+				<view class="detail del">
+					核销订单
+				</view>
+			</template>
+			<template @click="Detail(list)" v-else>
+				<view class="detail">
+					删除订单
+				</view>
+			</template>
+
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				h: uni.getSystemInfoSync().windowHeight,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				list: {},
+				statusClass: [
+					'',
+					'green',
+					'blue',
+					'grey',
+					'grey',
+				],
+
+			}
+		},
+		onLoad(option) {
+			// console.log(JSON.parse(option.list));
+			this.list = JSON.parse(option.list)
+			console.log('-----', this.list);
+
+		},
+		methods: {
+			copyOrderNo(item) {
+				let that = this;
+				// #ifdef H5
+				this.$copyText(item.orderCode).then(res => {
+					this.$showToast('复制成功');
+				})
+				// #endif
+				// #ifdef MP-WEIXIN
+				uni.setClipboardData({
+					data: item.orderCode,
+					success(res) {
+						that.$showToast('复制成功');
+					},
+					fail(err) {
+						that.$showToast('复制失败');
+					}
+				})
+				// #endif
+			},
+
+			// 删除订单
+			toStatus() {
+				this.$refs.uToast.show({
+					type: 'success',
+					title: '',
+					message: "正在开发",
+					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png'
+				})
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		margin: 0;
+		padding: 0;
+		box-sizing: border-box;
+	}
+
+	.page {
+		box-sizing: border-box;
+		// height: 100%;
+		background-color: #F5F8FA;
+	}
+
+
+
+	.ticketInfo-demo {
+		// border-bottom: 2rpx solid #EFEFEF;
+		margin-top: 40rpx;
+
+		.demo-layout {
+			display: flex;
+			align-items: center;
+			text-align: center;
+			margin: 0 80rpx;
+		}
+	}
+
+
+
+
+
+
+
+	.orderInfo {
+		box-sizing: border-box;
+		background-color: #fff;
+		border-radius: 16rpx;
+		width: 96%;
+		margin: 0 auto 20rpx;
+
+		.tit {
+			font-size: 32rpx;
+			color: #333;
+			padding-left: 30rpx;
+			padding-top: 40rpx;
+			font-weight: 600;
+			margin-bottom: 20rpx;
+		}
+
+		.txt {
+			font-size: 28rpx;
+			color: #808080;
+			width: 115rpx;
+			font-weight: Regular;
+		}
+
+		.icon {
+			font-size: 28rpx;
+			color: #333;
+			font-weight: Regular;
+		}
+
+		.val {
+			font-size: 28rpx;
+			color: #333;
+			font-weight: Regular;
+			margin: 0 20rpx 0 30rpx;
+		}
+
+	}
+
+	.ticketInfo {
+		box-sizing: border-box;
+		width: 96%;
+		margin: 0 auto 20rpx;
+		padding: 40rpx 24rpx 4rpx;
+		border-radius: 20rpx;
+		position: relative;
+		background-color: #fff;
+		z-index: 2;
+
+		.hander-titles {
+			display: flex;
+			height: 32rpx;
+			line-height: 32rpx;
+			margin: 20rpx 0 30rpx 0;
+
+			.image {
+				width: 32rpx;
+				height: 32rpx;
+				border-radius: 16rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.names {
+				font-size: 32rpx;
+				color: #333333;
+				font-weight: Bold;
+				margin: 0rpx 16rpx 0rpx 10rpx;
+			}
+
+		}
+
+		.ticketInfo-hander {
+			display: flex;
+
+			.image {
+				width: 136rpx;
+				height: 136rpx;
+				border-radius: 12rpx;
+				margin-right: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+		}
+
+		.name {
+			font-size: 32rpx;
+			color: #333;
+			font-weight: bold;
+			width: 100%;
+		}
+
+		.date {
+			// padding: 20rpx 0 32rpx;
+			padding-top: 20rpx;
+
+			text {
+				font-size: 26rpx;
+
+				&:nth-child(1) {
+					color: #808080;
+				}
+
+				&:nth-child(2) {
+					color: #FF7D01;
+					margin-left: 30rpx;
+				}
+			}
+		}
+
+
+
+		.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 40rpx;
+		// display: flex;
+		// position: relative;
+		// z-index: 2;
+
+		text {
+			color: #fff;
+
+			&:nth-child(1),
+			&:nth-child(3) {
+				font-size: 44rpx;
+				font-weight: Bold;
+			}
+
+			&:nth-child(2) {
+				flex: 1;
+				text-align: right;
+				width: 100px;
+				font-size: 36rpx;
+			}
+		}
+
+		.red {
+			color: indianred;
+		}
+
+		.green {
+			color: #111111;
+		}
+
+		.blue {
+			color: #1372FF;
+		}
+
+		.grey {
+			color: #4C5F76;
+		}
+
+		.orange {
+			color: #FF9100;
+		}
+	}
+
+
+
+
+	.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);
+			width: 100%;
+			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: #FFFFFF;
+			// background-color: #F6F6F6;
+			background-color: #007A69;
+		}
+	}
+</style>

pagesHouse/Mine/ordersList/index.vue

@@ -32,7 +32,7 @@
 						</view>
 						<span class='info' style="display: flex; justify-content: space-between;">
 							<span>
-								<span>{{item.userName}}</span>
+								<span style="margin-right: 15rpx;">{{item.userName}}</span>
 								<span>{{item.phone}}</span>
 							</span>
 							<span>x{{item.num}}</span>
@@ -113,7 +113,7 @@
 		},
 		onLoad(option) {
 			if (option.Type) {
-				const type = parseInt(option.Type) + 1
+				const type = parseInt(option.Type)
 				this.changeTab1(type)
 			} else {
 				this.getOrderList()
@@ -122,15 +122,32 @@
 		methods: {
 			// 去详情
 			navTo(item) {
-				console.log(item);
+				uni.navigateTo({
+					url: '/pagesHouse/Mine/ordersList/details/details?list=' + JSON.stringify(item)
+				})
 			},
 			// 核销
 			handleDetail(item) {
-				console.log(item);
+				let dto = {
+					writeOffCode: item.orderCode
+				}
+				this.$api.post('/merchant/merchantFisherman/home/writeOffOrder?dto=', dto).then(res => {})
 			},
 			// 删除
 			Detail(item) {
-				console.log(item);
+				this.$api.del('/merchant/merchantFisherman/home', [
+					item.id
+				]).then(res => {
+					if (res.data.code == 0) {
+						this.$showToast('删除成功');
+						this.getOrderList()
+					} else {
+						this.$showToast('删除失败');
+						this.getOrderList()
+					}
+
+				})
+
 			},
 			changeTab1(index) {
 				this.current = index;
@@ -143,19 +160,14 @@
 				this.changeTab(index)
 			},
 			getOrderList(state) {
-				this.$api.get('/api/fishermanOrder/queryMyOrderPage', {
-					// fishermanId: '',
+				this.$api.get('/merchant/merchantFisherman/home/queryMyOrderPage', {
+					// fishermanId:this.homestayId,
 					limit: this.limit,
 					page: this.page,
 					state: state ? state : ''
 				}).then((res => {
 					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)
-						// })
-						console.log(this.dataList, 'this.dataList');
 					} else {
 						uni.showToast({
 							title: res.data.msg,
@@ -166,40 +178,37 @@
 
 				}))
 			},
-			getOrderByStatusList() {
-				this.$api.get('/merchant/hotel/order/getMerchantOrderPageList', {
-					homestayId: this.homestayId,
+			getOrderByStatusList(state) {
+				this.$api.get('/merchant/merchantFisherman/home/queryMyOrderPage', {
+					// fishermanId:this.homestayId,
 					limit: this.limit,
 					page: this.page,
-					status: 0
+					state: state
 				}).then((res => {
 					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)
-						})
 					} else {
 						uni.showToast({
 							title: res.data.msg,
 							icon: 'none'
 						})
 					}
+
+
 				}))
 			},
-
 			changeTab(index) {
-				console.log(index, 'index------');
 				this.tabIdx = index;
 				switch (index) {
 					case 0:
 						this.getOrderList()
 						break
 					case 1:
-						this.getOrderList(0)
+						// this.getOrderList(0)
+						this.getOrderByStatusList(0)
 						break
 					case 2:
-						// this.getOrderByStatusList(-2)
+
 						this.getOrderList(4)
 						break
 					case 3:
@@ -217,6 +226,7 @@
 <style lang="scss" scoped>
 	.pages {
 		background: #F9FAFC;
+		box-sizing: border-box;
 
 		.tb {
 			width: 100%;

pagesHouse/Verification/handiwork.vue

@@ -0,0 +1,101 @@
+<template>
+	<view class="page">
+		<view class="hander">
+			<view class="content">
+				<view class="" style="display: flex; justify-content: space-between;">
+					<view class="">
+
+					</view>
+					<view class="one">
+						<image src="https://i.ringzle.com/file/20240225/dc4ab62598874a89ae24f26d30d631d1.png" mode="">
+						</image>
+					</view>
+				</view>
+				<view class="two">
+					<u--input type='number' placeholder="请输入核销码" border="none" v-model="value" @change="change"
+						color='#FFFFFF' size='36'></u--input>
+				</view>
+			</view>
+		</view>
+		<view class="btn" @click="handleDetail">
+			验证
+		</view>
+
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				h: uni.getSystemInfoSync().windowHeight - 87,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
+				value: ''
+			}
+		},
+		methods: {
+
+
+			// 核销
+			// handleDetail(item) {
+			// 	let dto = {
+			// 		writeOffCode: this.value
+			// 	}
+			// 	this.$api.post('/merchant/merchantFisherman/home/writeOffOrder?dto=', dto).then(res => {
+			// 		console.log(res);
+			// 	})
+			// },
+
+		}
+	}
+</script>
+<style lang="scss">
+	* {
+		margin: 0;
+		padding: 0;
+		box-sizing: border-box;
+	}
+
+	.page {
+		height: 100%;
+		box-sizing: border-box;
+		background-color: #f0f0f0;
+
+		.hander {
+			box-sizing: border-box;
+			background-color: #fff;
+			height: 436rpx;
+
+			.content {
+				height: 320rpx;
+				background-color: #4E6088;
+				// width: 100%;
+				padding: 27rpx 30rpx;
+
+				.one {
+
+					width: 54rpx;
+					height: 54rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+			}
+		}
+	}
+
+	.btn {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 118rpx;
+		background-color: #8E939C;
+		line-height: 118rpx;
+		text-align: center;
+		font-size: 30rpx;
+		color: #FFFFFF;
+		font-weight: Regular;
+	}
+</style>

pagesHouse/Verification/index.vue

@@ -1,8 +1,8 @@
 <template>
-	<view class="page" :style="{'min-height':(h-th)+'px','padding-top':mt+'px'}">
+	<view class="page" :style="{'min-height':(h-th)+'px'}">
 		<c-nav-bar title="核销"></c-nav-bar>
 		<view class="content">
-			<view class="content-one">
+			<view class="content-one" @click="SweepIt">
 				<view class="image">
 					<image src="https://i.ringzle.com/file/20240224/f7c81755b4f74f47b80c53ba4e6b051a.png" mode="">
 					</image>
@@ -11,7 +11,7 @@
 					扫一扫核销
 				</view>
 			</view>
-			<view class="content-two">
+			<view class="content-two" @click="handiwork">
 				<view class="image">
 					<image src="https://i.ringzle.com/file/20240224/49af25724572427fadff57f73a29d15b.png" mode="">
 					</image>
@@ -34,7 +34,16 @@
 			}
 		},
 		methods: {
+			// 扫码
+			SweepIt() {
 
+			},
+			// 手工
+			handiwork() {
+				uni.navigateTo({
+					url: '/pagesHouse/Verification/handiwork'
+				})
+			},
 		}
 	}
 </script>