diff --git a/manifest.json b/manifest.json index f3ad27e..9686c95 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "护理单元", "appid" : "__UNI__FB2D473", "description" : "护理单元", - "versionName" : "1.5.3", - "versionCode" : 153, + "versionName" : "1.5.4", + "versionCode" : 154, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -95,7 +95,8 @@ } } } - } + }, + "nativePlugins" : {} }, /* 快应用特有相关 */ "quickapp" : {}, diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index bebfbf1..c45c7e8 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -31,7 +31,7 @@ - + 王金福 @@ -39,7 +39,9 @@ + :class="targetIndex===index?'target':''" + :style="targetIndex === index ? { backgroundColor: '#ddf0ff' }: (index === menuIndex ? { backgroundColor: '#fff' } : {})" + @click="changeMenu(index)"> @@ -205,6 +207,16 @@ const secondcurrentIndexup = ref(0); const secondcurrentIndex = ref(0); const thirdcurrentIndex = ref(0); + + function testAsyncFunc(){ + // 获取 module + var testModule = uni.requireNativePlugin("TestModule") + // String deviceId =options.getString("deviceId"); + // String deviceName =options.getString("deviceName"); + var json = { deviceId: '4', deviceName: 'sdfsfsdf' } + // 调用异步方法 + testModule.gotoNativePage(json) + } // 暗黑模式改变 const darkchange = (res : boolean) => { darkFans.value = res @@ -448,29 +460,29 @@ // const isright = ref(false); const targetIndex = ref(0); const propsmove = ref(-1); - + const canback = ref(false); - - const canmoveit = (boolean:boolean) => { + + const canmoveit = (boolean : boolean) => { canback.value = boolean } const movecard = (where : number) => { if (where === 5) { - if(canback.value){ + if (canback.value) { propsmove.value = -1 nextTick(() => propsmove.value = where) return - }else{ - if(!isMain.value){ + } else { + if (!isMain.value) { isMain.value = true; targetIndex.value = menuIndex.value - }else{ + } else { uni.navigateBack() } - + return } - + } if (isMain.value) { diff --git a/pages/timeMatrix/drawer/specialDrawer.vue b/pages/timeMatrix/drawer/specialDrawer.vue index af89009..968dbea 100644 --- a/pages/timeMatrix/drawer/specialDrawer.vue +++ b/pages/timeMatrix/drawer/specialDrawer.vue @@ -4,9 +4,9 @@ - + @@ -41,7 +41,7 @@ // 拖拽状态 const startX = ref(0) - const dragging = ref(false) + const dragging = ref(true) const currentOffset = ref(0) // 计算样式:宽度 + 拖拽或开关 transform @@ -69,7 +69,7 @@ } function closeDrawer() { - isVisible.value = false + isVisible.value = true } function whiteDrawer() { @@ -85,27 +85,27 @@ // 拖拽事件 function onTouchStart(e) { - if (!isVisible.value) return - dragging.value = true - currentOffset.value = 0 - startX.value = e.touches[0].pageX + // if (!isVisible.value) return + // dragging.value = true + // currentOffset.value = 0 + // startX.value = e.touches[0].pageX } function onTouchMove(e) { - if (!dragging.value) return - const delta = e.touches[0].pageX - startX.value - currentOffset.value = delta > 0 ? delta : 0 + // if (!dragging.value) return + // const delta = e.touches[0].pageX - startX.value + // currentOffset.value = delta > 0 ? delta : 0 } function onTouchEnd() { - if (!dragging.value) return - dragging.value = false - const halfPx = screenWidth.value * (props.widNumber / 100) / 2 - if (currentOffset.value > halfPx) { - closeDrawer() - rotate180() - } - currentOffset.value = 0 + // if (!dragging.value) return + // dragging.value = true + // const halfPx = screenWidth.value * (props.widNumber / 100) / 2 + // if (currentOffset.value > halfPx) { + // closeDrawer() + // rotate180() + // } + // currentOffset.value = 0 } // 半圆旋转 @@ -125,7 +125,7 @@ position: fixed; bottom: 0; right: 0; - height: 85vh; + height: 40vh; // background: #eff0f4; z-index: 1000; border-top-left-radius: 80rpx; @@ -143,6 +143,7 @@ position: relative; width: 100%; height: 100%; + z-index: -1; } .drawer-content-circle { diff --git a/pages/timeMatrix/indexnew.vue b/pages/timeMatrix/indexnew.vue index 706d395..78efae0 100644 --- a/pages/timeMatrix/indexnew.vue +++ b/pages/timeMatrix/indexnew.vue @@ -56,11 +56,9 @@ - - - @@ -78,15 +76,15 @@ style="width: 80rpx;height: 48rpx;" v-if="item1.cycleType!='日常'" src="/static/index/newruler/jiao.png" - v-show="scalcType<14" /> + v-show="scalcType<11" /> + v-show="scalcType<11" v-if="item1.cycleType!='日常'"> {{item1.cycleType}} + v-show="scalcType<11"> {{splitString(item1.directiveName)[0]}}