Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

2025-11-07 17:31:38 +08:00 · 2025-11-07 17:31:38 +08:00 · 3febe161d7
parent 8978e1889a 0d40622e76
commit 3febe161d7
51 changed files with 3519 additions and 2933 deletions
--- a/manifest.json
+++ b/manifest.json
@ -49,7 +49,8 @@
                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "minSdkVersion" : 22
            },
            /* ios打包配置 */
            "ios" : {
--- a/pages/NursingNew/component/equipment.vue
+++ b/pages/NursingNew/component/equipment.vue
@ -918,7 +918,6 @@
 										openchaobiao.value = true
 										emit("canback", true)
 									} else {
-
 										getrulevalue()
 										emit("canback", true)
 									}
@ -1029,13 +1028,15 @@
 	const getrulevalue = () => {
 		rizhivalue.value.pageNo = 1;
 		relrule.value = []
-		ruletarget.value = 0
+		ruletarget.value = 0;
+		ruletype.value = 0;
 		if (typeNow.value == 1) {
 			rizhivalue.value.cid = indexmessage.value.cid;
 			rizhivalue.value.type = dianrizhi.value[0].type;
 			electricityMeterListArray(rizhivalue.value).then((element : any) => {
 				if (element.code == 200) {
 					relrule.value = element.result.records;
+					// console.log("????",relrule.value)
 					openrizhi.value = true
 				}
 			})
@ -1046,6 +1047,7 @@
 			electricityMeterListArray(rizhivalue.value).then((element : any) => {
 				if (element.code == 200) {
 					relrule.value = element.result.records;
+					// console.log("????111",relrule.value)
 					openrizhi.value = true
 				}
 			})
@ -1245,7 +1247,8 @@
 	}

 	const chaobiao = () => {
-		closeall()
+		closeall();
+	
 		if (typeNow.value == 1) {
 			electricityMeteleRead(indexmessage.value.cid, indexmessage.value.address).then((res : any) => {
 				uni.showToast({
--- a/pages/NursingNew/component/nurse/api.js
+++ b/pages/NursingNew/component/nurse/api.js
@ -32,3 +32,68 @@ export const getNcPackagelist = (nuId,customerId) => {
 		method: 'get',
 	})
 }
+
+
+
+
+// 新增服务指令
+export const addDirective = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addDirective`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 新增即时指令
+export const addInstant = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addInstant`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 新增情绪/体型标签
+export const addElderTag = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/addElderTag`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 编排护理流程-删除服务指令
+export const deleteDirective = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/deleteDirective`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 编排护理流程-删除即时服务指令
+export const deleteInstant = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}//nuIpadApi/nuBizNuCustomerServer/deleteInstant`,
+		method: 'post',
+		data: params,
+	})
+}
+
+// 编排护理流程-删除情绪/体型标签
+export const deleteElderTag = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/deleteElderTag`,
+		method: 'post',
+		data: params,
+	})
+}
+// 编排护理流程-修改服务指令
+export const editDirective = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/nuIpadApi/nuBizNuCustomerServer/editDirective`,
+		method: 'post',
+		data: params,
+	})
+}
--- a/pages/NursingNew/component/nurse/index.css
+++ b/pages/NursingNew/component/nurse/index.css
@ -1708,51 +1708,6 @@
 	flex-direction: column;
 	animation: shakesmall 0.8s infinite;
 	background-color: #fff;
-	/* box-shadow: 8rpx 8rpx 16rpx rgba(255, 138, 0, 0.7); */
-}
-
-.title-time-border-pouple-active-transparent {
-	margin: 10rpx;
-	border: 4rpx dashed #7B61FF;
-	/* background: linear-gradient(to bottom, #f1eeff, #e3deff); */
-	width: calc(100% - 40rpx);
-	height: calc(100% - 40rpx);
-	border-radius: 20rpx;
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	opacity: 0.3;
-	background-color: #fff;
-	/* box-shadow: 8rpx 8rpx 16rpx rgba(123, 97, 255, 0.7); */
-}
-
-.title-time-border-pouple {
-	margin: 10rpx;
-	border: 1rpx solid #dae8fa;
-	/* background: linear-gradient(to bottom, #f1eeff, #e3deff); */
-	width: calc(100% - 40rpx);
-	height: calc(100% - 40rpx);
-	border-radius: 20rpx;
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	background-color: #fff;
-	/* box-shadow: 8rpx 8rpx 16rpx rgba(123, 97, 255, 0.7); */
-}
-
-.title-time-border-pouple-active {
-	margin: 10rpx;
-	border: 1rpx solid #dae8fa;
-	background-color: #fff;
-	/* background: linear-gradient(to bottom, #f1eeff, #e3deff); */
-	width: calc(100% - 40rpx);
-	height: calc(100% - 40rpx);
-	border-radius: 20rpx;
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	animation: shakesmall 1s infinite;
-	/* box-shadow: 8rpx 8rpx 16rpx rgba(123, 97, 255, 0.7); */
 }

 .down-icons {
@ -1862,8 +1817,11 @@
 	top: 220rpx;
 	left: -17rpx;
 	width: 60rpx;
-	height: 1210rpx;
+	height: 1000rpx;
 	margin-top: 10rpx;
+	/* background-color: red; */
+	overflow: hidden;
+	z-index: 9999;
 	/* background: linear-gradient(to bottom, #c4dbf4, #c9c2ef, #c6dcf3); */
 	/* border-bottom: 2rpx solid #fff; */
 	/* border-left: 2rpx solid #fff; */
@ -1878,7 +1836,7 @@
 }

 .boom {
-	height: 1270rpx;
+	height: 2500rpx;
 	display: flex;
 	flex-direction: column;
 	/* // justify-content: center; */
@ -2100,8 +2058,8 @@
 	width: 100%;
 	height: 100%;
 	padding: 20rpx;
-	
-	.specia-title{
+
+	.specia-title {
 		width: 100%;
 		height: 100rpx;
 		font-size: 40rpx;
@ -2110,9 +2068,314 @@
 		justify-content: center;
 		align-items: center;
 	}
-	.specia-cards{
+
+	.specia-cards {
 		width: 100%;
 		display: flex;
 		flex-wrap: wrap;
 	}
-}
+}
+
+/* 容器默认隐藏，透明度为 0，不接受点击 */
+.neuro-wrapper {
+	position: fixed;
+	inset: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index: 999;
+	opacity: 0;
+	pointer-events: none;
+	transition: opacity 0.3s ease;
+}
+
+/* 显示时透明度过渡到 1，可接受点击 */
+.neuro-wrapper.is-active {
+	opacity: 1;
+	pointer-events: auto;
+}
+
+/* 遮罩层，半透明黑色 */
+.neuro-mask {
+	position: absolute;
+	inset: 0;
+	background-color: rgba(0, 0, 0, 0.3);
+}
+
+/* 拟态框 固定尺寸 + 阴影样式 + 相对定位于 wrapper */
+.neuro-box {
+	position: relative;
+	width: 600rpx;
+	height: 450rpx;
+	border-radius: 30rpx;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	z-index: 1;
+	padding: 0 5%;
+}
+
+.button {
+	width: 47%;
+	background-color: #ddf0ff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #007CFF;
+	border: 1rpx solid #007CFF;
+	font-size: 25rpx;
+	border-radius: 30rpx;
+}
+
+.title {
+	margin-top: 70rpx;
+	font-size: 33rpx;
+	font-weight: 600;
+}
+
+.card-font {
+	margin-top: 70rpx;
+	width: 600rpx;
+	justify-content: center;
+	display: flex;
+}
+
+.button-white {
+	width: 47%;
+	border: 2rpx solid #c3cacd;
+	background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 25rpx;
+	border-radius: 30rpx;
+}
+
+.delete-button-father {
+	position: absolute;
+	bottom: 60rpx;
+	left: 50%;
+	transform: translateX(-50%);
+	width: 100%;
+	height: 70rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 0 50rpx;
+}
+
+	.right-container-title-nav {
+		margin-top: 60rpx;
+		display: flex;
+		align-items: center;
+		height: 60rpx;
+		position: relative;
+		font-size: 28rpx;
+
+		.new-weight {
+			margin-left: 30rpx;
+			font-weight: 600;
+		}
+
+		.right-icons {
+			position: absolute;
+			right: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			margin-top: -5rpx;
+		}
+	}
+
+	.white-button {
+		width: 160rpx;
+		height: 70rpx;
+		border-radius: 40rpx;
+		background-color: #E6E7EB;
+		margin-left: 20rpx;
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.white-img {
+			width: 35rpx;
+			height: 35rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.left-top {
+		border-top-left-radius: 0 !important;
+	}
+
+	.right-top {
+		border-top-right-radius: 0 !important;
+	}
+
+	.left-bottom {
+		border-bottom-left-radius: 0 !important
+	}
+
+	.right-bottom {
+		border-bottom-right-radius: 0 !important;
+	}
+
+	.mark {
+		font-size: 29rpx;
+		position: relative;
+	}
+
+	.marknone {
+		font-size: 29rpx;
+		color: #999;
+		display: flex;
+		margin-top: 5rpx;
+	}
+
+	.tri-down {
+		width: 0;
+		height: 0;
+		border-left: 10rpx solid transparent;
+		/* s/2 */
+		border-right: 10rpx solid transparent;
+		/* s/2 */
+		border-top: 17.32rpx solid #999;
+		/* 0.866 * s */
+		margin: 0rpx 0rpx 0 15rpx;
+	}
+
+	.mark-bgc {
+		position: absolute;
+		top: 50rpx;
+		left: 0;
+		width: 450rpx;
+		background-color: #fff;
+		z-index: 999;
+		border-radius: 30rpx;
+		padding-bottom: 30rpx;
+		transition: opacity 0.3s ease;
+	}
+
+	.blue-button {
+		margin-top: 60rpx;
+		width: 150rpx;
+		height: 70rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #007CFF;
+		font-size: 30rpx;
+		background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+		border: 2rpx solid #9AD1FF;
+	}
+
+	.firsttarget {
+		--color: #99C9FD;
+		--thick: 2px;
+		--radius: 50rpx;
+		--outline-offset: 10rpx;
+		/* 外扩多少 */
+		/* 内层虚线（你现在用的） */
+		border-radius: var(--radius);
+		/* 内部背景 */
+		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
+		/* 外层虚线：放在 outline（不会影响元素尺寸） */
+		outline: var(--thick) dashed var(--color);
+		outline-offset: var(--outline-offset);
+		/* 保证文本 / 子元素在最上层 */
+		position: relative;
+		z-index: 999;
+	}
+
+	.secondtarget {
+		--color: #99C9FD;
+		--thick: 2px;
+		--radius: 10rpx;
+		--outline-offset: 0rpx;
+		/* 外扩多少 */
+		/* 内层虚线（你现在用的） */
+		border-radius: var(--radius);
+		/* 内部背景 */
+		animation: scalePulse 360ms cubic-bezier(.2, .8, .2, 1);
+		/* 外层虚线：放在 outline（不会影响元素尺寸） */
+		outline: var(--thick) dashed var(--color);
+		outline-offset: var(--outline-offset);
+		/* 保证文本 / 子元素在最上层 */
+		position: relative;
+		z-index: 999;
+	}
+
+	.xian-bian {
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		border-right: 1rpx solid transparent;
+		border-image: repeating-linear-gradient(180deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
+	}
+
+	.pulic-time {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #99C9FD;
+		font-size: 35rpx;
+		font-weight: 600;
+	}
+
+	.zhiling-card {
+		width: calc(100% - 20rpx);
+		height: 200rpx;
+		background-color: rgba(255, 255, 255, 0.3);
+		margin-left: 20rpx;
+		border-radius: 30rpx;
+		border: 2rpx solid rgb(229, 233, 249);
+		position: relative;
+		margin-bottom: 10rpx;
+		padding: 20rpx 30rpx;
+		overflow: hidden;
+
+		.zhiling-card-button {
+			position: absolute;
+			top: 0rpx;
+			right: 0rpx;
+			width: 120rpx;
+			height: 40rpx;
+		}
+
+		.zhiling-card-font {
+			position: absolute;
+			top: 0rpx;
+			right: 0rpx;
+			width: 120rpx;
+			height: 40rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			font-size: 24rpx;
+		}
+
+		.bag {
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 20rpx;
+
+			.bag-one {
+				// margin-right: 10rpx;
+			}
+		}
+	}
+
+	.overlay {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.1);
+		/* 半透明黑色 */
+		z-index: 998;
+	}
--- a/pages/NursingNew/component/nurse/index.vue
+++ b/pages/NursingNew/component/nurse/index.vue
--- a/pages/NursingNew/index.vue
+++ b/pages/NursingNew/index.vue
@ -100,13 +100,14 @@
 		name.value = uni.getStorageSync('realname')

 		getServiceTree().then((res : any) => {
-			//缓存护嘱菜单
+			// console.log("{{{{{}}}}}",res)			//缓存护嘱菜单
 			uni.setStorageSync("saveTree", res)
 		})
 		getNcPackagelist().then((res : any) => {
 			//缓存指令包
+			// console.log("{{{{{}}}}}",res)	
 			uni.setStorageSync("Packagelist", res.result)
-			console.log("????////",res.result)
+			// console.log("????////",res.result)
 		})
 	})

@ -172,14 +173,7 @@
 			), name: '设备'
 		},
 		{
-			url: genPaths(
-				'/static/index/newindex/kufang',
-				'storeroom_',
-				11,    // 张数
-				'png',
-				1,     // 起始索引为 1
-				false  // 不补零
-			), name: '返回'
+			url: [`/static/back.png`], name: '返回'
 		},
 		// {
 		// 	url: genPaths(
@ -192,24 +186,6 @@
 		// 	), name: '返回'
 		// },
 	])
-	const menuArray = ref([
-		{ url: '/static/index/lefticon/index.png', name: '首页' },
-		{ url: '/static/index/lefticon/nurse.png', name: '护嘱' },
-		{ url: '/static/index/lefticon/doctor.png', name: '医嘱' },
-		{ url: '/static/index/lefticon/give.png', name: '请领' },
-		{ url: '/static/index/lefticon/wifi.png', name: '设备' },
-		{ url: '/static/index/lefticon/back.png', name: '返回' }
-	])
-
-	// 初始化左侧菜单列表
-	const iconList = ref<Link[]>([
-		{ url: '/static/index/lefticon/index.png', targetUrl: '/static/index/lefticontarget/blueindex.png' },
-		{ url: '/static/index/lefticon/nurse.png', targetUrl: '/static/index/lefticontarget/bluenurse.png' },
-		{ url: '/static/index/lefticon/doctor.png', targetUrl: '/static/index/lefticontarget/bluedoctor.png' },
-		{ url: '/static/index/lefticon/give.png', targetUrl: '/static/index/lefticontarget/givedark.png' },
-		{ url: '/static/index/lefticon/wifi.png', targetUrl: '/static/index/lefticontarget/bluewifi.png' },
-		{ url: '/static/index/lefticon/back.png', targetUrl: '/static/index/lefticontarget/blueback.png' }
-	]);

 	// 当前选中的菜单索引
 	const menuIndex = ref<number>(-1);
--- a/pages/Warehouse/purchaseorder-备份.vue
+++ b/pages/Warehouse/purchaseorder-备份.vue
--- a/pages/Warehouse/purchaseorder.vue
+++ b/pages/Warehouse/purchaseorder.vue
--- a/pages/timeMatrix/drawer/index.vue
+++ b/pages/timeMatrix/drawer/index.vue
@ -25,6 +25,14 @@
 		}
 	})
 	const ballarray = ref([
+		{
+			name:'返回',
+			url:""
+		},
+		{
+			name:'详情',
+			url:""
+		},
 		{
 			name:'周期',
 			url:""
@ -73,7 +81,7 @@
 			left: 50%;
 			transform: translateX(-50%);
 			width: 100%;
-			height: 400rpx;
+			height: 600rpx;
 			// background-color: red;
 			display: flex;
 			flex-wrap: wrap;
--- a/pages/timeMatrix/drawer/specialDrawer.vue
+++ b/pages/timeMatrix/drawer/specialDrawer.vue
@ -125,8 +125,8 @@
 		position: fixed;
 		bottom: 0;
 		right: 0;
-		height: 40vh;
-		// background: #eff0f4;
+		height: 55vh;
+		// background: red;
 		z-index: 1000;
 		border-top-left-radius: 80rpx;
 		border-bottom-left-radius: 80rpx;
--- a/pages/timeMatrix/indexnew.vue
+++ b/pages/timeMatrix/indexnew.vue
@ -1,40 +1,9 @@
 <template>
 	<view class="doctorsay-container-container">
-		<!-- <view class="doctorsay-container-title">
-			<view class="doctorsay-container-left">
-				<view class="doctorsay-container-left-gun"></view>
-				<view class="doctorsay-container-left-font">时间矩阵</view>
-			</view>
-
-			<view class="doctorsay-container-right">
-				<view class="titlebutton-father">
-					<view v-for="(item,index) in jiajianArray" :key="index">
-						<view class="titlebutton" @click="changeType(index)">
-							{{item}}
-						</view>
-					</view>
-				</view>
-				<view class="titlebutton-father">
-					<view v-for="(item,index) in buttonArray" :key="index">
-						<view :class="getClassItem(index)" @click="changeTarget(index)">
-							{{item}}
-						</view>
-					</view>
-				</view>
-
-				<view class="doctorsay-container-right-kuai-cheng"></view>
-				<view class="doctorsay-container-kuai-font">日常</view>
-				<view class="doctorsay-container-right-kuai-zi"></view>
-				<view class="doctorsay-container-kuai-font">周期</view>
-				<view class="doctorsay-container-juzhen" @click="routerBack">
-					返回
-				</view>
-			</view>
-		</view> -->
 		<view class="super-card">
 			<view class="super-card-container">

-				<scroll-view style="height: 100%;width: 100%;" :scroll-left="scrollLeft" scroll-x
+				<scroll-view style="height: 100%;width: 100%;" :scroll-left="scrollLeft" scroll-x scroll-with-animation
 					:show-scrollbar="false">

 					<view :style="{width:widthType * 24 + `rpx`}" style="display: flex;">
@ -48,7 +17,7 @@
 					<view style="display: flex;height: calc(100% - 80rpx);position: relative;"
 						:style="{width:widthType * 24 + `rpx`}">
 						<view class="xian-bian"></view>
-						<scroll-view scroll-y :show-scrollbar="false" :scroll-top="scrollTop">
+						<scroll-view scroll-y :show-scrollbar="false" :scroll-top="scrollTop" scroll-with-animation>
 							<view style="display: flex;height: 100%;">
 								<view v-for="(item0,index0) in changetimearr" :key="index0">
 									<view class="super-card-time-und" :style="{width:widthType + `rpx`}">
@ -56,9 +25,10 @@
 										<view v-for="(item1,index1) in item0.children" style="width: 100%;"
 											:key="index1">
 											<view :style="{height:heightType + `rpx`}" class="super-card-time-card"
-												@touchend="handleTap(item1,index0,index1)" :data-index0="index0"
+												@click="handleTap(item1,index0,index1)" :data-index0="index0"
 												:data-index1="index1">
-												<view :class="getClass(item1,index0,index1)" :style="scalcType >= 11 && item1.cycleType !== '日常' && item1.startTime  ? { backgroundColor: '#c5e5ff' } : {}"
+												<view :class="getClass(item1,index0,index1)"
+													:style="scalcType >= 11 && item1.cycleType !== '日常' && item1.startTime  ? { backgroundColor: '#c5e5ff' } : {}"
 													style="font-size: 30rpx;position: relative;">
 													<view class="title-time-blue"
 														v-show="clickX == index0 && clickY == index1">
@ -67,7 +37,7 @@
 														style="flex-direction: column;overflow: hidden;">
 														<image v-show="item1.startTime"
 															style="width: 50rpx;height: 50rpx;margin: 0 auto;"
-															:src="item1.netImmediateFile" />
+															:src="item1.netImmediateFile?item1.netImmediateFile:`/static/logo.png`" />
 														<view class="title-time-time" style="font-size: 30rpx;"
 															v-show="scalcType<10">
 															{{item1.startTime + `-` + item1.endTime}}
@ -87,39 +57,11 @@
 														v-show="scalcType<11">
 														{{splitString(item1.directiveName)[0]}}
 													</view>
-													<!-- <view class="title-time" v-if="item1.startTime"
-														style="margin-top: 0rpx;">
-														<view class="title-time-time" style="font-size: 25rpx;"
-															v-show="scalcType<10">
-															{{item1.startTime + `-` + item1.endTime}}
-														</view>
-														<image class="title-time-button" v-show="scalcType<10"
-															:src="item1.cycleType=='日常'?`/static/index/yellowbian.png`:`/static/index/puoplebian.png`" />
-														<view class="title-time-font" v-show="scalcType<10">
-															{{item1.cycleType}}
-														</view>
-													</view> -->
-													<!-- <view v-show="scalcType>=10" style="margin: auto;"
-														:style="{fontSize: cardFont + `rpx`}">
-														{{item1.cycleType}}
+													<view
+														v-if="clickX == index0 && clickY == index1  && !item1.startTime"
+														class="pulic-time">
+														{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
 													</view>
-													<view v-show="scalcType<10"
-														:style="splitString(item1.directiveName)[1] ? {}:{marginTop:`20rpx`}"
-														style="font-weight: 700;font-size: 24rpx;">
-														{{splitString(item1.directiveName)[0]}}
-													</view>
-													<view class="down-icons" v-show="scalcType<10"
-														:style="item1.cycleType!='日常'?{backgroundColor:`rgb(212,203,255)`}:{}"
-														v-if="splitString(item1.directiveName)[1]">
-														<view class=""
-															v-for="(item,index) in splitString(item1.directiveName).slice(1)"
-															:key="index">
-															<view class="icon"
-																:style="item1.cycleType!='日常'?{backgroundColor:`rgb(123,97,255)`}:{}">
-																{{splitString(item1.directiveName)[index + 1]}}
-															</view>
-														</view>
-													</view> -->
 												</view>
 											</view>
 										</view>
@ -140,7 +82,7 @@
 		</specialDrawerVue>
 		<!-- 轮盘 -->
 		<!-- <joystick @movecard="movecard" /> -->
-		<arrowkeys @movecard="movecard" />
+		<!-- <arrowkeys @movecard="movecard" /> -->
 		<!-- 长按的弹出层` -->
 		<!-- <view v-show="isopen" class="popup-overlay" @click="isopen=false"> -->
 		<view class="popup-overlay-content" v-show="isopen"
@ -182,6 +124,9 @@
 	type darkFanstype = {
 		darkFans : boolean
 	}
+	const timeArray = [
+		`00`, `05`, `10`, `15`, `20`, `25`, `30`, `35`, `40`, `45`, `50`, `55`
+	];
 	const buttonArray = ref(["全部", "日常", "周期"]);
 	const jiajianArray = ref(["放大", "缩小"]);
 	const buttonTarget = ref(0);
@ -218,22 +163,36 @@
 	const clickball = (index : number) => {
 		switch (index) {
 			case 0:
-				changeTarget(2)
+				uni.navigateBack()
 				break
 			case 1:
-				changeType(0)
+				if (clickX.value && clickY.value) {
+					if(isopen.value){
+						isopen.value = false
+					}else{
+						rulerTouchClick(changetimearr.value[clickX.value].children[clickY.value], clickX.value, clickY.value)
+					}
+					
+				}
+
 				break
 			case 2:
-				changeTarget(1)
+				changeTarget(2)
 				break
 			case 3:
-				changeType(1)
+				changeType(0)
 				break
 			case 4:
-				changeTarget(0)
+				changeTarget(1)
 				break
 			case 5:
-				if (scalcType.value ===7) {
+				changeType(1)
+				break
+			case 6:
+				changeTarget(0)
+				break
+			case 7:
+				if (scalcType.value === 7) {
 					changeRuler(false)
 				} else {
 					changeRuler(true)
@ -436,7 +395,7 @@
 						widthType.value = 320;
 						heightType.value = 256;
 						break;
-					
+
 				}

 				// 按宽度比例计算期望高度
@ -462,29 +421,23 @@
 	const clickTimer = ref(null)
 	function handleTap(item : any, index0 : number, index1 : number) {
 		const now = Date.now()
+		if(isopen.value){
+			isopen.value = false
+		}
 		// 先清除之前的单击定时器，防止误触
 		if (clickTimer.value != null) {
 			clearTimeout(clickTimer.value)
 		}
 		// 如果两次触摸间隔小于 250ms，则判定双击
 		if (now - lastTap.value < 250) {
-			// message.value = '检测到双击事件'
-			// console.log('双击逻辑执行')
 			if (item.startTime) {
 				closeIsOpen(index0, index1)
 			}

 			lastTap.value = 0  // 重置，避免连续三次触发
 		} else {
-			// 延迟 250ms 执行单击逻辑，以等待可能的第二次触摸
-			// clickTimer.value = setTimeout(() => {
-			// 	rulerTouchClick(item, index0, index1, e)
-			// }, 250)
-			if (item.directiveName) {
-				clickX.value = index0;
-				clickY.value = index1;
-			}
-
+			clickX.value = index0;
+			clickY.value = index1;
 			lastTap.value = now
 		}
 	}
@ -1363,4 +1316,15 @@
 		border-bottom: 1rpx solid transparent;
 		border-image: repeating-linear-gradient(90deg, #A9ACB1 0px, #A9ACB1 6rpx, transparent 6rpx, transparent 12rpx) 1;
 	}
+
+	.pulic-time {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #99C9FD;
+		font-size: 35rpx;
+		font-weight: 600;
+	}
 </style>
--- a/pages/watch/index.vue
+++ b/pages/watch/index.vue
@ -1148,7 +1148,7 @@
 		// console.log("!!!!!!!!!",menuIndex.value,leftTargetIndex.value)
 		queryPadPageList().then((res => {
 			leftMenuArray.value = res.result.records;
-			console.log("queryPadPageList", leftMenuArray.value)
+			// console.log("queryPadPageList", leftMenuArray.value)
 			leftMenuArray.value.forEach((res : any) => {
 				switch (res.areaFlag) {
 					case '1':
--- a/static/back.png
+++ b/static/back.png
--- a/static/more.png
+++ b/static/more.png
--- a/static/shili.png
+++ b/static/shili.png
--- a/unpackage/cache/wgt/UNIFB2D473/app-config-service.js
+++ b/unpackage/cache/wgt/UNIFB2D473/app-config-service.js
--- a/unpackage/cache/wgt/UNIFB2D473/app-service.js
+++ b/unpackage/cache/wgt/UNIFB2D473/app-service.js
--- a/unpackage/cache/wgt/UNIFB2D473/manifest.json
+++ b/unpackage/cache/wgt/UNIFB2D473/manifest.json
@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.7.3","code":173},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"],"packagename":"uni.app.UNIFB2D473","aliasname":"__uni__fb2d473","password":"Z4Urhm9jqwqMGoeQNpGzJA==","storepwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keypwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"plistcmds":["Add :UIFileSharingEnabled bool true"],"devices":"universal"},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"share":{"weixin":{"UniversalLinks":"","appid":"wxda748470da82886e"}}},"debug":true,"syncDebug":true,"orientation":"portrait-primary"},"nativePlugins":{"MonitorModule":{}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.84","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}},"adid":"122926210510"},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.7.3","code":173},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"Camera":{},"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"google":{"abiFilters":["armeabi-v7a","arm64-v8a","x86"],"minSdkVersion":22,"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"],"packagename":"uni.app.UNIFB2D473","aliasname":"__uni__fb2d473","password":"Z4Urhm9jqwqMGoeQNpGzJA==","storepwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keypwd":"Z4Urhm9jqwqMGoeQNpGzJA==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"plistcmds":["Add :UIFileSharingEnabled bool true"],"devices":"universal"},"plugins":{"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}},"share":{"weixin":{"UniversalLinks":"","appid":"wxda748470da82886e"}}},"debug":true,"syncDebug":true,"orientation":"portrait-primary"},"nativePlugins":{"MonitorModule":{}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.85","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}},"adid":"122926210510"},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
--- a/unpackage/cache/wgt/UNIFB2D473/pages/Initialization/index.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/Initialization/index.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/Nursing/index.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/Nursing/index.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/NursingNew/index.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/NursingNew/index.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/camera.js
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/camera.js
--- a/unpackage/cache/wgt/UNIFB2D473/pages/login/login.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/login/login.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/watch/full.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/watch/full.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/watch/index.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/watch/index.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/input.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/input.css
@ -1 +1 @@
-.index-content-other[data-v-87f7dd57]{width:100%;height:100%;transition:opacity 1s ease;position:relative;background-color:#eff0f4}.index-content-down[data-v-87f7dd57]{position:absolute;bottom:1.25rem;left:50%;transform:translate(-50%)}.index-content-right[data-v-87f7dd57]{width:100%;border-radius:1.5625rem;display:flex;align-items:center;padding-top:3.125rem;font-size:1rem;position:relative}.index-content-right .index-content-title[data-v-87f7dd57]{position:absolute;top:1.875rem;left:1.875rem;display:flex;align-items:center}.index-content-right .index-content-title .shu[data-v-87f7dd57]{width:.625rem;height:1.5625rem;background:linear-gradient(to right,#0052c2,#00b4ff);border-radius:.625rem;margin-right:.9375rem}.index-content-right .index-content-title .shu-font[data-v-87f7dd57]{color:#415273;font-size:1.09375rem}.saomiao[data-v-87f7dd57]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;z-index:1}.saomiao .saoma-input[data-v-87f7dd57]{background-color:#fff;width:17.1875rem;height:2.8125rem;border-radius:.9375rem;padding-left:3.125rem;z-index:2}.saomiao .left-img[data-v-87f7dd57]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;left:.9375rem;transform:translateY(-50%);z-index:3}.saomiao .right-img[data-v-87f7dd57]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;right:6.875rem;transform:translateY(-50%);z-index:2}.blue-button[data-v-87f7dd57]{margin-left:.9375rem;width:5.3125rem;height:2.8125rem;border-radius:1.25rem;display:flex;justify-content:center;align-items:center;color:#007cff;font-size:.9375rem;background-color:#ddf0ff;border:.03125rem solid #007CFF}.big-ball[data-v-87f7dd57]{width:6.25rem;height:6.25rem;position:absolute;top:50%;left:-1.71875rem;transform:translateY(-50%);border-radius:50%;background-color:#dbe4f6}.big-ball .ball[data-v-87f7dd57]{width:4.6875rem;height:4.6875rem;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);border-radius:50%;background-color:#cfddf1}.back-img[data-v-87f7dd57]{width:.9375rem;height:.9375rem;margin-left:3.125rem;margin-right:.625rem}.big-bgc[data-v-87f7dd57]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:34.375rem;height:34.375rem}.big-img[data-v-87f7dd57]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:28.125rem;height:28.125rem}
+.index-content-other[data-v-a78aa9a4]{width:100%;height:100%;transition:opacity 1s ease;position:relative;background-color:#eff0f4}.index-content-down[data-v-a78aa9a4]{position:absolute;bottom:1.25rem;left:50%;transform:translate(-50%)}.index-content-right[data-v-a78aa9a4]{width:100%;border-radius:1.5625rem;display:flex;align-items:center;padding-top:3.125rem;font-size:1rem;position:relative}.index-content-right .index-content-title[data-v-a78aa9a4]{position:absolute;top:1.875rem;left:1.875rem;display:flex;align-items:center}.index-content-right .index-content-title .shu[data-v-a78aa9a4]{width:.625rem;height:1.5625rem;background:linear-gradient(to right,#0052c2,#00b4ff);border-radius:.625rem;margin-right:.9375rem}.index-content-right .index-content-title .shu-font[data-v-a78aa9a4]{color:#415273;font-size:1.09375rem}.saomiao[data-v-a78aa9a4]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;z-index:1}.saomiao .saoma-input[data-v-a78aa9a4]{background-color:#fff;width:17.1875rem;height:2.8125rem;border-radius:.9375rem;padding-left:3.125rem;z-index:2}.saomiao .left-img[data-v-a78aa9a4]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;left:.9375rem;transform:translateY(-50%);z-index:3}.saomiao .right-img[data-v-a78aa9a4]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;right:6.875rem;transform:translateY(-50%);z-index:2}.blue-button[data-v-a78aa9a4]{margin-left:.9375rem;width:5.3125rem;height:2.8125rem;border-radius:1.25rem;display:flex;justify-content:center;align-items:center;color:#007cff;font-size:.9375rem;background-color:#ddf0ff;border:.03125rem solid #007CFF}.big-ball[data-v-a78aa9a4]{width:6.25rem;height:6.25rem;position:absolute;top:50%;left:-1.71875rem;transform:translateY(-50%);border-radius:50%;background-color:#dbe4f6}.big-ball .ball[data-v-a78aa9a4]{width:4.6875rem;height:4.6875rem;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);border-radius:50%;background-color:#cfddf1}.back-img[data-v-a78aa9a4]{width:.9375rem;height:.9375rem;margin-left:3.125rem;margin-right:.625rem}.big-bgc[data-v-a78aa9a4]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:34.375rem;height:34.375rem}.big-img[data-v-a78aa9a4]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:28.125rem;height:28.125rem}.card[data-v-a78aa9a4]{width:18.75rem;margin-left:4%;height:14.0625rem;box-shadow:.09375rem .1875rem .375rem .09375rem rgba(206,206,206,.5);background-color:#f4f5f7;border-radius:.9375rem;margin-top:.15625rem;margin-bottom:1.09375rem;padding:0 .78125rem;position:relative;display:flex;justify-content:center;align-items:center;flex-direction:column;overflow:hidden}.card-title[data-v-a78aa9a4]{width:100%;height:4.0625rem;display:flex;align-items:center;justify-content:space-between}.main-title[data-v-a78aa9a4]{display:flex;align-items:center;margin-top:2.1875rem;margin-bottom:.3125rem}.video-father[data-v-a78aa9a4]{width:1.875rem;height:1.875rem;display:flex;justify-content:center;align-items:center;margin-left:.46875rem}.edit-img[data-v-a78aa9a4]{width:1.25rem;height:.9375rem}.play-img[data-v-a78aa9a4]{position:absolute;top:1.5625rem;right:.9375rem;width:4.0625rem;height:1.71875rem;font-size:.8125rem;border-radius:1.09375rem;border:.0625rem solid #999;display:flex;justify-content:center;align-items:center}.card-tags[data-v-a78aa9a4]{position:absolute;top:1.5625rem;left:0;width:6.25rem;height:2.03125rem;font-size:.78125rem;display:flex;justify-content:center;align-items:center}.popup-any[data-v-a78aa9a4]{position:fixed;top:0;right:0;bottom:0;left:0;opacity:0;transition:opacity .5s ease;-webkit-backdrop-filter:blur(.03125rem);backdrop-filter:blur(.03125rem);background-color:rgba(236,237,241,.4);z-index:999}.mask[data-v-a78aa9a4]{position:absolute;top:0;right:0;bottom:0;left:0}.rename-father[data-v-a78aa9a4]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);width:18.75rem;height:14.0625rem;border-radius:.9375rem;box-shadow:.0625rem .125rem .25rem .0625rem rgba(0,0,0,.3);background-color:#fff;display:flex;flex-direction:column;align-items:center;padding:0 .9375rem;z-index:999}.rename-father .rename-title[data-v-a78aa9a4]{width:100%;height:2.5rem;display:flex;justify-content:center;align-items:center;margin-top:.9375rem;margin-bottom:.625rem;font-size:1rem}.rename-father .rename-gray[data-v-a78aa9a4]{width:100%;height:2.5rem;display:flex;color:#a7a7a7;align-items:center}.rename-father .rename-input[data-v-a78aa9a4]{width:100%;height:2.5rem;display:flex;background-color:#f5f6fa;border-radius:.625rem;color:#a7a7a7;align-items:center;padding:0 .625rem;position:relative}.rename-father .rename-input .uni-input[data-v-a78aa9a4]{font-size:.78125rem;width:100%}.rename-father .rename-input .left-img[data-v-a78aa9a4]{width:1.5625rem;height:1.5625rem;margin-right:.46875rem}.rename-father .rename-input .right-img[data-v-a78aa9a4]{position:absolute;right:.9375rem;top:50%;transform:translateY(-50%);width:.9375rem;height:.9375rem}
--- a/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/leida.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/leida.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/saoma.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/saoma.css
--- a/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/settings.css
+++ b/unpackage/cache/wgt/UNIFB2D473/pages/watch/settings/settings.css
--- a/unpackage/cache/wgt/UNIFB2D473/static/ceshi1.png
+++ b/unpackage/cache/wgt/UNIFB2D473/static/ceshi1.png
--- a/unpackage/cache/wgt/UNIFB2D473/static/ceshi3.jpg
+++ b/unpackage/cache/wgt/UNIFB2D473/static/ceshi3.jpg
--- a/unpackage/cache/wgt/UNIFB2D473/static/ceshi3.png
+++ b/unpackage/cache/wgt/UNIFB2D473/static/ceshi3.png
--- a/unpackage/debug/android_debug.apk
+++ b/unpackage/debug/android_debug.apk
--- a/unpackage/dist/build/.nvue/pages/camera.js
+++ b/unpackage/dist/build/.nvue/pages/camera.js
@ -1,6 +1,6 @@
 import { _ as _export_sfc, r as requireNativePlugin, f as formatAppLog } from "../_plugin-vue_export-helper.js";
 import { resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode } from "vue";
-const _style_0 = { "center-column": { "": { "width": 680, "height": 520, "borderRadius": 30, "overflow": "hidden" } } };
+const _style_0 = { "center-column": { "": { "width": 620, "height": 425, "borderRadius": 30, "overflow": "hidden" } } };
 const _sfc_main = {
  data() {
    return {
@ -27,7 +27,6 @@ const _sfc_main = {
    const globalEvent = requireNativePlugin && requireNativePlugin("globalEvent");
    if (globalEvent && globalEvent.addEventListener) {
      globalEvent.addEventListener("myEvent", (e) => {
-        formatAppLog("log", "at pages/camera.nvue:35", e);
        if (e.recordUrl) {
          uni.showToast({
            title: "录屏成功",
@ -44,9 +43,7 @@ const _sfc_main = {
            duration: 1500
          });
        }
-        formatAppLog("log", "at pages/camera.nvue:51", "声音开没开", e.onVolumeChange);
        if (this.suo && e.onVolumeChange) {
-          formatAppLog("log", "at pages/camera.nvue:53", "声音被干掉了", e.onVolumeChange);
          if (e.onVolumeChange) {
            this.toggleVolume();
          }
@ -60,7 +57,6 @@ const _sfc_main = {
      (number) => {
        this.$refs.monitor.initAutoPlay(number);
        uni.setStorageSync("saveinit", number);
-        formatAppLog("log", "at pages/camera.nvue:66", "saveinit", number);
        this.suo = true;
      }
    );
@ -557,12 +553,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
  }, [
    createElementVNode("div", {
      class: "center-column",
-      style: normalizeStyle({ height: $data.isshow ? "520px" : "0px" })
+      style: normalizeStyle({ height: $data.isshow ? "425px" : "0px" })
    }, [
      createVNode(_component_MonitorView, {
        ref: "monitor",
        init: "5",
-        style: { "width": "680px", "height": "520px" },
+        style: { "width": "620px", "height": "425px" },
        onOnTel: $options.handleTelEvent,
        onOnSnapShot: $options.handleSnapShotEvent,
        onOnRecord: $options.handleRecordEvent,
--- a/unpackage/dist/build/app-plus/app-config-service.js
+++ b/unpackage/dist/build/app-plus/app-config-service.js
--- a/unpackage/dist/build/app-plus/app-service.js
+++ b/unpackage/dist/build/app-plus/app-service.js
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
@ -100,7 +100,8 @@
          "armeabi-v7a",
          "arm64-v8a",
          "x86"
-        ]
+        ],
+        "minSdkVersion": 22
      },
      "apple": {
        "dSYMs": false
@ -147,7 +148,7 @@
    "uni-app": {
      "control": "uni-v3",
      "vueVersion": "3",
-      "compilerVersion": "4.84",
+      "compilerVersion": "4.85",
      "nvueCompiler": "uni-app",
      "renderer": "auto",
      "nvue": {
--- a/unpackage/dist/build/app-plus/pages/Initialization/index.css
+++ b/unpackage/dist/build/app-plus/pages/Initialization/index.css
--- a/unpackage/dist/build/app-plus/pages/Nursing/index.css
+++ b/unpackage/dist/build/app-plus/pages/Nursing/index.css
--- a/unpackage/dist/build/app-plus/pages/NursingNew/index.css
+++ b/unpackage/dist/build/app-plus/pages/NursingNew/index.css
--- a/unpackage/dist/build/app-plus/pages/camera.js
+++ b/unpackage/dist/build/app-plus/pages/camera.js
--- a/unpackage/dist/build/app-plus/pages/login/login.css
+++ b/unpackage/dist/build/app-plus/pages/login/login.css
--- a/unpackage/dist/build/app-plus/pages/watch/full.css
+++ b/unpackage/dist/build/app-plus/pages/watch/full.css
--- a/unpackage/dist/build/app-plus/pages/watch/index.css
+++ b/unpackage/dist/build/app-plus/pages/watch/index.css
--- a/unpackage/dist/build/app-plus/pages/watch/settings/input.css
+++ b/unpackage/dist/build/app-plus/pages/watch/settings/input.css
@ -1 +1 @@
-.index-content-other[data-v-87f7dd57]{width:100%;height:100%;transition:opacity 1s ease;position:relative;background-color:#eff0f4}.index-content-down[data-v-87f7dd57]{position:absolute;bottom:1.25rem;left:50%;transform:translate(-50%)}.index-content-right[data-v-87f7dd57]{width:100%;border-radius:1.5625rem;display:flex;align-items:center;padding-top:3.125rem;font-size:1rem;position:relative}.index-content-right .index-content-title[data-v-87f7dd57]{position:absolute;top:1.875rem;left:1.875rem;display:flex;align-items:center}.index-content-right .index-content-title .shu[data-v-87f7dd57]{width:.625rem;height:1.5625rem;background:linear-gradient(to right,#0052c2,#00b4ff);border-radius:.625rem;margin-right:.9375rem}.index-content-right .index-content-title .shu-font[data-v-87f7dd57]{color:#415273;font-size:1.09375rem}.saomiao[data-v-87f7dd57]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;z-index:1}.saomiao .saoma-input[data-v-87f7dd57]{background-color:#fff;width:17.1875rem;height:2.8125rem;border-radius:.9375rem;padding-left:3.125rem;z-index:2}.saomiao .left-img[data-v-87f7dd57]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;left:.9375rem;transform:translateY(-50%);z-index:3}.saomiao .right-img[data-v-87f7dd57]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;right:6.875rem;transform:translateY(-50%);z-index:2}.blue-button[data-v-87f7dd57]{margin-left:.9375rem;width:5.3125rem;height:2.8125rem;border-radius:1.25rem;display:flex;justify-content:center;align-items:center;color:#007cff;font-size:.9375rem;background-color:#ddf0ff;border:.03125rem solid #007CFF}.big-ball[data-v-87f7dd57]{width:6.25rem;height:6.25rem;position:absolute;top:50%;left:-1.71875rem;transform:translateY(-50%);border-radius:50%;background-color:#dbe4f6}.big-ball .ball[data-v-87f7dd57]{width:4.6875rem;height:4.6875rem;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);border-radius:50%;background-color:#cfddf1}.back-img[data-v-87f7dd57]{width:.9375rem;height:.9375rem;margin-left:3.125rem;margin-right:.625rem}.big-bgc[data-v-87f7dd57]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:34.375rem;height:34.375rem}.big-img[data-v-87f7dd57]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:28.125rem;height:28.125rem}
+.index-content-other[data-v-a78aa9a4]{width:100%;height:100%;transition:opacity 1s ease;position:relative;background-color:#eff0f4}.index-content-down[data-v-a78aa9a4]{position:absolute;bottom:1.25rem;left:50%;transform:translate(-50%)}.index-content-right[data-v-a78aa9a4]{width:100%;border-radius:1.5625rem;display:flex;align-items:center;padding-top:3.125rem;font-size:1rem;position:relative}.index-content-right .index-content-title[data-v-a78aa9a4]{position:absolute;top:1.875rem;left:1.875rem;display:flex;align-items:center}.index-content-right .index-content-title .shu[data-v-a78aa9a4]{width:.625rem;height:1.5625rem;background:linear-gradient(to right,#0052c2,#00b4ff);border-radius:.625rem;margin-right:.9375rem}.index-content-right .index-content-title .shu-font[data-v-a78aa9a4]{color:#415273;font-size:1.09375rem}.saomiao[data-v-a78aa9a4]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);display:flex;z-index:1}.saomiao .saoma-input[data-v-a78aa9a4]{background-color:#fff;width:17.1875rem;height:2.8125rem;border-radius:.9375rem;padding-left:3.125rem;z-index:2}.saomiao .left-img[data-v-a78aa9a4]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;left:.9375rem;transform:translateY(-50%);z-index:3}.saomiao .right-img[data-v-a78aa9a4]{width:1.5625rem;height:1.5625rem;position:absolute;top:50%;right:6.875rem;transform:translateY(-50%);z-index:2}.blue-button[data-v-a78aa9a4]{margin-left:.9375rem;width:5.3125rem;height:2.8125rem;border-radius:1.25rem;display:flex;justify-content:center;align-items:center;color:#007cff;font-size:.9375rem;background-color:#ddf0ff;border:.03125rem solid #007CFF}.big-ball[data-v-a78aa9a4]{width:6.25rem;height:6.25rem;position:absolute;top:50%;left:-1.71875rem;transform:translateY(-50%);border-radius:50%;background-color:#dbe4f6}.big-ball .ball[data-v-a78aa9a4]{width:4.6875rem;height:4.6875rem;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);border-radius:50%;background-color:#cfddf1}.back-img[data-v-a78aa9a4]{width:.9375rem;height:.9375rem;margin-left:3.125rem;margin-right:.625rem}.big-bgc[data-v-a78aa9a4]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:34.375rem;height:34.375rem}.big-img[data-v-a78aa9a4]{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);width:28.125rem;height:28.125rem}.card[data-v-a78aa9a4]{width:18.75rem;margin-left:4%;height:14.0625rem;box-shadow:.09375rem .1875rem .375rem .09375rem rgba(206,206,206,.5);background-color:#f4f5f7;border-radius:.9375rem;margin-top:.15625rem;margin-bottom:1.09375rem;padding:0 .78125rem;position:relative;display:flex;justify-content:center;align-items:center;flex-direction:column;overflow:hidden}.card-title[data-v-a78aa9a4]{width:100%;height:4.0625rem;display:flex;align-items:center;justify-content:space-between}.main-title[data-v-a78aa9a4]{display:flex;align-items:center;margin-top:2.1875rem;margin-bottom:.3125rem}.video-father[data-v-a78aa9a4]{width:1.875rem;height:1.875rem;display:flex;justify-content:center;align-items:center;margin-left:.46875rem}.edit-img[data-v-a78aa9a4]{width:1.25rem;height:.9375rem}.play-img[data-v-a78aa9a4]{position:absolute;top:1.5625rem;right:.9375rem;width:4.0625rem;height:1.71875rem;font-size:.8125rem;border-radius:1.09375rem;border:.0625rem solid #999;display:flex;justify-content:center;align-items:center}.card-tags[data-v-a78aa9a4]{position:absolute;top:1.5625rem;left:0;width:6.25rem;height:2.03125rem;font-size:.78125rem;display:flex;justify-content:center;align-items:center}.popup-any[data-v-a78aa9a4]{position:fixed;top:0;right:0;bottom:0;left:0;opacity:0;transition:opacity .5s ease;-webkit-backdrop-filter:blur(.03125rem);backdrop-filter:blur(.03125rem);background-color:rgba(236,237,241,.4);z-index:999}.mask[data-v-a78aa9a4]{position:absolute;top:0;right:0;bottom:0;left:0}.rename-father[data-v-a78aa9a4]{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);width:18.75rem;height:14.0625rem;border-radius:.9375rem;box-shadow:.0625rem .125rem .25rem .0625rem rgba(0,0,0,.3);background-color:#fff;display:flex;flex-direction:column;align-items:center;padding:0 .9375rem;z-index:999}.rename-father .rename-title[data-v-a78aa9a4]{width:100%;height:2.5rem;display:flex;justify-content:center;align-items:center;margin-top:.9375rem;margin-bottom:.625rem;font-size:1rem}.rename-father .rename-gray[data-v-a78aa9a4]{width:100%;height:2.5rem;display:flex;color:#a7a7a7;align-items:center}.rename-father .rename-input[data-v-a78aa9a4]{width:100%;height:2.5rem;display:flex;background-color:#f5f6fa;border-radius:.625rem;color:#a7a7a7;align-items:center;padding:0 .625rem;position:relative}.rename-father .rename-input .uni-input[data-v-a78aa9a4]{font-size:.78125rem;width:100%}.rename-father .rename-input .left-img[data-v-a78aa9a4]{width:1.5625rem;height:1.5625rem;margin-right:.46875rem}.rename-father .rename-input .right-img[data-v-a78aa9a4]{position:absolute;right:.9375rem;top:50%;transform:translateY(-50%);width:.9375rem;height:.9375rem}
--- a/unpackage/dist/build/app-plus/pages/watch/settings/leida.css
+++ b/unpackage/dist/build/app-plus/pages/watch/settings/leida.css
--- a/unpackage/dist/build/app-plus/pages/watch/settings/saoma.css
+++ b/unpackage/dist/build/app-plus/pages/watch/settings/saoma.css
--- a/unpackage/dist/build/app-plus/pages/watch/settings/settings.css
+++ b/unpackage/dist/build/app-plus/pages/watch/settings/settings.css
--- a/unpackage/dist/build/app-plus/static/ceshi1.png
+++ b/unpackage/dist/build/app-plus/static/ceshi1.png
--- a/unpackage/dist/build/app-plus/static/ceshi3.jpg
+++ b/unpackage/dist/build/app-plus/static/ceshi3.jpg
--- a/unpackage/dist/build/app-plus/static/ceshi3.png
+++ b/unpackage/dist/build/app-plus/static/ceshi3.png