添加思天在泉

config/baseUrl.js

@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
 	// 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 = "https://testapi.nuttyreading.com/";      // 线上测试环境
+	 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
 	// 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

config/requestConfig.js

@@ -167,6 +167,7 @@ $http.dataFactory = async function(res) {
 					title: '登录失效，请重新登录',
 					icon: 'none'
 				});
+				console.log('到这里了')
 				setTimeout(() => {
 					uni.navigateTo({
 						url: "/pages/user/login"

manifest.json

@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.13",
-    "versionCode" : 1213,
+    "versionName" : "1.2.14",
+    "versionCode" : 1214,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
@@ -154,7 +154,10 @@
         "splashscreen" : {
             "alwaysShowBeforeRender" : false
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {},
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     // 5+App特有相关
     "quickapp" : {},
@@ -172,6 +175,9 @@
             "scope.userLocation" : {
                 "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
     "h5" : {
@@ -184,9 +190,61 @@
             "treeShaking" : {
                 "enable" : true
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
-    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274"
+    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
+    "uniStatistics" : {
+        "version" : "2",
+        "enable" : true
+    },
+    "mp-alipay" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-baidu" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-qq" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-toutiao" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    }
 }
 // 小程序特有相关
 

pages.json

@@ -510,18 +510,10 @@
         	}
         },
         {
-        	"path" : "pages/prescription/prescription",
+        	"path" : "pages/luck/luck",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "方药检索",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/prescription/prescriptionDetail",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "方药详情",
+        		"navigationBarTitleText" : "五运六气",
         		"enablePullDownRefresh" : false
         	}
         }

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>

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>

pages/peanut/home.vue

@@ -3,22 +3,24 @@
 		<!-- <z-nav-bar backState="2000" title="首页"></z-nav-bar> -->
 		<view class="home_bg">
 			<view class="" style=" ">
-				<view class="icon_hua">
-					<image src="../../static/icon/home_icon_3.png" mode="aspectFit" class="icon_hua_1"></image>
-				</view>	
-				<view class="hehan">
-					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
-				</view>	
-				<view class="fiveIcon flexbox" >
+				
+					<view class="icon_hua">
+						<image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
+					</view>	
+					<view class="hehan">
+						<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
+					</view>	
+							
+				<view class="fiveIcon flexbox" style="justify-content: space-around;">
 					<div class="item item1" @click="onPageJump('../acupoint/acupoint')">
 						<image src="../../static/icon/five1.png" mode="aspectFit" ></image>
 						<text>经穴检索</text>
 					</div>
-					<div class="item item1" @click="onPageJump('../prescription/prescription')">
+					<!-- <div class="item item1">
 						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
 						<text>方药检索</text>
-					</div>
-					<div class="item item1">
+					</div> -->
+					<div class="item item1" @click="onPageJump('../luck/luck')">
 						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
 						<text>五运六气</text>
 					</div>
@@ -27,10 +29,10 @@
 						<text>书名检索</text>
 					</div>
 					
-					<div class="item item1">
+					<!-- <div class="item item1">
 						<image src="../../static/icon/five5.png" mode="aspectFit"></image>
 						<text>吴门医述</text>
-					</div>
+					</div> -->
 				</view>
 				<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 					<view class="search">
@@ -50,23 +52,23 @@
 		<!-- <view class="home_nar" v-if="showEbook"> -->
 		<view class="home_nar">	
 				<view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')">
-					<image src="../../static/icon/home1.png" mode="aspectFit"></image>
+					<image src="../../static/icon/home1-1.png" mode="aspectFit"></image>
 					<!-- <text>打 卡</text> -->
 				</view>	
 						
 			<view  class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')">
-				<image src="../../static/icon/home2.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home2-1.png" mode="aspectFit"></image>
 				<!-- <text>听 书</text> -->
 			</view>			
 			
 			<!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> -->			
 			<view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')">
-				<image src="../../static/icon/home3.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home3-1.png" mode="aspectFit"></image>
 				<!-- <text>书 评</text> -->
 			</view>
 			
 			<view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')">
-				<image src="../../static/icon/home4.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home4-1.png" mode="aspectFit"></image>
 				<!-- <text>讲 书</text> -->
 			</view>		
 		</view>
@@ -125,14 +127,14 @@
 			</view>
 		</view> -->
 
-		<view class="head_line" style="margin-top: -20rpx;">
+		<view class="head_line" style="background-color: #fff;">
 			<b></b>
 			<text>新书上市</text>
 			<!-- <i @click="onBookMore('New')">查看更多 ></i> -->
 		</view>
 		
 		<view class="newBook">			
-			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10">
+			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10" style="margin-top: 0 !important;">
 				<view :class="['item']"  v-for="(item,index) in newBookList" :key="index">
 						<view class="videoBox" @click="goDetail(item.productId)">
 							<image  v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
@@ -727,23 +729,23 @@
 	.ProTabs{
 		// margin: 20rpx 0; 
 	padding:0 20rpx;
-		text{padding: 12rpx 14rpx; font-size: 32rpx;  border-radius: 10rpx; overflow: hidden; 
+		text{padding: 8rpx 14rpx; font-size: 32rpx; display: inline-block; border-radius: 10rpx; overflow: hidden; 
 		// background-color: #eee;
 		 color: #55aa7f; margin-right: 10rpx;}
 		text.cur{background-color:#55aa7f ; color: #fff;}
 	}
-	.newBook{margin-top: 20rpx;}
+	// .newBook{margin-top: 10rpx;}
 	.scroll-view_H{background-color: #fff;white-space: nowrap;
-		 padding:10rpx ; }
+		 padding:10rpx ; margin-top: 12rpx;}
 	.scroll-view_H{ 
-		.item { padding: 10rpx; overflow: hidden; display: inline-block;
+		.item { padding: 10rpx; overflow: hidden; display: inline-block; padding-bottom: 0;
 			width: 180rpx !important; margin-right: 20rpx;  border-radius: 10rpx;
 			.videoBox{ 
 				image{display: block; width:150rpx; 
 				height: 170rpx; 
 				}
 			}
-			.bookName{display: block; margin-top: 20rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
+			.bookName{display: block; margin-top: 6rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
 		overflow-x: hidden; overflow: hidden;
 		text-overflow: ellipsis;}
 		}
@@ -751,7 +753,8 @@
 	}
 	.flexbox{display: flex;}
 	.head_line {
-		margin: 20rpx 0 0 0;
+		padding-top: 8rpx;
+		margin: 12rpx 0 0 0;
 
 
 		b {
@@ -793,8 +796,8 @@
 			image{width: 150rpx; height: 80rpx;}
 		}
 		.icon_hua{width: 100%; text-align: center; display: block;
-		image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
-		}
+				image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
+				}
 		.search_box { margin: 0 auto; margin-top: 20rpx;  align-items: center;
 			width: calc(100% - 30rpx);   margin-top: 0;
     margin-bottom: 20rpx;
@@ -828,8 +831,10 @@
 			font-size: 30rpx; color: #fff; 
 		}
 }
-	.home_nar { 
-		margin: 10rpx 20rpx; justify-content: space-between;
+	.home_nar {
+		background-color: #fff;
+		padding: 20rpx 30rpx;
+		 justify-content: space-between;
 		display: flex;
 		color: #333; 
 		 margin-bottom: 0;
@@ -839,18 +844,18 @@
 		// .chaoshi{background-color:#fff2d8 ;  border: 2px solid #ede6d3;	}
 		// .shuping{ background-color: #d6ffda; border: 2px solid #bae9bf;}
 		// .shuguan{ background-color:#e3f9f9 ;  border: 2px solid #d7eced; }
-		.hn_cl_tit { padding-bottom: 10rpx;
+		.hn_cl_tit { 
 			// width: 23%;
 			width: 31%; 
 			text-align: center;			 
-			 border-radius: 20rpx ;	padding-top: 10rpx;	
+			 border-radius: 20rpx ;		
 			// line-height: 110upx;
 			//display: flex;
 			align-content: center;
 			justify-content: center;
 			image {				
-				width:90%;
-				height:156rpx;
+				width:120rpx;
+				height:120rpx;
 				display: block;
 				margin: 0 auto;
 				// margin: 0 20rpx;
@@ -1119,13 +1124,13 @@
 
 	.goods {
 		width: 100%;
-	margin:18rpx 0 50rpx 0;
+	margin:0 0 50rpx 0; background-color: #fff;
 
 		.goodsItem {
 			display: inline-block;
 			width: 46%;
 			border-radius: 20rpx;
-			padding: 25rpx 25rpx 20rpx 25rpx;
+			padding: 25rpx; padding-bottom: 5rpx;
 			margin: 0 20rpx 20rpx 20rpx;
 			background-color: #fff;
 			border: 1px solid #eee;
@@ -1140,12 +1145,12 @@
 
 				.goodsName {
 					margin-top: 10rpx;
-					font-size: 30rpx;
+					font-size: 28rpx;
 					// font-weight: bold;
 				}
 
 				.goodsPrice {
-					font-size: 30rpx;
+					font-size: 28rpx;
 					margin: 5rpx 0 0 3rpx;					
 					display: flex; justify-content: space-between;
 					.price{

pages/peanut/mine.vue

@@ -89,7 +89,8 @@
 			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈11111</text>
 			</view> -->			
-			<view class="nav_list" @click="newOnShare" v-if="isAndorid">
+			<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
+			<view class="nav_list" @click="newOnShare">
 				<text>分享App</text>
 			</view>
 			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
@@ -122,7 +123,7 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState
+		mapState,mapMutations
 	} from 'vuex';
 	export default {
 		data() {
@@ -160,6 +161,7 @@
 		},
 		//方法
 		methods: {
+			...mapMutations(['setUserInfo']),
 			// 获得操作系统
 			getOS(){
 				let oprateOs = ''				
@@ -278,6 +280,7 @@
 			// 退出登录
 			signOut() {
 				this.signShow = false
+				this.setUserInfo({'token': null})
 				uni.reLaunch({
 					url: '../user/login'
 				});

pages/prescription/prescription.vue

@@ -1,630 +0,0 @@
-<template>
-	<view class="container">
-		<!-- 公共组件-每个页面必须引入1 -->
-		<public-module></public-module> -->
-		<z-nav-bar title="方药检索"></z-nav-bar>
-		<!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
-			@cancel="cancel" @clear="clear">
-		</uni-search-bar> -->
-		<view class="oneCateList flexbox">
-			<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)"
-				v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
-		</view>
-		<view class="search_box">
-			<u-search placeholder="请输入方药名" @focus="focus" @clear="clear" v-model="searchValue" @input="input"
-				@blur="blur" @search="search"></u-search>
-		</view>
-		<view class="searchList" v-show="showSearchList">
-			<view class="itemBox" v-if="searchList.length > 0">
-				<view class="item" v-for="(item, index) in searchList" :key="index" @click="gotoDetail(item)">
-					{{item.title}}
-				</view>
-			</view>
-			<view v-else class="">
-				<u-divider text="未找到相关方药哦~"></u-divider>
-			</view>
-		</view>
-		<view v-show="!showSearchList" class="contentBox">
-			<view class="" v-if="false">
-				<!-- 常规格式 -->				
-				<view class="grid twoCateList" v-if="twoCateList.length > 0">
-					<u-grid :col="3" border class="u-grid-list">
-						<u-grid-item v-for="(item, index) in twoCateList" :key="item.id"
-							@click="setTwoCateIndex(item, index)">
-							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
-						</u-grid-item>
-					</u-grid>
-				</view>
-				<view class="titleList">
-					<u-grid :col="3" v-if="titleList.length > 0">
-						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">
-							<view :class="['titleItem']">{{item.title}}</view>
-						</u-grid-item>
-					</u-grid>
-					<u-divider v-else text="暂无方药数据哦~"></u-divider>
-				</view>
-			</view>
-			<view class="mode2" v-else>
-				<!-- 经方样式 -->
-				<scroll-view class="scroll-container" scroll-y="true" :scroll-into-view="toView"
-					scroll-with-animation="true">
-					<view class="address-book" v-for="(item, index) in jingfangList" :key="index" :id="item.id">
-						<view class="address-book-index">{{ item.id }}</view>
-						<view class="contact-container" v-for="(item, index) in item.data" :key="index">
-							<view class="contact-detail-container">
-								<view class="contact-name">{{ item.title }}</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="letter-nav">
-					<view class="item" v-for="(item, index) in indexList" :key="index" @click="toSelectIndex(item)">
-						{{ item }}
-					</view>
-				</view>
-
-			</view>
-		</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 {
-				indexList: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-					'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
-				],
-				playData: {},
-				searchValue: '',
-				oneCateList: [], // 一级分类标题1
-				twoCateList: [], // 二级分类标题
-				titleList: [], // 方药标题
-				curOneCateIndex: 0, // 当前选中的一级分类
-				curTwoCateIndex: 0, // 当前选中的二级分类
-				searchList: [], // 搜索结果数组
-				showSearchList: false,
-				toView: '',
-				jingfangList: [{
-						id: 'A',
-						data: [{
-								title: '阿联酋迪拉姆',
-							},
-							{
-								title: '阿尔巴尼亚列克',
-							},
-						]
-					},
-					{
-						id: 'B',
-						data: [{
-								title: '孟加拉国塔卡',
-							},
-							{
-								title: '保加利亚列瓦',
-							},
-						]
-					},
-
-					{
-						id: 'C',
-						data: [{
-								title: '加拿大元',
-							},
-							{
-								title: '瑞士法郎',
-							},
-						]
-					},
-					{
-						id: 'D',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'E',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'F',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'G',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'H',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'I',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'J',
-						data: [{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-							{
-								title: '丹麦克朗',
-							},
-							{
-								title: '多米尼加比索',
-							},
-						]
-					},
-					{
-						id: 'Z',
-						data: [{
-								title: 'z',
-							},
-							{
-								title: 'zzz',
-							},
-						]
-					}
-
-				], // 经方数组
-			}
-		},
-		onLoad() {
-			this.getCateList()
-		},
-		onHide() {
-			this.showSearchList = false
-			this.searchList = []
-		},
-		methods: {
-			toSelectIndex(item) {
-				this.toView = item
-			},
-			// 方药详情
-			gotoDetail(item) {
-				uni.navigateTo({
-					url: "./acupointDetail?id=" + item.id
-				})
-			},
-			// 获取方药名称
-			getTitles(id) {
-				$http.request({
-					url: "book/point/getPointsByCategoryId",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data: {
-						// loadAnimate: 'none', // 请求加载动画
-						'pointCategoryId': id
-					},
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '内容获取成功')
-					if (res.code == 0 && res.points.length > 0) {
-						this.titleList = res.points
-					} else {
-						this.titleList = []
-					}
-				}).catch(e => {
-					this.titleList = []
-					console.log(e)
-				})
-			},
-			setTwoCateIndex(item, index) {
-				let id = item.id
-				this.curTwoCateIndex = index
-				this.getTitles(id)
-			},
-			setOneCateIndex(item, index) {
-				let id = item.id
-				this.curOneCateIndex = index
-				this.curTwoCateIndex = 0
-				this.getTowCateList(id)
-			},
-			getTowCateList(id) {
-				$http.request({
-					url: "book/point/getPointCategoryByPid",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data: {
-						loadAnimate: 'none', // 请求加载动画
-						'id': id
-					},
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '二级分类获取成功')
-					if (res.code == 0 && res.category.length > 0) {
-						this.twoCateList = res.category
-						this.getTitles(this.twoCateList[0].id)
-					} else {
-						this.twoCateList = []
-						this.titleList = []
-					}
-				}).catch(e => {
-					this.twoCateList = []
-					this.titleList = []
-					console.log(e)
-				})
-			},
-			getCateList(id) {
-				id ? '' : id = 0
-				this.twoCateList = []
-				this.curTwoCateIndex = 0
-				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
-				$http.request({
-					url: "book/point/getPointCategoryByPid",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data: {
-						loadAnimate: 'none', // 请求加载动画
-						'id': id
-					},
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '脉穴分类获取成功')
-					if (res.code == 0 && res.category.length > 0) {
-						this.oneCateList = res.category
-						this.getTowCateList(this.oneCateList[0].id)
-					} else {
-						this.oneCateList = []
-					}
-				}).catch(e => {
-					this.oneCateList = []
-					console.log(e)
-				})
-			},
-			getSearch() {
-				$http.request({
-					url: "book/point/searchPointList",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data: {
-						loadAnimate: 'none', // 请求加载动画
-						'keywords': this.searchValue
-					},
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '搜索结果')
-					if (res.code == 0 && res.points.length > 0) {
-						this.searchList = res.points
-					}
-				}).catch(e => {
-					// this.titleList = []	
-					this.searchList = []
-					console.log(e)
-				})
-			},
-			search(res) {
-				console.log(res, 'res')
-				// uni.showToast({
-				// 	title: '搜索：' + res,
-				// 	icon: 'none'
-				// })
-
-			},
-			input(res) {
-				console.log('----input:', res)
-				if (res == '') {
-					this.searchList = []
-				} else {
-					this.getSearch()
-				}
-			},
-			clear(res) {
-				// uni.showToast({
-				// 	title: 'clear事件，清除值为：',
-				// 	icon: 'none'
-				// })
-				this.showSearchList = false
-			},
-			blur(res) {
-				if (res == '') {
-					this.showSearchList = false
-					this.searchList = []
-				} else {
-					this.getSearch()
-				}
-			},
-			focus(e) {
-				// uni.showToast({
-				// 	title: 'focus事件，输出值为：' + e.value,
-				// 	icon: 'none'
-				// })
-				this.showSearchList = true
-			},
-			// cancel(res) {
-			// 	uni.showToast({
-			// 		title: '点击取消，输入值为：' + res.value,
-			// 		icon: 'none'
-			// 	})
-			// }
-		},
-		onBackPress() {
-			// #ifdef APP-PLUS
-			plus.key.hideSoftKeybord();
-			// #endif
-		},
-		components: {
-			musicPlay
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.mode2 {
-		position: relative;
-	}
-
-	.address-book-index {
-		background-color: #f8f9fa; padding: 10rpx 0; text-indent: 2%;
-	}
-
-	.contact-img {
-		width: 20px;
-		height: 20px;
-	}
-
-	.scroll-container {
-		height: calc(100vh - 70rpx);
-	}
-
-	.letter-nav {
-		position: absolute;
-		right: 25rpx;
-		top: 40rpx;
-
-		.item {
-			font-size: 28rpx; margin-bottom: 10rpx;
-		}
-	}
-
-	.contact-container {
-		display: flex;
-		align-items: center;
-		margin: 2%;
-	}
-
-	.contact-detail-container {
-		margin-left: 2%;
-		.contact-name{
-			padding: 10rpx;
-		}
-
-	}
-
-	.searchList {
-		.item {
-			font-size: 28rpx;
-			padding: 20rpx;
-			border-bottom: 1px solid #dadbde;
-		}
-	}
-
-	.scroll-view_H {
-		background-color: #fff;
-		white-space: nowrap;
-		padding: 10rpx;
-	}
-
-	.oneCateList {
-		margin-bottom: 20rpx;
-		justify-content: space-between;
-
-		text {
-			text-align: center;
-			display: inline-block;
-			width: 32%;
-			padding: 20rpx 0;
-			font-size: 34rpx;
-			border-radius: 10rpx;
-		}
-
-		.cur {
-			background-color: #55aa7f;
-			color: #fff;
-		}
-	}
-
-	.contentBox {
-
-		.twoCateList {
-			font-size: 28rpx;
-			margin-top: 20rpx;
-
-			.grid-text {
-				padding: 30rpx 20rpx;
-				text-align: center;
-			}
-
-			.cur {
-				color: #55aa7f;
-			}
-
-			// .u-grid-list{border: 0.5px solid #dadbde;}
-		}
-
-		.titleList {
-			font-size: 26rpx;
-			margin-top: 20rpx;
-			padding: 10rpx;
-			border-radius: 10rpx;
-			background-color: #f8f9fa;
-
-			.titleItem {
-				padding: 20rpx 0;
-			}
-		}
-	}
-
-
-	.container {
-		padding: 10rpx;
-		min-height: 100vh;
-		overflow: hidden;
-		background-color: #fff;
-	}
-
-	.search_box {
-		margin: 0 auto;
-		overflow: hidden;
-		margin-top: 20rpx;
-		align-items: center;
-		width: calc(100% - 10px);
-		margin-top: 0;
-		margin-bottom: 40rpx;
-
-		.search {
-			height: 56upx;
-			display: flex;
-			width: 86%;
-			margin: 0 auto;
-			align-items: center;
-			padding: 0upx 40upx;
-			background-color: #fff;
-			border-radius: 20upx;
-			box-shadow: 0 0px 10px 1px #54a96633;
-		}
-
-		.prompt {
-			color: #838383;
-			font-size: 24rpx;
-
-		}
-
-		.icon_search {
-			background-image: url('@/static/icon/map_ic_search.png');
-			background-position: center center;
-			background-repeat: no-repeat;
-			background-size: cover;
-			width: 36upx;
-			height: 36upx;
-			margin-right: 20upx;
-		}
-	}
-
-	.flexbox {
-		display: flex;
-	}
-</style>

pages/prescription/prescriptionDetail.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/user/addAddress.vue

@@ -19,9 +19,9 @@
 
 				<u-form-item label="所在地区 :" prop="">
 					<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
-					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" -->
-					 @confirm="addconfirm" @change="changeHandler" ></u-picker>				
-				</u-form-item>
+					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
+						@confirm="addconfirm" @change="changeHandler" ></u-picker>
+				</u-form-item>				
 				<u-form-item label="详细地址 :" prop="useraddress">
 					<u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable
 						border="surround" />
@@ -50,6 +50,7 @@
 </template>
 
 <script>
+	
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
 	import addressList1 from "@/static/json/address.json"
@@ -63,14 +64,14 @@
 				// indexp:0,
 				// indexq:0,
 				// indexc:0,
-				playData: {},
+				playData:{},
 				addreShow: false, //是否显示
 				columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
 				columnData: [], //市数据
 				columnDatas: [], //区地址
 				switchTrue: true,
 				switchFalse: false,
-				addressChanged: false, // 地址修改标记
+				addressChanged:false, // 地址修改标记
 				navName: '', // 顶部导航栏标题
 				provId: '', // 存储省id
 				cityId: '', // 存储市id
@@ -90,51 +91,6 @@
 				isShowDel: false,
 				editIndex: 0,
 				deleteShow: false,
-				list: [{
-						value: 1,
-						label: '中国',
-						children: [{
-								value: 2,
-								label: '广东',
-								children: [{
-										value: 3,
-										label: '深圳'
-									},
-									{
-										value: 4,
-										label: '广州'
-									}
-								]
-							},
-							{
-								value: 5,
-								label: '广西',
-								children: [{
-										value: 6,
-										label: '南宁'
-									},
-									{
-										value: 7,
-										label: '桂林'
-									}
-								]
-							}
-						]
-					},
-					{
-						value: 8,
-						label: '美国',
-						children: [{
-							value: 9,
-							label: '纽约',
-							children: [{
-								value: 10,
-								label: '皇后街区'
-							}]
-						}]
-					}
-
-				],
 				rules: {
 					username: [{
 						required: true,
@@ -181,10 +137,10 @@
 				this.getAddress()
 			}
 			this.initDataPicker() //初始化省份列表
-
+			
 		},
 		onShow() {
-
+		
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -192,113 +148,113 @@
 		onReady() {
 			this.$refs.addForm.setRules(this.rules)
 		},
-		components: {
-			musicPlay
+		components:{
+			musicPlay	
 		},
-		methods: {
+		methods: {						
 			// 三级联动
 			initDataPicker() {
 				// console.log(this.addressList,'addressList')				
 				// this.$http
-				// .post('api/province/getProvince')
-				// .then(res => {
-				// 	if (res.code == 0) {
-				// this.addressList = res.provinceEntity
-				//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
-				let province = []; //初始数据需要展示的省份
-				let province1 = [{
-					"cityId": this.addressList[0].cityList[0].cityId,
-					"provId": this.addressList[0].cityList[0].provId,
-					"cityName": this.addressList[0].cityList[0].cityName,
-					"UName": this.addressList[0].cityList[0].cityName,
-					"createDate": this.addressList[0].cityList[0].createDate,
-					"regionCode": this.addressList[0].cityList[0].regionCode,
-					"countyList": this.addressList[0].cityList[0].countyList
-				}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
-				let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区
+					// .post('api/province/getProvince')
+					// .then(res => {
+					// 	if (res.code == 0) {
+							// this.addressList = res.provinceEntity
+							//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
+							let province = []; //初始数据需要展示的省份
+							let province1 = [{
+								"cityId": this.addressList[0].cityList[0].cityId,
+								"provId": this.addressList[0].cityList[0].provId,
+								"cityName": this.addressList[0].cityList[0].cityName,
+								"UName": this.addressList[0].cityList[0].cityName,
+								"createDate": this.addressList[0].cityList[0].createDate,
+								"regionCode": this.addressList[0].cityList[0].regionCode,
+								"countyList": this.addressList[0].cityList[0].countyList
+							}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
+							let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区
 
 
-				for (let i = 0; i < this.addressList.length; i++) {
-					this.addressList[i].UName = this.addressList[i].provName
-					if (this.addressList[i].cityList == null) {
-						this.addressList[i].cityList = [{
-							"cityId": this.addressList[i].provId,
-							"provId": this.addressList[i].provId,
-							"cityName": this.addressList[i].provName,
-							"UName": this.addressList[i].provName,
-							"createDate": this.addressList[i].createDate,
-							"regionCode": this.addressList[i].regionCode,
-							"countyList": [{
-								"countyId": this.addressList[i].provId,
-								"cityId": this.addressList[i].provId,
-								"countyName": this.addressList[i].provName,
-								"UName": this.addressList[i].provName,
-								"createDate": this.addressList[i].createDate,
-								"regionCode": this.addressList[i].regionCode
-							}]
-						}]
-					} else {
-						for (let j = 0; j < this.addressList[i].cityList.length; j++) {
-							this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
-								.cityName
-							for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
-								this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
-									.cityList[j].countyList[k].countyName
+							for (let i = 0; i < this.addressList.length; i++) {
+								this.addressList[i].UName = this.addressList[i].provName
+								if (this.addressList[i].cityList == null) {
+									this.addressList[i].cityList = [{
+										"cityId": this.addressList[i].provId,
+										"provId": this.addressList[i].provId,
+										"cityName": this.addressList[i].provName,
+										"UName": this.addressList[i].provName,
+										"createDate": this.addressList[i].createDate,
+										"regionCode": this.addressList[i].regionCode,
+										"countyList": [{
+											"countyId": this.addressList[i].provId,
+											"cityId": this.addressList[i].provId,
+											"countyName": this.addressList[i].provName,
+											"UName": this.addressList[i].provName,
+											"createDate": this.addressList[i].createDate,
+											"regionCode": this.addressList[i].regionCode
+										}]
+									}]
+								} else {
+									for (let j = 0; j < this.addressList[i].cityList.length; j++) {
+										this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
+											.cityName
+										for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
+											this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
+												.cityList[j].countyList[k].countyName
+										}
+									}
+								}
+								province.push(this.addressList[i]);
 							}
-						}
-					}
-					province.push(this.addressList[i]);
-				}
 
 
-				this.addressList[0].cityList[0].countyList.map(item => {
-					province2.push(item);
-				});
+							this.addressList[0].cityList[0].countyList.map(item => {
+								province2.push(item);
+							});
 
-				//省数据 因为要做数据初始化，所以是三维数组 
-				// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
-				this.columns.push(province);
-				this.columns.push(province1);
-				this.columns.push(province2);
+							//省数据 因为要做数据初始化，所以是三维数组 
+							// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
+							this.columns.push(province);
+							this.columns.push(province1);
+							this.columns.push(province2);
 
-				// console.log(6666666,this.columns)
+							// console.log(6666666,this.columns)
 
-				// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
-				// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
+							// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
+							// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
 
-				this.addressList.map(item => {
-					let city = [];
-					item.cityList.map(item1 => {
-						city.push(item1);
-					});
-					this.columnData.push(city);
-				});
+							this.addressList.map(item => {
+								let city = [];
+								item.cityList.map(item1 => {
+									city.push(item1);
+								});
+								this.columnData.push(city);
+							});
 
-				//区数据数组
-				//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,]   ,   [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,]   ]
+							//区数据数组
+							//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,]   ,   [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,]   ]
 
-				let area = [];
-				this.addressList.map((item, index) => {
-					let area1 = []; //省下面所有市的初始化
-					item.cityList.map(item1 => {
-						area = []; //市下面的区初始化
-						item1.countyList.map(item2 => {
-							area.push(item2);
-						});
-						area1.push(area); // 每循环一个市，添加该市下面的所有区
-					});
-					this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
-				});
+							let area = [];
+							this.addressList.map((item, index) => {
+								let area1 = []; //省下面所有市的初始化
+								item.cityList.map(item1 => {
+									area = []; //市下面的区初始化
+									item1.countyList.map(item2 => {
+										area.push(item2);
+									});
+									area1.push(area); // 每循环一个市，添加该市下面的所有区
+								});
+								this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
+							});
 
-				// };
-				// }).catch(e => {
-				// 	console.log(e,'e')
-				// })
+						// };
+					// }).catch(e => {
+					// 	console.log(e,'e')
+					// })
 
 			},
 			changeHandler(e) { //城市选择时触发
-				console.log(e, '变化了', this.columnData, this.columnDatas)
-				this.addressChanged = true
+			// console.log(e,'变化了',this.columnData, this.columnDatas)
+			this.addressChanged = true
 				const {
 					columnIndex, //当前选择的列，省 / 市 / 区
 					value, // 当前选择的数组内容
@@ -310,7 +266,7 @@
 				// 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更）
 				if (columnIndex === 0) { // 判断当前变更的是省还是市还是区
 					// picker为选择器this实例，变化第二列对应的选项				
-
+					
 					picker.setColumnValues(1, this.columnData[
 						index]); //设置市为该省下面的所有市，index是当前省在省份数组的下标，对应市数组中的下表就是 该省下面的所有市 的数据
 					picker.setColumnValues(2, this.columnDatas[index][0]); // 设置区域为该省下面第一个市下面的所有区域
@@ -322,7 +278,7 @@
 			},
 
 			addconfirm(e) { //点击确定按钮
-				console.log(e, '选中的值')
+			// console.log(e,'选中的值')
 				this.addressChanged = true
 				this.addreShow = false;
 				this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -330,7 +286,7 @@
 				this.cityId = e.value[1].cityId
 				this.countyId = e.value[2].regionCode
 			},
-
+			
 			addcancel() { //点击取消按钮
 				this.addreShow = false;
 			},
@@ -358,7 +314,7 @@
 						// this.addressForm.consigneePhone = this.addressForm.userphone
 						// this.addressForm.consigneeName = this.addressForm.username
 						// this.addressForm.regionCode = ''
-
+						
 						// // this.addressForm.userid = this.userInfo.id
 						// if(this.addressChanged){ // 如果修改过地址区域，就重新赋值，否则保持不变
 						// 	this.addressForm.areaidpath = `${this.provId}_${this.cityId}_${this.countyId}`
@@ -369,15 +325,15 @@
 
 						// let data = this.addressForm
 						let data = {
-							'id': this.addressForm.addressid,
-							'detailAddress': this.addressForm.useraddress,
-							'regionCode': this.countyId,
-							'userId': this.userInfo.id,
-							'consigneePhone': this.addressForm.userphone,
+							'id':this.addressForm.addressid,
+							'detailAddress' : this.addressForm.useraddress,
+							'regionCode':this.countyId,
+							'userId':this.userInfo.id,
+							'consigneePhone':this.addressForm.userphone,
 							'consigneeName': this.addressForm.username,
-							'isDefault': this.addressForm.isDafault ? 1 : 0
+							'isDefault':this.addressForm.isDafault ? 1 : 0
 						}
-						console.log(data, '保存参数')
+						console.log(data,'保存参数')
 						$http.request({
 							url: link_add,
 							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -419,17 +375,16 @@
 					.then(res => {
 						if (res.code == 0) {
 							this.addressForm = {
-								'useraddress': res.list[this.editIndex].detailAddress,
-								'userphone': res.list[this.editIndex].consigneePhone,
-								'username': res.list[this.editIndex].consigneeName,
-								'isdefault': res.list[this.editIndex].isDefault,
-								'isDafault': res.list[this.editIndex].isDefault == 1 ? true : false,
-								'areaidpathtext': res.list[this.editIndex].province + '-' + res.list[this
-									.editIndex].city + '-' + res.list[this.editIndex].county,
-								'addressid': res.list[this.editIndex].id
+								'useraddress':res.list[this.editIndex].detailAddress,
+								'userphone':res.list[this.editIndex].consigneePhone,
+								'username':res.list[this.editIndex].consigneeName,
+								'isdefault':res.list[this.editIndex].isDefault,
+								'isDafault':res.list[this.editIndex].isDefault == 1 ? true : false,
+								'areaidpathtext':res.list[this.editIndex].province +'-'+ res.list[this.editIndex].city +'-'+ res.list[this.editIndex].county
+								,'addressid':res.list[this.editIndex].id
 							}
 							this.countyId = res.list[this.editIndex].regionCode
-							//	this.addressForm = res.list[this.editIndex]
+						//	this.addressForm = res.list[this.editIndex]
 							if (this.addressForm.isdefault == 1) {
 								this.addressForm.isDafault = true
 							}
@@ -444,15 +399,15 @@
 				this.deleteShow = false
 				this.$http
 					.get(`book/userAddress/delete?id=${this.addressForm.addressid}`)
-					.then(res => {
-						if (res.code == 0) {
-							uni.showToast({
-								title: '地址删除成功',
-								duration: 1000,
-							});
-							uni.navigateBack()
-						}
-					})
+				.then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '地址删除成功',
+							duration: 1000,
+						});
+						uni.navigateBack()
+					}
+				})
 			},
 
 		},
@@ -461,19 +416,10 @@
 </script>
 
 <style lang="scss" scoped>
-	.flexbox {
-		display: flex;
+	.flexbox{display: flex;}
+	.selectAdd{ justify-content: space-between;
+		.addItem{ display: block;width: 30%}
 	}
-
-	.selectAdd {
-		justify-content: space-between;
-
-		.addItem {
-			display: block;
-			width: 30%
-		}
-	}
-
 	.add_arrow {
 		height: 28px;
 		line-height: 28px;
@@ -549,4 +495,4 @@
 			background-image: linear-gradient(90deg, #bf0c0c 0%, #95110c 100%)
 		}
 	}
-</style>
+</style>