From 40114505f06dc5b8da58b5e1da4016aec5fc2544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 20 Oct 2022 09:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/appointment/index.js                  |  26 --
 api/details/index.js                      |  18 -
 api/site/index.js                         |  16 -
 pages.json                                | 129 +++---
 pages/appointmenttime/appointmenttime.vue | 345 +++++++++++++--
 pages/nursestation/nursestation.vue       | 493 ++++++++++++++++++++++
 pages/site/site.vue                       |  69 ++-
 7 files changed, 896 insertions(+), 200 deletions(-)
 delete mode 100644 api/appointment/index.js
 delete mode 100644 api/site/index.js
 create mode 100644 pages/nursestation/nursestation.vue

diff --git a/api/appointment/index.js b/api/appointment/index.js
deleted file mode 100644
index 406450c..0000000
--- a/api/appointment/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from "../request.js"
-
-
-export function getPatientInfoList(openid) {
-	return request({
-		url: `/nurseApplet/login/getPatientInfoList?openId=${openid}`,
-		method: 'GET'
-	})
-}
-
-
-export function getStationItemInfo(stationId, stationItemId, stationItemPriceId) {
-	return request({
-		url: `/nurseApplet/login/getStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
-		method: 'GET'
-	})
-}
-export function appointment(data) {
-	return request({
-		url: `/nurseApplet/login/appointment`,
-		method: 'post',
-		data
-	})
-}
-
-
diff --git a/api/details/index.js b/api/details/index.js
index c7c3864..e69de29 100644
--- a/api/details/index.js
+++ b/api/details/index.js
@@ -1,18 +0,0 @@
-import request from "../request.js"
-
-
-export function introductionList(id) {
-	return request({
-		url: `/nurseApplet/nearbyNursingStation/introductionList?nurseStationId=${id}`,
-		method: 'GET'
-	})
-}
-
-
-
-export function getPatientInfo(id) {
-	return request({
-		url: `/nurseApplet/login/getPatientInfo?openId=${id}`,
-		method: 'GET'
-	})
-}
\ No newline at end of file
diff --git a/api/site/index.js b/api/site/index.js
deleted file mode 100644
index e60c559..0000000
--- a/api/site/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import request from "../request.js"
-
-
-// export function list() {
-// 	return request({
-// 		url: `/nurseApplet/system/patientInfo/list`,
-// 		method: 'GET'
-// 	})
-// }
-
-export function nearbyList(pageSize,pageNum,longitude, latitude, nurseStationType, ) {
-	return request({
-		url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}&nurseStationType=${nurseStationType}&nurseStationName=${nurseStationName}`,
-		method: 'GET'
-	})
-}
diff --git a/pages.json b/pages.json
index e71e35a..a7e2dc6 100644
--- a/pages.json
+++ b/pages.json
@@ -3,54 +3,36 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/diagnosis/diagnosis",
-			"style": {
-				"navigationBarTitleText": "诊疗结果",
-				"enablePullDownRefresh": false,
+	{
+	    "path" : "pages/nursestation/nursestation",
+	    "style" :
+	    {
+	        "navigationBarTitleText": "护理站详情",
+	        "enablePullDownRefresh": false,
+			"navigationBarBackgroundColor": "#ffffff"
+	    }
+
+	},{
+	    "path" : "pages/appointmenttime/appointmenttime",
+	    "style" :
+	    {
+	        "navigationBarTitleText": "预约时间",
+	        "enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
-		{
-			"path": "pages/InformationFilling/InformationFilling",
+	    }
+
+	},
+			{
+			"path": "pages/site/site",
 			"style": {
-				"navigationBarTitleText": "信息填写与确认",
+				"navigationBarTitleText": "附近护理站",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
 		},
 
+
 		{
-			"path": "pages/AppointmentRecord/AppointmentRecord",
-			"style": {
-				"navigationBarTitleText": "预约记录及结果",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
-		{
-			"path": "pages/detail/detail",
-			"style": {
-				"navigationBarTitleText": "护理站简介",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
-		},
-		{
-			"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": "",
@@ -64,40 +46,29 @@
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "pages/site/site",
+		    "path" : "pages/appointment/appointment",
+		    "style" :
+		    {
+		        "navigationBarTitleText": "选择时间",
+		        "enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#ffffff"
+		    }
+
+		},
+		{
+			"path": "pages/detail/detail",
 			"style": {
-				"navigationBarTitleText": "附近护理站",
+				"navigationBarTitleText": "护理站简介",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff" //背景颜色
 			}
 		}, {
-			"path": "pages/doctorslist/doctorslist",
-			"style": {
-				"navigationBarTitleText": "预约医生",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
-		}, {
-			"path": "pages/appointment/appointment",
-			"style": {
-				"navigationBarTitleText": "选择时间",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
 			"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": {
@@ -106,14 +77,20 @@
 				"navigationBarBackgroundColor": "#ffffff"
 			}
 		},
-		{
-			"path": "pages/appointmenttime/appointmenttime",
-			"style": {
-				"navigationBarTitleText": "预约时间",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff" //背景颜色
-			}
 
+		{
+			"path": "pages/homepage/homepage",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		}, {
+			"path": "pages/startup/startup",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
 		}, {
 			"path": "pages/Personal/Personal",
 			"style": {
@@ -142,16 +119,10 @@
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
-		},
-		{
-			"path": "pages/medicine/medicine",
-			"style": {
-				"navigationBarTitleText": "就医",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
-			}
 		}
-	],
+
+
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 823bdd5..0ccd022 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -3,32 +3,52 @@
 		<view class="message">请填写下面的信息</view>
 		<view class="xinxi">
 			<view class="user">
-				<view class="item">
+				<view class="item" @click='showNamePick'>
 					<span class="texts">姓名：</span>
+					<text v-if="patientName==''">请选择姓名</text>
+					<text v-else>{{patientName}}</text>
 					<!-- <text>某某某</text> -->
 					<!-- <input type="text"> -->
-					<u-input  />
+					<!-- <u-input  /> -->
 				</view>
-				<view class="item">
+				<view class="item" @tap='maskshow=true'>
 					<span class="texts">电话：</span>
+					<text v-if="phone==''">请选择电话</text>
+					<text v-else>{{list.phone}}</text>
 					<!-- <text>18888888888</text> -->
-					<u-input  />
+					<!-- <u-input  /> -->
 				</view>
-				<view class="item">
-					<span class="texts">时间：</span>
-					<u-input  />
-				</view>
-				<view class="item1">
+
+				<view class="item" @tap='maskshow=true'>
 					<span class="texts">地址：</span>
-				<u-input  />
+					<text v-if="address==''">请填写地址</text>
+					<text v-else>{{list.address}}</text>
+					<!-- <u-input  /> -->
+				</view>
+				<view class="item1" @tap='timeshow2=true'>
+					<span class="texts">时间：</span>
+					<text v-if="usertime==''">请选择时间</text>
+
+					<text v-else>{{list.usertime}}</text>
+					<image src="../../static/jiantou.png"></image>
+					<!-- <u-input  /> -->
 				</view>
 			</view>
 		</view>
+
+
+
+		<view>
+			<view class="beizhu">
+				服务时长:{{getinfolist.serveDurationUnit}}
+			</view>
+		</view>
+
 		<view class="taocan">套餐信息：
 			<text class="price">￥60</text>
 			<view>
 				<text class="qiguan">
-					·气管切开
+					111
 				</text>
 			</view>
 		</view>
@@ -42,35 +62,292 @@
 		</view>
 		<view class="beizhu">
 			<span>备注：</span>
-				<input placeholder="">
+			<input placeholder="">
 		</view>
-		<view class="xiugai">修改信息</view>
-		<view class="queren">确认预约</view>
+		<view class="radio-content">
+			<view class="radio-right">
+				<view class="radio" :class="radio1 == 2 ? 'radio-default':''" @tap="changeRadio2">
+					<view :class="radio1 == 2 ? 'radio-active':''"></view>
+				</view>
+			</view>
+			<text class="agreement" @tap="changeRadio2">我已阅读并同意</text>
+			<text @tap='maskshow=true;showRegectAgreeButton=false'>《用户协议》</text>
+		</view>
+
+		<view class="priceback">
+			<!-- <view class="price3">￥</view> -->
+			<!-- <view class="Apayment"> -->
+			<!-- <view class="zf"> -->
+			<view class="prices">￥60</view>
+			<!-- </view> -->
+			<view class="xiugai">修改信息</view>
+			<view class="queren" @tap='updata'>确认预约</view>
+		</view>
+		<u-toast ref="uToast" />
+		<u-select v-model="showName" :list="listInfo" @confirm="confirm"></u-select>
+		<u-picker @confirm='confirm2()' mode="time" v-model="timeshow2" start-year='2022' :params="params2">
+			<!-- <view style="z-index:999;color:red" v-if="timeshow2">应付:{{orderlist.totalPrice}}元</view> -->
+		</u-picker>
+		<u-picker @confirm='confirm3()' mode="time" v-model="timeshow3" start-year='2022' :params="params3">
+		</u-picker>
+		<u-picker @confirm='confirm4()' mode="time" v-model="timeshow4" start-year='2022' :params="params4">
+		</u-picker>
 	</view>
 </template>
 <script>
+	import {
+		getAppStationItemInfo,
+		getAppPatientList,
+		appointment
+	} from '@/api/appointmenttime/appointmenttime.js'
+	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
 			return {
-				maskshow: false,
+				params4: {
+					year: false,
+					month: false,
+					day: false,
+					hour: true,
+					minute: true,
+					second: false
+				},
+				params3: {
+					year: false,
+					month: false,
+					day: false,
+					hour: true,
+					minute: true,
+					second: false
+				},
+				params2: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
 				timeshow2: false,
+				timeshow3: false,
+				timeshow4: false,
+				maskshow: false,
+				orderlist: {
+					"patientId": '',
+					"stationId": 2,
+					"stationItemId": 2,
+					"stationItemPriceId": 3,
+					"serviceAddress": "",
+					"serviceDate": "",
+					"serviceStartTime": "",
+					"serviceEndTime": "",
+					"nurseItemName": "",
+					"nurseItemPrice": '',
+					"serveDurationUnit": "",
+					"consumableTotalPrice": '',
+					"totalPrice": '',
+					"remark": "",
+					"orderCount": 1,
+					"orderConsumableList": []
+				},
+				maskshow: false,
+				userlist: [],
+				userid: '',
+				patientId: 46,
+				phone: '',
+				patientName: '',
+				address: '',
+				usertime: '',
+				timeshow2: false,
+				timeshow2: false,
+				maskshow: false,
+				radio1: 1,
+				showName: false,
+				stationId: 2,
+				stationItemId: 2,
+				stationItemPriceId: 3,
+				getinfolist: {}, //服务时长
+				listInfo: [],
 			}
 		},
-		methods: {
+		onLoad() {
+			this.getInfo()
+			this.getPatientInfo()
 
+		},
+		methods: {
+			confirm(e) {
+				// console.log(e);
+				// this.username = e[0].label
+				this.listInfo.patientName = e[0].patientName
+			},
+			getInfo() {
+				getAppPatientList(this.patientId).then(res => {
+					// this.list = res.data
+					console.log(res.data);
+					// this.listInfo = res.data
+					this.listInfo = res.data.map((v, i) => {
+						return {
+							value: i,
+							label: v.patientName
+						}
+					})
+					// console.log(this.listInfo);
+				})
+			},
+			getPatientInfo() {
+				getAppStationItemInfo(this.stationId, this.stationItemId, this.stationItemPriceId).then(res => {
+					this.getinfolist = res.data
+					console.log("this.getinfolist", this.getinfolist);
+				})
+			},
+			showNamePick() {
+				this.showName = true
+				// console.log(11);
+			},
+			// changeRadio2() {
+			// 	this.radio1 = 2;
+			// 	// console.log("个人")
+			// 	this.maskshow = true;
+			// },
+			updata() {
+				this.orderlist.orderCount = 1;
+				// console.log(this.orderlist)
+				appointment(this.orderlist).then(res => {
+					if (res.code == 500) {
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error',
+						})
+					} else if (res.code == 200) {
+						this.$refs.uToast.show({
+							title: '预约成功',
+							type: 'success',
+							toast: 1000
+						})
+						setTimeout(() => {
+							uni.reLaunch({
+								url: `/pages/user/user`
+							})
+						}, 1000)
+					}
+
+				})
+			},
+			confirm4(e) {
+				console.log(e)
+				this.usertime = this.usertime + e.hour + ":" + e.minute
+				this.orderlist.serviceEndTime = e.hour + ":" + e.minute
+			},
+			confirm3(e) {
+				console.log(e)
+				var sep = '\xa0  \xa0';
+				this.usertime = this.usertime + sep + e.hour + ":" + e.minute + '至'
+				console.log(this.orderlist)
+				this.orderlist.serviceStartTime = e.hour + ":" + e.minute
+				console.log(this.orderlist)
+				this.timeshow4 = true;
+			},
+			confirm2(e) {
+				console.log(e);
+				this.timeshow3 = true;
+				this.orderlist.serviceDate = e.year + '-' + e.month + '-' + e.day
+				this.usertime = e.year + '年' + e.month + '月' + e.day + '日'
+			},
+			// confirm(e) {
+			// 	console.log(e[0]);
+			// 	var obj = this.userlist.map(el => {
+			// 		if (el.patientId == e[0].value) {
+			// 			return el
+			// 		}
+			// 	})
+			// 	this.userAddress = obj[0].address
+			// 	this.username = obj[0].patientName
+			// 	this.orderlist.patientId = obj[0].patientId
+			// 	this.orderlist.serviceAddress = obj[0].address
+			// 	console.log(this.orderlist)
+			// }
+			// tapuser(item) {
+			// 	console.log(item)
+			// 	// this.userlist
+			// 	this.userid = item.patientId
+			// 	this.username = item.patientName
+			// 	this.userAddress = item.address
+			// 	this.maskshow = false
+			// }
 		}
+
 	}
 </script>
 
 <style>
+	.item1 image {
+		width: 18rpx;
+		height: 27rpx;
+		/* float: right; */
+		margin-left: 50%;
+	}
+
+	.radio-active {
+		width: 16rpx;
+		height: 16rpx;
+		border-radius: 50%;
+		background-color: #178ffb;
+
+	}
+
+	.radio-default {
+		border: 2rpx solid #0fbda6;
+	}
+
+	.radio {
+		width: 34rpx;
+		height: 34rpx;
+		border-radius: 70%;
+		border: 2rpx solid #178ffb;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		margin: 0rpx 26rpx 0rpx 15rpx;
+
+	}
+
+	.radio-content {
+		height: 80rpx;
+		display: flex;
+		align-items: center;
+		font-size: 34rpx;
+		margin-bottom: 60rpx;
+
+	}
+
+	.radio-right {
+		margin-left: 66rpx;
+	}
+
 	.text {
 		color: #000000;
 		margin-left: 1%;
 		line-height: 100rpx;
-	
+
 	}
+
+	.priceback {
+		/* position: relative; */
+		width: 99%;
+		height: 141rpx;
+		background: #FFFFFF;
+		margin-top: 10%;
+		display: flex;
+
+
+	}
+
 	.texts {
-		margin-left: 5%;
+		/* margin-left: 5%; */
+		/* padding: 3%; */
+
 	}
 
 	.item {
@@ -78,23 +355,27 @@
 		height: 93rpx;
 		/* line-height: 93rpx; */
 		border-bottom: 1rpx solid #D8D4D4;
-		margin-left: 10rpx;
+		/* margin-left: 10rpx; */
+		margin-left: 3%;
 		display: flex;
 		align-items: center;
 		font-size: 36rpx;
 	}
+
 	.item1 {
 		width: 97%;
 		height: 93rpx;
 		/* line-height: 93rpx; */
-		margin-left: 10rpx;
+		margin-left: 3%;
 		display: flex;
 		align-items: center;
 		font-size: 36rpx;
+
 	}
+
 	.content {
 		/* width: 100%; */
-		min-height: 110vh;
+		height: 100%;
 		background-color: #F4F5F7;
 		padding: 3%;
 	}
@@ -120,6 +401,15 @@
 		border-radius: 20rpx;
 		margin-top: 3%;
 	}
+
+	.prices {
+		/* float: left; */
+		font-size: 54rpx;
+		color: #D43953;
+		line-height: 73rpx;
+		margin-top: 5%;
+	}
+
 	.name {
 		width: 70%;
 		/* height: 33rpx; */
@@ -185,19 +475,26 @@
 		background: #E1AE3C;
 		border-radius: 26rpx;
 		margin-left: 35%;
-		margin-top: 10%;
+		margin-top: 5%;
 		line-height: 71rpx;
 		text-align: center;
 		color: #ffffff;
 	}
 
+	.zf {
+		/* margin-left: 10%; */
+		/* margin-bottom: 5%; */
+	}
+
 	.queren {
 		width: 227rpx;
 		height: 71rpx;
 		background: #4C7BC9;
 		border-radius: 26rpx;
-		float: right;
-		margin-top: -10%;
+		/* float: right; */
+		/* margin-top: -10%; */
+		/* margin-left: 45%; */
+		margin-top: 5%;
 		line-height: 71rpx;
 		text-align: center;
 		color: #ffffff;
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
new file mode 100644
index 0000000..7074031
--- /dev/null
+++ b/pages/nursestation/nursestation.vue
@@ -0,0 +1,493 @@
+<template>
+	<view>
+		<view class="top">
+			<view class="righttext">
+				<image class="picture" src="../../static/mentoutu.png"></image>
+				<view class="title">
+					{{list.nurseStationName}}
+				</view>
+				<view class="address">{{list.address}} </view>
+				<view class="title2" @tap="gophone()">
+					<u-icon name="phone-fill" color="#ffffff" size="28"></u-icon>
+					联系我们
+				</view>
+				<view class="title3">
+					<image src="/static/daohang.png" mode="">导航</image>
+				</view>
+			</view>
+			<view class="detail">
+				<view class="detail2">机构简介</view>
+				<view class="textIn14">
+					{{list.agencyIntroduce}}
+				</view>
+			</view>
+			<view class="Nursestationconfiguration">
+				<view class="configuration">
+					护理站配置
+					<view class="config" v-for="(item,index) in nurseStationLabelList" :key="index">
+						<view class="measure">
+							<text>{{item.labelDescription}}</text>
+						</view>
+
+					</view>
+				</view>
+			</view>
+			<view class="tive"
+				style="width:99%;background-color:#ffffff;margin:0 auto;margin-top:5%;border-radius: 11px;height: 100%;">
+				<view class="tab-box">
+					<view class="tab-item" @tap="testTabClick(index)" :class="tabIndex == index?'active':''"
+						v-for="(item,index) in tabList" :key="index">
+						{{item.name}}
+					</view>
+				</view>
+				<view class="item" v-for="(item,index) in servelist" :key="index" v-show='choicetab==false'>
+					<view>
+						<image class="picture2" src="../../static/fuwutu.png"></image>
+					</view>
+					<view class="huanyao">{{item.nurseItemName}}
+					<view class="pingfen">	<u-rate  :count="5" value="2"></u-rate></view>
+					
+					</view>
+					<view class="servicetime">服务时长:{{item.serveDurationUnit}}</view>
+					<view class="appointment" @tap='goappointments()'>预约</view>
+					<view class="price">￥{{item.price}}</view>
+				</view>
+
+				<view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index">
+					<view>
+						<image class="pictures" src="../../static/fuwutu.png"></image>
+					</view>
+					<view class="product">{{item.goodsName}}
+					</view>
+					<!-- <view class="price">￥60</view> -->
+					<view class="appointment">购买</view>
+				</view>
+
+			</view>
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		introductionList,
+		itemList,
+		productInformation
+	} from '@/api/nursestation/nursestation.js';
+	import baseurl from '@/api/baseurl.js'
+	export default {
+		data() {
+			return {
+				choicetab: false, //切换
+				list: [],
+				servelist: [], //服务项目
+				productlist: [], //产品
+				nurseStationId: 2,
+				nurseStationLabelList: [], //护理站配置
+				nearbyNursingStationItemList: [],
+				pageNum: 1,
+				pageSize: 10,
+				tabIndex: 0,
+				tabList: [{
+					name: "服务项目"
+				}, {
+					name: "产品"
+				}, ]
+
+			}
+		},
+		onLoad() {
+			this.getInfo(),
+				this.serveinfo(),
+				this.productinfo()
+		},
+		methods: {
+			goappointments() {
+				uni.navigateTo({
+					url: `/pages/appointmenttime/appointmenttime`,
+
+				})
+			},
+			getInfo() {
+				introductionList(this.nurseStationId).then(res => {
+					this.list = res[0]
+					this.nurseStationLabelList = res[0].nurseStationLabelList
+					// this.nearbyNursingStationItemList = res[0].nearbyNursingStationItemList
+					console.log(this.nurseStationLabelList);
+				})
+			},
+			serveinfo() {
+				itemList(this.nurseStationId, this.pageSize, this.pageNum).then(res => {
+					this.servelist = res.rows
+					console.log(this.servelist)
+
+				})
+			},
+			productinfo() {
+				productInformation(this.nurseStationId, this.pageNum, this.pageSize).then(res => {
+					this.productlist = res.rows
+					console.log(this.productlist)
+				})
+			},
+			testTabClick(index) {
+				console.log(index)
+				this.tabIndex = index
+				this.choicetab = !this.choicetab
+				// if (this.index == 0) {
+				// 	// this.servelist = res.rows
+				// 	})
+				// }
+
+			}
+		},
+
+		gophone() {
+			var that = this
+			uni.getSystemInfo({
+				success: function(res) {
+					// console.log(res)
+					if (res.platform == 'ios') {
+						uni.makePhoneCall({
+							phoneNumber: that.list.phone //仅为示例
+						});
+					} else {
+						uni.showActionSheet({
+							itemList: [`呼叫`, ],
+							success: function(res) {
+								if (res.tapIndex + 1 == 1) {
+									uni.makePhoneCall({
+										phoneNumber: that.list.phone //仅为示例
+									});
+								}
+								console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+							},
+							fail: function(res) {
+								// console.log(res.errMsg);
+							}
+						});
+					}
+				}
+			});
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.pingfen{
+		float: right;
+	}
+	.product {
+		font-size: 38rpx;
+
+		margin-top: -26%;
+		margin-left: 28%;
+	}
+
+	.tab-box {
+		display: flex;
+
+		.tab-item {
+			flex-shrink: 0;
+			padding: 3%;
+			position: relative;
+			transition: all 0.2s linear;
+			font-size: 31rpx;
+
+
+			&::after {
+				transition: all 0.2s linear;
+				transform: translateX(-50%) scaleX(0);
+				content: '';
+				width: 50%;
+				position: absolute;
+				left: 50%;
+				bottom: 20rpx;
+				border-bottom: 6rpx solid #D43953;
+				border-radius: 4rpx;
+			}
+
+			&.active {
+				&::after {
+					content: '';
+					width: 50%;
+					position: absolute;
+					left: 50%;
+					transform: translateX(-50%) scaleX(1);
+					bottom: 20rpx;
+					border-bottom: 6rpx solid red;
+				}
+			}
+		}
+	}
+
+	.config {
+		display: flex;
+		// flex-wrap: wrap;
+		// justify-content: space-around;
+	}
+
+	//产品的图片
+	.pictures {
+		// position: absolute;
+		width: 170rpx;
+		height: 170rpx;
+		margin-left: 3%;
+
+	}
+
+	//全局
+	.top {
+		background-color: #F4F5F7;
+		width: 100%;
+		height: 100vh;
+		padding: 3%;
+	}
+
+	.detail {
+		position: relative;
+		width: 99%;
+		height: 443rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 3%;
+		font-size: 31rpx;
+		padding: 1px 20px 0 20px;
+		box-sizing: border-box;
+	}
+
+	.title3 image {
+		width: 24rpx;
+		height: 24rpx;
+		color: #ffffff;
+
+	}
+
+	.righttext {
+		position: relative;
+		background-color: #ffffff;
+		width: 99%;
+		height: 252rpx;
+		/* box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03); */
+		border-radius: 20rpx;
+		margin: 0 auto;
+
+	}
+
+	.detail2 {
+		font-size: 31rpx;
+		color: #333333;
+		line-height: 12rpx;
+		margin-left: -3%;
+		margin-top: 3%;
+		padding: 3%;
+		font-weight: 500;
+		/* margin-bottom: 20px; */
+	}
+
+	.address {
+		width: 396rpx;
+		height: 62rpx;
+		font-size: 25rpx;
+		margin-left: 35%;
+		margin-top: -2%;
+		font-family: Adobe Heiti Std;
+		font-weight: normal;
+		color: #999999;
+		line-height: 37rpx;
+	}
+
+	.picture {
+		position: absolute;
+		width: 170rpx;
+		height: 170rpx;
+		margin-left: 5%;
+		margin-top: 5%;
+	}
+
+	.picture2 {
+		width: 170rpx;
+		height: 170rpx;
+		margin-left: 3%;
+		// mar
+	}
+
+	.title {
+		margin-left: 35%;
+		line-height: 49px;
+		font-size: 33rpx;
+		font-weight: normal;
+		letter-spacing: 1px;
+
+	}
+
+	.title2 {
+		width: 149rpx;
+		height: 48rpx;
+		background: #D43953;
+		border-radius: 24px;
+		font-size: 21rpx;
+		font-family: Adobe Heiti Std;
+		font-weight: normal;
+		color: #ffffff;
+		line-height: 48rpx;
+		margin-left: 35%;
+		margin-top: 3%;
+		text-align: center;
+	}
+
+	.title3 {
+		width: 103rpx;
+		height: 48rpx;
+		background: #00C176;
+		border-radius: 24px;
+		font-size: 21rpx;
+		font-family: Adobe Heiti Std;
+		font-weight: normal;
+		color: #ffffff;
+		line-height: 48rpx;
+		margin-left: 60%;
+		margin-top: -7%;
+		text-align: center;
+	}
+
+	.textIn14 {
+		font-size: 29rpx;
+		text-indent: 2rem;
+		line-height: 42rpx;
+		color: #666666;
+	}
+
+	.Nursestationconfiguration {
+		width: 700rpx;
+		height: 184rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 3%;
+	}
+
+	.configuration {
+		font-size: 31rpx;
+		color: #333333;
+		line-height: 12rpx;
+		padding: 6%;
+		margin-left: -3%;
+		margin-top: 3%;
+		font-weight: 500;
+
+	}
+
+	.measure {
+		// width: 60%;
+		// height: 67rpx;
+		background: #F6F6F6;
+		border-radius: 33rpx;
+		text-align: center;
+		line-height: 67rpx;
+		display: inline-block;
+		margin-left: 5%;
+		// margin-top: 5%;
+	}
+
+
+
+	.huanyao {
+		// line-height: 10%;
+		// margin-top: -19%;
+		font-size: 38rpx;
+		margin-left: 35%;
+
+		margin-top: -24%;
+		color: #000000;
+		// line-height: 37rpx;
+		// margin: -160px -34px 42px 189px;
+
+	}
+
+	.picture3 {
+		width: 137rpx;
+		height: 23rpx;
+		float: right;
+	}
+
+	.servicetime {
+		font-size: 34rpx;
+		color: #999999;
+		line-height: 37rpx;
+		margin-left: 35%;
+	}
+
+	.appointment {
+		width: 125rpx;
+		height: 71rpx;
+		background: #4C7BC9;
+		border-radius: 26rpx;
+		float: right;
+		margin-top: -5%;
+		// margin-right: -5%;
+		color: #ffffff;
+		text-align: center;
+		line-height: 71rpx;
+	}
+
+	.price {
+		width: 60rpx;
+		height: 26rpx;
+		color: red;
+		font-size: 32rpx;
+		margin-top: 3%;
+		margin-left: 35%;
+	}
+
+	.item {
+		width: 99%;
+		height: 184rpx;
+		position: relative;
+		// background-color: ;
+		margin-bottom: 3%;
+	}
+
+	.item2 {
+		width: 99%;
+		height: 555rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		font-size: 31rpx;
+		color: #333333;
+		padding: 4%;
+		margin-left: -3%;
+		font-weight: 500;
+		margin: 0 auto;
+		margin-top: -17%;
+	}
+
+	.picture4 {
+		width: 170rpx;
+		height: 170rpx;
+		margin-top: 5%;
+	}
+
+	.chanpin {
+		line-height: 37rpx;
+		font-size: 31rpx;
+		color: #333333;
+		padding: 4%;
+		margin-left: 26%;
+		margin-top: -10%;
+		font-weight: 500;
+	}
+
+	.pay {
+		width: 125rpx;
+		height: 71rpx;
+		background: #4C7BC9;
+		border-radius: 26rpx;
+		margin-left: 78%;
+		margin-top: -7%;
+		color: white;
+		line-height: 71rpx;
+		text-align: center;
+	}
+</style>
diff --git a/pages/site/site.vue b/pages/site/site.vue
index d33771b..a23ebb5 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -17,15 +17,11 @@
 					<text class="nurse">{{item.nurseStationName}}</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>
 					<view class="click" @tap='godetails()'>
 						点击了解
@@ -54,7 +50,7 @@
 <script>
 	import {
 		nearbyList
-	} from '@/api/site/index.js';
+	} from '@/api/site/site.js';
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
@@ -63,39 +59,38 @@
 				mask: true,
 				pageNum: 1,
 				pageSize: 10,
-				latitude: 36.661634,
-				longitude: 117.025323,
-
+				longitude:116.397128,
+				latitude:39.916527,
 			}
 		},
-		// 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) {
+		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) {
 
-		// 				} 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()
@@ -107,7 +102,6 @@
 			this.requestinfo()
 		},
 		methods: {
-
 			requestinfo() {
 				if (this.nurseTypeCode != undefined) {
 					nearbyList()
@@ -161,7 +155,8 @@
 		// box-sizing: border-box;
 		position: relative;
 	}
-	.conNew{
+
+	.conNew {
 		width: 100%;
 		height: 1000000px;
 		background-color: #F4F5F7;