diff --git a/component/public/newgame/sxy-Timeing.vue b/component/public/newgame/sxy-Timeing.vue index 7d17e28..56d384d 100644 --- a/component/public/newgame/sxy-Timeing.vue +++ b/component/public/newgame/sxy-Timeing.vue @@ -34,7 +34,7 @@ export default { initTime: { // 初始时间 type: Number, - default: 10, + default:3600, }, // isDown: { // // 是否是倒计时 @@ -67,10 +67,6 @@ export default { this.cycle(); }, methods: { - chongzhi(){ - this.initTime = 185 - this.cycle(); - }, OneCycle(n) { // 一次翻页的周期 let num = 0; @@ -110,12 +106,12 @@ export default { } } - this.faceZindex = num <= 25 ? 1 : 0; - this.backZindex = num <= 25 ? 0 : 1; + this.faceZindex = num <= 10 ? 1 : 0; + this.backZindex = num <= 10 ? 0 : 1; this.transformInfo = `perspective(500rpx) rotateX(-${(180 * num) / 50}deg)`; - }, 20); // 将一秒钟分成50份。 + },5); // 将一秒钟分成50份。 }, cycle() { let minutes = Math.floor(this.initTime / 60); diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index f49a97c..8c1d045 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -127,7 +127,7 @@ - + + @@ -24,11 +25,9 @@ - - {{ indexmessage?.startTime.slice(11, 16) }} - - 10:00 + {{ indexmessage?.startTime.slice(11, 16) }} + |  30分钟 @@ -39,14 +38,15 @@ - - + + + + - 强直屈曲洗手 - (大体重) + (大体重) @@ -54,21 +54,29 @@ - - - + mode="aspectFill"/> + - {{ indexmessage?.directiveName?indexmessage?.directiveName:'一级压疮防护' }} + {{ indexmessage?.directiveName }} + + + + {{indexmessage?.categoryName }} + + @@ -134,8 +142,7 @@ - + @@ -194,16 +201,19 @@ const topbuttontarget = ref(0); const ilanarr = ref([]); const listobj = ref({}); - const indexmessage = ref({}); const photoplay = ref(false) const serverUrl = ref(uni.getStorageSync('imagebase') ) const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/') const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const current = ref(0) const autoplay = ref(false) + const init = (e)=>{ + firstgetqueryCgdList(e) + } + defineExpose({ + init + }) const change = (e)=>{ - console.log(e.detail.current) - console.log(current.value) current.value = e.detail.current } const swip = (e)=>{ @@ -248,15 +258,18 @@ }) } const plsbuy = ref([]) + // const indexmessage = ref({}); const firstgetqueryCgdList = (nuId) => { form.nuId = nuId; queryOrderList(form).then(res => { console.log(form) + console.log(res.result.records) if(res.result.records.length>0){ - indexmessage.value = res.result.records[0] + plsbuy.value = res.result.records + // indexmessage.value = res.result.records[0] // clickLeftMenu(0,res.result.records[0]) }else{ - indexmessage.value = {}; + plsbuy.value = []; } }) } @@ -498,6 +511,7 @@ width: 65vw; height: 70vh; position: relative; + background-color: #F2F3F8; .bots{ width: 60%; position: absolute; @@ -612,12 +626,11 @@ top: 0%; left: 50%; transform: translate(-50%, -20%); - // 禁止动画阻挡逻辑 z-index: -1; } .cardbox{ width:40vw; - height:35vh; + height:34vh; position: relative; top: -5vh; z-index: 55; @@ -640,25 +653,24 @@ .itemcard{ width: 11.2vw; - height: 7.8vw; + height: 8vw; background: #F8F8F8; border-radius: 1.6vw; margin: 1.2vw 1.5vw 0 0vw; display: inline-block; - border: 1px solid #F8F8F8; + border: 2px solid #F8F8F8; text-align: center; image{ - width: 2.4vw; - height: 2.4vw; - margin: 1.4vw auto 0vw; + width: 3.3vw; + height: 3.3vw; + margin: 0.8vw auto 0vw; } text{ display: block; text-align: center; font-weight: 400; - font-size: 1.4vw; + font-size: 1.3vw; color: #666666; - width: 100%; white-space: nowrap; width: 100%; text-overflow: ellipsis; @@ -667,7 +679,7 @@ view{ text-align: center; font-weight: 400; - font-size: 1.1vw; + font-size: 1vw; color: #555; width: 100%; } @@ -675,7 +687,7 @@ } .act{ background: #fff; - border: 1px dashed rgba(1,125,233,0.43); + border: 2px dashed rgba(1,125,233,0.43); text,view{ color: #017DE9; } @@ -691,8 +703,9 @@ } .big-img { - height: 450rpx; + height: 550rpx; z-index: 100; + margin-top: -100rpx; image{ width: 100%; height: 100%; @@ -760,7 +773,7 @@ .pao-father { position: absolute; - top: 20rpx; + top: -20rpx; right: -110rpx; font-size: 22rpx; width: 100rpx; diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 946bc71..8fd8826 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -256,7 +256,7 @@ let back = [ { name: '请领', url: '/static/shouye/sy/l0.png', urls: '/static/shouye/sy/l1.png', type: 'hldy_ql' }, - { name: '智慧物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' }, + { name: '物联', url: '/static/shouye/sy/g0.png', urls: '/static/shouye/sy/g1.png', type: 'wl' }, { name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', type: 'back' } ] arrlist.value.push(...back); diff --git a/static/index/newindex/curve/curve_1.png b/static/index/newindex/curve/curve_1.png index ba84f31..130cc41 100644 Binary files a/static/index/newindex/curve/curve_1.png and b/static/index/newindex/curve/curve_1.png differ diff --git a/static/index/newindex/curve/curve_2.png b/static/index/newindex/curve/curve_2.png index c0c3dea..6eb4f74 100644 Binary files a/static/index/newindex/curve/curve_2.png and b/static/index/newindex/curve/curve_2.png differ diff --git a/static/index/newindex/curve/curve_3.png b/static/index/newindex/curve/curve_3.png index f90414a..9342ab0 100644 Binary files a/static/index/newindex/curve/curve_3.png and b/static/index/newindex/curve/curve_3.png differ diff --git a/static/index/newindex/curve/curve_4.png b/static/index/newindex/curve/curve_4.png index 392eaac..7436d1d 100644 Binary files a/static/index/newindex/curve/curve_4.png and b/static/index/newindex/curve/curve_4.png differ diff --git a/static/index/newindex/curve/curve_5.png b/static/index/newindex/curve/curve_5.png index e513890..3192efe 100644 Binary files a/static/index/newindex/curve/curve_5.png and b/static/index/newindex/curve/curve_5.png differ diff --git a/static/index/newindex/curve/curve_6.png b/static/index/newindex/curve/curve_6.png index 8c243ea..4a02000 100644 Binary files a/static/index/newindex/curve/curve_6.png and b/static/index/newindex/curve/curve_6.png differ diff --git a/static/index/newindex/curve/curve_7.png b/static/index/newindex/curve/curve_7.png index 21dd871..e94878f 100644 Binary files a/static/index/newindex/curve/curve_7.png and b/static/index/newindex/curve/curve_7.png differ diff --git a/static/index/newindex/curve/curve_8.png b/static/index/newindex/curve/curve_8.png index 7cdbf08..20c4edc 100644 Binary files a/static/index/newindex/curve/curve_8.png and b/static/index/newindex/curve/curve_8.png differ diff --git a/static/index/newindex/curve/curve_9.png b/static/index/newindex/curve/curve_9.png index 31f777b..ae8b74a 100644 Binary files a/static/index/newindex/curve/curve_9.png and b/static/index/newindex/curve/curve_9.png differ diff --git a/static/index/newindex/states/pao.png b/static/index/newindex/states/pao.png index 2087d77..0bd5fc5 100644 Binary files a/static/index/newindex/states/pao.png and b/static/index/newindex/states/pao.png differ diff --git a/static/zlb.png b/static/zlb.png new file mode 100644 index 0000000..3934b59 Binary files /dev/null and b/static/zlb.png differ