diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue
index 22f083e..6a69243 100644
--- a/pages/detailNursing/detailNursing.vue
+++ b/pages/detailNursing/detailNursing.vue
@@ -64,19 +64,24 @@
-
+
+ 护理明细
+ 实际时长
+
-
+
{{item.info.name}}
-
+
- 分钟
+ 分钟
@@ -136,7 +141,7 @@
flag: false, //未开始护理时,是否更新过定位(真为更新过定位)
qqmapsdk: null,
inputStyle: {
- fontSize: "24rpx",
+ fontSize: "34rpx",
color: "#36596A",
width: "140rpx",
background: "#F9F9F9"
@@ -174,6 +179,14 @@
});
},
+ selectPick(e, item) {
+ if (e.value) {
+ if (!item.form.time) {
+ item.form.time = item.info.time_lenth
+ }
+ }
+ },
+
async getDeatil(id) {
let res = await this.$u.api.nurseDetail({
id
@@ -668,6 +681,18 @@
margin: 0 auto;
}
+ .table-title {
+ display: flex;
+ justify-content: space-between;
+
+ &>view {
+ text-align: center;
+ width: 260rpx;
+
+ padding-top: 24rpx;
+ }
+ }
+
.content {
padding: 14rpx 20rpx 24rpx 20rpx;
@@ -678,7 +703,22 @@
justify-content: space-between;
align-items: center;
- .checkbox {}
+ padding: 24rpx 0;
+ padding-left: 10rpx;
+
+ .checkbox {
+ flex: 1
+ }
+
+ ::v-deep .u-checkbox {
+ width: 100% !important;
+ }
+
+ ::v-deep .u-checkbox__label {
+ width: 100% !important;
+
+ padding-left: 16rpx;
+ }
.input {
display: flex;
@@ -759,7 +799,7 @@
margin: 46rpx auto;
}
- ::v-deep .u-checkbox__icon-wrap--disabled {
- background: #1d5cba !important;
+ ::v-deep .u-checkbox__icon-wrap--disabled text {
+ color: #1d5cba !important;
}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index da75318..cdd545e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,7 +1,7 @@
-
+
@@ -163,6 +163,7 @@
export default {
data() {
return {
+ marginTop: 96,
swiperIndex: 0,
inputStyle: {
width: "468rpx",
@@ -245,6 +246,11 @@
onShow() {
this.getStatistic()
this.getRemind()
+ },
+ created() {
+ const res = uni.getSystemInfoSync()
+ console.log('sys', res);
+ this.marginTop = res.statusBarHeight + 2
}
}
@@ -260,7 +266,7 @@
display: flex;
align-items: center;
- margin-top: 96rpx;
+ //margin-top: 96rpx;
.head-img {