diff --git a/pages/NursingNew/component/invoicing/index.vue b/pages/NursingNew/component/invoicing/index.vue index 092d46b..ce86fb6 100644 --- a/pages/NursingNew/component/invoicing/index.vue +++ b/pages/NursingNew/component/invoicing/index.vue @@ -587,7 +587,7 @@ watch( () => props.isshow, (newVal, oldVal) => { - console.log(1111) + // console.log(1111) // 只有当新旧值不相同时才执行 if (newVal !== oldVal) { bottomisShaking.value = false @@ -1608,15 +1608,15 @@ }) } const routerPush = () => { - uni.setStorage({ - key: 'myArray', - data: timearr.value, - success: function () { - uni.navigateTo({ - url: `/pages/timeMatrix/indexnew` - }) - }, - }); + // uni.setStorage({ + // key: 'myArray', + // data: timearr.value, + // success: function () { + // uni.navigateTo({ + // url: `/pages/timeMatrix/indexnew` + // }) + // }, + // }); } // 暂存器 const saveRulerTime = ref({ @@ -1664,8 +1664,8 @@ const emotionTagList = ref([]); const bodyTagList = ref([]); const geteverything = () => { - if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { - getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => { + // console.log("有没有",uni.getStorageSync('nuId'),uni.getStorageSync('elderId')) + getNclist(uni.getStorageSync('nuId'),uni.getStorageSync('elderId')).then((res : any) => { console.log("啥啊",res) timearr.value = Array.from({ length: 24 }, (_, hour) => ({ positioning: hour.toString(), @@ -1694,12 +1694,47 @@ } }) }) - } + // if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { + // getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => { + // console.log("啥啊",res) + // 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; + // }) + // bottomItems.value = res.result.instantList + // cansumit.value = true; + // emotionTagList.value = res.result.emotionTagList; + // emotionTagListLook.value = [] + // bodyTagListLook.value = [] + // res.result.emotionTagList.forEach((res : any) => { + // if (res.izSelected == 'Y') { + // emotionTagListLook.value.push(res.netPic) + // } + // }) + // bodyTagList.value = res.result.bodyTagList + // res.result.bodyTagList.forEach((res : any) => { + // if (res.izSelected == 'Y') { + // bodyTagListLook.value.push(res.netPic) + // } + // }) + // }) + // } } const savePackagelist = ref([]); onMounted(() => { + // if(uni.getStorageSync('elderId')===null){ + // uni.setStorageSync('elderId', ""); + // } savePackagelist.value = uni.getStorageSync('Packagelist') || [] let res = uni.getStorageSync('saveTree2') + console.log("啥啊啊啊啊",savePackagelist.value,res) + let goodArray = [] myArray.forEach((element : any) => { element.children.forEach((element1 : any) => { diff --git a/pages/NursingNew/component/nurse/bigindex.css b/pages/NursingNew/component/nurse/bigindex.css index 4e0e966..07d6e30 100644 --- a/pages/NursingNew/component/nurse/bigindex.css +++ b/pages/NursingNew/component/nurse/bigindex.css @@ -138,7 +138,7 @@ width: 100%; height: 1350rpx; display: flex; - margin-top: 62rpx; + margin-top: 30rpx; .doctorsay-container-container { width: 100%; @@ -469,8 +469,8 @@ .right-order { position: fixed; right: 20rpx; - top: 62rpx; - height: 1220rpx; + top: 30rpx; + height: 1278rpx; width: 454rpx; background-color: #fff; border-radius: 30rpx; @@ -604,7 +604,7 @@ .history-items { width: 100%; margin-top: 15rpx; - height: 385rpx; + height: 440rpx; .history-item { /* margin-left: 1%; */ diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue index c0a37d1..02eda0b 100644 --- a/pages/NursingNew/component/nurse/bigindex.vue +++ b/pages/NursingNew/component/nurse/bigindex.vue @@ -29,7 +29,7 @@ - + + + + + + \ No newline at end of file diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 7d15cb1..9663d08 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -3,10 +3,13 @@ + + + - + @@ -30,13 +33,14 @@ import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'; import { queryPadPageList ,getPermissionList } from '@/pages/watch/api/lunpan.js' import index from "./component/index.vue" + import newnurse from "./component/nurse/newindex.vue" import equipment from "./component/equipment.vue" import logistics from "./component/logistics/index.vue" import invoicing from "./component/invoicing/index.vue" import requestform from "./component/pleasetake/takehome.vue" import doctorask from "./component/doctorask/doctorask.vue" - import nurse from "./component/nurse/index.vue" + // import nurse from "./component/nurse/index.vue" import bignurse from "./component/nurse/bigindex.vue" import { onBackPress,onShow } from '@dcloudio/uni-app'; import { getNcPackagelist } from './component/nurse/api.js' diff --git a/pages/login/login.vue b/pages/login/login.vue index c98fd7e..7b8be48 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -173,7 +173,7 @@ return form.password && isLength11(form.username) }) - const showPopup = ref(true) + const showPopup = ref(false) function closebottom() { openbottom.value = false; isTarget.value = true; @@ -182,6 +182,8 @@ function closePopup() { showPopup.value = false; + } + onMounted(()=>{ uni.setStorageSync("appWgtVersion", uni.getSystemInfoSync().appWgtVersion) if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) { showPopup.value = true; @@ -196,7 +198,7 @@ } } init(); - } + }) function closeapp() { plus.runtime.quit() }