重新对接接口

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" : {

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,
+	})
+}

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 {

pages/NursingNew/component/nurse/index.vue

@@ -16,8 +16,8 @@
 						<view style="margin-right: 15rpx;">
 							体型标签:
 						</view>
-
+						<view class="overlay" v-show="openbody" @click="openbody=false"></view>
-						<view class="mark-bgc" v-show="openbody" :style="{opacity:bodydonghua?1:0}">
+						<view class="mark-bgc" v-show="openbody" :style="{opacity:bodydonghua?1:0}" @click.stop>
 							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
 								<view>
 									体型标签
@@ -51,7 +51,8 @@
 					:class="topindex===1&&!bodystatus&&!facestatus?'firsttarget':''">
 					<view class="mark">
 						情绪标签：
-						<view class="mark-bgc" v-show="openface" :style="{opacity:facedonghua?1:0}">
+						<view class="overlay" v-show="openface" @click="openface=false"></view>
+						<view class="mark-bgc" v-show="openface" :style="{opacity:facedonghua?1:0}" @click.stop>
 							<view style="margin-top: 40rpx;margin-bottom: 30rpx;;margin-left: 50rpx;font-size: 32rpx;">
 								<view>
 									情绪标签
@@ -115,7 +116,7 @@
 					</view>
 
 					<view class="super-card-container">
-						<scroll-view style="height: 1330rpx;width: 100%;border: 2rpx solid balck;"
+						<scroll-view style="height: 1330rpx;width: 100%;border: 2rpx solid balck;" scroll-with-animation
 							:scroll-left="cardLeft" scroll-x @scroll="handleTop" :show-scrollbar="false">
 							<view style="display: flex;width:4824rpx;">
 								<view v-for="(item0,index0) in timearr" :key="index0">
@@ -127,7 +128,8 @@
 							<view style="display: flex;height: calc(100% - 330rpx);position: relative;">
 								<view class="xian-bian"></view>
 								<scroll-view style="height: 100%;width:6744rpx;" :scroll-top="scrollTop"
-									:scroll-y="true" @scroll="handleScrolltime" :show-scrollbar="false">
+									scroll-with-animation :scroll-y="true" @scroll="handleScrolltime"
+									:show-scrollbar="false">
 									<view style="display: flex;height: 100%;">
 										<view v-for="(item0,index0) in timearr" :key="index0">
 											<view class="super-card-time-und">
@@ -138,7 +140,6 @@
 														:style="!targetRuler.bordershow && saveRulerTime.index0 === index0 && saveRulerTime.index1 === index1 ? {zIndex:999} : {borderBottom: '1rpx solid transparent'}"
 														:id="`a${index0}_${index1}`" style="position: relative;"
 														@click="rulerTouchClick(item1,index0,index1)"
-														@touchmove="rulerTouchMove" @touchend="rulerTouchEnd()"
 														:data-index0="index0" :data-index1="index1">
 														<view class="time-button-orange-spe"
 															:style="{left:flyNumber.index0?`-130rpx`:`0`}"
@@ -233,7 +234,7 @@
 											</view>
 										</view>
 										<view class="super-end-items-father-close-father" v-show="bottomisShaking"
-											@click.stop="bottomItems.splice(index, 1);saveAll()">
+											@click.stop="bottomItems.splice(index, 1);killjishi(item.id)">
 											-
 										</view>
 									</view>
@@ -377,7 +378,8 @@
 								<image class="white-circle-img"
 									:src="`/static/index/keyimg/notebutton${sayisopen ? 'blue' : ''}.png`" />
 							</view>
-							<view class="white-circle" @click="open = !open;isMove=false;flyNumber.index0 = -1;flyNumber.index1 = -1;">
+							<view class="white-circle"
+								@click="open = !open;isMove=false;flyNumber.index0 = -1;flyNumber.index1 = -1;">
 								<image class="white-circle-img"
 									:src="`/static/index/keyimg/open${open ? 'blue' : ''}.png`" />
 							</view>
@@ -409,7 +411,8 @@
 		</view>
 		<!-- 点击的弹出层 -->
 		<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
-			<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao" v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage=='0'"
+			<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao"
+				v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage=='0'"
 				:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
 				@click.stop>
 				<view class="popup-overlay-content-left">
@@ -435,23 +438,20 @@
 						{{ timearr[showDetail[0]]?.children[showDetail[1]]?.endTime }}
 					</view>
 					<view class="specia-cards" v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList">
-						<view class="title-time-border-yellow" style="font-size: 30rpx;overflow: hidden;width: 230rpx;height: 150rpx;" v-for="(item1,index1) in JSON.parse(timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList)" :key="index1">
+						<view class="title-time-border-yellow"
-						
+							style="font-size: 30rpx;overflow: hidden;width: 232rpx;height: 150rpx;"
-							<view class="title-time" 
+							v-for="(item1,index1) in timearr[showDetail[0]]?.children[showDetail[1]]?.directivesList"
-								
+							:key="index1">
-								style="flex-direction: column;">
+
-								<image 
+							<view class="title-time" style="flex-direction: column;">
-									style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
+								<image style="width: 60rpx;height: 60rpx;margin: 0 auto;margin-top: 10rpx"
 									:src="item1.netImmediateFile" />
 								<view class="title-time-time" style="font-size: 30rpx;">
 									{{item1.serviceDuration + "分钟"}}
 								</view>
-								<image class="title-time-button"
+								<image class="title-time-button" style="width: 80rpx;height: 48rpx;"
-									style="width: 80rpx;height: 48rpx;"
+									v-if="item1.cycleType!='日常'" src="/static/index/newruler/jiao.png" />
-									v-if="item1.cycleType!='日常'"
+								<view class="title-time-font" style="right: 10rpx;top: 5rpx;font-size: 23rpx;"
-									src="/static/index/newruler/jiao.png" />
-								<view class="title-time-font"
-									style="right: 10rpx;top: 5rpx;font-size: 23rpx;"
 									v-if="item1.cycleType!='日常'">
 									{{ item1.cycleType == '1' ? '日常' : item1.cycleType == '2' ? '周期' : '即时' }}
 								</view>
@@ -513,9 +513,9 @@
 							护理流程
 						</view>
 						<view style="margin-top: 30rpx;">
-							护理单元01
+							{{uni.getStorageSync('nuName')}}
 							<text style="color: #1083F8;">
-								王金凤
+								{{uni.getStorageSync('NUall').elderInfo?uni.getStorageSync('NUall').elderInfo.name:""}}
 							</text>
 						</view>
 						<view class="blue-button">
@@ -532,7 +532,7 @@
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps, defineEmits, watch } from 'vue';
 	import { onShow, onHide } from '@dcloudio/uni-app';
 	import type { roomBtttonType } from "./index";
-	import { getNclist, addBatch } from "./api.js";
+	import { getNclist, addBatch, addDirective, addInstant, addElderTag, deleteDirective, deleteInstant, deleteElderTag, editDirective } from "./api.js";
 	import { myArray } from './yaoshandiao.js';
 
 	const props = defineProps({
@@ -766,11 +766,15 @@
 			}, 50)
 		}
 	)
+
 	const bodytarget = ref([]);
 	const facetarget = ref([]);
 	const addbody = (index : number) => {
 		if (bodyTagList.value[index].izSelected == '1') {
-			bodyTagList.value[index].izSelected = '0'
+			// console.log("///",bodyTagList.value[index])
+			// return
+			bodyTagList.value[index].izSelected = '0';
+			
 		} else {
 			let targetNumber = 0;
 			bodyTagList.value.forEach((element : any) => {
@@ -876,17 +880,7 @@
 	// 这是二级菜单的动画的模板
 	const secondtemp = ref([])
 	onMounted(() => {
-		downdonghua.value = 0;
+
-		let goodArray = []
-		myArray.forEach((element : any) => {
-			element.children.forEach((element1 : any) => {
-				goodArray.push({
-					name: element1.title,
-					url: element1.url,
-				})
-			})
-		})
-		secondtemp.value = goodArray
 	})
 	// 上次点击时间
 	const lastTap = ref(0)
@@ -932,7 +926,6 @@
 		// 用 positioning 替换原来的小时部分
 		timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime = positioning + ":" + start.padStart(2, '0'); // "9:20"
 		timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime = positioning + ":" + String(end % 60).padStart(2, '0'); // "9:20"
-		console.log("cccc",timearr.value[indexsave.value[0]].children[indexsave.value[1]])
 		flyNumber.value.index0 = -1;
 		flyNumber.value.index1 = -1;
 		isMove.value = false;
@@ -941,7 +934,17 @@
 			index1: saveEditIndex.value.index1
 		}
 		whereEvent(data);
-		saveAll()
+		// saveAll()
+		let infoValue = timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1]
+		infoValue.positioning = saveEditIndex.value.index0;
+		infoValue.positioningLong = saveEditIndex.value.index1;
+		// console.log("issuccess？",saveEditIndex.value.index0,saveEditIndex.value.index1)
+		editDirective(infoValue).then((res : any) => {
+			if (res.success) {
+				geteverything()
+			}
+
+		})
 	}
 	//变更左侧菜单
 	const changLeft = (index : number) => {
@@ -1006,64 +1009,64 @@
 	const isRule = ref(false);
 	const savemoved = ref(-1);
 	const movecard = (where : number) => {
-		isDelete.value = false;
+		// isDelete.value = false;
-		switch (where) {
+		// switch (where) {
-			case 0:
+		// 	case 0:
-				if (saveEditIndex.value.index1) {
+		// 		if (saveEditIndex.value.index1) {
-					saveEditIndex.value.index1--
+		// 			saveEditIndex.value.index1--
-					centerCell();
+		// 			centerCell();
-					isopen.value = false;
+		// 			isopen.value = false;
-					if (open.value) {
+		// 			if (open.value) {
-						setTimeout(() => {
+		// 				setTimeout(() => {
-							rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
+		// 					rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-						}, 50)
+		// 				}, 50)
-					}
+		// 			}
-				} else {
+		// 		} else {
-					topindex.value = 0
+		// 			topindex.value = 0
-					savemoved.value = saveEditIndex.value.index0
+		// 			savemoved.value = saveEditIndex.value.index0
-					isRule.value = false;
+		// 			isRule.value = false;
-				}
+		// 		}
-				break
+		// 		break
-			case 1:
+		// 	case 1:
-				if (saveEditIndex.value.index0 == 23) {
+		// 		if (saveEditIndex.value.index0 == 23) {
-					return
+		// 			return
-				}
+		// 		}
-				saveEditIndex.value.index0++
+		// 		saveEditIndex.value.index0++
-				centerCell();
+		// 		centerCell();
-				isopen.value = false;
+		// 		isopen.value = false;
-				if (open.value) {
+		// 		if (open.value) {
-					setTimeout(() => {
+		// 			setTimeout(() => {
-						rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
+		// 				rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-					}, 50)
+		// 			}, 50)
-				}
+		// 		}
-				break
+		// 		break
-			case 2:
+		// 	case 2:
-				if (saveEditIndex.value.index1 == 11) {
+		// 		if (saveEditIndex.value.index1 == 11) {
-					return
+		// 			return
-				}
+		// 		}
-				saveEditIndex.value.index1++
+		// 		saveEditIndex.value.index1++
-				centerCell();
+		// 		centerCell();
-				isopen.value = false;
+		// 		isopen.value = false;
-				if (open.value) {
+		// 		if (open.value) {
-					setTimeout(() => {
+		// 			setTimeout(() => {
-						rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
+		// 				rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-					}, 50)
+		// 			}, 50)
-				}
+		// 		}
-				break
+		// 		break
-			case 3:
+		// 	case 3:
-				if (saveEditIndex.value.index0 == 0) {
+		// 		if (saveEditIndex.value.index0 == 0) {
-					return
+		// 			return
-				}
+		// 		}
-				saveEditIndex.value.index0--
+		// 		saveEditIndex.value.index0--
-				centerCell();
+		// 		centerCell();
-				isopen.value = false;
+		// 		isopen.value = false;
-				if (open.value) {
+		// 		if (open.value) {
-					setTimeout(() => {
+		// 			setTimeout(() => {
-						rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
+		// 				rulerTouchClick(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1], saveEditIndex.value.index0, saveEditIndex.value.index1)
-					}, 50)
+		// 			}, 50)
-				}
+		// 		}
-				break
+		// 		break
-		}
+		// }
 	}
 	const topindex = ref(-1)
 	const movetop = (where : number) => {
@@ -1166,11 +1169,9 @@
 	let throttleTimer = null;
 	//监听拖拽
 	const dragOffset = ref(0);
-	const topIn = ref(0)
 	const moveDownNumber = ref(0)
 	function handleScrolltime(e) {
 		let num = e.detail.scrollTop
-		topIn.value = e.detail.scrollTop
 		let formattedNum = parseFloat(num.toFixed(2));
 		moveDownNumber.value = formattedNum
 	}
@@ -1182,35 +1183,6 @@
 	const changeBug = ref(true);
 	// 方法：根据条件返回不同的类名
 	const getClass = (item, index0, index1) => {
-		// if (item.cycleType === '日常') {
-		// 	if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
-		// 		return 'title-time-border-yellow-active-transparent';
-		// 	} else if (shakyTable.value) {
-		// 		return 'title-time-border-yellow-active';
-		// 	} else {
-		// 		return 'title-time-border-yellow';
-		// 	}
-		// } else if (item.cycleType == '周期') {
-		// 	//为啥这么写，是因为动画写行内无效！！！
-		// 	if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
-		// 		return 'title-time-border-pouple-active-transparent';
-		// 	}
-		// 	else if (shakyTable.value) {
-		// 		return 'title-time-border-pouple-active';
-		// 	} else {
-		// 		return 'title-time-border-pouple';
-		// 	}
-			
-		// }else  if(item.cycleType == '打包'){
-		// 	if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
-		// 		return 'title-time-border-yellow-active-transparent';
-		// 	} else if (shakyTable.value) {
-		// 		return 'title-time-border-yellow-active';
-		// 	} else {
-		// 		return 'title-time-border-yellow';
-		// 	}
-			
-		// }
 		if (item.cycleType) {
 			if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
 				return 'title-time-border-yellow-active-transparent';
@@ -1219,7 +1191,7 @@
 			} else {
 				return 'title-time-border-yellow';
 			}
-		} 
+		}
 		return 'title-time-border';
 	}
 	// 通用的生成函数
@@ -1448,38 +1420,21 @@
 					})
 					.exec()
 			}
-		}, 50)
+		}, 400)
 	}
 	const shakyTable = ref(false);
 	const reldata = ref([]);
-	//表格长按开始
-	const rulerTouchMove = (e : any) => {
-		const moveXa = Math.floor(e.touches[0].pageX);
-		const moveYa = Math.floor(e.touches[0].pageY);
-		// 计算移动距离
-		if (
-			Math.abs(moveXa - moveX.value) > 0 ||
-			Math.abs(moveYa - moveY.value) > 0
-		) {
-			// 移动时取消长按计时器
-			if (timer.value) {
-				clearTimeout(timer.value);
-				timer.value = null;
-			}
-		}
-	}
-	//表格长按结束
-	const rulerTouchEnd = () => {
-		isTuoing.value = false;
-		if (timer.value) {
-			clearTimeout(timer.value);
-			timer.value = null;
-		}
-	}
 	const deleteRuler = (index0 : number, index1 : number) => {
-		let tagName = timearr.value[index0].children[index1].tagName
+		// let tagName = timearr.value[index0].children[index1].tagName;
-		timearr.value[index0].children[index1] = { directiveName: "", tagName: tagName };
+
-		saveAll()
+		// timearr.value[index0].children[index1] = { directiveName: "", tagName: tagName };
+		// saveAll()
+		console.log("?????", timearr.value[index0].children[index1].id)
+		deleteDirective({ id: timearr.value[index0].children[index1].id }).then((res : any) => {
+			if (res.success) {
+				geteverything()
+			}
+		})
 	}
 	const longPressTimer = ref(null);
 	const isScrolling = ref(false)
@@ -1610,15 +1565,31 @@
 		}, 1000)
 	}
 
-	onBeforeUnmount(() => {
+	const doaddDirective = (element : any) => {
-		if (animTimer) clearTimeout(animTimer)
+		// console.log("提交了啥", element)
-	})
+		addDirective(element).then((res) => {
+			// console.log("添加后返回了啥1", res)
+			if (res.success) {
+				geteverything()
+			}
+		})
+	}
+
+	const killjishi = (id : string) => {
+		deleteInstant({ id: id }).then((res) => {
+			// console.log("添加后返回了啥1", res)
+			if (res.success) {
+				geteverything()
+			}
+		})
+	}
+
 	const addnew = () => {
-		
+
-		if(iszhiling.value){
+		if (iszhiling.value) {
 			let allobject = savePackagelist.value[forthmenuIndex.value];
-			console.log("special",allobject)
+			// console.log("special",allobject)
-			
+
 			if (saveEditIndex.value.index1 === -1 && saveEditIndex.value.index0 === -1) {
 				return
 			}
@@ -1638,13 +1609,17 @@
 			let cycleValue = "";
 			const startHour = Number(saveEditIndex.value.index0)
 			const startMinute = Number(timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName)
-			const endMinute = startMinute + Number(allobject.totalDuration)
+			const endMinute = startMinute + Number(allobject.serviceDuration)
 			const endHour = startHour + Math.floor(endMinute / 60)
 			const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
 			const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
-			// timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].startTime = formattedStart
+
-			// timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].endTime = formattedEnd
 			let param = {
+				id: "",
+				nuId: uni.getStorageSync('nuId'),
+				nuName: uni.getStorageSync('nuName'),
+				customerId: uni.getStorageSync('customerId'),
+				customerName: uni.getStorageSync('NUall').elderInfo.name,
 				directiveId: allobject.id,
 				directiveName: allobject.packageName,
 				typeId: "",
@@ -1656,20 +1631,17 @@
 				cycleValue: cycleValue,
 				startTime: formattedStart,
 				endTime: formattedEnd,
+				serviceDuration: allobject.serviceDuration,
 				positioning: saveEditIndex.value.index0.toString(),
 				positioningLong: saveEditIndex.value.index1.toString(),
 				izPackage: '1',
 				previewFile: "",
 				previewFileSmall: "",
-				serviceDuration: "",
 				immediateFile: "",
 				immediateFileFocus: "",
 				netImmediateFile: "",
-				tagName: "",
+				tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
-				directivesList:JSON.stringify(allobject.directivesList)
 			}
-			console.log("right",param)
-			
 			//给表格赋值
 			timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
 			let data = {
@@ -1677,18 +1649,17 @@
 				index1: saveEditIndex.value.index1
 			}
 			whereEvent(data);
-			saveAll()
+			// saveAll()
-			
+			doaddDirective(param);
 			return
 		}
-		
+
-		
 		let stopIt = false;
 		let allobject = bigArray.value[upmenuIndex.value].children[downmenuIndex.value].children[thirdmenuIndex.value]
 		if (allobject.cycleType === "即时护理") {
 			scrollLeft.value = 1;
 			bottomItems.value.forEach((element : any, index : number) => {
-				if (element.directiveName === allobject.title) {
+				if (element.directiveName == allobject.title) {
 					stopIt = true
 				}
 			})
@@ -1704,18 +1675,27 @@
 					pushValue.directiveName = allobject.title;
 					pushValue.target = `#03a4ff`
 					pushValue.id = ""
-					bottomItems.value.unshift(pushValue)
+					pushValue.nuId = uni.getStorageSync('nuId'),
+						pushValue.nuName = uni.getStorageSync('nuName'),
+						pushValue.customerId = uni.getStorageSync('customerId'),
+						pushValue.customerName = uni.getStorageSync('NUall').elderInfo.name,
+						bottomItems.value.unshift(pushValue)
 					// 实现即时指令动画
 					cleansettimeout.value = setTimeout(() => {
 						bottomItems.value[0].target = `#fff`;
-						saveAll()
+						// saveAll()
+						addInstant(pushValue).then((res : any) => {
+							if (res.success) {
+								geteverything()
+							}
+						})
 					}, 1500)
 				} else {
 					clearTimeout(cleansettimeoutrel.value);
 					isop.value = true;
 					cleansettimeoutrel.value = setTimeout(() => {
 						isop.value = false;
-						saveAll()
+						// saveAll()
 					}, 1500)
 				}
 			})
@@ -1774,9 +1754,11 @@
 		const endHour = startHour + Math.floor(endMinute / 60)
 		const formattedStart = `${String(startHour)}:${String(startMinute).padStart(2, '0')}`
 		const formattedEnd = `${String(endHour)}:${String(endMinute % 60).padStart(2, '0')}`
-		// timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].startTime = formattedStart
-		// timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].endTime = formattedEnd
 		let param = {
+			nuId: uni.getStorageSync('nuId'),
+			nuName: uni.getStorageSync('nuName'),
+			customerId: uni.getStorageSync('customerId'),
+			customerName: uni.getStorageSync('NUall').elderInfo.name,
 			directiveId: allobject.id,
 			directiveName: allobject.title,
 			typeId: allobject.typeId,
@@ -1806,7 +1788,7 @@
 			index1: saveEditIndex.value.index1
 		}
 		whereEvent(data);
-		saveAll()
+		doaddDirective(param);
 	}
 	const cleansettimeout = ref(null);
 	const cleansettimeoutrel = ref(null);
@@ -1815,21 +1797,21 @@
 			return
 		}
 		//给后端编译一下
-		let postArray = [];
+		// let postArray = [];
-		timearr.value.forEach((element0, index0) => {
+		// timearr.value.forEach((element0, index0) => {
-			element0.children.forEach((element1, index1) => {
+		// 	element0.children.forEach((element1, index1) => {
-				if (!element1.directiveName && !element1.id) {
+		// 		if (!element1.directiveName && !element1.id) {
+
+		// 		} else {
+		// 			element1.positioning = index0;
+		// 			element1.positioningLong = index1;
+		// 			postArray.push(element1)
+		// 		}
+
+		// 	})
+
+		// })
 
-				} else {
-					element1.positioning = index0;
-					element1.positioningLong = index1;
-					postArray.push(element1)
-				}
-				
-			})
-			
-		})
-		console.log("入参111",postArray)
 		let info = []
 
 		bodyTagList.value.forEach((element : any) => {
@@ -1843,21 +1825,21 @@
 			}
 		})
 
-		bottomItems.value.forEach((element : any, index : number) => {
+		// bottomItems.value.forEach((element : any, index : number) => {
-			element.sort = index
+		// 	element.sort = index
-		})
+		// })
 
 		let allvalue = {
 			nuId: uni.getStorageSync('nuId'),
 			nuName: uni.getStorageSync('nuName'),
 			customerId: uni.getStorageSync('customerId'),
 			customerName: uni.getStorageSync('NUall').elderInfo.name,
-			serverList: postArray,
+			// serverList: postArray,
-			instantList: bottomItems.value,
+			// instantList: bottomItems.value,
 			tagList: info
 		}
 
-
+		// console.log("入参", allvalue)
 		addBatch(allvalue).then(() => {
 			geteverything()
 		})
@@ -1919,13 +1901,19 @@
 	const emotionTagList = ref([]);
 	const bodyTagList = ref([]);
 	const geteverything = () => {
-
 		if (uni.getStorageSync('nuId') && uni.getStorageSync('customerId')) {
 			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('customerId')).then((res : any) => {
+				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
+					positioning: hour.toString(),
+					children: minuteArr.map(time => ({
+						tagName: time,           // 表示分钟，如 '00', '05' 等
+						directiveName: '' // 默认的 directiveName
+					}))
+				}))
 				res.result.serviceList.forEach((res : any) => {
 					timearr.value[res.positioning].children[res.positioningLong] = res;
 				})
-				console.log("res", res.result)
+				// console.log("返回了", res.result.serviceList)
 				bottomItems.value = res.result.instantList
 				cansumit.value = true;
 				emotionTagList.value = res.result.emotionTagList;
@@ -1937,6 +1925,7 @@
 					}
 				})
 				bodyTagList.value = res.result.bodyTagList
+				// console.log("zzzz",res.result.bodyTagList)
 				res.result.bodyTagList.forEach((res : any) => {
 					if (res.izSelected == '1') {
 						bodyTagListLook.value.push(res.netPic)
@@ -1948,33 +1937,49 @@
 	}
 	const savePackagelist = ref([]);
 	onMounted(() => {
-		geteverything()
+
-		savePackagelist.value = uni.getStorageSync('Packagelist')
+		savePackagelist.value = uni.getStorageSync('Packagelist') || []
 		let res = uni.getStorageSync('saveTree')
-		res.result.forEach((element : any) => {
+
-			if (element.netFlag == '0') {
+		// console.log("jiance", savePackagelist.value, res)
-				doctorsayList.value.forEach((res : any) => {
+
-					if (res.name == element.title) {
+		let goodArray = []
-						element.url = res.url
+		myArray.forEach((element : any) => {
-					}
+			element.children.forEach((element1 : any) => {
+				goodArray.push({
+					name: element1.title,
+					url: element1.url,
 				})
-			} else {
+			})
-				element.url = element.animationPath
+		})
-			}
+		secondtemp.value = goodArray
-			element.children.forEach((res1 : any) => {
+
-				if (res1.netFlag == '0') {
+		if (res.result) {
-					secondtemp.value.forEach((res2 : any) => {
+			res.result.forEach((element : any) => {
-						if (res2.name == res1.title) {
+				if (element.netFlag == '0') {
-							res1.url = res2.url
+					doctorsayList.value.forEach((res : any) => {
+						if (res.name == element.title) {
+							element.url = res.url
 						}
 					})
 				} else {
-					res1.url = res1.animationPath
+					element.url = element.animationPath
 				}
+				element.children.forEach((res1 : any) => {
+					if (res1.netFlag == '0') {
+						secondtemp.value.forEach((res2 : any) => {
+							if (res2.name == res1.title) {
+								res1.url = res2.url
+							}
+						})
+					} else {
+						res1.url = res1.animationPath
+					}
 
+				})
 			})
-		})
+			bigArray.value = res.result;
-		bigArray.value = res.result;
+		}
 		downList.value = bigArray.value[0].children
 		upmenuIndex.value = -1;
 		downdonghua.value = -1;
@@ -1982,20 +1987,22 @@
 			upmenuIndex.value = 0;
 			downdonghua.value = 0;
 		}, 50)
-		// console.log("结束")
-
-		// })
-
 		uni.$on('where', findback);
+		downdonghua.value = 0;
+		geteverything()
+
+
 	})
 
 	const bodyTagListLook = ref([]);
 	const emotionTagListLook = ref([]);
 	const cansumit = ref(false);
 
-	onHide(() => {
+	onBeforeUnmount(() => {
+		if (animTimer) clearTimeout(animTimer)
 		uni.$off('where', findback);
-	});
+
+	})
 	function findback(data : any) {
 		solveWatch.value = 3;
 		whereEvent(data)
@@ -2297,4 +2304,12 @@
 			}
 		}
 	}
+
+	.overlay {
+		position: fixed;
+		inset: 0;
+		background: rgba(0, 0, 0, 0.1);
+		/* 半透明黑色 */
+		z-index: 998;
+	}
 </style>

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)
 		})
 	})
 

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':

unpackage/cache/wgt/__UNI__FB2D473/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.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"}

unpackage/cache/wgt/__UNI__FB2D473/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}

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,

unpackage/dist/build/app-plus/manifest.json

@@ -100,7 +100,8 @@
           "armeabi-v7a",
           "arm64-v8a",
           "x86"
-        ]
+        ],
+        "minSdkVersion": 22
       },
       "apple": {
         "dSYMs": false

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}