Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	api/register/index.js

api/Lifeservice/Lifeservice.js

@@ -0,0 +1,10 @@
+import request from "../request.js"
+
+
+
+export function nurseType() {
+	return request({
+		url: `/nurseApplet/nearbyNursingStation/getNurseTypeList`,
+		method: 'GET'
+	})
+}

api/appointment/index.js

@@ -0,0 +1,26 @@
+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
+	})
+}
+
+

api/details/index.js

@@ -0,0 +1,18 @@
+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'
+	})
+}

api/index/index.js

@@ -0,0 +1,81 @@
+import request from "../request.js"
+
+export function getWeChatUser(loginCode) {
+	return request({
+		url: `/nurseApplet/login/getWeChatUserInfo?loginCode=${loginCode}`,
+		method: 'GET'
+	})
+}
+
+// 个人中心
+export function getPatient(openId) {
+	return request({
+		url: `/nurseApplet/login/getPatientInfo?openId=${openId}`,
+		method: 'GET'
+	})
+}
+// 护理站
+// export function getPatient(openId) {
+// 	return request({
+// 		url: `/nurseApplet/system/nurseType/list=${openId}`,
+// 		method: 'GET'
+// 	})
+// }
+
+
+export function getAppletPictureUrl(fileName) {
+	return request({
+		url: `/nurseApplet/login/getAppletPictureUrl?fileName=${fileName}`,
+		method: 'GET'
+	})
+}
+
+
+
+export function uploadHeadPicture(data) {
+	return request({
+		url: `/nurseApplet/login/uploadHeadPicture`,
+		method: 'POST',
+		data
+	})
+}
+
+// export function getPreOrderById(data,data2) {
+// 	return request({
+// 		url: `/kindergarten/applet/appletLogin?loginCode=${data}&phoneCode=${data2}`,
+// 		method: 'GET'
+// 	})
+// }
+// //查看
+// export function getStudentScore(data) {
+// 	return request({
+// 		url: `/kindergarten/applet/getStudentScoreInfo?studentId=${data}`,
+// 		method: 'GET'
+// 	})
+// }
+// //绑定家长手机号
+// export function bindParent(data) {
+// 	return request({
+// 		url: `/kindergarten/applet/bindParentInfo`,
+// 		method: 'POST',
+// 		data
+// 	})
+// }
+
+
+
+// export function getInfoByPhone(data) {
+// 	return request({
+// 		url: `/kindergarten/applet/getInfoByPhone?phone=${data}`,
+// 		method: 'GET'
+// 	})
+// }
+
+
+// export function addConfirmOrder(data) {
+//     return request({
+//         url: ``,
+//         method: "post",
+//         data
+//     })
+// }

api/order/index.js

@@ -0,0 +1,12 @@
+import request from "../request.js"
+
+
+export function patienInfo(id,orderNo) {
+	return request({
+		url: `/nurseApplet/serviceOrder/patienInfo?patientId=${id}&orderNo=${orderNo}`,
+		method: 'GET'
+	})
+}
+
+
+

api/orderPrart/index.js

@@ -0,0 +1,12 @@
+import request from "../request.js"
+
+
+export function nursingOrder(parentId) {
+	return request({
+		url: `/nurseApplet/nursingOrder/userPage?parentId=${parentId}`,
+		method: 'GET'
+	})
+}
+
+
+

api/site/index.js

@@ -0,0 +1,16 @@
+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, nurseStationName) {
+	return request({
+		url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}&nurseStationType=${nurseStationType}&nurseStationName=${nurseStationName}`,
+		method: 'GET'
+	})
+}

api/userdata/index.js

@@ -0,0 +1,11 @@
+import request from "../request.js"
+
+
+
+
+export function getRegisterPatientInfo(patientId) {
+	return request({
+		url: `/nurseApplet/login/getRegisterPatientInfo?patientId=${patientId}`,
+		method: 'GET'
+	})
+}

pages/detail/detail.vue

@@ -0,0 +1,111 @@
+<template>
+	
+	<view class="CON">
+		<view class="concent">
+			<view class="background">
+				<view class="picture">
+						<image src="/static/detailed.png" mode=""></image>
+						<view>
+							<view class="detailed">
+								<view>护理站是以维护社区人群健康、满足社区 人群基本医疗护理需求为宗旨，以护士为核心 的各类护理人员组成的团队，在一定社区范围 内，为长期卧床老人、患者、残疾人、临终患 者和其他需要护理服务者提供基础护理、专科 护理、临终护理、消毒隔离技术指导、营养指导、社区康复指导、健康宣教和其他护理服务 的医疗机构。</view>
+							<view>护理站以遵医嘱的上门护理服务为主，包括生活护理和医疗护理，详情如下：</view>
+							</view>
+							</view>
+								</view>
+							</view>
+						</view>
+						<view class="concenta"></view>
+				</view>
+	
+	
+		
+	
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.CON{
+		// position: relative;
+		width: 100%;
+		height: 100%;
+	    // min-height: 100vh;
+		background-color:: #F4F5F7 ;
+		padding-bottom: 20rpx;
+	}
+.concent{
+	// position: absolute;
+	
+	width: 701rpx;
+	height: 811rpx;
+	background: #4C7BC9;
+	box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03);
+	border-radius: 20rpx;
+	margin-top: 5%;
+	// left: 50%;
+	// transform: translateX(-50%);
+	margin: 0 auto;
+	margin-bottom: 20px;
+}
+.concenta{
+	margin: 0 auto;
+	margin-bottom: 20px;
+	// position: absolute;
+	width: 701rpx;
+	height: 811rpx;
+	background: #E1AE3C;
+	// margin-top: 118%;
+	// margin-left: 2.55%;
+	border-radius: 25rpx;
+	// margin-bottom: 30rpx;
+}
+.background{
+	position: relative;
+	// display: flex;
+	width: 657rpx;
+	height: 727rpx;
+	background: #FFFFFF;
+	border-radius: 25rpx;
+	background-color: white;
+	margin: 0 auto;
+	top: 50%;
+	transform: translateY(-50%);
+	
+
+	// text-align:center;
+	
+	
+	
+}
+.detailed{
+	// font-size: 29rpx;
+	width: 657rpx;
+	height: 727rpx;
+	padding: 0 42rpx;
+	line-height: 56rpx;
+}
+.detailed view{
+	// height: 100%;
+	text-indent: 2em;
+}
+.picture image{
+	width: 178rpx;
+	height: 84rpx;
+	background: #FFFFFF;
+	border-radius: 25px;
+	// float: right;
+	margin-left:68%;
+	margin-top: 5%;
+}
+</style>