From 173d7fc27947d3d494485a9a8b58798094324664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 24 Oct 2022 16:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E8=BF=91=E6=8A=A4=E7=90=86=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                             |   6 +
 pages.json                                |  30 ++--
 pages/appointmenttime/appointmenttime.vue |   1 +
 pages/site/site.vue                       | 176 +++++-----------------
 4 files changed, 58 insertions(+), 155 deletions(-)

diff --git a/manifest.json b/manifest.json
index 5b8053d..9532159 100644
--- a/manifest.json
+++ b/manifest.json
@@ -97,8 +97,14 @@
                     "key" : "08e138f3f5e8595453526cbbeed38124",
                     "securityJsCode" : "e50d5cf4e75c0a2b3f5cbfcc96cc4d8f",
                     "serviceHost" : ""
+                },
+                "qqmap" : {
+                    "key" : "7NIBZ-PCVLJ-UEDFB-KUTCS-Z2O7Z-K6BHO"
                 }
             }
+        },
+        "devServer" : {
+            "port" : ""
         }
     }
 }
diff --git a/pages.json b/pages.json
index 50e3da6..b187281 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,19 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/site/site",
+			"style": {
+				"navigationBarTitleText": "附近护理站",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff" //背景颜色
+			}
+		},{
+			"path": "pages/appointmenttime/appointmenttime",
+			"style": {
+				"navigationBarTitleText": "预约时间",
+				"enablePullDownRefresh": false
+			}
+		},{
 			"path": "pages/modifyAddress/modifyAddress",
 			"style": {
 				"navigationBarTitleText": "修改地址",
@@ -30,13 +43,7 @@
 			}
 
 		},
-		{
-			"path": "pages/appointmenttime/appointmenttime",
-			"style": {
-				"navigationBarTitleText": "预约时间",
-				"enablePullDownRefresh": false
-			}
-		},
+		
 		
 		
 		{
@@ -48,14 +55,7 @@
 			}
 
 		},
-		{
-			"path": "pages/site/site",
-			"style": {
-				"navigationBarTitleText": "附近护理站",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
+		
 
 
 		// {
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 4bffd61..51d5516 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -316,6 +316,7 @@
 		.Consumablespackage {
 			width: 94%;
 			height: 188rpx;
+			;
 			margin: 10rpx auto;
 			padding: 3%;
 			font-size: 35rpx;
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 4113b1f..782fa14 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -1,43 +1,46 @@
 <template>
 	<view class="app">
-		<view>
-			<view class="nursetation" @tap='detailed()'>
-				<text class="what">什么是护理站？</text>
-				<u-icon class="icon" name="arrow-right"></u-icon>
-			</view>
-			<view class="map">
-				<map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
-					:markers="markers"></map>
-			</view>
+
+		<view class="nursetation" @tap='detailed()'>
+			<text class="what">什么是护理站？</text>
+			<u-icon class="icon" name="arrow-right"></u-icon>
 		</view>
+		<view class="map">
+			<map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
+				:markers="markers"></map>
+		</view>
+
 		<view class="conNew">
-			<view class="addressContent">
-				<view class="lists" v-for="(item,index) in nearbylist" :key="index">
+			<view class="addressContent" v-for="(item,index) in nursestationlist" :key="index">
+				<view class="lists">
 					<view class="nurse">{{item.nurseStationName}}</view>
-					<view class="distance">距离您800米</view>
+					<view class="distance">距离您{{item.distance}}米</view>
 					<view class="background">
 						<image src="/static/logo.png" mode=""></image>
+						<text class="qyttext">泉医通</text>
+						<text class="lianmeng">济卫护理联盟NO.1</text>
 					</view>
-					<view class="understand" @tap='godetails()'>
+					<view class="understand" @tap='godetails(item)'>
 						点击了解
 					</view>
 				</view>
 			</view>
 		</view>
 
-		<view class="masks" style="" v-if="locationmask">
+		<view class="masks" style="" v-if="mask">
 			<view class="mask">
-				<view class="picture2">
+				<view class="picture">
 					<image src="../../static/locatinsmall.png"></image>
 				</view>
-				<view class="title">
+
+				<view class="text">
 					请打开系统定位
 				</view>
-
 				<view class="btns">
-					<view class="btn1" @tap='cancel()'>取消</view>
-					<view class="btn2" @tap='getsite()'>去打开</view>
+					<view class="bt" @tap='cancel()'>取消</view>
+					<view class="btn" @tap='getsite()'>确定</view>
 				</view>
+
 			</view>
 		</view>
 	</view>
@@ -50,8 +53,8 @@
 	export default {
 		data() {
 			return {
-				nearbylist: [],
-				locationmask: false,
+				nursestationlist: [],
+				mask: true,
 				pageNum: 1,
 				pageSize: 10,
 				//map地图所需
@@ -67,11 +70,11 @@
 			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) {
+						if (res.total == this.nursestationlist.length) {
 
 						} else {
 							res.rows.forEach(e => {
-								this.nearbylist.push(e)
+								this.nursestationlist.push(e)
 							})
 						}
 					})
@@ -80,9 +83,9 @@
 					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 {
+						if (res.data.total == this.nursestationlist.length) {} else {
 							res.data.rows.forEach(e => {
-								this.nearbylist.push(e)
+								this.nursestationlist.push(e)
 							})
 						}
 						console.log(this.nearbylist)
@@ -102,26 +105,15 @@
 		},
 		methods: {
 			requestinfo() {
-				if (this.nurseTypeCode != undefined) {
-					nearbyList()
-						.then(res => {
-							this.nearbylist = res.rows
-							console.log(this.nearbylist)
-						})
-				} else {
-					uni.request({
-						url: baseurl +
-							`/nurseApplet/nearbyNursingStation/nearbyList`,
-						success: (res) => {
-							this.nearbylist = res.data.rows
-							console.log(this.nearbylist)
-						}
-					});
-				}
+				nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, ).then(res => {
+					this.nursestationlist = res.rows
+					// console.log(this.nursestationlist)
+				})
 			},
-			godetails() {
+			godetails(item) {
+				console.log(item)
 				uni.navigateTo({
-					url: `/pages/nursestation/nursestation`
+					url: `/pages/nursestation/nursestation?nurseStationId=${item.nurseStationId}`
 				})
 			},
 			detailed() {
@@ -137,101 +129,5 @@
 </script>
 
 <style lang="scss">
-	//护理站列表
-	.conNew {
-		width: 96%;
-		background-color: #F4F5F7;
-		z-index: 999;
-		position: absolute;
-		top: 400rpx;
-		left: 2%;
-
-		.addressContent {
-			width: 100%;
-		}
-
-		.lists {
-			background-color: #ffffff;
-			width: 100%;
-			height: 240rpx;
-			margin-bottom: 14rpx;
-			border-radius: 20rpx;
-			position: relative;
-
-			.nurse {
-				font-size: 30rpx;
-				position: absolute;
-				top: 15%;
-				left: 35%;
-			}
-
-			.distance {
-				position: absolute;
-				top: 40%;
-				font-size: 14rpx;
-				margin-left: 35%;
-				color: #666666;
-			}
-
-			.background {
-				width: 180rpx;
-				height: 180rpx;
-				background-color: #4C7BC9;
-				position: absolute;
-				top: 12%;
-				left: 7%;
-				border-radius: 30rpx;
-			}
-
-			.background image {
-				width: 99rpx;
-				height: 99rpx;
-				// margin: 0 auto;
-				text-align: center;
-				margin-top: 5%;
-				margin-left: 20%;
-			}
-
-			.understand {
-				color: #ffffff;
-				width: 170rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				text-align: center;
-				background-color: #4C7BC9;
-				position: absolute;
-				bottom: 10%;
-				right: 5%;
-				border-radius: 35rpx;
-			}
-		}
-	}
-
-	//什么是护理站
-	.nursetation {
-		width: 80%;
-		position: absolute;
-		top: 20px;
-		left: 10%;
-		float: left;
-		border: 1px solid #f0f0f0;
-		border-radius: 20rpx;
-		background-color: #ffffff;
-		z-index: 100;
-		height: 85rpx;
-		line-height: 85rpx;
-		box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
-
-		.what {
-			margin-left: 10%;
-			display: inline-block;
-		}
-
-		.icon {
-			display: inline-block;
-			height: 85rpx;
-			line-height: 85rpx;
-			margin-left: 45%;
-		}
-	}
+@import './site.scss'
 </style>