From 6ded15093330df9553af6f38a27826528cf5e860 Mon Sep 17 00:00:00 2001 From: Wkang921 Date: Thu, 6 Jul 2023 17:15:21 +0800 Subject: [PATCH] no msg --- pages/home/jl/index.js | 24 ++- pages/home/jl/index.json | 3 +- pages/home/jl/index.wxml | 32 ++-- pages/home/jl/index.wxss | 62 ++++---- pages/home/jl/jlai/jlai.wxss | 6 + pages/home/xx/lindex/lindex.js | 22 ++- pages/home/xx/lindex/lindex.wxml | 101 +++++++++---- pages/home/xx/lindex/lindex.wxss | 187 ++++++++++++------------ pages/home/xx/lindex/lxz/lxz.js | 14 +- pages/home/xx/lindex/lxz/lxz.wxml | 2 +- pages/home/xx/xz/xz.js | 14 +- pages/home/xx/xz/xz.wxml | 2 +- pages/home/xx/xz/xz.wxss | 2 +- pages/home/xyc/index.wxml | 20 ++- pages/home/xyc/index.wxss | 39 ++--- pages/home/xyc/tdyw/tdyw.js | 24 ++- pages/home/xyc/tdyw/tdyw.wxss | 234 ++++++++++++++++++++---------- pages/home/xyc/wdyw/wdyw.js | 1 - pages/home/xyc/wdyw/wdyw.wxss | 1 - pages/index/index.wxss | 2 +- project.private.config.json | 25 +--- 21 files changed, 505 insertions(+), 312 deletions(-) diff --git a/pages/home/jl/index.js b/pages/home/jl/index.js index d69e91d..418a169 100644 --- a/pages/home/jl/index.js +++ b/pages/home/jl/index.js @@ -18,6 +18,7 @@ Page({ minutes:0, pickerValue: [0, 0], prayTime:0, //祈祷时间 + prayTimeStr: '选择祈祷时长' , prayerContent:'', //祈祷内容 showSexLogo:false,//不展示形象修改按钮 showPray:false, //显示祈祷弹层 @@ -28,7 +29,8 @@ Page({ showEnergyFail:false, //赠送成功提示 showInject:false, //显示注入能量 showInEnergy:false, //显示能量注入中 - showScsEnergy:false //显示注册成功提示 + showScsEnergy:false, //显示注册成功提示 + showTiming:false //显示祈祷时间弹层 }, ShowOrNotLogoS(){ this.setData({singleShow:!this.data.singleShow}) @@ -42,6 +44,7 @@ Page({ doSetXxtMale(){ this.doSetXxt('male') }, + showTiming(){this.setData({showTiming : !this.data.showTiming})}, doSetXxtFemale(){ this.doSetXxt('female') }, @@ -130,8 +133,12 @@ Page({ prayerContent:'' }) } + this.setData({showTiming: false}) }, onPickerChange(e){ + console.log(e.detail.value); + const time = e.detail.value[0] + '小时' + e.detail.value[1] + '分钟' + this.setData({prayTimeStr: time}) if(e.detail.value[0] === this.data.hours){ this.setData({ minutes:this.data.minute @@ -207,6 +214,11 @@ Page({ minutes:59 }) } + if(hours<=0){ + this.setData({ + minutes:minute + }) + } this.setData({ userInfo:res.data.data, hours:hours, @@ -227,13 +239,20 @@ Page({ }, btnOK(){ const prayerEnergy = (this.data.pickerValue[0]*60 + this.data.pickerValue[1])/6 - if(prayerEnergy < 1){ + if(this.data.userInfo.crystallineEnergy < 1){ return Toast({ context: this, selector: '#t-toast', message: '能量不足', }); } + if(this.data.prayerContent === ''){ + return Toast({ + context: this, + selector: '#t-toast', + message: '祈祷内容不能为空', + }); + } if(this.data.prayerContent.length > 11){ return Toast({ context: this, @@ -263,6 +282,7 @@ Page({ }).catch((err) => { console.log('祈祷失败',err); }) + this.setData({showTiming: false}) }, btnCancel(){ console.log('111'); diff --git a/pages/home/jl/index.json b/pages/home/jl/index.json index b55c785..2d04b72 100644 --- a/pages/home/jl/index.json +++ b/pages/home/jl/index.json @@ -5,6 +5,7 @@ "t-rate": "tdesign-miniprogram/rate/rate", "t-image": "tdesign-miniprogram/image/image", "t-icon": "tdesign-miniprogram/icon/icon", - "t-toast": "tdesign-miniprogram/toast/toast" + "t-toast": "tdesign-miniprogram/toast/toast", + "t-input": "tdesign-miniprogram/input/input" } } \ No newline at end of file diff --git a/pages/home/jl/index.wxml b/pages/home/jl/index.wxml index f791c02..954286a 100644 --- a/pages/home/jl/index.wxml +++ b/pages/home/jl/index.wxml @@ -167,28 +167,32 @@ 祈祷时长 - 选择祈祷时长 + {{prayTimeStr}} + + + + - 你还有{{userInfo.crystallineEnergy}}%水晶能量，可为对方祈祷{{hours}}小时{{minute}}分 - - - - - {{ item }} - - - {{ item }} - - - + 你还有{{userInfo.crystallineEnergy}}%水晶能量，可为对方祈祷{{hours}}小时{{minute}}分 + + + + + {{ item }} + + + {{ item }} + + - + + diff --git a/pages/home/jl/index.wxss b/pages/home/jl/index.wxss index f994085..4ec1473 100644 --- a/pages/home/jl/index.wxss +++ b/pages/home/jl/index.wxss @@ -311,7 +311,10 @@ page { .yan1{ position: absolute; width:114rpx; - height:116.67rpx; + height:116rpx; + display: flex; + align-items: center; + justify-content: center; background-repeat: no-repeat; background-size:100% 100%; margin-top: 837.33rpx; @@ -321,7 +324,10 @@ page { .yan2{ position: absolute; width:114rpx; - height:116.67rpx; + height:116rpx; + display: flex; + align-items: center; + justify-content: center; background-repeat: no-repeat; background-size:100% 100%; margin-top: 837.33rpx; @@ -366,30 +372,25 @@ page { .yan11{ position: absolute; - width:46.67rpx; - height:46.67rpx; + width:46rpx; + height:46rpx; background-repeat: no-repeat; background-size:100% 100%; - margin-top: 33.33rpx; - margin-left:34.33rpx; background-image: url(https://oss.wish.ydxxkj.top/xy/paw.png); } .yan12{ - position: absolute; - width:46.67rpx; - height:46.67rpx; + /* position: absolute; */ + width:46rpx; + height:46rpx; background-repeat: no-repeat; background-size:100% 100%; - margin-top: 33.33rpx; - margin-left:34.33rpx; background-image: url(https://oss.wish.ydxxkj.top/xy/male.png); } .yan13{ - /* position: absolute; */ width:36rpx; - height:46.67rpx; + height:46rpx; background-repeat: no-repeat; background-size:100% 100%; background-size: contain; @@ -398,9 +399,9 @@ page { .xxtl{ position: absolute; - width:326.67rpx; - height:771.33rpx; - margin-top: 326.67rpx; + width:326rpx; + height:772rpx; + margin-top: 326rpx; margin-left: 88rpx; background-repeat: no-repeat; background-size:100% 100%; @@ -413,10 +414,10 @@ page { .xxtr{ position: absolute; - width:323.33rpx; - height:787.33rpx; - margin-top: 308.67rpx; - margin-left: 355.33rpx; + width:326rpx; + height:782rpx; + margin-top: 326rpx; + margin-left: 356rpx; background-repeat: no-repeat; background-size:100% 100%; } @@ -429,7 +430,10 @@ page { .yanql1{ position: absolute; width:114rpx; - height:116.67rpx; + height:116rpx; + display: flex; + align-items: center; + justify-content: center; background-repeat: no-repeat; background-size:100% 100%; margin-top: 492rpx; @@ -440,7 +444,10 @@ page { .yanql2{ position: absolute; width:114rpx; - height:116.67rpx; + height:116rpx; + display: flex; + align-items: center; + justify-content: center; background-repeat: no-repeat; background-size:100% 100%; margin-top: 663.33rpx; @@ -451,7 +458,10 @@ page { .yanql4{ position: absolute; width:114rpx; - height:116.67rpx; + height:116rpx; + display: flex; + align-items: center; + justify-content: center; background-repeat: no-repeat; background-size:100% 100%; margin-top: 492rpx; @@ -462,7 +472,10 @@ page { .yanql5{ position: absolute; width:114rpx; - height:116.67rpx; + height:116rpx; + display: flex; + align-items: center; + justify-content: center; background-repeat: no-repeat; background-size:100% 100%; margin-top: 663.33rpx; @@ -818,7 +831,6 @@ background-image: url(https://oss.wish.ydxxkj.top/xy/ysfgx.png); bottom: 0; width: 100%; height: 434rpx; - padding: 0 28px; z-index: 999; line-height: 20px; background-color: rgba(255, 255, 255, 1); diff --git a/pages/home/jl/jlai/jlai.wxss b/pages/home/jl/jlai/jlai.wxss index 022b0ea..6441db6 100644 --- a/pages/home/jl/jlai/jlai.wxss +++ b/pages/home/jl/jlai/jlai.wxss @@ -1,4 +1,10 @@ /* pages/home/jl/jlai/jlai.wxss */ +page { + width: 100%; + height: 100%; + overflow: hidden; +} + .reback{ position: absolute; margin-left: 20rpx; diff --git a/pages/home/xx/lindex/lindex.js b/pages/home/xx/lindex/lindex.js index 4281444..dc3858f 100644 --- a/pages/home/xx/lindex/lindex.js +++ b/pages/home/xx/lindex/lindex.js @@ -24,7 +24,7 @@ Page({ minute: 0, // 分 second: 0 , // 秒 millisecond:0, - dsQTime:'00：00：00', + dsQTime:'00:00:00', luYinStatus:0,//录音状态，0代表还没开始，1代表进行中，2代表录音完毕 delId:'', luyinVisible:false, @@ -38,7 +38,6 @@ Page({ loverInfo:{}, hasLover:false,// 是否单身 userInfo:{} - }, doLuYINBoF(e){ //先判断是开是关 @@ -176,7 +175,7 @@ Page({ } hm = res.duration - fz*60*1000-mz*1000 let sec = Math.floor(res.duration/1000) - let ssec = fz+'\''+mz+'\'\''+hm+'\'\'\'' + let ssec = fz+'\''+mz+'\'\'' console.log(ssec) wx.uploadFile({ url: 'https://xzjl-api.windymuse.cn/api/resource', @@ -434,9 +433,20 @@ Page({ }) }, doMessageInfo(){/**查询聊天信息 */ - req.getRequest('/api/user/curt/message/lover',{}).then((res)=>{ + req.getRequest('/api/user/curt/message/lover',{ limit:-1}).then((res)=>{ if(res.data.code==200){ - this.setData({messages:res.data.data.records.reverse()}) + const list = res.data.data.records + // 格式化时间 + list.forEach(item => { + const date = new Date(item.createdAt) + const year = date.getFullYear() + const month = date.getMonth() + 1 + const day = date.getDate() + const hours = date.getHours() + const minutes = date.getMinutes() + item.createdAt = `${year}年${month}月${day}日 ${hours}:${minutes}` + }) + this.setData({messages:list.reverse()}) } }).catch((err)=>{ console.log(err); @@ -517,7 +527,7 @@ Page({ }) }, doClickYx(){ - this.setData({luyinVisible:true,luYinStatus:0,dsQTime:'00：00：00'}) + this.setData({luyinVisible:true,luYinStatus:0,dsQTime:'00:00:00'}) console.log('点击了音讯') }, quxiaoLuyin(){/**取消录音 */ diff --git a/pages/home/xx/lindex/lindex.wxml b/pages/home/xx/lindex/lindex.wxml index 8ae7829..c121451 100644 --- a/pages/home/xx/lindex/lindex.wxml +++ b/pages/home/xx/lindex/lindex.wxml @@ -20,76 +20,117 @@ - + {{item.createdAt}} - - - + {{item.status=='unread'?'未读':'已读'}} - + + + - {{item.status=='unread'?'未读':'已读'}} + - - + {{item.status=='unread'?'未读':'已读'}} + + {{item.extra.ssec}} - - - - - 1{{item.extra.ssec}} + + + + + - {{item.status=='unread'?'未读':'已读'}} + {{item.extra.ssec}} + + - - {{item.content}} {{item.status=='unread'?'未读':'已读'}} + + + {{item.content}} + + + - - - + + - - - - - - + + + {{item.status=='unread'?'未读':'已读'}} - + + + {{item.status=='unread'?'未读':'已读'}} - {{item.content}} + + {{item.content}} + {{item.status=='unread'?'未读':'已读'}} + diff --git a/pages/home/xx/lindex/lindex.wxss b/pages/home/xx/lindex/lindex.wxss index 83e843e..fbc0dc7 100644 --- a/pages/home/xx/lindex/lindex.wxss +++ b/pages/home/xx/lindex/lindex.wxss @@ -248,16 +248,15 @@ text-align: center; } .wchatfor{ width: 750rpx; + padding: 0 64rpx; + box-sizing: border-box; } .wchattime{ - left: 131px; - top: 256px; width: 750rpx; - height: 28px; + margin-top: 32rpx; color: rgba(153, 153, 153, 1); - font-size: 12px; + font-size: 24rpx; text-align: center; - font-family: SourceHanSansSC-regular; } .wchattxk{ display: inline-block; @@ -369,15 +368,14 @@ text-align: center; font-family: SourceHanSansSC-regular; } .zjtablea1{ - width: 750rpx; + width: 100%; height: 176rpx; } .zjtx1{ - position: absolute; - margin-left: 317px; - margin-top: 19rpx; - width: 36px; - height: 36px; + width: 84rpx; + height: 84rpx; + margin-left: 24rpx; + box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4); } .zjxf1{ position: absolute; @@ -398,94 +396,80 @@ text-align: center; font-family: SourceHanSansSC-regular; } .zjtablea2{ - width: 750rpx; - height:134rpx; + width: 100%; + height: 134rpx; + display: flex; + align-items: center; + justify-content: flex-end; } .zjypk1{ - position: absolute; - left: 160px; - margin-top: 7px; - width: 150px; - height: 42px; - line-height: 20px; - border-radius: 10px; + width: 300rpx; + height: 84rpx; + padding-left: 32rpx; + box-sizing: border-box; + display: flex; + align-items: center; + border-radius: 20rpx; background-color: rgba(255, 255, 255, 1); color: rgba(16, 16, 16, 1); - font-size: 14px; - text-align: center; - font-family: Arial; + font-size: 28rpx; border: 1px solid rgba(239, 239, 239, 1); } .zjypt1{ - position: absolute; - left: 16px; - top: 6px; - width: 30px; - height: 30px; + width: 60rpx; + height: 60rpx; + margin-right: 20rpx; + background-size: cover; background-image: url(https://oss.wish.ydxxkj.top/xy/yppic.png); } .zjypt11{ - position: absolute; - left: 16px; - top: 6px; - width: 30px; - height: 30px; + width: 60rpx; + height: 60rpx; + margin-right: 20rpx; overflow: hidden; } .zjypwz1{ - position: absolute; - left: 56px; -top: 24rpx; -width: 45px; -height: 18px; -color: rgba(154, 154, 154, 1); -font-size: 12px; -text-align: left; -font-family: SourceHanSansSC-regular; + color: rgba(154, 154, 154, 1); + font-size: 24rpx; } .zjypydwd{ - position: absolute; - margin-left: 250rpx; - margin-top: 30px; - width: 28px; - height: 20px; + height: 100%; + padding: 0 20rpx 20rpx 0; + box-sizing: border-box; color: rgba(206, 206, 206, 1); - font-size: 12px; - text-align: left; - font-family: SourceHanSansSC-regular; + font-size: 24rpx; + display: flex; + align-items: flex-end; } .zjtable3{ - width: 750rpx; + width: 100%; height: 150rpx; + display: flex; + align-items: center; + justify-content: flex-end; } .zjxxbox1{ - position: absolute; - margin-left: 260rpx; - width: 180px; - height: 60px; + width: 360rpx; + height: 120rpx; line-height: 60px; + background-size: contain; background-image: url(https://oss.wish.ydxxkj.top/xy/%E7%BA%B8%E6%9D%A1.png); color: rgba(51, 51, 51, 1); font-size: 14px; text-align: left; - font-family: SourceHanSansSC-regular; - text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; } .zjtextydwd1{ - position: absolute; - margin-left: 210rpx; - margin-top: 30px; - width: 28px; - height: 20px; + height: 100%; + display: flex; + align-items: flex-end; color: rgba(206, 206, 206, 1); - font-size: 12px; - text-align: left; - font-family: SourceHanSansSC-regular; + font-size: 24rpx; + margin: 0 10rpx 60rpx 0; } .zjtextcontent{ @@ -566,7 +550,7 @@ top: 568px; .cqlgd{ width: 750rpx; - height: 530rpx; + height: 280rpx; } .fhan11{ border-radius: 58rpx; @@ -596,9 +580,24 @@ background-image: url(https://oss.wish.ydxxkj.top/xy/xtreturn.png); background-color: transparent!important; } .zjtableatp1{ - width: 750rpx; + width: 100%; + height: 220rpx; + padding: 0 32rpx; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.zjtableatp2{ + width: 100%; height: 220rpx; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: flex-start; } + .zjxftp1{ float: right; margin-right:130rpx; @@ -619,14 +618,11 @@ background-image: url(https://oss.wish.ydxxkj.top/xy/xtreturn.png); } .zjydwdtp2{ - display: inline-block; - margin-top: 50px; - width: 28px; - height: 20px; + height: 100%; color: rgba(206, 206, 206, 1); - font-size: 12px; - text-align: left; - font-family: SourceHanSansSC-regular; + font-size: 24rpx; + display: flex; + align-items: flex-end; } .zjxftp2{ display: inline-block; @@ -636,38 +632,37 @@ background-image: url(https://oss.wish.ydxxkj.top/xy/xtreturn.png); max-width: 500rpx; } .zttp11{ - float: right; - margin-right: 130rpx; + /* margin-right: 130rpx; */ + height: 200rpx; + flex: 1; + display: flex; + justify-content: flex-end; +} + +.zttp11 .t-image{ + height: 200rpx; + max-width: 440rpx; } + .zttp12{ - float: left; - margin-left: 10rpx; + height: 200rpx; + display: flex; + align-items: center; } .zjydwdtp3{ - display: inline-block; - margin-top: 80px; - margin-left: 10rpx; - width: 28px; - height: 20px; + height: 100%; + display: flex; + align-items: flex-end; color: rgba(206, 206, 206, 1); - font-size: 12px; - text-align: left; - font-family: SourceHanSansSC-regular; + font-size: 24rpx; } .zjxftp3{ - display: inline-block; - margin-left:10rpx; height: 200rpx; - background-repeat: no-repeat; - max-width: 500rpx; + max-width: 480rpx; } .wchattxk11{ - float: left; - margin-left: 19px; - margin-top: 7rpx; - width: 36px; - height: 36px; - background-color: chartreuse; + width: 72rpx; + height: 72rpx; } .tppp1{ diff --git a/pages/home/xx/lindex/lxz/lxz.js b/pages/home/xx/lindex/lxz/lxz.js index 872218d..82693cf 100644 --- a/pages/home/xx/lindex/lxz/lxz.js +++ b/pages/home/xx/lindex/lxz/lxz.js @@ -141,7 +141,7 @@ Page({ resourceId: data.data.id, duration: this.data.duration, videoSrc: this.data.videoSrc, - extra: {duration : this.data.duration} + extra: {duration : this.data.ssec} }) this.setData({audioList: list}) } @@ -225,7 +225,17 @@ Page({ time = time + ':' + millisecond } - this.setData({soundTime: time}) + let ssec = minute + '\'' + if (second < 10) { + ssec = ssec + '0' + second + '\'\'' + }else { + ssec = ssec + second + } + + this.setData({ + soundTime: time, + ssec: ssec + }) }, endSound(){ console.log('结束录音'); diff --git a/pages/home/xx/lindex/lxz/lxz.wxml b/pages/home/xx/lindex/lxz/lxz.wxml index c3a3e3a..ce053f6 100644 --- a/pages/home/xx/lindex/lxz/lxz.wxml +++ b/pages/home/xx/lindex/lxz/lxz.wxml @@ -22,7 +22,7 @@ - {{item.duration}} + {{item.extra.duration}} diff --git a/pages/home/xx/xz/xz.js b/pages/home/xx/xz/xz.js index 872218d..82693cf 100644 --- a/pages/home/xx/xz/xz.js +++ b/pages/home/xx/xz/xz.js @@ -141,7 +141,7 @@ Page({ resourceId: data.data.id, duration: this.data.duration, videoSrc: this.data.videoSrc, - extra: {duration : this.data.duration} + extra: {duration : this.data.ssec} }) this.setData({audioList: list}) } @@ -225,7 +225,17 @@ Page({ time = time + ':' + millisecond } - this.setData({soundTime: time}) + let ssec = minute + '\'' + if (second < 10) { + ssec = ssec + '0' + second + '\'\'' + }else { + ssec = ssec + second + } + + this.setData({ + soundTime: time, + ssec: ssec + }) }, endSound(){ console.log('结束录音'); diff --git a/pages/home/xx/xz/xz.wxml b/pages/home/xx/xz/xz.wxml index c3a3e3a..ce053f6 100644 --- a/pages/home/xx/xz/xz.wxml +++ b/pages/home/xx/xz/xz.wxml @@ -22,7 +22,7 @@ - {{item.duration}} + {{item.extra.duration}} diff --git a/pages/home/xx/xz/xz.wxss b/pages/home/xx/xz/xz.wxss index 331fea1..dbb6e47 100644 --- a/pages/home/xx/xz/xz.wxss +++ b/pages/home/xx/xz/xz.wxss @@ -405,7 +405,7 @@ textarea { width: 100%; height: 50rpx; margin-top: 40rpx; - background-image: url(https://oss.wish.ydxxkj.top/xy/iconPark-acoustic%20Copy%203%401x.png); + background-image: url(https://oss.wish.ydxxkj.top/xy/iconPark-acoustic%20Copy%203%401x%20%281%29.png); } .sound-box-img2 { diff --git a/pages/home/xyc/index.wxml b/pages/home/xyc/index.wxml index 3224eb2..1641f74 100644 --- a/pages/home/xyc/index.wxml +++ b/pages/home/xyc/index.wxml @@ -22,9 +22,22 @@ 许愿链接 许愿图片 - - - + + + + diff --git a/pages/home/xyc/index.wxss b/pages/home/xyc/index.wxss index 7d835c9..1b1af83 100644 --- a/pages/home/xyc/index.wxss +++ b/pages/home/xyc/index.wxss @@ -305,18 +305,16 @@ font-family: SourceHanSansSC-medium; } .xyljt{ - padding: 20rpx 0 0 20rpx !important; position: absolute; - left: 250rpx; - top: 572rpx; + left: 218rpx; + top: 490rpx; + padding: 0 0 0 20rpx !important; + box-sizing: border-box; width: 350rpx!important; height: 80rpx!important; line-height: 80rpx!important; border-radius: 20rpx; font-size: 28rpx; - display: flex; - align-items: center; - justify-content: space-between; border: 1px solid rgba(187, 187, 187, 1); } @@ -326,9 +324,10 @@ font-family: SourceHanSansSC-medium; .qwsjt{ position: absolute; - left: 250rpx; + left: 220rpx; top: 448rpx; - padding: 20rpx 0 0 20rpx !important; + padding: 0 20rpx !important; + box-sizing: border-box; width: 350rpx!important; height: 80rpx!important; border-radius: 20rpx; @@ -337,25 +336,18 @@ font-family: SourceHanSansSC-medium; border: 1px solid rgba(187, 187, 187, 1); } -.xltb{ - position: absolute; - right: 130rpx; - top:478rpx; - width:26rpx; - height:26rpx; - background-repeat: no-repeat; - background-size:100% 100%; - background-image: url(https://oss.wish.ydxxkj.top/xy/xltb.png); - -} - .xytpt{ position: absolute; width:600rpx; height:600rpx; - margin-top:700rpx; + margin-top:530rpx; margin-left: 210rpx!important; } + +.t-upload__add-icon { + background-color: #FFFFFF !important; +} + .t-grid { background-color: transparent!important; } @@ -414,8 +406,8 @@ font-family: SourceHanSansSC-medium; /* 许愿成功回显 */ .wishdetail{ position: absolute; - width:750rpx; - height:1624rpx; + width:100%; + height:100%; background-color: rgba(255, 255, 255, 0.7); } .popbox{ @@ -539,6 +531,7 @@ font-family: SourceHanSansSC-medium; .popup-main { height: 462rpx; + margin-bottom: 68rpx; background-color: #fff; } diff --git a/pages/home/xyc/tdyw/tdyw.js b/pages/home/xyc/tdyw/tdyw.js index 789f5c2..1bda042 100644 --- a/pages/home/xyc/tdyw/tdyw.js +++ b/pages/home/xyc/tdyw/tdyw.js @@ -10,9 +10,18 @@ Page({ showDelDialog:false, detail:{}, visible:false, - rrs:[{"lastModifiedDate":"2023-03-29T14:49:58.000+08:00","createdAt":"2023-03-14T15:44:16.000+08:00","id":1,"userid":1,"link":"http://www.baidu.com","img":"http://oss.wish.ydxxkj.top/resource/24130a65-ec5e-4c48-86d1-e964859f8532-1680072583657.jpg","content":"我希望明年去富士山下的樱花.","status":"processing","deadline":"2024-04-16"},{"lastModifiedDate":"2023-03-29T14:49:58.000+08:00","createdAt":"2023-03-14T15:44:16.000+08:00","id":1,"userid":1,"link":"http://www.baidu.com","img":"http://oss.wish.ydxxkj.top/resource/24130a65-ec5e-4c48-86d1-e964859f8532-1680072583657.jpg","content":"我希望明年去富士山下的樱花.","status":"completed","deadline":"2024-04-16"},{"lastModifiedDate":"2023-03-29T14:49:58.000+08:00","createdAt":"2023-03-14T15:44:16.000+08:00","id":1,"userid":1,"link":"http://www.baidu.com","img":"http://oss.wish.ydxxkj.top/resource/24130a65-ec5e-4c48-86d1-e964859f8532-1680072583657.jpg","content":"我希望明年去富士山下的樱花.","status":"expired","deadline":"2024-04-16"}], + shareVisible:false, //分享弹层 wishes:[] }, + // 分享微信 + shareWx(){ + console.log('分享微信') + }, + showShare(){ + this.setData({ + shareVisible:!this.data.shareVisible + }) + }, go2DelDialog(){ this.setData({showDelDialog:true}) }, @@ -33,6 +42,10 @@ Page({ icon: 'none', duration: 1000 }) + this.getMyWish() + this.setData({ + visible: false + }) } }).catch((err)=>{ console.log(err); @@ -64,8 +77,8 @@ Page({ }) }, go2WishDetail(e){/**查看愿望详情 */ - this.setData({visible:true,detail:e.target.dataset.wish}) - this.setData({detail:e.target.dataset.wish}) + this.setData({visible:true,detail:e.currentTarget.dataset.wish}) + this.setData({detail:e.currentTarget.dataset.wish}) }, onVisibleChange(e) { this.setData({ @@ -80,7 +93,7 @@ Page({ }, getMyWish(){ req.getRequest('/api/user/curt/lover/wish',{}).then((res)=>{ - console.log(res) + console.log(res,'11111111') if(res.data.code==200){ this.setData({wishes:res.data.data.records}) } @@ -143,5 +156,8 @@ Page({ */ onShareAppMessage() { + }, + + onShareTimeline(){ } }) \ No newline at end of file diff --git a/pages/home/xyc/tdyw/tdyw.wxss b/pages/home/xyc/tdyw/tdyw.wxss index 5a18764..88781d5 100644 --- a/pages/home/xyc/tdyw/tdyw.wxss +++ b/pages/home/xyc/tdyw/tdyw.wxss @@ -56,14 +56,13 @@ left: -48rpx; top: 232rpx; width: 880rpx; - height: 1270rpx; + height: 1370rpx; background-repeat: no-repeat; background-size:100% 100%; - background-image: url(https://oss.wish.ydxxkj.top/xy/xycbg3.png); } .boxitem{ - margin-left: 16px; + margin: 0 auto; top: 104px; width: 343px; height: 94px; @@ -104,13 +103,13 @@ .qwsjbox{ float:initial; margin-left: 174rpx; -top: 153px; -width: 143px; -height: 17px; -color: rgba(108, 108, 108, 1); -font-size: 12px; -text-align: left; -font-family: SourceHanSansSC-regular; + top: 306rpx; + width: 286rpx; + height: 34rpx; + color: rgba(108, 108, 108, 1); + font-size: 12px; + text-align: left; + font-family: SourceHanSansSC-regular; } .wczt{ @@ -151,10 +150,10 @@ font-family: SourceHanSansSC-regular; } .popbox{ position: absolute; - left: 33px; - top: 83px; - width: 310px; - height: 540px; + left: 66rpx; + top: 166rpx; + width: 620rpx; + height: 1080rpx; background-repeat: no-repeat; background-size:100% 100%; background-image: url(https://oss.wish.ydxxkj.top/xy/detailbkg.png); @@ -162,61 +161,61 @@ font-family: SourceHanSansSC-regular; .yximg{ position: absolute; - left: 73px; - top: 165px; - width: 230px; - height: 154px; + left: 146rpx; + top: 330rpx; + width: 460rpx; + height: 308rpx; border-radius: 10px; background-color: #767686; } .ywwz{ position: absolute; - left: 164px; -top: 353px; -width: 48px; -height: 33px; -color: rgba(248, 99, 42, 1); -font-size: 24px; -text-align: left; -font-family: SourceHanSansSC-bold; + left: 328rpx; + top: 706rpx; + /* width: 96rpx; */ + height: 66rpx; + color: rgba(248, 99, 42, 1); + font-size: 48rpx; + text-align: left; + font-family: SourceHanSansSC-bold; } .ywxq{ position: absolute; - left: 91px; -top: 399px; -width: 194px; -height: 150rpx; -color: rgba(108, 108, 108, 1); -font-size: 18px; -text-align: center; -font-family: SourceHanSansSC-regular; + left: 182rpx; + top: 798rpx; + width: 388rpx; + height: 150rpx; + color: rgba(108, 108, 108, 1); + font-size: 36rpx; + text-align: center; + font-family: SourceHanSansSC-regular; } .qwsj{ position: absolute; - left: 140px; -top: 490px; -width: 96px; -height: 33px; -color: rgba(248, 99, 42, 1); -font-size: 24px; -text-align: center; -font-family: SourceHanSansSC-regular; + left: 280rpx; + top: 980rpx; + /* width: 192rpx; */ + height: 66rpx; + color: rgba(248, 99, 42, 1); + font-size: 48rpx; + text-align: center; + font-family: SourceHanSansSC-regular; } .qwsjtxt{ position: absolute; - left: 125px; -top: 536px; -width: 127px; -height: 25px; -color: rgba(108, 108, 108, 1); -font-size: 18px; -text-align: center; -font-family: SourceHanSansSC-regular; + left: 250rpx; + top: 1072rpx; + width: 254rpx; + height: 50rpx; + color: rgba(108, 108, 108, 1); + font-size: 36rpx; + text-align: center; + font-family: SourceHanSansSC-regular; } .yqq{/*圆圈*/ - border-radius: 64rpx; + border-radius: 50%; position: absolute; width: 60px; height:60px; @@ -234,16 +233,16 @@ font-family: SourceHanSansSC-regular; border-radius: 64rpx; position: absolute; left: 21px; -top: 644px; -width: 60px; -height: 60px; -background: linear-gradient(222.54deg, rgba(248,99,42,1) 14.03%,rgba(249,135,89,1) 85.21%); -color: rgba(16, 16, 16, 1); -font-size: 12px; -text-align: center; -box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4); -font-family: Arial; -border: 3px solid rgba(255, 255, 255, 1); + top: 644px; + width: 60px; + height: 60px; + background: linear-gradient(222.54deg, rgba(248,99,42,1) 14.03%,rgba(249,135,89,1) 85.21%); + color: rgba(16, 16, 16, 1); + font-size: 12px; + text-align: center; + box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4); + font-family: Arial; + border: 3px solid rgba(255, 255, 255, 1); } .ywcczk{ @@ -251,13 +250,20 @@ border: 3px solid rgba(255, 255, 255, 1); height:192rpx; top:1290rpx; width:750rpx; + display: flex; + justify-content: center; } .anwz1{ - position: absolute; - width:120rpx; + width: 120rpx; height: 192rpx; + margin-right: 40rpx; +} + +.anwz1:last-child { + margin-right: 0; } + .anwztxt1{ position: absolute; width:120rpx; @@ -274,21 +280,99 @@ border: 3px solid rgba(255, 255, 255, 1); width: 42px; height: 42px; } -.sc1{ - margin-left: 42rpx; + +.popup-main { + height: 462rpx; + background-color: #fff; +} + +.popup-main .main-top { + height: 80rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 30rpx; + box-sizing: border-box; + border-bottom: 1px solid #E9E9E8; +} + +.t-icon-close { + color: #6c6c6c; +} + +.popup-main .main-top .text { + font-size: 16px; + color: #6c6c6c; +} + +.popup-main .main-box { + height: 100%; + padding-top:70rpx; + box-sizing: border-box; + display: flex; + flex-wrap: wrap; +} + +.popup-main .main-box .box-item { + width: 100rpx; + height: 150rpx; + margin-left: 70rpx; + display: flex; + align-items: center; + flex-direction: column; +} + +.popup-main .main-box .box-item .item-icon { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + margin-bottom: 10rpx; + display: flex; + justify-content: center; + align-items: center; + background-color: #1AAD19; +} + +.popup-main .main-box .box-item .item-icon .t-image { + width: 56rpx; + height: 56rpx; } -.xg1{ - margin-left: 112px; + +.popup-main .main-box .box-item .item-text { + font-size: 12px; + color: #A2A2A2; +} + +.cyan { + background-color: #A8E450 !important; } -.wc1{ - margin-left: 203px; +.orange { + background-color: #FF9900 !important; } -.fx1{ - margin-left: 294px; +.blue { + background-color: #3CCDFF !important; } -.sc2{ - margin-left: 112px; +.yellow { + background-color: #FFCE41 !important; } -.fx2{ - margin-left: 203px; +.cyan { + background-color: #A8E450 !important; +} + +.all-img { + position: absolute; + top: 192rpx; + left: 336rpx; + width: 80rpx; + height: 64rpx; + z-index: 1; +} + +.all-img-processing { + position: absolute; + top: 192rpx; + left: 336rpx; + width: 80rpx; + height: 64rpx; + z-index: 1; } \ No newline at end of file diff --git a/pages/home/xyc/wdyw/wdyw.js b/pages/home/xyc/wdyw/wdyw.js index 97e38ba..9d0e38f 100644 --- a/pages/home/xyc/wdyw/wdyw.js +++ b/pages/home/xyc/wdyw/wdyw.js @@ -11,7 +11,6 @@ Page({ detail:{}, visible:false, shareVisible:false, //分享弹层 - rrs:[{"lastModifiedDate":"2023-03-29T14:49:58.000+08:00","createdAt":"2023-03-14T15:44:16.000+08:00","id":1,"userid":1,"link":"http://www.baidu.com","img":"http://oss.wish.ydxxkj.top/resource/24130a65-ec5e-4c48-86d1-e964859f8532-1680072583657.jpg","content":"我希望明年去富士山下的樱花.","status":"processing","deadline":"2024-04-16"},{"lastModifiedDate":"2023-03-29T14:49:58.000+08:00","createdAt":"2023-03-14T15:44:16.000+08:00","id":1,"userid":1,"link":"http://www.baidu.com","img":"http://oss.wish.ydxxkj.top/resource/24130a65-ec5e-4c48-86d1-e964859f8532-1680072583657.jpg","content":"我希望明年去富士山下的樱花.","status":"completed","deadline":"2024-04-16"},{"lastModifiedDate":"2023-03-29T14:49:58.000+08:00","createdAt":"2023-03-14T15:44:16.000+08:00","id":1,"userid":1,"link":"http://www.baidu.com","img":"http://oss.wish.ydxxkj.top/resource/24130a65-ec5e-4c48-86d1-e964859f8532-1680072583657.jpg","content":"我希望明年去富士山下的樱花.","status":"expired","deadline":"2024-04-16"}], wishes:[] }, // 分享微信 diff --git a/pages/home/xyc/wdyw/wdyw.wxss b/pages/home/xyc/wdyw/wdyw.wxss index bdfd7fd..88781d5 100644 --- a/pages/home/xyc/wdyw/wdyw.wxss +++ b/pages/home/xyc/wdyw/wdyw.wxss @@ -59,7 +59,6 @@ height: 1370rpx; background-repeat: no-repeat; background-size:100% 100%; - background-image: url(https://oss.wish.ydxxkj.top/xy/xycbg3.png); } .boxitem{ diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 7ea8663..896797a 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -14,7 +14,7 @@ display: flex; flex-direction: column; align-items: center; - background-image: url(https://oss.wish.ydxxkj.top/xy/bkg.png); + background-image: url(https://oss.wish.ydxxkj.top/xy/index-bgc.png); background-repeat: no-repeat; background-size: contain; } diff --git a/project.private.config.json b/project.private.config.json index a858ce3..afcc415 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -10,35 +10,14 @@ "list": [ { "name": "", - "pathName": "pages/xz/index", + "pathName": "pages/home/jl/index", "query": "", "launchMode": "default", "scene": null }, { "name": "", - "pathName": "pages/home/xx/lindex/lxz/lxz", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "pages/home/xx/xz/xz", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "pages/xz/index", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "pages/home/me/indexx", + "pathName": "pages/home/xx/lindex/lindex", "query": "", "launchMode": "default", "scene": null