From 22923e5b486e5a1e2d1313bb7829fb464810c9d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 15 Nov 2022 16:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |  6 +++---
 pages/forgotPassword/forgotPassword.vue |  2 +-
 pages/taskDetails/taskDetails.scss      | 16 ++++++++++++----
 pages/taskDetails/taskDetails.vue       | 18 ++++++++++++++++++
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/App.vue b/App.vue
index 493643a..9318a84 100644
--- a/App.vue
+++ b/App.vue
@@ -9,11 +9,11 @@
 <style lang="scss">
 	/*每个页面公共css */
 	@import "uview-ui/index.scss";
-
-	.app {
+	page {
 		background-color: #F4F5F7;
+	}
+	.app {
 		width: 100%;
-		height: 100vh;
 		// position: relative;
 		color: #000000;
 		padding: 30rpx 0 200rpx 0;
diff --git a/pages/forgotPassword/forgotPassword.vue b/pages/forgotPassword/forgotPassword.vue
index 9a3f9bd..53af159 100644
--- a/pages/forgotPassword/forgotPassword.vue
+++ b/pages/forgotPassword/forgotPassword.vue
@@ -73,7 +73,7 @@
 							})
 							setTimeout(e => {
 								uni.navigateTo({
-									url: `/pages/login/login?phonenumber=${this.appPersonallist.phonenumber}&password=${this.appPersonallist.stationPersonPassword}`
+									url: `/pages/login/login?phonenumber=${this.phonenumber}&password=${this.password}`
 								})
 							}, 1500)
 						} else {
diff --git a/pages/taskDetails/taskDetails.scss b/pages/taskDetails/taskDetails.scss
index 394a2f1..5c64d29 100644
--- a/pages/taskDetails/taskDetails.scss
+++ b/pages/taskDetails/taskDetails.scss
@@ -1,9 +1,18 @@
 .app {
 		padding: 0;
-		// font-size: 35rpx;
 		height: 100vh;
 		padding: 3%;
-
+		.img{
+			line-height: 90rpx;
+			view{
+				font-size: 32rpx;
+				padding: 20rpx 0;
+			}
+			image{
+				width: 100%;
+				height: 700rpx;
+			}
+			}
 		.details {
 			width: 100%;
 			height: 250rpx;
@@ -62,7 +71,7 @@
 			border-radius: 20rpx;
 			position: relative;
 			top: 20rpx;
-
+		
 
 			.item {
 				line-height: 110rpx;
@@ -82,7 +91,6 @@
 					width: 80%;
 					margin-left: 100rpx;
 					margin-top: 30rpx;
-
 				}
 
 			}
diff --git a/pages/taskDetails/taskDetails.vue b/pages/taskDetails/taskDetails.vue
index f572ed5..00452b2 100644
--- a/pages/taskDetails/taskDetails.vue
+++ b/pages/taskDetails/taskDetails.vue
@@ -30,6 +30,24 @@
 				</view>
 			</view>
 		</view>
+		<view class="img">
+			<view class="">
+				护理员到岗照片
+			</view>
+			<image :src="baseurl+list.onDutyPictureUrl" mode=""></image>
+		</view>
+		<view class="img">
+			<view class="">
+				服务结束照片
+			</view>
+			<image :src="baseurl+list.serviceEndPictureUrl" mode=""></image>
+		</view>
+		<view class="img">
+			<view class="">
+				签名
+			</view>
+			<image :src="baseurl+list.userSignaturePictureUrl" mode=""></image>
+		</view>
 		<view class="submit">
 			<view class="return" @tap='goreturn' v-if="list.orderStatus=='NOT_FINISH'">
 				任务退回