我的书籍，五运六气日期

pages/library/library.vue

@@ -386,7 +386,7 @@
 			// 跳转到讲书
 			goJiangShu(val){
 				uni.navigateTo({
-					url: '../talkBook/talkBookDetail?bookId='+ val.id
+					url: '../talkBook/talkBookML?bookid='+ val.id
 				})
 			},
 			// 跳转到古籍

pages/luck/luck.vue

@@ -12,7 +12,8 @@
 			<view class="flexbox box1 grayBg">
 				<view class="yunqi">
 					<view class="">
-						<text>五运：{{wy.zhuyun[wy.now]}}(主运) &nbsp; {{wy.keyun[wy.now]}}(客运) &nbsp; {{wy.nianyun}}(年运)</text>
+						<text>五运：{{wy.zhuyun[wy.now]}}(主运) &nbsp; {{wy.keyun[wy.now]}}(客运) &nbsp;
+							{{wy.nianyun}}(年运)</text>
 					</view>
 					<view class="">
 						<text>六气：{{lq.zhuqi[lq.now]}}(主气) &nbsp; {{lq.keqi[lq.now]}}(客气)</text>
@@ -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,9 +172,9 @@
 					day: '',
 					hour: ''
 				},
-				wYScrollLeft:0,
+				wYScrollLeft: 0,
-				lQScrollLeft:0,
+				lQScrollLeft: 0,
-wytext:'',
+				wytext: '',
 			}
 		},
 		onLoad() {
@@ -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()
 							// })
@@ -240,6 +245,24 @@ wytext:'',
 				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: {
@@ -300,15 +323,31 @@ wytext:'',
 			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;
@@ -326,7 +365,8 @@ 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{
+	.sizai {
-	.keyun{
+		.keyun {
-		position:relative;
+			position: relative;
+		}
+
+		.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: '（在泉）';
+		}
 	}
-	.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: '（在泉）';}
-}
 	.flexbox {
 		display: flex;
 	}