diff --git a/pages.json b/pages.json
index edb4983..cc9f6f5 100644
--- a/pages.json
+++ b/pages.json
@@ -16,13 +16,6 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/Completedwork/Completedwork",
-			"style": {
-				"navigationBarTitleText": "已完成工单",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/Changepassword/Changepassword",
 			"style": {
diff --git a/pages/Completedwork/Completedwork.vue b/pages/Completedwork/Completedwork.vue
deleted file mode 100644
index 58fa2d9..0000000
--- a/pages/Completedwork/Completedwork.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-	<view class="app">
-		<view class="top">
-			<view class="text">
-				肚子不舒服
-			</view>
-			<view class="price">
-				￥200
-
-			</view>
-		</view>
-		<view class="bodys">
-			<view class="time">
-				时间
-			</view>
-			<view class="datatime">
-				<span>2023-09-21 13:30-14:00</span>
-
-			</view>
-		</view>
-		<view class="bottom">
-			<view class="time">
-				患者信息
-			</view>
-			<view class="info">
-				姓名：万鹏
-			</view>
-			<view class="info">
-				性别：男
-			</view>
-			<view class="info">
-				身份证号：372401199705254567
-			</view>
-			<view class="info">
-				手机号码：13454678907
-			</view>
-			<view class="info">
-				家庭住址：北京市昌平区振兴街幸福里
-			</view>
-
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.app {
-		background: #F1F1F1;
-		height: 100vh;
-
-		.top {
-			display: flex;
-			width: 96%;
-			height: 102rpx;
-			background: #FFFFFF;
-			border-radius: 14rpx;
-			position: relative;
-			left: 50%;
-			margin: 30rpx 0 30rpx 0;
-			line-height: 102rpx;
-			transform: translateX(-50%);
-
-			.text {
-				font-size: 32rpx;
-				font-family: SourceHanSansSC-Medium, SourceHanSansSC;
-				font-weight: 500;
-				color: #333333;
-				padding-left: 30rpx;
-			}
-
-			.price {
-				position: absolute;
-				right: 20rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				font-size: 38rpx;
-				font-family: Adobe Heiti Std;
-				color: #EE2B2B;
-
-
-			}
-
-		}
-
-		.bodys {
-			width: 96%;
-			height: 200rpx;
-			background: #FFFFFF;
-			border-radius: 14rpx;
-			margin: 30rpx 0 30rpx 0;
-			left: 50%;
-			position: relative;
-			transform: translateX(-50%);
-
-			.time {
-				width: 96%;
-				padding-left: 30rpx;
-				border-bottom: 1rpx solid #E6E6E6;
-				height: 100rpx;
-				line-height: 100rpx;
-				font-size: 28rpx;
-				font-family: SourceHanSansSC-Medium, SourceHanSansSC;
-				font-weight: 500;
-				color: #333333;
-				left: 50%;
-				position: relative;
-				transform: translateX(-50%);
-
-			}
-
-			.datatime {
-				width: 690rpx;
-				height: 72rpx;
-				line-height: 72rpx;
-				background: #F7F9F8;
-				border-radius: 14rpx;
-				padding-left: 30rpx;
-				left: 50%;
-				top:18rpx;
-				position: relative;
-				transform: translateX(-50%);
-
-			}
-		}
-
-		.bottom {
-			width: 96%;
-			height: 470rpx;
-			background: #FFFFFF;
-			border-radius: 14rpx;
-			margin: 30rpx 0 30rpx 0;
-			left: 50%;
-			position: relative;
-			transform: translateX(-50%);
-
-			.time {
-				width: 96%;
-				padding-left: 30rpx;
-				border-bottom: 1rpx solid #E6E6E6;
-				height: 100rpx;
-				line-height: 100rpx;
-				font-size: 28rpx;
-				font-family: SourceHanSansSC-Medium, SourceHanSansSC;
-				font-weight: 500;
-				color: #333333;
-				left: 50%;
-				position: relative;
-				transform: translateX(-50%);
-
-			}
-
-			.datatime {
-				width: 690rpx;
-				height: 72rpx;
-				line-height: 72rpx;
-				background: #F7F9F8;
-				border-radius: 14rpx;
-				padding-left: 30rpx;
-				left: 50%;
-				position: relative;
-				transform: translateX(-50%);
-
-			}
-
-			.info {
-				width: 96%;
-				height: 72rpx;
-				line-height: 72rpx;
-				padding-left: 30rpx;
-				// background: red;
-				left: 50%;
-				position: relative;
-				transform: translateX(-50%);
-
-				font-size: 24rpx;
-				font-family: SourceHanSansSC-Medium, SourceHanSansSC;
-				font-weight: 500;
-				color: #333333;
-
-			}
-
-		}
-
-	}
-</style>
\ No newline at end of file
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index d88d85b..1cf8c98 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -64,11 +64,6 @@
 							<span>{{item.problemDescription}}</span>
 						</view>
 					</view>
-					<view class="address" @click.stop='goMap(item)'>
-						<view class="text">
-							{{item.serviceAddress}}
-						</view>
-					</view>
 					<view class="btns">
 						<view class="text" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">
 							待接单
@@ -88,7 +83,7 @@
 							接单
 						</view>
 						<view class="btnreturn" @click.stop='goconfirmCompletion(item)'
-							v-if="item.orderStatus=='RECEIVED_GOODS'">
+							style="background-color:#18CBB3;color: #fff;" v-if="item.orderStatus=='RECEIVED_GOODS'">
 							完成
 						</view>
 						<view class="btnaccept" @click.stop='govideo(item)' v-if="item.orderStatus=='RECEIVED_GOODS'">
@@ -224,7 +219,7 @@
 			//详情
 			gotaskDetails(item) {
 				uni.navigateTo({
-					url: `/pages/taskDetails/taskDetails?id=${item.consultationInfoId}`
+					url: `/pages/taskDetails/taskDetails?id=${item.consultationInfoId}&title=${item.orderStatus}`
 				})
 			},
 			//完成
@@ -297,13 +292,7 @@
 				})
 			},
 			tabschange(index) {
-				console.log(index)
 				this.tabscurrent = index;
-				if(this.tabscurrent==2){
-					uni.navigateTo({
-						url:'/pages/Completedwork/Completedwork'
-					})
-				}
 				this.query.orderStatus = this.tabslist[index].value
 				this.optionname = '全部'
 				this.optionindex = 0
@@ -526,7 +515,7 @@
 						height: 60rpx;
 						text-align: center;
 						line-height: 55rpx;
-						border-radius: 5rpx;
+						border-radius: 50rpx;
 						border: 1px solid #18CBB3;
 						position: absolute;
 					}
@@ -544,30 +533,6 @@
 					}
 				}
 
-				.address {
-					position: relative;
-
-					.text {
-						width: 80%;
-					}
-
-
-					.p {
-						padding-left: 30rpx;
-						font-size: 24rpx;
-						color: #EA706A;
-					}
-
-					image {
-						position: absolute;
-						top: 50%;
-						left: 0rpx;
-						transform: translateY(-40%);
-						width: 25rpx;
-						height: 25rpx;
-					}
-				}
-
 				.time {
 					line-height: 60rpx;
 					font-size: 24rpx;
@@ -669,4 +634,4 @@
 			::v-deep .u-cell-box {}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/taskDetails/taskDetails.vue b/pages/taskDetails/taskDetails.vue
index 2ee7bb6..74fab0c 100644
--- a/pages/taskDetails/taskDetails.vue
+++ b/pages/taskDetails/taskDetails.vue
@@ -61,11 +61,23 @@
 				list: null,
 				baseurl: null,
 				fileUrls: [],
+				title: '',
 			};
 		},
 		onLoad(options) {
 			this.baseurl = baseurl
 			this.info(options.id)
+			this.title = options.title
+			if (options.title == 'COMPLETED') {
+				this.title = '已完成工单'
+			} else {
+				this.title = '工单详情'
+			}
+		},
+		onReady() { //更改导航栏文字
+			uni.setNavigationBarTitle({
+				title: this.title,
+			});
 		},
 		methods: {
 			previewImage(index) {