diff --git a/pages/library/library.vue b/pages/library/library.vue index 941b8c4..423dda4 100644 --- a/pages/library/library.vue +++ b/pages/library/library.vue @@ -386,7 +386,7 @@ // 跳转到讲书 goJiangShu(val){ uni.navigateTo({ - url: '../talkBook/talkBookDetail?bookId='+ val.id + url: '../talkBook/talkBookML?bookid='+ val.id }) }, // 跳转到古籍 diff --git a/pages/luck/luck.vue b/pages/luck/luck.vue index a549282..cd9fc23 100644 --- a/pages/luck/luck.vue +++ b/pages/luck/luck.vue @@ -12,7 +12,8 @@ - 五运：{{wy.zhuyun[wy.now]}}(主运)   {{wy.keyun[wy.now]}}(客运)   {{wy.nianyun}}(年运) + 五运：{{wy.zhuyun[wy.now]}}(主运)   {{wy.keyun[wy.now]}}(客运)   + {{wy.nianyun}}(年运) 六气：{{lq.zhuqi[lq.now]}}(主气)   {{lq.keqi[lq.now]}}(客气) @@ -29,79 +30,79 @@ 《 ↓ 五运图 》 - - - 开始时间
运数 - - 主运 - 客运 - - - {{wy.fiveTimes[0]}}起
初之运 - {{wy.zhuyun[0]}} - {{wy.keyun[0]}} - - - {{wy.fiveTimes[1]}}起
二之运 - {{wy.zhuyun[1]}} - {{wy.keyun[1]}} - - - {{wy.fiveTimes[2]}}起
三之运 - {{wy.zhuyun[2]}} - {{wy.keyun[2]}} - - - {{wy.fiveTimes[3]}}起
四之运 - {{wy.zhuyun[3]}} - {{wy.keyun[3]}} - - - {{wy.fiveTimes[4]}}起
终之运 - {{wy.zhuyun[4]}} - {{wy.keyun[4]}} - + + + 开始时间
运数 + + 主运 + 客运 + + {{wy.fiveTimes[0]}}起
初之运 + {{wy.zhuyun[0]}} + {{wy.keyun[0]}} + + + {{wy.fiveTimes[1]}}起
二之运 + {{wy.zhuyun[1]}} + {{wy.keyun[1]}} + + + {{wy.fiveTimes[2]}}起
三之运 + {{wy.zhuyun[2]}} + {{wy.keyun[2]}} + + + {{wy.fiveTimes[3]}}起
四之运 + {{wy.zhuyun[3]}} + {{wy.keyun[3]}} + + + {{wy.fiveTimes[4]}}起
终之运 + {{wy.zhuyun[4]}} + {{wy.keyun[4]}} + + - 《 ↓ 六气图，左滑查看全年气数 》 + 《 ↓ 六气图，左滑查看全年气数 》 - - 开始时间
气数 - - 主气 - 客气 - - - {{lq.time[0]}}起
初之气 - {{lq.zhuqi[0]}} - {{lq.keqi[0]}} - - - {{lq.time[1]}}起
二之气 - {{lq.zhuqi[1]}} - {{lq.keqi[1]}} - - - {{lq.time[2]}}起
三之气 - {{lq.zhuqi[2]}} - {{lq.keqi[2]}} - - - {{lq.time[3]}}起
四之气 - {{lq.zhuqi[3]}} - {{lq.keqi[3]}} - - - {{lq.time[4]}}起
五之气 - {{lq.zhuqi[4]}} - {{lq.keqi[4]}} - - - {{lq.time[5]}}起
终之气 - {{lq.zhuqi[5]}} - {{lq.keqi[5]}} - + + 开始时间
气数 + + 主气 + 客气 + + + {{lq.time[0]}}起
初之气 + {{lq.zhuqi[0]}} + {{lq.keqi[0]}} + + + {{lq.time[1]}}起
二之气 + {{lq.zhuqi[1]}} + {{lq.keqi[1]}} + + + {{lq.time[2]}}起
三之气 + {{lq.zhuqi[2]}} + {{lq.keqi[2]}} + + + {{lq.time[3]}}起
四之气 + {{lq.zhuqi[3]}} + {{lq.keqi[3]}} + + + {{lq.time[4]}}起
五之气 + {{lq.zhuqi[4]}} + {{lq.keqi[4]}} + + + {{lq.time[5]}}起
终之气 + {{lq.zhuqi[5]}} + {{lq.keqi[5]}} + @@ -129,6 +130,7 @@ second = second < 10 ? ('0' + second) : second; return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second; + }; export default { @@ -139,11 +141,13 @@ pageHeight: uni.getSystemInfoSync().windowHeight - 200, fiveYunNum: 5, // date: new Date().toISOString().slice(0, 10), // 只返回年月日 - date: Date.now() - 2 * 24 * 3600 * 1000, // 返回年月日带时间 + // date: Date.now() -2* 24 * 3600 * 1000, // 返回年月日带时间 + date: Date.now(), // 返回年月日带时间 dateToString: formatDateTime(new Date()), // 字符串格式的日期 - timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳 + // timestamp: Date.now() -2* 24 * 3600 * 1000, // 时间戳 + timestamp: Date.now(), // 时间戳 wy: { - curTime:0, + curTime: 0, zhuyun: [], keyun: [], nianyun: '', @@ -157,7 +161,7 @@ selected: [] }, lq: { - curTime:0, + curTime: 0, zhuqi: [], keqi: [], time: [] @@ -168,18 +172,18 @@ day: '', hour: '' }, - wYScrollLeft:0, - lQScrollLeft:0, -wytext:'', + wYScrollLeft: 0, + lQScrollLeft: 0, + wytext: '', } }, onLoad() { let da = new Date().toISOString().slice(0, 10) this.timestamp = new Date(da).getTime() this.getYun(this.dateToString) - + }, - + onHide() { }, @@ -187,6 +191,7 @@ wytext:'', scroll: function(e) {}, // 获取五运六气 getYun(date) { + console.log(this.data + '1111111111111111111') let that = this $http.request({ url: "book/point/WYLQForYear", @@ -206,7 +211,7 @@ wytext:'', this.wy.nianyun = res.wylq.wy.nianYun this.wy.fiveTimes = res.wylq.wy.time this.wy.now = res.wylq.wy.now - this.wytext = 'text'+this.wy.now + this.wytext = 'text' + this.wy.now // this.wy.timestampList = res.wylq.wy.time.map( item => { // return new Date(item).getTime() // }) @@ -222,24 +227,42 @@ wytext:'', this.lq = res.wylq.lq // this.wy.now >= 2 ? this.wYScrollLeft = 1800 : 0 // this.lq.now >= 2 ?this.lQScrollLeft = 1800 : 0 - - + + // this.lq.timestampList = res.wylq.lq.time.map( item => { // return new Date(item).getTime() // }) // console.log(this.wYScrollLeft,this.lQScrollLeft,'this.lq.timestampList') - } + } }).catch(e => { console.log(e, 'e') }); - }, + }, changeLog(e) { console.log('change事件:', e); - let ss = e.slice(0, 10) + let ss = e.slice(0, 10) this.timestamp = new Date(ss).getTime() this.getYun(e) - }, + }, + + formatDateTime(time) { + var date = new Date(time); + var y = date.getFullYear(); + var m = date.getMonth() + 1; + m = m < 10 ? ('0' + m) : m; + var d = date.getDate(); + d = d < 10 ? ('0' + d) : d; + var h = date.getHours(); + h = h < 10 ? ('0' + h) : h; + var minute = date.getMinutes(); + var second = date.getSeconds(); + minute = minute < 10 ? ('0' + minute) : minute; + second = second < 10 ? ('0' + second) : second; + + return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second; + + }, }, components: { @@ -289,7 +312,7 @@ wytext:'', width: 100%; .leftone { - + border-left: 1px solid #ddd; } @@ -297,18 +320,34 @@ wytext:'', display: inline-block; text-align: center; background-color: #fef9e4; - border-right: 1px solid #ddd; + border-right: 1px solid #ddd; border-bottom: 1px solid #ddd; } - .row.cur{background-color: #8d3d16; color: #fff; position: relative; border-right:0; - z-index: 5; box-shadow:0 0 10px #8d3d16; - } + + .row.cur { + background-color: #8d3d16; + color: #fff; + position: relative; + border-right: 0; + z-index: 5; + box-shadow: 0 0 10px #8d3d16; + } + .line { padding: 20rpx; border-top: 1px solid #ddd; - span{font-size: 36rpx; } + + span { + font-size: 36rpx; + } + } + + .line1 { + font-size: 24rpx; + height: 200rpx; + writing-mode: vertical-rl; + ; } - .line1{ font-size: 24rpx; height: 200rpx; writing-mode: vertical-rl;;} .zhuyun { color: #8d3d16; @@ -325,8 +364,9 @@ wytext:'', .container { padding: 10rpx; - - background-color: #fff; padding-bottom: 70rpx; + + background-color: #fff; + padding-bottom: 70rpx; } .datetimeBox { @@ -334,29 +374,55 @@ wytext:'', margin: 0 auto; margin-bottom: 30rpx; } - .liuqiBox{ - .line.keyun { padding: 60rpx 10rpx} + + .liuqiBox { + .line.keyun { + padding: 60rpx 10rpx + } } - .wuYunBox{ - .row{width: 20%; box-sizing: border-box;} + + .wuYunBox { + .row { + width: 20%; + box-sizing: border-box; + } } + /deep/ .uni-calendar__content-mobile { bottom: 100rpx !important; } -.sizai{ - .keyun{ - position:relative; + .sizai { + .keyun { + position: relative; + } + + .keyun::after { + position: absolute; + content: ''; + top: 24rpx; + left: 0; + font-size: 24rpx; + display: block; + width: 100%; + color: #888; + text-align: center; + } + } - .keyun::after{ position: absolute; content: ''; top:24rpx; left:0;font-size: 24rpx; display:block; width: 100%; color: #888; text-align: center;} - -} -.sizai1{ - .keyun::after{content: '（司天）';} -} -.sizai2{ - .keyun::after{content: '（在泉）';} -} + + .sizai1 { + .keyun::after { + content: '（司天）'; + } + } + + .sizai2 { + .keyun::after { + content: '（在泉）'; + } + } + .flexbox { display: flex; }