diff --git a/config/baseUrl.js b/config/baseUrl.js
index 8ad08d1..0c13f59 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -5,10 +5,11 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://localhost:7001/";
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
-	// baseUrl = "http://59.110.212.44:9200/pb/";
 	baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
-	 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+		 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
+		// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	// baseUrl = "http://59.110.212.44:9200/pb/";
+	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
 	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
 	// socketUrl = "ws://8.129.186.35:6001/";
diff --git a/pages.json b/pages.json
index 061a446..50c161c 100644
--- a/pages.json
+++ b/pages.json
@@ -12,28 +12,28 @@
 			"path": "pages/peanut/shopping",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/bookshelf",
 			"style": {
 				"navigationBarTitleText": "我的书架",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/mine",
 			"style": {
 				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
-		},		
+		},
 		{
 			"path": "pages/peanut/searchFor",
 			"style": {
 				"navigationBarTitleText": "搜索",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -64,14 +64,14 @@
 			"path": "pages/yRead/angbook",
 			"style": {
 				"navigationBarTitleText": "小说3",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/yRead/cus-audio-play",
 			"style": {
 				"navigationBarTitleText": "小说3-1",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -90,14 +90,14 @@
 			"path": "pages/eBook/bookContent",
 			"style": {
 				"navigationBarTitleText": "小说详情",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/eBook/bookMessage",
 			"style": {
 				"navigationBarTitleText": "小说简介",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -116,28 +116,28 @@
 			"path": "pages/peanut/opeVip",
 			"style": {
 				"navigationBarTitleText": "开通Vip",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/reCharge",
 			"style": {
 				"navigationBarTitleText": "充值",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/user/persData",
 			"style": {
 				"navigationBarTitleText": "个人资料",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/user/persCount",
 			"style": {
 				"navigationBarTitleText": "个人账户",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -168,7 +168,7 @@
 			"path": "pages/user/login",
 			"style": {
 				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh":false        // 禁止下拉刷新
+				"enablePullDownRefresh": false // 禁止下拉刷新
 			}
 		},
 		{
@@ -252,307 +252,258 @@
 				"navigationBarTitleText": "物流详情"
 			}
 		}
-	
-    ,{
-            "path" : "pages/peanut/aboutUs",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "关于我们",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/listen",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "悦耳列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }        
-        ,{
-            "path" : "pages/listen/home",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "悦耳听书",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "搜索听书",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/bgMusix",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "背景音乐模式",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/bgMusic",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "背景音乐启用",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/bgMusic",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "背景音乐启用",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/musicbg",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "音乐1",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/peanut/myComments",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的评价",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/setListen",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "听书设置11",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/bigListen",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "听书页面",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/listen/listenNotBuy",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "未购买的详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/comments/comments",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "书评1",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/comments/commentsDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "书评详情1",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/comments/commentsList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "书评",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/bookShop/settlementBook",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "book购买1",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/library/library",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的图书",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/clock/clock",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "读书打卡",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/clock/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "读书打卡列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/clock/clockList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "打卡记录1",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/talkBook/talkBook",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "讲书",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/talkBook/talkBookML",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "讲书书籍页面",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/talkBook/talkBookDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "讲书详情",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-        {
-            "path" : "pages/yian/yian",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "医案",
-                "enablePullDownRefresh": true
-            }
-            
-        },
-        {
-            "path" : "pages/yian/yianList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "医案列表",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/yian/yianDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "医案详情",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{           // 更新版本
-					"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
-					"style": {
-						"disableScroll": true,
-						"app-plus": {
-							"backgroundColorTop": "transparent",
-							"background": "transparent",
-							"titleNView": false,
-							"scrollIndicator": false,
-							"popGesture": "none",
-							"animationType": "fade-in",
-							"animationDuration": 200
-		
-						}
-					}
+
+		, {
+			"path": "pages/peanut/aboutUs",
+			"style": {
+				"navigationBarTitleText": "关于我们",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/listen",
+			"style": {
+				"navigationBarTitleText": "悦耳列表",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/home",
+			"style": {
+				"navigationBarTitleText": "悦耳听书",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/listen/search",
+			"style": {
+				"navigationBarTitleText": "搜索听书",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/bgMusix",
+			"style": {
+				"navigationBarTitleText": "背景音乐模式",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/bgMusic",
+			"style": {
+				"navigationBarTitleText": "背景音乐启用",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/bgMusic",
+			"style": {
+				"navigationBarTitleText": "背景音乐启用",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/musicbg",
+			"style": {
+				"navigationBarTitleText": "音乐1",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/peanut/myComments",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/setListen",
+			"style": {
+				"navigationBarTitleText": "听书设置11",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/bigListen",
+			"style": {
+				"navigationBarTitleText": "听书页面",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/listen/listenNotBuy",
+			"style": {
+				"navigationBarTitleText": "未购买的详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/comments/comments",
+			"style": {
+				"navigationBarTitleText": "书评1",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/comments/commentsDetail",
+			"style": {
+				"navigationBarTitleText": "书评详情1",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/comments/commentsList",
+			"style": {
+				"navigationBarTitleText": "书评",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/bookShop/settlementBook",
+			"style": {
+				"navigationBarTitleText": "book购买1",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/library/library",
+			"style": {
+				"navigationBarTitleText": "我的图书",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/clock/clock",
+			"style": {
+				"navigationBarTitleText": "读书打卡",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/clock/index",
+			"style": {
+				"navigationBarTitleText": "读书打卡列表",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/clock/clockList",
+			"style": {
+				"navigationBarTitleText": "打卡记录1",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/talkBook/talkBook",
+			"style": {
+				"navigationBarTitleText": "讲书",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/talkBook/talkBookML",
+			"style": {
+				"navigationBarTitleText": "讲书书籍页面",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/talkBook/talkBookDetail",
+			"style": {
+				"navigationBarTitleText": "讲书详情",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/yian/yian",
+			"style": {
+				"navigationBarTitleText": "医案",
+				"enablePullDownRefresh": true
+			}
+
+		},
+		{
+			"path": "pages/yian/yianList",
+			"style": {
+				"navigationBarTitleText": "医案列表",
+				"enablePullDownRefresh": true
+			}
+
+		}, {
+			"path": "pages/yian/yianDetail",
+			"style": {
+				"navigationBarTitleText": "医案详情",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{ // 更新版本
+			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
+			"style": {
+				"disableScroll": true,
+				"app-plus": {
+					"backgroundColorTop": "transparent",
+					"background": "transparent",
+					"titleNView": false,
+					"scrollIndicator": false,
+					"popGesture": "none",
+					"animationType": "fade-in",
+					"animationDuration": 200
+
 				}
-        ,{
-            "path" : "pages/bookShop/deliverLIst",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "快递列表",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-        {
-        	"path" : "pages/peanut/chargeDetaill",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "充值详情1",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/acupoint/acupoint",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "穴位检索",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/acupoint/acupointDetail",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "脉穴详情",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/timeAcupoint/timeAcupoint",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "时辰取穴",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/timeAcupoint/totalTable",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "全部穴位一览表",
-        		"enablePullDownRefresh" : false
-        	}
-        }
-    ],
+			}
+		},
+		{
+			"path": "pages/bookShop/deliverLIst",
+			"style": {
+				"navigationBarTitleText": "快递列表",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/peanut/chargeDetaill",
+			"style": {
+				"navigationBarTitleText": "充值详情1",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/acupoint/acupoint",
+			"style": {
+				"navigationBarTitleText": "穴位检索",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/acupoint/acupointDetail",
+			"style": {
+				"navigationBarTitleText": "脉穴详情",
+				"enablePullDownRefresh": false
+			}
+		},{
+			"path": "pages/timeAcupoint/timeAcupoint",
+			"style": {
+				"navigationBarTitleText": "时辰取穴",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/timeAcupoint/totalTable",
+			"style": {
+				"navigationBarTitleText": "全部穴位一览表",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/luck/luck",
+			"style": {
+				"navigationBarTitleText": "五运六气",
+				"enablePullDownRefresh": false
+			}
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -560,7 +511,7 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF",
 		"navigationStyle": "custom",
-		"enablePullDownRefresh":true
+		"enablePullDownRefresh": true
 	},
 	"tabBar": {
 		"color": "#444444",
@@ -613,4 +564,4 @@
 			"query": "" //启动参数，在页面的onLoad函数里面得到
 		}]
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/luck/luck - 副本.vue b/pages/luck/luck - 副本.vue
new file mode 100644
index 0000000..0ce1c55
--- /dev/null
+++ b/pages/luck/luck - 副本.vue	
@@ -0,0 +1,287 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module> -->
+		<z-nav-bar title="五运六气"></z-nav-bar>
+		<view class="">
+			<canvas style="width: 100%; height:100vh;" canvas-id="firstCanvas" id="firstCanvas"></canvas>
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	export default {
+		data() {
+			return {
+				playData: {},
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				zhuyun: [],
+				keyun: [],
+				nianyun: '',
+				fiveTimes: []
+			}
+		},
+		onLoad() {
+			this.getYun()
+		},
+		onReady: function(e) {
+
+		},
+		onHide() {
+
+		},
+		methods: {
+			getpanOne() {
+				console.log(this.nianyun, 'nuanyun')
+				var myCanvas = uni.createCanvasContext('firstCanvas')
+				//将原点设置100,100位置
+				myCanvas.translate(0, 0);
+				//原点在100,100，则圆心设为0,0 ——> 100,100的位置
+				myCanvas.setStrokeStyle("#00ff00")
+				myCanvas.setLineWidth(1)
+				// myCanvas.fillStyle = "#f3b2a7"
+				// myCanvas.rect(0, 0, 200, 200)
+				// myCanvas.stroke()			
+				myCanvas.setLineWidth(1)
+				//	console.log(-Math.PI/5,'-Math.PI/2')
+				let yunNum = 360 / 5
+				var angle = Math.PI * 2 / 5;
+				// let startAng = 0
+				// console.log(angle,'angle')
+				var deg = Math.PI / 180
+				// 最大圈
+				for (var i = 0; i < this.fiveYunNum; i++) {
+					myCanvas.setStrokeStyle("#000")
+					let n = i + 1
+					myCanvas.beginPath();
+					myCanvas.moveTo(this.pageWidth / 2, this.pageHeight / 2)
+					myCanvas.arc(this.pageWidth / 2, this.pageHeight / 2, 160, -deg * i * yunNum, -deg * yunNum * n, true)
+
+					myCanvas.font = 'normal 16px Arial'
+					myCanvas.fillStyle = "#f3b2a7"
+					myCanvas.fill();
+					myCanvas.closePath();
+					myCanvas.stroke()
+				}
+				for (var i = 0; i < this.fiveYunNum; i++) {
+					myCanvas.setStrokeStyle("#000")
+					let n = i + 1
+					myCanvas.beginPath();
+					myCanvas.moveTo(this.pageWidth / 2, this.pageHeight / 2)
+					myCanvas.arc(this.pageWidth / 2, this.pageHeight / 2, 90, -deg * i * yunNum, -deg * yunNum * n, true)
+					myCanvas.closePath();
+					myCanvas.fillStyle = "#fef9e4"
+					myCanvas.fill();
+					myCanvas.stroke()
+				}
+				// 中间的主运					
+				myCanvas.beginPath();
+				myCanvas.arc(this.pageWidth / 2, this.pageHeight / 2, 30, 0, 2 * Math.PI, true)
+				myCanvas.fillStyle = "#f8d8d5"
+				myCanvas.fill();
+				myCanvas.fillStyle = "#000"
+				myCanvas.fillText(this.nianyun, this.pageWidth / 2 - 9, this.pageHeight / 2 + 6)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+
+				// 绘制文字(主运)		
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[0], this.pageWidth / 2 + 90, this.pageHeight / 2 + 70)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[1], this.pageWidth / 2 - 30, this.pageHeight / 2 + 120)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[2], this.pageWidth / 2 - 140, this.pageHeight / 2)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[3], this.pageWidth / 2 - 50, this.pageHeight / 2 - 120)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[4], this.pageWidth / 2 + 90, this.pageHeight / 2 - 70)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+				// 结束
+				// 绘制文字（客运）
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[0], this.pageWidth / 2 + 40, this.pageHeight / 2 + 40)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[1], this.pageWidth / 2 - 20, this.pageHeight / 2 + 60)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				 myCanvas.beginPath();				
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[2], this.pageWidth / 2 - 70, this.pageHeight / 2)
+				myCanvas.closePath();				
+				 myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[3], this.pageWidth / 2 - 30, this.pageHeight / 2 - 50)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[4], this.pageWidth / 2 + 30, this.pageHeight / 2 - 20)
+				myCanvas.closePath();
+				myCanvas.stroke()
+				// 结束	
+							
+				// 绘制时间
+				 // myCanvas.beginPath();
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 + 170, this.pageHeight / 2 - 30);
+				myCanvas.rotate(90 * Math.PI / 180 );
+				// console.log(30 * Math.PI / 180 )
+				myCanvas.fillStyle = "#000"
+				// myCanvas.textBaseline = 'middle'
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[0],  0,  0)
+				 // myCanvas.closePath();
+				myCanvas.restore()				
+				
+				
+				// myCanvas.beginPath();
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 + 80, this.pageHeight / 2 + 150);
+				myCanvas.rotate((90+yunNum) * Math.PI / 180 );
+				// console.log(30 * Math.PI / 180 )
+				myCanvas.fillStyle = "#000"
+				// myCanvas.textBaseline = 'middle'
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[1],  0,  0)
+				 // myCanvas.closePath();
+				myCanvas.restore()
+				
+				
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 - 120, this.pageHeight / 2  + 120);
+				myCanvas.rotate((90+yunNum*2) * Math.PI / 180 );			
+				myCanvas.fillStyle = "#000"			
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[2],  0,  0)				
+				myCanvas.restore()
+				
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 - 160, this.pageHeight / 2  - 70);
+				myCanvas.rotate((90+yunNum*3) * Math.PI / 180 );			
+				myCanvas.fillStyle = "#000"			
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[3],  0,  0)				
+				myCanvas.restore()
+				
+				myCanvas.save();
+				myCanvas.translate(this.pageWidth / 2 + 20, this.pageHeight / 2  - 170);
+				myCanvas.rotate((90+yunNum*4) * Math.PI / 180 );			
+				myCanvas.fillStyle = "#000"			
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[4],  0,  0)				
+				myCanvas.restore()
+
+				myCanvas.draw()
+			},
+			getYun() {
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": "2023-11-16 13:25:15"
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+
+						if (res.code == 0 && res.tgdz) {
+							console.log('获取成功', res.tgdz)
+							this.zhuyun = res.tgdz.wy.zhuYun
+							this.keyun = res.tgdz.wy.keYun
+							this.nianyun = res.tgdz.wy.nianYun
+							this.fiveTimes = res.tgdz.wy.time
+							// console.log(this.nianyun,'this.nianyun')
+							this.getpanOne()
+						} else {
+
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			}
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 10rpx;
+		height: 100vh;
+		background-color: #fff;
+	}
+
+
+	.flexbox {
+		display: flex;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/luck/luck.vue b/pages/luck/luck.vue
new file mode 100644
index 0000000..a549282
--- /dev/null
+++ b/pages/luck/luck.vue
@@ -0,0 +1,363 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module> -->
+		<z-nav-bar title="五运六气"></z-nav-bar>
+		<view>
+			<!-- {{date}}---{{timestamp}} -->
+			<!-- <uni-section :title="'date 对象用法：' + datetimesingle" type="line"></uni-section> -->
+			<view class="datetimeBox">
+				<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+			</view>
+			<view class="flexbox box1 grayBg">
+				<view class="yunqi">
+					<view class="">
+						<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>
+					</view>
+				</view>
+				<!-- <view class="yinli">
+					<text>{{yinli.year}}</text>
+					<text>{{yinli.month}}</text>
+					<text>{{yinli.day}}</text>
+					<text>{{yinli.hour}}</text>
+				</view> -->
+			</view>
+		</view>
+
+		<view class="centerBox">《 ↓ 五运图 》</view>
+		<!-- <scroll-view class="scroll-view_H flexbox" scroll-x="true" @scroll="scroll" > -->
+			<view class="flexbox scroll-view_H wuYunBox">
+				<view class="leftone row" id="text">
+					<view class="line line1">开始时间<br /><span>运数</span></view>
+					<!-- <view class="">*节</view> -->
+					<view class="line zhuyun">主运</view>
+					<view class="line keyun">客运</view>
+				</view>
+				<view :class="['row', wy.now == 0 ? 'cur' : '']" id="text0">
+					<view class="line line1">{{wy.fiveTimes[0]}}起<br /><span>初之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[0]}}</view>
+					<view class="line  keyun">{{wy.keyun[0]}}</view>
+				</view>
+				<view :class="['row', wy.now == 1 ? 'cur' : '']" id="text1">
+					<view class="line line1">{{wy.fiveTimes[1]}}起<br /><span>二之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[1]}}</view>
+					<view class="line keyun">{{wy.keyun[1]}}</view>
+				</view>
+				<view :class="['row', wy.now == 2 ? 'cur' : '']" id="text2">
+					<view class="line line1">{{wy.fiveTimes[2]}}起<br /><span>三之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[2]}}</view>
+					<view class="line keyun">{{wy.keyun[2]}}</view>
+				</view>
+				<view :class="['row', wy.now == 3 ? 'cur' : '']" id="text3">
+					<view class="line line1">{{wy.fiveTimes[3]}}起<br /><span>四之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[3]}}</view>
+					<view class="line keyun">{{wy.keyun[3]}}</view>
+				</view>
+				<view :class="['row',wy.now == 4 ? 'cur' : '']" id="text4">
+					<view class="line line1">{{wy.fiveTimes[4]}}起<br /><span>终之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[4]}}</view>
+					<view class="line keyun">{{wy.keyun[4]}}</view>
+				</view>
+			</view>
+		<!-- </scroll-view> -->
+		<view class="centerBox">《 ↓ 六气图，左滑查看全年气数 》</view>		
+		<scroll-view class="scroll-view_H flexbox liuqiBox" scroll-x="true" @scroll="scroll" :scroll-left="200">
+			<!-- <view class="flexbox scroll-view_H"> -->
+				<view class="leftone row">
+					<view class="line line1">开始时间<br /><span>气数</span></view>
+					<!-- <view class="">*节</view> -->
+					<view class="line zhuyun">主气</view>
+					<view class="line keyun">客气</view>
+				</view>
+				<view :class="['row', lq.now == 0 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[0]}}起<br /><span>初之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[0]}}</view>
+					<view class="line  keyun">{{lq.keqi[0]}}</view>
+				</view>
+				<view :class="['row', lq.now == 1 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[1]}}起<br /><span>二之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[1]}}</view>
+					<view class="line keyun">{{lq.keqi[1]}}</view>
+				</view>
+				<view :class="['row', 'sizai', 'sizai1', lq.now == 2 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[2]}}起<br /><span>三之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[2]}}</view>
+					<view class="line keyun">{{lq.keqi[2]}}</view>
+				</view>
+				<view :class="['row', lq.now == 3 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[3]}}起<br /><span>四之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[3]}}</view>
+					<view class="line keyun">{{lq.keqi[3]}}</view>
+				</view>
+				<view :class="['row', lq.now == 4 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[4]}}起<br /><span>五之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[4]}}</view>
+					<view class="line keyun">{{lq.keqi[4]}}</view>
+				</view>
+				<view :class="['row', 'sizai', 'sizai2', lq.now == 5 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[5]}}起<br /><span>终之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[5]}}</view>
+					<view class="line keyun">{{lq.keqi[5]}}</view>
+				</view>
+			<!-- </view> -->
+		</scroll-view>
+		<!-- <image src="../../static/icon/leftFrag.gif" mode="scaleToFill"></image> -->
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function 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;
+	};
+
+	export default {
+		data() {
+			return {
+				playData: {},
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: Date.now() - 2 * 24 * 3600 * 1000, // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000,      // 时间戳
+				wy: {
+					curTime:0,
+					zhuyun: [],
+					keyun: [],
+					nianyun: '',
+					fiveTimes: []
+				},
+				showCalendar: false,
+				info: {
+					lunar: true,
+					range: true,
+					insert: false,
+					selected: []
+				},
+				lq: {
+					curTime:0,
+					zhuqi: [],
+					keqi: [],
+					time: []
+				},
+				yinli: {
+					year: '',
+					month: '',
+					day: '',
+					hour: ''
+				},
+				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() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			// 获取五运六气
+			getYun(date) {
+				let that = this
+				$http.request({
+						url: "book/point/WYLQForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.wylq) {
+							console.log('获取成功', res.wylq)
+							this.wy.zhuyun = res.wylq.wy.zhuYun
+							this.wy.keyun = res.wylq.wy.keYun
+							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.wy.timestampList = res.wylq.wy.time.map( item => {
+							// 	return new Date(item).getTime()
+							// })
+							// this.wy.curTime = this.wy.timestampList.find(function(elem){							     
+							// 		 return elem > that.timestamp								 
+							//  });
+							//  console.log(this.wy,'this.wy.curTime',this.timestamp)
+							// this.yinli.month = res.wylq.month
+							// this.yinli.day = res.wylq.day
+							// this.yinli.hour = res.wylq.hour
+							// this.yinli.year = res.wylq.year
+
+							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)	
+				this.timestamp = new Date(ss).getTime()
+				this.getYun(e)
+			},			
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #888;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+
+		.yunqi {
+			color: #c06346;
+			line-height: 50rpx;
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+			
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			 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;
+   }
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+			span{font-size: 36rpx;   }
+		}
+		.line1{ font-size: 24rpx; height: 200rpx; writing-mode: vertical-rl;;}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container {
+		padding: 10rpx;
+		
+		background-color: #fff; padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+	.liuqiBox{
+		.line.keyun { padding: 60rpx 10rpx}
+	}
+	.wuYunBox{
+		.row{width: 20%; box-sizing: border-box;}
+	}
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+.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;} 
+	
+}
+.sizai1{
+	.keyun::after{content: '（司天）';}
+}
+.sizai2{
+	.keyun::after{content: '（在泉）';}
+}
+	.flexbox {
+		display: flex;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 5850292..92c7c83 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -20,14 +20,13 @@
 						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
 						<text>方药检索</text>
 					</div> -->
-					<!-- <div class="item item1">
+					 <div class="item item1">
+					<div class="item item1" @click="onPageJump('../luck/luck')">
 						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
 						<text>五运六气</text>
-					</div> -->
-					<!-- <div class="item item1" @click="onPageJump('../timeAcupoint/timeAcupoint')">
-						<image src="../../static/icon/five6.png" mode="aspectFit"></image>
-						<text>时辰取穴</text>
-					</div> -->
+					</div> 
+					</div>
+					
 					<div class="item item1" @click="onPageJump('../peanut/searchFor')">
 						<image src="../../static/icon/five3.png" mode="aspectFit"></image>
 						<text>书名检索</text>
diff --git a/utils/getHours.js b/utils/getHours.js
new file mode 100644
index 0000000..2965f1d
--- /dev/null
+++ b/utils/getHours.js
@@ -0,0 +1,18 @@
+import store from '@/store/index.js'
+import $http from '@/config/requestConfig.js';
+// #ifdef APP-PLUS
+const nowHour = new Date;
+// #endif
+// #ifdef H5
+const nowHour = new Date;
+// #endif
+nowHour.hourNumber = nowHour.getHours()   // 当前的小时数
+
+var myHour = {	
+    playBgm({mute=false}){
+    },
+	
+	
+}
+module.exports = {nowHour}
+