diff --git a/pages/home/jl/index.js b/pages/home/jl/index.js
index 11e2dd4..fd37f0e 100644
--- a/pages/home/jl/index.js
+++ b/pages/home/jl/index.js
@@ -73,11 +73,12 @@ Page({
})
},
getXxObj(){/**获取形象对应的图片 */
- req.getRequest('/api/dict/values/sprite-type',{}).then((res)=>{
+ req.getRequest('/api/dict/value/horoscope-resource',{}).then((res)=>{
if(res.data.code==200){
- this.setData({xingxiangtu:res.data.data})
+ const horoscopes = res.data.data
+ const type = this.data.userInfo.birthdayConstellation
+ this.setData({xingxiangtu: horoscopes[type].sprite})
}
- console.log(this.data.xingxiangtu);
}).catch((err)=>{
console.log(err);
})
@@ -191,7 +192,6 @@ Page({
const pendantEnergy = res.data.data.crystallineEnergy
const hours = Math.floor(pendantEnergy * 6 / 60); // 计算小时数
const minute = pendantEnergy * 6 - hours * 60
- console.log(pendantEnergy, '11111');
if(hours>0){
this.setData({
minutes:59
@@ -203,6 +203,7 @@ Page({
minute:minute,
pendantEnergy:pendantEnergy
})
+ this.getXxObj()
// console.log(this.data.userInfo);
}
}).catch((err)=>{
@@ -302,7 +303,6 @@ Page({
onLoad(options) {
this.getUserInfo()
this.getUserLoverInfo()
- this.getXxObj()
},
/**
diff --git a/pages/home/jl/index.wxml b/pages/home/jl/index.wxml
index b3135f6..beac35e 100644
--- a/pages/home/jl/index.wxml
+++ b/pages/home/jl/index.wxml
@@ -8,7 +8,9 @@
-
+
+
+
@@ -73,8 +75,12 @@
-
-
+
+
+
+
+
+
@@ -122,7 +128,9 @@
-
+
+
+
{{loverInfo.horoscope.number}}
幸运数字
diff --git a/pages/home/jl/index.wxss b/pages/home/jl/index.wxss
index 6b350d4..dbfd35c 100644
--- a/pages/home/jl/index.wxss
+++ b/pages/home/jl/index.wxss
@@ -295,7 +295,12 @@
margin-left: 212rpx;
background-repeat: no-repeat;
background-size:100% 100%;
- background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/szn.png);
+ /* background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/szn.png); */
+}
+
+.xxt image {
+ width: 100%;
+ height: 100%;
}
.yan1{
@@ -392,7 +397,12 @@
margin-left: 88rpx;
background-repeat: no-repeat;
background-size:100% 100%;
- background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/szn.png);
+ /* background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/szn.png); */
+}
+
+.xxtl image {
+ width: 100%;
+ height: 100%;
}
.xxtr{
@@ -403,7 +413,12 @@
margin-left: 355.33rpx;
background-repeat: no-repeat;
background-size:100% 100%;
- background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/xxtr.png);
+ /* background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/xxtr.png); */
+}
+
+.xxtr image {
+ width: 100%;
+ height: 100%;
}
.yanql1{
@@ -458,7 +473,12 @@
margin-left: 212rpx;
background-repeat: no-repeat;
background-size:100% 100%;
- background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/xxtr.png);
+ /* background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/jl/xxtr.png); */
+}
+
+.xxtq image{
+ width: 100%;
+ height: 100%;
}
.k1{
diff --git a/pages/home/me/indexx.wxml b/pages/home/me/indexx.wxml
index 9fccbb4..b4e8ee1 100644
--- a/pages/home/me/indexx.wxml
+++ b/pages/home/me/indexx.wxml
@@ -56,7 +56,7 @@
V1.0
-
+
解除羁绊
diff --git a/pages/home/me/mydevice/device.js b/pages/home/me/mydevice/device.js
index 50aad0b..8f493a1 100644
--- a/pages/home/me/mydevice/device.js
+++ b/pages/home/me/mydevice/device.js
@@ -10,8 +10,8 @@ Page({
* 页面的初始数据
*/
data: {
- devs:[]
-
+ devs:[],
+ QRcode:''
},
doCopy(e){/**赋值设备唯一识别码 */
let key = e.target.dataset.copy
@@ -35,7 +35,11 @@ Page({
req.getRequest('/api/user/curt/equipments',{}).then((res)=>{
if(res.data.code==200){
// 循环查询
- this.setData({devs:res.data.data})
+ const mac = res.data.data[0].mac
+ this.setData({
+ devs:res.data.data,
+ QRcode: `https://xzjl-api.windymuse.cn/api/v1/qr/generate?mac=${mac}`
+ })
}
}).catch((err)=>{
console.log(err);
@@ -47,44 +51,44 @@ Page({
*/
onLoad(options) {
this.doDevQuery()
- const query = wx.createSelectorQuery()
- query.select('#myQrcode')
- .fields({
- node: true,
- size: true
- })
- .exec((res) => {
- var canvas = res[0].node
-
- // 调用方法drawQrcode生成二维码
- drawQrcode({
- canvas: canvas,
- canvasId: 'myQrcode',
- width: 260,
- padding: 30,
- background: '#ffffff',
- foreground: '#000000',
- text: '大王顶真帅',
- })
-
- // 获取临时路径（得到之后，想干嘛就干嘛了）
- wx.canvasToTempFilePath({
- canvasId: 'myQrcode',
- canvas: canvas,
- x: 0,
- y: 0,
- width: 260,
- height: 260,
- destWidth: 260,
- destHeight: 260,
- success(res) {
- console.log('二维码临时路径：', res.tempFilePath)
- },
- fail(res) {
- console.error(res)
- }
- })
- })
+ // const query = wx.createSelectorQuery()
+ // query.select('#myQrcode')
+ // .fields({
+ // node: true,
+ // size: true
+ // })
+ // .exec((res) => {
+ // var canvas = res[0].node
+
+ // // 调用方法drawQrcode生成二维码
+ // drawQrcode({
+ // canvas: canvas,
+ // canvasId: 'myQrcode',
+ // width: 260,
+ // padding: 30,
+ // background: '#ffffff',
+ // foreground: '#000000',
+ // text: '大王顶真帅',
+ // })
+
+ // // 获取临时路径（得到之后，想干嘛就干嘛了）
+ // wx.canvasToTempFilePath({
+ // canvasId: 'myQrcode',
+ // canvas: canvas,
+ // x: 0,
+ // y: 0,
+ // width: 260,
+ // height: 260,
+ // destWidth: 260,
+ // destHeight: 260,
+ // success(res) {
+ // console.log('二维码临时路径：', res.tempFilePath)
+ // },
+ // fail(res) {
+ // console.error(res)
+ // }
+ // })
+ // })
},
diff --git a/pages/home/me/mydevice/device.wxml b/pages/home/me/mydevice/device.wxml
index 580d78b..bc5eed2 100644
--- a/pages/home/me/mydevice/device.wxml
+++ b/pages/home/me/mydevice/device.wxml
@@ -11,7 +11,9 @@
设备唯一识别码
识别码是设备唯一ID，绝对不能告诉别人哦！
设备二维码
-
+
+
+
可代替设备用于登录，可在设备丢失时临时登录使用
请不要将二维码告知他人，否则有账号丢失风险
@@ -20,7 +22,7 @@
-
+
diff --git a/pages/home/me/mydevice/device.wxss b/pages/home/me/mydevice/device.wxss
index b9ddbcc..3a820a8 100644
--- a/pages/home/me/mydevice/device.wxss
+++ b/pages/home/me/mydevice/device.wxss
@@ -632,6 +632,11 @@
width: 300rpx;
height: 300rpx;
}
+
+.sbewm image {
+ width: 100%;
+ height: 100%;
+}
.sbsbmk{
position: absolute;
left: 88rpx;
diff --git a/pages/home/xx/hy/hx/hx.js b/pages/home/xx/hy/hx/hx.js
index 3bec25b..486ed35 100644
--- a/pages/home/xx/hy/hx/hx.js
+++ b/pages/home/xx/hy/hx/hx.js
@@ -12,7 +12,7 @@ Page({
},
go2Reback(){
wx.navigateTo({
- url: '/pages/home/xx/hy/yx/yx'
+ url: '/pages/home/xx/lindex/lindex'
})
},
go2Xz(){
diff --git a/pages/home/xx/hy/index.js b/pages/home/xx/hy/index.js
index 07ec2bd..5a38155 100644
--- a/pages/home/xx/hy/index.js
+++ b/pages/home/xx/hy/index.js
@@ -11,7 +11,7 @@ Page({
},
go2Reback(){
wx.navigateTo({
- url: '/pages/home/xx/hy/yx/yx'
+ url: '/pages/home/xx/lindex/lindex'
})
},
go2Xz(){
diff --git a/pages/home/xx/hy/yx/yx.js b/pages/home/xx/hy/yx/yx.js
index adde1ce..92c999c 100644
--- a/pages/home/xx/hy/yx/yx.js
+++ b/pages/home/xx/hy/yx/yx.js
@@ -11,7 +11,7 @@ Page({
},
go2Reback(){
wx.navigateTo({
- url: '/pages/home/xx/hy/yx/yx'
+ url: '/pages/home/xx/lindex/lindex'
})
},
go2Xz(){
diff --git a/pages/home/xx/hy/zt/zt.js b/pages/home/xx/hy/zt/zt.js
index 4347f89..18275b0 100644
--- a/pages/home/xx/hy/zt/zt.js
+++ b/pages/home/xx/hy/zt/zt.js
@@ -11,7 +11,7 @@ Page({
},
go2Reback(){
wx.navigateTo({
- url: '/pages/home/xx/hy/yx/yx'
+ url: '/pages/home/xx/lindex/lindex'
})
},
go2Xz(){
diff --git a/pages/home/xx/lindex/lxz/lxz.js b/pages/home/xx/lindex/lxz/lxz.js
index 77d0e2b..506cf76 100644
--- a/pages/home/xx/lindex/lxz/lxz.js
+++ b/pages/home/xx/lindex/lxz/lxz.js
@@ -11,13 +11,17 @@ Page({
to:'',
from:'',
content:'',
- img:'https://wk921-1316969570.cos.ap-nanjing.myqcloud.com/xzimg.png',
+ img:'',
messageList:[],
sound:'',
- soundTime:0,
+ soundTime:'00:00:00',
+ duration: '',
+ minute:0, //分
+ second:0, //秒
+ millisecond:0, //毫秒
showBtn:true,
- showImg:true,
- showLtqp:true,
+ showImg:false,
+ showLtqp:false,
showImgBig:false, //图片太大弹层
showSoundMore:false, //语音太多提示
showSend:false, //寄出提示
@@ -26,13 +30,15 @@ Page({
showAlready:false,
btn1:true,
btn2:false,
- btn3:false
+ btn3:false,
+ showSoundImg:true
},
writeLetters(){
console.log('写信');
this.setData({
showImg:false,
showLtqp:false,
+ Preview: false
})
},
already(){
@@ -43,14 +49,20 @@ Page({
type: 'text',
content: this.data.content
})
- const formData = {
+ const fromData = {
from: this.data.from,
to: this.data.to,
- messageList: list
+ messageList: list,
+ status:'unread'
}
- console.log(formData);
- req.putRequest('/api/user/curt/letter',{formData}).then(res => {
- console.log(res);
+ console.log(fromData);
+ // 修改信札
+ req.putRequest('/api/user/curt/letter',fromData).then(res => {
+ console.log(res,'修改信札内容成功');
+ // 修改状态
+ req.patchRequest('/api/user/curt/letter/send',{}).then(res => {
+ console.log(res,'信札状态修改成功');
+ })
})
},
closeShowImgBig(){
@@ -68,6 +80,9 @@ Page({
openPreview(){
console.log('预览');
this.setData({Preview:true})
+ if(this.data.messageList.length){
+ this.setData({showLtqp: true})
+ }
},
ClearYl(){
console.log('清除语音');
@@ -83,17 +98,15 @@ Page({
return item.type !== "graphic"
})
this.setData({
- img:'https://wk921-1316969570.cos.ap-nanjing.myqcloud.com/xzimg.png',
- messageList: list
+ img:'',
+ messageList: list,
+ showImg: false
})
console.log(this.data.messageList);
},
// 上传图片
addImg(){
console.log('添加图片');
- this.setData({
- showImg:true
- })
wx.chooseMedia({
mediaType: 'image',
success: (res) => {
@@ -149,7 +162,8 @@ Page({
})
this.setData({
img:data.data.abUrl,
- messageList:list
+ messageList:list,
+ showImg:true
})
console.log(this.data.messageList);
}
@@ -180,61 +194,97 @@ Page({
},
openSound(){
console.log('添加声音');
- this.setData({showSound:true,showLtqp:true})
+ this.setData({showSound:true})
},
closeSound(){
this.setData({showSound:false})
},
startSound(){
console.log('开始录音');
- const time = setInterval(()=>{
- this.setData({soundTime:this.data.soundTime + 1})
- },1000)
- this.setData({ timeId: time })
- wx.startRecord({
- success: (res) => {
- console.log(res.tempFilePath);
- this.setData({sound:res.tempFilePath,btn1:false,btn2:true})
- }
- })
+
+ this.setData({btn1: false, btn2: true, showSoundImg: false})
+ let option = {
+ duration:10000, //录音的时长，之前最大值好像只有1分钟，现在最长可以录音10分钟
+ format:'mp3', //录音的格式，有aac和mp3两种
+ }
+ wx.getRecorderManager().start(option)
+ // 开启定时器
+ this.data.timeOut = setInterval(this.counter,50)
+ },
+ // 计时器
+ counter(){
+ let second = this.data.second
+ let minute = this.data.minute
+ let millisecond = this.data.millisecond
+
+ this.setData({millisecond: millisecond + 5})
+ if(millisecond > 99) {
+ this.setData({millisecond: 0, second : second + 1 })
+ }else if(second >= 60) {
+ this.setData({second: 0, minute: minute + 1})
+ }else if(minute === 3) {
+ this.second({soundTime: '03:00:00'})
+ clearInterval(this.data.timeOut)
+ }
+
+ let time = '0' + minute
+ if (second < 10) {
+ time = time + ':0' + second
+ }else {
+ time = time + ':' + second
+ }
+ if (millisecond < 10){
+ time = time + ':0' + millisecond
+ } else {
+ time = time + ':' + millisecond
+ }
+
+ this.setData({soundTime: time})
},
endSound(){
- console.log('结束录音');
- wx.stopRecord()
- clearInterval(this.data.timeId)
+ console.log('暂停录音');
+ wx.getRecorderManager().pause()
+ clearInterval(this.data.timeOut)
+ this.setData({btn2:false, btn3:true, showSoundImg:true})
},
playVoice(){
- console.log('播放录音');
- this.setData({btn2:false,btn3:true})
- wx.playVoice({
- filePath: this.data.sound,
- complete: () => {
- console.log('录音播放结束');
- this.setData({btn2:true,btn3:false})
- }
- });
+ console.log('继续录音');
+ wx.getRecorderManager().resume()
+ this.data.timeOut = setInterval(this.counter,50)
+ this.setData({btn2:true, btn3:false, showSoundImg:false})
},
addSound(){
console.log('添加录音');
- this.uploadFile(this.data.sound,'audio')
- this.setData({
- btn1:true,
- btn2:false,
- btn3:false,
- soundTime:0
+ console.log(this.data.soundTime);
+ this.setData({duration: this.data.soundTime})
+ wx.getRecorderManager().stop()
+ clearInterval(this.data.timeOut)
+ // 监听结束录音
+ wx.getRecorderManager().onStop((res) => {
+ console.log(res);
+ this.uploadFile(res.tempFilePath,'audio')
})
- // console.log(this.data.messageList);
- },
- delSound(){
- console.log('不添加该条语音');
this.setData({
- sound:'',
btn1:true,
btn2:false,
btn3:false,
- soundTime:0
+ showLtqp: true,
+ minute:0,
+ second:0,
+ millisecond:0,
+ soundTime:'00:00:00'
})
},
+ // delSound(){
+ // console.log('不添加该条语音');
+ // this.setData({
+ // sound:'',
+ // btn1:true,
+ // btn2:false,
+ // btn3:false,
+ // soundTime:'00:00:00'
+ // })
+ // },
logout(){
req.deleteRequest('/api/user/logout',{}).then((res)=>{
if(res.data.code===200){
@@ -251,10 +301,15 @@ Page({
console.log('获取当前用户信札内容');
req.getRequest('/api/user/curt/letter',{}).then(res => {
console.log(res);
- this.setData({
- to: res.data.data.to,
- from: res.data.data.from,
- })
+ // res.data.data.messageList.forEach(item => {
+ // if(item.type === 'text'){
+ // this.setData({content: item.content})
+ // }
+ // })
+ // this.setData({
+ // to: res.data.data.to,
+ // from: res.data.data.from,
+ // })
})
},
/**
diff --git a/pages/home/xx/lindex/lxz/lxz.wxml b/pages/home/xx/lindex/lxz/lxz.wxml
index b738dfb..ea78e37 100644
--- a/pages/home/xx/lindex/lxz/lxz.wxml
+++ b/pages/home/xx/lindex/lxz/lxz.wxml
@@ -23,7 +23,7 @@
- 2′24″
+ {{duration}}
@@ -51,19 +51,26 @@
-
+
- 取消
+ 取消
添加
{{soundTime}}
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/pages/home/xx/lindex/lxz/lxz.wxss b/pages/home/xx/lindex/lxz/lxz.wxss
index 2f28763..89c2c8b 100644
--- a/pages/home/xx/lindex/lxz/lxz.wxss
+++ b/pages/home/xx/lindex/lxz/lxz.wxss
@@ -375,6 +375,32 @@
background-image: url(https://wk921-1316969570.cos.ap-nanjing.myqcloud.com/iconPark-acoustic%20Copy%203%401x.png);
}
+.sound-box-img2 {
+ width: 1000px;
+ height: 50rpx;
+ margin-top: 40rpx;
+ animation: move 5s infinite linear;
+}
+
+.sound-box-img2 image {
+ width: 50rpx;
+ height: 50rpx;
+}
+/* 定义动画 */
+ /* 定义和调用动画 */
+ @keyframes move {
+
+ /* 动画的第一个状态和盒子的默认状态相同, 可以省略动画的开始状态代码 */
+ /* from {
+ transform: translateX(0);
+ } */
+ to {
+ transform: translateX(-750rpx);
+ /* transform: translateX(-900px); */
+ /* transform: translateX(-800px); */
+ }
+}
+
.sound-box-btn {
width: 100%;
height: 120rpx;
@@ -481,7 +507,7 @@
width: 660rpx;
height: 522rpx;
background-size: contain;
- background-image: url(https://wk921-1316969570.cos.ap-nanjing.myqcloud.com/%E4%BF%A1.png?q-sign-algorithm=sha1&q-ak=AKID75iKvt6pKeBH6kmQmugG7VsgGfLQq1lreUvTebnOcOYJjuHMexmmTv6BLsv8wnp7&q-sign-time=1686215487;1686219087&q-key-time=1686215487;1686219087&q-header-list=host&q-url-param-list=ci-process&q-signature=69197c8ac4f07d2037248bca09f6c0c5b0eabe5b&x-cos-security-token=liea1KCZaPvP7X7AVEMsUpo4E4n0UJsaba5cb9901edd2b22e04025e2028d4d1a2gmo41jTDzQWkJ-8pNsYx9bPLid0N78p6o0Zp4VO8m2JYh70Nq7Jr5BMVkX2pkZNiRDwUyYeXWYGXbihjwO2JK5NItEL5Y2E5av5GWTJlPw4E-pIGHqTSN0T5oZ1oDybeWI33Vx8EPpYf12eFO-5RLRgQcmXyI9i8YDkSF_bNKRVLVGe7n0cbNcVIk0QqECF&ci-process=originImage);
+ background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xx/xzt.png);
}
.already-text {
diff --git a/pages/home/xx/xz/xz.js b/pages/home/xx/xz/xz.js
index 506cf76..63e70da 100644
--- a/pages/home/xx/xz/xz.js
+++ b/pages/home/xx/xz/xz.js
@@ -141,14 +141,15 @@ Page({
})
// 判断语音条数大于3条
if(audio.length >= 3){
- this.setData({showSoundMore:true})
+ this.setData({showSoundMore:true, showSoundImg:true})
}else {
list.push({
type: 'audio',
resourceId: data.data.id,
})
this.setData({
- messageList: list
+ messageList: list,
+ showSoundImg: true
})
}
console.log(this.data.messageList);
diff --git a/pages/home/xx/xz/xz.wxml b/pages/home/xx/xz/xz.wxml
index 9a772b6..ea78e37 100644
--- a/pages/home/xx/xz/xz.wxml
+++ b/pages/home/xx/xz/xz.wxml
@@ -63,10 +63,14 @@
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.js b/pages/index/index.js
index f9da2b1..a86adf7 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -79,6 +79,8 @@ Page({
* code为用户码参数，用户码为空则代表为扫码登录
*/
login(mode,code){
+ console.log(mode,'模式');
+ console.log(code, 'code');
//如果有token，直接进入
if(wx.getStorageSync('token')){
wx.showToast({
diff --git a/project.private.config.json b/project.private.config.json
index bb4d0f1..08e5d44 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -10,28 +10,21 @@
"list": [
{
"name": "",
- "pathName": "pages/home/xyc/index",
+ "pathName": "pages/home/jl/index",
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "",
- "pathName": "pages/home/xy/index",
+ "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/home/xx/hy/hx/hx",
+ "pathName": "pages/home/me/mydevice/device",
"query": "",
"launchMode": "default",
"scene": null