diff --git a/pages/home/jl/jlai/jlai.js b/pages/home/jl/jlai/jlai.js index ccfd6aa..29a2404 100644 --- a/pages/home/jl/jlai/jlai.js +++ b/pages/home/jl/jlai/jlai.js @@ -7,6 +7,7 @@ Page({ * 页面的初始数据 */ data: { + isAdd:false, times:0,//非会员聊天次数 chatList:[], ltinfo:'', @@ -14,6 +15,14 @@ Page({ userInfo:{}, stxx:false, }, + addClick(){ + console.log('点击了加号') + this.setData({isAdd:true}) + }, + noaddClick(){ + console.log('点击了加号') + this.setData({isAdd:false}) + }, dovipTips(){ wx: wx.showToast({ title: '请购买会员或聊天次数', diff --git a/pages/home/jl/jlai/jlai.wxml b/pages/home/jl/jlai/jlai.wxml index 46e0abb..5e3a7e7 100644 --- a/pages/home/jl/jlai/jlai.wxml +++ b/pages/home/jl/jlai/jlai.wxml @@ -45,17 +45,36 @@ - + - - + + - + - + + + + + + + + + + + + + + 星座运势 + 星座占卜 + 塔罗占卜 + 文字冒险游戏 + 帮我写一封情书 + 我和Ta未来会怎样 + 情感倾诉 diff --git a/pages/home/jl/jlai/jlai.wxss b/pages/home/jl/jlai/jlai.wxss index b231fa0..e2937b9 100644 --- a/pages/home/jl/jlai/jlai.wxss +++ b/pages/home/jl/jlai/jlai.wxss @@ -290,4 +290,76 @@ height: 66.45px; background-repeat: no-repeat; background-size:100% 100%; background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/hyhg.png); +} +.ltk112{ + position: absolute; + left: 0px; + top: 1224rpx; + width: 375px; + height: 90px; + line-height: 20px; + background-color: rgba(248, 248, 248, 1); + text-align: center; + border: 1px solid rgba(255, 0, 0, 0); +} +.myshkjj{ + position: absolute; + top: 1340rpx; + width: 1924rpx; + height: 108px; + line-height: 20px; + background-color: rgba(255, 255, 255, 1); + text-align: center; + overflow: auto; +} +.myshkjjco{ + position: absolute; + height: 30px; + line-height: 55rpx; + opacity: 0.9; + border-radius: 24px; + background: linear-gradient(222.69deg, rgba(248,99,42,1) 14.04%,rgba(249,135,89,1) 88.56%); + font-size: 12px; + text-align: center; + box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4); + font-family: Arial; + color: rgba(255, 255, 255, 1); + font-size: 14px; + text-align: center; + font-family: SourceHanSansSC-regular; +} +.myshkjjxzys{ + left: 14px; + top: 17px; + width: 88px; +} +.myshkjjxxzb{ + left: 118px; + top: 17px; + width: 88px; +} +.myshkjjtlzb{ + left: 222px; + top: 17px; + width: 88px; +} +.myshkjjwzmxyx{ + left: 326px; + top: 17px; + width: 137px; +} +.myshkjjbwxyfqs{ + left: 14px; +top: 63px; +width: 153px; +} +.myshkjjwhtwlhzy{ + left: 183px; +top: 63px; +width: 167px; +} +.myshkjjqgqs{ + left: 366px; +top: 63px; +width: 118px; } \ No newline at end of file diff --git a/pages/home/me/indexx.js b/pages/home/me/indexx.js index dc9169d..0510c15 100644 --- a/pages/home/me/indexx.js +++ b/pages/home/me/indexx.js @@ -9,6 +9,7 @@ Page({ * 页面的初始数据 */ data: { + isCxHq:false, bdsjhVisible:false, avatar:"", userInfo:{ diff --git a/pages/home/me/indexx.wxml b/pages/home/me/indexx.wxml index 0d2c935..86da8ac 100644 --- a/pages/home/me/indexx.wxml +++ b/pages/home/me/indexx.wxml @@ -78,7 +78,7 @@ - 重新获取 + {{isCxHq?'重新获取':'立即获取'}} 取消 完成 diff --git a/pages/home/me/indexx.wxss b/pages/home/me/indexx.wxss index 192e79e..db157f9 100644 --- a/pages/home/me/indexx.wxss +++ b/pages/home/me/indexx.wxss @@ -164,7 +164,7 @@ .smst{ position: absolute; - left: 57rpx; + left: 69rpx; top: 152rpx; width: 420rpx; height: 42rpx; diff --git a/pages/home/me/yjfk/yjfk.wxss b/pages/home/me/yjfk/yjfk.wxss index f5fbf26..a761362 100644 --- a/pages/home/me/yjfk/yjfk.wxss +++ b/pages/home/me/yjfk/yjfk.wxss @@ -68,13 +68,12 @@ } .submit{ - z-index: 9999; position: absolute; left: 236rpx; top: 1290rpx; width: 280rpx; height: 80rpx; - line-height: 80rpx; + line-height: 70rpx; border-radius: 20rpx; background: linear-gradient(233.49deg, rgba(248,99,42,1) 10.48%,rgba(249,135,89,1) 89.2%); text-align: center; diff --git a/pages/home/xx/lindex/lindex.js b/pages/home/xx/lindex/lindex.js index f72931b..d10dd8c 100644 --- a/pages/home/xx/lindex/lindex.js +++ b/pages/home/xx/lindex/lindex.js @@ -7,6 +7,7 @@ Page({ * 页面的初始数据 */ data: { + innerAudioContext:'', formats: {}, readOnly: false, placeholder: '开始输入...', @@ -37,6 +38,37 @@ Page({ hasLover:false,// 是否单身 userInfo:{} + }, + doLuYINBoF(e){ + //先判断是开是关 + if(!e.currentTarget.dataset.bf){//此时点击为关闭 + //设置当前状态为关闭,并关闭 + this.setData({['messages['+e.currentTarget.dataset.index+'].extra.isBf']:false}) + this.data.innerAudioContext.stop() // 关闭 + }else{//此时点击为开启 + // 先设置全部为false + for(var i =0;i{ + this.setData({['messages['+e.currentTarget.dataset.index+'].extra.isBf']:false}) + }) + } + }, //编辑器相关 readOnlyChange() { @@ -69,7 +101,6 @@ Page({ format(e) { let { name, value } = e.target.dataset if (!name) return - // console.log('format', name, value) this.editorCtx.format(name, value) }, @@ -140,7 +171,7 @@ Page({ fz = Math.floor(res.duration/(60*1000)) } if(res.duration>=1000){ - mz = Math.floor((res.duration-fz*60*1000)/(60*1000)) + mz = Math.floor((res.duration-fz*60*1000)/(1000)) } hm = res.duration - fz*60*1000-mz*1000 let sec = Math.floor(res.duration/1000) @@ -162,7 +193,8 @@ Page({ let data = JSON.parse(res.data); let id = data.data.id req.postRequest('/api/user/curt/message/lover',{"type": "audio","resourceId": id,extra:{ - ssec:ssec + ssec:ssec, + isBf:false //正在播放为false }}).then((res)=>{ tt.onLoad() if(res.data.code==200){ @@ -512,6 +544,10 @@ Page({ */ onLoad(options) { console.log('开始。。。。') + const innerAudioContext = wx.createInnerAudioContext({ + useWebAudioImplement: false + }) + this.setData({innerAudioContext:innerAudioContext}) this.popover = this.selectComponent('#popover'); console.log('结束。。。。') this.doQueryInit() @@ -539,7 +575,7 @@ Page({ * 生命周期函数--监听页面隐藏 */ onHide() { - console.log('隐藏了页面') + this.data.innerAudioContext.stop() }, /** @@ -547,7 +583,7 @@ Page({ */ onUnload() { clearInterval(this.data.timer) - console.log('卸载隐藏了页面') + this.data.innerAudioContext.stop() }, /** diff --git a/pages/home/xx/lindex/lindex.wxml b/pages/home/xx/lindex/lindex.wxml index a6c916a..f7ddb7a 100644 --- a/pages/home/xx/lindex/lindex.wxml +++ b/pages/home/xx/lindex/lindex.wxml @@ -45,8 +45,13 @@ - - 1111 + + {{item.extra.ssec}} + + + 1{{item.extra.ssec}} {{item.status=='unread'?'未读':'已读'}} @@ -173,52 +178,4 @@ 删除 - - - - - - - - - - - - To: - - - - - - - - - From: - - - - - - - - - - - - - - - - - 预览 - 发送 - - - - 音讯 - - 画像 - - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/home/xx/lindex/lxz/lxz.js b/pages/home/xx/lindex/lxz/lxz.js index 16b1fa3..a672bf6 100644 --- a/pages/home/xx/lindex/lxz/lxz.js +++ b/pages/home/xx/lindex/lxz/lxz.js @@ -1,11 +1,50 @@ Page({ data: { - formats: {}, - readOnly: false, - placeholder: '开始输入...', - editorHeight: 300, - keyboardHeight: 0, - isIOS: false + isYuLan:false,//是否是预览状态 + to:'', + from:'', + form:{ + to:'', + from:'' + }, + yxVisible:false,//音讯弹窗 + formats: {}, + readOnly: false, + placeholder: '开始输入...', + editorHeight: 300, + keyboardHeight: 0, + isIOS: false + }, + bINput(e){ + console.log(e) + }, + sqjdSj: function(e) { + console.log('到这里了。。。。') + console.log(e.detail.value); + console.log(this.editorCtx) + }, + doYulan(){ + console.log('点击了预览!!!') + this.setData({isYuLan:true}) + }, + doCancelYuLan(){ + console.log('取消了预览') + this.setData({isYuLan:false}) + }, + doSend(){ + console.log(this.data.to) + console.log('点击了发送!!!') + }, + doClickYinXun(){ + this.setData({yxVisible:true}) + }, + doCancelLuyin(){ + this.setData({yxVisible:false}) + }, + doCancelXz(){ + wx.navigateTo({ + url: '/pages/home/xx/lindex/lindex' + }) }, readOnlyChange() { this.setData({ diff --git a/pages/home/xx/lindex/lxz/lxz.json b/pages/home/xx/lindex/lxz/lxz.json index 6e4a260..c56374b 100644 --- a/pages/home/xx/lindex/lxz/lxz.json +++ b/pages/home/xx/lindex/lxz/lxz.json @@ -2,6 +2,6 @@ "navigationBarTitleText": "发表文章", "disableScroll": true, "usingComponents": { - + "t-popup": "tdesign-miniprogram/popup/popup" } } \ No newline at end of file diff --git a/pages/home/xx/lindex/lxz/lxz.wxml b/pages/home/xx/lindex/lxz/lxz.wxml index 919b459..7485cd0 100644 --- a/pages/home/xx/lindex/lxz/lxz.wxml +++ b/pages/home/xx/lindex/lxz/lxz.wxml @@ -2,35 +2,67 @@ - - + + To:{{to}} + + + + To: + + + + + + + + + From: + + + + + + + + + + + + From:{{from}} + - - - - - - - - - - - - - - - - 预览 - 发送 - - - - 音讯 - - 画像 - \ No newline at end of file + + + + + + + + + + + + + + + + + +音讯 + +画像 + +预览 + +发送 + + + 取消 + 添加 + + + diff --git a/pages/home/xx/lindex/lxz/lxz.wxss b/pages/home/xx/lindex/lxz/lxz.wxss index 7b97052..5dbe128 100644 --- a/pages/home/xx/lindex/lxz/lxz.wxss +++ b/pages/home/xx/lindex/lxz/lxz.wxss @@ -34,7 +34,7 @@ font-size: 16px; line-height: 1.5; overflow: auto; - padding: 10px 10px 20px 10px; + top: 50rpx; } .ql-active { @@ -68,7 +68,6 @@ .xfxfhl{ - z-index: 100; position: fixed; left: 0px; top: 331px; @@ -88,7 +87,7 @@ .xfzjhz{ position: absolute; left: 154px; - top: 482rpx; + top: 1144rpx; width: 73px; height: 71px; background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/xfzjhzpic.png); @@ -115,20 +114,19 @@ .xzfhan1{ left: 16px; - top: 592rpx; + top: 1252rpx; } .xzfhan2{ left: 608rpx; - top: 440rpx; + top: 1102rpx; } .xzfhan3{ left: 608rpx; - top: 592rpx; + top: 1252rpx; } .xzylanbtn{ position: absolute; - - top: 396px; + top: 1452rpx; width: 105px; height: 35px; line-height: 70rpx; @@ -156,4 +154,180 @@ height: 30px; background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/xtreturn.png); } - +.xfxc1{ + position: absolute; + width: 750rpx; + height: 472rpx; + top: 1113rpx; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/lxz/lxzzxf.png); +} +.lzxzz1{ + position: absolute; + width: 154rpx; + height: 184rpx; + top: 929rpx; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/lxz/lzxzz1.png); +} +.lzxzs1{ + position: absolute; + width: 74rpx; + height: 211rpx; + top: 718rpx; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/lxz/lzxzs1.png); +} +.lzxyz1{ + position: absolute; + width: 100rpx; + left: 650rpx; + height: 140.67rpx; + top: 972.07rpx; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/lxz/lzxyz1.png); +} +.lzxys1{ + position: absolute; + width: 47.33rpx; + left: 702.67rpx; + height: 311.33rpx; + top: 662.07rpx; + background-repeat: no-repeat; + background-size: 100% 100%; + background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/lxz/lzxys1.png); +} +.xzxjto{ + margin-left: 50rpx; + margin-top: 68rpx; + width: 147px; + height: 21px; + color: rgba(108, 108, 108, 1); + font-size: 14px; + text-align: left; + font-family: SourceHanSansSC-regular; +} +.xzxjto111{ + position: absolute; + width: 147px; + height: 21px; + color: rgba(108, 108, 108, 1); + font-size: 14px; + text-align: left; + font-family: SourceHanSansSC-regular; +} +.toText111{ + position: absolute; + height: 21px; + line-height: 42rpx; +} +.xzxjfrom{ + margin-left: 50rpx; + margin-top: 30rpx; + width: 147px; + height: 21px; + color: rgba(108, 108, 108, 1); + font-size: 14px; + text-align: left; + font-family: SourceHanSansSC-regular; + +} +.xzxjtot1{ + display: inline-block; + width: 30rpx; + background-color: blue; +} +.xzxjtoipt{ + position: absolute; + margin-left: 60rpx; + width: 110px; + height: 21px; + border-bottom: 1rpx solid #000; +} +.xzxjtoiptfrom{ + display: inline-block; + position: absolute; + margin-left: 90rpx; + width: 90px; + height: 21px; + border-bottom: 1rpx solid #000; +} +.yxtc{ + position: absolute; + top: 1162rpx; + width: 750rpx; + height: 462rpx; + line-height: 20px; + border-radius: 10px 10px 0px 0px; + background-color: rgba(255, 255, 255, 1); + color: rgba(16, 16, 16, 1); + font-size: 14px; + text-align: center; + font-family: Arial; +} +.yxtchx{ + position: absolute; + left: 0px; + top: 72rpx; + width: 375px; + border: 1rpx solid rgba(233, 233, 232, 1); +} +.yxtcqxan{ + position: absolute; + left: 16px; + width: 32px; + height: 72rpx; + line-height:72rpx; + color: rgba(108, 108, 108, 1); + font-size: 16px; + text-align: left; + font-family: SourceHanSansSC-regular; +} +.yxtctjan{ + position: absolute; + left: 325px; +width: 32px; +height: 72rpx; +line-height:72rpx; +color: rgba(206, 206, 206, 1); +font-size: 16px; +text-align: left; +font-family: SourceHanSansSC-regular; +} +.ylto{ + display: inline-block; + margin-left: 60rpx; + margin-top: 50rpx; + width: 300rpx; + height: 48rpx; + line-height: 48rpx; + color: rgba(108, 108, 108, 1); + font-size: 16px; + text-align: left; + font-family: SourceHanSansSC-medium; +} +.ylfrom{ + box-sizing: border-box; + margin-top: 10rpx; + width: 630rpx; + height: 48rpx; + line-height: 48rpx; + color: rgba(108, 108, 108, 1); + font-size: 16px; + text-align: left; + font-family: SourceHanSansSC-medium; + padding-bottom: 200rpx; +} +.ylfrom1{ + text-align: right; + margin-right: 50rpx; +} +.ylfrombtm{ + box-sizing: border-box; + width: 750rpx; + height: 200rpx; +} \ No newline at end of file diff --git a/pages/home/xy/index.wxml b/pages/home/xy/index.wxml index 429d20e..2fe19cc 100644 --- a/pages/home/xy/index.wxml +++ b/pages/home/xy/index.wxml @@ -1,5 +1,6 @@ + diff --git a/pages/home/xy/index.wxss b/pages/home/xy/index.wxss index bc18183..d4b6bdf 100644 --- a/pages/home/xy/index.wxss +++ b/pages/home/xy/index.wxss @@ -39,7 +39,14 @@ margin: auto; background-image: url(https://gitee.com/lsltsl/zodiac-elf/raw/master/xzjl/xy/gold1.png); } - +.gold111{ + position: absolute; + left: 70px; + top: 179px; + width: 240px; + height: 240px; + background-image: url(https://gitee.com/lsltsl/zodiac-elf/raw/master/xzjl/xy/gold1.png); +} .gold2{ position: absolute; width: 608.22rpx; diff --git a/pages/home/xyc/index.js b/pages/home/xyc/index.js index 39c0271..0af7286 100644 --- a/pages/home/xyc/index.js +++ b/pages/home/xyc/index.js @@ -165,10 +165,10 @@ Page({ duration: 5000 }) }else{ - - //api/user/curt/wish 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, @@ -179,6 +179,7 @@ Page({ } this.setData({xyContent:'',xyLink:'',note:'',imgUrl:'',fileList:[]}) }else{ + console.log('额外情况') wx.showToast({ title:res.data.msg, icon: 'none', @@ -188,9 +189,13 @@ Page({ }).catch((err)=>{ - console.log(err); + wx.showToast({ + title:'出错了:'+err.data.msg, + icon: 'none', + duration: 5000 + }) }) - console.log('许愿成功!') + console.log('许愿成功111!') } diff --git a/pages/index/index.js b/pages/index/index.js index 2333824..f64f8c9 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -21,7 +21,7 @@ Page({ icon: 'none', duration: 5000 }) - login('nfc',options.sn) + this.login('nfc',options.sn) }else{ console.log('无数据') }