diff --git a/component/Initialization/fuwu.vue b/component/Initialization/fuwu.vue deleted file mode 100644 index a2714cb..0000000 --- a/component/Initialization/fuwu.vue +++ /dev/null @@ -1,1143 +0,0 @@ - - - - - \ No newline at end of file diff --git a/component/Initialization/index.vue b/component/Initialization/index.vue deleted file mode 100644 index 4c5ed5e..0000000 --- a/component/Initialization/index.vue +++ /dev/null @@ -1,881 +0,0 @@ - - - - - \ No newline at end of file diff --git a/component/public/reset.vue b/component/public/reset.vue index ef285ce..b3354a8 100644 --- a/component/public/reset.vue +++ b/component/public/reset.vue @@ -39,7 +39,7 @@ } from 'vue' import { updatePassword - } from '@/pages/Initialization/api.js' + } from '@/pages/login/api.js' // 接收 show 属性并支持 update:show 事件 const props = defineProps({ diff --git a/component/zy-upgrade/zy-upgrade.vue b/component/zy-upgrade/zy-upgrade.vue index 59f1ae7..6d25a1f 100644 --- a/component/zy-upgrade/zy-upgrade.vue +++ b/component/zy-upgrade/zy-upgrade.vue @@ -227,10 +227,8 @@ plus.runtime.install(res.tempFilePath, { force: false }, function() { - //console.log('install success...'); plus.runtime.restart(); }, function(e) { - console.error('install fail...',JSON.stringify(e)); uni.showToast({ title: '升级失败', icon:'none' @@ -244,7 +242,6 @@ } }, fail:function(e) { - //console.log("下载失败",e) uni.showToast({ title: '下载失败:'+e.errMsg, icon:'none' @@ -255,11 +252,8 @@ } }) this.downloadTask.onProgressUpdate(function(res){ - // console.log("99999",res) that.update_process = res.progress if(res.progress == Infinity){ - //使用size计算 - //console.log("计算size"); let progress = (res.totalBytesWritten / that.size)*100 if(progress>100){ progress = 100 @@ -300,10 +294,8 @@ height: 290rpx; } .zy-upgrade-topbg-blue { - /* background-image: url('static/images/blue.png'); */ background-size: 100% 100%; background-repeat: no-repeat; - /* height: 290rpx; */ } .zy-upgrade-title { font-size: 35rpx; diff --git a/manifest.json b/manifest.json index 21bd300..af52869 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "护理单元", "appid" : "__UNI__FB2D473", "description" : "护理单元", - "versionName" : "1.0.011", - "versionCode" : 10011, + "versionName" : "1.0.012", + "versionCode" : 10012, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 8e5b393..6da5c43 100644 --- a/pages.json +++ b/pages.json @@ -6,21 +6,7 @@ } }, - { - "path": "pages/index/index", - "style": { - "navigationStyle": "custom" - } - }, - // 护理 - { - "path": "pages/Nursing/index", - "style": { - "navigationStyle": "custom" - } - - }, { "path": "pages/watch/index", "style": { @@ -109,31 +95,6 @@ }, - // 仓储 - { - "path": "pages/Warehousing/index", - "style": { - "navigationStyle": "custom" - } - - }, - //初始化 - { - "path": "pages/Initialization/index", - "style": { - "navigationStyle": "custom" - } - - }, - // 服务考核 - { - "path": "pages/assess/index", - "style": { - "navigationStyle": "custom" - } - - }, - // 护理表格预览 { "path": "pages/timeMatrix/index", diff --git a/pages/Initialization/api.js b/pages/Initialization/api.js deleted file mode 100644 index e77f1cf..0000000 --- a/pages/Initialization/api.js +++ /dev/null @@ -1,18 +0,0 @@ -// 引入 request 文件 -import request from '@/request/index.js' - -// 以下 api 为博主项目示例，实际与项目相匹配 - -//修改密码 -export const updatePassword = (form) => { - return request({ - url: `${uni.getStorageSync('serverUrl')}/sys/user/updatePassword`, - method: 'put', - data: { - username: form.username, - oldpassword: form.oldpassword, - password: form.password, - confirmpassword: form.confirmpassword, - } - }) -} \ No newline at end of file diff --git a/pages/Initialization/index.css b/pages/Initialization/index.css deleted file mode 100644 index e69de29..0000000 diff --git a/pages/Initialization/index.ts b/pages/Initialization/index.ts deleted file mode 100644 index 064fa04..0000000 --- a/pages/Initialization/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -export type Link = { - url : string; - targetUrl : string; - name : string; - pao : number; -}; -export type buttonLink = { - url : string; - name : string; -}; -export type iconTopLink = { - url : string; - name : string; -}; \ No newline at end of file diff --git a/pages/Initialization/index.vue b/pages/Initialization/index.vue deleted file mode 100644 index 0a1a156..0000000 --- a/pages/Initialization/index.vue +++ /dev/null @@ -1,324 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/Nursing/index.css b/pages/Nursing/index.css deleted file mode 100644 index e69de29..0000000 diff --git a/pages/Nursing/index.ts b/pages/Nursing/index.ts deleted file mode 100644 index 8260c85..0000000 --- a/pages/Nursing/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export type Link = { - url : string; - targetUrl : string; -}; diff --git a/pages/Nursing/index.vue b/pages/Nursing/index.vue deleted file mode 100644 index 0beec6c..0000000 --- a/pages/Nursing/index.vue +++ /dev/null @@ -1,505 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css index fa06e8c..65483ab 100644 --- a/pages/NursingNew/component/nurse/index.css +++ b/pages/NursingNew/component/nurse/index.css @@ -547,20 +547,13 @@ } .super-card-container { - /* 设置背景图和白色背景 */ - /* background: url("/static/index/whitemountain.png") center/cover, rgba(255, 255, 255, 0.5); */ - /* 使用 screen 混合模式，让图像与白色混合变淡 */ background-blend-mode: screen; isolation: isolate; overflow: hidden; margin-left: 10rpx; width: 1300rpx; height: 1350rpx; - /* border-top-right-radius: 20rpx; - border-bottom-right-radius: 20rpx; */ - /* border: 2rpx solid #fff; */ border-left: 0; - /* box-shadow: 10rpx 10rpx 20px rgba(0, 0, 0, 0.1); */ position: relative; } @@ -987,79 +980,7 @@ } } -.popup-delete { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - display: flex; - justify-content: center; - align-items: center; - backdrop-filter: blur(1rpx); - background-color: rgba(89, 109, 154, 0.4); - /* 添加毛玻璃效果 */ - z-index: 999; - .popup-delete-content { - position: absolute; - right: 750rpx; - display: flex; - flex-direction: column; - align-items: center; - width: 800rpx; - height: 500rpx; - background: url("/static/index/lightbgcnew.png") center/cover, rgba(255, 255, 255, 0.5); - background-blend-mode: screen; - border: 2rpx solid #fff; - /* 使用 screen 混合模式，让图像与白色混合变淡 */ - border-radius: 30rpx; - box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1); - transition: opacity 0.4s ease; - - .popup-delete-img { - width: 250rpx; - height: 230rpx; - margin-top: 40rpx; - margin-bottom: 20rpx; - } - - .popup-delete-text { - font-size: 30rpx; - color: #42474E; - } - - .popup-delete-button { - display: flex; - justify-content: space-around; - height: 90rpx; - margin-top: 30rpx; - - .popup-delete-button-left { - background-color: rgb(2, 171, 254); - width: 200rpx; - height: 80rpx; - border-radius: 40rpx; - display: flex; - justify-content: center; - align-items: center; - color: #fff; - margin: 0 10rpx; - } - - .popup-delete-button-right { - background-color: #ced9e8; - width: 200rpx; - height: 80rpx; - border-radius: 40rpx; - display: flex; - justify-content: center; - align-items: center; - margin: 0 10rpx; - } - } - } -} .popup-overlay { position: fixed; @@ -1164,156 +1085,6 @@ } } -.popup-song { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - display: flex; - justify-content: center; - align-items: center; - backdrop-filter: blur(1rpx); - background-color: rgba(89, 109, 154, 0.4); - /* 添加毛玻璃效果 */ - z-index: 999; - - .popup-song-contain { - position: absolute; - right: 450rpx; - width: 1296rpx; - background: url("/static/index/clearmountain.png") center/cover, rgba(255, 255, 255, 0.7); - /* 使用 screen 混合模式，让图像与白色混合变淡 */ - background-blend-mode: screen; - border: 2rpx solid #fff; - /* 使用 screen 混合模式，让图像与白色混合变淡 */ - background-blend-mode: screen; - border-radius: 40rpx; - box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.1); - opacity: 0; - transition: opacity 0.4s ease; - - .shu-container-left { - display: flex; - margin-top: 70rpx; - margin-bottom: 20rpx; - - .shu-container-left-gun { - margin-top: 5rpx; - margin-left: 40rpx; - margin-right: 20rpx; - width: 13rpx; - height: 35rpx; - background: linear-gradient(to bottom, #04BCED, #0160CE); - border-radius: 10rpx; - } - - .shu-container-left-font { - font-size: 35rpx; - font-weight: 700; - } - } - } -} - -.popup-song-father { - position: relative; - - .shu-up-img { - position: absolute; - top: -70rpx; - left: 305rpx; - width: 700rpx; - height: 80rpx; - } - - .shu-up-font { - position: absolute; - top: -50rpx; - left: 390rpx; - display: flex; - color: rgb(255, 90, 0); - } - - .arrayindex { - display: flex; - flex-wrap: wrap; - width: 100%; - // height: 200rpx; - margin-left: 30rpx; - margin-right: 30rpx; - margin-bottom: 60rpx; - - .arrayindex-one { - width: 285rpx; - height: 100rpx; - margin-left: 20rpx; - margin-top: 20rpx; - background-color: rgb(241, 245, 252); - border-radius: 20rpx; - border: 1rpx solid rgb(109, 131, 179); - display: flex; - justify-content: center; - align-items: center; - font-size: 29rpx; - } - - .arrayindex-one-target { - width: 285rpx; - height: 100rpx; - margin-left: 20rpx; - margin-top: 20rpx; - background: linear-gradient(to right, #00c9ff, #0076ff); - color: #fff; - border-radius: 20rpx; - border: 1rpx solid rgb(2, 171, 254); - display: flex; - justify-content: center; - align-items: center; - font-size: 29rpx; - } - } - - .secondarrayindex { - display: flex; - flex-wrap: wrap; - width: 100%; - // height: 200rpx; - margin-left: 30rpx; - margin-right: 30rpx; - margin-bottom: 60rpx; - - .arrayindex-one { - width: 380rpx; - height: 100rpx; - margin-left: 20rpx; - margin-top: 20rpx; - background-color: rgb(241, 245, 252); - border-radius: 20rpx; - border: 1rpx solid rgb(109, 131, 179); - display: flex; - justify-content: center; - align-items: center; - font-size: 29rpx; - } - - .arrayindex-one-target { - width: 380rpx; - height: 100rpx; - margin-left: 20rpx; - margin-top: 20rpx; - background: linear-gradient(to right, #00c9ff, #0076ff); - color: #fff; - border-radius: 20rpx; - border: 1rpx solid rgb(2, 171, 254); - display: flex; - justify-content: center; - align-items: center; - font-size: 29rpx; - } - } -} - .ri-img { position: absolute; top: -4rpx; @@ -1890,18 +1661,12 @@ .popup-share-content { position: absolute; - /* right: 515rpx; */ display: flex; flex-direction: column; width: 800rpx; height: 450rpx; background-color: #fff; - /* background: url("/static/index/lightbgcnew.png") center/cover, rgba(255, 255, 255, 0.7); - background-blend-mode: screen; */ - /* border: 2rpx solid #fff; */ - /* 使用 screen 混合模式，让图像与白色混合变淡 */ border-radius: 30rpx; - /* box-shadow: 10rpx 10rpx 20rpx rgba(0, 0, 0, 0.1); */ transition: opacity 0.4s ease; .popup-share-title { diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 807dd02..14bde21 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -1,5 +1,5 @@ diff --git a/pages/timeMatrix/decball.vue b/pages/timeMatrix/decball.vue index 3fe722b..28c409b 100644 --- a/pages/timeMatrix/decball.vue +++ b/pages/timeMatrix/decball.vue @@ -6,7 +6,6 @@ @touchmove="handleTouchMove" @touchend="handleTouchEnd" @touchcancel="handleTouchEnd"> - - diff --git a/pages/timeMatrix/index.vue b/pages/timeMatrix/index.vue index d597f63..364770d 100644 --- a/pages/timeMatrix/index.vue +++ b/pages/timeMatrix/index.vue @@ -415,35 +415,12 @@