diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue index 3bd9061..fe7192b 100644 --- a/pages/NursingNew/component/nurse/bigindex.vue +++ b/pages/NursingNew/component/nurse/bigindex.vue @@ -437,7 +437,7 @@ required: true, }, }); - const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') + const serverUrl = ref(uni.getStorageSync('imagebase')) const opendata = ref(false); const bodystatus = ref(false); const bodystatustarget = ref(-1); diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css index c8bd6c0..dd741a4 100644 --- a/pages/NursingNew/component/nurse/index.css +++ b/pages/NursingNew/component/nurse/index.css @@ -591,8 +591,8 @@ } .title-time-font-rel { - - margin-top: 10rpx; + + margin-top: 9rpx; font-size: 33rpx; font-weight: 800; /* margin-bottom: 5rpx; */ @@ -601,6 +601,7 @@ white-space: nowrap; color: black; } + .title-time-font-tags { font-size: 24rpx; font-weight: 600; @@ -610,6 +611,7 @@ white-space: nowrap; color: #999; } + .title-time-items { display: flex; justify-content: space-around; @@ -821,14 +823,14 @@ display: flex; width: 100%; position: relative; - - + + .title-time-time { font-size: 32rpx; margin: 0 auto; font-weight: 600; - /* margin-left: 10rpx; */ + /* margin-left: 20rpx; */ /* margin-top: 12rpx; */ } @@ -1661,12 +1663,19 @@ } } -.tags-img { - width: 50rpx; - height: 50rpx; - margin-bottom: 10rpx; +.tags-img-view { + width: 50%; + display: flex; + justify-content: center; + + .tags-img { + width: 50rpx; + height: 50rpx; + + } } + .specia-onshow { background-color: rgb(241, 245, 252); width: 100%; @@ -2007,22 +2016,38 @@ height: 1278rpx; width: 600rpx; border-radius: 30rpx; - .right-tags{ + + .right-tags { background-color: #fff; width: 100%; height: 220rpx; border-radius: 35rpx; - - - .right-tags-title{ + position: relative; + + .setting-open { + position: absolute; + top: 80rpx; + left: 0; + width: 100%; + height: 830rpx; + background-color: #fff; + border: 1rpx solid rgba(0, 137, 254, 0.29); + border-radius: 30rpx; + + + } + + + .right-tags-title { width: 100%; height: 80rpx; display: flex; align-items: center; position: relative; - .right-setting{ + + .right-setting { position: absolute; - right: 20rpx; + right: 23rpx; top: 20rpx; width: 90rpx; height: 46rpx; @@ -2036,18 +2061,55 @@ border: 1rpx solid #E5E5E5; } } + + .right-contont { + width: 100%; + height: 140rpx; + display: flex; + + + + + .tags-leftmenu { + width: 48%; + height: 100%; + position: relative; + + .leftmenu-shu { + position: absolute; + top: 30%; + right: 0; + transform: translateY(-30%); + width: 1rpx; + height: 70%; + background-color: #EEEEEE; + } + + /* background-color: red; */ + } + + .tags-rightmenu { + width: 52%; + height: 100%; + position: relative; + /* background-color: red; */ + } + } } } -.blue-shu{ + +.blue-shu { background-color: #0089FE; width: 9rpx; height: 26rpx; border-radius: 5rpx; margin-right: 13rpx; } -.blue-font{ + +.blue-font { font-size: 33rpx; } + .title-time-border-hisOk { border: 2rpx solid #D4E4FE; width: calc(100% - 15rpx); @@ -2058,6 +2120,7 @@ background-color: #F6F9FF; flex-direction: column; } + .title-time { display: flex; width: 100%; @@ -2068,9 +2131,9 @@ .card-time { position: absolute; - bottom: 35rpx; - left: 20rpx; - font-size: 28rpx; + bottom: 30rpx; + left: 30rpx; + font-size: 30rpx; } .card-time-red { @@ -2111,6 +2174,16 @@ color: #1083f8; } } -.weight-time{ + +.weight-time { display: flex; +} + +.haven-img { + width: 130rpx; + height: 130rpx; + position: absolute; + top: 45%; + left: 50%; + transform: translate(-45%, -50%); } \ No newline at end of file diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue index 32075d3..b7ba022 100644 --- a/pages/NursingNew/component/nurse/newindex.vue +++ b/pages/NursingNew/component/nurse/newindex.vue @@ -124,7 +124,45 @@ 设置 + + + + + + + + + + + + + + + + + + + + @@ -295,7 +333,7 @@ required: true, }, }); - + const serverUrl = ref(uni.getStorageSync('imagebase')) const bodystatus = ref(false); const bodystatustarget = ref(-1); const facestatus = ref(false); @@ -1389,9 +1427,12 @@ bodyTagList.value = res.result.bodyTagList res.result.bodyTagList.forEach((res : any) => { if (res.izSelected == 'Y') { - bodyTagListLook.value.push(res.netPic) + bodyTagListLook.value.push(res.pic) + console.log("我看看",serverUrl.value + res.pic) + console.log("我看看总的",res) } }) + console.log("看看图标", bodyTagListLook.value) }) } } diff --git a/pages/login/api.js b/pages/login/api.js index 47255b6..010dde9 100644 --- a/pages/login/api.js +++ b/pages/login/api.js @@ -19,6 +19,13 @@ export const getLoginCode = (time) => { method: 'get', }) } +//获得图片base +export const getPublicMediaUrl = (time) => { + return request({ + url: `/api/baseInfo/getPublicMediaUrl`, + method: 'get', + }) +} //登录 export const loginApp = (params) => { diff --git a/pages/login/login.vue b/pages/login/login.vue index 1cf1a7c..22e7103 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -148,7 +148,7 @@ import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue' import oneseven from '@/pages/login/oneseven.vue' import twoseven from '@/pages/login/twoseven.vue' - import { isRel, getLoginCode, loginApp } from './api.js' + import { isRel, getLoginCode, loginApp,getPublicMediaUrl } from './api.js' import huakuai from '@/component/public/huakuai.vue' import { initWs, connectWs } from '@/common/websocketManager.js'; @@ -184,6 +184,7 @@ showPopup.value = false; } onMounted(()=>{ + uni.setStorageSync("appWgtVersion", uni.getSystemInfoSync().appWgtVersion) if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) { showPopup.value = true; @@ -404,6 +405,10 @@ }); connectWs(); // 主动连接 WebSocket } + // 获得图片前缀 + getPublicMediaUrl().then((res:any)=>{ + uni.setStorageSync("imagebase", res.result) + }) jumpTo(`/pages/login/newanimationpage`) } diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue index 5c9134d..6503732 100644 --- a/pages/login/newanimationpage.vue +++ b/pages/login/newanimationpage.vue @@ -2,7 +2,7 @@