修改

pages/Modifyinformation/Modifyinformation.vue

@@ -160,7 +160,6 @@
 				uni.chooseImage({
 					count: 9,
 					success(res) {
-						that.certificateimg = []
 						res.tempFilePaths.forEach(e => {
 							that.uploadcertificateimg.push(e)
 							that.certificateimg.push(e)

pages/Mymission/Mymission.vue

@@ -33,9 +33,12 @@
 					</view>
 					<view class="image">
 						<image src="../../static/jinbi.png" mode=""></image>
-						<span>
+						<span v-if="item.orderCommissionAmount&&item.orderCommissionAmount>=0">
 							+ {{item.orderCommissionAmount}}
 						</span>
+						<span v-else>
+							+ 0
+						</span>
 					</view>
 				</view>
 				<image class="itemimg" v-if="item.orderStatus=='NOT_FINISH'||item.orderStatus=='WAIT_RECEIVE'"

pages/RevenueDetails/RevenueDetails.vue

@@ -7,7 +7,12 @@
 					{{itemlist.nurseItemName}}
 				</view>
 				<view class="righttext">
+					<span v-if="itemlist.orderCommissionAmount&&itemlist.orderCommissionAmount>=0">
 						￥{{itemlist.orderCommissionAmount}}
+					</span>
+					<span v-else>
+						￥ 0
+					</span>
 				</view>
 			</view>
 			<view class="content">
@@ -51,7 +56,8 @@
 					{{itemlist.disablingCondition=="DISABLED"?'已失能':''}}
 				</view>
 				<view class="item" v-if="itemlist.disablingCondition=='DISABLED'">
-					失能情况：{{itemlist.disablingReason}}
+					失能情况：
+					<span v-if="itemlist.disablingReason">{{itemlist.disablingReason}}</span>
 				</view>
 				<view class="item">
 					身体健康状况：{{itemlist.diseaseName}}

pages/confirmCompletion/confirmCompletion.vue

@@ -7,7 +7,12 @@
 					{{itemlist.nurseItemName}}
 				</view>
 				<view class="righttext">
+					<span v-if="itemlist.orderCommissionAmount&&itemlist.orderCommissionAmount>=0">
 						￥{{itemlist.orderCommissionAmount}}
+					</span>
+					<span v-else>
+						￥ 0
+					</span>
 				</view>
 			</view>
 			<view class="content">

pages/taskDetails/taskDetails.scss

@@ -31,7 +31,7 @@
 			border-radius: 5rpx;
 
 			.content {
-				margin-left: 50rpx;
+				padding: 0 50rpx;
 				font-size: 30rpx;
 
 				.item {

pages/taskDetails/taskDetails.vue

@@ -7,7 +7,12 @@
 					{{list.nurseItemName}}
 				</view>
 				<view class="righttext">
+					<span v-if="list.orderCommissionAmount&&list.orderCommissionAmount>=0">
 						￥{{list.orderCommissionAmount}}
+					</span>
+					<span v-else>
+						￥ 0
+					</span>
 				</view>
 			</view>
 			<view class="content">
@@ -51,7 +56,8 @@
 					{{list.disablingCondition=="DISABLED"?'已失能':''}}
 				</view>
 				<view class="item" v-if="list.disablingCondition=='DISABLED'">
-					失能情况：{{list.disablingReason}}
+					失能情况：
+					<span v-if="list.disablingReason">{{list.disablingReason}}</span>
 				</view>
 			</view>
 		</view>

pages/taskReturn/taskReturn.vue

@@ -1,18 +1,27 @@
 <template>
-	<view class="app">
+	<view class="app" v-if="tasklist">
 		<view class="top">
 			<view class="title">
 				<image src="../../static/fuwu.png" mode=""></image>
 				<view class="text">
-					陪诊
+					{{tasklist.nurseItemName}}
+				</view>
+				<view class="righttext">
+					<span v-if="tasklist.orderCommissionAmount&&tasklist.orderCommissionAmount>=0">
+						￥{{tasklist.orderCommissionAmount}}
+					</span>
+					<span v-else>
+						￥ 0
+					</span>
 				</view>
 			</view>
 			<view class="content">
 				<view class="time">
-					时间：2023-02-07 8:00-12:00
+					时间：{{tasklist.serviceDate}}
+					<span style='padding-left: 10rpx;'>{{tasklist.serviceStartTime}}</span>
 				</view>
 				<view class="address">
-					地点：山东省立医院东院区
+					地点：{{tasklist.serviceAddress}}
 				</view>
 			</view>
 		</view>
@@ -29,7 +38,8 @@
 						:key="index" :name="item.name" shape='circle'>{{item.name}}</u-checkbox>
 				</u-checkbox-group>
 			</view>
-			<u-input v-model="value" type="text" :border="true" border-color='#E6E6E6' placeholder='请在此输入' />
+			<u-input v-model="value" type="text" :border="true" border-color='#E6E6E6' placeholder='请在此输入'
+				v-if="list[4].checked" />
 		</view>
 		<view class="btn" @tap='taskreturn'>
 			立即提交
@@ -39,16 +49,20 @@
 </template>
 
 <script>
+	import {
+		taskDetails
+	} from '@/api/taskDetails/taskDetails.js'
 	import {
 		orderFallback
 	} from '@/api/taskReturn/index.js'
 	export default {
 		data() {
 			return {
-				item: null, //传值item
+				baseurl: null,
+				tasklist: null, //传值item
 				nursePersonId: null, //护理员id
 				taskReturnReason: '',
-				value: '', //input绑定
+				value: null, //input绑定
 				list: [{
 					name: '与其他工单时间冲突',
 					checked: false,
@@ -72,15 +86,24 @@
 			checkboxChange(e) {},
 			// 选中任一checkbox时，由checkbox-group触发
 			checkboxGroupChange(e) {
-				e.forEach(e => {
+				this.taskReturnReason = ''
-					this.taskReturnReason += e + ';'
+				e.forEach(el => {
+					if (el != '其它') {
+						this.taskReturnReason += el + ';'
+					}
 				})
 			},
 			taskreturn() {
+				if (this.list[4].checked && this.value) {
+					this.taskReturnReason += this.value + ';'
+				}
+				if (!this.tasklist.id) {
+					this.tasklist.id = this.tasklist.orderDetailsId
+				}
 				var obj = {
-					"appointmentOrderId": this.item.id,
+					"appointmentOrderId": this.tasklist.id,
 					"stationPersonId": this.nursePersonId,
-					"appointmentOrderNo": this.item.orderNo,
+					"appointmentOrderNo": this.tasklist.orderNo,
 					"taskReturnReason": this.taskReturnReason,
 				}
 				orderFallback(obj).then(res => {
@@ -98,7 +121,7 @@
 			},
 		},
 		onLoad(options) {
-			this.item = JSON.parse(options.item)
+			this.tasklist = JSON.parse(options.item)
 			var that = this
 			const value = uni.getStorageSync('nursePersonId');
 			if (value) {
@@ -125,12 +148,12 @@
 
 		.btn {
 			width: 496rpx;
-			height: 58rpx;
+			height: 70rpx;
 			background: #4271B9;
 			border-radius: 5rpx;
 			margin: 80rpx auto;
 			text-align: center;
-			line-height: 58rpx;
+			line-height: 70rpx;
 			color: #fff;
 		}
 
@@ -156,7 +179,7 @@
 			padding-bottom: 40rpx;
 
 			.content {
-				margin-left: 50rpx;
+				padding: 0 50rpx;
 				font-size: 30rpx;
 
 				.time {
@@ -172,6 +195,17 @@
 			display: flex;
 			height: 100rpx;
 			line-height: 100rpx;
+			width: 100%;
+			position: relative;
+
+			.righttext {
+				position: absolute;
+				right: 20rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				font-size: 34rpx;
+				color: #EA706A;
+			}
 
 			.text {
 				font-size: 34rpx;