From 17555f37c0bb32a5e8f8c43000d7de75455d6bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 17 Oct 2022 11:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                     |  58 +++-
 api/baseurl.js                              |   2 +-
 api/disease/index.js                        |   8 +
 api/information/index.js                    |  19 ++
 manifest.json                               |  30 +-
 pages.json                                  |  81 ++++--
 pages/CommodityDetails/CommodityDetails.vue |  22 --
 pages/Doctordetails/Doctordetails.vue       | 104 +++++++
 pages/Personal/Personal.vue                 |  37 ---
 pages/ProductList/ProductList.vue           |   5 -
 pages/disease/disease.vue                   | 122 +++++++++
 pages/doctorslist/doctorslist.vue           | 111 ++++++++
 pages/homepage/homepage.vue                 |  63 ++---
 pages/information/information.vue           | 287 ++++++++++++++++++++
 pages/login/login.vue                       |   4 -
 pages/medicine/medicine.vue                 |  49 ++++
 pages/register/register.vue                 |   4 -
 pages/shopping/shopping.vue                 |  50 +---
 pages/site/site.vue                         | 180 ++++++------
 static/chaxun.png                           | Bin 0 -> 3273 bytes
 static/information.png                      | Bin 0 -> 4526 bytes
 static/yuyue.png                            | Bin 0 -> 2378 bytes
 22 files changed, 949 insertions(+), 287 deletions(-)
 create mode 100644 api/disease/index.js
 create mode 100644 api/information/index.js
 create mode 100644 pages/Doctordetails/Doctordetails.vue
 create mode 100644 pages/disease/disease.vue
 create mode 100644 pages/doctorslist/doctorslist.vue
 create mode 100644 pages/information/information.vue
 create mode 100644 pages/medicine/medicine.vue
 create mode 100644 static/chaxun.png
 create mode 100644 static/information.png
 create mode 100644 static/yuyue.png

diff --git a/App.vue b/App.vue
index ea9eff2..dc7413f 100644
--- a/App.vue
+++ b/App.vue
@@ -1,16 +1,10 @@
-
-<style lang="scss">
-	@import "uview-ui/index.scss";
-</style>
+<script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
 		},
 		onShow: function() {
-			console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
 		}
 	}
 </script>
@@ -18,4 +12,54 @@
 <style lang="scss">
 	/*每个页面公共css */
 	@import "uview-ui/index.scss";
+
+	.app {
+		background-color: #F4F5F7;
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		color: #000000;
+
+		.cards {
+			width: 94%;
+			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
+			background-color: #fff;
+			position: absolute;
+			top: 3%;
+			left: 3%;
+			display: flex;
+			justify-content: space-evenly;
+			flex-wrap: wrap;
+			padding: 40rpx 0 200rpx 0;
+			border-radius: 25rpx;
+
+			.item {
+				width: 43%;
+				height: 300rpx;
+				margin-bottom: 40rpx;
+				border-radius: 25rpx;
+				position: relative;
+
+				.title {
+					width: 70%;
+					text-align: center;
+					font-size: 46rpx;
+					color: #FCFCFC;
+					position: absolute;
+					top: 58%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					position: absolute;
+					top: 20%;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+		}
+	}
 </style>
diff --git a/api/baseurl.js b/api/baseurl.js
index 7f01d55..ff0cce3 100644
--- a/api/baseurl.js
+++ b/api/baseurl.js
@@ -1,2 +1,2 @@
-var baseurl = "http://192.168.16.94:8080";
+var baseurl = "http://192.168.16.94:8081";
 export default baseurl
diff --git a/api/disease/index.js b/api/disease/index.js
new file mode 100644
index 0000000..ed3c3ac
--- /dev/null
+++ b/api/disease/index.js
@@ -0,0 +1,8 @@
+import request from "../request.js"
+
+export function getDiseaseInfo() {
+	return request({
+		url: `/nurseApplet/login/getDiseaseInfo`,
+		method: 'GET'
+	})
+}
diff --git a/api/information/index.js b/api/information/index.js
new file mode 100644
index 0000000..f392702
--- /dev/null
+++ b/api/information/index.js
@@ -0,0 +1,19 @@
+import request from "../request.js"
+
+//区街道list
+export function getRegionAndStreetInfo() {
+	return request({
+		url: `/nurseApplet/login/getRegionAndStreetInfo`,
+		method: 'GET'
+	})
+}
+
+
+
+//查询护理类型信息
+export function getNurseType() {
+	return request({
+		url: `/nurseApplet/login/getNurseTypeInfo`,
+		method: 'GET'
+	})
+}
diff --git a/manifest.json b/manifest.json
index 6d00163..5b8053d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,9 +17,7 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {
-            "Geolocation" : {}
-        },
+        "modules" : {},
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -42,14 +40,21 @@
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "",
-                        "appkey_android" : ""
+                        "appkey_android" : "b38c6aa0cb9a6323f48b05ea6462aed5"
                     }
                 },
                 "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "android" ],
+                        "appkey_ios" : "",
+                        "appkey_android" : "b38c6aa0cb9a6323f48b05ea6462aed5"
+                    },
                     "system" : {
-                        "__platform__" : [ "ios", "android" ]
+                        "__platform__" : [ "android" ]
                     }
-                }
+                },
+                "push" : {},
+                "payment" : {}
             },
             "splashscreen" : {
                 "androidStyle" : "default",
@@ -84,5 +89,16 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {
+                "amap" : {
+                    "key" : "08e138f3f5e8595453526cbbeed38124",
+                    "securityJsCode" : "e50d5cf4e75c0a2b3f5cbfcc96cc4d8f",
+                    "serviceHost" : ""
+                }
+            }
+        }
+    }
 }
diff --git a/pages.json b/pages.json
index 2c76f6d..fcfe5b7 100644
--- a/pages.json
+++ b/pages.json
@@ -4,12 +4,61 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/information/information",
+			"style": {
+				"navigationBarTitleText": "请完善个人信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},{
+			"path": "pages/Doctordetails/Doctordetails",
+			"style": {
+				"navigationBarTitleText": "医生信息",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 				// "enablePullDownRefresh": false
 			}
+		},{
+			"path": "pages/shopping/shopping",
+			"style": {
+				"navigationBarTitleText": "医路优品",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/doctorslist/doctorslist",
+			"style": {
+				"navigationBarTitleText": "预约医生",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/homepage/homepage",
+			"style": {
+				"navigationBarTitleText": "泉医到家",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},  {
+			"path": "pages/disease/disease",
+			"style": {
+				"navigationBarTitleText": "疾病信息选择",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/CommodityDetails/CommodityDetails",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}, {
 			"path": "pages/register/register",
 			"style": {
@@ -24,29 +73,13 @@
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
 		}, {
-			"path": "pages/homepage/homepage",
-			"style": {
-				"navigationBarTitleText": "泉医到家",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/CommodityDetails/CommodityDetails",
-			"style": {
-				"navigationBarTitleText": "商品详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		},
-		{
 			"path": "pages/detail/detail",
 			"style": {
 				"navigationBarTitleText": "护理站简介",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
-		},
-		{
+		}, {
 			"path": "pages/homepage/homepage",
 			"style": {
 				"navigationBarTitleText": "商品详情",
@@ -66,13 +99,6 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-		}, {
-			"path": "pages/shopping/shopping",
-			"style": {
-				"navigationBarTitleText": "医路优品",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
 		}, {
 			"path": "pages/ProductList/ProductList",
 			"style": {
@@ -87,6 +113,13 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
+		}, {
+			"path": "pages/medicine/medicine",
+			"style": {
+				"navigationBarTitleText": "就医",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 63064d0..b89d76c 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -8,12 +8,6 @@
 				<swiper-item>
 					<image style='width:100%;height:750rpx' src="../../static/spjtcs.png" mode=""></image>
 				</swiper-item>
-				<swiper-item>
-					<image style='width:100%;height:750rpx' src="../../static/spjtcs.png" mode=""></image>
-				</swiper-item>
-				<swiper-item>
-					<image style='width:100%;height:750rpx' src="../../static/spjtcs.png" mode=""></image>
-				</swiper-item>
 			</swiper>
 		</uni-swiper-dot>
 		<view class="Commodity common">
@@ -115,10 +109,6 @@
 				//轮播内容
 				info: [{
 					content: '内容 A'
-				}, {
-					content: '内容 B'
-				}, {
-					content: '内容 C'
 				}],
 				current: 0, //轮播初始下标
 				mode: 'dot', //轮播点样式
@@ -141,19 +131,7 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		position: relative;
-		color: #000000;
-
 		.mask {
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			background-color: #000000;
-			background: rgba(0, 0, 0, 0.6);
-
 			.PurchasePage {
 				position: fixed;
 				top: 40%;
diff --git a/pages/Doctordetails/Doctordetails.vue b/pages/Doctordetails/Doctordetails.vue
new file mode 100644
index 0000000..4c8c15f
--- /dev/null
+++ b/pages/Doctordetails/Doctordetails.vue
@@ -0,0 +1,104 @@
+<template>
+	<view class="app">
+		<view class="info">
+			<view class="image">
+			</view>
+			<view class="name">
+				某某某
+			</view>
+			<view class="position">
+				主任医师
+			</view>
+			<view class="border">
+
+			</view>
+			<view class="text">
+				熟悉呼吸系统疾病的诊治，尤其擅 长肺栓塞、肺动脉高压和慢性气道疾 病的研究。
+			</view>
+		</view>
+		<view class="price">
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		padding-top: 20rpx;
+
+		.price {
+			width: 94%;
+			height: 105rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			margin: 0 auto;
+			margin-top: 15rpx;
+		}
+
+		.info {
+			width: 94%;
+			height: 651rpx;
+			margin: 0 auto;
+			background: #FFFFFF;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 20rpx;
+			position: relative;
+			font-size: 36rpx;
+
+			.text {
+				width: 90%;
+				line-height: 67rpx;
+				position: absolute;
+				left: 5%;
+				top: 263rpx;
+				text-indent: 1em;
+			}
+
+			.border {
+				width: 90%;
+				margin: 0 auto;
+				height: 1rpx;
+				background: #D8D4D4;
+				position: absolute;
+				left: 5%;
+				top: 209rpx;
+			}
+
+			.position {
+				font-size: 35rpx;
+				color: #969394;
+				position: absolute;
+				left: 264rpx;
+				top: 122rpx;
+			}
+
+			.name {
+				position: absolute;
+				left: 264rpx;
+				top: 68rpx;
+			}
+
+			.image {
+				width: 147rpx;
+				height: 150rpx;
+				background: #BFBFBF;
+				border-radius: 25rpx;
+				position: absolute;
+				left: 74rpx;
+				top: 32rpx;
+			}
+		}
+
+	}
+</style>
diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index 1c7d31a..2ffce85 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -36,49 +36,12 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
-
 		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			position: absolute;
-			top: 3%;
-			left: 3%;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 200rpx 0;
-			border-radius: 25rpx;
-
 			.item {
-				width: 43%;
 				height: 295rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
 				.title {
 					width: 80%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
 					top: 60%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
 				}
 			}
 		}
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 1900988..c055b4b 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -71,11 +71,6 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
-
 		.productlist {
 			width: 100%;
 			margin: 0 auto;
diff --git a/pages/disease/disease.vue b/pages/disease/disease.vue
new file mode 100644
index 0000000..f7d3982
--- /dev/null
+++ b/pages/disease/disease.vue
@@ -0,0 +1,122 @@
+<template>
+	<view class="app">
+		<view style="height: 20rpx;background-color: #F4F5F7;">
+		</view>
+		<view class="items">
+			<view class="item" style="background-color: #4C7BC9;color: #ffffff;">
+				无
+			</view>
+			<view class="item" v-for='(item,index) in diseaselist' :key="index">
+				{{item.diseaseName}}
+			</view>
+			<view class="other">
+				<span>其他:</span>
+				<!-- <input type="text"> -->
+				<u-input type="text" placeholder='请填写' />
+			</view>
+			<view class="btn">
+				提交
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getDiseaseInfo
+	} from '@/api/disease/index.js'
+	export default {
+		data() {
+			return {
+				diseaselist: [],
+			};
+		},
+		onLoad() {
+			this.diseaseinfo()
+		},
+		methods: {
+			diseaseinfo() {
+				getDiseaseInfo().then(res => {
+					this.diseaselist = res.data;
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100%;
+		padding-bottom: 70rpx;
+
+		.btn {
+			width: 217rpx;
+			height: 68rpx;
+			background: #4C7BC9;
+			border-radius: 26rpx;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			line-height: 68rpx;
+			margin: 100rpx 0 0 60%;
+		}
+
+		.items {
+			width: 90%;
+			margin: 0 auto;
+			text-align: center;
+			color: #000000;
+
+			.other {
+				margin: 0 auto;
+				height: 93rpx;
+				display: flex;
+				background-color: #fff;
+				border-radius: 20rpx;
+				width: 100%;
+				box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				margin: 20rpx auto;
+				line-height: 93rpx;
+
+				view {
+					height: 93rpx;
+					font-size: 32rpx;
+					line-height: 93rpx;
+				}
+
+				span {
+					display: inline-block;
+					line-height: 93rpx;
+					height: 93rpx;
+					width: 30%;
+					font-size: 32rpx;
+				}
+
+				::v-deep .u-input__input {
+					height: 93rpx;
+					font-size: 32rpx;
+				}
+
+				::v-deep .uni-input-wrapper {
+					height: 93rpx;
+					line-height: 93rpx;
+				}
+
+				::v-deep .u-input {
+					width: 70%;
+					height: 93rpx;
+					line-height: 93rpx;
+				}
+			}
+
+			.item {
+				width: 100%;
+				height: 93rpx;
+				background: #ffffff;
+				box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				border-radius: 20rpx;
+				margin: 20rpx auto;
+				line-height: 93rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/doctorslist/doctorslist.vue b/pages/doctorslist/doctorslist.vue
new file mode 100644
index 0000000..e3a5133
--- /dev/null
+++ b/pages/doctorslist/doctorslist.vue
@@ -0,0 +1,111 @@
+<template>
+	<view class="app">
+		<view class="visual">
+			<view class="department">
+				<view class="item" v-for="(item,index) in departmentlist" :key="index"
+					:class="aindex == index ?'departmentitem':''">
+					{{item.name}}
+				</view>
+			</view>
+			<view class="list">
+				<view class="information">
+					<view class="image">
+					</view>
+					<view class="name">
+						某某某
+					</view>
+				</view>
+				<view class="information">
+					<view class="image">
+					</view>
+					<view class="name">
+						某某某
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				aindex: 1,
+				departmentlist: [{
+						name: '内科',
+					},
+					{
+						name: '外科',
+					},
+					{
+						name: '皮肤科',
+					},
+				],
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		.visual {
+			text-align: center;
+			width: 94%;
+			margin: 0 auto;
+			background-color: #F4F5F7;
+			padding-top: 20rpx;
+			display: flex;
+
+			.list {
+				width: 72%;
+				background: #FFFFFF;
+				box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				border-radius: 0px 20rpx 20rpx 0px;
+				padding-bottom: 100rpx;
+
+				.information {
+					width: 90%;
+					position: relative;
+					margin: 37rpx auto 0;
+					padding-bottom: 60rpx;
+					border-bottom: 1rpx solid #D8D4D4;
+
+					.name {
+						font-size: 36rpx;
+						position: absolute;
+						left: 45%;
+						top: 10%;
+					}
+
+					.image {
+						width: 135rpx;
+						height: 138rpx;
+						background: #BFBFBF;
+						border-radius: 25rpx;
+						margin-left: 6%;
+					}
+				}
+			}
+
+			.department {
+				width: 28%;
+
+				.item {
+					line-height: 100rpx;
+					width: 100%;
+					height: 100rpx;
+					background: #ffffff;
+					box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+					border-radius: 20rpx 0px 0px 20rpx;
+					margin-bottom: 6rpx;
+				}
+
+				.departmentitem {
+					background: #4C7BC9;
+					color: #ffffff;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index a4352f6..7548e43 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -7,7 +7,7 @@
 					护理站
 				</view>
 			</view>
-			<view class="expert item">
+			<view class="expert item" @tap='gomedicine'>
 				<image src="../../static/zhuanjia.png" mode=""></image>
 				<view class="title">
 					就医
@@ -34,38 +34,35 @@
 			<view style="width:56% ;">
 			</view>
 		</view>
+
+
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {
-
-			};
+			return {};
+		},
+		methods: {
+			//跳转就医页面
+			gomedicine() {
+				uni.navigateTo({
+					url: '/pages/medicine/medicine'
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
+		// background-color: #F4F5F7;
+		// width: 100%;
+		// height: 100vh;
+		// position: relative;
 
 		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			position: absolute;
-			top: 3%;
-			left: 3%;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 0 0;
-			border-radius: 25rpx;
 
 			.smallitem {
 				width: 30%;
@@ -96,34 +93,6 @@
 				}
 			}
 
-			.item {
-				width: 43%;
-				height: 310rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
-				.title {
-					width: 80%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
-					top: 55%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-			}
-
 			.knowledge {
 				background-color: #E1AE3C;
 			}
diff --git a/pages/information/information.vue b/pages/information/information.vue
new file mode 100644
index 0000000..df1ddd6
--- /dev/null
+++ b/pages/information/information.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="app">
+		<u-mask :show="usershow" class='mask'>
+			<view class="information">
+				<image src="../../static/information.png" mode=""></image>
+				<view class="title">
+					请完善个人信息
+				</view>
+				<view class="cancel">
+					取消
+				</view>
+				<view class="determine">
+					去完善
+				</view>
+			</view>
+		</u-mask>
+		<view class="" style="background-color: #F4F5F7;height: 20rpx;width:100%">
+		</view>
+		<view class="userinfo info">
+			<view class="item">
+				<span>姓名:</span>
+				<!-- <input type="text"> -->
+				<u-input v-model="query.patientName" type="text" placeholder='' maxlength='5' />
+			</view>
+			<view class="item">
+				<span>电话:</span>
+				<u-input v-model="query.phone" maxlength='11' type="text" placeholder='' />
+			</view>
+			<view class="item">
+				<span>身份证号:</span>
+				<u-input v-model="query.cardNo" type="text" placeholder='' maxlength='18' />
+			</view>
+			<view class="item" @tap='areashow=true'>
+				<span>所属区域:</span>
+				<view></view>
+				<u-select v-model="areashow" label-name='areaName' value-name='areaCode' mode="mutil-column-auto"
+					:list="arealist" @confirm="areaconfirm"></u-select>
+			</view>
+			<view class="item">
+				<span>详细地址:</span>
+				<u-input v-model="query.address" type="text" placeholder='' />
+			</view>
+			<view class="item" @tap='getAddress()'>
+				<span>所在位置:</span>
+				<view></view>
+				<!-- <u-input type="text" placeholder='' /> -->
+			</view>
+
+		</view>
+
+		<view class="info">
+			<view class="service">
+				<view class="title">
+					所属服务
+				</view>
+				<view class="Multiplechoice">
+					<view class="choice" @tap="gondisease">
+						服务1
+					</view>
+					<view class="choice" v-for="(item,index) in getNurseTypelist" :key="index">
+						{{item.nurseTypeName}}
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<u-button type="primary" @tap='a'>主要按钮</u-button>
+	</view>
+</template>
+
+<script>
+	import {
+		getRegionAndStreetInfo,
+		getNurseType
+	} from '@/api/information/index.js'
+	export default {
+		data() {
+			return {
+				usershow: false, //完善信息开关
+				arealist: [], //区街道list
+				areashow: false, //经纬度开关
+				getNurseTypelist: [], //护理类型数组
+				query: { //信息请求数组
+					patientName: "",
+					cardNo: "",
+					phone: "",
+					address: "",
+					areaCode: "",
+					nurseTypeIdList: [],
+					diseaseInfoList: [],
+				}
+			};
+		},
+		//进入界面加载
+		onLoad() {
+			this.areaInfo()
+			this.getNurseTypeInfo();
+		},
+		methods: {
+			a() {
+				console.log(this.query)
+			},
+			//获取所在位置
+			getAddress() {
+				uni.chooseLocation({
+					success: function(res) {
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+						console.log('经度：' + res.longitude);
+					}
+				});
+			},
+			//护理类型请求
+			getNurseTypeInfo() {
+				getNurseType().then(res => {
+					this.getNurseTypelist = res.data
+				})
+			},
+			//区街道
+			areaInfo() {
+				getRegionAndStreetInfo().then(res => {
+					res.data.forEach(e => {
+						if (e.children.length == 0) {
+							e.children.push({
+								areaCode: "",
+								areaName: "暂无街道",
+								children: null,
+								id: '',
+							})
+						}
+					})
+					this.arealist = res.data;
+					console.log(this.arealist)
+				})
+			},
+			//区街道选择
+			areaconfirm(e) {
+				console.log(e)
+				// this.form.areaCode = e[e.length - 1].value
+				// this.address = e[0].label + '-' + e[1].label
+				// this.address = e[0].label + '-' + e[1].label + '-' + e[2].label
+				// console.log(this.address);
+			},
+			//点击医疗护理跳转
+			gondisease() {
+				uni.navigateTo({
+					url: '/pages/disease/disease'
+				})
+			},
+		},
+	}
+</script>
+<style lang="scss">
+	.app {
+		.service {
+			width: 90%;
+			margin: 0 auto;
+			padding-bottom: 15rpx;
+
+			.Multiplechoice {
+				font-size: 32rpx;
+				color: #FFFFFF;
+				width: 100%;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+
+				.choice {
+					text-align: center;
+					line-height: 70rpx;
+					width: 190rpx;
+					height: 70rpx;
+					background: #BFBFBF;
+					border-radius: 26rpx;
+					margin-top: 30rpx;
+				}
+			}
+
+			.title {
+				font-size: 36rpx;
+				padding-top: 36rpx;
+			}
+		}
+
+		.info {
+			width: 90%;
+			margin: 0 auto 20rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding-bottom: 5rpx;
+			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+		}
+
+
+		.userinfo {
+			.item {
+				width: 90%;
+				margin: 0 auto;
+				height: 120rpx;
+				line-height: 120rpx;
+				border-bottom: 1rpx solid #D8D4D4;
+				display: flex;
+
+				view {
+					height: 120rpx;
+					font-size: 32rpx;
+					line-height: 120rpx;
+				}
+
+				span {
+					display: inline-block;
+					line-height: 120rpx;
+					height: 120rpx;
+					width: 30%;
+					font-size: 32rpx;
+				}
+
+				::v-deep .u-input__input {
+					height: 120rpx;
+					font-size: 32rpx;
+				}
+
+				::v-deep .uni-input-wrapper {
+					height: 120rpx;
+					line-height: 120rpx;
+				}
+
+				::v-deep .u-input {
+					width: 70%;
+					height: 120rpx;
+					line-height: 120rpx;
+				}
+			}
+
+			.item:nth-child(6) {
+				border: 0;
+			}
+		}
+
+		.mask {
+			.information {
+				width: 70%;
+				height: 400rpx;
+				margin: 50% auto;
+				background: #FFFFFF;
+				border-radius: 30rpx;
+				text-align: center;
+				color: #FFFFFF;
+				position: relative;
+
+				.determine,
+				.cancel {
+					width: 200rpx;
+					height: 70rpx;
+					border-radius: 26rpx;
+					font-size: 34rpx;
+					line-height: 70rpx;
+					position: absolute;
+					top: 74%;
+				}
+
+				.determine {
+					background: #4C7BC9;
+					right: 36rpx;
+				}
+
+				.cancel {
+					background: #C5BFBF;
+					left: 36rpx;
+				}
+
+				.title {
+					font-size: 42rpx;
+					margin-top: 40rpx;
+					color: #000000;
+				}
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					margin: 10% 0 0 0;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a9ef3b2..6ffa40e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -258,10 +258,6 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		position: relative;
-		height: 100vh;
-		width: 100%;
 		font-family: DengXian;
 		color: #C3C1C1;
 		font-weight: 400;
diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue
new file mode 100644
index 0000000..dff6624
--- /dev/null
+++ b/pages/medicine/medicine.vue
@@ -0,0 +1,49 @@
+<template>
+	<view class="app">
+		<view class="cards">
+			<view class="item" style="background: #4C7BC9;" @tap='godoctorslist'>
+				<image src="../../static/yuyue.png" mode=""></image>
+				<view class="title" style="font-size: 42rpx;">
+					预约医生
+				</view>
+			</view>
+			<view class="item" style="background-color: #E1AE3C;">
+				<image src="../../static/chaxun.png" mode=""></image>
+				<view class="title" style="font-size: 42rpx;">
+					查看结果
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {};
+		},
+		methods: {
+			// 跳转预约医生界面
+			godoctorslist() {
+				uni.navigateTo({
+					url: '/pages/doctorslist/doctorslist'
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		.cards {
+			padding: 40rpx 0 500rpx 0;
+
+			.item {
+				image {
+					width: 80rpx;
+					height: 80rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index efe1255..f89c1b3 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -62,10 +62,6 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		position: relative;
-		height: 100vh;
-		width: 100%;
 		font-family: DengXian;
 		color: #C3C1C1;
 		font-weight: 400;
diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue
index 9bf2153..05256f9 100644
--- a/pages/shopping/shopping.vue
+++ b/pages/shopping/shopping.vue
@@ -51,51 +51,11 @@
 
 <style lang="scss">
 	.app {
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 100vh;
-		position: relative;
+		// background-color: #F4F5F7;
+		// width: 100%;
+		// height: 100vh;
+		// position: relative;
 
-		.cards {
-			width: 94%;
-			box-shadow: 0px 0px 30rpx 0px rgba(108, 99, 255, 0.16);
-			background-color: #fff;
-			position: absolute;
-			top: 3%;
-			left: 3%;
-			display: flex;
-			justify-content: space-evenly;
-			flex-wrap: wrap;
-			padding: 40rpx 0 200rpx 0;
-			border-radius: 25rpx;
-
-			.item {
-				width: 43%;
-				height: 300rpx;
-				margin-bottom: 40rpx;
-				border-radius: 25rpx;
-				position: relative;
-
-				.title {
-					width: 70%;
-					text-align: center;
-					font-size: 46rpx;
-					color: #FCFCFC;
-					position: absolute;
-					top: 58%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-
-				image {
-					width: 100rpx;
-					height: 100rpx;
-					position: absolute;
-					top: 20%;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-			}
-		}
+		
 	}
 </style>
diff --git a/pages/site/site.vue b/pages/site/site.vue
index dbe7fc2..1b3f14b 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -1,13 +1,18 @@
 <template>
 	<view class="concent">
 		<view class="nursstation" @tap='detailed()'>
-			<text class="what" >什么是护理站？</text>
+			<text class="what">什么是护理站？</text>
 			<u-icon class="icon" name="arrow-right"></u-icon>
 		</view>
 		<view class="page-body" style="margin-top: -80rpx;">
-			<view class="page-section page-section-gap" >
+			<view class="page-section page-section-gap">
+
+				<map style="width: 100%; height: 300px;" :latitude="latitude" :longitude="longitude" :markers="covers">
+				</map>
+
+				<!-- 				
 				<map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
-					:markers="markers"></map>
+					:markers="markers"></map> -->
 			</view>
 		</view>
 
@@ -15,15 +20,11 @@
 			<text class="nurse">济南护万家护理有限公司</text>
 			<text class="distance">距离您800米</text>
 			<view class="background">
-			
-					<view class="picture">
-							<image src="/static/logo.png" mode=""></image>
-					</view>
-				
-					<text class="qyttext">泉医通</text>
-					<text class="lianmeng">济卫护理联盟NO.1</text>
-			
-
+				<view class="picture">
+					<image src="/static/logo.png" mode=""></image>
+				</view>
+				<text class="qyttext">泉医通</text>
+				<text class="lianmeng">济卫护理联盟NO.1</text>
 			</view>
 			<view class="click">点击了解</view>
 
@@ -57,11 +58,9 @@
 				<view class="picture2">
 					<image src="../../static/locatinsmall.png"></image>
 				</view>
-
 				<view class="title">
 					请打开系统定位
 				</view>
-
 				<view class="btns">
 					<view class="btn1" @tap='cancel()'>取消</view>
 					<view class="btn2" @tap='getsite()'>去打开</view>
@@ -99,87 +98,100 @@
 				pageNum: 1,
 				pageSize: 10,
 				mask: false,
+
+				id: 0, // 使用 marker点击事件 需要填写id
+				title: 'map',
+				latitude: 36.661634,
+				longitude: 117.025323,
+				covers: [{
+					latitude: 39.909,
+					longitude: 116.39742,
+
+				}, {
+					latitude: 39.90,
+					longitude: 116.39,
+
+				}]
 			}
 		},
 		onReachBottom() {
-			this.pageNum++;
-			if (this.nurseTypeCode != undefined) {
-				nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
-					.then(res => {
-						if (res.total == this.nearbylist.length) {
+			// this.pageNum++;
+			// if (this.nurseTypeCode != undefined) {
+			// 	nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
+			// 		.then(res => {
+			// 			if (res.total == this.nearbylist.length) {
 
-						} else {
-							res.rows.forEach(e => {
-								this.nearbylist.push(e)
-							})
-						}
-					})
-			} else {
-				uni.request({
-					url: baseurl +
-						`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
-					success: (res) => {
-						if (res.data.total == this.nearbylist.length) {} else {
-							res.data.rows.forEach(e => {
-								this.nearbylist.push(e)
-							})
-						}
-						console.log(this.nearbylist)
-					}
-				});
-			}
+			// 			} else {
+			// 				res.rows.forEach(e => {
+			// 					this.nearbylist.push(e)
+			// 				})
+			// 			}
+			// 		})
+			// } else {
+			// 	uni.request({
+			// 		url: baseurl +
+			// 			`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
+			// 		success: (res) => {
+			// 			if (res.data.total == this.nearbylist.length) {} else {
+			// 				res.data.rows.forEach(e => {
+			// 					this.nearbylist.push(e)
+			// 				})
+			// 			}
+			// 			console.log(this.nearbylist)
+			// 		}
+			// 	});
+			// }
 		},
 
 
 		watch: {
-			iptVal() {
-				this.requestinfo()
-			},
+			// iptVal() {
+			// 	this.requestinfo()
+			// },
 		},
 		onShow() {},
 		onLoad(options) {
-			console.log(options)
-			console.log(baseurl)
-			this.baseurl = baseurl;
-			this.nurseTypeCode = options.nurseTypeCode
-			var that = this
-			uni.getStorage({
-				key: 'openid',
-				success(res) {
-					console.log(res)
-					that.openid = res.data
-					getPatientInfo(that.openid).then(res => {
-						// console.log(res)
-						if (res.code == 200) {
-							that.latitude = res.data.homeLatitude
-							that.longitude = res.data.homeLongitude
-							console.log(that.latitude, that.longitude)
-							if (!that.latitude) {
-								that.latitude = 36.661634
-							}
-							if (!that.longitude) {
-								that.longitude = 117.025323
-							}
-							that.markers.push({
-								id: 3,
-								latitude: res.data.homeLatitude,
-								longitude: res.data.homeLongitude,
-								width: 20,
-								height: 25,
-								iconPath: "../../static/location.png"
-							})
-						}
-					})
-				}
-			})
-			that.requestinfo()
+			// console.log(options)
+			// console.log(baseurl)
+			// this.baseurl = baseurl;
+			// this.nurseTypeCode = options.nurseTypeCode
+			// var that = this
+			// uni.getStorage({
+			// 	key: 'openid',
+			// 	success(res) {
+			// 		console.log(res)
+			// 		that.openid = res.data
+			// 		getPatientInfo(that.openid).then(res => {
+			// 			// console.log(res)
+			// 			if (res.code == 200) {
+			// 				that.latitude = res.data.homeLatitude
+			// 				that.longitude = res.data.homeLongitude
+			// 				console.log(that.latitude, that.longitude)
+			// 				if (!that.latitude) {
+			// 					that.latitude = 36.661634
+			// 				}
+			// 				if (!that.longitude) {
+			// 					that.longitude = 117.025323
+			// 				}
+			// 				that.markers.push({
+			// 					id: 3,
+			// 					latitude: res.data.homeLatitude,
+			// 					longitude: res.data.homeLongitude,
+			// 					width: 20,
+			// 					height: 25,
+			// 					iconPath: "../../static/location.png"
+			// 				})
+			// 			}
+			// 		})
+			// 	}
+			// })
+			// that.requestinfo()
 		},
 		methods: {
-			detailed(){
-					uni.navigateTo({
-						url: `/pages/detail/detail`
-					})
-				},
+			detailed() {
+				uni.navigateTo({
+					url: `/pages/detail/detail`
+				})
 			},
 			// getsite() {
 			// 	let data={};
@@ -218,8 +230,8 @@
 					url: `/pages/details/details?id=${item.nurseStationId}`
 				})
 			},
-		}
-	
+		},
+	}
 </script>
 
 <style lang="scss">
diff --git a/static/chaxun.png b/static/chaxun.png
new file mode 100644
index 0000000000000000000000000000000000000000..0629232519c8df52d54358814fb84cd39588a5ec
GIT binary patch
literal 3273
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

literal 0
HcmV?d00001

diff --git a/static/information.png b/static/information.png
new file mode 100644
index 0000000000000000000000000000000000000000..44addf752a51c1f34ccec7684676c332c4f9b676
GIT binary patch
literal 4526
zcma)<byU-R`^Ps*8U#g@l#n5)G$J)%)QZt60`4Xi>0D6KU?3^d-H6f%(y-ADI>4X|
zKpI4lXXExhzx({2f1Yy|*XR4b-mmNZ`JV0UvnUi&mxb{HBLDzk(bt0*k>3fFCp|U!
z^+mW<82~`_76muaCNBYi<Dj5pQ_~V~P>Za6ziH5fzB7qjo4R)+g8Fs5MofcRkUpLI
zK?I0zKPqSl=GUPc)NP0%l2v`opkYuK5=(#v^&*2h;ka&cn*pvDit9r8^&s#>m|veh
zz8~q=4aXCp7$Oqihrsk3U<e5RUKq9y>fcTF!u^R*Y%d(!1M??9aYV8N$C0HT1dag1
z^&&BSaB_hmLUFwaOfMYY10!3oy)b+q#fvAvutX@n7lG~jyCx5X<H#z-eo_-*c(RL(
zA|l9B$P$)-z@GGAd&xa;Eb)&-L7iC0D!v!?FFOK9A;58D6vcQ#J6Zliphzc7_<zAE
z;qgQSj>06@lt|>;@;3xazD`a~W)dkoItlYPiZYS1{S%4YL$On8#7T@3!XMxt_{nqx
z`G!zXlpT?Ql>R>i!av2yX!4+w>n9h<+xY{B{R96SLJmMi{bQui{`L6x@(=A_Dy8#J
z_><UV4n;kQ^#9ua_vJrH{x62VyFeTH^ZV7y2x$xeQc=^;(w(AbU}R!uVP#`K&B1x*
zEY~^i3p~7h0)iKXghfOziGeOlNM5;mO-e>qPF_Lr`VD0jRW)_6h89FyM^{fD3WFn%
z1}H-#6H_zuo3}0QSXx=%MgL`EYiIA^c<;W`17{akHxExQZy#Sj3=Z!f5Ev2~79J59
z9rNhP)42GA#H8fsDKFB}GqSRCa`W;F3X6(MO3TVCURJ((U0qXKSKrY1rm6XDOKW>a
zXIFO*f!N#EKQK5nJTf{qJ~=i0?mcN{cJ9N+PoL)(7MGU4eEs%)Wp(Yx`o`wg_Rj9!
z{?CJ7heyA8KQl3tzt*+-5DgQ*_p6q_tP@NxsCO`Xn7a+6FhT^U0p}`b^hB?|yOF??
z%&aXMmZJB9Ikb`kuB`zzkL!EyF#<yO`*@$-)Xb@P0Di%ZqN67u9F~r*?VjoiQ(EqC
z`jO%}hf&}9`g3CfGx%#!by;cX2>8*reT+A=Fhtm9>;uX0jz{IeG_lIr*};InRPClw
z(|q&xG~r{R|B{|S$eUhuNwuo_f||?@RG<^W-5&qErPuPc;GHFL8;|cV*%0va@HASP
z^97f}E2fsaLCXz#tfB4R=(LIgPsbU;hRFOr%Hi=<m+VqaO{u1wI@6k+Ie9lKqFY^E
z`F)G(WQfnWjHS&~)-z#|`Mc)1E-6QQH$w|bj#wRpXYaing-mm5w}y`<sXbxbsY!65
zujG7`wbIT1L}*9O{?t35PGxOCY%V-x=l$Jh=upRRI!bhMw+k6gpVs-9)TsaDG-A@3
z;S58#O#WP}w1}2}v=I$A|0g?YUYiRbroFq&TKut7E(_1&U#VUL4{}5p#08{rhIQ}g
ztF5?6s?H2W=^RBQ%RH2}#%-vH3C*??r4Lc*-fR$bwk_L&uV%;P9Hu=osktF9EY?!A
zfLcu%l-9t)Fx>vU*S;6}T@Czh(k0d?w-X&HXq{j8D_2&+chBsAPP+_M_*Jd=x_69N
zsrXS}0$Or<y!(5kmD1bg^iI7NOp@QgRty~PFtj1j)Tu)%pp|o%6#w+9+(mJ92ukn1
z*fSz8a?vSp%$c85YRe$c{d)f;!t7~helJTlm3E7Ym)4?aX+-z7che(Q)@6}W(zouY
zc5b1N35kOBPL@)V1Tlq<wa%L_X{uq$aAV1M;V=_hl{25Qc=pC*gW+(wTvB=Ar_wjM
zmd+OK^4Przbe}?UxBYCNuq#36QPLrb@x!c=TuYZwLbeLev--8P%GQ8|yve6=#~ob;
zIFHVDBTi-KgOyEcuF&RU=Pk`>7vAKsRFWip&jxjEQAZ*dbDM>7E(n)<C&%Y@{ic{i
z)OqFAwyI`}a{Da%Uqz)qK2OceL+W2{uD_pX*zS5@veNZ+dHsbs|HxXL>mdt{@Kn;l
zVOvuDq3U*vvk3Te!lCdJYu~p5Fxl~IEj)FbPl*qGlko#*dFz;*EP=)zmN;PDZlXL@
zOO((CE^Xa0AgZ}^Dc?S={!q;jrJ~J+<M-_f;JO_CLvmX-P19Y?Eb?m80?nW>svZ!j
z$;9X$@Pw0Ug)`It`XWN?HvO1ogt6J)#@p631@uZ==41@_&5WwwVvh#uqh5Zw?ad(U
zW1JowxsVopx+B?a!-jqC(d6u4v(RN$K$^A2hs}Z|H>;j9-qmpB8qGt;(P(4GDN7}R
zXYo4{n>|<ZZbwbYUVFRGe2)f;VcN6{7<m1A473fr7b9w%WutbZL_N?da66Y<W<s88
zb-(_M-D<>K#50XFr&8j0!RiNu=e~<_%EQ`&3o_hZ)1=-XR>!nEZ&L5s`f7Y)ruJ-#
zU15d3iNfYuTh;x=`o$2PmVHMCv!k;NznbnEORTt)Q2W=og<Rwrk|D?Uwn78;X3h1K
zclg2Bu8hq6Z6MUcxh_vNyiT}FA=~qqx{7}H%c)Qx%R<+r%O@E_KJd|JJa6_&nbfk0
z1_8vHACt;jRN0G@xtyGhyOPcJ&eU}fYT)>cIGK}>*k(HuL#vR5kNTMxoulrRQnMd_
zIrb+=-In@NRjWAXqN&PfSc!EJGIi@lxzOSwj%LxnA7cGlqsQ=tP(usEy+7@p^k#L-
zBIs!2x=gBGfyRC}-Kg`hU*AAOA}NcZP<Zpo+I>`^?M5<vziwu=hOfN2`p+WlP3$J<
z^UhnyOtj3Ec7eUI`xYuaF>jv_tj1{9?vI%ZGk1TeUKhJ{c$R7dN#X$KS~$o!J+6&P
znL>6l1<?9)+)`*q9;=P&bbvIDZ$4oC&iTNWE6S~A$1XK6u8aQEFu^`m%eQ1!QTO_j
zc^#KEvv<9H&a&;|`1Zs2JYmf_G4cIME|I|fpNb#wztJ)*R$`~yj=W@3tfTA4YD}n<
zWW*X~qM&&*+A;MXU=AM;&*(|@VZ}q~gpZKs#TCyqT4j*#W_mtdr;>o0=uy>GvE<9s
zQcYZpBD&d?K-aPt7(hk@OUcOW;3)OyCZ0hBm%xDTK)-WlwvD;LG~yQ&;B<3G$Lcr*
zO|>i{qoO#KdufmmI9z9_hia4d`km=2F1@(P_O@^V>*ri+(R=6!So}-5;C+R*!IHhg
zmmJ#i3$EuS037*LAmdey9Xa+1yPIdq5-!IkRt7a6>OGDxzNlFI%7ec=%>OVGX1O&Z
zU|PLDP#Rj%WIfKt7G?2C)v1KL;p6dEMIh^QxJ|n5Z<$OZd!e$qISD)ny*#PKohm;2
z&4uR;KcBkIj}IBSUT+k&eia5>C7%aG@x+ADhKclO`+Zq{UQ5Wba7Q$@jspO&-H7#2
z*;PnapG&PO8zl01{Z?_+@^HFtMF&_11s!^*mleGJoY^lFG-YOpesge&U~K*o2tX--
zb@QT-n_E6r>gninXKP_u$|KWRGyus)*42ii3=^|MW!t;P;<@WHY|ZOC+JGP_J#}g4
z{D&P((N~TYGZ^Q~QR_A!W<V@J^l;}b)ULVJ><hLxt9^gM3ZyRu3{px#Rj-<y;R|L9
zb8smyY`@NUFuo@XTo(_2@Qm?>RfNMW;6{ihI{Ys{Mn$mCOhv;eos91}uM#H!eYlTI
zA@wL7mDjLD9ThuJ`Qd0Ds|bq^BaoeGwG4N^nA%Y5TO&h|7ro^aw3zzVJKAPBzz>Zf
zq^=&HUgtfUSj{iDoU_J*X(ok&&S(v>{)F;H{<ugJ%kkw_l+ibEf+)S<scZ-BIipjb
zEkglDEUFT2$v4>dsA$+hs=<ARdVG;Wr+_rjPoL(fj80L_X##>hRgCi4M9u<fkh-QY
zfynpIg0J^adOYt~llnY`z6yyjH00H}=fy2Qhh~<DkoM;5{`paAO)$cJSm{yUI67^b
zmD3DNixtXe5#c!hMI&?$J3dO6v!)R?$KHn0s;v&T<%w-WLHw{UQxk&gSG6MwP2G?K
zuh_+@8I<T8CW-)nwFVSp&jgJ)wSGNgzS}}0H2}<P5+|4QOop8$;fcTEQg+HH!?GJ8
zp9#Y1;O3<!N85ZqYo>q6A)jgC7HDHdW1yp5_}r{iya`wb{L!QpJ=?MEcME?legUok
zW+$dJk3HtibhL@P+DAt(WLfLn2(>gMiUg;yutTUk7w6$C&TymN6o5v4f@><BP>g-t
z!VnGpWup3lyN-0~YbGwRWU{5y<xn)R6MB(3byS27T$Xf6TAa%U(0TtAcl@U60k|yr
zhqQQ69$TochG-0j`8V)>Lj7ydjRMwCgAwT%8MpV~{ls8dP=6sys5M$G#Ec;!c>O_Q
zYZivqQm`r2eArb?^BnyTAE9lYCKRnuRvXh!k}?`qMI!M;r7$=)Xf-n!No{Mp<gt^C
zHD3shxWE=!X06MI*k5x@CPn+?N}=orOP<8W59^?-E$UKA$A$CwS+dJXj*4SUM^g`U
z96A{C!#~<%r+33`-{%T_Rj(RnV0pLN7?jm~vEb8!6nYFcbww7>-`uFqF718|!sjKy
zBIbSt95`^1bjI`e;Hj>Vf0IIr)R**-6(6T^T2O`f_f_xEWjRpGPmiI;f#%MliA~>Q
zsiVpi?Ye4+&57{q*&3(c-aq2G7OTMR2GtpAsqf4+;TWs0Pep#M0^bgEi5VzO<*P{C
zR>D=s=_qzBO+hb^W`2z`rqoN>K2MrfNyW{R$}=Cw$3$uI`*I!e<4NW7JRj>sqaz_1
zktx*OEkLyZk+zAQoPjm7vX*E}ls}dIx4RLLnf|j*dXP0lzXbhx4xp|3Iq3&<ofk;K
zJZEvz$XJ3qvYo}RYD+MYHJf^6DG#mN^v<&yVesNE&Kt?)Lr6UeXJN5BJv}?vFumcp
zd*N6PIoV>hAstZg%976Gy!xdxzmaw~GknfJGh2f6*N?WZtG<eud~E){_4eDT_Ujn;
z9{MM1HTtR^#5W<!SC;PfC}R|^E+maO2RA$BD!h?>fb4YBzqc%@dD>?G9*!}L?MG90
z?@i0yc}LPD>T6<wUQ_F>i?!4buZbAR@Y}vp(N$o&W6<Vl>nW+qnYzrr`uf2RN5;UY
zN^((EUnhSKi{DfE%x{kG>vn2DPBsI%R;0$4#UWEozP&aB!Lb@!>VZzq!-sY1TejMP
z!zuv5vZkk;V4HM@`)rA47ME@FN+ycWEB(|KjkrJL^@QQmh&ewU_b`67>sMN&*Kv-I
z+FdOe+g?mW?(w>jkIqx_$@va1_xyo~Kx^y*5VNYYEA?m<11$3orX07++?f-?aDd%B
zc(Gz-D7whNkjfq82AdU;;EwmUpbGXolT*xN2ehe1a#D5X-*r9`bmpcU=>^qj?G$&1
zLr2D*^U<tm0ePSn2Vb(jIEl})16K4-zbM&NuFa_*v&xSG>|RQ?YwWJj;1s7HJNX;I
z6ib8Ab}em~QNPUn=w9`)$3U&)H9<b3`pXl_7aAij`GrU$n7tKOP!g7B!GDQ(ZkctR
zle;7E;<?PtP#YOIg4xm)6lsomLkxltjTZ&DGH=}(i=No~W#JSpJKu3=nqhM8x4?(|
X#{pw1kH|kp0D!(W5>lag_u+p4s&k|?

literal 0
HcmV?d00001

diff --git a/static/yuyue.png b/static/yuyue.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7ed0e748e701ae306fa1f6414f0ac8eed9c9121
GIT binary patch
literal 2378
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
HU^D&&UnHqP

literal 0
HcmV?d00001