挂号预约，APP消息提醒的详情页修改

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,7 +2,7 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.93",
+    "versionName" : "1.2.94",
     "versionCode" : 180,
     "transformPx" : false,
     /* 5+App特有相关 */

CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -5,7 +5,7 @@
 			<view class="header">
 				<image @click="logShow" :src="logoImage"></image>
 			</view>
-			<!-- 主体表单 -->
+			<!-- 主体表单 --> 
 			<view class="main">
 				<wInput v-model="phoneData" type="text" maxlength="11" placeholder="账号" :focus="isFocus"></wInput>
 				<wInput v-model="passData" type="password" maxlength="110" placeholder="密码" isShowPass></wInput>

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairDetail/finishDetail/finishDetail.vue

@@ -139,6 +139,14 @@
 			}
 		},
 		onLoad(option) {
+			// console.log(JSON.parse(getCurrentPages()))
+			if(getCurrentPages().length > 0 ){
+				getCurrentPages().forEach((e)=>{
+					console.log(e)
+					// console.log(JSON.parse(e))
+					// console.log(JSON.stringify(e))
+				})
+			}
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
 			this.valiFormData.workorderid = option.wid
 			this.showBeforePic = option.showBeforePic

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue

@@ -423,53 +423,84 @@
 				}
 			}
 		},
-		async onLoad(optioin) {
+		onShow(){
+			const pages = getCurrentPages();
+			const currentPage = pages[pages.length - 1];
+			const routeParams = currentPage.options;
+			
+			// let fullPath = `${currentPage.route}`;
+			// console.log(fullPath)
+			// if(fullPath === '/pages/myTask/workOrderDetail/workOrderDetail'){
+			// 	if (Object.keys(routeParams).length > 0) {
+			// 		fullPath += '?';
+			// 		for (const key in routeParams) {
+			// 		  fullPath += `${key}=${routeParams[key]}&`;
+			// 		}
+			// 		fullPath = fullPath.slice(0, -1); // 去除最后一个多余的 '&'
+			// 	}
+			// 	uni.reLaunch({
+			// 	  url:fullPath
+			// 	});
+			// }
+			// console.log(fullPath);
+			  
+			this.init(routeParams)
+		},
+		onLoad(optioin) {
 			console.log(optioin,'1111111111111')
-			await this.getGongDanType()
-			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
-			this.workorderid = optioin.wid
-			this.sms_id = optioin.sms_id
-			this.listtype = optioin.listtype
-			this.getDetail(0)
-			this.getDetail(3)
-			this.getDetail(1)
-			this.getDetail(4)
-			if(this.sms_id) {
-				this.getButtons()
-			}else if(optioin.buttons) {
-				console.log(JSON.parse(optioin.buttons))
-				JSON.parse(optioin.buttons).forEach(v => {
-					let btn = this.$mButtonConfig[v.key];
-					if (btn != undefined) {
-						this.orderButtonData.push(btn);
-					}
-					//判断有没有返回按钮有的话显示维修确认页面
-					if(v.key == "repairconfirmnew"){
-						this.isconfirm = 1
-					}
-				})
-			}
-			// pageData.getDet((res, data) => {
-			// 	this.departList = data
-			// })
-			this.departList = JSON.parse(uni.getStorageSync('deptTreeData'))
-			// pageData.getApplicant('', (res) => {
-			// 	this.userCodeList = res
-			// })
-			 if(this.sms_id) {
-				this.isDisplay.displaySegmentedControl = true
-				this.segmenter.type = 0
-				this.segmenter.items = ["处理结果", "协作工单","工单流程",  "维修记录", "评价"]
-				this.getDetail(2)
-			} else {
-				this.isDisplay.displaySegmentedControl = true
-				this.segmenter.type = optioin.segmenter
-				this.segmenter.items = segmenterData[optioin.segmenter]
-				this.getDetail(2)
-			}
-			this.roleCode = uni.getStorageSync("roleCode")
+			// 页面
+			uni.$on("updateDetail", (res) => {
+				this.init(optioin)
+			})
+			// this.init(optioin)
 		},
 		methods: {
+			async init(optioin){
+				await this.getGongDanType()
+				this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
+				this.workorderid = optioin.wid
+				this.sms_id = optioin.sms_id
+				this.listtype = optioin.listtype
+				this.getDetail(0)
+				this.getDetail(3)
+				this.getDetail(1)
+				this.getDetail(4)
+				if(this.sms_id) {
+					this.getButtons()
+				}else if(optioin.buttons) {
+					console.log(JSON.parse(optioin.buttons))
+					this.orderButtonData = []
+					JSON.parse(optioin.buttons).forEach(v => {
+						let btn = this.$mButtonConfig[v.key];
+						if (btn != undefined) {
+							this.orderButtonData.push(btn);
+						}
+						//判断有没有返回按钮有的话显示维修确认页面
+						if(v.key == "repairconfirmnew"){
+							this.isconfirm = 1
+						}
+					})
+				}
+				// pageData.getDet((res, data) => {
+				// 	this.departList = data
+				// })
+				this.departList = JSON.parse(uni.getStorageSync('deptTreeData'))
+				// pageData.getApplicant('', (res) => {
+				// 	this.userCodeList = res
+				// })
+				 if(this.sms_id) {
+					this.isDisplay.displaySegmentedControl = true
+					this.segmenter.type = 0
+					this.segmenter.items = ["处理结果", "协作工单","工单流程",  "维修记录", "评价"]
+					this.getDetail(2)
+				} else {
+					this.isDisplay.displaySegmentedControl = true
+					this.segmenter.type = optioin.segmenter
+					this.segmenter.items = segmenterData[optioin.segmenter]
+					this.getDetail(2)
+				}
+				this.roleCode = uni.getStorageSync("roleCode")
+			},
 			clickEye(){
 				this.detailContentData.F_DeptPhone = decrypt(this.detailContentData.F_DeptPhoneShow)
 				this.detailContentData.F_Applicantsphone = decrypt(this.detailContentData.F_ApplicantsphoneShow)

CallCenterWeb.UI/RMYYAPP/utils/helper.js

@@ -62,7 +62,17 @@ export default {
 				});
 				setTimeout(() => {
 					uni.$emit("updateList", {}); //列表刷新数据
-					uni.navigateBack({delta})
+					console.log(getCurrentPages())
+					if(getCurrentPages().length > Number(delta)){
+						uni.navigateBack({delta})
+					} else {
+						if(Number(delta) === 2 ){
+							uni.navigateBack({delta:1})
+						}if(Number(delta) === 1){
+							uni.$emit("updateDetail", {}); //列表刷新数据
+						}
+					}
+					
 					fn(false)
 				}, 500)