diff --git a/components/dialog/dialog.vue b/components/dialog/dialog.vue
index bb9c07e..36d11fd 100644
--- a/components/dialog/dialog.vue
+++ b/components/dialog/dialog.vue
@@ -42,13 +42,13 @@
@click="oncancel"
>
- 取消
+ {{ cancelText }}
- 确定
+ {{ confirmText }}
diff --git a/pages.json b/pages.json
index 980224a..a3b4eca 100644
--- a/pages.json
+++ b/pages.json
@@ -771,6 +771,16 @@
}
}
},
+ {
+ "path": "caseRecord/caseRecord",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "uni-app分页",
+ "app": {
+ "bounce": "none"
+ }
+ }
+ },
{
"path": "visitPlan/visitPlan",
"style": {
@@ -934,6 +944,17 @@
}
}
},
+ {
+ "path": "selectPatientSingle/selectPatientSingle",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarRightButton":{ "hide": true},
+ "navigationBarTitleText": "uni-app分页",
+ "app": {
+ "bounce": "none"
+ }
+ }
+ },
{
"path": "visitNote/visitNote",
"style": {
@@ -1000,17 +1021,7 @@
// }
// }
// },
- // {
- // "path": "selectPatientSingle/selectPatientSingle",
- // "style": {
- // "navigationStyle": "custom",
- // "navigationBarRightButton":{ "hide": true},
- // "navigationBarTitleText": "uni-app分页",
- // "app": {
- // "bounce": "none"
- // }
- // }
- // },
+
// {
// "path": "patientInfo/patientInfo",
// "style": {
@@ -1114,16 +1125,7 @@
// }
// }
// },
- // {
- // "path": "caseRecord/caseRecord",
- // "style": {
- // "navigationStyle": "custom",
- // "navigationBarTitleText": "uni-app分页",
- // "app": {
- // "bounce": "none"
- // }
- // }
- // },
+
// {
// "path": "searchPatient/searchPatient",
// "style": {
diff --git a/pages_app/caseRecord/caseRecord.vue b/pages_app/caseRecord/caseRecord.vue
index 771e280..ca2e380 100644
--- a/pages_app/caseRecord/caseRecord.vue
+++ b/pages_app/caseRecord/caseRecord.vue
@@ -1,13 +1,13 @@
-
+
+
@@ -16,10 +16,11 @@
修改
- 保存
+ 提交
+
@@ -337,7 +338,16 @@ const saveRecord = () => {
/* 主要内容区域 */
.main-content {
- padding: 0rpx 30rpx;
+ position: fixed;
+ top: calc(var(--status-bar-height) + 44px);
+ left: 0;
+ right: 0;
+ width: 100%;
+ box-sizing: border-box;
+ bottom:150rpx;
+ z-index:1;
+ overflow-y: scroll;
+ padding: 30rpx;
}
.form-item {
diff --git a/pages_app/followDetail/followDetail.vue b/pages_app/followDetail/followDetail.vue
index 22bac60..2ac1595 100644
--- a/pages_app/followDetail/followDetail.vue
+++ b/pages_app/followDetail/followDetail.vue
@@ -15,7 +15,8 @@
-->
-
+
+
患者
{{ patientName }}
@@ -30,6 +31,7 @@
+