diff --git a/api/api.js b/api/api.js
index e594ffe..ec196a3 100644
--- a/api/api.js
+++ b/api/api.js
@@ -689,7 +689,28 @@ const api = {
 	receiveWelfare(data){
 		return request('/expertAPI/receiveWelfare', data, 'post', false);
 	},
-	
+	getKePuCollection(data){
+		return request('/expertAPI/getKePuCollection', data, 'post', false);
+	},
+	getRead(data){
+		return request('/expertAPI/read', data, 'post', false);
+	},
+	getOutRead(data){
+		return request('/expertAPI/outread', data, 'post', false);
+	},
+	getAgree(data){
+		return request('/expertAPI/agree', data, 'post', false);
+	},
+	getDisagree(data){
+		return request('/expertAPI/disagree', data, 'post', false);
+	},
+	getCollect(data){
+		return request('/expertAPI/collection', data, 'post', false);
+	},
+	getGanDanFileOrder(data){
+		return request('/expertPay/getGanDanFileOrder', data, 'post', false);
+	}
+	//https://dev-app.igandan.com/app/expertPay/getGanDanFileOrder
 
 }
 
diff --git a/manifest.json b/manifest.json
index f863c84..5b6a8f5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "肝胆相照专家版",
     "appid" : "__UNI__89F511F",
     "description" : "",
-    "versionName" : "4.2.2",
-    "versionCode" : 422,
+    "versionName" : "4.2.4",
+    "versionCode" : 424,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index a21e7a0..3649e7c 100644
--- a/pages.json
+++ b/pages.json
@@ -5,7 +5,6 @@
 			"^u--(.*)": "@/node_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^up-(.*)": "@/node_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^u-([^-].*)": "@/node_modules/uview-plus/components/u-$1/u-$1.vue"
-
 		}
 	},
 	"pages": [
@@ -29,7 +28,6 @@
 				}
 			}
 		},
-		
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -38,1503 +36,1624 @@
 				"app": {
 					"bounce": "none"
 				}
-		    }
-	},
-	{
-		"path": "pages/patientClass/patientClass",
-		"style": {
-			 "navigationStyle": "custom",
-			"navigationBarTitleText": "uni-app分页",
-			"app": {
-			      "bounce": "none"
-			 }
-		}
-	},
-	{
-		"path": "pages/live/live",
-		"style": {
-			 "navigationStyle": "custom",
-			"navigationBarTitleText": "uni-app分页",
-			"app": {
-			      "bounce": "none"
-			 }
-		}
-	},
-	{
-		"path": "pages/meeting/meeting",
-		"style": {
-			 "navigationStyle": "custom",
-			"navigationBarTitleText": "直播",
-			"app": {
-			      "bounce": "none"
-			 }
-		}
-	},
-	{
-		"path": "pages/education/education",
-		"style": {
-			 "navigationStyle": "custom",
-			"navigationBarTitleText": "uni-app分页",
-			"app": {
-			      "bounce": "none"
-			 }
-		}
-	},
-	{
-		"path": "pages/my/my",
-		"style": {
-			 "navigationStyle": "custom",
-			"navigationBarTitleText": "uni-app分页",
-			"app": {
-			      "bounce": "none"
-			 }
-		}
-	},
-	// {
-	// 	"path": "pages/webview/webview",
-	// 	"style": {
-	// 		"navigationStyle": "custom",
- // 			"navigationBarTitleText": "uni-app分页",
-	// 		"app": {
-	// 		      "bounce": "none"
-	// 		 }
-	// 	}
-	// },
-	{
-		"path" : "pages/univerify/univerify",
-		"style" : 
+			}
+		},
 		{
-			"navigationBarTitleText" : ""
+			"path": "pages/patientClass/patientClass",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "uni-app分页",
+				"app": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/live/live",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "uni-app分页",
+				"app": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/meeting/meeting",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "直播",
+				"app": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/education/education",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "uni-app分页",
+				"app": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/my/my",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "uni-app分页",
+				"app": {
+					"bounce": "none"
+				}
+			}
+		},
+		// {
+		// 	"path": "pages/webview/webview",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 			"navigationBarTitleText": "uni-app分页",
+		// 		"app": {
+		// 		      "bounce": "none"
+		// 		 }
+		// 	}
+		// },
+		{
+			"path": "pages/univerify/univerify",
+			"style": {
+				"navigationBarTitleText": ""
+			}
 		}
-	}
-	
 	],
 	"subPackages": [
-	// {
-	// 	"root": "pages_course",
-	// 	"pages": [
-	// 		{
-	// 			"path": "index/index",
-	// 			"style": {
-	// 				"navigationBarTitleText": "课程页面演示",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "course/course",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "肝胆相照精品课",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "course_detail/course_detail",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "课程详情",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "course_review/course_review",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "评价课程",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "my_courses/my_courses",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "我的课程",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "course_payment/course_payment",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "课程支付",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "order_record/order_record",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "订单记录",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "course_filter/course_filter",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "筛选",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "invoice/invoice",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "开具发票",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "invoice_info/invoice_info",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "填写发票信息",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "invoice_detail/invoice_detail",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "开票详情",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		}
-	// 	]
-	// },
-	{
-		"root": "pages_app",
-		"pages": [
-			{
-				"path": "webview/webview",
-				"style": {
-					"softinputMode": "adjustResize",
-					 "navigationStyle": "custom",
-					"navigationBarTitleText": "网页",
-					"app": {
-					      "bounce": "none",
-						  "softinputmode":"adjustResize"
-					 },
-					 "app-plus":{
-						 "softinputmode":"adjustResize"
-					 }
-				}
-			},
-			{
-				"path": "scanLogin/scanLogin",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "会议历史搜索",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "meetHistroySearch/meetHistroySearch",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "会议历史搜索",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "meetHistroy/meetHistroy",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "会议历史",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "replayList/replayList",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "会议回放",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "liveReplay/liveReplay",
-				"style": {
-					 "navigationStyle": "custom",
-					"navigationBarTitleText": "uni-app分页",
-					"app": {
-					      "bounce": "none"
-					 }
-				}
-			},	
-			{
-				"path": "reply/reply",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarRightButton":{ "hide": true},
-					"navigationBarTitleText": "回复",
-					"app": {
-					      "bounce": "none"
-					 }
-				}
-			},
+		// {
+		// 	"root": "pages_course",
+		// 	"pages": [
+		// 		{
+		// 			"path": "index/index",
+		// 			"style": {
+		// 				"navigationBarTitleText": "课程页面演示",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "course/course",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "肝胆相照精品课",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "course_detail/course_detail",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "课程详情",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "course_review/course_review",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "评价课程",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "my_courses/my_courses",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "我的课程",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "course_payment/course_payment",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "课程支付",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "order_record/order_record",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "订单记录",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "course_filter/course_filter",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "筛选",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoice/invoice",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "开具发票",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoice_info/invoice_info",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "填写发票信息",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "invoice_detail/invoice_detail",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "开票详情",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		}
+		// 	]
+		// },
+		{
+			"root": "pages_app",
+			"pages": [
 				{
-				"path": "video/video",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarRightButton":{ "hide": true},
-					"navigationBarTitleText": "uni-app分页",
-					"app": {
-						"bounce": "none"
+					"path": "webview/webview",
+					"style": {
+						"softinputMode": "adjustResize",
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "网页",
+						"app": {
+							"bounce": "none",
+							"softinputmode": "adjustResize"
+						},
+						"app-plus": {
+							"softinputmode": "adjustResize"
+						}
 					}
-				}
-			},
-			{
-				"path": "downLoadVideo/downLoadVideo",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "uni-app分页",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "zhinanDownload/zhinanDownload",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "治疗指南",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "pptDownload/pptDownload",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "治疗指南",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-			"path": "pptDetail/pptDetail",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-			"path": "ppt/ppt",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "pay/pay",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-				"path": "articleDownload/articleDownload",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "文献期刊",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-			"path": "patientVideo/patientVideo",
-			"style": {
-				 "navigationStyle": "custom",
-				 "navigationBarRightButton":{ "hide": true},
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-				"path": "videoDetail/videoDetail",
-				"style": {
-					 "navigationStyle": "custom",
-					 "navigationBarRightButton":{ "hide": true},
-					"navigationBarTitleText": "uni-app分页",
-					"app": {
-					      "bounce": "none"
-					 }
-				}
-			},
-			{
-			"path": "zhinan/zhinan",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		  },
-		  {
-			"path": "zhinanList/zhinanList",
-			"style": {
-				 "navigationStyle": "custom",
-				 "navigationBarRightButton":{ "hide": true},
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		 },
-		 {
-			"path": "hot/hot",
-			"style": {
-				 "navigationStyle": "custom",
-				 "navigationBarRightButton":{ "hide": true},
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
+				},
 				{
-			"path": "login/login",
-			"style": {
-				 "navigationStyle": "custom",
-				 "navigationBarRightButton":{ "hide": true},
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "smsLogin/smsLogin",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-				"path": "consultDetail/consultDetail",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "uni-app分页",
-					"app": {
-						"bounce": "none"
+					"path": "webview/webviewClass",
+					"style": {
+						"softinputMode": "adjustResize",
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "网页",
+						"app": {
+							"bounce": "none",
+							"softinputmode": "adjustResize"
+						},
+						"app-plus": {
+							"softinputmode": "adjustResize"
+						}
 					}
-				}
-			},
-			{
-			"path": "freeDetail/freeDetail",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-				"path": "consult/consult",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "uni-app分页",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
+				},
 				{
-				"path": "myAnswer/myAnswer",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "我的意见",
-					"app": {
-						"bounce": "none"
+					"path": "scanLogin/scanLogin",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "会议历史搜索",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "meetHistroySearch/meetHistroySearch",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "会议历史搜索",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "meetHistroy/meetHistroy",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "会议历史",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "replayList/replayList",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "会议回放",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "liveReplay/liveReplay",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "reply/reply",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "回复",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "video/video",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "downLoadVideo/downLoadVideo",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "zhinanDownload/zhinanDownload",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "治疗指南",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "pptDownload/pptDownload",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "治疗指南",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "pptDetail/pptDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "ppt/ppt",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "pay/pay",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "articleDownload/articleDownload",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "文献期刊",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientVideo/patientVideo",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "videoDetail/videoDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "zhinan/zhinan",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "zhinanList/zhinanList",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "hot/hot",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "login/login",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "smsLogin/smsLogin",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "consultDetail/consultDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "freeDetail/freeDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "consult/consult",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myAnswer/myAnswer",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "我的意见",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myCode/myCode",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "buyPoint/buyPoint",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myWelfare/welfareDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myWelfare/myWelfare",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "idcardAuth/idcardAuth",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "idcardAuth/bankCardList",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "常用银行卡",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myCourseware/myCourseware",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myCourseware/coursewareDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "buyUpan/buyUpan",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "buyUpan/address",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myWelfareCard/myWelfareCard",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myWelfareCard/exchange",
+					"style": {
+						"navigationStyle": "custom",
+						"softinputMode": "adjustResize",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myPoint/myPoint",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "积分",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "pointGoods/pointGoods",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "news/news",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myFlower/myFlower",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "msg/msg",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myPatient/myPatient",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "newsList/newsList",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "feedback/feedback",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "意见反馈",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientMsg/patientMsg",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientGroup/patientGroup",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "groupMsg/groupMsg",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "schedule/schedule",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "visitPlan/visitPlan",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "caseList/caseList",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "checkRecord/checkRecord",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "visit/visit",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientSetting/patientSetting",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientRemark/patientRemark",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientDetail/patientDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "groupEdit/groupEdit",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "groupManage/groupManage",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myAccount/myAccount",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "我的账户",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myAccount/billDetails",
+					"style": {
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 80,
+						"navigationBarTitleText": "账单明细",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myAccount/withdrawal",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "提现",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "selectPatient/selectPatient",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "visitNote/visitNote",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "followDetail/followDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarRightButton": {
+							"hide": true
+						},
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "pwdLogin/pwdLogin",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "patientInfo/patientInfo",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "患者信息",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "replayText/replayText",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "会议回放",
+						"app": {
+							"bounce": "none"
+						}
 					}
 				}
-			},
-			{
-			"path": "myCode/myCode",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-			"path": "buyPoint/buyPoint",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
+				// 	{
+				// 		"path": "changePassword/index",
+				// 		"style": {
+				// 			"navigationStyle": "custom",
+				// 			"navigationBarTitleText": "修改登录密码",
+				// 			"app": {
+				// 				"bounce": "none"
+				// 			}
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "selectPatientSingle/selectPatientSingle",
+				// 		"style": {
+				// 			"navigationStyle": "custom",
+				// 			"navigationBarRightButton":{ "hide": true},
+				// 			"navigationBarTitleText": "uni-app分页",
+				// 			"app": {
+				// 				"bounce": "none"
+				// 			}
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "patientInfo/patientInfo",
+				// 		"style": {
+				// 			"navigationStyle": "custom",
+				// 			"navigationBarTitleText": "患者信息",
+				// 			"app": {
+				// 				"bounce": "none"
+				// 			}
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "searchNews/searchNews",
+				// 		"style": {
+				// 			"navigationStyle": "custom",
+				// 			"navigationBarTitleText": "uni-app分页",
+				// 			"app": {
+				// 				"bounce": "none"
+				// 			}
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "writeInfo/writeInfo",
+				// 		"style": {
+				// 			"navigationStyle": "custom",
+				// 			"navigationBarRightButton":{ "hide": true},
+				// 			"navigationBarTitleText": "uni-app分页",
+				// 			"app": {
+				// 				"bounce": "none"
+				// 			}
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "myApplication/myApplication",
+				// 		"style": {
+				// 			 "navigationStyle": "custom",
+				// 			 "navigationBarRightButton":{ "hide": true},
+				// 			"navigationBarTitleText": "uni-app分页",
+				// 			"app": {
+				// 			      "bounce": "none"
+				// 			 }
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "searchVideo/searchVideo",
+				// 		"style": {
+				// 			 "navigationStyle": "custom",
+				// 			 "navigationBarRightButton":{ "hide": true},
+				// 			"navigationBarTitleText": "uni-app分页",
+				// 			"app": {
+				// 			      "bounce": "none"
+				// 			 }
+				// 		}
+				// 	},
+				// 	{
+				// 		"path": "search/search",
+				// 		"style": {
+				// 			 "navigationStyle": "custom",
+				// 			 "navigationBarRightButton":{ "hide": true},
+				// 			"navigationBarTitleText": "uni-app分页",
+				// 			"app": {
+				// 			      "bounce": "none"
+				// 			 }
+				// 		}
+				// 	},
+				// {
+				// 	"path": "video/video",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		 "navigationBarRightButton":{ "hide": true},
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "liveReplay/liveReplay",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },	
+				// {
+				// 	"path": "myWelfareCard/exchange",
+				// 	"style": {
+				// 		"navigationStyle": "custom",
+				// 		"navigationBarTitleText": "兑换福利卡",
+				// 		"app": { "bounce": "none" }
+				// 	}
+				// },
+				// {
+				// 	"path": "pointMall/pointMall",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "caseRecord/caseRecord",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "searchPatient/searchPatient",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "qikan/qikan",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "smsLogin/smsLogin",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myDownLoad/myDownLoad",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myCollect/myCollect",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// {
+				// 	"path": "myCourseware/myCourseware",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "changeMobile/changeMobile",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "wechatContact/wechatContact",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "setting/setting",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myVideo/myVideo",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "zhinanList/zhinanList",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		 "navigationBarRightButton":{ "hide": true},
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "personInfo/personInfo",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "videoHistory/videoHistory",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "pwdLogin/pwdLogin",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myCollect/video",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myCollect/english",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myCollect/file",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myCollect/news",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "myCollect/huanjiao",
+				// 	"style": {
+				// 		 "navigationStyle": "custom",
+				// 		"navigationBarTitleText": "uni-app分页",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// {
+				// 	"path": "feedback/feedback-logoff",
+				// 	"style": {
+				// 		"navigationStyle": "custom",
+				// 		"navigationBarTitleText": "注销账户",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// },
+				// {
+				// 	"path": "reply/reply",
+				// 	"style": {
+				// 		"navigationStyle": "custom",
+				// 		"navigationBarRightButton":{ "hide": true},
+				// 		"navigationBarTitleText": "回复",
+				// 		"app": {
+				// 		      "bounce": "none"
+				// 		 }
+				// 	}
+				// }
+			]
 		},
 		{
-			"path": "myWelfare/welfareDetail",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "myWelfare/myWelfare",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "buyUpan/buyUpan",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "buyUpan/address",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "myWelfareCard/myWelfareCard",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "myWelfareCard/exchange",
-			"style": {
-				 "navigationStyle": "custom",
-				 "softinputMode": "adjustResize",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "myPoint/myPoint",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "积分",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		
-		{
-			"path": "pointGoods/pointGoods",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "news/news",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-
-		{
-			"path": "msg/msg",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "myPatient/myPatient",
-			"style": {
-				 "navigationStyle": "custom",
-				 "navigationBarRightButton":{ "hide": true},
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-			"path": "newsList/newsList",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-		{
-			"path": "pwdLogin/pwdLogin",
-			"style": {
-				 "navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app分页",
-				"app": {
-				      "bounce": "none"
-				 }
-			}
-		},
-			{
-				"path": "patientInfo/patientInfo",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "患者信息",
-					"app": {
-						"bounce": "none"
+			"root": "pages_goods",
+			"pages": [
+				{
+					"path": "coupon/coupon",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "积分券",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "pointMall/pointMall",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "积分商城",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "myRedemption/myRedemption",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "我的兑换",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "productDetail/productDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "商品详情",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "logistics/logistics",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "物流信息",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "exchange/index",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "在线兑换",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "exchange/exchangeDetail",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "在线兑换",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "exchange/address_list",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "地址管理",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "exchange/address",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "收货地址",
+						"app": {
+							"bounce": "none"
+						}
 					}
 				}
-			},
-			{
-				"path": "replayText/replayText",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "会议回放",
-					"app": {
-						"bounce": "none"
+			]
+		},
+		{
+			"root": "pages_chat",
+			"pages": [
+				{
+					"path": "outPatient/outPatient",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
 					}
-				}
-			}
-		// 	{
-		// 		"path": "changePassword/index",
-		// 		"style": {
-		// 			"navigationStyle": "custom",
-		// 			"navigationBarTitleText": "修改登录密码",
-		// 			"app": {
-		// 				"bounce": "none"
+				},
+				{
+					"path": "stopPatient/stopPatient",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							"bounce": "none"
+						}
+					}
+				},
+						{
+					"path": "groupSend/groupSend",
+					"style": {
+						 "navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							  "bounce": "none"
+						 }
+					}
+				},
+				{
+					"path": "patientGroup/patientGroup",
+					"style": {
+						 "navigationStyle": "custom",
+						"navigationBarTitleText": "uni-app分页",
+						"app": {
+							  "bounce": "none"
+						 }
+					}
+				},
+				{
+					               "path": "addAddress/addAddress",
+								"style": {
+									"navigationStyle": "custom",
+									"navigationBarTitleText": "uni-app分页",
+									"app": {
+										"bounce": "none"
+									}
+								}
+							},
+							{
+					               "path": "editAddress/editAddress",
+								"style": {
+									"navigationStyle": "custom",
+									"navigationBarTitleText": "uni-app分页",
+									"app": {
+										"bounce": "none"
+									}
+								}
+							},
+							{
+								"path": "outManage/outManage",
+								"style": {
+									"navigationStyle": "custom",
+									"navigationBarTitleText": "uni-app分页",
+									"app": {
+										"bounce": "none"
+									}
+								}
+							},
+							{
+								"path": "groupMessage/groupMessage",
+								"style": {
+									 "navigationStyle": "custom",
+									"navigationBarTitleText": "uni-app分页",
+									"app": {
+										  "bounce": "none"
+									 }
+								}
+							},{
+					               "path": "note/note",
+					               "style": {
+					                   "navigationStyle": "custom",
+					                   "navigationBarTitleText": "uni-app分页",
+					                   "app": {
+					                       "bounce": "none"
+					                   }
+					               }
+					           }
+			]
+		}
+		// {
+		// 	"root": "pages_chat",
+		// 	"pages": [
+		// 		{
+		// 			"path": "chat/index",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "聊天页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "groupSend/groupSend",
+		// 			"style": {
+		// 				 "navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					  "bounce": "none"
+		// 				 }
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "patientGroup/patientGroup",
+		// 			"style": {
+		// 				 "navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					  "bounce": "none"
+		// 				 }
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "quickReply/quickReply",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "article/article",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "searchArticle/searchArticle",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "video/video",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		//            {
+		//                "path": "addAddress/addAddress",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		//                "path": "editAddress/editAddress",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "outManage/outManage",
+		// 			"style": {
+		// 				"navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					"bounce": "none"
+		// 				}
+		// 			}
+		// 		},
+		// 		{
+		// 			"path": "groupMessage/groupMessage",
+		// 			"style": {
+		// 				 "navigationStyle": "custom",
+		// 				"navigationBarTitleText": "uni-app分页",
+		// 				"app": {
+		// 					  "bounce": "none"
+		// 				 }
 		// 			}
 		// 		}
-		// 	},
-		// 	{
-		// 		"path": "selectPatientSingle/selectPatientSingle",
-		// 		"style": {
-		// 			"navigationStyle": "custom",
-		// 			"navigationBarRightButton":{ "hide": true},
-		// 			"navigationBarTitleText": "uni-app分页",
-		// 			"app": {
-		// 				"bounce": "none"
-		// 			}
-		// 		}
-		// 	},
-		// 	{
-		// 		"path": "patientInfo/patientInfo",
-		// 		"style": {
-		// 			"navigationStyle": "custom",
-		// 			"navigationBarTitleText": "患者信息",
-		// 			"app": {
-		// 				"bounce": "none"
-		// 			}
-		// 		}
-		// 	},
-			
-		
-		
-		// 	{
-		// 		"path": "searchNews/searchNews",
-		// 		"style": {
-		// 			"navigationStyle": "custom",
-		// 			"navigationBarTitleText": "uni-app分页",
-		// 			"app": {
-		// 				"bounce": "none"
-		// 			}
-		// 		}
-		// 	},
-		// 	{
-		// 		"path": "writeInfo/writeInfo",
-		// 		"style": {
-		// 			"navigationStyle": "custom",
-		// 			"navigationBarRightButton":{ "hide": true},
-		// 			"navigationBarTitleText": "uni-app分页",
-		// 			"app": {
-		// 				"bounce": "none"
-		// 			}
-		// 		}
-		// 	},
-		// 	{
-		// 		"path": "myApplication/myApplication",
-		// 		"style": {
-		// 			 "navigationStyle": "custom",
-		// 			 "navigationBarRightButton":{ "hide": true},
-		// 			"navigationBarTitleText": "uni-app分页",
-		// 			"app": {
-		// 			      "bounce": "none"
-		// 			 }
-		// 		}
-		// 	},
-		// 	{
-		// 		"path": "searchVideo/searchVideo",
-		// 		"style": {
-		// 			 "navigationStyle": "custom",
-		// 			 "navigationBarRightButton":{ "hide": true},
-		// 			"navigationBarTitleText": "uni-app分页",
-		// 			"app": {
-		// 			      "bounce": "none"
-		// 			 }
-		// 		}
-		// 	},
-		// 	{
-		// 		"path": "search/search",
-		// 		"style": {
-		// 			 "navigationStyle": "custom",
-		// 			 "navigationBarRightButton":{ "hide": true},
-		// 			"navigationBarTitleText": "uni-app分页",
-		// 			"app": {
-		// 			      "bounce": "none"
-		// 			 }
-		// 		}
-		// 	},
-		
-		// {
-		// 	"path": "video/video",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "patientSetting/patientSetting",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "patientRemark/patientRemark",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "groupEdit/groupEdit",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "groupManage/groupManage",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		
-		
-		// {
-		// 	"path": "selectPatient/selectPatient",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "visitNote/visitNote",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "followDetail/followDetail",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "liveReplay/liveReplay",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },	
-		
-		// {
-		// 	"path": "myFlower/myFlower",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		
-		
-		// {
-		// 	"path": "myWelfareCard/exchange",
-		// 	"style": {
-		// 		"navigationStyle": "custom",
-		// 		"navigationBarTitleText": "兑换福利卡",
-		// 		"app": { "bounce": "none" }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "pointMall/pointMall",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		
-		
-		
-		
-		// {
-		// 	"path": "caseRecord/caseRecord",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "searchPatient/searchPatient",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-
-		// {
-		// 	"path": "visitPlan/visitPlan",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-
-		// {
-		// 	"path": "caseList/caseList",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "checkRecord/checkRecord",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "qikan/qikan",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "smsLogin/smsLogin",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "patientGroup/patientGroup",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "groupMsg/groupMsg",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		
-		// {
-		// 	"path": "myDownLoad/myDownLoad",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "myCollect/myCollect",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myAccount/myAccount",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "我的账户",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myAccount/billDetails",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "账单明细",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myAccount/withdrawal",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "提现",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myCourseware/myCourseware",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "changeMobile/changeMobile",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "wechatContact/wechatContact",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "setting/setting",
-		// 	"style": {
-				
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "schedule/schedule",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "visit/visit",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "patientDetail/patientDetail",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "idcardAuth/idcardAuth",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "idcardAuth/bankCardList",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "常用银行卡",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myVideo/myVideo",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "zhinanList/zhinanList",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		 "navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "personInfo/personInfo",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "patientMsg/patientMsg",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		
-		// {
-		// 	"path": "videoHistory/videoHistory",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "pwdLogin/pwdLogin",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myCollect/video",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myCollect/english",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myCollect/file",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myCollect/news",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "myCollect/huanjiao",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "uni-app分页",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		
-		// {
-		// 	"path": "feedback/feedback",
-		// 	"style": {
-		// 		 "navigationStyle": "custom",
-		// 		"navigationBarTitleText": "意见反馈",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "feedback/feedback-logoff",
-		// 	"style": {
-		// 		"navigationStyle": "custom",
-		// 		"navigationBarTitleText": "注销账户",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
-		// },
-		// {
-		// 	"path": "reply/reply",
-		// 	"style": {
-		// 		"navigationStyle": "custom",
-		// 		"navigationBarRightButton":{ "hide": true},
-		// 		"navigationBarTitleText": "回复",
-		// 		"app": {
-		// 		      "bounce": "none"
-		// 		 }
-		// 	}
+		//            ,{
+		//                "path": "stopPatient/stopPatient",
+		//                "style": {
+		//                    "navigationStyle": "custom",
+		//                    "navigationBarTitleText": "uni-app分页",
+		//                    "app": {
+		//                        "bounce": "none"
+		//                    }
+		//                }
+		//            }
+		// 		,{
+		//                "path": "note/note",
+		//                "style": {
+		//                    "navigationStyle": "custom",
+		//                    "navigationBarTitleText": "uni-app分页",
+		//                    "app": {
+		//                        "bounce": "none"
+		//                    }
+		//                }
+		//            }
+		// 	]
 		// }
-
-		
-		]
-	},
-	{
-		"root": "pages_goods",
-		"pages": [
-			{
-				"path": "coupon/coupon",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "积分券",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "pointMall/pointMall",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "积分商城",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "myRedemption/myRedemption",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "我的兑换",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			
-			{
-				"path": "productDetail/productDetail",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "商品详情",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "logistics/logistics",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "物流信息",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "exchange/index",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "在线兑换",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "exchange/exchangeDetail",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "在线兑换",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "exchange/address_list",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "地址管理",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			},
-			{
-				"path": "exchange/address",
-				"style": {
-					"navigationStyle": "custom",
-					"navigationBarTitleText": "收货地址",
-					"app": {
-						"bounce": "none"
-					}
-				}
-			}
-		]
-	}
-	// {
-	// 	"root": "pages_chat",
-	// 	"pages": [
-	// 		{
-	// 			"path": "chat/index",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "聊天页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "groupSend/groupSend",
-	// 			"style": {
-	// 				 "navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					  "bounce": "none"
-	// 				 }
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "patientGroup/patientGroup",
-	// 			"style": {
-	// 				 "navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					  "bounce": "none"
-	// 				 }
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "quickReply/quickReply",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "article/article",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "searchArticle/searchArticle",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "video/video",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "outPatient/outPatient",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
- //            {
- //                "path": "addAddress/addAddress",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
- //                "path": "editAddress/editAddress",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "outManage/outManage",
-	// 			"style": {
-	// 				"navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					"bounce": "none"
-	// 				}
-	// 			}
-	// 		},
-	// 		{
-	// 			"path": "groupMessage/groupMessage",
-	// 			"style": {
-	// 				 "navigationStyle": "custom",
-	// 				"navigationBarTitleText": "uni-app分页",
-	// 				"app": {
-	// 					  "bounce": "none"
-	// 				 }
-	// 			}
-	// 		}
- //            ,{
- //                "path": "stopPatient/stopPatient",
- //                "style": {
- //                    "navigationStyle": "custom",
- //                    "navigationBarTitleText": "uni-app分页",
- //                    "app": {
- //                        "bounce": "none"
- //                    }
- //                }
- //            }
-	// 		,{
- //                "path": "note/note",
- //                "style": {
- //                    "navigationStyle": "custom",
- //                    "navigationBarTitleText": "uni-app分页",
- //                    "app": {
- //                        "bounce": "none"
- //                    }
- //                }
- //            }
-			
-	// 	]
-	// }
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -1561,14 +1680,14 @@
 			"navigationStyle": "custom"
 		}
 	},
-	"condition" : {
+	"condition": {
 		"current": 0,
 		"list": [
 			{
 				"name": "",
-				"path": "",
+				"path": "pages_chat/groupMessage/groupMessage",
 				"query": ""
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/loading/loading.vue b/pages/loading/loading.vue
index fd0003d..26171a6 100644
--- a/pages/loading/loading.vue
+++ b/pages/loading/loading.vue
@@ -15,7 +15,7 @@ const countDown=()=>{
   }
   timer.value=setInterval(()=>{
     count.value++;
-    if(count.value>=3){
+    if(count.value>=5){
       clearInterval(timer.value);
       plus.runtime.quit();
     }
diff --git a/pages/patientClass/patientClass.vue b/pages/patientClass/patientClass.vue
index 761227d..1dd38cb 100644
--- a/pages/patientClass/patientClass.vue
+++ b/pages/patientClass/patientClass.vue
@@ -108,8 +108,9 @@
 			
 			<!-- 空状态 -->
 			<view class="empty-state" v-if="articleList.length === 0 && !loading">
-				<uni-icons type="article" size="80" color="#cccccc"></uni-icons>
-				<text class="empty-text">暂无文章</text>
+				<empty :emptyDesc="'暂无患教信息'"></empty>
+				<!-- <uni-icons type="article" size="80" color="#cccccc"></uni-icons>
+				<text class="empty-text">暂无文章</text> -->
 			</view>
 		</scroll-view>
 		
@@ -155,7 +156,7 @@
 		currentPage.value = 1;
 		hasMore.value = true;
 		articleList.value = [];
-		polularScienceArticleListByKeywordsNew(true);
+		polularScienceArticleListByKeywordsNew(false);
 	};
 	const loadGuideTags = async () => {
 			try {
@@ -203,9 +204,9 @@
 				// 判断是否还有更多数据
 				hasMore.value = newData.length >= pageSize.value;
 				
-				if (!isRefresh) {
-					currentPage.value++;
-				}
+				// if (!isRefresh) {
+				// 	currentPage.value++;
+				// }
 				
 				console.log('文章数据加载成功:', articleList.value);
 			}
@@ -287,7 +288,7 @@
 		// 跳转到详情页
 		if (article.path) {
 			uni.navigateTo({
-				url: `/pages_app/webview/webview?url=${encodeURIComponent(docUrl+article.path)}&title=患教详情`
+				url: `/pages_app/webview/webviewClass?url=${encodeURIComponent(docUrl+article.path+'?fromtype=doctor')}&title=患教详情&uuid=${article.uuid}&sharetitle=${article.title}&summary=${article.summary}&type=huanjiao&imgPath=${encodeURIComponent(article.image)}`
 			});
 		}
 	};
@@ -313,6 +314,7 @@
 	// 上拉加载更多
 	const onLoadMore = async () => {
 		if (!hasMore.value || loading.value) return;
+		currentPage.value++
 		await polularScienceArticleListByKeywordsNew(false);
 	};
 	
@@ -377,11 +379,11 @@
 		hasMore.value = true;
 		articleList.value = [];
 		showFilter.value = false;
-		polularScienceArticleListByKeywordsNew(true);
+		polularScienceArticleListByKeywordsNew(false);
 	};
 	
 	onShow(() => {
-		polularScienceArticleListByKeywordsNew(true);
+		polularScienceArticleListByKeywordsNew(false);
 		loadGuideTags();
 	});
 </script>
@@ -501,10 +503,10 @@ $padding-small: 20rpx;
 // 文章列表
 .article-list {
 	position: fixed;
-	height:calc(100vh - var(--status-bar-height) - 44px - 188rpx);
+	// height:calc(100vh - var(--status-bar-height) - 44px - 207rpx);
 	top: calc(var(--status-bar-height) + 44px + 188rpx);
 	
-	padding-bottom: 130rpx;
+	bottom: 128rpx;
 	.article-item {
 		background-color: $white;
 		margin-bottom: $padding-small;
@@ -572,6 +574,9 @@ $padding-small: 20rpx;
 						
 						font-size: 24rpx;
 						color: $gray-medium;
+						text{
+							white-space: nowrap;
+						}
 					}
 				}
 			}
diff --git a/pages_app/caseList/caseList.vue b/pages_app/caseList/caseList.vue
index 1aeb351..e788114 100644
--- a/pages_app/caseList/caseList.vue
+++ b/pages_app/caseList/caseList.vue
@@ -1,13 +1,15 @@
 <template>
 	<view class="container">
 		<!-- 头部导航 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="病情记录"
 			@clickLeft="goBack"
-			fixed
+			
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -17,6 +19,7 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+		</view>
 		
 		
 		<!-- 主要内容区域 -->
@@ -301,7 +304,10 @@ onMounted(() => {
 
 /* 主要内容区域 */
 .main-content {
-	height: calc(100vh - 180rpx);
+	top: calc(var(--status-bar-height) + 44px);
+	width: 100%;
+	position: fixed;
+	bottom:0;
 	padding: 40rpx 30rpx;
     box-sizing: border-box;
 }
diff --git a/pages_app/checkRecord/checkRecord.vue b/pages_app/checkRecord/checkRecord.vue
index dbaa862..7ed9447 100644
--- a/pages_app/checkRecord/checkRecord.vue
+++ b/pages_app/checkRecord/checkRecord.vue
@@ -6,15 +6,13 @@
 		<!-- 主要内容区域 -->
 		<view class="main-content">
 			<!-- 疾病诊断部分 -->
-			<view class="section">
-				<view class="section-header">
-					<view class="red-bar"></view>
-					<text class="section-title">疾病诊断</text>
-				</view>
+			<view class="header">
+				<view class="section">
 				<view class="section-content">
 					<text class="diagnosis-text">疾病诊断: {{ pageData.diseaseName }}</text>
 				</view>
 			</view>
+			</view>
 			
 			<!-- 化验报告部分 -->
 			<view class="section">
@@ -153,7 +151,7 @@ onMounted(() => {
 })
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .container {
 	background-color: #ffffff;
 	min-height: 100vh;
@@ -205,13 +203,7 @@ onMounted(() => {
 }
 
 /* 头部导航样式 */
-.header {
-	display: flex;
-	align-items: center;
-	padding: 20rpx 30rpx;
-	background-color: #ffffff;
-	border-bottom: 1rpx solid #f0f0f0;
-}
+
 
 .back-btn {
 	width: 60rpx;
@@ -237,7 +229,8 @@ onMounted(() => {
 
 /* 主要内容区域 */
 .main-content {
-	padding: 0 30rpx;
+	margin-top: calc(var(--status-bar-height) + 44px);
+	
 }
 
 .section {
@@ -247,6 +240,7 @@ onMounted(() => {
 .section-header {
     margin-top: 20rpx;
 	position: relative;
+	
 	margin-bottom: 20rpx;
 }
 
@@ -277,7 +271,21 @@ onMounted(() => {
 	color: #333333;
 	line-height: 1.5;
 }
-
+.header{
+	background: #8B2316;
+	color: #fff;
+	margin-bottom: 20rpx;
+	.section{
+		padding:20rpx;
+		margin-bottom: 10rpx;
+	}
+	.section-content{
+		padding-left:0rpx;
+	}
+	.diagnosis-text{
+		color: #fff;
+	}
+}
 .no-report-text {
 	font-size: 28rpx;
 	color: #999999;
diff --git a/pages_app/feedback/feedback.vue b/pages_app/feedback/feedback.vue
index 7d5818a..2015c2a 100644
--- a/pages_app/feedback/feedback.vue
+++ b/pages_app/feedback/feedback.vue
@@ -3,7 +3,7 @@
 	
 		
 		<!-- 顶部导航栏 -->
-		<navBar title="意见反馈"></navBar>
+		<navBar :title="'意见反馈'"></navBar>
 		
 		<!-- 反馈输入区域 -->
 		<view class="feedback-input-container">
@@ -126,6 +126,7 @@
 	
 	/* 反馈输入区域 */
 	.feedback-input-container {
+		margin-top: calc(var(--status-bar-height) + 44px);
 		padding: 30rpx;
 		flex: 1;
 	}
diff --git a/pages_app/followDetail/followDetail.vue b/pages_app/followDetail/followDetail.vue
index 9cf0e1c..22bac60 100644
--- a/pages_app/followDetail/followDetail.vue
+++ b/pages_app/followDetail/followDetail.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="visit-note-page">
-		<uni-nav-bar
+		<navBar :title="'随访详情'" />
+		<!-- <uni-nav-bar
 			left-icon="left"
 			title="随访详情"
 			@clickLeft="goBack"
@@ -11,7 +12,7 @@
 			backgroundColor="#eee"
 		>
 		
-		</uni-nav-bar>
+		</uni-nav-bar> -->
 
 		<!-- 患者行 -->
 		<view class="row" @click="noop">
@@ -41,6 +42,7 @@
 	import { onLoad,onShow } from '@dcloudio/uni-app'
     import api from '@/api/api.js'
 	const patientName = ref('')
+	import navBar from '@/components/navBar/navBar.vue'
 	const note = ref('请近日来医院复诊、复查')
 	const datetime = ref('')
 	const followUpUuid = ref('')
diff --git a/pages_app/groupEdit/groupEdit.vue b/pages_app/groupEdit/groupEdit.vue
index fade7e2..968517c 100644
--- a/pages_app/groupEdit/groupEdit.vue
+++ b/pages_app/groupEdit/groupEdit.vue
@@ -1,12 +1,14 @@
 <template>
 	<view class="group-edit-page">
-        <uni-nav-bar
+        <view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			:title="groupUuid ? '编辑分组' : '新建分组'"
 			@clickLeft="goBack"
-			fixed
+			
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -15,7 +17,9 @@
 			</template>
 		</uni-nav-bar>
 		
-		<!-- 分组名称 -->
+		</view>
+	    <view class="contentbox">
+				<!-- 分组名称 -->
 		<view class="section-header">分组名称</view>
 		<view class="name-row">
 			<input class="name-input" v-model.trim="groupName" placeholder="请输入分组名称" maxlength="20" />
@@ -46,6 +50,7 @@
 		</view>
 	
 
+		</view>
 
 
 		<!-- 底部删除按钮 -->
@@ -194,6 +199,9 @@
 </script>
 
 <style lang="scss" scoped>
+.contentbox{
+	margin-top: calc(var(--status-bar-height) + 44px);
+}
 	.group-edit-page{
 		min-height: 100vh;
 		background: #f5f5f5;
diff --git a/pages_app/groupManage/groupManage.vue b/pages_app/groupManage/groupManage.vue
index b22f9bf..8045f45 100644
--- a/pages_app/groupManage/groupManage.vue
+++ b/pages_app/groupManage/groupManage.vue
@@ -1,12 +1,12 @@
 <template>
   <view class="group-manage-page">
-    <uni-nav-bar
+    <view class="nabox">
+      <view class="status_bar"></view>
+      <uni-nav-bar
       left-icon="left"
       title="分组管理"
       @clickLeft="goBack"
-      fixed
       color="#8B2316"
-      height="180rpx"
       :border="false"
       backgroundColor="#eee"
     >
@@ -14,6 +14,7 @@
         <view class="save-text" @click="saveGroups">保存</view>
       </template>
     </uni-nav-bar>
+    </view>
 
     <!-- 已选中的分组 -->
     <view class="selected-section">
@@ -166,6 +167,7 @@ const saveGroups = () => {
 			color: #333;
 }
 .selected-section {
+  margin-top: calc(var(--status-bar-height) + 44px);
   min-height: 300rpx;
   padding: 30rpx;
   border-bottom: 1rpx solid #f0f0f0;
diff --git a/pages_app/idcardAuth/bankCardList.vue b/pages_app/idcardAuth/bankCardList.vue
index 73479b4..6326ca4 100644
--- a/pages_app/idcardAuth/bankCardList.vue
+++ b/pages_app/idcardAuth/bankCardList.vue
@@ -1,20 +1,22 @@
 <template>
 	<view class="bank-card-page">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		 <view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="常用银行卡"
-			@clickLeft="goBack()"
+			@clickLeft="goBack"
 			right-text="添加"
 			@clickRight="addBankCard"
-			fixed
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eeeeee"
 		>
 		</uni-nav-bar>
 
+		 </view>
 		<!-- 银行卡列表 -->
 		<view class="card-list">
 			<view class="card-item" v-for="(card, index) in bankCards" :key="card.uuid">
@@ -42,18 +44,35 @@ import navTo from '@/utils/navTo';
 import api from '@/api/api';
 import empty from "@/components/empty/empty.vue"
 const bankCards = ref([]);
-
+import { onLoad,onBackPress } from '@dcloudio/uni-app';
+const from = ref('');
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
+onBackPress(() => {
+	if(!from.value){
+		uni.navigateBack();
+		return true;
+	}
+});
 // 银行卡数据
 const getBankCardList = () => {
 	api.bankCardList({}).then(res => {
-		if (res.code === 200 && res.data.bankList) {
-			bankCards.value = res.data.bankList;
+
+		if (res.code === 200 && res.data) {
+			bankCards.value = res.data;
 		}
 	});
 };
 
 const goBack = () => {
-	uni.navigateBack();
+	if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
 };
 
 const addBankCard = () => {
@@ -98,6 +117,7 @@ onMounted(() => {
 
 /* 银行卡列表样式 */
 .card-list {
+	margin-top: calc(var(--status-bar-height) + 44px);
 	padding: 30rpx;
 	
 	.card-item {
diff --git a/pages_app/idcardAuth/idcardAuth.vue b/pages_app/idcardAuth/idcardAuth.vue
index 68b7bbc..764567b 100644
--- a/pages_app/idcardAuth/idcardAuth.vue
+++ b/pages_app/idcardAuth/idcardAuth.vue
@@ -1,17 +1,20 @@
 <template>
 	<view class="idcard-auth-page">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			:title="currentStep === 1 ? '身份验证' : '添加银行卡'"
-			@clickLeft="goBack()"
-			fixed
+			@clickLeft="goBack"
+		
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eeeeee"
 		>
 		</uni-nav-bar>
+		</view>
 		<!-- 内容区域 -->
 		<view class="content-area">
 			<!-- 进度指示器 -->
@@ -90,10 +93,11 @@
 								v-model="formData.cardNumber"
 								placeholder-style="color: #cccccc"
 							/>
-							<view class="info-icon">
+							
+						</view>
+						<view class="info-icon" @click="showInfo('card')">
 								<text class="icon-text">!</text>
 							</view>
-						</view>
 					</view>
 					<view class="form-item">
 						<text class="form-label">手机号</text>
@@ -104,9 +108,10 @@
 								v-model="formData.mobile"
 								placeholder-style="color: #cccccc"
 							/>
-							<view class="info-icon">
+							
+						</view>
+						<view class="info-icon"  @click="showInfo('phone')">
 								<text class="icon-text">!</text>
-							</view>
 						</view>
 					</view>
 				</view>
@@ -145,6 +150,18 @@
 			</view>
 		</view>
 	</view>
+	<unidialog
+    :visible="cardVisible"
+    :showCancel="false"
+	:title="cardTitle"
+	:content="cardContent"
+    :showConfirm="true"
+    :confirmText="'知道了'"
+    @close="cardVisible=false"
+    @confirm="cardVisible=false"
+  >
+   
+  </unidialog>
 </template>
 
 <script setup>
@@ -153,7 +170,10 @@ import stepImg from "@/static/add_card_no.png"
 import stepActiveImg from "@/static/add_card_yes.png"
 import navTo from '@/utils/navTo';
 import api from '@/api/api';
-
+import unidialog from '@/components/dialog/dialog.vue';
+const cardContent = ref('暂支持以下银行：农业银行、建设银行、光大银行、平安银行、兴业银行、中信银行、邮政储蓄银行、民生银行、中国银行、工商银行、交通银行、浦发银行、广发银行、华夏银行、招商银行、北京银行、上海银行。');
+const cardTitle = ref('银行卡说明');
+const cardVisible = ref(true);
 const formData = ref({
 	name: '',
 	idNumber: '',
@@ -163,7 +183,16 @@ const formData = ref({
 
 const isLoading = ref(false);
 const currentStep = ref(1); // 当前步骤，1表示身份信息，2表示添加银行卡
-
+const showInfo = (type) => {
+	if (type === 'card') {
+		cardTitle.value = '银行卡说明';
+		cardContent.value = '暂支持以下银行：农业银行、建设银行、光大银行、平安银行、兴业银行、中信银行、邮政储蓄银行、民生银行、中国银行、工商银行、交通银行、浦发银行、广发银行、华夏银行、招商银行、北京银行、上海银行。';
+	} else if (type === 'phone') {
+		cardTitle.value = '手机号说明';
+		cardContent.value = '银行预留的手机号码是办理银行卡时所填写的手机号码。没有预留，手机号码已经忘记或者已经停用，请联系银行客服更新处理';
+	}
+	cardVisible.value = true;
+};
 // 短信弹框相关
 const showSmsDialog = ref(false);
 const smsCode = ref('');
@@ -337,7 +366,7 @@ const onCancelSms = () => {
 }
 
 .content-area {
-	padding-top: 160rpx;
+	margin-top: calc(var(--status-bar-height) + 44px);
 	padding: 0rpx 0rpx 0;
 }
 
@@ -487,7 +516,25 @@ const onCancelSms = () => {
 				border-color: #8B2316;
 			}
 		}
-		
+		.info-icon {
+				flex:1;
+				position: absolute;
+				right: 20rpx;
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 50%;
+				background: #fff;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border: 2rpx solid #8B2316;
+				
+				.icon-text {
+					font-size: 20rpx;
+					color: #8B2316;
+					font-weight: bold;
+				}
+			}
 		.input-container {
 			display: flex;
 			align-items: center;
@@ -509,24 +556,7 @@ const onCancelSms = () => {
 				}
 			}
 			
-			.info-icon {
-				flex:1;
-				position: absolute;
-				right: 20rpx;
-				width: 40rpx;
-				height: 40rpx;
-				border-radius: 50%;
-				background: #f0f0f0;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				
-				.icon-text {
-					font-size: 20rpx;
-					color: #cccccc;
-					font-weight: bold;
-				}
-			}
+			
 		}
 	}
 }
diff --git a/pages_app/msg/msg.vue b/pages_app/msg/msg.vue
index 2fdd6bf..c48a87c 100644
--- a/pages_app/msg/msg.vue
+++ b/pages_app/msg/msg.vue
@@ -14,7 +14,7 @@
       <template v-slot:right>
         <view class="nav-right"  >
             <view class="collect-img" @click="clearMsg" >
-            <image class="img-icon" :src="clearImg" mode="aspectFill" />
+            <image class="img-icon" :src="clearImg"  />
           </view>
         </view>
       </template>
@@ -83,10 +83,13 @@
 			
 			<!-- 其他模块 - 卡片样式 -->
 			<view v-else>
-				<view class="card" v-for="(msg, idx) in msgList" :key="msg.id" @click="goMsgDetail(msg)">
-					<view class="card-title" :class="{'active':msg.is_read==0}">{{ msg.title }}</view>
-					<view class="card-content">{{ msg.content }}</view>
+				<view class="card-cell" v-for="(msg, idx) in msgList" :key="msg.id" @click="goMsgDetail(msg)">
 					<view class="card-time">{{ msg.create_date }}</view>
+					<view class="card" >
+						<view class="card-title" :class="{'active':msg.is_read==0}">{{ msg.title }}</view>
+						<view class="card-content">{{ msg.content }}</view>
+						
+					</view>
 				</view>
 			</view>
 			
@@ -189,8 +192,9 @@
 				if (res.confirm) {
 					api.appMesageRead().then(res => {
 						console.log(res);
+						getUnReadList();
 					});
-					getUnReadList();
+					
 				}
 			}
 		});
@@ -202,27 +206,53 @@
 		};
 		//readMsg(msg.id);
 		if(msg.extra.module==4){
-			uni.sendNativeEvent('goCourseDetail', {
+			if(msg.extra.type==17 || msg.extra.type==40){
+               uni.showToast({
+				title: '暂停中',
+				icon: 'none'
+			  });
+			}else{
+				uni.sendNativeEvent('goCourseDetail', {
 				msg: {
 					id:msg.extra.id
 				}
 			});
+			}
+			
 
+		}else if(msg.extra.module==2){
+			if(msg.extra.type==19){
+				let url=`/pages_app/myCourseware/myCourseware?from=msg`
+				navTo({
+					url: url
+				})
+			}
+			
 		}else{
 			let url="";
 		if(msg.extra.module==1 && msg.extra.type==36){
 			url=`/pages_app/myPoint/myPoint?from=msg`
-		}else if(msg.extra.module==1 && msg.extra.type==31){
-			url=`/pages_app/myPoint/myPoint?from=msg`
-		}else if(msg.extra.module==1 && msg.extra.type==35){
-			uni.setStorageSync('lookWelfare', 'useWelfare');
-			url=`/pages_app/myWelfare/myWelfare?from=msg`
-		}else if(msg.extra.module==3 && msg.extra.type==12){
-			url=`/pages_app/myPatient/myPatient`
-		}
-		navTo({
+			navTo({
 			url: url
 		})
+		}else if(msg.extra.module==1 && msg.extra.type==31){
+			url=`/pages_app/myPoint/myPoint?from=msg`
+			navTo({
+			url: url
+		})
+		}else if(msg.extra.module==1 && msg.extra.type==35){
+			//uni.setStorageSync('lookWelfare', 'useWelfare');
+			url=`/pages_app/myWelfareCard/myWelfareCard?from=msg`
+			navTo({
+			url: url
+		})
+		}else if(msg.extra.module==3 && msg.extra.type==12){
+			url=`/pages_app/myPatient/myPatient?from=msg`
+			navTo({
+			url: url
+		})
+		}
+		
 		}
 	}
 	// 下拉刷新
@@ -378,9 +408,13 @@
 	.nav-right{
 		display: flex;
 		align-items: center;
-		.collect-img{
-			width: 34rpx;
-			height: 34rpx;
+		.collect-img {
+			width: 50rpx;
+			height: 50rpx;
+			.img-icon{
+				width: 50rpx;
+				height: 50rpx;
+			}
 		}
 	}
 	.msg-page {
@@ -445,7 +479,7 @@
 	.msg-list {
 		position: fixed;
 		// 减去导航与宫格的高度
-		top: 360rpx; // 让列表起始位置在宫格下方
+		top: calc(var(--status-bar-height) + 44px + 230rpx);
 		padding: 20rpx 24rpx 40rpx;
 		box-sizing: border-box;
 	     bottom: 0rpx;
@@ -486,6 +520,20 @@
 			}
 		}
 		
+		.card-cell{
+			display: flex;
+			flex-direction: column;
+			
+			margin-bottom: 30rpx;
+			box-sizing: border-box;
+		}
+		.card-time {
+				width:100%;
+				margin:10rpx 0;
+				font-size: 30rpx;
+				color: #666;
+				text-align: center;
+			}
 		.card {
 			background: #fff;
 			border-radius: 16rpx;
@@ -510,11 +558,7 @@
 				margin-bottom: 14rpx;
 			}
 
-			.card-time {
-				font-size: 24rpx;
-				color: $muted;
-				text-align: right;
-			}
+			
 		}
 
 		// 聊天列表样式
diff --git a/pages_app/myAccount/billDetails.vue b/pages_app/myAccount/billDetails.vue
index 9fc896b..b48504e 100644
--- a/pages_app/myAccount/billDetails.vue
+++ b/pages_app/myAccount/billDetails.vue
@@ -1,16 +1,19 @@
 <template>
 	<view class="bill-details-page">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="账单明细"
 			@clickLeft="goBack"
-			fixed
+			
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eeeeee"
 		></uni-nav-bar>
+		</view>
 
 		<!-- 表格头部 -->
 		<view class="table-header">
@@ -72,9 +75,16 @@ const total = ref(0)
 const isFirstPage = ref(true)
 const isLastPage = ref(false)
 
+const stopRefresh = () => {
+	refreshing.value = false
+}
+
 // 获取订单列表
 const getOrderList = async (isRefresh = false) => {
-	if (loading.value) return
+	if (loading.value) {
+		if (isRefresh) stopRefresh()
+		return
+	}
 	
 	loading.value = true
 	
@@ -93,7 +103,8 @@ const getOrderList = async (isRefresh = false) => {
 			}
 			
 			// 处理订单数据
-			const processedList = list.map(item => ({
+			const safeList = Array.isArray(list) ? list : []
+			const processedList = safeList.map(item => ({
 				id: item.trade_no,
 				typeName: item.type_name,
 				userName: item.user_name,
@@ -117,12 +128,16 @@ const getOrderList = async (isRefresh = false) => {
 		})
 	} finally {
 		loading.value = false
-		refreshing.value = false
+		stopRefresh()
 	}
 }
 
 // 刷新数据
 const onRefresh = () => {
+	if (loading.value) {
+		stopRefresh()
+		return
+	}
 	refreshing.value = true
 	page.value = 1
 	isLastPage.value = false
@@ -182,10 +197,13 @@ onMounted(() => {
 
 // 表格头部样式
 .table-header {
-	background-color: #e0e0e0;
+	background-color: #fff;
+	position: fixed;
 	display: flex;
+	width: 100%;
 	padding: 20rpx 30rpx;
-	margin-top: 170rpx; /* 为固定导航栏留出空间 */
+	box-sizing: border-box;
+	top:calc(var(--status-bar-height) + 44px); /* 为固定导航栏留出空间 */
 	border-bottom: 1rpx solid #ccc;
 	
 	.header-cell {
@@ -224,11 +242,16 @@ onMounted(() => {
 
 // 交易记录列表样式
 .transaction-list {
-	background-color: #f5f5f5;
+	top:calc(var(--status-bar-height) + 44px + 130rpx);
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0rpx;
+	background-color: #fff;
 }
 
 .transaction-item {
-	background-color: #f8f8f8;
+	
 	display: flex;
 	padding: 20rpx 30rpx;
 	border-bottom: 1rpx solid #e5e5e5;
diff --git a/pages_app/myAccount/myAccount.vue b/pages_app/myAccount/myAccount.vue
index 004da7c..d126c5e 100644
--- a/pages_app/myAccount/myAccount.vue
+++ b/pages_app/myAccount/myAccount.vue
@@ -1,16 +1,17 @@
 <template>
 	<view class="my-account-page">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		 <view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="我的账户"
 			@clickLeft="goBack"
-			fixed
 			color="#8B2316"
-			height="180rpx"
 			:border="false"
 			backgroundColor="#eeeeee"
 		></uni-nav-bar>
+		 </view>
 
 		<!-- 账户余额区域 -->
 		<view class="account-summary">
@@ -21,7 +22,7 @@
 			<text class="balance-amount">{{ (accountBalance/100).toFixed(2) }}</text>
 			
 			<!-- 账户信息详情 -->
-			<view class="account-details">
+			<!-- <view class="account-details">
 				<view class="detail-item">
 					<text class="detail-label">单次提现限额</text>
 					<text class="detail-value">{{ (withdrawalBalanceMaxOnce/100).toFixed(2) }}元</text>
@@ -34,7 +35,7 @@
 					<text class="detail-label">最低提现金额</text>
 					<text class="detail-value">{{ (lessWithdrawalBalance/100).toFixed(2) }}元</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 
 		<!-- 操作选项 -->
@@ -47,7 +48,7 @@
 					<text class="action-title">提现</text>
 					<text class="action-subtitle">提现金额不得少于{{ (lessWithdrawalBalance/100).toFixed(2) }}元</text>
 				</view>
-				<text class="action-arrow">></text>
+				<uni-icons type="right" size="25" color="#999"></uni-icons>
 			</view>
 			
 			<view class="action-item" @click="handleBillDetails">
@@ -57,7 +58,7 @@
 				<view class="action-content">
 					<text class="action-title">账单明细</text>
 				</view>
-				<text class="action-arrow">></text>
+				<uni-icons type="right" size="25" color="#999"></uni-icons>
 			</view>
 		</view>
 
@@ -70,6 +71,19 @@
 import { ref, onMounted } from 'vue'
 import api from '@/api/api.js'	
 import docUrl from '@/utils/docUrl'
+import { onLoad,onBackPress } from '@dcloudio/uni-app';
+const from = ref('');
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
+onBackPress(() => {
+	if(!from.value){
+		plus.runtime.quit();
+		return true;
+	}
+});
 // 响应式数据
 const accountBalance = ref(0)
 const withdrawalBalanceMaxOnce = ref(0)
@@ -86,13 +100,17 @@ onMounted(() => {
 
 // 方法
 const goBack = () => {
-	uni.navigateBack()
+	if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
 }
 
 const handleWithdrawal = () => {
 	if(accountBalance.value < lessWithdrawalBalance.value){
 		uni.showToast({
-			title: `提现金额不得少于${(lessWithdrawalBalance/100).toFixed(2)}元`,
+			title: `提现金额不得少于${(lessWithdrawalBalance.value/100).toFixed(2)}元`,
 			icon: 'none'
 		})
 		return
@@ -150,9 +168,10 @@ const getMyAccount = async () => {
 
 // 账户余额区域样式
 .account-summary {
+	margin-top: calc(var(--status-bar-height) + 44px);
 	background: linear-gradient(135deg, #8B2316, #A0522D);
-	margin: 30rpx;
-	border-radius: 20rpx;
+	// margin: 30rpx;
+	// border-radius: 20rpx;
 	padding: 60rpx 40rpx;
 	text-align: center;
 	box-shadow: 0 8rpx 24rpx rgba(139, 35, 22, 0.3);
@@ -164,7 +183,7 @@ const getMyAccount = async () => {
 		.profile-avatar {
 			width: 120rpx;
 			height: 120rpx;
-			border-radius: 60rpx;
+			border-radius: 20rpx;
 			border: 4rpx solid rgba(255, 255, 255, 0.3);
 			object-fit: cover;
 		}
@@ -223,10 +242,10 @@ const getMyAccount = async () => {
 // 操作选项样式
 .action-items {
 	background-color: #ffffff;
-	margin: 0 30rpx;
-	border-radius: 20rpx;
+	margin-top: 30rpx;
+	// border-radius: 20rpx;
 	overflow: hidden;
-	box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
+	// box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
 	
 	.action-item {
 		display: flex;
diff --git a/pages_app/myAccount/withdrawal.vue b/pages_app/myAccount/withdrawal.vue
index acb539c..5787c6f 100644
--- a/pages_app/myAccount/withdrawal.vue
+++ b/pages_app/myAccount/withdrawal.vue
@@ -1,16 +1,17 @@
 <template>
 	<view class="withdrawal-page">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="提现"
 			@clickLeft="goBack"
-			fixed
 			color="#8B2316"
-			height="180rpx"
 			:border="false"
 			backgroundColor="#eeeeee"
 		></uni-nav-bar>
+		</view>
 
 		<!-- 主内容区域 -->
 		<view class="main-content">
@@ -48,12 +49,12 @@
 				<text class="amount-title">提现金额</text>
 				<view class="amount-display">
 					<text class="currency-symbol">¥</text>
-					<text class="amount-value">{{ withdrawalAmount }}</text>
+					<text class="amount-value">{{ withdrawalAmount}}</text>
 				</view>
 				<view class="amount-details">
-					<text class="tax-info">扣除个人所得税<text class="highlight-red">{{ (incomeTax / 100).toFixed(2) }}元</text></text>
-					<text class="fee-info">扣除提现手续费<text class="highlight-red">{{ (withdrawalBalanceFee / 100).toFixed(2) }}元</text></text>
-					<text class="actual-amount">此次提现实际到账<text class="highlight-red">{{ actualAmount }}元</text></text>
+					<text class="tax-info">扣除个人所得税<text class="highlight-red">{{ incomeTax}}元</text></text>
+					<!-- <text class="fee-info">扣除提现手续费<text class="highlight-red">{{ (withdrawalBalanceFee / 100).toFixed(2) }}元</text></text> -->
+					<text class="actual-amount">此次提现实际到账<text class="highlight-red">{{ actualAmount}}元</text></text>
 				</view>
 			</view>
 		</view>
@@ -132,10 +133,11 @@ onMounted(() => {
 // 计算提现金额
 const calculateAmounts = () => {
 	// 提现金额 = 账户余额 - 个人所得税 - 提现手续费
-	const totalDeduction = incomeTax.value + withdrawalBalanceFee.value
-	const amount = accountBalance.value - totalDeduction
-	withdrawalAmount.value = accountBalance.value > 0 ? (accountBalance.value/100).toFixed(2) : '0.00'
-	actualAmount.value = amount > 0 ? (amount/100).toFixed(2) : '0.00'
+	// const totalDeduction = incomeTax.value + withdrawalBalanceFee.value
+	// const amount = accountBalance.value - totalDeduction
+	// withdrawalAmount.value = accountBalance.value > 0 ? (accountBalance.value/100).toFixed(2) : '0.00'
+	// actualAmount.value = amount > 0 ? (amount/100).toFixed(2) : '0.00'
+
 }
 
 // 初始化数据
@@ -173,7 +175,7 @@ const getMyAccount = async () => {
 			withdrawalBalanceFee.value = res.data.withdrawalBalanceFee
 			lessWithdrawalBalance.value = res.data.lessWithdrawalBalance
 			// 获取账户信息后计算金额
-			calculateAmounts()
+			//calculateAmounts()
 			// 然后获取个人所得税
 			getIncomeTax(accountBalance.value)
 		}
@@ -187,10 +189,13 @@ const getIncomeTax = async (amount) => {
 	try {
 		const res = await api.getIncomeTax({amount: amount})
 		console.log('个人所得税:', res)
-		if (res && res.code === 200 && res.data) {
-			incomeTax.value = res.data.incomeTax || 0
+		if (res.code ==200) {
+			incomeTax.value = (res.data.tax/100).toFixed(2) || 0
+			withdrawalAmount.value = (amount/100).toFixed(2) || 0
+			actualAmount.value = (res.data.actual_amount/100).toFixed(2) || 0
+
 			// 获取税费后重新计算金额
-			calculateAmounts()
+			//calculateAmounts()
 		}
 	} catch (error) {
 		console.error('获取个人所得税失败:', error)
@@ -405,7 +410,7 @@ const onCancelSms = () => {
 
 // 主内容区域
 .main-content {
-	padding: 0 30rpx;
+	
 }
 
 // 加载状态
@@ -433,7 +438,7 @@ const onCancelSms = () => {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	padding: 30rpx 0;
+	padding: 30rpx;
 	
 	.section-title {
 		font-size: 32rpx;
@@ -456,7 +461,8 @@ const onCancelSms = () => {
 .bank-card-info {
 	display: flex;
 	align-items: center;
-	padding: 30rpx 0;
+	padding: 30rpx;
+	background-color: #ffffff;
 	
 	.bank-logo {
 		width: 60rpx;
@@ -520,8 +526,8 @@ const onCancelSms = () => {
 
 // 金额区域
 .amount-section {
-	padding: 40rpx 0;
-	
+	padding: 40rpx 30rpx;
+	background-color: #ffffff;
 	.amount-title {
 		display: block;
 		font-size: 32rpx;
@@ -556,7 +562,7 @@ const onCancelSms = () => {
 			margin-bottom: 12rpx;
 			
 			.highlight-red {
-				color: #8B2316;
+				color: red;
 			}
 		}
 	}
diff --git a/pages_app/myCourseware/coursewareDetail.vue b/pages_app/myCourseware/coursewareDetail.vue
new file mode 100644
index 0000000..95e6b38
--- /dev/null
+++ b/pages_app/myCourseware/coursewareDetail.vue
@@ -0,0 +1,210 @@
+<template>
+  <view class="detail-page">
+    <navBar title="订单详情" />
+
+    <view class="order-card">
+      <view class="order-top">
+        <text class="download-no">下载课件号: {{ detail.downloadNo || "--" }}</text>
+        <text class="pay-status">{{ detail.statusText || "--" }}</text>
+      </view>
+
+      <view class="section-divider"></view>
+
+      <view class="course-title">{{ detail.title || "--" }}</view>
+
+     
+
+      <view class="info-list">
+        <view class="info-row">
+          <text class="info-label">课件作者：</text>
+          <text class="info-value">{{ detail.author || "--" }}</text>
+        </view>
+        <view class="info-row">
+          <text class="info-label">金额：</text>
+          <text class="info-value amount">{{ detail.amountText || "--" }}</text>
+        </view>
+        <view class="info-row">
+          <text class="info-label">创建时间：</text>
+          <text class="info-value">{{ detail.createTime || "--" }}</text>
+        </view>
+        <view class="info-row">
+          <text class="info-label">支付方式：</text>
+          <text class="info-value">{{ detail.payType || "--" }}</text>
+        </view>
+        <view class="info-row">
+          <text class="info-label">支付时间：</text>
+          <text class="info-value">{{ detail.payTime || "--" }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import api from "@/api/api.js";
+
+const coursewareId = ref("");
+const detail = ref({
+  downloadNo: "",
+  statusText: "",
+  title: "",
+  author: "",
+  amountText: "",
+  createTime: "",
+  payType: "",
+  payTime: "",
+});
+
+const formatDateTime = (value) => {
+  if (!value) return "";
+  if (typeof value === "string" && value.includes("-")) return value;
+  const timeNum = Number(value);
+  if (!timeNum) return "";
+  const ms = timeNum < 10000000000 ? timeNum * 1000 : timeNum;
+  const d = new Date(ms);
+  const y = d.getFullYear();
+  const m = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  const h = String(d.getHours()).padStart(2, "0");
+  const min = String(d.getMinutes()).padStart(2, "0");
+  const s = String(d.getSeconds()).padStart(2, "0");
+  return `${y}-${m}-${day} ${h}:${min}:${s}`;
+};
+
+const formatAmount = (value) => {
+  if (value === undefined || value === null || value === "") return "";
+  const num = Number(value);
+  if (Number.isNaN(num)) return "";
+  const amount = num > 1000 ? num / 100 : num;
+  return `${amount.toFixed(2)}元`;
+};
+
+const formatStatus = (raw) => {
+  if (raw === undefined || raw === null) return "";
+  const text = String(raw).toLowerCase();
+  if (text === "paid" || text === "success" || text === "1" || text === "2") return "已支付";
+  if (text === "unpaid" || text === "0" || text === "created") return "未支付";
+  return String(raw);
+};
+
+const formatPayType = (raw) => {
+  if (raw === undefined || raw === null || raw === "") return "免费";
+  const text = String(raw).toLowerCase();
+  if (text === "0" || text === "free") return "免费";
+  if (text === "1" || text.includes("wx") || text.includes("wechat")) return "微信";
+  if (text === "2" || text.includes("ali")) return "支付宝";
+  if (text === "3" || text.includes("balance")) return "余额";
+  return String(raw);
+};
+
+const fetchCoursewareDetail = async () => {
+  if (!coursewareId.value) return;
+  try {
+    const res = await api.getGanDanFileOrder({
+      order_id: coursewareId.value,
+    });
+    if (res.code !== 200 || !res.data) return;
+
+    const data = res.data;
+    detail.value = {
+      downloadNo: data.order_id || data.download_no || data.gandanfile_order_id || data.id || "",
+      statusText: formatStatus(data.order_status || data.status || data.pay_status || ""),
+      title: data.title || data.name || data.file_name || "",
+      author: data.provider_name || data.author || data.nickname || "",
+      amountText: formatAmount(data.pay_amount || data.total_fee || data.amount || data.price || 0),
+      createTime: formatDateTime(data.create_date || data.create_time || data.order_time || ""),
+      payType: formatPayType(data.pay_type_name || data.pay_type || data.payment_method || ""),
+      payTime: formatDateTime(data.pay_date || data.pay_time || ""),
+    };
+  } catch (error) {
+    uni.showToast({
+      title: "获取详情失败",
+      icon: "none",
+    });
+  }
+};
+
+onLoad((options) => {
+  coursewareId.value = options.id;
+  fetchCoursewareDetail();
+});
+</script>
+
+<style lang="scss" scoped>
+.detail-page {
+  min-height: 100vh;
+  background: #f5f5f5;
+}
+
+.order-card {
+  background: #fff;
+  margin-top: calc(var(--status-bar-height) + 44px);
+}
+
+.order-top {
+  min-height: 88rpx;
+  padding: 0 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.download-no {
+  font-size: 32rpx;
+  color: #333;
+}
+
+.pay-status {
+  font-size: 32rpx;
+  color: #8b2316;
+}
+
+.section-divider {
+  height: 16rpx;
+  background: #f5f5f5;
+}
+
+.course-title {
+  padding: 20rpx 30rpx;
+  color: #8b2316;
+  font-size: 32rpx;
+  line-height: 1.5;
+  word-break: break-all;
+  border-bottom: 2rpx solid #ccc;
+}
+
+.info-list {
+  padding: 24rpx 30rpx;
+}
+
+.info-row {
+  min-height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10rpx;
+}
+
+.info-row:last-child {
+  margin-bottom: 0;
+}
+
+.info-label {
+  font-size: 18rpx;
+  color: #333;
+}
+
+.info-value {
+  max-width: 68%;
+  font-size: 28rpx;
+  color: #666;
+  text-align: right;
+  word-break: break-all;
+}
+
+.amount {
+  color:red;
+}
+</style>
\ No newline at end of file
diff --git a/pages_app/myCourseware/myCourseware.vue b/pages_app/myCourseware/myCourseware.vue
index 35076e7..c9943d4 100644
--- a/pages_app/myCourseware/myCourseware.vue
+++ b/pages_app/myCourseware/myCourseware.vue
@@ -1,18 +1,7 @@
 <template>
+	<navBar title="我的课件" />
 	<view class="my-courseware-page">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
-			left-icon="left"
-			title="我的课件"
-			@cviewckLeft="goBack"
-			fixed
-			color="#8B2316"
-			height="180rpx"
-			:border="false"
-			backgroundColor="#eeeeee"
-		>
-			
-		</uni-nav-bar>
 
 		<!-- 标签页导航 -->
 		<view class="tab-nav">
@@ -37,11 +26,11 @@
 		<view class="summary-bar">
 			<view class="summary-item">
 				<up-image  :src="downLoadImg" width="36rpx" height="36rpx" ></up-image>
-				<text class="summary-text">{{ activeTab === 'download' ? '下载账户' : '分享账户' }}: {{ downloadCount }}</text>
+				<text class="summary-text">{{ totalAmount}}</text>
 			</view>
 			<view class="summary-item">
 				<up-image  :src="moneyImg" width="36rpx" height="36rpx" ></up-image>
-				<text class="summary-text">{{ activeTab === 'download' ? '文件数量' : '分享文件' }}: {{ totalAmount }}</text>
+				<text class="summary-text">{{ downloadCount }}</text>
 			</view>
 		</view>
 
@@ -74,7 +63,7 @@
 						<text class="label">时间:</text>
 						<text class="value">{{ item.time }}</text>
 					</view>
-					<view class="courseware-status">
+					<view class="courseware-status" v-if="activeTab === 'download'">
 						<text class="label">状态:</text>
 						<text class="value status-paid">{{ item.status }}</text>
 					</view>
@@ -97,6 +86,8 @@
 <script setup>
 import { ref, onMounted } from 'vue';
 import api from '@/api/api';
+import  navTo  from '@/utils/navTo.js';
+import { onLoad } from '@dcloudio/uni-app';
 import downLoadImg from "@/static/course_download.png"
 import moneyImg from "@/static/course_yuan.png"
 const activeTab = ref('download');
@@ -105,8 +96,8 @@ const loading = ref(false);
 const noMore = ref(false);
 const page = ref(1);
 const pageSize = ref(10);
-const downloadCount = ref(4);
-const totalAmount = ref('20.00');
+const downloadCount = ref(0);
+const totalAmount = ref(0);
 
 const coursewareList = ref([]);
 
@@ -118,6 +109,12 @@ const goBack = () => {
 	uni.navigateBack();
 };
 
+onLoad((options) => {
+	if(options.from){
+		//from.value = options.from;
+		switchTab('share')
+	}
+})
 const switchTab = (tab) => {
 	activeTab.value = tab;
 	// 切换标签时重置数据
@@ -132,37 +129,10 @@ const onItemClick = (item) => {
 	console.log('点击课件:', item);
 	
 	if (activeTab.value === 'download') {
-		// 下载标签页的处理逻辑
-		if (item.download_path) {
-			uni.downloadFile({
-				url: item.download_path,
-				success: (res) => {
-					if (res.statusCode === 200) {
-						uni.openDocument({
-							filePath: res.tempFilePath,
-							success: () => {
-								console.log('打开文档成功');
-							},
-							fail: (err) => {
-								console.error('打开文档失败:', err);
-								uni.showToast({ title: '无法打开此文件', icon: 'none' });
-							}
-						});
-					}
-				},
-				fail: (err) => {
-					console.error('下载失败:', err);
-					uni.showToast({ title: '下载失败', icon: 'none' });
-				}
-			});
-		} else {
-			uni.showToast({ title: `点击了下载课件: ${item.name}`, icon: 'none' });
-		}
-	} else {
-		// 分享标签页的处理逻辑
-		uni.showToast({ title: `点击了分享课件: ${item.name}`, icon: 'none' });
-		// 这里可以添加分享相关的操作，比如查看分享详情、重新分享等
-	}
+		navTo({
+			url: `/pages_app/myCourseware/coursewareDetail?id=${item.order_id}`
+		})
+	} 
 };
 
 const onRefresh = () => {
@@ -175,7 +145,7 @@ const onRefresh = () => {
 			if (res.code === 200 && res.data) {
 				const data = res.data.list;
 				// 更新摘要信息
-				downloadCount.value = res.data.downloadTotalAccount || 0;
+				downloadCount.value = (res.data.downloadTotalAccount/100).toFixed(2) || 0;
 				totalAmount.value = res.data.downloadFileCount || 0;
 				
 				// 处理课件列表数据
@@ -203,7 +173,7 @@ const onRefresh = () => {
 			if (res.code === 200 && res.data) {
 				const data = res.data.list;
 				// 更新摘要信息 - 分享数据使用不同的字段
-				downloadCount.value = res.data.shareTotalAccount || 0;
+				downloadCount.value = (res.data.shareTotalAccount/100).toFixed(2) || 0;
 				totalAmount.value = res.data.shareloadFileCount || 0;
 				
 				// 处理分享列表数据
@@ -305,7 +275,7 @@ const onLoadMore = () => {
 	background: #ffffff;
 	border-bottom: 2rpx solid #f0f0f0;
 	position: fixed;
-	top: 180rpx;
+	top: calc(var(--status-bar-height) + 44px);
 	left: 0;
 	right: 0;
 	z-index: 10;
@@ -332,20 +302,21 @@ const onLoadMore = () => {
 
 .summary-bar {
 	display: flex;
-	justify-content: space-between;
+	
 	align-items: center;
 	background: #8B2316;
 	padding: 20rpx 30rpx;
 	position: fixed;
-	top: 260rpx; // 标签页导航下方
+	top: calc(var(--status-bar-height) + 44px + 124rpx); // 标签页导航下方
 	left: 0;
 	right: 0;
 	z-index: 10;
 	
 	.summary-item {
+		flex:1;
 		display: flex;
 		align-items: center;
-		
+		justify-content: flex-start;
 		.summary-text {
 			color: #ffffff;
 			font-size: 28rpx;
@@ -355,7 +326,7 @@ const onLoadMore = () => {
 }
 
 .courseware-list {
-	height: calc(100vh - 180rpx - 116rpx - 80rpx);
+	// height: calc(100vh - 180rpx - 116rpx - 80rpx);
 	position: fixed;
 	top: 336rpx; // 调整顶部位置，为固定的摘要栏腾出空间
 	bottom: 0;
diff --git a/pages_app/myFlower/myFlower.vue b/pages_app/myFlower/myFlower.vue
index a7308b4..fab52e0 100644
--- a/pages_app/myFlower/myFlower.vue
+++ b/pages_app/myFlower/myFlower.vue
@@ -2,16 +2,19 @@
 
 	<view class="flower-page">
 		<!-- 顶部统计栏（与截图一致：两项） -->
-		<uni-nav-bar
+		  <view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left" 
 			title="我的鲜花" 
 			@clickLeft="goBack" 
-			fixed 
+			
 			color="#8B2316" 
-			height="180rpx" 
+			
 			:border="false" 
 			backgroundColor="#eeeeee"
 		/>
+		  </view>
 		
 		<view class="stats-bar">
 			<view class="stat">
@@ -60,10 +63,10 @@
 			<view v-if="noMore && records.length > 0" class="no-more">
 				<text>没有更多数据了</text>
 			</view>
-			<view class="debug-actions">
-				<!-- <button @click="testLoadMore" size="mini" type="primary">测试加载更多</button>
-				<text class="debug-info">当前页: {{ page }}, 加载中: {{ loading }}, 无更多: {{ noMore }}</text> -->
-			</view>
+			<!-- <view class="debug-actions">
+				<button @click="testLoadMore" size="mini" type="primary">测试加载更多</button>
+				<text class="debug-info">当前页: {{ page }}, 加载中: {{ loading }}, 无更多: {{ noMore }}</text>
+			</view> -->
 		</scroll-view>
 	</view>
 </template>
@@ -74,6 +77,19 @@ import flowerImg from "@/static/flowers.png"
 import moneyImg from "@/static/mind_totle_money.png"
 import emptyImg from "@/static/icon_empty.png"
 import api from '@/api/api.js';
+import { onBackPress,onLoad } from '@dcloudio/uni-app';
+const from=ref('');
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
+onBackPress(() => {
+	if(!from.value){
+		plus.runtime.quit();
+		return true;
+	}
+});
 // 与截图一致的顶部两项统计：总鲜花数与累计金额
 const stat = ref({ totalCount: 0, totalAmount: 0.0 });
 
@@ -91,11 +107,11 @@ const scrollTop = ref(0);
 
 
 const goBack = () => {
-	uni.navigateBack({
-		fail() {
-			uni.redirectTo({ url: '/pages/index/index' });
-		}
-	});
+	if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
 };
 
 const getFlowerList = () => {
@@ -225,7 +241,7 @@ $card: #ffffff;
 
 .stats-bar {
 	display: flex;
-	
+	margin-top: calc(var(--status-bar-height) + 44px);
 	align-items: center;
 	padding: 24rpx 30rpx;
 	background: #fff;
diff --git a/pages_app/myPatient/myPatient.vue b/pages_app/myPatient/myPatient.vue
index e157db8..6faf711 100644
--- a/pages_app/myPatient/myPatient.vue
+++ b/pages_app/myPatient/myPatient.vue
@@ -1,20 +1,6 @@
 <template>
-	
+	<navBar :title="from == 'msg' ? '新的患者' : '我的患者'" />
 	<view class="new-patient-page">
-	
-
-		<uni-nav-bar
-			left-icon="left" 
-			title="我的患者" 
-			@clickLeft="goBack" 
-			fixed 
-			color="#8B2316" 
-			height="180rpx" 
-			:border="false" 
-			backgroundColor="#eeeeee"
-		/>
-		
-
 		<!-- 提醒区域 -->
 		<view class="reminder-section">
 			<view class="reminder-icon">
@@ -65,6 +51,7 @@
 				</view>
 			</view>
 		</view>
+		<empty v-if="applyList.length == 0 && historyList.length == 0" :emptyDesc="'暂无新随访申请患者'" />
 
 		<!-- 底部按钮 -->
 		<view class="bottom-button">
@@ -75,11 +62,25 @@
 
 <script setup>
 import { ref } from 'vue';
-import { onLoad,onShow} from '@dcloudio/uni-app';
+import { onLoad,onShow,onBackPress} from '@dcloudio/uni-app';
 import goImg from "@/static/go_big.png"
 import api from '@/api/api.js'
 import docUrl from "@/utils/docUrl"
 import navTo from "@/utils/navTo.js"
+import empty from "@/components/empty/empty.vue"
+import navBar from "@/components/navBar/navBar.vue"
+const from=ref('');
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
+onBackPress(() => {
+	if(!from.value){
+		plus.runtime.quit();
+		return true;
+	}
+});
 // 响应式数据
 const pendingRequest = ref({
 	name: '陈新华',
@@ -91,7 +92,11 @@ const historyList = ref([]);
 
 // 方法
 const goBack = () => {
-	uni.navigateBack();
+	if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
 };
 
 const rejectRequest = () => {
@@ -316,6 +321,7 @@ const addPatient = () => {
 	display: flex;
 	align-items: flex-start;
 	padding: 30rpx;
+	margin-top: calc(var(--status-bar-height) + 44px);
 	background-color: #ffffff;
 	margin-bottom: 20rpx;
 	
diff --git a/pages_app/patientDetail/patientDetail.vue b/pages_app/patientDetail/patientDetail.vue
index 78f012e..832d679 100644
--- a/pages_app/patientDetail/patientDetail.vue
+++ b/pages_app/patientDetail/patientDetail.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="content">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="患者详情"
 			@clickLeft="goBack"
-			fixed
 			color="#8B2316"
-			height="180rpx"
 			:border="false"
 			backgroundColor="#eeeeee"
 		>
@@ -17,6 +17,7 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+		</view>
 
 		<!-- 头部信息卡片 -->
 		<view class="card header-card">
@@ -157,11 +158,21 @@
 	const editDesc = ()=> uni.showToast({ title:'编辑描述', icon:'none' })
 	const sendMessage = async()=>{
 		let userId=uni.getStorageSync('userInfo').uuid.toLowerCase();
-		let conversationId=userId+'|1|'+patientInfo.value.uuid.toLowerCase();
-	    await uni.$UIKitStore.uiStore.selectConversation(conversationId)
-		navTo({
-				url:'/pages_chat/chat/index'
-			})
+		// let conversationId=userId+'|1|'+patientInfo.value.uuid.toLowerCase();
+	    // await uni.$UIKitStore.uiStore.selectConversation(conversationId)
+		// navTo({
+		// 		url:'/pages_chat/chat/index'
+		// 	})
+		uni.sendNativeEvent('goSendMsg', {
+			msg: {
+				patientuuid: patientInfo.value.uuid,
+				nickname:nickname.value,
+				realName:patientInfo.value.realName,
+				photo:patientInfo.value.photo,
+			}
+		},ret => {
+			console.log(ret);
+		})
 	};
 	const nickname = ref('');
 	const group = ref({});
@@ -255,7 +266,9 @@
 	.nav-right { padding-right: 20rpx; }
 
 	.card { background:#ffffff; padding: 20rpx; padding-top: 0;}
-	.header-card { display:flex; padding-top: 20rpx;}
+	.header-card {
+		margin-top: calc(var(--status-bar-height) + 44px);
+	 display:flex; padding-top: 20rpx;}
 	.avatar { width: 140rpx; height: 140rpx; border-radius: 12rpx; margin-right: 20rpx; }
 	.base-info { flex:1; }
 	.name-row { display:flex; align-items:center; margin-bottom: 10rpx; }
diff --git a/pages_app/patientGroup/patientGroup.vue b/pages_app/patientGroup/patientGroup.vue
index 6f0da2b..2fcf522 100644
--- a/pages_app/patientGroup/patientGroup.vue
+++ b/pages_app/patientGroup/patientGroup.vue
@@ -2,13 +2,15 @@
 	<view class="patient-group-page">
 	
 		<!-- 头部 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left" 
 			title="患者分组" 
 			@clickLeft="goBack" 
-			fixed 
+			
 			color="#8B2316" 
-			height="180rpx" 
+			
 			:border="false" 
 			backgroundColor="#eeeeee"
 		>
@@ -16,6 +18,7 @@
 				<view class="save-text" @click="addGroup">新建</view>
 			</template>
 		</uni-nav-bar>
+		</view>
 		<!-- 筛选排序栏 -->
 		<view class="filter-sort-bar">
 			<view class="sort-section" @click="toggleGroupSort">
@@ -62,9 +65,9 @@
 		<view v-if="showInnerSort" class="popup-mask" @click="closeInnerSort"></view>
 
 		<!-- 患者列表 -->
-		<scroll-view class="patient-list-section" scroll-y="true" :style="{ height: scrollViewHeight }">
+		<scroll-view class="patient-list-section" scroll-y="true" >
 			<!-- 分组循环渲染 -->
-			<view class="groupcell" v-for="(group, gi) in groups" :key="group.uuid || gi">
+			<view class="groupcell" v-for="(group, gi) in groups" :key="group.uuid || gi" style="flex-direction: row;">
 				<view class="section-title" @click="toggleGroup(gi)">
 					<view class="left">
 						<view class="imgbox" :class="{ 'active':openGroups[gi] }">
@@ -79,15 +82,16 @@
 					</view>
 				</view>
 				<view class="patient-list" v-if="openGroups[gi]">
-					<view class="patient-item" v-for="(patient, index) in (group.patientList || [])" :key="patient.uuid || index">
+					<view class="patient-item" v-for="(patient, index) in getVisiblePatients(group, gi)" :key="patient.uuid || index" @click="goPatientDetail(patient.uuid)">
 						<view class="patient-avatar">
-							<up-image :src="docUrl + patient.photo" width="80rpx" height="80rpx" mode="aspectFill"></up-image>
+							<up-image :src="patient._photoUrl" width="80rpx" height="80rpx" mode="aspectFill"></up-image>
 						</view>
 						<view class="patient-info">
-							<view class="patient-name">{{ patient.realName || patient.nickname || '-' }}</view>
-							<view class="follow-up-time">随访于{{ formatYMD(patient.join_date) }}</view>
+							<view class="patient-name">{{ patient._displayName }}</view>
+							<view class="follow-up-time">随访于{{ patient._formattedJoinDate }}</view>
 						</view>
 					</view>
+					<view v-if="isGroupRendering(group, gi)" class="rendering-tip">加载中...</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -96,7 +100,7 @@
 
 <script setup>
 import { ref, computed, onMounted } from 'vue';
-import { onShow } from "@dcloudio/uni-app";
+import { onShow,onBackPress,onLoad } from "@dcloudio/uni-app";
 import upImg from "@/static/triangle_green_theme.png"
 import downImg from "@/static/triangle_normal.png"
 import groupRightImg from "@/static/groupright_big.png"
@@ -107,10 +111,36 @@ import dayjs from 'dayjs'
 import navTo from '@/utils/navTo.js'
 const list_sort = ref(0);
 const group_sort = ref(0);
-
+const from = ref('');
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
+onShow(() => {
+	uni.showLoading({
+		title: '加载中...',
+		mask: true
+	});
+	fetchGroupList();
+});
+const goPatientDetail = (uuid) => {
+		navTo({
+			url: `/pages_app/patientDetail/patientDetail?uuid=${uuid}`
+		})
+	}
+onBackPress(() => {
+	if(!from.value){
+		uni.navigateBack();
+		return true;
+	}
+});
 // 分组数据与展开状态
 const groups = ref([]);
 const openGroups = ref({});
+const groupRenderCount = ref({});
+const INITIAL_RENDER_COUNT = 20;
+const BATCH_RENDER_COUNT = 20;
 
 const formatYMD = (val) => {
 	if (!val) return '';
@@ -122,9 +152,6 @@ const formatYMD = (val) => {
 const groupSortTitle = computed(() => group_sort.value === 0 ? '按首字母' : '分组人数');
 const innerSortTitle = computed(() => list_sort.value === 0 ? '按首字母' : '随访时间');
 
-onShow(() => {
-	fetchGroupList();
-});
 
 const fetchGroupList = async () => {
 	const res = await api.groupList({
@@ -134,15 +161,74 @@ const fetchGroupList = async () => {
 		group_sort:group_sort.value
 	});
 	if(res.code === 200){
-		groups.value = Array.isArray(res.data) ? res.data : [];
+		groups.value = Array.isArray(res.data) ? preprocessGroups(res.data) : [];
 		// 初始化展开状态：默认收起
 		openGroups.value = {};
+		groupRenderCount.value = {};
 		groups.value.forEach((_, idx) => openGroups.value[idx] = false);
+		
+		uni.hideLoading();
 	}
 };
 
 const toggleGroup = (idx) => {
 	openGroups.value[idx] = !openGroups.value[idx];
+	if (openGroups.value[idx]) {
+		startProgressiveRender(idx);
+	}
+};
+
+const preprocessGroups = (rawGroups) => {
+	return rawGroups.map((group) => {
+		const list = Array.isArray(group.patientList) ? group.patientList : [];
+		list.forEach((patient) => {
+			patient._formattedJoinDate = formatYMD(patient.join_date);
+			patient._displayName = patient.realName || patient.nickname || '-';
+			patient._photoUrl = `${docUrl}${patient.photo || ''}`;
+		});
+		return {
+			...group,
+			patientList: list
+		};
+	});
+};
+
+const startProgressiveRender = (idx) => {
+	const group = groups.value[idx];
+	if (!group) return;
+	const total = (group.patientList || []).length;
+	if (!total) {
+		groupRenderCount.value[idx] = 0;
+		return;
+	}
+
+	groupRenderCount.value[idx] = Math.min(INITIAL_RENDER_COUNT, total);
+	if (total <= INITIAL_RENDER_COUNT) return;
+
+	const loadNextBatch = () => {
+		if (!openGroups.value[idx]) return;
+		const current = groupRenderCount.value[idx] || 0;
+		if (current >= total) return;
+		groupRenderCount.value[idx] = Math.min(current + BATCH_RENDER_COUNT, total);
+		if (groupRenderCount.value[idx] < total) {
+			setTimeout(loadNextBatch, 16);
+		}
+	};
+
+	setTimeout(loadNextBatch, 16);
+};
+
+const getVisiblePatients = (group, idx) => {
+	const list = group?.patientList || [];
+	const renderCount = groupRenderCount.value[idx] || 0;
+	if (renderCount >= list.length) return list;
+	return list.slice(0, renderCount);
+};
+
+const isGroupRendering = (group, idx) => {
+	const total = (group?.patientList || []).length;
+	const rendered = groupRenderCount.value[idx] || 0;
+	return total > 0 && rendered < total;
 };
 
 const editGroup = (group) => {
@@ -201,7 +287,11 @@ const chooseInnerSort = (type) => {
 
 // 方法
 const goBack = () => {
-	uni.navigateBack();
+	if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
 };
 
 const createNew = () => {
@@ -218,6 +308,9 @@ const createNew = () => {
 .patient-group-page {
 	min-height: 100vh;
 	background-color: #f5f5f5;
+	.groupcell{
+	    flex-direction: row!important;
+   }	
 }
 
 /* 弹窗样式 */
@@ -388,7 +481,7 @@ const createNew = () => {
 	padding: 20rpx 30rpx;
 	background-color: #ffff;
 	position: fixed;
-	top: 180rpx;
+	top: calc(var(--status-bar-height) + 44px);
 	left: 0;
 	right: 0;
 	z-index: 9;
@@ -525,5 +618,12 @@ const createNew = () => {
 			}
 		}
 	}
+
+	.rendering-tip {
+		padding: 16rpx 30rpx 24rpx;
+		font-size: 24rpx;
+		color: #999;
+		text-align: center;
+	}
 }
 </style>
diff --git a/pages_app/patientMsg/patientMsg.vue b/pages_app/patientMsg/patientMsg.vue
index b22633e..d301084 100644
--- a/pages_app/patientMsg/patientMsg.vue
+++ b/pages_app/patientMsg/patientMsg.vue
@@ -1,7 +1,34 @@
 <template>
 	<view class="content">
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
+				left-icon="left"
+				:title="title"
+				@clickLeft="goBack"
+				
+				color="#8B2316"
+			
+				:border="false"
+				backgroundColor="#eee"
+			>
+				<template #right>
+					<view class="nav-right" v-if="activeTab === 'message'">
+						<uni-icons type="search" size="24" color="#8B2316" @click="searchPatients"></uni-icons>
+						<uni-icons type="staff" size="24" color="#8B2316" @click="managePatients" style="margin-left: 30rpx;"></uni-icons>
+					</view>
+					<view class="nav-right" v-else-if="activeTab === 'list'">
+						<uni-icons type="search" size="24" color="#8B2316" @click="searchPatients"></uni-icons>
+						<uni-icons type="plusempty" size="24" color="#8B2316" @click="goCode" style="margin-left: 30rpx;" ></uni-icons>
+					</view>
+					<view class="nav-right" v-else-if="activeTab === 'plan'" @click="showAddMenu">
+						<view class="save-btn">添加</view>
+					</view>
+				</template>
+			</uni-nav-bar>
+		</view>
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		<!-- <uni-nav-bar
 			left-icon="left"
 			:title="title"
 			@clickLeft="goBack"
@@ -25,7 +52,7 @@
 				</view>
 				
 			</template>
-		</uni-nav-bar>
+		</uni-nav-bar> -->
 		
 		<!-- 消息列表区域 -->
 		<scroll-view 
@@ -36,7 +63,7 @@
 			:refresher-triggered="isRefreshing"
 			@refresherrefresh="onRefresh"
 		>
-		 <ConversationList />
+		 <!-- <ConversationList /> -->
 			<!-- 消息项 -->
 			<!-- <view class="message-item" v-for="(item, index) in messageList" :key="item.id || index" @click="openMessage(item)">
 				<view class="message-avatar">
@@ -69,8 +96,15 @@
 		
 		<!-- 患者列表区域 -->
 		<view class="patient-list" v-if="activeTab === 'list'">
-			<!-- 特殊操作项 -->
-			<view class="special-actions">
+			
+			
+			<view class="listbox">
+				<!-- 使用 up-index-list 索引组件，数据动态渲染 -->
+				<up-index-list :index-list="indexList" v-if="loadFinish" >
+
+					<!-- 特殊操作项 -->
+					<template #header>
+			<view class="special-actions" >
 				<view class="action-item" @click="addNewPatient">
 					<view class="action-icon new-patient">
 						<uni-icons type="person" size="24" color="#ffffff"></uni-icons>
@@ -93,24 +127,20 @@
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
 				</view>
 			</view>
-			
-			<view class="listbox">
-				<!-- 使用 up-index-list 索引组件，数据动态渲染 -->
-				<up-index-list :index-list="indexList" custom-nav-height="180rpx" v-if="patientList.length > 0">
-					<template v-for="group in patientGroups" :key="group.letter">
+		</template>
+					<template v-for="group in patientGroups" :key="group.letter" >
 						<up-index-item >
 							<up-index-anchor :text="group.letter" />
 							
 							<view class="group-section">
 								<view class="patient-item" v-for="item in group.items" :key="item.uuid || item.id" >
 									<template v-if="item.placeholder">
-										
 										<view class="patient-avatar-placeholder">
-											<uni-icons type="person" size="32" color="#ffffff"></uni-icons>
+											<uni-icons type="person" size="32" color="#ffffff" @click="goPatientDetail(item.uuid)"></uni-icons>
 										</view>
 									</template>
 									<template v-else>
-										<image class="patient-avatar" :src="docUrl+item.photo" mode="aspectFill"></image>
+										<image class="patient-avatar" :src="docUrl+item.photo" mode="aspectFill" @click="goPatientDetail(item.uuid)"></image>
 									</template>
 									<view class="patient-info" @click="goPatientDetail(item.uuid)">
 										<text class="patient-name">{{ item.realName }}</text>
@@ -127,7 +157,7 @@
 						</up-index-item>
 					</template>
 				</up-index-list>
-				<empty v-else></empty>
+				<empty v-if="patientList.length === 0"></empty>
 			</view>
 		</view>
 		<view class="plan" v-if="activeTab === 'plan'">
@@ -207,6 +237,7 @@
 			</view>
 			<view class="tab-item" :class="{active: activeTab === 'list'}" @click="switchTab('list')">
 				<text class="tab-text">患者列表</text>
+				<view class="tab-dot" v-if="hasNewPatient"><uni-badge class="uni-badge-left-margin" :text="applyList.length" :offset="[-3, -3]" size="small" /></view>
 			</view>
 			<view class="tab-item" :class="{active: activeTab === 'plan'}" @click="switchTab('plan')">
 				<text class="tab-text">随访计划</text>
@@ -218,17 +249,30 @@
 
 <script setup>
 	import { ref, getCurrentInstance, computed } from 'vue';
-	import { onShow,onLoad} from "@dcloudio/uni-app";
+	import { onShow,onLoad,onBackPress} from "@dcloudio/uni-app";
 	import dayImg from "@/static/visit_data11.png"
 	import planImg from "@/static/visitplan.png"
 	import api from '@/api/api.js';
 	import navTo from '@/utils/navTo.js';
 	import docUrl  from '@/utils/docUrl.js';
     const  patientList = ref([]);
+	const navHeight = ref(40);
+	onBackPress(() => {
+		plus.runtime.quit();
+		return true;
+	});
+	const getNavHeight = () => {
+		const systemInfo = uni.getSystemInfoSync();
+		console.log(2223);
+		console.log(systemInfo);
+		navHeight.value = systemInfo.statusBarHeight + 44;
+		console.log(navHeight.value);
+	}
 	import pinyin from 'pinyin';
 	import dayjs from 'dayjs'
 	import lineImg from "@/static/item_visitplan_fg.png"
-	import ConversationList from './conversation-list/index.vue'
+	const loadFinish = ref(false);
+	//import ConversationList from './conversation-list/index.vue'
     const title = ref('患者消息');
     const goPatientDetail = (uuid) => {
 		navTo({
@@ -323,10 +367,11 @@
  }
 	// 根据 patientList 构建按拼音首字母的分组
 	const buildGroupsFromPatients = () => {
+		
 		const map = new Map();
 		patientList.value.forEach((p) => {
 			const name = p.realName;
-			const first = getFirstLetter(name).toUpperCase();
+			const first = name?getFirstLetter(name).toUpperCase():'#';
 			const letter = /^[A-Z]$/.test(first) ? first : '#';
 			if (!map.has(letter)) map.set(letter, []);
 			map.get(letter).push(p);
@@ -334,11 +379,22 @@
 		const letters = Array.from(map.keys()).sort((a,b) => a.localeCompare(b));
 		patientGroups.value = letters.map(l => ({ letter: l, items: map.get(l) }));
 		rebuildIndexList();
+		if(patientList.value.length > 4000){
+			loadFinish.value = true;
+			setTimeout(() => {
+				uni.hideLoading();
+				
+			}, 10000);
+		}else{
+			uni.hideLoading();
+			loadFinish.value = true;
+		}
 	};
 	
 	
 	// 申请列表数据
 	const applyList = ref([]);
+	const hasNewPatient = computed(() => applyList.value.length > 0);
 	
 	// 刷新状态
 	const isRefreshing = ref(false);
@@ -412,13 +468,6 @@
 			});
 		}
 	};
-	const goBack = () => {
-      uni.reLaunch({
-        url: "/pages/index/index?from=push"
-      })
- 
-};
-
 	const patientListByGBK = async () => {
 		
 		const res = await api.patientListByGBK();
@@ -536,10 +585,20 @@
 		switch(tab) {
 			case 'message':
 				// 患者消息页面逻辑 - 刷新申请列表
-				getApplyList();
-				title.value = '患者消息';
+				uni.sendNativeEvent('goPatientMsg', {
+					msg: 'goPatientMsg'
+				},ret => {
+					console.log(ret);
+				})
+				// getApplyList();
+				// title.value = '患者消息';
 				break;
 			case 'list':
+			uni.showLoading({
+			title: '加载中...',
+			mask: true
+		});
+			patientListByGBK();
 			title.value = '患者列表';
 				// 显示患者列表
 				break;
@@ -556,14 +615,14 @@
 	// 添加新患者
 	const addNewPatient = () => {
 		navTo({
-			url: '/pages_app/myPatient/myPatient'
+			url: '/pages_app/myPatient/myPatient?from=patientMsg'
 		})
 	};
 	
 	// 管理患者分组
 	const managePatientGroups = () => {
 		navTo({
-			url: '/pages_app/patientGroup/patientGroup'
+			url: '/pages_app/patientGroup/patientGroup?from=patientMsg'
 		})
 	};
 	
@@ -582,7 +641,9 @@
 			url: '/pages_app/visit/visit?from=patientMsg'
 		});
 	};
-	
+	const goBack = () => {
+		plus.runtime.quit();
+	}
 	// 添加日程
 	const addSchedule = () => {
 		showAddMenuFlag.value = false;
@@ -605,6 +666,7 @@
 	
 	// 页面显示时加载数据
 	onLoad((options) => {
+		getNavHeight();
 		if(options.from == 'push'){
 			fromType.value='push';
 		}
@@ -612,7 +674,15 @@
 		loadMessageList();
 		computeListHeight();
 		getApplyList();
-		patientListByGBK();
+		
+		if(options.type=='list'){
+			activeTab.value='list';
+		   switchTab('list')
+		}
+		if(options.type=='plan'){
+			activeTab.value='plan';
+		   switchTab('plan')
+		}
 		
 	});
 	onShow(() => {
@@ -788,6 +858,13 @@
 				color: #999999;
 				transition: color 0.3s;
 			}
+
+			.tab-dot {
+				position: absolute;
+				top: 18rpx;
+				right: 28rpx;
+				
+			}
 			
 			&.active {
 				.tab-text {
@@ -809,18 +886,21 @@
 	
 	// 患者列表样式
 	.patient-list {
-
-		height:calc(100vh - 265rpx);
+    // position: fixed;
+	    width: 100%;
+	  
+		margin-top:calc(var(--status-bar-height) + 44px);
+		height:calc(100vh - var(--status-bar-height) - 44px - 103rpx);
 		overflow-y: scroll;
 		display: flex;
 		flex-direction:column;
 		background-color: #ffffff;
-		margin-top: 20rpx;
-		padding-bottom: 500rpx;
-		position: relative;
+		
+		bottom: 103rpx;
+		
 		.listbox{
 			flex:1;
-			padding-bottom: 100rpx;
+			
 		}
 		.groups-scroll {
 			display: none;
@@ -1058,7 +1138,7 @@
 	/* 随访计划样式 */
 	.plan{
 		position: fixed;
-		top: 180rpx;
+		top:calc(var(--status-bar-height) + 44px);
 		left: 0;
 		right: 0;
 		bottom:110rpx;
diff --git a/pages_app/patientRemark/patientRemark.vue b/pages_app/patientRemark/patientRemark.vue
index b97a394..0e80c7e 100644
--- a/pages_app/patientRemark/patientRemark.vue
+++ b/pages_app/patientRemark/patientRemark.vue
@@ -1,16 +1,20 @@
 <template>
 	<view class="remark-page">
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="设置备注和分组"
 			@clickLeft="goBack"
-			fixed
+		
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eee"
 		/>
-		<view class="form-block">
+		</view>
+		<view class="contentbox">
+			<view class="form-block">
 			<view class="label">备注</view>
 			<input class="input" v-model.trim="remark" :placeholder="groupInfo.nickname || '给患者添加备注名'" placeholder-class="ph" maxlength="20"/>
 		</view>
@@ -25,6 +29,7 @@
 			<view class="label">描述</view>
 			<textarea class="textarea" v-model.trim="note" :placeholder="groupInfo.note || '补充患者关键信息，方便随访患者'" placeholder-class="ph" auto-height maxlength="140"/>
 		</view>
+		</view>
 
 		<view class="bottom-bar">
 			<button class="save-btn" @click="updateNicknameNote">保存</button>
@@ -98,8 +103,11 @@
 </script>
 
 <style lang="scss" scoped>
+.contentbox{
+	margin-top: calc(var(--status-bar-height) + 44px);
+}
 	.remark-page{
-		min-height: 100vh;
+		height: 100vh;
 		background: #f7f7f7;
 		padding-bottom: 140rpx;
 	}
diff --git a/pages_app/patientSetting/patientSetting.vue b/pages_app/patientSetting/patientSetting.vue
index 00bb9ba..6591205 100644
--- a/pages_app/patientSetting/patientSetting.vue
+++ b/pages_app/patientSetting/patientSetting.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="setting-page">
-		<uni-nav-bar
+		<navBar :title="'常用设置'"></navBar>
+		<!-- <uni-nav-bar
 			left-icon="left"
 			title="常用设置"
 			@clickLeft="goBack"
@@ -11,7 +12,7 @@
 			backgroundColor="#eee"
 		>
 		
-		</uni-nav-bar>
+		</uni-nav-bar> -->
 
 		<view class="list-block">
 			<view class="cell" @click="goRemark">
@@ -65,6 +66,7 @@
     	import { ref } from 'vue'
 	import navTo from '@/utils/navTo.js'
 	import { onLoad, onShow } from '@dcloudio/uni-app'
+	import navBar from '@/components/navBar/navBar.vue'
     import api from '@/api/api.js'
 	import unidialog from '@/components/dialog/dialog.vue'
 	const patientUuid = ref('')
@@ -137,7 +139,11 @@
 		background:#f7f7f7;
 	}
 	.list-block{
-		margin-top: 20rpx;
+		position: fixed;
+		top: calc(var(--status-bar-height) + 44px);
+		left: 0;
+		right: 0;
+		bottom: 0;
 		background: #fff;
 		.cell{
 			display: flex;
diff --git a/pages_app/ppt/ppt.vue b/pages_app/ppt/ppt.vue
index 69c4c6e..f679bec 100644
--- a/pages_app/ppt/ppt.vue
+++ b/pages_app/ppt/ppt.vue
@@ -113,10 +113,21 @@
 	</view>
 	<unidialog
     :visible="pptVisible"
-    :content="pptContent"
+    :showCancel="false"
+    :showConfirm="true"
+    :confirmText="'知道了'"
     @close="pptVisible=false"
     @confirm="pptConfirm"
-  ></unidialog>
+  >
+   <template v-slot:content>
+    <view class="ppt-content">
+	  <image :src="contactImg" width="80rpx" height="80rpx" class="contact-img" @longpress.stop.prevent="saveContactImgToAlbum"></image>
+      <view class="ppt-content-title">
+        <text style="color:#666">APP下载课件为pdf格式，扫码联系平台文献助手获取原版PPT。</text>
+      </view>
+    </view>
+   </template>
+  </unidialog>
 </template>
 
 <script setup>
@@ -132,6 +143,7 @@
 	import downLoadImg from "@/static/wdxz.png"
 	import pptImg from "@/static/pdf.png"
 	import wordImg from "@/static/word.png"
+	import contactImg from "@/static/contact.png"
 	import api from '@/api/api.js';
 	import navTo from '@/utils/navTo.js';
 	const isFilterActive=ref(false)
@@ -148,8 +160,51 @@
 		const pageSize = ref(10);
 		const pptConfirm=()=>{
 			pptVisible.value=false;
-			feedBack();
+			//feedBack();
 		}
+	const saveContactImgToAlbum = () => {
+		uni.getImageInfo({
+			src: contactImg,
+			success: (imgRes) => {
+				uni.saveImageToPhotosAlbum({
+					filePath: imgRes.path,
+					success: () => {
+						uni.showToast({
+							title: '图片已保存到相册',
+							icon: 'none'
+						});
+					},
+					fail: (err) => {
+						const errMsg = (err && err.errMsg) || '';
+						if (errMsg.includes('auth deny') || errMsg.includes('authorize no response') || errMsg.includes('denied')) {
+							uni.showModal({
+								title: '提示',
+								content: '请先在系统设置中允许访问相册',
+								showCancel: true,
+								confirmText: '去设置',
+								success: (res) => {
+									if (res.confirm) {
+										uni.openSetting();
+									}
+								}
+							});
+							return;
+						}
+						uni.showToast({
+							title: '保存失败，请稍后重试',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			fail: () => {
+				uni.showToast({
+					title: '图片读取失败',
+					icon: 'none'
+				});
+			}
+		});
+	}
 	
 	// 响应式数据
 	const coursewareList = ref([]);
@@ -512,6 +567,12 @@
 	$submit-btn-color: #20b2aa;
 	$theme-color: #8B2316;
 	$white: #fff;
+	.contact-img{
+		width: 280rpx;
+		height: 280rpx;
+		margin: 0 auto;
+		display: block;
+	}
 	// 混合器
 	@mixin flex-center {
 		display: flex;
diff --git a/pages_app/pptDetail/pptDetail.vue b/pages_app/pptDetail/pptDetail.vue
index 64715d9..f8aecd9 100644
--- a/pages_app/pptDetail/pptDetail.vue
+++ b/pages_app/pptDetail/pptDetail.vue
@@ -109,6 +109,24 @@
     @close="freeClose"
     @confirm="freeConfirm"
   ></unidialog>
+
+<!-- 下载课件弹窗（非 App 端使用组件，App 端使用原生弹窗） -->
+  <!-- #ifndef APP-PLUS -->
+  <unidialog
+    :visible="pptVisible"
+    @close="closePptDownloadTip"
+    @confirm="closePptDownloadTip"
+  >
+    <template v-slot:content>
+      <view class="ppt-content">
+        <image :src="contactImg" width="80rpx" height="80rpx" class="contact-img"></image>
+        <view class="ppt-content-title">
+          <text>APP下载课件为pdf格式，扫码联系平台文献助手获取原版PPT。</text>
+        </view>
+      </view>
+    </template>
+  </unidialog>
+  <!-- #endif -->
 </template>
 
 <script setup>
@@ -125,6 +143,7 @@ import friendImg from "@/static/share_wxc.png";
 import logoImg from "@/static/weiboShare.png";
 import downloadStore from "@/store/downloadStorePpt.js";
 import unidialog from "@/components/dialog/dialog.vue";
+import contactImg from "@/static/contact.png"
 import downloadImg from "@/static/ppt_dw.png";
 const freeVisible = ref(false);
 const freeContent = ref('');
@@ -136,10 +155,321 @@ import isAndroid from "@/utils/platform.js";
 const isFirstDownload = ref(false);
 const path=ref('');
 const from=ref('');
+const pptVisible = ref(false);
+const nativeDownloadMaskView = ref(null);
+const nativeDownloadPopupView = ref(null);
+const nativeDownloadPopupShowing = ref(false);
+const nativeDownloadPopupInfo = ref({
+  screenW: 0,
+  screenH: 0,
+  dialogW: 0,
+  dialogH: 0,
+  dialogLeft: 0,
+  dialogTop: 0,
+  imageTop: 0,
+  imageLeft: 0,
+  imageSize: 0,
+  buttonTop: 0,
+  buttonH: 0
+});
+let downloadLongPressTimer = null;
+let downloadLongPressTriggered = false;
+const showPptDownloadTip = () => {
+  // #ifdef APP-PLUS
+  showNativeDownloadPopup();
+  // #endif
+  // #ifndef APP-PLUS
+  pptVisible.value = true;
+  // #endif
+};
+const closePptDownloadTip = () => {
+  // #ifdef APP-PLUS
+  closeNativeDownloadPopup();
+  // #endif
+  // #ifndef APP-PLUS
+  pptVisible.value = false;
+  // #endif
+};
 const freeConfirm = () => {
   freeVisible.value = false;
   downloadGanDanFile();
 };
+const clearDownloadLongPressTimer = () => {
+  if (downloadLongPressTimer) {
+    clearTimeout(downloadLongPressTimer);
+    downloadLongPressTimer = null;
+  }
+};
+const getDownloadRelativePoint = (e, info) => {
+  let x = 0;
+  let y = 0;
+  if (e.clientX !== undefined && e.clientY !== undefined) {
+    x = e.clientX;
+    y = e.clientY;
+  } else if (e.pageX !== undefined && e.pageY !== undefined) {
+    x = e.pageX;
+    y = e.pageY;
+  } else if (e.touches && e.touches.length > 0) {
+    x = e.touches[0].clientX || e.touches[0].pageX || 0;
+    y = e.touches[0].clientY || e.touches[0].pageY || 0;
+  } else if (e.changedTouches && e.changedTouches.length > 0) {
+    x = e.changedTouches[0].clientX || e.changedTouches[0].pageX || 0;
+    y = e.changedTouches[0].clientY || e.changedTouches[0].pageY || 0;
+  }
+  if (!x || !y) return null;
+  let relativeX = x;
+  let relativeY = y;
+  // 不同机型/端上报坐标有差异：可能是屏幕坐标，也可能是面板内坐标
+  if (!(x >= 0 && x <= info.dialogW && y >= 0 && y <= info.dialogH)) {
+    relativeX = x - info.dialogLeft;
+    relativeY = y - info.dialogTop;
+  }
+  if (relativeX < 0 || relativeX > info.dialogW || relativeY < 0 || relativeY > info.dialogH) {
+    return null;
+  }
+  return { relativeX, relativeY };
+};
+const isPointInDownloadImageArea = (point, info) => {
+  if (!point) return false;
+  const { relativeX, relativeY } = point;
+  return relativeX >= info.imageLeft &&
+    relativeX <= info.imageLeft + info.imageSize &&
+    relativeY >= info.imageTop &&
+    relativeY <= info.imageTop + info.imageSize;
+};
+const saveNativePopupImageToAlbum = () => {
+  // #ifdef APP-PLUS
+  try {
+    const localPath = plus.io.convertLocalFileSystemURL('_www/static/contact.png') || '_www/static/contact.png';
+    uni.saveImageToPhotosAlbum({
+      filePath: localPath,
+      success: () => {
+        uni.showToast({
+          title: '图片已保存到相册',
+          icon: 'none'
+        });
+      },
+      fail: (err) => {
+        const errMsg = (err && err.errMsg) || '';
+        if (errMsg.includes('auth deny') || errMsg.includes('authorize no response') || errMsg.includes('denied')) {
+          uni.showModal({
+            title: '提示',
+            content: '请先在系统设置中允许访问相册',
+            showCancel: true,
+            confirmText: '去设置',
+            success: (res) => {
+              if (res.confirm) {
+                uni.openSetting();
+              }
+            }
+          });
+          return;
+        }
+        uni.showToast({
+          title: '保存失败，请稍后重试',
+          icon: 'none'
+        });
+      }
+    });
+  } catch (e) {
+    uni.showToast({
+      title: '保存失败，请稍后重试',
+      icon: 'none'
+    });
+  }
+  // #endif
+};
+
+function createNativeDownloadPopup() {
+  // #ifdef APP-PLUS
+  if (nativeDownloadMaskView.value || nativeDownloadPopupView.value) return;
+  const screenW = plus.screen.resolutionWidth;
+  const screenH = plus.screen.resolutionHeight;
+  const dialogW = uni.upx2px(620);
+  const dialogH = uni.upx2px(660);
+  const dialogLeft = Math.round((screenW - dialogW) / 2);
+  const dialogTop = Math.round((screenH - dialogH) / 2);
+  const buttonH = uni.upx2px(96);
+  const buttonTop = dialogH - buttonH;
+  const titleTop = uni.upx2px(46);
+  const imageSize = uni.upx2px(280);
+  const imageTop = titleTop + uni.upx2px(72);
+  const imageLeft = Math.round((dialogW - imageSize) / 2);
+  const textTop = imageTop + imageSize + uni.upx2px(36);
+
+  nativeDownloadPopupInfo.value = {
+    screenW,
+    screenH,
+    dialogW,
+    dialogH,
+    dialogLeft,
+    dialogTop,
+    imageTop,
+    imageLeft,
+    imageSize,
+    buttonTop,
+    buttonH
+  };
+
+  nativeDownloadMaskView.value = new plus.nativeObj.View('native-download-mask', {
+    left: '0px',
+    top: '0px',
+    width: screenW + 'px',
+    height: screenH + 'px',
+    zindex: 99996,
+    touchable: true,
+    interceptTouchEvent: true
+  }, [
+    { tag: 'rect', id: 'mask', position: { left: '0px', top: '0px', width: screenW + 'px', height: screenH + 'px' }, color: 'rgba(0,0,0,0.5)' }
+  ]);
+
+  nativeDownloadPopupView.value = new plus.nativeObj.View('native-download-panel', {
+    left: dialogLeft + 'px',
+    top: dialogTop + 'px',
+    width: dialogW + 'px',
+    height: dialogH + 'px',
+    zindex: 99997,
+    touchable: true,
+    interceptTouchEvent: true
+  }, []);
+
+  nativeDownloadPopupView.value.drawRect({
+    color: '#FFFFFF',
+    radius: uni.upx2px(24)
+  }, {
+    left: '0px',
+    top: '0px',
+    width: dialogW + 'px',
+    height: dialogH + 'px'
+  });
+
+  nativeDownloadPopupView.value.drawText('温馨提示', {
+    left: '0px',
+    top: titleTop + 'px',
+    width: dialogW + 'px',
+    height: uni.upx2px(56) + 'px'
+  }, {
+    size: uni.upx2px(34) + 'px',
+    color: '#8B2316',
+    align: 'center',
+    verticalAlign: 'middle',
+    weight: '500'
+  });
+
+  try {
+    nativeDownloadPopupView.value.drawBitmap('_www/static/contact.png', {}, {
+      left: imageLeft + 'px',
+      top: imageTop + 'px',
+      width: imageSize + 'px',
+      height: imageSize + 'px'
+    });
+  } catch (e) {}
+
+  nativeDownloadPopupView.value.drawText('APP下载课件为pdf格式，扫码联系', {
+    left: uni.upx2px(60) + 'px',
+    top: textTop + 'px',
+    width: (dialogW - uni.upx2px(120)) + 'px',
+    height: uni.upx2px(44) + 'px'
+  }, {
+    size: uni.upx2px(28) + 'px',
+    color: '#666666',
+    align: 'center',
+    verticalAlign: 'middle'
+  });
+
+  nativeDownloadPopupView.value.drawText('平台文献助手获取原版PPT。', {
+    left: uni.upx2px(60) + 'px',
+    top: (textTop + uni.upx2px(48)) + 'px',
+    width: (dialogW - uni.upx2px(120)) + 'px',
+    height: uni.upx2px(44) + 'px'
+  }, {
+    size: uni.upx2px(28) + 'px',
+    color: '#666666',
+    align: 'center',
+    verticalAlign: 'middle'
+  });
+
+  nativeDownloadPopupView.value.drawRect({ color: '#F0F0F0' }, {
+    left: '0px',
+    top: (buttonTop - 1) + 'px',
+    width: dialogW + 'px',
+    height: '1px'
+  });
+
+  nativeDownloadPopupView.value.drawText('知道了', {
+    left: '0px',
+    top: buttonTop + 'px',
+    width: dialogW + 'px',
+    height: buttonH + 'px'
+  }, {
+    size: uni.upx2px(32) + 'px',
+    color: '#000',
+    align: 'center',
+    verticalAlign: 'middle',
+    weight: '500'
+  });
+
+  const handleDownloadMaskClick = () => {
+    clearDownloadLongPressTimer();
+    closeNativeDownloadPopup();
+  };
+  const handleDownloadPanelTouchStart = (e) => {
+    const info = nativeDownloadPopupInfo.value;
+    const point = getDownloadRelativePoint(e, info);
+    clearDownloadLongPressTimer();
+    downloadLongPressTriggered = false;
+    if (!isPointInDownloadImageArea(point, info)) return;
+    downloadLongPressTimer = setTimeout(() => {
+      downloadLongPressTriggered = true;
+      saveNativePopupImageToAlbum();
+    }, 600);
+  };
+  const handleDownloadPanelTouchEnd = () => {
+    clearDownloadLongPressTimer();
+  };
+  const handleDownloadPanelClick = (e) => {
+    const info = nativeDownloadPopupInfo.value;
+    const point = getDownloadRelativePoint(e, info);
+    if (!point) return;
+    if (downloadLongPressTriggered) {
+      downloadLongPressTriggered = false;
+      return;
+    }
+    const { relativeY } = point;
+    if (relativeY >= info.buttonTop) {
+      closeNativeDownloadPopup();
+    }
+  };
+
+  nativeDownloadMaskView.value.addEventListener('click', handleDownloadMaskClick, false);
+  nativeDownloadMaskView.value.addEventListener('touchstart', handleDownloadMaskClick, false);
+  nativeDownloadPopupView.value.addEventListener('click', handleDownloadPanelClick, false);
+  nativeDownloadPopupView.value.addEventListener('touchstart', handleDownloadPanelTouchStart, false);
+  nativeDownloadPopupView.value.addEventListener('touchend', handleDownloadPanelTouchEnd, false);
+  nativeDownloadPopupView.value.addEventListener('touchcancel', handleDownloadPanelTouchEnd, false);
+  // #endif
+}
+
+function showNativeDownloadPopup() {
+  // #ifdef APP-PLUS
+  if (nativeDownloadPopupShowing.value) return;
+  if (!nativeDownloadMaskView.value || !nativeDownloadPopupView.value) {
+    createNativeDownloadPopup();
+  }
+  nativeDownloadMaskView.value && nativeDownloadMaskView.value.show();
+  nativeDownloadPopupView.value && nativeDownloadPopupView.value.show();
+  nativeDownloadPopupShowing.value = true;
+  // #endif
+}
+
+function closeNativeDownloadPopup() {
+  // #ifdef APP-PLUS
+  if (!nativeDownloadPopupShowing.value) return;
+  nativeDownloadMaskView.value && nativeDownloadMaskView.value.hide();
+  nativeDownloadPopupView.value && nativeDownloadPopupView.value.hide();
+  nativeDownloadPopupShowing.value = false;
+  // #endif
+}
 
 // 删除任务
 const removeTask = (index) => {
@@ -239,7 +569,9 @@ onLoad((options) => {
   path.value =decodeURIComponent(options.src);
   from.value = options.from;
   checkUser(options);
+  //showNativeDownloadPopup();
   //ganDanFileDetials();
+  
 });
 onUnload(() => {
   uni.$off('paySuccess');
@@ -269,6 +601,7 @@ onShow(() => {
             downLoadStatus.value = 'completed';
            }else if(downloadTasks.value[i].status == 'downloading') {
             downLoadStatus.value = 'loading';
+            //showPptDownloadTip();
            }else if(downloadTasks.value[i].status == 'paused') {
             downLoadStatus.value = 'paused';
            }else if(downloadTasks.value[i].status == 'failed') {
@@ -742,10 +1075,12 @@ const createGanDanFileOrder=()=>{
 		})
 	};
 const downLoadByType=()=>{
+ 
   if(orderInfo.value.price==0){
     downloadGanDanFile('free');
   }else if(orderInfo.value.price>0){
     if(orderInfo.value.welfareNum>0){
+     
       //freeVisible.value = true;
       freeContent.value = '您还有'+orderInfo.value.welfareNum+'次免费下载机会，希望本次下载免费吗？';
       uni.showModal({
@@ -790,6 +1125,7 @@ const downLoadByType=()=>{
   }
 }
 const downloadGanDanFile = (type) => {
+  showPptDownloadTip();
   let order_id='';
   if(type=='free'){
     order_id='FREE';
@@ -1020,6 +1356,7 @@ const startDownload = (index) => {
   if (!taskItem) return;
   hasDownload.value = true;
   downLoadStatus.value = 'loading';
+  //showPptDownloadTip();
   const task = uni.downloadFile({
     url: taskItem.url,
     success: (res1) => {
@@ -1243,11 +1580,14 @@ const shareToMoments = () => {
 // 页面隐藏/卸载时清理原生弹窗
 onHide(() => {
   // #ifdef APP-PLUS
+  clearDownloadLongPressTimer();
   closeNativePopup();
+  closeNativeDownloadPopup();
   // #endif
 });
 onUnload(() => {
   // #ifdef APP-PLUS
+  clearDownloadLongPressTimer();
   try{
     nativeMaskView.value && nativeMaskView.value.close && nativeMaskView.value.close();
     nativePopupView.value && nativePopupView.value.close && nativePopupView.value.close();
@@ -1255,6 +1595,13 @@ onUnload(() => {
   nativeMaskView.value = null;
   nativePopupView.value = null;
   popupShowing.value = false;
+  try{
+    nativeDownloadMaskView.value && nativeDownloadMaskView.value.close && nativeDownloadMaskView.value.close();
+    nativeDownloadPopupView.value && nativeDownloadPopupView.value.close && nativeDownloadPopupView.value.close();
+  }catch(e){}
+  nativeDownloadMaskView.value = null;
+  nativeDownloadPopupView.value = null;
+  nativeDownloadPopupShowing.value = false;
   // #endif
 });
 </script>
@@ -1289,7 +1636,12 @@ onUnload(() => {
   display: flex;
   align-items: center;
 }
-
+.contact-img{
+		width: 280rpx;
+		height: 280rpx;
+		margin: 0 auto;
+		display: block;
+	}
 .download-bar {
   position: fixed;
   top:calc(var(--status-bar-height) + 44px);
diff --git a/pages_app/schedule/schedule.vue b/pages_app/schedule/schedule.vue
index bec6cbc..edb8123 100644
--- a/pages_app/schedule/schedule.vue
+++ b/pages_app/schedule/schedule.vue
@@ -1,13 +1,15 @@
 <template>
 	<view class="content">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="添加日程"
 			@clickLeft="goBack"
-			fixed
+			
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -17,6 +19,7 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+		</view>
 		
 		<!-- 主要内容区域 -->
 		<view class="main-content">
@@ -296,8 +299,13 @@
 	
 	/* 主要内容区域 */
 	.main-content {
+		position: fixed;
+		top: calc(var(--status-bar-height) + 44px);
+		left: 0;
+		right: 0;
+		bottom: 0;
 		
-		margin-top: 20rpx;
+		// margin-top: 20rpx;
 	}
 	
 	/* 表单区域样式 */
diff --git a/pages_app/selectPatient/selectPatient.vue b/pages_app/selectPatient/selectPatient.vue
index d2a2c31..547c262 100644
--- a/pages_app/selectPatient/selectPatient.vue
+++ b/pages_app/selectPatient/selectPatient.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="select-page">
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="选择患者"
 			@clickLeft="goBack"
-			fixed
 			color="#8B2316"
-			height="180rpx"
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -16,6 +16,7 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+		</view>
 
 		<!-- 搜索框 -->
 		<view class="search-bar">
@@ -51,22 +52,32 @@
 	const selectedIds = ref([])
 	const patientList = ref([])
 	const selectedDetail = ref([])
-	
+	const availablePatientList = ref([])
 	// 计算属性：显示所有患者，但标记已选中的状态
-	const availablePatientList = computed(() => {
-		return patientList.value
-	})
+	// const availablePatientList = computed(() => {
+	// 	return patientList.value
+	// })
     const patientListByGBK = async () => {
 		
 		const res = await api.patientListByGBK();
 		if(res.code == 1){
 			patientList.value = res.data;
-			
-			
+			availablePatientList.value = res.data;
+			if(res.data.length > 1000){
+				setTimeout(() => {
+					uni.hideLoading();
+				}, 5000);
+			}else{
+				uni.hideLoading();
+			}
 		}
 		
 	};
 	onLoad((options) => {
+		uni.showLoading({
+			title: '加载中...',
+			mask: true
+		})
 		if(options.from == 'chatMsg'){
 			from.value = 'chatMsg';
 		}
@@ -79,9 +90,11 @@
 				uni.removeStorageSync('preSelectedIds')
 			}
 		} catch (e) {}
+		patientListByGBK();
 	})
     onShow(() => {
-		patientListByGBK();
+		
+		
 		// 根据已选中的ID更新selectedDetail
 		updateSelectedDetail();
 	});
@@ -112,7 +125,12 @@
 	}
 	
 	const onSearch = () => {
-        patientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1)
+		if(keyword.value.replace(/\s/g, "")){
+			availablePatientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1)
+		}else{
+			availablePatientList.value = patientList.value
+		}
+       
     }
 	const goBack = () => uni.navigateBack()
 	const confirmSelect = () => {
@@ -143,14 +161,17 @@
 
 <style lang="scss" scoped>
 	.select-page{
-		min-height: 100vh; background:#fefefe;
+		min-height: 100vh; background:#fefefe;overflow: hidden;
 	}
 	.confirm-text{ color:#fff; font-size: 28rpx;white-space: nowrap; }
 	.confirm-btn{ background:#7f7f7f; padding: 10rpx 18rpx; border-radius: 26rpx; }
 	.confirm-btn.active{ background:#8B2316; }
 	.search-bar{
+	
         border: 2rpx solid #eee;
-		margin: 20rpx 30rpx; display:flex; align-items:center; gap: 16rpx;
+		margin: 0rpx 30rpx; display:flex;
+		margin-top: calc(var(--status-bar-height) + 64px);
+		 align-items:center; gap: 16rpx;
 		.input-wrap{ flex:1; background:#fff; border-radius: 12rpx; padding: 16rpx 20rpx; }
 		.search-input{ font-size: 28rpx; color:#333; }
 		.ph{ color:#bfbfbf; }
diff --git a/pages_app/selectPatientSingle/selectPatientSingle.vue b/pages_app/selectPatientSingle/selectPatientSingle.vue
index a0e655d..570a5f8 100644
--- a/pages_app/selectPatientSingle/selectPatientSingle.vue
+++ b/pages_app/selectPatientSingle/selectPatientSingle.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="select-page">
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="选择患者"
 			@clickLeft="goBack"
-			fixed
 			color="#8B2316"
-			height="180rpx"
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -16,6 +16,7 @@
 				</view>
 			</template> -->
 		</uni-nav-bar>
+		</view>
 
 		<!-- 搜索框 -->
 		<view class="search-bar">
@@ -50,22 +51,32 @@
 	const selectedIds = ref([])
 	const patientList = ref([])
 	const selectedDetail = ref([])
-	
+	const availablePatientList = ref([])
 	// 计算属性：显示所有患者，但标记已选中的状态
-	const availablePatientList = computed(() => {
-		return patientList.value
-	})
+	// const availablePatientList = computed(() => {
+	// 	return patientList.value
+	// })
     const patientListByGBK = async () => {
 		
 		const res = await api.patientListByGBK();
 		if(res.code == 1){
 			patientList.value = res.data;
-			
-			
+			availablePatientList.value = res.data;
+			if(res.data.length > 1000){
+				setTimeout(() => {
+					uni.hideLoading();
+				}, 5000);
+			}else{
+				uni.hideLoading();
+			}
 		}
 		
 	};
 	onLoad(() => {
+		uni.showLoading({
+			title: '加载中...',
+			mask: true
+		})
 		// 读取已选中的成员ID
 		try {
 			const preSelected = uni.getStorageSync('preSelectedIds')
@@ -75,9 +86,10 @@
 				uni.removeStorageSync('preSelectedIds')
 			}
 		} catch (e) {}
+		patientListByGBK();
 	})
     onShow(() => {
-		patientListByGBK();
+		
 		// 根据已选中的ID更新selectedDetail
 		updateSelectedDetail();
 	});
@@ -115,7 +127,12 @@
 	}
 	
 	const onSearch = () => {
-        patientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1)
+		if(keyword.value.replace(/\s/g, "")){
+			availablePatientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1)
+		}else{
+			availablePatientList.value = patientList.value
+		}
+        //patientList.value = patientList.value.filter(p => p.realName.indexOf(keyword.value) !== -1 || (p.nickname && p.nickname.indexOf(keyword.value) !== -1) || p.mobile.indexOf(keyword.value) !== -1)
     }
 	const goBack = () => uni.navigateBack()
 	const confirmSelect = (id) => {
@@ -135,14 +152,16 @@
 
 <style lang="scss" scoped>
 	.select-page{
-		min-height: 100vh; background:#fefefe;
+		min-height: 100vh; background:#fefefe;overflow: hidden;
 	}
 	.confirm-text{ color:#fff; font-size: 28rpx;white-space: nowrap; }
 	.confirm-btn{ background:#7f7f7f; padding: 10rpx 18rpx; border-radius: 26rpx; }
 	.confirm-btn.active{ background:#8B2316; }
 	.search-bar{
         border: 2rpx solid #eee;
-		margin: 20rpx 30rpx; display:flex; align-items:center; gap: 16rpx;
+		margin: 20rpx 30rpx;
+		margin-top: calc(var(--status-bar-height) + 64px);
+		 display:flex; align-items:center; gap: 16rpx;
 		.input-wrap{ flex:1; background:#fff; border-radius: 12rpx; padding: 16rpx 20rpx; }
 		.search-input{ font-size: 28rpx; color:#333; }
 		.ph{ color:#bfbfbf; }
diff --git a/pages_app/video/video.vue b/pages_app/video/video.vue
index 861ea36..9646655 100644
--- a/pages_app/video/video.vue
+++ b/pages_app/video/video.vue
@@ -3,7 +3,7 @@
     <view class="status_bar"></view>
     <uni-nav-bar
       left-icon="left"
-      title="肝胆视频"
+      title="肝胆视频1"
       @clickLeft="goBack"
       color="#8B2316"
       :border="false"
diff --git a/pages_app/visit/visit.vue b/pages_app/visit/visit.vue
index 9e21d9c..362c10b 100644
--- a/pages_app/visit/visit.vue
+++ b/pages_app/visit/visit.vue
@@ -1,13 +1,15 @@
 <template>
 	<view class="content">
 		<!-- 顶部导航栏 -->
-		<uni-nav-bar
+		 <view class="navbox">
+			 <view class="status_bar"></view>
+			 <uni-nav-bar
 			left-icon="left"
 			title="添加随访计划"
 			@clickLeft="goBack"
-			fixed
+			
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -17,6 +19,8 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+		 </view>
+		<!--  -->
 
 		<!-- 患者选择 -->
 		<view class="form-section" @click="selectPatient">
@@ -140,8 +144,9 @@
 		show.value=false;
 	}
 	const goVisitNote=(idx,note)=>{
+		let name=patientName.value?encodeURIComponent(patientName.value):'';
 		navTo({
-			url: '/pages_app/visitNote/visitNote?idx='+idx+'&note='+encodeURIComponent(note)+'&patient_name='+encodeURIComponent(patientName.value),
+			url: '/pages_app/visitNote/visitNote?idx='+idx+'&note='+encodeURIComponent(note)+'&patient_name='+encodeURIComponent(name),
 			events: {
 				onVisitNoteSubmit: ({ note, idx }) => {
 					console.log('onVisitNoteSubmit', note, idx)
@@ -216,7 +221,7 @@
 			if (!isNaN(parsed.getTime())) baseDate = parsed;
 		}
 		const nextDate = addMonths(baseDate, 3);
-		visits.value.push({ id, date: formatDate(nextDate) });
+		visits.value.push({ id, date: formatDate(nextDate),note:defaultContent });
 		// 下一帧滚动到新项
 		nextTick(()=>{ scrollIntoViewId.value = `visit-${id}`; });
 	};
@@ -317,7 +322,8 @@
 	.submit-text { font-size: 32rpx; color: #8B2316; font-weight: 500; }
 
 	.form-section {
-		margin-top: 20rpx;
+		margin-top: calc(var(--status-bar-height) + 44px);
+		// margin-top: 20rpx;
 		display: flex; align-items: center; justify-content: space-between;
 		padding: 30rpx; background: #ffffff; border-bottom: 1rpx solid #f0f0f0;
 		.section-label { width: 160rpx; flex-shrink: 0; }
diff --git a/pages_app/visitNote/visitNote.vue b/pages_app/visitNote/visitNote.vue
index 99e7f54..83142a1 100644
--- a/pages_app/visitNote/visitNote.vue
+++ b/pages_app/visitNote/visitNote.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="visit-note-page">
-		<uni-nav-bar
+		<view class="navbox">
+			<view class="status_bar"></view>
+			<uni-nav-bar
 			left-icon="left"
 			title="添加随访计划"
 			@clickLeft="goBack"
-			fixed
 			color="#8B2316"
-			height="180rpx"
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -16,11 +16,13 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+		</view>
 
-		<!-- 患者行 -->
+		<view class="contentbox">
+			<!-- 患者行 -->
 		<view class="row" @click="noop">
 			<text class="row-label">患者</text>
-			<text class="row-value">{{ patientName }}</text>
+			<text class="row-value">{{ patientName?patientName:'' }}</text>
 		</view>
 
 		<!-- 标题栏 -->
@@ -30,6 +32,7 @@
 		<view class="note-box">
 			<textarea class="note-textarea" v-model.trim="note" placeholder="请填写随访内容" auto-height :maxlength="200" />
 		</view>
+		</view>
 	</view>
 </template>
 
@@ -41,7 +44,9 @@
 	const note = ref('请近日来医院复诊、复查')
 	const idx = ref(0)
 	onLoad((options) => {
-		patientName.value =decodeURIComponent( options?.patient_name )
+		console.log(options.patient_name==undefined)
+		patientName.value =options.patient_name ?decodeURIComponent(options.patient_name):'';
+		console.log(patientName.value)
 		if (options?.note) note.value = decodeURIComponent(options.note)
 		if (options?.idx) idx.value = options.idx
 		
@@ -62,6 +67,9 @@
 </script>
 
 <style lang="scss" scoped>
+.contentbox{
+	margin-top: calc(var(--status-bar-height) + 44px);
+}
 	.visit-note-page{
 		min-height: 100vh; background:#f5f5f5;
 	}
@@ -78,7 +86,7 @@
 
 	.note-box{ background:#fff; padding: 20rpx 24rpx; }
 	.note-textarea{
-		width: 100%; min-height: 260rpx; background:#e5e5e5; border-radius: 0; padding: 20rpx; font-size: 32rpx; color:#111;
+		box-sizing: border-box;width: 100%; min-height: 260rpx; background:#e5e5e5; border-radius: 0; padding: 20rpx; font-size: 32rpx; color:#111;
 	}
 </style>
 
diff --git a/pages_app/webview/webviewClass.vue b/pages_app/webview/webviewClass.vue
new file mode 100644
index 0000000..36d68a3
--- /dev/null
+++ b/pages_app/webview/webviewClass.vue
@@ -0,0 +1,1164 @@
+<template>
+  <view class="container" :style="{ backgroundColor: backgroundColor }">
+    <!-- 分享弹窗 -->
+
+    <view class="navbox">
+      <view class="status_bar"></view>
+      <uni-nav-bar
+        left-icon="left"
+        :title="title"
+        @clickLeft="goBack"
+        color="#8B2316"
+        :border="false"
+        backgroundColor="#eeeeee"
+      >
+        <template #right>
+          <view class="nav-actions">
+            <view class="collect-img" @click="shareToggle" v-if="canShare">
+              <image
+                class="share-img-icon"
+                :src="shareIcon"
+                mode="aspectFill"
+              />
+            </view>
+          </view>
+        </template>
+      </uni-nav-bar>
+    </view>
+  </view>
+  <view class="bottom-box" >
+     <view class="bottom-cell">
+      <image class="bottom-cell-img" :src="readImg"  />
+      <text class="bottom-cell-text">{{ readnum }}</text>
+     </view>
+     <view class="bottom-cell" @click="toggleAgree">
+      <image class="bottom-cell-img" :src="isAgree==1?likeImg:dislikeImg"  />
+      <text class="bottom-cell-text">{{ agreenum }}</text>
+     </view>
+     <view class="bottom-cell" @click="toggleCollect">
+      <image class="bottom-cell-img" :src="isCollection==1?collectImg:discollectImg"  />
+      <text class="bottom-cell-text">收藏</text>
+     </view>
+     <view class="bottom-cell" @click="shareToggle">
+      <image class="bottom-cell-img" :src="shareImgBottom"  />
+      <text class="bottom-cell-text">分享</text>
+     </view>
+  </view>
+  <uni-popup ref="shareRef" type="bottom" safeArea backgroundColor="#fff">
+    <view class="share-popup">
+      <view class="share-title">分享到</view>
+      <view class="share-content">
+        <view class="share-item" @click="shareToWechat">
+          <view class="share-icon wechat-icon">
+            <image class="share-img" :src="wxImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">微信</text>
+        </view>
+        <view class="share-item" @click="shareToMoments">
+          <view class="share-icon moments-icon">
+            <image class="share-img" :src="friendImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">朋友圈</text>
+        </view>
+        <view class="share-item" @click="shareToWeibo">
+          <view class="share-icon weibo-icon">
+            <image class="share-img" :src="sinaImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">新浪微博</text>
+        </view>
+      </view>
+      <view class="share-cancel" @click="closeShare">
+        <text>取消</text>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { onLoad, onHide, onShow, onUnload } from "@dcloudio/uni-app";
+import api from "@/api/api";
+import navBar from "@/components/navBar/navBar.vue";
+import shareIcon from "@/static/icon_share.png";
+import sinaImg from "@/static/share_sina.png";
+import wxImg from "@/static/share_weixin.png";
+import friendImg from "@/static/share_wxc.png";
+import logoImg from "@/static/weiboShare.png";
+import collectImg from "@/static/icon_book_collect_sel.png";
+import discollectImg from "@/static/icon_book_collect_nor.png";
+import readImg from "@/static/reading.png";
+import likeImg from "@/static/argee_sure.png";
+import dislikeImg from "@/static/argee_no.png";
+import shareImgBottom from "@/static/icon_share.png";
+
+const title = ref("新闻详情");
+const safeUrl = ref("");
+const backgroundColor = ref("");
+const hasBg = ref(false);
+const canShare = ref(false);
+const summary = ref("");
+const shareLink = ref("");
+const shareImg = ref("");
+const shareTitle = ref("");
+const uuid = ref("");
+const isCollection = ref(0);
+const readnum = ref(0);
+const agreenum = ref(0);
+const isAgree = ref(0);
+const user_uuid = ref("");
+const bottomHeight=ref(65);
+
+const getCollect = () => {
+  api.getCollect({
+    other_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+     if(res.code == 200) {
+        uni.showToast({
+          title: "收藏成功",
+          icon: "none",
+        });
+        getKePuCollection();
+     }
+  });
+};
+const getDiscollect = () => {
+  api.getDiscollect({
+    other_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+    console.log(res);
+    if(res.code == 200) {
+      uni.showToast({
+        title: "取消收藏成功",
+        icon: "none",
+      });
+      getKePuCollection();
+    }
+  });
+};
+const toggleCollect = () => {
+  if(isCollection.value == 0) {
+    getCollect();
+  } else {
+    getDiscollect();
+  }
+};
+const toggleAgree = () => {
+  if(isAgree.value == 0) {
+    getAgree();
+  } else {
+    getDisagree();
+  }
+};
+const getAgree = () => {
+  api.getAgree({
+    news_article_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+    getKePuCollection();
+  });
+};
+const getDisagree = () => {
+  api.getDisagree({
+    news_article_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+    console.log(res);
+    getKePuCollection();
+  });
+};
+const getOutRead = () => {
+  api.getOutRead({
+    uuid: uuid.value,
+   type: 2,
+  }).then(res => {
+    console.log(res);
+  });
+};
+const getKePuCollection = () => {
+  api.getKePuCollection({
+    uuid: uuid.value,
+    user_uuid: user_uuid.value,
+  }).then(res => {
+    console.log(res.data);
+    if(res.code == 200) {
+      isCollection.value = res.data.isCollection;
+      readnum.value = res.data.readnum;
+      agreenum.value = res.data.agreenum;
+      isAgree.value = res.data.isAgree;
+    }
+  });
+};
+const goBack = () => {
+  uni.navigateBack({
+    fail() {
+      uni.redirectTo({
+        url: "/pages/index/index",
+      });
+    },
+  });
+};
+onShow(() => {
+  uni.hideLoading();
+  // console.log('show');
+  // plus.screen.lockOrientation('portrait-primary');
+});
+onUnload(() => {
+  // console.log('onUnload');
+  // plus.screen.lockOrientation('portrait-primary');
+});
+onHide(() => {
+  // console.log('onHide');
+  // plus.screen.lockOrientation('landscape-primary');
+});
+onLoad((query) => {
+  const userInfo = uni.getStorageSync("userInfo");
+  user_uuid.value = userInfo.uuid;
+  if (query.title) {
+    title.value = query.title;
+  }
+  if (query.uuid) {
+    uuid.value = query.uuid;
+  }
+  if (query.share == 1) {
+    canShare.value = true;
+  }
+  if (query.bg == 1) {
+    hasBg.value = true;
+
+    backgroundColor.value = "linear-gradient(to bottom,'#fff' , '#398775')";
+  }
+  getKePuCollection();
+  getOutRead();
+  var height = 0; //定义动态的高度变量，如高度为定值，可以直接写
+  uni.getSystemInfo({
+    success: (sysinfo) => {
+      height = sysinfo.windowHeight; //自行修改
+	  //bottomHeight.value=height-140
+    },
+    complete: () => {},
+  });
+  const raw = query && (query.url || "");
+  try {
+    safeUrl.value = decodeURIComponent(raw);
+    shareImg.value = query.imgPath?decodeURIComponent(query.imgPath):'https://doc.igandan.com/app/html/img/2016/20160714132557.png';
+    console.log(shareImg.value);
+    if (query.type == "live_yugao") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "分享一篇来自“肝胆相照”的会议预告：" + shareTitle.value;
+    } else if (query.type == "live_old") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "分享一篇来自“肝胆相照”的历史会议：" + shareTitle.value;
+    } else if (query.type == "live") {
+      shareTitle.value = "肝胆相照直播：" + query.sharetitle;
+      summary.value = shareTitle.value;
+    }else if(query.type=='news'){
+      shareTitle.value = query.sharetitle;
+      summary.value ='';
+    }else if(query.type=='huanjiao'){
+       console.log(query.sharetitle);
+       console.log(query.summary);
+      shareTitle.value = query.sharetitle;
+      summary.value = query.summary;
+    }
+    // #ifdef APP-PLUS
+    const resInfo = uni.getSystemInfoSync(); // 或者使用 uni.getSystemInfo({...}).then(res => {...})
+    let statusBarHeight = resInfo.statusBarHeight;
+    let wv = plus.webview.create("", "custom-webview", {
+      top: statusBarHeight + 44 + "px",
+      bottom: "65px",
+    });
+    wv.loadURL(safeUrl.value);
+
+    let pages = getCurrentPages();
+    let page = pages[pages.length - 1];
+
+    var currentWebview = page.$getAppWebview(); //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
+    currentWebview.append(wv);
+    setTimeout(function () {
+      wv = currentWebview.children()[0];
+      wv.setStyle({
+        top: statusBarHeight + 44 + "px",
+        height: height - 140,
+        bottom: "65px",
+        scalable: true,
+        videoFullscreen: "landscape",
+        zIndex: -1,
+      });
+    }, 300); //如果是页面初始化调用时，需要延时一下
+    wv.onloaded = (e) => {
+      wv.show();
+    };
+
+    uni.onWindowResize((res) => {
+      if (res.size.windowHeight < height) {
+        console.log(res.size.windowHeight);
+
+        console.log(height);
+        console.log("键盘高度", res.height);
+        setTimeout(function () {
+          wv.setStyle({
+            //设置web-view距离顶部的距离以及自己的高度，单位为px
+            top: statusBarHeight + 44 + "px",
+            videoFullscreen: "landscape",
+            height: height - res.size.windowHeight + 100,
+            scalable: true, //webview的页面是否可以缩放，双指放大缩小
+            bottom: "65px",
+          });
+        }, 0);
+
+        //高度缩小
+        //如页面初始化调用需要写延迟
+      } else {
+        setTimeout(function () {
+          wv.setStyle({
+            //设置web-view距离顶部的距离以及自己的高度，单位为px
+            top: statusBarHeight + 44 + "px",
+            height: height - 80,
+            bottom: "65px",
+            videoFullscreen: "landscape",
+            scalable: true, //webview的页面是否可以缩放，双指放大缩小
+          });
+        }, 0);
+      }
+    });
+    // 创建并展示原生弹窗
+    createNativePopup();
+
+    // #endif
+  } catch (e) {
+    safeUrl.value = raw;
+  }
+});
+const shareRef = ref(null);
+shareRef.value?.open();
+// 分享APP
+const shareToggle = () => {
+  showNativePopup();
+  // console.log(shareRef.value);
+  // shareRef.value?.open();
+  //  uni.showActionSheet({
+  //    title:"分享",
+  //    itemList: ['分享到微信', '分享到朋友圈', '分享到微博'],
+  //    success: function (res) {
+  //    		if(res.tapIndex==0){
+  // 			shareToWechat()
+  // 		}else if(res.tapIndex==1){
+  // 			shareToMoments()
+  // 		}else{
+  // 			shareToWeibo()
+  // 		}
+  //    	},
+  //  })
+};
+
+// 关闭分享弹窗
+const closeShare = () => {
+  shareRef.value.close();
+};
+
+// ========= 原生弹窗（plus.nativeObj.view）============
+const nativeMaskView = ref(null);
+const nativePopupView = ref(null);
+const popupShowing = ref(false);
+// 保存弹窗尺寸信息，供事件处理使用
+const popupInfo = ref({
+  screenW: 0,
+  screenH: 0,
+  panelH: 0,
+  cancelH: 0,
+  contentTop: 0,
+  iconSize: 0,
+  textSize: 0,
+});
+
+function createNativePopup() {
+  // #ifdef APP-PLUS
+  if (nativeMaskView.value || nativePopupView.value) return;
+  const screenW = plus.screen.resolutionWidth;
+  const screenH = plus.screen.resolutionHeight;
+  const panelH = uni.upx2px(520); // 面板高度（含标题+内容+取消）
+  const radius = uni.upx2px(20);
+
+  // 保存尺寸信息
+  const iconSize = 50; // 图标大小80px（与图标文件尺寸一致）
+  const titleH = uni.upx2px(80);
+  const cancelH = uni.upx2px(100);
+  const contentTop = uni.upx2px(90) + titleH;
+  const textSize = uni.upx2px(24);
+
+  popupInfo.value = {
+    screenW,
+    screenH,
+    panelH,
+    cancelH,
+    contentTop,
+    iconSize,
+    textSize,
+  };
+  // 遮罩
+  nativeMaskView.value = new plus.nativeObj.View(
+    "native-share-mask",
+    {
+      left: "0px",
+      top: "0px",
+      width: screenW + "px",
+      height: screenH + "px",
+      zindex: 99998,
+      touchable: true,
+      interceptTouchEvent: true,
+    },
+    [
+      {
+        tag: "rect",
+        id: "mask",
+        position: {
+          left: "0px",
+          top: "0px",
+          width: screenW + "px",
+          height: screenH + "px",
+        },
+        color: "rgba(0,0,0,0.5)",
+      },
+    ]
+  );
+  // 面板
+  nativePopupView.value = new plus.nativeObj.View(
+    "native-share-panel",
+    {
+      left: "0px",
+      top: screenH - panelH + "px",
+      width: screenW + "px",
+      height: panelH + "px",
+      zindex: 99999,
+      touchable: true,
+      interceptTouchEvent: true,
+    },
+    []
+  );
+  // 背景+圆角
+  nativePopupView.value.drawRect(
+    {
+      color: "#FFFFFF",
+      radius: radius,
+      rectStyles: {},
+    },
+    {
+      left: uni.upx2px(0) + "px",
+      top: uni.upx2px(0) + "px",
+      width: screenW + "px",
+      height: panelH + "px",
+    }
+  );
+  // 标题
+  nativePopupView.value.drawText(
+    "分享到",
+    {
+      left: "0px",
+      top: uni.upx2px(20) + "px",
+      width: screenW + "px",
+      height: titleH + "px",
+    },
+    {
+      size: uni.upx2px(32) + "px",
+      color: "#333333",
+      align: "center",
+      verticalAlign: "middle",
+      weight: "500",
+    }
+  );
+  const items = [
+    { id: "it-wechat", text: "微信" },
+    { id: "it-moments", text: "朋友圈" },
+    // { id: 'it-weibo', text: '微博' }
+  ];
+  // 三个分享项区域（使用图标）
+  const itemW = screenW / items.length;
+  const iconTop = contentTop;
+  const textTop = iconTop + iconSize + uni.upx2px(16);
+
+  console.log("图标布局信息:", {
+    screenW,
+    itemW,
+    iconSize,
+    iconTop,
+    contentTop,
+  });
+
+  // 图标文件名映射（直接使用文件名，避免路径转换问题）
+  const iconFiles = [
+    "share_weixin.png", // 微信
+    "share_wxc.png", // 朋友圈
+    "share_sina.png", // 微博
+  ];
+
+  items.forEach((it, idx) => {
+    const left = idx * itemW;
+    // 计算图标居中位置（确保是整数像素）
+    const iconLeft = Math.round(left + (itemW - iconSize) / 2);
+    const iconLeftPx = iconLeft;
+    // 确保所有图标使用相同的 top 值，保证在一行
+    const iconTopPx = Math.round(iconTop);
+    const iconSizePx = iconSize;
+
+    console.log(
+      `图标 ${idx} (${it.text}): left=${left}, itemW=${itemW.toFixed(
+        2
+      )}, iconLeft=${iconLeftPx}, iconTop=${iconTopPx}, iconSize=${iconSizePx}`
+    );
+
+    // 构建图标本地路径
+    // 说明：
+    //  - 在 Android 上使用 convertLocalFileSystemURL 可以得到 file:// 路径；
+    //  - 但在 iOS 上，plus.nativeObj.View.drawBitmap 对 file:// 路径兼容性较差，
+    //    更推荐直接使用 "_www" 相对路径。
+    // 这里统一使用 "_www/static/xxx.png" 相对路径，兼容 Android 和 iOS。
+    let iconPath = null;
+    try {
+      const iconFile = iconFiles[idx];
+      // 使用 _www 相对路径，避免 iOS 下 file:// 路径导致图片不显示
+      iconPath = "_www/static/" + iconFile;
+      console.log(`图标 ${it.text} 路径: ${iconPath}`);
+    } catch (e) {
+      console.log("构建图标路径失败:", e);
+      iconPath = null;
+    }
+
+    // 绘制图标
+    if (iconPath) {
+      try {
+        console.log(
+          `绘制图标 ${it.text}: 位置=(${iconLeftPx}, ${iconTopPx}), 大小=${iconSizePx}x${iconSizePx}`
+        );
+        // 使用 drawBitmap 绘制图标
+        // 尝试不同的参数格式，确保图标不变形且正确显示
+        // 格式1: drawBitmap(src, position, options)
+        try {
+          nativePopupView.value.drawBitmap(
+            iconPath,
+            {},
+            {
+              left: iconLeftPx + "px",
+              top: iconTopPx + "px",
+              width: iconSizePx + "px",
+              height: iconSizePx + "px",
+            }
+          );
+        } catch (e1) {
+          // 如果格式1失败，尝试格式2: drawBitmap(src, position)
+          try {
+            nativePopupView.value.drawBitmap(iconPath, {
+              left: iconLeftPx + "px",
+              top: iconTopPx + "px",
+              width: iconSizePx + "px",
+              height: iconSizePx + "px",
+            });
+          } catch (e2) {
+            console.log("drawBitmap 两种格式都失败:", e1, e2);
+            throw e2;
+          }
+        }
+      } catch (e) {
+        console.log("绘制图标失败，使用圆形色块代替:", e);
+        // 如果图标加载失败，使用圆形色块作为后备
+        const bgColor = idx === 2 ? "#E6162D" : "#07C160";
+        nativePopupView.value.drawRect(
+          {
+            color: bgColor,
+            radius: Math.round(iconSize / 2),
+          },
+          {
+            left: Math.round(iconLeft) + "px",
+            top: Math.round(iconTop) + "px",
+            width: Math.round(iconSize) + "px",
+            height: Math.round(iconSize) + "px",
+          }
+        );
+      }
+    } else {
+      // 如果没有图标路径，使用圆形色块
+      const bgColor = idx === 2 ? "#E6162D" : "#07C160";
+      nativePopupView.value.drawRect(
+        {
+          color: bgColor,
+          radius: Math.round(iconSize / 2),
+        },
+        {
+          left: Math.round(iconLeft) + "px",
+          top: Math.round(iconTop) + "px",
+          width: Math.round(iconSize) + "px",
+          height: Math.round(iconSize) + "px",
+        }
+      );
+    }
+
+    // 绘制文字
+    nativePopupView.value.drawText(
+      it.text,
+      {
+        left: left + "px",
+        top: textTop + "px",
+        width: itemW + "px",
+        height: textSize + uni.upx2px(20) + "px",
+      },
+      {
+        size: textSize + "px",
+        color: "#666666",
+        align: "center",
+        verticalAlign: "top",
+      }
+    );
+  });
+  // 取消按钮分割线
+  const cancelTop = panelH - cancelH;
+  nativePopupView.value.drawRect(
+    { color: "#F0F0F0" },
+    {
+      left: "0px",
+      top: cancelTop - 1 + "px",
+      width: screenW + "px",
+      height: "1px",
+    }
+  );
+  nativePopupView.value.drawText(
+    "取消",
+    {
+      left: "0px",
+      top: cancelTop + "px",
+      width: screenW + "px",
+      height: cancelH + "px",
+    },
+    {
+      size: uni.upx2px(32) + "px",
+      color: "#333333",
+      align: "center",
+      verticalAlign: "middle",
+    }
+  );
+  // 事件处理函数
+  const handleMaskClick = () => {
+    console.log("遮罩被点击");
+    closeNativePopup();
+  };
+
+  const handlePanelClick = (e) => {
+    console.log("面板被点击", e);
+    const info = popupInfo.value;
+
+    // 获取点击坐标
+    let x = 0;
+    let y = 0;
+
+    // 尝试多种方式获取坐标
+    if (e.clientX !== undefined && e.clientY !== undefined) {
+      x = e.clientX;
+      y = e.clientY;
+    } else if (e.pageX !== undefined && e.pageY !== undefined) {
+      x = e.pageX;
+      y = e.pageY;
+    } else if (e.touches && e.touches.length > 0) {
+      x = e.touches[0].clientX || e.touches[0].pageX || 0;
+      y = e.touches[0].clientY || e.touches[0].pageY || 0;
+    } else if (e.changedTouches && e.changedTouches.length > 0) {
+      x = e.changedTouches[0].clientX || e.changedTouches[0].pageX || 0;
+      y = e.changedTouches[0].clientY || e.changedTouches[0].pageY || 0;
+    }
+
+    console.log("原始坐标:", x, y);
+    console.log("屏幕信息:", info);
+
+    if (!x || !y) {
+      console.log("坐标无效");
+      return;
+    }
+
+    // 判断坐标是相对于屏幕还是相对于视图
+    // 如果 y 小于 panelH，说明是相对于视图的坐标
+    // 如果 y 大于等于 screenH - panelH，说明是相对于屏幕的坐标
+    let relativeY = y;
+    let relativeX = x;
+
+    if (y < info.panelH) {
+      // 相对于视图的坐标，直接使用
+      relativeY = y;
+      relativeX = x;
+      console.log("使用相对于视图的坐标:", relativeX, relativeY);
+    } else if (y >= info.screenH - info.panelH) {
+      // 相对于屏幕的坐标，转换为相对于视图的坐标
+      relativeY = y - (info.screenH - info.panelH);
+      relativeX = x;
+      console.log(
+        "使用相对于屏幕的坐标，转换为相对视图:",
+        relativeX,
+        relativeY
+      );
+    } else {
+      // 可能是其他情况，尝试直接使用
+      console.log("坐标类型不确定，尝试直接使用");
+    }
+
+    // 取消区域（底部取消按钮）- 相对于视图
+    const cancelTop = info.panelH - info.cancelH;
+    console.log(
+      "取消区域判断: relativeY =",
+      relativeY,
+      ", cancelTop =",
+      cancelTop
+    );
+    if (relativeY >= cancelTop) {
+      console.log("点击了取消按钮");
+      closeNativePopup();
+      return;
+    }
+
+    // 分享项区域（图标+文字区域）- 相对于视图
+    const shareAreaTop = info.contentTop;
+    const shareAreaBottom =
+      shareAreaTop + info.iconSize + info.textSize + uni.upx2px(20);
+
+    console.log(
+      "分享区域: relativeY =",
+      relativeY,
+      ", 范围 =",
+      shareAreaTop,
+      "到",
+      shareAreaBottom
+    );
+
+    if (relativeY >= shareAreaTop && relativeY <= shareAreaBottom) {
+      // 计算点击的是第几个分享项（0:微信, 1:朋友圈, 2:微博）
+      const itemWidth = info.screenW / items.length;
+      const idx = Math.min(2, Math.max(0, Math.floor(relativeX / itemWidth)));
+
+      console.log(
+        "点击了分享项:",
+        idx,
+        ", x =",
+        relativeX,
+        ", itemWidth =",
+        itemWidth
+      );
+
+      if (idx === 0) {
+        console.log("执行微信分享");
+        shareToWechat();
+        closeNativePopup();
+      } else if (idx === 1) {
+        console.log("执行朋友圈分享");
+        shareToMoments();
+        closeNativePopup();
+      } else if (idx === 2) {
+        console.log("执行微博分享");
+        // shareToWeibo();
+        // closeNativePopup();
+      }
+    } else {
+      console.log(
+        "点击位置不在分享区域内, relativeY =",
+        relativeY,
+        ", 需要范围:",
+        shareAreaTop,
+        "到",
+        shareAreaBottom
+      );
+    }
+  };
+
+  // 同时监听 click 和 touchstart 事件
+  nativeMaskView.value.addEventListener("click", handleMaskClick, false);
+  nativeMaskView.value.addEventListener("touchstart", handleMaskClick, false);
+
+  nativePopupView.value.addEventListener("click", handlePanelClick, false);
+  nativePopupView.value.addEventListener("touchstart", handlePanelClick, false);
+  nativePopupView.value.addEventListener("touchend", handlePanelClick, false);
+  // #endif
+}
+
+function showNativePopup() {
+  // #ifdef APP-PLUS
+  if (popupShowing.value) return;
+  if (!nativeMaskView.value || !nativePopupView.value) {
+    createNativePopup();
+  }
+  nativeMaskView.value && nativeMaskView.value.show();
+  nativePopupView.value && nativePopupView.value.show();
+  popupShowing.value = true;
+  // #endif
+}
+
+function closeNativePopup() {
+  // #ifdef APP-PLUS
+  if (!popupShowing.value) return;
+  nativeMaskView.value && nativeMaskView.value.hide();
+  nativePopupView.value && nativePopupView.value.hide();
+  popupShowing.value = false;
+  // #endif
+}
+
+// 分享到微信
+const shareToWechat = () => {
+  // #ifdef APP-PLUS
+  // 使用系统分享
+  uni.downloadFile({
+    url: shareImg.value,
+    success: function (res) {
+      uni.compressImage({
+        src: res.tempFilePath,
+        quality: 60,
+        success: function (res2) {
+          uni.share({
+            provider: "weixin",
+            scene: "WXSceneSession",
+            type: 0,
+            title: shareTitle.value,
+            summary: summary.value,
+            href: safeUrl.value,
+            imageUrl: res2.tempFilePath,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+        },
+      });
+    },
+  });
+
+  // #endif
+
+  // #ifdef H5
+  // H5环境下的分享
+  if (navigator.share) {
+    navigator
+      .share({
+        title: "肝胆相照APP",
+        text: "专业的医疗健康平台，快来下载体验吧！",
+        url: shareLink.value,
+      })
+      .then(() => {
+        uni.showToast({
+          title: "分享成功",
+          icon: "success",
+        });
+      })
+      .catch(() => {
+        uni.showToast({
+          title: "分享失败",
+          icon: "none",
+        });
+      });
+  } else {
+    // 复制到剪贴板
+    uni.setClipboardData({
+      data:
+        "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：" +
+        shareLink.value,
+      success: () => {
+        uni.showToast({
+          title: "已复制到剪贴板",
+          icon: "success",
+        });
+      },
+    });
+  }
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  // 微信小程序分享
+  uni.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"],
+  });
+  // #endif
+
+  closeShare();
+};
+
+// 页面隐藏/销毁时清理原生弹窗
+onHide(() => {
+  // #ifdef APP-PLUS
+  closeNativePopup();
+  // #endif
+});
+onUnload(() => {
+  // #ifdef APP-PLUS
+  try {
+    nativeMaskView.value &&
+      nativeMaskView.value.close &&
+      nativeMaskView.value.close();
+    nativePopupView.value &&
+      nativePopupView.value.close &&
+      nativePopupView.value.close();
+  } catch (e) {}
+  nativeMaskView.value = null;
+  nativePopupView.value = null;
+  popupShowing.value = false;
+  // #endif
+});
+// 分享到朋友圈
+const shareToMoments = () => {
+  // #ifdef APP-PLUS
+  uni.downloadFile({
+    url: shareImg.value,
+    success: function (res) {
+      uni.compressImage({
+        src: res.tempFilePath,
+        quality: 60,
+        success: function (res2) {
+          uni.share({
+            provider: "weixin",
+            scene: "WXSceneTimeline",
+            type: 0,
+            title: shareTitle.value,
+            summary: summary.value,
+            href: safeUrl.value,
+            imageUrl: res2.tempFilePath,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+        },
+        fail: function (err) {
+          console.log("fail:" + JSON.stringify(err));
+        },
+      });
+    },
+  });
+
+  // #endif
+
+  // #ifdef H5
+  // 复制到剪贴板
+  uni.setClipboardData({
+    data: "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com",
+    success: () => {
+      uni.showToast({
+        title: "已复制到剪贴板，可分享到朋友圈",
+        icon: "success",
+      });
+    },
+  });
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  uni.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"],
+  });
+  // #endif
+
+  closeShare();
+};
+
+// 分享到新浪微博
+const shareToWeibo = () => {
+  // #ifdef APP-PLUS
+  uni.share({
+    provider: "sinaweibo",
+    type: 0,
+    title: shareTitle.value,
+    summary: summary.value,
+    href: safeUrl.value,
+    imageUrl: logoImg,
+    success: function (res) {
+      console.log("分享成功");
+    },
+    fail: function (err) {
+      console.log("fail:" + JSON.stringify(err));
+    },
+  });
+  // plus.share.sendWithSystem({
+  // 	type: 'text',
+  // 	content: '肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com'
+  // }, () => {
+  // 	uni.showToast({
+  // 		title: '分享成功',
+  // 		icon: 'success'
+  // 	})
+  // }, (err) => {
+  // 	console.log('分享失败：', err)
+  // 	uni.showToast({
+  // 		title: '分享失败',
+  // 		icon: 'none'
+  // 	})
+  // })
+  // #endif
+
+  // #ifdef H5
+  // 复制到剪贴板
+  uni.setClipboardData({
+    data: "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com",
+    success: () => {
+      uni.showToast({
+        title: "已复制到剪贴板，可分享到微博",
+        icon: "success",
+      });
+    },
+  });
+  // #endif
+
+  closeShare();
+};
+</script>
+
+<style>
+.bottom-box {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  z-index:99;
+  background-color: #fff;
+  
+ 
+}
+.bottom-cell {
+  flex: 1;
+  height:55px;
+ border-right: 2rpx solid #ccc;
+ border-top: 2rpx solid #ccc;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+ 
+}
+.bottom-cell:last-child {
+  border-right: none;
+}
+.bottom-cell-img {
+  width: 40rpx;
+  height: 40rpx;
+}
+.bottom-cell-text {
+  margin-left: 8rpx;
+  font-size: 28rpx;
+  color: #666;
+}
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 10000000;
+}
+/* 分享弹窗样式 */
+.share-popup {
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  padding: 40rpx 0 0;
+}
+.share-img {
+  width: 100rpx;
+  height: 100rpx;
+}
+.share-title {
+  text-align: center;
+  font-size: 32rpx;
+  color: #333;
+  margin-bottom: 40rpx;
+  font-weight: 500;
+}
+
+.share-content {
+  display: flex;
+  justify-content: space-around;
+  padding: 0 40rpx 40rpx;
+}
+
+.share-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+}
+
+.share-icon {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20rpx;
+}
+
+.wechat-icon {
+  background-color: #07c160;
+}
+
+.moments-icon {
+  background-color: #07c160;
+}
+
+.weibo-icon {
+  background-color: #e6162d;
+}
+
+.qq-icon {
+  background-color: #12b7f5;
+}
+
+.share-icon-text {
+  font-size: 50rpx;
+  color: #fff;
+  font-weight: bold;
+}
+
+.share-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.share-cancel {
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-top: 1rpx solid #f0f0f0;
+  font-size: 32rpx;
+  color: #333;
+}
+
+.share-cancel:active {
+  background-color: #f5f5f5;
+}
+.nav-actions .share-img-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-actions .collect-img-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-actions {
+  display: flex;
+  align-items: center;
+}
+
+.container {
+  height: 100vh;
+  position: relative;
+  z-index: 0;
+  overflow: scroll;
+}
+.tip {
+  padding: 24rpx;
+  color: #666;
+  font-size: 28rpx;
+}
+</style>
diff --git a/pages_chat/addAddress/addAddress.vue b/pages_chat/addAddress/addAddress.vue
index afc918f..f126926 100644
--- a/pages_chat/addAddress/addAddress.vue
+++ b/pages_chat/addAddress/addAddress.vue
@@ -100,13 +100,21 @@ const addNew = () => {
 }
 
 .list-container {
-  padding: 24rpx;
+  top: calc(var(--status-bar-height) + 54px);
+  width: 100%;
+  bottom: 120rpx;
+  left: 0rpc;
+  right: 0rpx;
+  overflow-y: scroll;
+  position: fixed;
+ 
 }
 
 .card {
   background-color: #fff;
   border-radius: 16rpx;
   overflow: hidden;
+  margin: 0 30rpx 20rpx;
   margin-bottom: 20rpx;
   box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.04);
 }
diff --git a/pages_chat/chat/message/message-input copy.vue b/pages_chat/chat/message/message-input copy.vue
new file mode 100644
index 0000000..3450919
--- /dev/null
+++ b/pages_chat/chat/message/message-input copy.vue	
@@ -0,0 +1,1545 @@
+<template>
+  <div class="input-root">
+    <div class="msg-input-wrapper">
+      <!-- 当回复他人消息时，输入框上方需要展示被回复消息相关内容 -->
+      <div v-if="isReplyMsg" class="reply-message-wrapper">
+        <div class="reply-message-close" @tap="removeReplyMsg">
+          <Icon
+            color="#929299"
+            :iconStyle="{ fontWeight: '200' }"
+            :size="13"
+            type="icon-guanbi1"
+          />
+        </div>
+        <div class="reply-line">｜</div>
+        <div class="reply-title">{{ t('replyText') }}</div>
+        <div class="reply-to">
+          <Appellation
+            :account="replyMsg && replyMsg.senderId"
+            :team-id="
+              props.conversationType ===
+              V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+                ? to
+                : ''
+            "
+            color="#929299"
+            :fontSize="13"
+          >
+          </Appellation>
+        </div>
+        <div class="reply-to-colon">:</div>
+        <div
+          v-if="replyMsg && replyMsg.messageClientId === 'noFind'"
+          class="reply-noFind"
+        >
+          {{ t('replyNotFindText') }}
+        </div>
+        <div class="reply-message" v-else>
+          <message-one-line
+            v-if="
+              replyMsg &&
+              replyMsg.messageType ===
+                V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT
+            "
+            :text="replyMsg && replyMsg.text"
+          ></message-one-line>
+          <div v-else>
+            {{
+              replyMsg
+                ? '[' + REPLY_MSG_TYPE_MAP[replyMsg.messageType] + ']'
+                : ''
+            }}
+          </div>
+        </div>
+      </div>
+      <!-- 输入框上按钮组 -->
+      <div class="msg-button-group">
+        <div
+          @tap="handleAudioVisible"
+          v-if="!(isWeb || isHarmonyOs || isGroupSend)"
+          class="msg-input-button"
+        >
+          <Icon
+            v-if="audioPanelVisible"
+            :size="20"
+            type="audio-btn-selected"
+            key="audio-btn-selected"
+          />
+          <Icon v-else :size="20" type="icon-audio" key="icon-audio" />
+        </div>
+        <div class="msg-input-button">
+          <Icon @tap="handleEmojiVisible" :size="20" type="icon-biaoqing" />
+        </div>
+        <div class="msg-input-button">
+          <div>
+            <Icon @tap="handleSendImageMsg" :size="20" type="icon-tupian" />
+          </div>
+        </div>
+        <div class="msg-input-button">
+          <Icon @tap="handleSendMoreVisible" type="send-more" :size="20" />
+        </div>
+        <!-- <div class="msg-input-button">
+          <Icon @tap="handleSetting" type="icon-shezhi" :size="20" />
+        </div> -->
+      </div>
+      <div v-if="inputVisible" class="msg-input">
+        <!-- 当从表情面板切换到文字输入时，直接唤起键盘，会导致input框滚动消失，故此处需要用EmojiInput兼容下，保证先隐藏表情面板，再弹出键盘 -->
+        <div
+          v-show="showEmojiInput"
+          @click="onClickEmojiInput"
+          class="input-emoji"
+        >
+          <div v-if="inputText" class="input-text">{{ inputText }}</div>
+          <div v-else class="input-placeholder">
+            {{
+              isTeamMute ? t('teamMutePlaceholder') : t('chatInputPlaceHolder')
+            }}
+          </div>
+        </div>
+        <input
+          v-show="!showEmojiInput"
+          :focus="isFocus"
+          class="msg-input-input"
+          :maxlength="-1"
+          :placeholder="
+            isTeamMute ? t('teamMutePlaceholder') : t('chatInputPlaceHolder')
+          "
+          v-model="inputText"
+          type="text"
+          :disabled="isTeamMute"
+          :confirm-hold="true"
+          cursor-spacing="20"
+          adjust-position="true"
+          confirm-type="send"
+          @confirm="handleSendTextMsg"
+          @blur="handleInputBlur"
+          @input="handleInput"
+          id="msg-input"
+        />
+      </div>
+      <!-- 表情面板 -->
+      <div v-if="emojiVisible" class="msg-emoji-panel" @click.stop="() => {}">
+        <Face
+          @emojiClick="handleEmoji"
+          @emojiDelete="handleEmojiDelete"
+          @emojiSend="handleSendTextMsg"
+        />
+      </div>
+      <!-- 发送语音消息面板 -->
+      <div
+        v-if="audioPanelVisible"
+        class="msg-audio-panel"
+        @click.stop="() => {}"
+      >
+        <VoicePanel @handleSendAudioMsg="handleSendAudioMsg"></VoicePanel>
+      </div>
+      <!-- 发送更多面板 -->
+      <div
+        v-if="sendMoreVisible"
+        class="send-more-panel"
+        @click.stop="() => {}"
+      >
+        <div class="send-more-panel-item-wrapper" v-if="!(isGroupSend)">
+          <div
+            class="send-more-panel-item"
+            @tap="(event:any) => handleSendVideoMsg('camera', event)"
+          >
+            <Icon type="icon-paishe" :size="30"></Icon>
+          </div>
+          <div class="icon-text">{{ t('shootText') }}</div>
+        </div>
+        <div class="send-more-panel-item-wrapper" v-if="!(isGroupSend)">
+          <div
+            class="send-more-panel-item"
+            @tap="(event: any) => handleSendVideoMsg('album', event)"
+          >
+            <Icon type="icon-shipin2" :size="30"></Icon>
+          </div>
+          <div class="icon-text">{{ t('albumText') }}</div>
+        </div>
+        <div class="send-more-panel-item-wrapper">
+          <div
+            class="send-more-panel-item"
+            @tap="(event: any) => handleCustom('reply', event)"
+          >
+            <image :src="quickImg" mode="widthFix"></image>
+          </div>
+          <div class="icon-text">快捷回复</div>
+        </div>
+        <div class="send-more-panel-item-wrapper">
+          <div
+            class="send-more-panel-item"
+            @tap="(event: any) => handleCustom('hj', event)"
+          >
+          <image :src="quickImg" mode="widthFix"></image>
+          </div>
+          <div class="icon-text">患教</div>
+        </div>
+        <div class="send-more-panel-item-wrapper">
+          <div
+            class="send-more-panel-item"
+            @tap="(event: any) => handleCustom('outpatient', event)"
+          >
+           <image :src="chuzhenImg" mode="widthFix"></image>
+          </div>
+          <div class="icon-text">出/停诊公告</div>
+        </div>
+        <div class="send-more-panel-item-wrapper">
+          <div
+            class="send-more-panel-item"
+            @tap="(event: any) => handleCustom('mall', event)"
+          >
+            <image :src="mallImg" mode="widthFix"></image>
+          </div>
+          <div class="icon-text">商城</div>
+        </div>
+
+        <!-- <div class="send-more-panel-item-wrapper">
+          <div
+            class="send-more-panel-item"
+            @tap="(event: any) => handleCustom('hospital', event)"
+          >
+            <image :src="hospitalImg" mode="widthFix"></image>
+          </div>
+          <div class="icon-text">互联网医院</div>
+        </div> -->
+        <!-- 音频呼叫 -->
+        <!-- <div
+          class="send-more-panel-item-wrapper"
+          v-if="
+            isAndroidOrIosApp &&
+            props.conversationType !==
+              V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+          "
+        >
+          <div class="send-more-panel-item" @tap="handleCall(1)">
+            <Icon type="icon-audio-call" :size="30"></Icon>
+          </div>
+          <div class="icon-text">{{ t('voiceCallText') }}</div>
+        </div> -->
+
+        <!-- 视频呼叫 -->
+        <!-- <div
+          class="send-more-panel-item-wrapper"
+          v-if="
+            isAndroidOrIosApp &&
+            props.conversationType !==
+              V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+          "
+        >
+          <div class="send-more-panel-item" @tap="() => handleCall(2)">
+            <Icon type="icon-video-call" :size="30"></Icon>
+          </div>
+          <div class="icon-text">{{ t('videoCallText') }}</div>
+        </div> -->
+        <!-- <div
+          v-if="isWeb"
+          class="send-more-panel-item-wrapper"
+          @tap="handleSendFileMsg"
+        >
+          <div class="send-more-panel-item">
+            <Icon type="icon-file" :size="30"></Icon>
+          </div>
+          <div class="icon-text">{{ t('fileText') }}</div>
+        </div> -->
+      </div>
+    </div>
+    <!-- @消息相关 popup -->
+    <UniPopup
+      ref="popupRef"
+      background-color="#ffffff"
+      type="bottom"
+      mask-background-color="rgba(0,0,0,0.4)"
+      @change="onPopupChange"
+    >
+      <MentionMemberList :team-id="to"></MentionMemberList>
+    </UniPopup>
+    <!-- 复制自 groupSend 的遮罩与弹窗 -->
+    <view v-if="showModal" class="mask" @tap="closeModal"></view>
+    <view v-if="showModal" class="center-modal">
+      <view class="modal-title">温馨提示</view>
+      <view class="modal-divider"></view>
+      <view class="modal-item" @tap="onSelectSince('article')">
+        <text>图文科普</text>
+      </view>
+      <view class="modal-divider"></view>
+      <view class="modal-item" @tap="onSelectSince('video')">
+        <text>视频科普</text>
+      </view>
+    </view>
+     <!-- 商城弹窗 -->
+    <view v-if="showMallModal" class="mask" @tap="closeMallModal"></view>
+    <view v-if="showMallModal" class="center-modal">
+      <view class="modal-title">温馨提示</view>
+      <view class="modal-divider"></view>
+      <view class="modal-item" @tap="sendMallMsg">
+        <text>纽娃复合营养素固体饮料</text>
+      </view>
+      <view class="modal-divider"></view>
+      <view class="modal-item" >
+        <text>更多商品正在准备中</text>
+      </view>
+    </view>
+  </div>
+</template>
+
+<script lang="ts" setup>
+/** 消息页面输入框组件 */
+import docUrl from '@/utils/docUrl'
+import Face from './face.vue'
+import VoicePanel from './voice-panel.vue'
+import Icon from '@/components/Icon.vue'
+import { ref, getCurrentInstance, computed, onUnmounted, onMounted } from 'vue'
+import { ALLOW_AT, events, REPLY_MSG_TYPE_MAP } from '@/utils/im/constants'
+import { emojiMap } from '@/utils/im/emoji'
+import { t } from '@/utils/im/i18n'
+import { handleNoPermission } from '@/utils/im/permission'
+import { customNavigateTo } from '@/utils/im/customNavigate'
+import MessageOneLine from '@/components/MessageOneLine.vue'
+import {
+  isAndroidApp,
+  stopAllAudio,
+  isIosWeb,
+  isWeb,
+  isWxApp,
+  startCall,
+  isAndroidOrIosApp,
+  isHarmonyOs,
+} from '@/utils/im/index'
+
+// @ts-ignore
+import UniPopup from '@/components/uni-components/uni-popup/components/uni-popup/uni-popup.vue'
+// @ts-ignore
+import MentionMemberList from './mention-member-list.vue'
+import Appellation from '@/components/Appellation.vue'
+import { AT_ALL_ACCOUNT } from '@/utils/im/constants'
+import { replaceEmoji } from '@/utils/im/index'
+import { autorun } from 'mobx'
+import quickImg from '@/static/quck_message.png'
+import chuzhenImg from '@/static/outpatient_true.png'
+import mallImg from '@/static/ytx_chattingfooter_shopping.png'
+import hospitalImg from '@/static/ytx_chatting_hospital.png'
+import {onShow,onUnload} from '@dcloudio/uni-app'
+
+import {
+  V2NIMTeam,
+  V2NIMTeamChatBannedMode,
+  V2NIMTeamMember,
+} from 'nim-web-sdk-ng/dist/esm/nim/src/V2NIMTeamService'
+import {
+  V2NIMMessageForUI,
+  YxServerExt,
+  YxAitMsg,
+} from '@xkit-yx/im-store-v2/dist/types/types'
+//@ts-ignore
+import { V2NIMConst } from '@/utils/im/nim'
+import { V2NIMMessage } from 'nim-web-sdk-ng/dist/esm/nim/src/V2NIMMessageService'
+export type MentionedMember = { accountId: string; appellation: string }
+import navTo from '@/utils/navTo'
+import api from '@/api/api.js'
+let userInfo=uni.getStorageSync('userInfo');
+let expert_uuid=userInfo.uuid;
+let expert_name=userInfo.realName;
+let patient_uuid='';
+const articleInfo=ref({});
+const videoInfo=ref({});
+const patientListByGBK = async () => {
+		
+		const res = await api.patientListByGBK();
+		if(res.code == 1){
+			//patientList.value = res.data;
+      for (let i = 0; i < res.data.length; i++) {
+        if (res.data[i].uuid.toLowerCase() === props.to) {
+          patient_uuid = res.data[i].uuid;
+          break;
+        }
+      }
+			
+			
+		}
+		
+	};
+const props = withDefaults(
+  defineProps<{
+    conversationType: V2NIMConst.V2NIMConversationType
+    to: string
+    isGroupSend?: boolean
+    replyMsgsMap?: {
+      [key: string]: V2NIMMessageForUI
+    }
+  }>(),
+  {}
+)
+const emits = defineEmits(['send'])
+/** 会话ID */
+const conversationId =
+  props.conversationType ===
+  V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P
+    ? uni.$UIKitNIM.V2NIMConversationIdUtil.p2pConversationId(props.to)
+    : uni.$UIKitNIM.V2NIMConversationIdUtil.teamConversationId(props.to)
+
+/** 输入框内容 */
+const inputText = ref('')
+const extVisible = ref(false)
+/** 群发选择弹窗 */
+const showModal = ref(false)
+/** 商城弹窗 */
+const showMallModal = ref(false)
+/** 音频面板flag */
+const audioPanelVisible = ref(false)
+/** 发送更多面板flag */
+const sendMoreVisible = ref(false)
+/** 表情面板flag */
+const emojiVisible = ref(false)
+/** input框flag */
+const inputVisible = computed(() => {
+  if (audioPanelVisible.value || sendMoreVisible.value) {
+    return false
+  } else {
+    return true
+  }
+})
+
+/** 发起呼叫，type: 1 音频呼叫，2 视频呼叫 */
+const handleCall = (type: number) => {
+  const myAccount = uni.$UIKitStore.userStore.myUserInfo.accountId
+
+  const remoteShowName = uni.$UIKitStore.uiStore.getAppellation({
+    account: props.to,
+  })
+  if (myAccount) {
+    startCall({
+      remoteUserAccid: props.to,
+      currentUserAccid: myAccount,
+      type: type,
+      remoteShowName: remoteShowName,
+    })
+  } else {
+    uni.showToast({
+      title: t('callFailedText'),
+      icon: 'none',
+    })
+  }
+}
+const outPatientList = ref([]);
+const getListOutPatient = async () => {
+  const res = await api.listOutPatient({
+    page:1,
+  });
+  if(res.code == 200){
+    outPatientList.value = res.data.list.list;
+  }
+}
+const stopOutPatientList = ref([]);
+const getStopOutPatientList = async () => {
+  const res = await api.stopOutPatientList();
+  if(res.code == 200){
+    stopOutPatientList.value = res.data;
+  }
+}
+onShow(() => {
+  uni.$on('articelItem', (article) => {
+    console.log('article', article);
+    articleInfo.value = article;
+    senCustomMsg('article');
+    //handleSendTextMsg('article', article);
+  });
+  uni.$on('videoItem', (video) => {
+    console.log('video', video);
+    videoInfo.value = video;
+    senCustomMsg('video');
+    //handleSendTextMsg('video', video);
+  });
+  uni.$on('quickReply', (reply) => {
+    inputText.value= reply;
+    uni.$emit(events.CLOSE_PANEL)
+  });
+  getListOutPatient();
+  getStopOutPatientList();
+});
+onUnload(() => {
+  uni.$off('articelItem');
+  uni.$off('videoItem');
+  uni.$off('quickReply');
+});
+/** 商城弹窗 */
+let rawStr="{\"gdxz_content\":\"我已入驻肝胆相照互联网医院，复诊购药一站式服务，快来看看吧\",\"gdxz_ext_data\":\"[互联网医院]\",\"gdxz_id\":\"1681174885629431808\",\"gdxz_img\":\"https://img.applets.igandanyiyuan.com/applet/admin/avatar/2023071813261420200708181049.png\",\"gdxz_title\":\"肝胆相照互联网医院\",\"gdxz_type\":\"[互联网医院]\",\"gdxz_url\":\"\"}";
+const sendMallMsg = () => {
+  showMallModal.value = false;
+  //handleSendTextMsg('mall');
+  senCustomMsg('mall');
+ 
+}
+
+/** 商城弹窗 */
+const closeMallModal = () => {
+  showMallModal.value = false
+}
+
+/** 用于解决表情面板和键盘冲突，导致输入框滚动消失问题 */
+const showEmojiInput = ref(false)
+
+/** 回复消息相关 */
+const isReplyMsg = ref(false)
+const isFocus = ref(false)
+const replyMsg = ref<V2NIMMessageForUI>()
+
+/** @ 消息相关 */
+const ctx = getCurrentInstance()
+const popupRef = ref(null)
+
+/** @ 成员列表 */
+const selectedAtMembers = ref<MentionedMember[]>([])
+
+/** 群相关 */
+const team = ref<V2NIMTeam>()
+/** 群成员 */
+const teamMembers = ref<V2NIMTeamMember[]>([])
+/** 群禁言模式 */
+const teamMute = ref<V2NIMTeamChatBannedMode>(
+  V2NIMConst.V2NIMTeamChatBannedMode.V2NIM_TEAM_CHAT_BANNED_MODE_UNBAN
+)
+/** 是否是群主 */
+const isGroupOwner = ref(false)
+/** 是否是群管理员 */
+const isGroupManager = ref(false)
+/** 群是否禁言 */
+const isTeamMute = ref(false)
+
+/** 是否允许@ 所有人 */
+const allowAtAll = computed(() => {
+  let ext: YxServerExt = {}
+  try {
+    ext = JSON.parse((team.value || {}).serverExtension || '{}')
+  } catch (error) {
+    //
+  }
+  if (ext[ALLOW_AT] === 'manager') {
+    return isGroupOwner.value || isGroupManager.value
+  }
+  return true
+})
+/** 更新群禁言 */
+const updateTeamMute = () => {
+  if (
+    teamMute.value ===
+    V2NIMConst.V2NIMTeamChatBannedMode.V2NIM_TEAM_CHAT_BANNED_MODE_UNBAN
+  ) {
+    isTeamMute.value = false
+    return
+  }
+
+  /** 群主或者群管理员在群禁言时，可以发送消息 */
+  if (isGroupOwner.value || isGroupManager.value) {
+    isTeamMute.value = false
+    return
+  }
+  isTeamMute.value = true
+  return
+}
+
+/** 弹窗*/
+const onPopupChange = (e: any) => {
+  uni.$emit(events.HANDLE_MOVE_THROUGH, e.value)
+}
+
+/** 打开/关闭群发选择弹窗（与 groupSend 保持一致） */
+const openModal = () => {
+  showModal.value = true;
+ 
+}
+const closeModal = () => {
+  showModal.value = false
+}
+const toggleModal = () => {
+  showModal.value = !showModal.value
+}
+const onSelectSince = (type: string) => {
+  showModal.value = false
+  if (type === 'article') {
+    navTo({ url: '/pages_chat/article/article' })
+  } else if (type === 'video') {
+    navTo({ url: '/pages_chat/video/video' })
+  }
+}
+
+
+/** 点击@ 群成员 */
+const handleMentionItemClick = (member: MentionedMember) => {
+  //@ts-ignore
+  ctx.refs.popupRef.close()
+  uni.$emit(events.HANDLE_MOVE_THROUGH, false)
+  const nickInTeam = member.appellation
+  selectedAtMembers.value = [
+    ...selectedAtMembers.value.filter(
+      (item) => item.accountId !== member.accountId
+    ),
+    member,
+  ]
+  const newInputText = inputText.value + nickInTeam + ' '
+  // 更新input框的内容
+  inputText.value = newInputText
+}
+
+/** 关闭popup */
+const closePopup = () => {
+  //@ts-ignore
+  ctx.refs.popupRef.close()
+}
+
+/** 点击表情输入框，隐藏表情面板，显示键盘 */
+const onClickEmojiInput = () => {
+  showEmojiInput.value = false
+  extVisible.value = false
+  emojiVisible.value = false
+  if (isIosWeb) {
+    showKeyboard()
+  } else if (!isHarmonyOs) {
+    const timeout = setTimeout(() => {
+      showKeyboard()
+      clearTimeout(timeout)
+    }, 500)
+  }
+}
+
+/** 输入框失焦 */
+const handleInputBlur = () => {
+  isFocus.value = false
+}
+
+/** 滚动到底部 */
+const scrollBottom = () => {
+  if (!isWeb) {
+    setTimeout(() => {
+      uni.$emit(events.ON_SCROLL_BOTTOM)
+    }, 300)
+  } else {
+    uni.$emit(events.ON_SCROLL_BOTTOM)
+  }
+}
+
+/** 输入框输入事件 */
+const handleInput = (event: any) => {
+  const text = event?.detail?.value
+  const isAit = text.endsWith('@') || text.endsWith('@\n')
+  if (
+    props.conversationType ==
+    V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+  ) {
+    if (isAit) {
+      /** 当前输入的是@ */
+      uni.hideKeyboard()
+      // @ts-ignore
+      ctx.refs.popupRef.open('bottom')
+      isFocus.value = false
+      uni.$emit(events.HANDLE_MOVE_THROUGH, true)
+    }
+  }
+}
+
+/** 发送文本消息 */
+const handleSendTextMsg = (type:string) => {
+  if (inputText.value.trim() === '') return
+  const ext = onAtMembersExtHandler()
+   let mallText='纽娃复合营养素固体饮料主要成分是:蜂花粉、乳清蛋白粉、灰树花粉、低聚木糖、蚕蛹氨基酸、麦芽粉、薏苡仁粉、烟酸、磷脂，以及其他调味品、辅助原料。科学配比制成，含有丰富的蛋白质、氨基酸、维生素、微量元素及其他营养元素，点击链接了解详情。'
+  let text = type==='mall'?mallText:replaceEmoji(inputText.value)
+  const textMsg = uni.$UIKitNIM.V2NIMMessageCreator.createTextMessage(text)
+ //let serverExtension={"gdxz_nickName":"测试","gdxz_sessionType":"general"};
+  if(props.isGroupSend){
+    emits('send',{
+      content:text,
+      msg_type:1,
+    })
+    inputText.value = ''
+    isReplyMsg.value = false
+    replyMsg.value = undefined
+    selectedAtMembers.value = [];
+  }else{
+
+    uni.$UIKitStore.msgStore
+    .sendMessageActive({
+      msg: textMsg as unknown as V2NIMMessage,
+      conversationId,
+      serverExtension:selectedAtMembers.value.length && (ext as any),
+      sendBefore: () => {
+        scrollBottom();
+       
+      },
+    })
+    .catch(() => {
+      uni.showToast({
+        icon: 'error',
+        title: t('sendMsgFailedText'),
+      })
+    })
+    .finally(() => {
+      scrollBottom()
+    })
+
+  inputText.value = ''
+  isReplyMsg.value = false
+  replyMsg.value = undefined
+  selectedAtMembers.value = [];
+  // if(type=='mall'){
+  //         senCustomMsg('mall');
+  // }
+}
+}
+
+/** 发送文件消息 */
+const handleSendFileMsg = () => {
+  uni.chooseFile({
+    count: 1,
+    type: 'all',
+    success: (res) => {
+      const filePath = res?.tempFilePaths?.[0]
+      // @ts-ignore
+      const fileName = res?.tempFiles?.[0]?.name
+      if (filePath && fileName) {
+        const fileMsg = uni.$UIKitNIM.V2NIMMessageCreator.createFileMessage(
+          filePath,
+          fileName
+        )
+        uni.$UIKitStore.msgStore.sendMessageActive({
+          msg: fileMsg as unknown as V2NIMMessage,
+          conversationId,
+          sendBefore: () => {
+            scrollBottom()
+          },
+        })
+      }
+    },
+    fail: () => {
+      uni.showToast({
+        title: t('sendFileFailedText'),
+        icon: 'none',
+      })
+    },
+  })
+}
+
+/** 移除回复消息 */
+const removeReplyMsg = () => {
+  uni.$UIKitStore.msgStore.removeReplyMsgActive(
+    replyMsg?.value?.conversationId as string
+  )
+  isReplyMsg.value = false
+}
+
+/** 显示表情面板 */
+const handleEmojiVisible = () => {
+  if (isTeamMute.value) return
+  if (isWxApp || isAndroidApp || isHarmonyOs) {
+    const timeout = setTimeout(() => {
+      emojiVisible.value = true
+      extVisible.value = true
+      uni.$emit(events.ON_SCROLL_BOTTOM)
+      clearTimeout(timeout)
+    }, 300)
+  } else {
+    emojiVisible.value = true
+    extVisible.value = true
+  }
+  showEmojiInput.value = true
+  audioPanelVisible.value = false
+  sendMoreVisible.value = false
+  uni.$emit(events.ON_SCROLL_BOTTOM)
+}
+
+/** 显示发送更多"+"面板 */
+const handleSendMoreVisible = () => {
+  if (isTeamMute.value) return
+  audioPanelVisible.value = false
+  emojiVisible.value = false
+  sendMoreVisible.value = !sendMoreVisible.value
+  setTimeout(() => {
+    uni.$emit(events.ON_SCROLL_BOTTOM)
+  }, 300)
+}
+
+/** 点击表情 */
+const handleEmoji = (emoji: { key: string; type: string }) => {
+  inputText.value += emoji.key
+}
+
+/** 删除表情 */
+const handleEmojiDelete = () => {
+  let target = ''
+  const isEmojiEnd = Object.keys(emojiMap).reduce((prev, cur) => {
+    const isEnd = inputText.value.endsWith(cur)
+    if (isEnd) {
+      target = cur
+    }
+    return prev || isEnd
+  }, false)
+  if (isEmojiEnd && target) {
+    inputText.value = inputText.value.replace(target, '')
+  } else {
+    inputText.value = inputText.value.slice(0, -1)
+  }
+}
+
+/** 显示语音面板 */
+const handleAudioVisible = () => {
+  if (isTeamMute.value) return
+  audioPanelVisible.value = !audioPanelVisible.value
+  emojiVisible.value = false
+  setTimeout(() => {
+    uni.$emit(events.ON_SCROLL_BOTTOM)
+  }, 300)
+}
+
+/** 发送图片消息 */
+const handleSendImageMsg = () => {
+  if (isTeamMute.value) return
+  stopAllAudio()
+  uni.chooseImage({
+    count: 1,
+    sizeType: ['compressed'],
+    success: (res) => {
+      const imgMsg = uni.$UIKitNIM.V2NIMMessageCreator.createImageMessage(
+        res.tempFilePaths[0]
+      )
+      if(props.isGroupSend){
+        const fileManager = uni.getFileSystemManager();
+        fileManager.readFile({
+          filePath: res.tempFilePaths[0],
+          encoding: 'base64',
+          success: (res) => {
+              emits('send',{  
+                content:res.data,
+                msg_type:2,
+              })
+        },
+        fail: (error) => {
+          console.log('chooseImage', error)
+        }
+      })
+      }else{
+      uni.$UIKitStore.msgStore
+        .sendMessageActive({
+          msg: imgMsg as unknown as V2NIMMessage,
+          conversationId,
+          progress: () => true,
+          sendBefore: () => {
+            scrollBottom()
+          },
+        })
+        .then(() => {
+          scrollBottom()
+        })
+        .catch(() => {
+          scrollBottom()
+          uni.showToast({
+            icon: 'error',
+            title: t('sendImageFailedText'),
+          })
+        })
+    }
+    
+  },
+  /** uniapp 提供的chooseImage api 在鸿蒙上表现为不支持选择gif，在其他端支持 */
+  fail: (error) => {
+      console.log('chooseImage', error)
+    },
+    /** 没有开启权限时，提示开启权限 */
+    complete: handleNoPermission,
+  })
+  
+}
+const senCustomMsg = (type:string) => {
+    let rawStr="";
+    let text="";
+    let msg_type=0;
+    let msg_content="";
+    let doctor_id="";
+  if(type == 'hospital'){
+    doctor_id='';
+    msg_type=8;
+    msg_content="https://img.applets.igandanyiyuan.com/applet/admin/avatar/2023071813261420200708181049.png";
+    text="[互联网医院]";
+    rawStr=`{\"gdxz_content\":\"我已入驻肝胆相照互联网医院，复诊购药一站式服务，快来看看吧\",\"gdxz_ext_data\":\"[互联网医院]\",\"gdxz_id\":\"1681174885629431808\",\"gdxz_img\":\"https://img.applets.igandanyiyuan.com/applet/admin/avatar/2023071813261420200708181049.png\",\"gdxz_title\":\"肝胆相照互联网医院\",\"gdxz_type\":\"[互联网医院]\",\"gdxz_url\":\"\"}`;
+  }else if(type == 'mall'){
+    msg_type=6;
+    msg_content="";
+    text="[肝胆商城]";
+    rawStr=`{\"gdxz_content\":\"肝胆相照®肝胆病在线公共服务平台\",\"gdxz_ext_data\":\"[肝胆商城]\",\"gdxz_id\":\"\",\"gdxz_img\":\"\",\"gdxz_title\":\"纽娃复合营养素固体饮料\",\"gdxz_type\":\"[肝胆商城]\",\"gdxz_url\":\"https://wx.igandan.com/shop_notify/setInfo?patient_uuid=${patient_uuid}&expert_uuid=${expert_uuid}\"}`;
+  }else if(type == 'outpatient'){
+    msg_type=5;
+    msg_content="";
+    text="[门诊公告]";
+    rawStr=`{\"gdxz_content\":\"门诊详情\",\"gdxz_ext_data\":\"[门诊公告]\",\"gdxz_id\":\"\",\"gdxz_img\":\"\",\"gdxz_title\":\"${expert_name}医生门诊详情\",\"gdxz_type\":\"[门诊公告]\",\"gdxz_url\":\"https://dev-wx.igandan.com/wxPatient/index.htm#/outPatient?link=share&expertUuid=${expert_uuid}\"}`
+  }else if(type == 'article'){
+    msg_type=3;
+    msg_content=articleInfo.value.uuid;
+    text="[图文科普]";
+    let content='"'+articleInfo.value.summary+'"';
+    let id='"'+articleInfo.value.uuid+'"';
+    let title='"'+articleInfo.value.title+'"';
+    let path='"'+docUrl+articleInfo.value.path+'"';
+    rawStr=`{\"gdxz_content\":${content},\"gdxz_ext_data\":\"[图文科普]\",\"gdxz_id\":${id},\"gdxz_img\":\"http://doc.igandan.org/app/book/pdf/2019/20190613152617.png\",\"gdxz_title\":${title},\"gdxz_type\":\"[图文科普]\",\"gdxz_url\":${path}}`
+  }else if(type == 'video'){
+    msg_type=4;
+    msg_content=videoInfo.value.uuid;
+    let content='"'+videoInfo.value.note+'"';
+    let id='"'+videoInfo.value.uuid+'"';
+    let title='"'+videoInfo.value.name+'"';
+    let path='"'+docUrl+videoInfo.value.path+'"';
+    text="[视频科普]";
+    rawStr=`{\"gdxz_content\":${content},\"gdxz_ext_data\":\"[视频科普]\",\"gdxz_id\":${id},\"gdxz_img\":\"http://doc.igandan.org/app/book/pdf/2019/20190613152617.png\",\"gdxz_title\":${title},\"gdxz_type\":\"[视频科普]\",\"gdxz_url\":${path}}`
+  }
+  const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(text,rawStr)
+  if(props.isGroupSend){
+    emits('send',{
+      content:msg_content,
+      msg_type:msg_type,
+    })
+  }else{
+  uni.$UIKitStore.msgStore
+        .sendMessageActive({
+          msg: customMsg as unknown as V2NIMMessage,
+          conversationId,
+          progress: () => true,
+          sendBefore: () => {
+            scrollBottom()
+          },
+        })
+        .then(() => {
+          scrollBottom();
+        })
+        .catch(() => {
+          scrollBottom()
+          uni.showToast({
+            icon: 'error',
+            title: '发送失败',
+          })
+        })
+  }
+}
+
+const handleCustom = (type: string, event: any) => {
+  if (isTeamMute.value) return
+  if(type == 'reply'){
+     navTo({
+      url: '/pages_chat/quickReply/quickReply',
+     })
+  }else if(type == 'hj'){
+    showModal.value = true
+  }else if(type == 'mall'){
+    showMallModal.value = true
+    patientListByGBK();
+  }else if(type == 'outpatient'){
+      //  navTo({
+      //   url: '/pages_chat/outpatient/outpatient',
+      // })
+    if( outPatientList.value.length==0 && stopOutPatientList.value.length==0 ){
+      navTo({
+        url: '/pages_chat/outpatient/outpatient',
+      })
+    }else{
+      senCustomMsg('outpatient');
+    }
+   
+   
+  }else if(type == 'hospital'){
+    senCustomMsg('hospital');
+  }
+}
+/** 发送视频消息（使用相机或者从相册选择） */
+const handleSendVideoMsg = (type: string, event: any) => {
+  if (isTeamMute.value) return
+  stopAllAudio()
+  // 这里做一层拦截的原因是，微信小程序在input聚焦的时候点击+号按钮，会触发此函数执行，阻止冒泡也无法解决该问题，疑为uniapp编译问题
+  if (isWxApp && event?.type == 'blur') {
+    return
+  }
+
+  uni.chooseVideo({
+    sourceType: [type],
+    compressed: true,
+    maxDuration: 60,
+    success: (res) => {
+      const videoMsg = uni.$UIKitNIM.V2NIMMessageCreator.createVideoMessage(
+        res.tempFilePath
+      )
+
+      uni.$UIKitStore.msgStore
+        .sendMessageActive({
+          msg: videoMsg as unknown as V2NIMMessage,
+          conversationId,
+          progress: () => true,
+          sendBefore: () => {
+            scrollBottom()
+          },
+        })
+        .then(() => {
+          scrollBottom()
+        })
+        .catch(() => {
+          scrollBottom()
+          uni.showToast({
+            icon: 'error',
+            title: t('sendVideoFailedText'),
+          })
+        })
+    },
+    /** 没有开启权限时，提示开启权限 */
+    complete: handleNoPermission,
+  })
+}
+
+/** 发送语音消息 */
+const handleSendAudioMsg = (filePath: string, duration: number) => {
+  const audioMsg =
+    uni.$UIKitNIM.V2NIMMessageCreator.createAudioMessage(filePath)
+
+  uni.$UIKitStore.msgStore
+    .sendMessageActive({
+      msg: audioMsg as unknown as V2NIMMessage,
+      conversationId,
+      progress: () => true,
+      sendBefore: (msg) => {
+        scrollBottom()
+        uni.$UIKitStore.msgStore.addMsg(msg.conversationId, [
+          {
+            ...msg,
+            //@ts-ignore
+            attachment: {
+              duration: duration,
+            },
+          },
+        ])
+      },
+    })
+    .then(() => {
+      scrollBottom()
+    })
+    .catch(() => {
+      uni.showToast({
+        icon: 'error',
+        title: t('sendAudioFailedText'),
+      })
+      scrollBottom()
+    })
+}
+
+/** 跳转设置页 */
+const handleSetting = () => {
+  uni.hideKeyboard()
+  if (
+    props.conversationType ===
+    V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P
+  ) {
+    customNavigateTo({
+      url: `/pages/Chat/message/p2p-set?id=${props.to}`,
+    })
+  } else if (
+    props.conversationType ===
+    V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+  ) {
+    customNavigateTo({
+      url: `/pages/Team/team-set/index?id=${props.to}`,
+    })
+  }
+}
+
+let teamWatch = () => {}
+/** 编译到鸿蒙上时，通过isFocus来唤起键盘，会导致input框滚动消失，故鸿蒙不使用isFocus来唤起键盘，由用户手动唤起 */
+const showKeyboard = () => {
+  isFocus.value = true
+}
+
+onMounted(() => {
+  /** 群监听 */
+  teamWatch = autorun(() => {
+    if (
+      props.conversationType ===
+      V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+    ) {
+      //@ts-expect-error
+      const _team: V2NIMTeam = uni.$UIKitStore.teamStore.teams.get(props.to)
+
+      teamMembers.value = uni.$UIKitStore.teamMemberStore.getTeamMember(
+        props.to
+      )
+
+      const myUser = uni.$UIKitStore.userStore.myUserInfo
+      isGroupOwner.value = _team?.ownerAccountId == myUser.accountId
+      isGroupManager.value = teamMembers.value
+        .filter(
+          (item) =>
+            item.memberRole ===
+            V2NIMConst.V2NIMTeamMemberRole.V2NIM_TEAM_MEMBER_ROLE_MANAGER
+        )
+        .some((member) => member.accountId === (myUser ? myUser.accountId : ''))
+      team.value = _team
+      if (_team) {
+        teamMute.value = _team.chatBannedMode
+      }
+      updateTeamMute()
+    }
+  })
+
+  /** 撤回后，重新编辑消息 */
+  uni.$on(events.ON_REEDIT_MSG, (msg: V2NIMMessageForUI) => {
+    const _replyMsg = props.replyMsgsMap?.[msg.messageClientId]
+
+    // 为了解决 1.撤回回复消息A 2.再撤回普通文本消息B 3.重新编辑消息A 4.再重新编辑消息B后 输入框显示A的引用内容，发送后显示A的引用内容的问题
+
+    if (msg.conversationId) {
+      uni.$UIKitStore.msgStore.removeReplyMsgActive(msg.conversationId)
+      isReplyMsg.value = false
+    }
+
+    /** 如果重新编辑的是回复消息，则需要将回复消息展示在输入框上方 */
+    if (_replyMsg?.messageClientId) {
+      _replyMsg && uni.$UIKitStore.msgStore.replyMsgActive(_replyMsg)
+      replyMsg.value = _replyMsg
+      isReplyMsg.value = true
+    }
+
+    /** 如果重新编辑的是@消息，则需要将被@ 的成员重新加入selectedAtMembers */
+    if (msg.serverExtension) {
+      const extObj = JSON.parse(msg.serverExtension)
+      const yxAitMsg = extObj.yxAitMsg
+      if (yxAitMsg) {
+        const _mentionedMembers: MentionedMember[] = []
+        Object.keys(yxAitMsg).forEach((key) => {
+          if (key == AT_ALL_ACCOUNT) {
+            _mentionedMembers.push({
+              accountId: key,
+              appellation: '所有人',
+            })
+          } else {
+            _mentionedMembers.push({
+              accountId: key,
+              appellation: uni.$UIKitStore.uiStore.getAppellation({
+                account: key,
+                teamId: props.to,
+                ignoreAlias: true,
+              }),
+            })
+          }
+        })
+        selectedAtMembers.value = _mentionedMembers
+      }
+    }
+    inputText.value = msg?.oldText || ''
+    if (!isHarmonyOs) {
+      showKeyboard()
+    }
+  })
+
+  uni.$on(events.REPLY_MSG, (msg: V2NIMMessageForUI) => {
+    isReplyMsg.value = true
+    replyMsg.value = msg
+    if (!isHarmonyOs) {
+      showKeyboard()
+    }
+  })
+
+  uni.$on(events.AIT_TEAM_MEMBER, (member: MentionedMember) => {
+    selectedAtMembers.value = [
+      ...selectedAtMembers.value.filter(
+        (item) => item.accountId !== member.accountId
+      ),
+      member,
+    ]
+    const newInputText = inputText.value + '@' + member.appellation + ' '
+    /** 更新input框的内容 */
+    inputText.value = newInputText
+  })
+
+  /** 关闭表情、语音、发送更多面板 */
+  uni.$on(events.CLOSE_PANEL, () => {
+    emojiVisible.value = false
+    extVisible.value = false
+    audioPanelVisible.value = false
+    sendMoreVisible.value = false
+  })
+
+  /** @ 消息 @ 群成员 */
+  uni.$on(events.HANDLE_AIT_MEMBER, (member: MentionedMember) => {
+    handleMentionItemClick(member)
+  })
+
+  /** 关闭@ 群成员面板 */
+  uni.$on(events.CLOSE_AIT_POPUP, () => {
+    closePopup()
+  })
+
+  /** 表情点击 */
+  uni.$on(events.EMOJI_CLICK, (emoji) => {
+    handleEmoji(emoji)
+  })
+
+  /** 表情删除 */
+  uni.$on(events.EMOJI_DELETE, () => {
+    handleEmojiDelete()
+  })
+
+  /** 表情发送 */
+  uni.$on(events.EMOJI_SEND, () => {
+    emojiVisible.value = false
+    extVisible.value = false
+    handleSendTextMsg()
+  })
+
+  if (uni.onKeyboardHeightChange) {
+    uni.onKeyboardHeightChange((res) => {
+      const isAndroidWxapp =
+        uni.getSystemInfoSync().platform == 'android' && isWxApp
+      // 此处是为了点击安卓键盘上的收起按钮时，表情面板需要隐藏
+      if (
+        (res.height === 0 && isAndroidApp) ||
+        (res.height === 0 && isAndroidWxapp)
+      ) {
+        emojiVisible.value = false
+        extVisible.value = false
+      }
+    })
+  }
+})
+
+/** 处理选中的@ 成员 */
+const onAtMembersExtHandler = () => {
+  let ext: YxServerExt
+  if (selectedAtMembers.value.length) {
+    selectedAtMembers.value
+      .filter((member) => {
+        if (!allowAtAll.value && member.accountId === AT_ALL_ACCOUNT) {
+          return false
+        }
+        return true
+      })
+      .forEach((member) => {
+        const substr = `@${member.appellation}`
+        const positions: number[] = []
+        let pos = inputText.value?.indexOf(substr)
+        while (pos !== -1) {
+          positions.push(pos)
+          pos = inputText.value?.indexOf(substr, pos + 1)
+        }
+        if (positions.length) {
+          if (!ext) {
+            ext = {
+              yxAitMsg: {
+                [member.accountId]: {
+                  text: substr,
+                  segments: [],
+                },
+              },
+            }
+          } else {
+            ;(ext.yxAitMsg as YxAitMsg)[member.accountId] = {
+              text: substr,
+              segments: [],
+            }
+          }
+          positions.forEach((position) => {
+            const start = position
+            ;(ext?.yxAitMsg as YxAitMsg)[member.accountId].segments.push({
+              start,
+              end: start + substr.length,
+              broken: false,
+            })
+          })
+        }
+      })
+  }
+  // @ts-ignore
+  return ext
+}
+
+onUnmounted(() => {
+  uni.$off(events.REPLY_MSG)
+  uni.$off(events.ON_REEDIT_MSG)
+  uni.$off(events.REPLY_MSG)
+  uni.$off(events.AIT_TEAM_MEMBER)
+  // 关闭表情面板
+  uni.$off(events.CLOSE_PANEL)
+  // @消息 @群成员
+  uni.$off(events.HANDLE_AIT_MEMBER)
+  // 关闭@群成员面板
+  uni.$off(events.CLOSE_AIT_POPUP)
+  // 表情点击
+  uni.$off(events.EMOJI_CLICK)
+  // 表情删除
+  uni.$off(events.EMOJI_DELETE)
+  // 表情发送
+  uni.$off(events.EMOJI_SEND)
+  removeReplyMsg()
+  teamWatch()
+})
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/common.scss';
+
+.input-root {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  height: auto;
+  max-height: 300px;
+}
+
+.input-root-h5 {
+  height: auto;
+  position: relative;
+  order: 1;
+}
+
+.msg-input-wrapper {
+  width: 100%;
+  height: 100%;
+  background-color: #eff1f3;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  z-index: 999;
+}
+
+.msg-input {
+  overflow-x: hidden;
+  padding: 7px;
+  background-color: #eff1f3;
+
+  &-input {
+    background-color: #fff;
+    height: 40px;
+    font-size: 16px;
+    padding: 0 12px;
+    border-radius: 6px;
+    margin-bottom: 5px;
+
+    &::placeholder {
+      padding: 0 12px;
+    }
+  }
+}
+
+.msg-button-group {
+  padding: 12px 20px 2px 20px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.msg-input-button {
+  flex: 1;
+  // &:not(:last-child) {
+  //   margin-right: 60px;
+  // }
+
+  &.msg-input-loading {
+    animation: loadingCircle 1s infinite linear;
+    z-index: 1;
+    width: 20px;
+    height: 20px;
+    margin-top: 4px;
+
+    .loading {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+
+.msg-ext {
+  overflow-y: auto;
+  width: 100%;
+  height: 300px;
+  background-color: #eff1f3;
+  z-index: 1;
+}
+
+.msg-emoji-panel {
+  overflow-y: auto;
+  width: 100%;
+  height: 246px;
+  background-color: #eff1f3;
+  z-index: 1;
+}
+
+.msg-audio-panel {
+  overflow-y: hidden;
+  width: 100%;
+  height: 300px;
+  background-color: #eff1f3;
+  z-index: 1;
+}
+
+.send-more-panel {
+  padding: 15px;
+  overflow-y: hidden;
+  width: 100%;
+  height: 300px;
+  background-color: #eff1f3;
+  z-index: 1;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+}
+
+.send-more-panel-item-wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  display: inline-block;
+  margin-bottom: 10px;
+  .send-more-panel-item {
+    background-color: #fff;
+    border-radius: 8px;
+    width: 100rpx;
+    height: 100rpx;
+    display: flex;
+    overflow: hidden;
+    align-items: center;
+    margin: 0 15px;
+    justify-content: center;
+    image{
+      width: 100rpx;
+      height: 100rpx;
+      border-radius: 8px;
+    }
+  }
+  .icon-text {
+    font-size: 12px;
+    color: #747475;
+    margin-top: 8px;
+    text-align: center;
+  }
+}
+
+.reply-message-wrapper {
+  display: flex;
+  font-size: 13px;
+  background-color: #eff1f2;
+  height: 25px;
+  padding-top: 6px;
+  align-items: center;
+  color: #929299;
+
+  .reply-noFind {
+    width: fit-content;
+  }
+
+  .reply-to-colon {
+    flex-basis: 3px;
+    margin-right: 2px;
+  }
+
+  .reply-message-close {
+    flex-basis: 14px;
+    margin-left: 10px;
+    display: flex;
+    align-items: center;
+  }
+
+  .reply-message {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    message-one-line {
+      flex: 1;
+      font-size: 13px;
+      width: 100%;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+
+  .reply-title {
+    flex-basis: 30px;
+    white-space: nowrap;
+    margin-right: 5px;
+  }
+
+  .reply-to {
+    max-width: 120px;
+    flex: 0 0 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-size: 13px;
+  }
+}
+
+.input-emoji {
+  background-color: #fff;
+  height: 40px;
+  line-height: 40px;
+  font-size: 16px;
+  padding: 0 12px;
+  border-radius: 6px;
+}
+
+.input-text {
+  white-space: nowrap;
+}
+
+.input-placeholder {
+  background-color: #fff;
+  height: 40px;
+  line-height: 40px;
+  font-size: 16px;
+  padding: 0 12px;
+  border-radius: 6px;
+  color: gray;
+}
+.file-picker-wrapper {
+  position: absolute;
+  width: 60px;
+  height: 60px;
+  z-index: 1;
+  .files-button {
+    width: 60px;
+    height: 60px;
+  }
+}
+
+/* 复制自 groupSend 的遮罩与弹窗样式 */
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 1000;
+}
+
+.center-modal {
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  width: 650rpx;
+  background: #ffffff;
+  border-radius: 16rpx;
+  z-index: 1001;
+  overflow: hidden;
+  box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.15);
+}
+
+.modal-title {
+  text-align: center;
+  font-size: 34rpx;
+  color: #d32f2f;
+  padding: 28rpx 20rpx;
+}
+
+.modal-item {
+  padding: 36rpx 28rpx;
+  font-size: 30rpx;
+  color: #333333;
+  background: #ffffff;
+}
+
+.modal-divider {
+  height: 2rpx;
+  background: #eeeeee;
+}
+</style>
diff --git a/pages_chat/chat/message/message-input.vue b/pages_chat/chat/message/message-input.vue
index 3450919..a951cf0 100644
--- a/pages_chat/chat/message/message-input.vue
+++ b/pages_chat/chat/message/message-input.vue
@@ -361,8 +361,8 @@ const patientListByGBK = async () => {
 	};
 const props = withDefaults(
   defineProps<{
-    conversationType: V2NIMConst.V2NIMConversationType
-    to: string
+    conversationType?: V2NIMConst.V2NIMConversationType
+    to?: string
     isGroupSend?: boolean
     replyMsgsMap?: {
       [key: string]: V2NIMMessageForUI
@@ -371,12 +371,25 @@ const props = withDefaults(
   {}
 )
 const emits = defineEmits(['send'])
-/** 会话ID */
-const conversationId =
-  props.conversationType ===
-  V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P
+/** 会话ID（群发场景可不传 to / conversationType） */
+const getConversationId = () => {
+  if (!props.to || props.conversationType === undefined) return ''
+  return props.conversationType ===
+    V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P
     ? uni.$UIKitNIM.V2NIMConversationIdUtil.p2pConversationId(props.to)
     : uni.$UIKitNIM.V2NIMConversationIdUtil.teamConversationId(props.to)
+}
+const ensureConversationId = () => {
+  const cid = getConversationId()
+  if (!cid) {
+    uni.showToast({
+      title: '会话信息缺失',
+      icon: 'none',
+    })
+    return ''
+  }
+  return cid
+}
 
 /** 输入框内容 */
 const inputText = ref('')
@@ -643,7 +656,7 @@ const handleSendTextMsg = (type:string) => {
   const ext = onAtMembersExtHandler()
    let mallText='纽娃复合营养素固体饮料主要成分是:蜂花粉、乳清蛋白粉、灰树花粉、低聚木糖、蚕蛹氨基酸、麦芽粉、薏苡仁粉、烟酸、磷脂，以及其他调味品、辅助原料。科学配比制成，含有丰富的蛋白质、氨基酸、维生素、微量元素及其他营养元素，点击链接了解详情。'
   let text = type==='mall'?mallText:replaceEmoji(inputText.value)
-  const textMsg = uni.$UIKitNIM.V2NIMMessageCreator.createTextMessage(text)
+  //const textMsg = uni.$UIKitNIM.V2NIMMessageCreator.createTextMessage(text)
  //let serverExtension={"gdxz_nickName":"测试","gdxz_sessionType":"general"};
   if(props.isGroupSend){
     emits('send',{
@@ -655,7 +668,8 @@ const handleSendTextMsg = (type:string) => {
     replyMsg.value = undefined
     selectedAtMembers.value = [];
   }else{
-
+    const conversationId = ensureConversationId()
+    if (!conversationId) return
     uni.$UIKitStore.msgStore
     .sendMessageActive({
       msg: textMsg as unknown as V2NIMMessage,
@@ -696,6 +710,8 @@ const handleSendFileMsg = () => {
       // @ts-ignore
       const fileName = res?.tempFiles?.[0]?.name
       if (filePath && fileName) {
+        const conversationId = ensureConversationId()
+        if (!conversationId) return
         const fileMsg = uni.$UIKitNIM.V2NIMMessageCreator.createFileMessage(
           filePath,
           fileName
@@ -797,9 +813,9 @@ const handleSendImageMsg = () => {
     count: 1,
     sizeType: ['compressed'],
     success: (res) => {
-      const imgMsg = uni.$UIKitNIM.V2NIMMessageCreator.createImageMessage(
-        res.tempFilePaths[0]
-      )
+      // const imgMsg = uni.$UIKitNIM.V2NIMMessageCreator.createImageMessage(
+      //   res.tempFilePaths[0]
+      // )
       if(props.isGroupSend){
         const fileManager = uni.getFileSystemManager();
         fileManager.readFile({
@@ -816,6 +832,8 @@ const handleSendImageMsg = () => {
         }
       })
       }else{
+      const conversationId = ensureConversationId()
+      if (!conversationId) return
       uni.$UIKitStore.msgStore
         .sendMessageActive({
           msg: imgMsg as unknown as V2NIMMessage,
@@ -888,13 +906,15 @@ const senCustomMsg = (type:string) => {
     text="[视频科普]";
     rawStr=`{\"gdxz_content\":${content},\"gdxz_ext_data\":\"[视频科普]\",\"gdxz_id\":${id},\"gdxz_img\":\"http://doc.igandan.org/app/book/pdf/2019/20190613152617.png\",\"gdxz_title\":${title},\"gdxz_type\":\"[视频科普]\",\"gdxz_url\":${path}}`
   }
-  const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(text,rawStr)
+  //const customMsg = uni.$UIKitNIM.V2NIMMessageCreator.createCustomMessage(text,rawStr)
   if(props.isGroupSend){
     emits('send',{
       content:msg_content,
       msg_type:msg_type,
     })
   }else{
+  const conversationId = ensureConversationId()
+  if (!conversationId) return
   uni.$UIKitStore.msgStore
         .sendMessageActive({
           msg: customMsg as unknown as V2NIMMessage,
@@ -959,6 +979,8 @@ const handleSendVideoMsg = (type: string, event: any) => {
     compressed: true,
     maxDuration: 60,
     success: (res) => {
+      const conversationId = ensureConversationId()
+      if (!conversationId) return
       const videoMsg = uni.$UIKitNIM.V2NIMMessageCreator.createVideoMessage(
         res.tempFilePath
       )
@@ -990,6 +1012,8 @@ const handleSendVideoMsg = (type: string, event: any) => {
 
 /** 发送语音消息 */
 const handleSendAudioMsg = (filePath: string, duration: number) => {
+  const conversationId = ensureConversationId()
+  if (!conversationId) return
   const audioMsg =
     uni.$UIKitNIM.V2NIMMessageCreator.createAudioMessage(filePath)
 
diff --git a/pages_chat/editAddress/editAddress.vue b/pages_chat/editAddress/editAddress.vue
index 390d1a0..4f63420 100644
--- a/pages_chat/editAddress/editAddress.vue
+++ b/pages_chat/editAddress/editAddress.vue
@@ -147,7 +147,7 @@ onLoad((options) => {
 
 <style lang="scss" scoped>
 .edit-address-page { min-height: 100vh; background: #fff; }
-.form-container { padding: 24rpx; }
+.form-container { padding: 24rpx;margin-top: calc(var(--status-bar-height) + 44px); }
 
 .form-item { display: flex; align-items: center; justify-content: space-between; padding: 24rpx 0; }
 .form-item.column { flex-direction: column; align-items: flex-start; }
diff --git a/pages_chat/groupMessage/groupMessage.vue b/pages_chat/groupMessage/groupMessage.vue
index 11b877d..1e4969f 100644
--- a/pages_chat/groupMessage/groupMessage.vue
+++ b/pages_chat/groupMessage/groupMessage.vue
@@ -1,7 +1,22 @@
 <template>
 	<view class="page">
 		<!-- 顶部导航 -->
-		<navBar title="群发消息"  />
+		<!-- <navBar title="群发消息"  /> -->
+		<view class="navbox">
+       <view class="status_bar"></view>
+       <uni-nav-bar
+			left-icon="left"
+			title="群发消息"
+			@clickLeft="goBack"
+		
+			color="#8B2316"
+		
+			:border="false"
+			backgroundColor="#eee"
+		>
+			
+		</uni-nav-bar>
+     </view>
 		
 		<!-- 下拉刷新和上拉加载容器 -->
 		<scroll-view 
@@ -32,6 +47,9 @@
 						<view class="line phone" v-if="item.msg_type==1">
 							{{ item.msg_content }}
 						</view>
+						<view class="line phone imgwrap" v-if="item.msg_type==2">
+							<image :src="getMsgImageUrl(item)" class="imgbox" mode="aspectFill" @click="previewMsgImage(item)"></image>
+						</view>
 						<view class="line phone" v-if="item.msg_type==3" @click="onDetail(item)">
 							<view class="custom">
 								<view class="title">{{JSON.parse(item.msg_content).summary }}</view>
@@ -131,7 +149,7 @@
 import { ref, onMounted } from 'vue'
 import navBar from '@/components/navBar/navBar.vue'
 import api from '@/api/api.js'
-import { onShow } from '@dcloudio/uni-app'
+import { onShow,onBackPress,onLoad } from '@dcloudio/uni-app'
 import docUrl from '@/utils/docUrl.js'
 import navTo from '@/utils/navTo.js'
 const currentTime = ref('')
@@ -145,7 +163,25 @@ const refreshing=ref(false);
 const loading=ref(false);
 const hasMore=ref(true);
 const pad = (n) => (n < 10 ? `0${n}` : `${n}`)
-
+const from = ref('');
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
+onBackPress(() => {
+	if(!from.value){
+		plus.runtime.quit();
+		return true;
+	}
+});
+const goBack = () => {
+	if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
+}
 // 格式化时间显示
 const formatTime = (dateStr) => {
 	if (!dateStr) return ''
@@ -231,6 +267,25 @@ const onDetail = (item) => {
 		url: `/pages_app/webview/webview?url=${encodeURIComponent(path)}`,
 	})
 }
+const getMsgImageUrl = (item) => {
+	const content = item?.msg_content || '';
+	if (!content) return '';
+	if (content.startsWith('http://') || content.startsWith('https://') || content.startsWith('data:image')) {
+		return content;
+	}
+	return docUrl + content;
+}
+const previewMsgImage = (item) => {
+	const imageUrl = getMsgImageUrl(item);
+	if (!imageUrl) {
+		uni.showToast({ title: '图片地址无效', icon: 'none' });
+		return;
+	}
+	uni.previewImage({
+		current: imageUrl,
+		urls: [imageUrl]
+	});
+}
 // 上拉加载更多
 const onLoadMore = async () => {
 	if(!hasMore.value || loading.value) return;
@@ -506,4 +561,14 @@ $red: #D32F2F;
 		font-weight: 600;
 	}
 }
+.imgbox{
+	width: 200rpx;
+	height:200rpx;
+}
+.imgwrap{
+	width:100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
 </style>
diff --git a/pages_chat/groupSend/groupSend.vue b/pages_chat/groupSend/groupSend.vue
index 8b1b1cb..b8225de 100644
--- a/pages_chat/groupSend/groupSend.vue
+++ b/pages_chat/groupSend/groupSend.vue
@@ -1,13 +1,15 @@
 <template>
   <view class="page" @touchstart="handleTapContent">
     <!-- 顶部导航 -->
-    <uni-nav-bar
+     <view class="navbox">
+        <view class="status_bar"></view>
+        <uni-nav-bar
 			left-icon="left"
 			title="群发消息"
 			@clickLeft="goBack"
-			fixed
+			
 			color="#8B2316"
-			height="180rpx"
+			
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -17,6 +19,7 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+     </view>
 
     <!-- 警告提示区域 -->
     <view class="warning-section">
@@ -224,6 +227,7 @@ $red: #d32f2f;
   background: #fff8e1;
   border-left: 6rpx solid #ff9800;
   margin: 20rpx 30rpx;
+  margin-top: calc(var(--status-bar-height) + 64px);
   border-radius: 8rpx;
 
   .warning-icon {
diff --git a/pages_chat/note/note.vue b/pages_chat/note/note.vue
index 89229e6..86c7991 100644
--- a/pages_chat/note/note.vue
+++ b/pages_chat/note/note.vue
@@ -179,6 +179,7 @@ const submitInfo = () => {
 /* 主内容区域 */
 .content-area {
   padding: 40rpx 30rpx;
+  margin-top: calc(var(--status-bar-height) + 44px);
   display: flex;
   flex-direction: column;
 }
diff --git a/pages_chat/outManage/outManage.vue b/pages_chat/outManage/outManage.vue
index 40acb2f..2ccad7e 100644
--- a/pages_chat/outManage/outManage.vue
+++ b/pages_chat/outManage/outManage.vue
@@ -342,6 +342,7 @@ const confirmPublish = () => {
 
 /* 主内容区域 */
 .content-area {
+  margin-top: calc(var(--status-bar-height) + 44px);
   padding: 40rpx 30rpx;
 }
 
diff --git a/pages_chat/outPatient/outPatient.vue b/pages_chat/outPatient/outPatient.vue
index 923dd61..245d139 100644
--- a/pages_chat/outPatient/outPatient.vue
+++ b/pages_chat/outPatient/outPatient.vue
@@ -1,13 +1,15 @@
 <template>
   <view class="outpatient-page">
     <!-- 导航栏 -->
-    <uni-nav-bar
+     <view class="navbox">
+       <view class="status_bar"></view>
+       <uni-nav-bar
 			left-icon="left"
 			title="出/停诊公告"
 			@clickLeft="goBack"
-			fixed
+		
 			color="#8B2316"
-			height="180rpx"
+		
 			:border="false"
 			backgroundColor="#eee"
 		>
@@ -18,6 +20,7 @@
 				</view>
 			</template>
 		</uni-nav-bar>
+     </view>
 
     <!-- 标签页 -->
     <view class="tab-container">
@@ -136,10 +139,11 @@
 <script setup>
 import { ref, reactive } from 'vue'
 import api from '@/api/api'
-import {onShow,onUnload,onLoad} from '@dcloudio/uni-app'
+import {onShow,onUnload,onLoad,onBackPress} from '@dcloudio/uni-app'
 import navTo from '@/utils/navTo'
 const page=ref(1);
 // 响应式数据
+const from = ref('');
 const currentTab = ref('suspension')
 const remarks = ref('')
 
@@ -147,6 +151,17 @@ const note = ref('')
 
 const outpatientSchedules = ref([])
 const outPatientList = ref([]);
+onBackPress(() => {
+	if(!from.value){
+		plus.runtime.quit();
+		return true;
+	}
+});
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from;
+	}
+});
 const getListOutPatient = async () => {
   const res = await api.listOutPatient({
     page:page.value,
@@ -225,14 +240,11 @@ const getTypeText = (type) => {
 }
 // 方法
 const goBack = () => {
-  uni.navigateBack({
-    delta: 1,
-    fail() {
-      uni.redirectTo({
-        url: '/pages/index/index'
-      })
-    }
-  })
+  if(!from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
 }
 
 const share = () => {
@@ -248,9 +260,7 @@ const addNew = () => {
     icon: 'none'
   })
 }
-onLoad((options) => {
-  
-})
+
 onShow(() => {
     getStopOutPatientList();
     getListOutPatient();
@@ -490,6 +500,7 @@ const deleteSchedule = async (uuid) => {
 
 /* 标签页样式 */
 .tab-container {
+  margin-top: calc(var(--status-bar-height) + 44px);
   display: flex;
   align-items: center;
   background-color: #fff;
diff --git a/pages_chat/stopPatient/stopPatient.vue b/pages_chat/stopPatient/stopPatient.vue
index be3cfa1..8331916 100644
--- a/pages_chat/stopPatient/stopPatient.vue
+++ b/pages_chat/stopPatient/stopPatient.vue
@@ -110,7 +110,7 @@ const submit = () => {
 
 <style lang="scss" scoped>
 .stop-page { min-height: 100vh; background: #fff; }
-.content-area { padding: 30rpx; }
+.content-area { padding: 30rpx; margin-top: calc(var(--status-bar-height) + 44px);}
 
 .form-section { margin-bottom: 40rpx; }
 .section-head { display: flex; justify-content: space-between; align-items: center; }
diff --git a/static/argee_no.png b/static/argee_no.png
new file mode 100644
index 0000000..34cc2a4
Binary files /dev/null and b/static/argee_no.png differ
diff --git a/static/argee_sure.png b/static/argee_sure.png
new file mode 100644
index 0000000..eebf5ac
Binary files /dev/null and b/static/argee_sure.png differ
diff --git a/static/contact.png b/static/contact.png
new file mode 100644
index 0000000..525d03d
Binary files /dev/null and b/static/contact.png differ
diff --git a/static/reading.png b/static/reading.png
new file mode 100644
index 0000000..b856cf2
Binary files /dev/null and b/static/reading.png differ
diff --git a/utils/request.js b/utils/request.js
index 82b63ce..2c1b21c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -115,14 +115,14 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 				}else if (res.data.code == 200 || res.data.code == 1 || res.data.code == "1" || res.data.code == "200" ){
 					e(res.data)
 				}else if (res.data.code == 401 || res.data.code == 403 || res.data.code ==
-					405 || res.data.code == 406 || res.data.code == 37006) {
+					405 || res.data.code == 406 || res.data.code == 37006 || res.data.code == 35002) {
 						uni.hideLoading();
 						if(process.env.UNI_PLATFORM == "mp-weixin"){
 							uni.redirectTo({url:'/pages_app/login/login'})
 						}
-						// else{
-						// 	uni.navigateTo({url:'/pages_app/login/login'})
-						// }
+						else{
+							uni.navigateTo({url:'/pages_app/login/login'})
+						}
 					 uni.sendNativeEvent('getNewToken', {
 						msg: 'getNewToken'
 					 },ret => {