diff --git a/src/apis/carbasics.js b/src/apis/carbasics.js index bbb7f09..1e362bc 100644 --- a/src/apis/carbasics.js +++ b/src/apis/carbasics.js @@ -113,6 +113,7 @@ const install = (Vue, vm) => { vm.$u.api.generalBasic = params => vm.$u.post(`${carbasics}/ocr/general/basic`, params); // 上传文件 vm.$u.api.uploadFile = `${filedeal}/file/upload/multiple`; + // vm.$u.api.uploadFile = `http://101.201.226.163/filedeal/file/upload/multiple`; // 查询我的申请列表; vm.$u.api.queryMyApply = params => vm.$u.post(`${account}/queryMyApply`, params); // 查询部门与职位 diff --git a/src/components/Demonstration/Demonstration.vue b/src/components/Demonstration/Demonstration.vue index dd38815..9cd9a25 100644 --- a/src/components/Demonstration/Demonstration.vue +++ b/src/components/Demonstration/Demonstration.vue @@ -6,7 +6,7 @@ - 填写中 + {{ patientInfo.firstAidType }}
@@ -52,6 +52,7 @@ export default { gender: data.gender, age: data.age, isInfo: true, + firstAidType: data.firstAidType === 0 ? '急救患者' : '出院患者', }; this.setPatientInfo(info); } catch (error) { diff --git a/src/components/PatientList/PatientList.vue b/src/components/PatientList/PatientList.vue index 75c5a76..000ef74 100644 --- a/src/components/PatientList/PatientList.vue +++ b/src/components/PatientList/PatientList.vue @@ -74,7 +74,7 @@ >
- +
@@ -273,6 +273,7 @@ export default { this.setFirstAidId(firstAidId); this.setDetailValueType(demonstrate); // this.$router.push(`/patient-line`); + this.outIndex = -1; uni.navigateTo({ url: `/pages/patientLine/patientLine?caseType=${caseType}` }); } } catch (error) { @@ -398,6 +399,7 @@ export default { // 改变急救类型时,重新查询数据 changeSelect(e) { this.tval = e; + this.outIndex = -1; this.getData(true); }, searchBlur() { @@ -441,7 +443,7 @@ export default { position: absolute; left: 50%; margin-left: -32rpx; - bottom: -18rpx; + bottom: -20rpx; } .tab-text { font-size: 32rpx; @@ -505,21 +507,22 @@ export default { height: 118px; background: #ffffff; box-shadow: 0px 4px 20px 0px rgba(39, 59, 97, 0.08); - border-radius: 24r; + border-radius: 20rpx; + overflow: hidden; opacity: 1; } .add-patient { z-index: 10; border-radius: 50%; - height: 40px; - width: 40px; + height: 108rpx; + width: 108rpx; display: flex; align-items: center; justify-content: center; - background-color: #0284c7; + background: linear-gradient(136deg, #7bc0ff 0%, #4d88ff 100%); position: fixed; - bottom: 100px; - right: 16px; + bottom: 220rpx; + right: 32rpx; } .patient-list { background-color: #fff; diff --git a/src/components/Test/Test.vue b/src/components/Test/Test.vue index 61340d3..2f849d6 100644 --- a/src/components/Test/Test.vue +++ b/src/components/Test/Test.vue @@ -86,11 +86,11 @@
- +
+ {{ radioValue }} - {{ radioValue }}
@@ -139,8 +139,8 @@
- +
- + {{ radioValue.name }}
@@ -208,8 +208,9 @@ :clearable="false" :value="radioValue.value" :type="radioValue.unit ? 'number' : 'text'" - placeholder="请输入症状描述" + :placeholder="radioValue.min && radioValue.max ? `请输入${radioValue.min}-${radioValue.max}` : '请输入'" style="width: 300rpx !important" + :custom-style="{fontSize: '28rpx'}" @click="iptChangeRadio(radioValue.name, listItem.code, index, listIndex)" @blur=" changeRadioScore( @@ -229,6 +230,7 @@ - {{ radioValue.name }} + {{ radioValue.name }}
@@ -955,8 +957,8 @@ export default { color: #3e3d4d; } .ipt-radio view { - height: 40px; - line-height: 40px; + height: 33px; + line-height: 33px; } .list-box { border-radius: 4px; diff --git a/src/components/Test/component/Talk.vue b/src/components/Test/component/Talk.vue index 54baff3..86b7df4 100644 --- a/src/components/Test/component/Talk.vue +++ b/src/components/Test/component/Talk.vue @@ -1,5 +1,5 @@