修改

api/request.js

@@ -17,26 +17,16 @@ var request = function(config) {
 				if (res.data.code == 9999) {
 					uni.removeStorageSync('token');
 					uni.removeStorageSync('nursePersonId');
-					uni.showModal({
+					uni.removeStorageSync('personRoleLoginFlag');
-						title: "登录提示",
+					uni.navigateTo({
-						content: '登录失效,请重新登录',
+						url: '/pages/login/login'
-						success(res1) {
-							if (res1.confirm) {
-								uni.navigateTo({
-									url: '/pages/login/login'
-								})
-							} else if (res1.cancel) {
-								uni.reLaunch({
-									url: '/pages/startup/startup'
-								})
-							}
-						},
-						fail(err1) {
-							uni.reLaunch({
-								url: '/pages/startup/startup'
-							})
-						}
 					})
+				} else if (res.data.code == 500) {
+					// uni.removeStorageSync('nursePersonId');
+					// uni.removeStorageSync('personRoleLoginFlag');
+					// uni.navigateTo({
+					// 	url: '/pages/login/login'
+					// })
 				}
 				uni.hideLoading();
 				resolve(res.data)

api/taskDetails/taskDetails.js

@@ -1,7 +1,6 @@
 import request from "../request.js"
 
 // 任务详情
-
 export function taskDetails(orderDetailsId) {
 	return request({
 		url: `/nurseApp/personLogin/taskDetails?&orderDetailsId=${orderDetailsId}`,

pages.json

@@ -80,6 +80,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/RevenueDetails/RevenueDetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收益信息",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/Modifyinformation/Modifyinformation.vue

@@ -171,8 +171,10 @@
 					res.data.positionalTitleLevel == 'MIDDLE_LEVEL' ? res.data.positionalTitleLevel = '中级' : ''
 					res.data.positionalTitleLevel == 'HIGH_LEVEL' ? res.data.positionalTitleLevel = '高级' : ''
 					res.data.nurseStationPersonCertificateList.forEach(e => {
-						e.certificateUrl = baseurl + e.certificateUrl
+						if (e.certificateUrl) {
-						this.certificateimg.push(e.certificateUrl)
+							e.certificateUrl = baseurl + e.certificateUrl
+							this.certificateimg.push(e.certificateUrl)
+						}
 					})
 					res.data.id = this.nursePersonId
 					res.data.nurseStationPersonCheckList = []

pages/MyBenefits/MyBenefits.vue

@@ -41,7 +41,7 @@
 			</view>
 		</view>
 		<view class="list" v-if="Detailslist.length>0">
-			<view class="item" v-for="(item,index) in Detailslist" :key="index">
+			<view class="item" v-for="(item,index) in Detailslist" :key="index" @tap='gotaskDetails(item)'>
 				<view class="time">
 					<!-- {{item.serviceDate}} {{item.serviceStartTime}} -->
 					{{item.finishOrderTime}}
@@ -196,6 +196,12 @@
 					this.monthTime = date.year + '-' + date.month + '-01'
 				}
 			},
+			//去详情
+			gotaskDetails(item) {
+				uni.navigateTo({
+					url: `/pages/RevenueDetails/RevenueDetails?orderDetailsId=${item.nurserStationPersonRevenueId}`
+				})
+			},
 		}
 	}
 </script>

pages/Mymission/Mymission.vue

@@ -153,7 +153,6 @@
 					"appointmentOrderNo": item.orderNo
 				}
 				receiveOrders(obj).then(res => {
-					console.log(res)
 					if (res.code == 200) {
 						this.$refs.uToast.show({
 							title: '接单成功',

pages/confirmCompletion/confirmCompletion.vue

@@ -20,7 +20,13 @@
 				</view>
 			</view>
 		</view>
-		<view class="pictures">
+		<view class="pictures top">
+			<view class="title">
+				<image src="../../static/upload.png" mode=""></image>
+				<view class="text">
+					资料上传
+				</view>
+			</view>
 			<view class="picture">
 				<view class="attendantImg">
 					护理员到岗照片
@@ -59,7 +65,7 @@
 			</view>
 			<view class="picture" style="height: 730rpx;">
 				<view class="attendantImg" style="border-bottom: 1rpx solid #BAB7B8;">
-					用户签名确认
+					用户签名
 				</view>
 				<!-- 	<view class="receive">
 					我确认已接受服务
@@ -245,7 +251,6 @@
 		},
 		onLoad(options) {
 			this.itemlist = JSON.parse(options.list)
-			console.log(this.itemlist)
 			this.list.id = options.orderDetailsId
 			this.orderNo = this.itemlist.orderNo
 			var that = this

pages/homepage/homepage.vue

@@ -8,17 +8,24 @@
 			</view>
 			<view class="btns">
 				<view class="btn" @tap="goMymission('NOT_FINISH')">
-					<view class="number">
+					<view class="number" v-if="selectOrderByNursePersonCountlist.notFinishCount>=0">
 						{{selectOrderByNursePersonCountlist.notFinishCount}}项
 					</view>
+					<view class="number" v-else>
+						0项
+					</view>
 					<view class="text">
 						待处理
 					</view>
 				</view>
 				<view class="btn" @tap="goMymission('COMPLETE')">
-					<view class="number" style="color: #333333;">
+					<view class="number" style="color: #333333;"
+						v-if='selectOrderByNursePersonCountlist.completeCount>=0'>
 						{{selectOrderByNursePersonCountlist.completeCount}}项
 					</view>
+					<view class="number" style="color: #333333;" v-else>
+						0项
+					</view>
 					<view class="text">
 						已完成
 					</view>

pages/personal/personal.vue

@@ -126,15 +126,10 @@
 						this.Personallist = res.data
 					} else {
 						this.$refs.uToast.show({
-							title: '账号异常,请重新登录',
+							title: '您未登录,请重新登录',
 							type: 'error',
 							duration: '1500'
 						})
-						setTimeout(e => {
-							uni.reLaunch({
-								url: '/pages/login/login'
-							})
-						}, 1500)
 					}
 				})
 			},
@@ -161,15 +156,6 @@
 					this.gologin();
 				}
 			},
-			//去登陆
-			gologin() {
-				this.$refs.uToast.show({
-					title: '您未登录,请先登录',
-					type: 'error',
-					duration: '1000',
-					url: '/pages/login/login'
-				})
-			},
 		}
 	}
 </script>

pages/taskDetails/taskDetails.vue

@@ -6,7 +6,7 @@
 				<view class="text">
 					{{list.nurseItemName}}
 				</view>
-				<view class="righttext" >
+				<view class="righttext">
 					￥{{list.totalPrice}}
 				</view>
 			</view>
@@ -55,12 +55,17 @@
 				</view>
 			</view>
 		</view>
-		<view class="btnsuccess" v-if="list.orderStatus!='COMPLETE'" @tap='goconfirmCompletion'>
+		<span v-if="list.orderStatus=='NOT_FINISH'||list.orderStatus=='WAIT_RECEIVE'">
-			去完成
+			<view class="btnsuccess" @tap='goconfirmCompletion' v-if="list.orderStatus=='NOT_FINISH'">
-		</view>
+				去完成
-		<view class="btnreturn" @tap='gotaskReturn' v-if="list.orderStatus!='COMPLETE'">
+			</view>
-			退回
+			<view class="btnsuccess" @tap='Receivingorders' v-if="list.orderStatus=='WAIT_RECEIVE'">
-		</view>
+				接单
+			</view>
+			<view class="btnreturn" @tap='gotaskReturn'>
+				退回
+			</view>
+		</span>
 	</view>
 </template>
 
@@ -68,10 +73,14 @@
 	import {
 		taskDetails
 	} from '@/api/taskDetails/taskDetails.js'
+	import {
+		receiveOrders
+	} from '@/api/Mymission/Mymission.js'
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
 			return {
+				nursePersonId: null, //护理员id
 				baseurl: null,
 				list: {}, //详情对象
 				tude: { //经纬度
@@ -91,6 +100,24 @@
 					this.baseurl = baseurl
 				})
 			},
+			//接单
+			Receivingorders() {
+				var obj = {
+					"appointmentOrderId": this.list.orderDetailsId,
+					"stationPersonId": this.nursePersonId,
+					"appointmentOrderNo": this.list.orderNo
+				}
+				receiveOrders(obj).then(res => {
+					if (res.code == 200) {
+						this.$refs.uToast.show({
+							title: '接单成功',
+							type: 'success',
+							duration: '1500'
+						})
+						this.taskDetailsinfo(this.orderDetailsId)
+					}
+				})
+			},
 			//经纬度
 			getlocations() {
 				let that = this
@@ -134,6 +161,11 @@
 			this.orderDetailsId = options.orderDetailsId
 		},
 		onShow() {
+			var that = this
+			const value = uni.getStorageSync('nursePersonId');
+			if (value) {
+				that.nursePersonId = value
+			} else {}
 			this.taskDetailsinfo(this.orderDetailsId)
 		},
 	}