diff --git a/component/Initialization/settings.vue b/component/Initialization/settings.vue index adcd6e5..2a4a2de 100644 --- a/component/Initialization/settings.vue +++ b/component/Initialization/settings.vue @@ -31,7 +31,8 @@ - + @@ -49,7 +50,7 @@ + :appstoreflag="true" :autocheckupdate="true" @showupdateTips="noNeed"> @@ -76,6 +77,7 @@ import twoseven from '@/pages/login/twoseven.vue' const zyupgrade = ref(null); + const issay = ref(false) const openany = ref(false); const opentype = ref(false); const exitshow = ref(false); @@ -117,36 +119,37 @@ break case 5: + issay.value = true; zyupgrade.value?.check_update() break case 6: openany.value = true; opentype.value = true; animation.value = false; - setTimeout(()=>{ + setTimeout(() => { animation.value = true; - },50) + }, 50) break case 7: openany.value = true; opentype.value = false; animation.value = false; - setTimeout(()=>{ + setTimeout(() => { animation.value = true; - },50) + }, 50) break } } - + const noNeed = () => { - if(props.isShow){ + if (props.isShow && issay.value) { uni.showToast({ - title: '已经是最新版了', - icon: 'none', // 无图标,仅文字 - duration: 2000 // 显示时长,单位毫秒 + title: '已经是最新版了', + icon: 'none', // 无图标,仅文字 + duration: 2000 // 显示时长,单位毫秒 }); } - + } @@ -219,6 +222,7 @@ height: 100rpx; color: #0174D3; } + .popup-any { position: fixed; inset: 0; @@ -229,11 +233,12 @@ transition: opacity 0.5s ease; background-color: rgba(0, 0, 0, 0.3); } + .mask { position: absolute; inset: 0; } - + .box-any { position: absolute; top: 50%; @@ -248,16 +253,17 @@ flex-direction: column; padding: 65rpx 40rpx; } + .title-left { display: flex; align-items: center; - + .back-img { width: 60rpx; height: 60rpx; margin-right: 30rpx; } - + .back-font { font-size: 35rpx; font-weight: 600; diff --git a/component/public/donghua.vue b/component/public/donghua.vue index 7b2a1a0..4b7ca23 100644 --- a/component/public/donghua.vue +++ b/component/public/donghua.vue @@ -23,11 +23,11 @@ }, width: { type: String, - default: '60rpx' + default: '65rpx' }, height: { type: String, - default: '60rpx' + default: '65rpx' }, objectFit: { type: String, diff --git a/component/public/game/joysticknew.vue b/component/public/game/joysticknew.vue index cd546db..1caecf6 100644 --- a/component/public/game/joysticknew.vue +++ b/component/public/game/joysticknew.vue @@ -1,37 +1,64 @@ - - \ No newline at end of file +.move-circle { + position: absolute; + width: 330rpx; + height: 330rpx; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + z-index: 9999; +} +.move-circle-all { + width: 300rpx; + height: 300rpx; +} +.click-box-top { + position: absolute; + top: 0; + left: 100rpx; + width: 130rpx; + height: 120rpx; +} +.click-box-bottom { + position: absolute; + bottom: 0; + left: 100rpx; + width: 130rpx; + height: 120rpx; +} +.click-box-left { + position: absolute; + bottom: 100rpx; + left: 0; + width: 98rpx; + height: 120rpx; +} +.click-box-right { + position: absolute; + bottom: 100rpx; + right: 0; + width: 98rpx; + height: 120rpx; +} + diff --git a/component/public/newgame/arrowkeys.vue b/component/public/newgame/arrowkeys.vue new file mode 100644 index 0000000..7df65c6 --- /dev/null +++ b/component/public/newgame/arrowkeys.vue @@ -0,0 +1,227 @@ + + + + + \ No newline at end of file diff --git a/component/public/newgame/joysticknew.vue b/component/public/newgame/joysticknew.vue index b18bad3..e90e7af 100644 --- a/component/public/newgame/joysticknew.vue +++ b/component/public/newgame/joysticknew.vue @@ -1,94 +1,383 @@ - - \ No newline at end of file diff --git a/component/public/specialDrawer.vue b/component/public/specialDrawer.vue new file mode 100644 index 0000000..78a6a3b --- /dev/null +++ b/component/public/specialDrawer.vue @@ -0,0 +1,172 @@ + + + + + \ No newline at end of file diff --git a/component/rightItemssecondrelnew/index.css b/component/rightItemssecondrelnew/index.css index 7b5d31f..54a9dda 100644 --- a/component/rightItemssecondrelnew/index.css +++ b/component/rightItemssecondrelnew/index.css @@ -194,7 +194,7 @@ margin-top: 10rpx; .white-circle-click { - width: 170rpx; + width: 150rpx; height: 70rpx; } @@ -230,7 +230,7 @@ overflow: hidden; /* 小容器 */ - .bad-circle-up { + /* .bad-circle-up { position: absolute; top: -20rpx; left: 15rpx; @@ -250,7 +250,7 @@ background-color: rgb(229, 233, 249); -webkit-mask-image: radial-gradient(circle farthest-side at 100% 100%, transparent calc(100% - 1px), black 100%); mask-image: radial-gradient(circle farthest-side at 100% 100%, transparent calc(100% - 1px), black 100%); - } + } */ .middle-left-box { margin-left: 10rpx; diff --git a/component/rightItemssecondrelnew/index.vue b/component/rightItemssecondrelnew/index.vue index f7d346e..3305371 100644 --- a/component/rightItemssecondrelnew/index.vue +++ b/component/rightItemssecondrelnew/index.vue @@ -297,10 +297,7 @@ :class="(index === upmenuIndex) ? `doctorsay-container-card-font-dark`:`doctorsay-container-card-font`"> {{ item.name }} - - - - + @@ -308,7 +305,7 @@ 不能重复添加相同的即时服务指令 - + diff --git a/manifest.json b/manifest.json index 36da888..0d48513 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "护理单元", "appid" : "__UNI__FB2D473", "description" : "护理单元", - "versionName" : "1.3.4", - "versionCode" : 134, + "versionName" : "1.4.5", + "versionCode" : 145, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index da43eee..f7c2b7a 100644 --- a/pages.json +++ b/pages.json @@ -10,6 +10,14 @@ } }, + // 测试 + // { + // "path": "pages/ceshi", + // "style": { + // "navigationStyle": "custom" + // } + + // }, { "path": "pages/index/index", "style": { @@ -24,6 +32,14 @@ "navigationStyle": "custom" } + }, + // 监控 + { + "path": "pages/watch/index", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/NursingNew/index", diff --git a/pages/Initialization/index.vue b/pages/Initialization/index.vue index fdc77a0..0a1a156 100644 --- a/pages/Initialization/index.vue +++ b/pages/Initialization/index.vue @@ -28,7 +28,7 @@ - + @@ -61,8 +61,9 @@ { url: '/static/index/relindex/fuwu.png', targetUrl: '/static/index/relindex/fuwublue.png', name: '服务考核', pao: 0 }, { url: '/static/index/relindex/jigou.png', targetUrl: '/static/index/relindex/jigoublue.png', name: '机构功能1', pao: 0 }, { url: '/static/index/relindex/jigou.png', targetUrl: '/static/index/relindex/jigoublue.png', name: '机构功能2', pao: 0 }, - { url: '/static/index/relindex/jigou.png', targetUrl: '/static/index/relindex/jigoublue.png', name: '机构功能3', pao: 0 }, { url: '/static/index/relindex/shezhi.png', targetUrl: '/static/index/relindex/shezhiblue.png', name: '设置', pao: 0 }, + { url: '/static/index/newindex/curve/return_8.png', targetUrl: '/static/index/newindex/curve/return_1.png', name: '返回', pao: 0 }, + // { url: '/static/index/relindex/shezhi.png', targetUrl: '/static/index/relindex/shezhiblue.png', name: '设置', pao: 0 }, ]); const iconTop = ref([ @@ -86,6 +87,9 @@ } // 变更菜单 const changeMenu = (index : number) => { + if(index === 5 ){ + uni.navigateBack() + } menuIndex.value = index; }; const clicktopright = (index : number) => { @@ -127,7 +131,9 @@ } const name = ref(""); // 生命周期钩子 - onLoad(() => { + onLoad((options) => { + console.log("???",options.menu) + options.menu ? menuIndex.value = options.menu : menuIndex.value = 0; name.value = uni.getStorageSync('realname') }); diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index d4d21be..1f32bd4 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -1,5 +1,5 @@