2022.10.18

pages/detailNursing/detailNursing.vue

@@ -64,19 +64,24 @@
 				</view>
 
 				<view class="line"></view>
-
+				<view class="table-title">
+					<view>护理明细</view>
+					<view>实际时长</view>
+				</view>
 				<view class="content">
 					<view class="content-item" v-for="(item,index) in skuList" :key='item.info.id'>
-						<u-checkbox :disabled="detail.status === 2" v-model="item.isSelect" shape="circle"
-							:name="item.form.name">
+						<u-checkbox class="checkbox" label-size="34" size="36" :disabled="detail.status === 2"
+							v-model="item.isSelect" shape="square" :name="item.form.name"
+							@change="selectPick($event,item)">
 							{{item.info.name}}
 						</u-checkbox>
 						<view class="input">
-							<u-input :disabled="detail.status === 2" v-model="item.form.time" :custom-style="inputStyle"
-								:placeholder="'需 '+item.info.time_lenth" placeholder-style="color:#A7AFBC;"
-								input-align="center" :clearable="false" type="number" height="40">
+							<u-input :disabled="detail.status === 2 || !item.isSelect" v-model="item.form.time"
+								:custom-style="inputStyle" :placeholder="'需 '+ item.info.time_lenth"
+								placeholder-style="color:#A7AFBC;font-size:28rpx;" input-align="center"
+								:clearable="false" type="number" height="46">
 							</u-input>
-							<view>分钟</view>
+							<view style="font-size: 34rpx;">分钟</view>
 						</view>
 					</view>
 				</view>
@@ -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;
 	}
 </style>

pages/home/home.vue

@@ -1,7 +1,7 @@
 <template>
 	<view style="padding-bottom: 10rpx;">
 		<!-- 用户信息 -->
-		<view class="user-info" @click="toSetting">
+		<view class="user-info" :style="{'margin-top':marginTop + 'px'}" @click="toSetting">
 			<view class="head-img">
 				<u-avatar :src="vuex_user.upload.url || (vuex_user.sex === '男' ? vuex_male_img : vuex_female_img)"
 					size="104"></u-avatar>
@@ -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
 		}
 	}
 </script>
@@ -260,7 +266,7 @@
 		display: flex;
 		align-items: center;
 
-		margin-top: 96rpx;
+		//margin-top: 96rpx;
 
 		.head-img {