From 2dcf5c6a02354a7d1f41c38149381c8865133ffd Mon Sep 17 00:00:00 2001 From: Wkang921 Date: Thu, 1 Jun 2023 11:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4+=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 10244 bytes icons/.DS_Store | Bin 0 -> 6148 bytes miniprogram_npm/.DS_Store | Bin 0 -> 8196 bytes pages/home/jl/index.js | 43 +++++++ pages/home/jl/index.wxml | 55 +++++++-- pages/home/jl/index.wxss | 71 ++++++++++-- pages/home/jl/jlai/jlai.js | 2 +- pages/home/xy/index.wxss | 24 ++-- pages/home/xyc/index.js | 57 +++++++--- pages/home/xyc/index.json | 4 +- pages/home/xyc/index.wxml | 34 +++++- pages/home/xyc/index.wxss | 171 ++++++++++++++++++++++++++-- pages/home/xyc/wdyw/wdyw.js | 16 ++- pages/home/xyc/wdyw/wdyw.json | 3 +- pages/home/xyc/wdyw/wdyw.wxml | 69 +++++++++-- pages/home/xyc/wdyw/wdyw.wxss | 209 +++++++++++++++++++++++----------- project.private.config.json | 9 +- styles/.DS_Store | Bin 0 -> 6148 bytes utils/.DS_Store | Bin 0 -> 6148 bytes 19 files changed, 616 insertions(+), 151 deletions(-) create mode 100644 .DS_Store create mode 100644 icons/.DS_Store create mode 100644 miniprogram_npm/.DS_Store create mode 100644 styles/.DS_Store create mode 100644 utils/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c99eb79847e4dccd52b82e034a1f74d6656a1f7b GIT binary patch literal 10244 zcmeI1(QeZ)6o!wtb)=;gB9}Z0s6)GyOK6({L%HNhos?Vap;sp$OSJ>};t{qNt=v4FN+SNnja8S)A7E)TL(Z{Ju}!?WVt5ZTeN{ z@UnVyLdea9pq6k;ZPV z4wct0U9aZ%OMcI*b!9ze^}@2!R=ToyV=!1NY^>UM@*Bfddr&CkSMBw?_lLu@wRCIk z;r34J=>6cs@Z%SB3_*n6mKN0Warzaxv49TB9k1zo4K_whVc;2~r=ycYA4M0@yr{q; zUDPlwV4m^anTy%h0j>s82W1tMwW+1eY+eabbW^O)7|!+lJ)VDs|DJzSx~(D30;MmV zPz7K)*Mq}@+tc8(+la!QXm?SuPVBG-^eSeigT?(0X#*f{1E(*arT0c&^T@n^2rJ@Y zvsw+4?BHc%b}4DcZR&%E{bZ8nMIEjP3~hj}0TVlueSq4<=9LRQ@msi=hT3A2gT&ix z4B^d0EnKTh2N?DMHUC|$SXHrF)AWqC=n-ww6UZD^WG%i9F#zUfVrB8Ph@y&UUQ|$#E^3&t zMVMd+7y^dCc_uKcKHld0|E`Q(-?iI_JBS=u zZ=|F&K_ai?A?0;E9{4(b1(9|0EIA-w4CP2klpvh`j{)ZVFTszy)-&h-)3}8_v0Jcz HJ^%j(GLp;g literal 0 HcmV?d00001 diff --git a/icons/.DS_Store b/icons/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1ebdd6d5b0a5e63ea7752d75af1639b48ac692ce GIT binary patch literal 6148 zcmeH~K~LK-6vv;TY;MrB9+2SZ%cLE8Xa}M~6H-*zfg4h$?Jy7|q#BX37&R%~=sM+V zz&F@O*(c!RZ134`Q)mj8p@|_s>G|*2?>Y5Pv0Vdz=#SzqKnnmQI%&hhVvbQidCeBM zrHLxc7@zl2eG;WQs>QknN5Bzycm!zeE`KzL`LKMj92=P z=qye0qSLt+3yY1VCr_pHr1#7_3{LepD8gct_ru`_dfE?*(}?SDwNC%k!{}Wy7$3D( zc63&RNj4aoRWm7hfT5FR@x3|?+uR2@Pwwm;MownLo z-<(dHa`i=bd++$umy5~Q>9LVb$Uv8nVqUBHQTwHL}`7XTW(d!td)&cw%)1-rStW3UKaZXCNY<`!-$% za{0aocH=n$j=+CUfc6K4PU^FkR?XIdg}DNtHn7 z2&6MuPkfa{n$~FM%0Vg0^xx)6o*RV8IxottuLIcs)b;4HLVMty1QIuuoI-*lP7%W1yIoIv`?r~$)>8L_OH zSX&!Oo*J-*lcVbc*4pT3a=;ond3t?4X7nB(Iy*L3Tv=Uvxc=ywTm+El9Rls@dZT@g zQq2;VGCuP-D`2m%=zU3{*NOzZgN}2RGK0hDO zaJojG$(rp!-she-!2>sRIh(m1;GQ1~X>p9rbDVJr_xN~83ivRF&sxzD)Eu=J&_R)rHvFriNgV(`g(DH|r4 zWSr4htS>bYjT+Do=iwSm!F^bTr|<$d?kji$AK(*wA^XT7a*Xto5ptHCBUi|Ea)V5g z8FGuvD*L8tNFA-trjR&@+kEDA;dT(p7;H8MR|!My0R~qdgG>bAAWAj{-V(L}UJZk@ zHRwn$&RQFEzvOGThTbocQ1>tld>G64z7vnaN7C&&!XMWW-k`r*No`nY9dRlQc4phG zZYv@3|4Tpq{=YMCUf-2wKr`@L7$7YdGZ)k7s(Ogmdlk91g>??AC_=BIP?}&P({V(Z qjw5dTVTiJYs=_7}VMQVKVEOAG0)F~iVz(Yu`uzU`>Eb_o{(l4YCY0p> literal 0 HcmV?d00001 diff --git a/pages/home/jl/index.js b/pages/home/jl/index.js index 819afe3..5a3ce02 100644 --- a/pages/home/jl/index.js +++ b/pages/home/jl/index.js @@ -17,6 +17,7 @@ Page({ minute:0, minutes:0, pickerValue: [0, 0], + prayTime:0, //祈祷时间 prayerContent:'', //祈祷内容 showSexLogo:false,//不展示形象修改按钮 showPray:false, //显示祈祷弹层 @@ -25,6 +26,9 @@ Page({ showEnergyToast:false, //显示赠送能量提示 showEnergySuccess:false, //赠送成功提示 showEnergyFail:false, //赠送成功提示 + showInject:false, //显示注入能量 + showInEnergy:false, //显示能量注入中 + showScsEnergy:false //显示注册成功提示 }, ShowOrNotLogoS(){ this.setData({singleShow:!this.data.singleShow}) @@ -140,9 +144,48 @@ Page({ pickerValue: e.detail.value }) }, + openInject(){ + this.setData({ + showInject:!this.data.showInject + }) + }, + // 注入晶石 + btnInject(){ + this.setData({ + showInject:!this.data.showInject, + showInEnergy:!this.data.showInEnergy + }) + req.patchRequest('/api/user/curt/inject-energy-to-pendant',{}).then((res)=>{ + console.log('能量注入成功'); + this.getUserInfo() + }) + setTimeout(()=>{ + this.setData({ + showInEnergy:!this.data.showInEnergy, + showScsEnergy:true + }) + },2000) + }, getUserInfo(){ req.getRequest('/api/user/curt',{}).then((res)=>{ if(res.data.code===200){ + // 获取已经祈祷时间 + const now = new Date(); + const startTime = new Date(res.data.data.prayerStartTime) + const diff = now.getTime() - startTime.getTime(); + const hour = Math.floor(diff / (1000 * 60 * 60)); + const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60)); + const seconds = Math.floor((diff % (1000 * 60)) / 1000); + const formattedTime = `${hour.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`; + // 获取结束祈祷返回能量 + const nowTime = new Date(); + const endTime = new Date(res.data.data.prayerEndTime) + const TimeDiff = endTime.getTime() - nowTime.getTime(); + this.setData({ + prayTime: formattedTime, + energy:Math.floor(TimeDiff / 36000) + }) + const pendantEnergy = res.data.data.pendantEnergy const minute = pendantEnergy * 6 const hours = Math.floor(pendantEnergy / 60); // 计算小时数 diff --git a/pages/home/jl/index.wxml b/pages/home/jl/index.wxml index 6e83411..06ac444 100644 --- a/pages/home/jl/index.wxml +++ b/pages/home/jl/index.wxml @@ -21,16 +21,29 @@ - + - -70% + +{{userInfo.crystallineEnergy}}% + - + + + + 能量已经集满啦！ + 可以注入到水晶中 + 增强运势哦！ + + + + 能量已注入100% + 守护时间为08小时00分 + + 水晶能量 能量注入 @@ -51,7 +64,7 @@ {{ userInfo.prayerContent }} - 你已为Ta祈祷 02:20:13 + 你已为Ta祈祷 {{prayTime}} @@ -85,18 +98,18 @@ - - + + 祈祷 - - + + - 70% - 79% + {{userInfo.crystallineEnergy}}% + {{loverInfo.crystallineEnergy}}% @@ -174,7 +187,7 @@ 要结束祈祷吗？ - 将返还23%星座能量 + 将返还{{energy}}%星座能量 溢出能量将消失 @@ -229,6 +242,24 @@ + + + + + + 你要将能量注入到晶石吗？ + 晶石将开启守护计时 + + + + + + + + + + 能量注入中…… +
精灵 AI
diff --git a/pages/home/jl/index.wxss b/pages/home/jl/index.wxss index 7615e90..0295734 100644 --- a/pages/home/jl/index.wxss +++ b/pages/home/jl/index.wxss @@ -38,12 +38,13 @@ .dcright{ position:absolute; - width:116.67rpx; - height:116.67rpx; - margin-left: 520rpx; - margin-top:1232rpx; - background-color: #f76229; + width: 100rpx; + height: 100rpx; + margin-left: 528rpx; + margin-top: 1240rpx; + /* background-color: #f76229; */ border-radius: 58.335rpx; + z-index: 1; } .dclefttxt{ @@ -71,8 +72,8 @@ position:absolute; width:68rpx; height:78.67rpx; - margin-left:24rpx; - margin-top:18.67rpx; + margin-left: 18rpx; + margin-top: 14rpx; background-repeat: no-repeat; background-size:100% 100%; background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/wjx.png); @@ -844,4 +845,60 @@ picker-view-column { padding: 36rpx 0 0 20rpx; box-sizing: border-box; box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4); +} + +.energy-full { + position: absolute; + top: 500rpx; + right: 230rpx; + width: 286rpx; + height: 160rpx; + opacity: 0.9; + border-radius: 15px; + background-color: rgba(255, 255, 255, 1); + color: #6C6C6C; + font-size: 14px; + padding: 18rpx 0 0 20rpx; + box-sizing: border-box; + box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4); +} + +.energy-complete { + position: absolute; + top: 500rpx; + right: 230rpx; + width: 336rpx; + height: 160rpx; + opacity: 0.9; + border-radius: 15px; + background-color: rgba(255, 255, 255, 1); + color: #6C6C6C; + font-size: 14px; + padding: 36rpx 0 0 20rpx; + box-sizing: border-box; + box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4); +} + +.in-energy { + position: absolute; + top: 500rpx; + right: 130rpx; + width: 484rpx; + height: 434rpx; + font-size: 18px; + color: #6C6C6C; + border-radius: 15px; + background-color: rgba(255, 255, 255, 1); + text-align: center; + box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4); +} + +.dcright1 { + position: absolute; + bottom: 270rpx; + right: 109rpx; +} + +.dcright1 .t-progress__canvas--inner { + background-color: #f76229 !important; } \ No newline at end of file diff --git a/pages/home/jl/jlai/jlai.js b/pages/home/jl/jlai/jlai.js index 29a2404..511e055 100644 --- a/pages/home/jl/jlai/jlai.js +++ b/pages/home/jl/jlai/jlai.js @@ -41,7 +41,7 @@ Page({ }, go2BB(e){/**鼠标回显事件 */ - this.setData({ltinfo:e.detail.value}) + // this.setData({ltinfo:e.detail.value}) }, go2Send(e){/**发送消息 */ this.setData({isBlank:false}) diff --git a/pages/home/xy/index.wxss b/pages/home/xy/index.wxss index d4b6bdf..1b3de2d 100644 --- a/pages/home/xy/index.wxss +++ b/pages/home/xy/index.wxss @@ -26,8 +26,8 @@ .gold1{ position: absolute; - width: 608.22rpx; - height: 487.33rpx; + width: 540rpx; + height: 500rpx; display: flex; flex-direction: column; background-repeat: no-repeat; @@ -49,8 +49,8 @@ } .gold2{ position: absolute; - width: 608.22rpx; - height: 487.33rpx; + width: 540rpx; + height: 500rpx; display: flex; flex-direction: column; background-repeat: no-repeat; @@ -65,14 +65,14 @@ .gold3{ position: absolute; - width: 354.67rpx; - height: 327.33rpx; + top: 190rpx; + left: 190rpx; + width: 370rpx; + height: 330rpx; display: flex; flex-direction: column; background-repeat: no-repeat; background-size:100% 100%; - margin-top: 192.67rpx; - margin-left:198.67rpx; background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xy/gold3.png); } @@ -90,15 +90,15 @@ .gold2{ position: absolute; - width: 608.22rpx; - height: 487.33rpx; + width: 550rpx; + height: 550rpx; display: flex; flex-direction: column; background-repeat: no-repeat; background-size:100% 100%; - left: 0; + left: 8rpx; right: 0; - top: 0; + top: -12rpx; bottom: 0; margin: auto; background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xy/gold22.png); diff --git a/pages/home/xyc/index.js b/pages/home/xyc/index.js index 0af7286..70e2fa8 100644 --- a/pages/home/xyc/index.js +++ b/pages/home/xyc/index.js @@ -19,21 +19,17 @@ Page({ link:'', img:'' }, - cvisible: false, - note: '', - xyForm:{ - - }, + note: '', + xyForm:{}, visible:false,//弹窗 single:true, xzInfo:{}, userInfo:{}, xyNfc:true, - xyInfo:{ - - } - + xyInfo:{}, + showXyz:false, //显示许愿中弹层 + showDetail:false //许愿成功回显弹层 }, handleAdd(e){/**添加图片 */ const { fileList } = this.data; @@ -67,7 +63,7 @@ Page({ type: 'poster' }, success: async res => { - let data = JSON.parse(res.data); + let data = JSON.parse(res.data); console.log(data, '111111'); if (data.code == 200) { this.setData({imgUrl:data.data.abUrl}) @@ -89,7 +85,6 @@ Page({ showToast('图片上传失败'); } }); - console.log('许愿成功！') }, go2MyYw(){ wx.navigateTo({ @@ -111,7 +106,10 @@ Page({ const { value } = e.detail; const format = (val) => { const date = new Date(val); - return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`; + const year = date.getFullYear(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const day = date.getDate().toString().padStart(2, '0'); + return `${year}-${month}-${day}`; }; this.setData({ @@ -165,10 +163,11 @@ Page({ duration: 5000 }) }else{ + console.log('图片地址', this.data.imgUrl); + console.log('图片地址', this.data.xyLink); req.postRequest('/api/user/curt/wish',{content:this.data.xyContent,deadline:this.data.note,img:this.data.imgUrl,link:this.data.xyLink}).then((res)=>{ console.log('许愿成功11111！') console.log(res) - console.log('额外情况') if(res.data.code==200){ this.setData({ visible: false, @@ -177,7 +176,14 @@ Page({ if(res.data.data&&res.data.data.loverId&&res.data.data.loverId!=null){ this.setData({single:false}) } - this.setData({xyContent:'',xyLink:'',note:'',imgUrl:'',fileList:[]}) + this.setData({xyContent:'',xyLink:'',note:'',imgUrl:'',fileList:[],showXyz:true}) + setTimeout(()=>{ + this.setData({ + showXyz:false, + showDetail:true, + item:res.data.data + }) + },2000) }else{ console.log('额外情况') wx.showToast({ @@ -215,13 +221,34 @@ Page({ }) this.setData({xyInfo:wx.getStorageSync('nfc')}) }, + // 关闭回显 + closeDetail(){ + this.setData({ + showDetail: false + }) + }, + // 分享 + openShare(){ + console.log('分享'); + }, + // 获取我的许愿 + getMyWish(){ + req.getRequest('/api/user/curt/wish',{}).then((res)=>{ + console.log(res,'11111111') + if(res.data.code==200){ + this.setData({wishes:res.data.data.records}) + } + }).catch((err)=>{ + console.log(err); + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { this.initXy() - + this.getMyWish() }, /** diff --git a/pages/home/xyc/index.json b/pages/home/xyc/index.json index 1ee391f..4cea983 100644 --- a/pages/home/xyc/index.json +++ b/pages/home/xyc/index.json @@ -5,6 +5,8 @@ "t-input": "tdesign-miniprogram/input/input", "t-textarea": "tdesign-miniprogram/textarea/textarea", "t-calendar": "tdesign-miniprogram/calendar/calendar", - "t-upload": "tdesign-miniprogram/upload/upload" + "t-upload": "tdesign-miniprogram/upload/upload", + "t-dialog": "tdesign-miniprogram/dialog/dialog", + "t-image": "tdesign-miniprogram/image/image" } } \ No newline at end of file diff --git a/pages/home/xyc/index.wxml b/pages/home/xyc/index.wxml index 090f235..294d971 100644 --- a/pages/home/xyc/index.wxml +++ b/pages/home/xyc/index.wxml @@ -1,12 +1,12 @@ 银币{{userInfo.silverCoin}}枚 -我的愿望 +我的愿望{{wishes.length}} 银币{{userInfo.silverCoin}}枚 Ta的愿望 -我的愿望 +我的愿望{{wishes.length}} @@ -44,4 +44,32 @@ - \ No newline at end of file + + + + + 投枚银币许个愿吧！守护精灵将会祝福你的愿望！ + + + + + 愿望祝福中…… + + + + + + + + 愿望 + {{item.content}} + 期望时间 + {{item.deadline}} + + + + + 分享 + + + diff --git a/pages/home/xyc/index.wxss b/pages/home/xyc/index.wxss index bc0d1a2..3d18d37 100644 --- a/pages/home/xyc/index.wxss +++ b/pages/home/xyc/index.wxss @@ -222,13 +222,13 @@ .qwsj{ position: absolute; left: 92rpx; -top: 468rpx; -width: 72px; -height: 24px; -color: rgba(108, 108, 108, 1); -font-size: 16px; -text-align: left; -font-family: SourceHanSansSC-regular; + top: 468rpx; + width: 72px; + height: 24px; + color: rgba(108, 108, 108, 1); + font-size: 16px; + text-align: left; + font-family: SourceHanSansSC-regular; } .xylj{ @@ -341,7 +341,7 @@ border: 1px solid rgba(187, 187, 187, 1); .xltb{ position: absolute; - left:596rpx; + left:530rpx; top:480rpx; width:26rpx; height:26rpx; @@ -369,3 +369,158 @@ border: 1px solid rgba(187, 187, 187, 1); margin-top: 370rpx; margin-left: 75rpx; } + +/* 提示 */ +.xyc-toast { + position: absolute; + top: 720rpx; + right: 180rpx; + width: 310rpx; + height: 180rpx; + padding: 12px; + box-sizing: border-box; + color: #6c6c6c; + line-height: 20px; + opacity: 0.9; + border-radius: 15px; + background-color: rgba(255, 255, 255, 1); + font-size: 14px; + box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4); +} + +/* 许愿进行中 */ +.xyc-process { + position: absolute; + top: 530rpx; + left: 140rpx; + z-index: 999; + width: 484rpx; + height: 434rpx; + line-height: 20px; + border-radius: 15px; + background-color: rgba(255, 255, 255, 1); + color: #6c6c6c; + text-align: center; + box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4); +} + +/* 许愿成功回显 */ +.wishdetail{ + position: absolute; + width:750rpx; + height:1624rpx; + background-color: rgba(255, 255, 255, 0.7); +} +.popbox{ + position: absolute; + left: 66rpx; + top: 206rpx; + width: 620rpx; + height: 1080rpx; + background-repeat: no-repeat; + background-size:100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xyc/detailbkg.png); +} + +.yximg{ + position: absolute; + left: 146rpx; + top: 330rpx; + width: 460rpx; + height: 308rpx; + border-radius: 10px; + background-color: #767686; +} +.ywwz2{ + position: absolute; + left: 328rpx; + top: 706rpx; + width: 96rpx; + height: 66rpx; + color: rgba(248, 99, 42, 1); + font-size: 24px; + text-align: left; + font-family: SourceHanSansSC-bold; +} + +.ywxq2{ + position: absolute; + left: 182rpx; + top: 798rpx; + width: 388rpx; + height: 150rpx; + color: rgba(108, 108, 108, 1); + font-size: 18px; + text-align: center; + font-family: SourceHanSansSC-regular; +} +.qwsj2{ + position: absolute; + left: 280rpx; + top: 980rpx; + width: 192rpx; + height: 66rpx; + color: rgba(248, 99, 42, 1); + font-size: 24px; + text-align: center; + font-family: SourceHanSansSC-regular; +} +.qwsjtxt2{ + position: absolute; + left: 250rpx; + top: 1072rpx; + width: 254rpx; + height: 50rpx; + color: rgba(108, 108, 108, 1); + font-size: 18px; + text-align: center; + font-family: SourceHanSansSC-regular; +} + +.anwz1 { + position: absolute; + bottom: 0; + margin-left: 315rpx; +} + +.anwz1 .anwz1-tb { + width: 120rpx; + height: 120rpx; + margin: 0 auto; + border-radius: 50%; + background-color: #F8632A; + line-height: 17px; + background: linear-gradient(222.54deg, rgba(248,99,42,1) 14.03%,rgba(249,135,89,1) 85.21%); + font-size: 12px; + box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4); + border: 3px solid rgba(255, 255, 255, 1); + display: flex; + justify-content: center; + align-items: center; +} + +.anwz1 .anwztxt1 { + margin-top: 20rpx; + font-size: 18px; + color: #6c6c6c; + text-align: center; +} + +.anwz1 .anzmlogo1 { + width: 100rpx; + height: 100rpx; +} + +.xyctoast { + position: absolute; + top: -16rpx; + right: -16rpx; + display: flex; + justify-content: center; + align-items: center; + width: 40rpx; + height: 40rpx; + border-radius: 50%; + background-color: #F73535; + +} \ No newline at end of file diff --git a/pages/home/xyc/wdyw/wdyw.js b/pages/home/xyc/wdyw/wdyw.js index 0f2ab2b..7a71f71 100644 --- a/pages/home/xyc/wdyw/wdyw.js +++ b/pages/home/xyc/wdyw/wdyw.js @@ -10,9 +10,15 @@ Page({ showDelDialog:false, 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:[] }, + showShare(){ + this.setData({ + shareVisible:!this.data.shareVisible + }) + }, go2DelDialog(){ this.setData({showDelDialog:true}) }, @@ -33,6 +39,10 @@ Page({ icon: 'none', duration: 1000 }) + this.getMyWish() + this.setData({ + visible: false + }) } }).catch((err)=>{ console.log(err); @@ -64,8 +74,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 +90,7 @@ Page({ }, getMyWish(){ req.getRequest('/api/user/curt/wish',{}).then((res)=>{ - console.log(res) + console.log(res,'11111111') if(res.data.code==200){ this.setData({wishes:res.data.data.records}) } diff --git a/pages/home/xyc/wdyw/wdyw.json b/pages/home/xyc/wdyw/wdyw.json index b11bd4d..0f8ec47 100644 --- a/pages/home/xyc/wdyw/wdyw.json +++ b/pages/home/xyc/wdyw/wdyw.json @@ -2,6 +2,7 @@ "usingComponents": { "t-image": "tdesign-miniprogram/image/image", "t-popup": "tdesign-miniprogram/popup/popup", - "t-dialog": "tdesign-miniprogram/dialog/dialog" + "t-dialog": "tdesign-miniprogram/dialog/dialog", + "t-icon": "tdesign-miniprogram/icon/icon" } } \ No newline at end of file diff --git a/pages/home/xyc/wdyw/wdyw.wxml b/pages/home/xyc/wdyw/wdyw.wxml index 3a89581..4905cf4 100644 --- a/pages/home/xyc/wdyw/wdyw.wxml +++ b/pages/home/xyc/wdyw/wdyw.wxml @@ -8,8 +8,7 @@ - - + {{item.content}} @@ -20,7 +19,6 @@ 进行中 已完成 已过期 - @@ -39,46 +37,46 @@ - + 删除 - + 修改 - + 已达成 - + 分享 - + 删除 - + 分享 - + 删除 - + 修改 @@ -100,4 +98,51 @@ data-del="{{detail.id}}" bind:cancel="closeDelDialog" /> - + + + + + + 分享到 + + + + + + + + 微信 + + + + + + 朋友圈 + + + + + + 微博 + + + + + + QQ + + + + + + QQ空间 + + + + + + 生成图片 + + + + diff --git a/pages/home/xyc/wdyw/wdyw.wxss b/pages/home/xyc/wdyw/wdyw.wxss index 8cb305e..af4de81 100644 --- a/pages/home/xyc/wdyw/wdyw.wxss +++ b/pages/home/xyc/wdyw/wdyw.wxss @@ -54,16 +54,16 @@ background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xyc/bg .xycbg3{ position: absolute; left: -24px; -top: 116px; -width: 440px; -height: 635px; -background-repeat: no-repeat; -background-size:100% 100%; -background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xyc/xycbg3.png); + top: 116px; + width: 440px; + height: 635px; + background-repeat: no-repeat; + background-size:100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xyc/xycbg3.png); } .boxitem{ - margin-left: 16px; + margin: 0 auto; top: 104px; width: 343px; height: 94px; @@ -104,13 +104,13 @@ background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xyc/xy .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 +151,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://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xyc/detailbkg.png); @@ -162,57 +162,57 @@ 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: 24px; + 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: 18px; + 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: 24px; + 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: 18px; + text-align: center; + font-family: SourceHanSansSC-regular; } .yqq{/*圆圈*/ @@ -251,13 +251,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 +281,87 @@ 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: 70rpx; + height: 70rpx; +} + +.popup-main .main-box .box-item .item-icon image { + width: 100rpx; + height: 100rpx; + border-radius: 50%; +} + +.popup-main .main-box .box-item .item-text { + font-size: 12px; + color: #A2A2A2; } -.xg1{ - margin-left: 112px; + +.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; } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 10f451f..344f243 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -10,14 +10,7 @@ "list": [ { "name": "", - "pathName": "pages/home/xx/lindex/lindex", - "query": "", - "launchMode": "default", - "scene": null - }, - { - "name": "", - "pathName": "pages/home/xx/lindex/lindex", + "pathName": "pages/home/xyc/index", "query": "", "launchMode": "default", "scene": null diff --git a/styles/.DS_Store b/styles/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3076cc35fc784d416fb8246580b4e3c01caa3b3e GIT binary patch literal 6148 zcmeHK!Ab)$5KU^UX+`Wo&|@xwhaOrLOA%qI_25ld(Su66Yl~f2H>JC^XszsT=pXq7 zevZy0sZ^>*MP&viZ+0@1-MoZkhcU+MgLZ|nB4bQ|B4+Z?d?MJ7IwKkDnFHi{jQB8A zmwu@HnOJiCP6lx8ax7q%OtFYfuODuSUC@nJE&B7PBK=|9vn&1V_rf4f%H{SzOsyQQ`$rr>~QPb_YVv zPlKqfhIKWF+OZzTH623aMZQ^F8;vT}T1jq}YvYm}RjcKa+}_$5kMm-6y|Q=My1u;| z-H#t0^&}XF&8lVD;sl<+n402^+mAvOU4eI!F^ME328aP-;7>DP4>hs)r)NPQPYe(P z-@yQ$4-yp7v6vdvM+Y>z1OUu}TMO9u-t{@Q9}$61OJl&o^7~| zI?T=9tuwR4yHKv6I*HTa$ahQ5j+7O&zpP%Yq>XaG7EQ-k0Ep&tQF12x3Jk23HE D?K)h* literal 0 HcmV?d00001 diff --git a/utils/.DS_Store b/utils/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d85d1680ee14628461bacaccfaea94fef8d7d2eb GIT binary patch literal 6148 zcmeHK!EO^V5FMwXb%GE%RBDgDAoUPc2_T{hRa&Lx&>PaCa)7GcWkb7YyDr%c5e-3m z;UnM=_!PdNpHtr0rb?Tj-Vg$hG=5|Ijjes_wbw)>`lF;v)FL7YXRI|)EHLh8pR<~4 zSq2I-MnVyl6zygD%^ce|{EZ6myOZ>mG!5yLX5L?%=@@;yFrLCUE{!2tz>mkpndAS6 z&$6^AJDm$rTdLn#UXijXoA;Ur;fWrHWmJxeel&c=wdYZJ61(_?*4b4Y#rx@CeArsu z(RmrA`Cw?0(_{e3>z8Ss=y6|<@}w~1gtkMy~ycDAN%HR<&_ZT0xk zlj*b}*B*4Y_l{0Ko=-kaKYulkLIMld*nNk;;2VNDVLpVzJk$9x`Z!Ng2H}n=rJOeD z9TmLrXN3C>&a7}vh&-V8G(uV6Ls^g`)^6mifL&sSY$5y04K}LYyaHYUufXjJxUEm# zy`AbAUIDMbf2IKM4+_p0IIJw1tpkO*0s!l1Hinpg897He3>;P#(E}4U6=+k1yJ85N zj&|jEfy2t8O()?lAHvNn+zmyT*)hH{bP|C@UwQ?+0@oE-veg!!|IdDZ|G%E(YhD4b zz(1vcsPBfmeLRvoTjw5*&sqgPg0nHNvUrt(z#PTk@=?4FH->h_0Wfe_SwsuW{|Fcv LeBl-NqYC^4TzQ99 literal 0 HcmV?d00001