diff --git a/pages/acupoint/acupoint.vue b/pages/acupoint/acupoint.vue
index 60e455c..b0686d1 100644
--- a/pages/acupoint/acupoint.vue
+++ b/pages/acupoint/acupoint.vue
@@ -174,6 +174,12 @@
this.getTitles(id)
},
setOneCateIndex(item, index) {
+ if(item.title == "时辰取穴"){
+ uni.navigateTo({
+ url: "../timeAcupoint/timeAcupoint"
+ })
+ return
+ }
let id = item.id
this.curOneCateIndex = index
this.curTwoCateIndex = 0
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 72de994..ff89918 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -24,10 +24,10 @@
五运六气
-->
-
+
书名检索
diff --git a/pages/timeAcupoint/timeAcupoint.vue b/pages/timeAcupoint/timeAcupoint.vue
index 72e747d..f77c12d 100644
--- a/pages/timeAcupoint/timeAcupoint.vue
+++ b/pages/timeAcupoint/timeAcupoint.vue
@@ -1,7 +1,7 @@
- -->
+
@@ -9,27 +9,32 @@
-
+
+
+ 天干
地支
+
- 五运:{{wy.zhuyun[wy.now]}}(主运) {{wy.keyun[wy.now]}}(客运)
- {{wy.nianyun}}(年运)
-
-
- 六气:{{lq.zhuqi[lq.now]}}(主气) {{lq.keqi[lq.now]}}(客气)
-
+ {{tiangandizhi.hour}}
+ {{tiangandizhi.day}}
+ {{tiangandizhi.month}}
+ {{tiangandizhi.year}}
+
- ↓ 24时辰对应穴位图表 左滑查看全部
+ ↓ 12时辰对应穴位图表 左滑查看全部
+
+
+ 注:表中带* 者是原穴
-
-
+
+
-
+
|
@@ -37,30 +42,48 @@
|
- | 23:00 - 01:00 |
+ 23 - 01 |
-
- | 23:00 - 01:00 |
+
+ | 01 - 03 |
- | 23:00 - 01:00 |
+ 03 - 05 |
- | 23:00 - 01:00 |
+ 07 - 09 |
- | 23:00 - 01:00 |
+ 09 - 11 |
- | 23:00 - 01:00 |
+ 11 - 13 |
+
+
+ | 13 - 15 |
+
+
+ | 15 - 17 |
+
+
+ | 17 - 19 |
+
+
+ | 19 - 21 |
+
+
+ | 19 - 21 |
+
+
+ | 21 - 23 |
-
+
-
-
+
+
| 灵龟八法 |
飞腾八法 |
@@ -83,127 +106,40 @@
过时泄本 |
过时补原 |
-
- | 太冲 |
- 太冲 |
-
- 丘*虚
- 陷 谷
- 陷 谷
+ |
+ | {{item.lgbf.KX}} |
+ {{item.lgbf.HX}} |
+ {{item.ftbf.KX}} |
+ {{item.ftbf.HX}} |
+
+
+ {{item1}}
+
+
|
- 7 |
- 7 |
-
- 7 |
- 7 |
- 7 |
- 7 |
-
-
- | 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
- 7
+ {{item.zwlz.nzf.bf}}
|
- 7
+ {{item.zwlz.nzf.xf}}
|
- 7
+ {{item.zwlz.nzf.gsxb}}
|
- 7
+ {{item.zwlz.nzf.gsbf}}
|
-
- | 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
-
- | 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
-
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
-
- | 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
-
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
-
- | 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
- 太冲 |
-
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
- 7
- |
-
+
+ 注:表中带* 者是原穴
+
@@ -238,31 +174,22 @@
pageHeight: uni.getSystemInfoSync().windowHeight - 200,
fiveYunNum: 5,
// date: new Date().toISOString().slice(0, 10), // 只返回年月日
- date: Date.now() - 2 * 24 * 3600 * 1000, // 返回年月日带时间
+ date: new Date().getTime(), // 返回年月日带时间
dateToString: formatDateTime(new Date()), // 字符串格式的日期
- timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳
- wy: {
- curTime: 0,
- zhuyun: [],
- keyun: [],
- nianyun: '',
- fiveTimes: []
- },
- showCalendar: false,
- lq: {
- curTime: 0,
- zhuqi: [],
- keqi: [],
- time: []
- },
-
+ timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳
+ showCalendar: false,
+ quxue: [], // 时辰取穴
+ tiangandizhi:{},
+ yuanXue:[
+ '腕骨','丘墟','丘墟','太溪','大陵','京骨','阳池','太渊','合谷','太白','冲阳','神门'],
}
},
onLoad() {
let da = new Date().toISOString().slice(0, 10)
this.timestamp = new Date(da).getTime()
- this.getYun(this.dateToString)
-
+ console.log('初始时间', this.dateToString,this.date)
+ this.getXueWei(this.dateToString)
+ this.getTGDZ(this.dateToString)
},
onHide() {
@@ -270,11 +197,17 @@
},
methods: {
scroll: function(e) {},
- // 获取五运六气
- getYun(date) {
+ // 设置文字颜色
+ getHightLightColor(text){
+ if(text.indexOf('*') != -1){
+ return "#9c3211"
+ }
+ },
+ // 获取天干地支
+ getTGDZ(date){
let that = this
$http.request({
- url: "book/point/WYLQForYear",
+ url: "book/point/TGDZForYear",
method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
data: {
"date": date
@@ -284,18 +217,32 @@
},
})
.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.lq = res.wylq.lq
-
+ if (res.code == 0 ) {
+ console.log('天干地支', res.tgdz)
+ this.tiangandizhi = res.tgdz
+ }
+
+ }).catch(e => {
+ console.log(e, 'e')
+ });
+ },
+ // 获取时辰取穴
+ getXueWei(date) {
+ let that = this
+ $http.request({
+ url: "book/point/SCQX",
+ method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
+ data: {
+ "date": date
+ },
+ header: { //默认 无 说明:请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(res => {
+ if (res.code == 0 && res.flag.length > 0) {
+ console.log('时辰取穴', res.flag)
+ this.quxue = res.flag
}
}).catch(e => {
@@ -306,7 +253,8 @@
console.log('change事件:', e);
let ss = e.slice(0, 10)
this.timestamp = new Date(ss).getTime()
- this.getYun(e)
+ this.getXueWei(e)
+ this.getTGDZ(e)
},
},
@@ -319,7 +267,9 @@