diff --git a/src/doctor/Doctor.vue b/src/doctor/Doctor.vue
index 096dcced7323df1c732befb2798de707f18e89b0..18f22c407b29468cf1560347b6b8068658016f83 100644
--- a/src/doctor/Doctor.vue
+++ b/src/doctor/Doctor.vue
@@ -52,7 +52,7 @@ export default {
if (!token) {
token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') {
- token = 'de42c09b-bcb0-4c21-9c8d-aaca5eff8cbb'
+ token = '210a0035-82a1-4979-a2eb-74130a292a9f'
}
}
if (token) {
diff --git a/src/doctor/followUp/generalFU/form/BaseInfo.vue b/src/doctor/followUp/generalFU/form/BaseInfo.vue
index e8bf6e583ad2adf17fdfd5841b9e45232c4c00bc..a4fcbcb3612ba0ae554c5b090f7c849f774248fd 100644
--- a/src/doctor/followUp/generalFU/form/BaseInfo.vue
+++ b/src/doctor/followUp/generalFU/form/BaseInfo.vue
@@ -2,12 +2,11 @@
<div>
<van-form ref='form'>
<div class='title'>居民信息</div>
- <van-cell-group inset>
<div class='label-title'>证件类型</div>
<van-field
v-model='form.certificateTypeName'
is-link
- disabled
+ readonly
placeholder='证件类型'
class='input-back mt-2 form-input'
:rules='rules.certificateTypeName'
@@ -15,7 +14,7 @@
<div class='label-title mt-5'>证件号码</div>
<van-field
v-model='form.idCard'
- disabled
+ readonly
placeholder='证件号码'
class='input-back mt-2 form-input'
:rules='rules.idCard'
@@ -32,7 +31,7 @@
<van-field
v-model='form.genderName'
is-link
- disabled
+ readonly
placeholder='性别'
class='input-back mt-2 form-input'
:rules='rules.genderName'
@@ -41,7 +40,7 @@
<van-field
v-model='form.dataBirth'
is-link
- disabled
+ readonly
placeholder='出生日期'
class='input-back mt-2 form-input'
:rules='rules.dataBirth'
@@ -67,7 +66,7 @@
<div class='label-title mt-5'>年龄</div>
<van-field
v-model='form.currentAge'
- disabled
+ readonly
placeholder='年龄'
class='input-back mt-2 form-input'
:rules='rules.currentAge'
@@ -207,31 +206,40 @@
</template>
</van-cell>
<van-cell title='死亡' clickable @click="form.lossReason = 3"
- class='input-back mt-2 form-input'>
+ class='input-back mt-2 form-input'
+ :style="{borderRadius: form.lossReason == 3 ? '8px 8px 0px 0px ': '8px'}"
+ >
<template #right-icon>
<van-radio :name='3' />
</template>
</van-cell>
- <van-field
- v-if='form.lossReason == 3'
- v-model='form.deathReason'
- clearable
- placeholder='死亡原因'
- class='input-back mt-2 form-input'
- />
+ <div class='death-r' v-if='form.lossReason == 3'>
+ <van-field
+ v-model='form.deathReason'
+ clearable
+ placeholder='死亡原因'
+ class='input-white form-input'
+ />
+ </div>
+
<van-cell title='其他' clickable @click="form.lossReason = 9"
- class='input-back mt-2 form-input'>
+ class='input-back mt-2 form-input'
+ :style="{borderRadius: form.lossReason == 9 ? '8px 8px 0px 0px ': '8px'}"
+ >
<template #right-icon>
<van-radio :name='9' />
</template>
</van-cell>
- <van-field
- v-if='form.lossReason == 9'
- v-model='form.lossReasonOther'
- clearable
- placeholder='其他原因'
- class='input-back mt-2 form-input'
- />
+ <div class='death-r' v-if='form.lossReason == 9'>
+ <van-field
+ v-if='form.lossReason == 9'
+ v-model='form.lossReasonOther'
+ clearable
+ placeholder='其他原因'
+ class='input-white form-input'
+ />
+ </div>
+
</van-cell-group>
</van-radio-group>
</template>
@@ -439,7 +447,7 @@
</van-radio-group>
</template>
</van-field>
- </van-cell-group>
+
</van-form>
</div>
</template>
@@ -737,6 +745,9 @@ export default {
.input-back {
background: #FAFAFA;
}
+.input-white {
+ background: #FFFFFF;
+}
.tel-back {
background: #F5F5F5;
@@ -744,6 +755,12 @@ export default {
border-radius: 0px 0px 8px 8px;
}
+.death-r{
+ background: #F5F5F5;
+ border-radius: 0px 0px 8px 8px;
+ padding: 8px 12px;
+}
+
.tel {
background: #FFFFFF;
padding: 8px;
@@ -774,4 +791,10 @@ export default {
:deep(.van-cell:after) {
border-bottom: 0px;
}
+:deep(.van-radio__icon--checked.van-radio__icon--dot .van-radio__icon--dot__icon) {
+ background: #FFFFFF;
+}
+:deep(.van-radio__icon--checked.van-radio__icon--dot) {
+ background: var(--van-radio-checked-icon-color);
+}
</style>
\ No newline at end of file
diff --git a/src/doctor/followUp/generalFU/form/CommonBottom.vue b/src/doctor/followUp/generalFU/form/CommonBottom.vue
index a47f2c85739694cf1522e9b504fa389b5f6b14e0..1ebd6cd049d7fca4ed16aeffb4e82a1f74535d91 100644
--- a/src/doctor/followUp/generalFU/form/CommonBottom.vue
+++ b/src/doctor/followUp/generalFU/form/CommonBottom.vue
@@ -1,7 +1,6 @@
<template>
<div>
<van-form ref='form'>
- <van-cell-group inset>
<div class='no-req-label'>随访单位</div>
<van-field
v-model='form.visitUnitName'
@@ -35,7 +34,6 @@
/>
<DocOfficeDoctor v-model:show="show3" v-model:value="form.visitDoctorId" @change="changeDoctor" :unitId="form.visitUnitId" :officeId="form.visitOfficeId"/>
- </van-cell-group>
</van-form>
</div>
</template>
diff --git a/src/doctor/followUp/generalFU/form/GeneralFUForm.vue b/src/doctor/followUp/generalFU/form/GeneralFUForm.vue
index 937933ede286032ac12abbc909b60320c2da63fa..e5237570f58482f0755f11559a7c8d9e68d74be5 100644
--- a/src/doctor/followUp/generalFU/form/GeneralFUForm.vue
+++ b/src/doctor/followUp/generalFU/form/GeneralFUForm.vue
@@ -2,7 +2,6 @@
<div>
<van-form ref='form'>
<div class='title'>随访信息</div>
- <van-cell-group inset>
<div v-if='showOne && firstForm.visitSituation == 1'>
<div class='no-req-label'>随访内容</div>
<van-field
@@ -166,7 +165,6 @@
<van-date-picker @confirm='dataConfirm' @cancel='showDate = false' />
</van-popup>
</div>
- </van-cell-group>
</van-form>
</div>
</template>
diff --git a/src/doctor/resident/form/BaseInfo.vue b/src/doctor/resident/form/BaseInfo.vue
index 8cd0d03c37d53eb898d1139561c4a505a254053d..713a5e4e39808a10eeab5ca6865a25f8c66927f4 100644
--- a/src/doctor/resident/form/BaseInfo.vue
+++ b/src/doctor/resident/form/BaseInfo.vue
@@ -5,7 +5,7 @@
<div class='p-4 h-overflow'>
<van-form ref='form'>
<div class='title'>居民信息</div>
- <van-cell-group inset>
+ <van-cell-group>
<div class='label-title'>证件类型</div>
<van-field
v-model='form.certificateTypeName'
diff --git a/src/utils/common.js b/src/utils/common.js
index 1fad1438910545a5a2556c9e2d3f02269901b170..d866407f05b01144d766bab4ab82e316d2959300 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -233,8 +233,7 @@ export function isWeiXin() {
export function backHome() {
if (isIOSWebKit()) { //ios
console.log('ios')
- // callMobile("closeWebPage", {})
- window.webkit.messageHandlers.closeWebPage.postMessage(null);
+ callMobile("onBack", {})
} else if (isAndroid()) {
console.log('Android')
callMobile("closePage", {})