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

# Conflicts:
#	pages.json
#	pages/site/site.vue
This commit is contained in:
曹辉 2022-10-17 11:27:14 +08:00
commit b5594d827b
5 changed files with 643 additions and 285 deletions

View File

@ -120,6 +120,32 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
},
{
"path" : "pages/appointmenttime/appointmenttime",
"style" :
{
"navigationBarTitleText": "预约时间",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
}
},{
"path" : "pages/appointment/appointment",
"style" :
{
"navigationBarTitleText": "选择时间",
"enablePullDownRefresh": false
}
},
{
"path": "pages/detail/detail",
"style": {
"navigationBarTitleText": "护理站简介",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
}
}
],
"globalStyle": {

View File

@ -0,0 +1,82 @@
<template>
<!-- <view> -->
<view class="background">
<text class="appointment">选择想要预约的时间</text>
<view class="nowtime">
<view class="time">
9月10号
</view>
<view class="time">
9月11号
</view>
<view class="time">
9月12号
</view>
<view class="time">
9月13号
</view>
</view>
</view>
<!-- </view> -->
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
.nowtime {
display: flex;
/* flex-direction: row; */
flex-wrap: wrap;
justify-content: space-around;
}
.background {
width: 702rpx;
height: 773rpx;
font-size: ;
background: #FFFFFF;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20px;
margin: 0 auto;
margin-top: 5%;
}
.appointment {
text-align: center;
width: 320rpx;
height: 34rpx;
font-size: 36rpx;
/* font-family: Adobe Heiti Std; */
font-weight: normal;
color: #000000;
line-height: 50px;
margin-left: 30%;
}
.time {
margin-top: 20rpx;
width: 290rpx;
height: 290rpx;
line-height: 290rpx;
text-align: center;
background: #4C7BC9;
border-radius: 25rpx;
margin-left: 5%;
color: white;
font-size: 50rpx;
}
</style>

View File

@ -0,0 +1,228 @@
<template>
<view class="content">
<view class="message">请填写下面的信息</view>
<view class="xinxi">
<view class="user">
<view class="item" @tap='maskshow=true'>姓名
<text class="name">李某某</text>
</view>
<view class="item" @tap='maskshow=true'>电话
<text class="name">18565988855</text>
</view>
<view class="item" @tap='maskshow=true'>地址
<text class="name">111</text>
</view>
<view class="item" @tap='timeshow2=true'>时间
<text class="name">9月1日</text>
</view>
</view>
</view>
<view class="taocan">套餐信息
<text class="price">60</text>
<view>
<text class="qiguan">
·气管切开
</text>
</view>
</view>
<view class="haocaibao">耗材包详情
<text class="price2">60</text>
<view class="">
<text class="qiguan">
·一次性换药包X1一次性注射器X1
</text>
</view>
</view>
<view class="beizhu">备注</view>
<view class="xiugai">修改信息</view>
<view class="queren">确认预约</view>
</view>
</template>
<script>
export default {
data() {
return {
maskshow: false,
timeshow2: false,
}
},
methods: {
}
}
</script>
<style>
.user {
/* background-color: #fff; */
/* margin-bottom: 16rpx; */
.item {
height: 100rpx;
width: 90%;
margin: 0 auto;
line-height: 100rpx;
border-bottom: 1rpx solid #f0f1f6;
display: flex;
justify-content: space-between;
font-size: 24rpx;
letter-spacing: 1rpx;
text:nth-child(1) {
color: #000000;
}
text:nth-child(2) {
color: #333333;
}
}
}
.content {
/* width: 100%; */
min-height: 100vh;
background-color: #F4F5F7;
padding: 3%;
}
.message {
width: 701rpx;
height: 96rpx;
background: white;
/* box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03); */
border-radius: 20rpx;
margin: 0 auto;
text-align: center;
line-height: 96rpx;
/* margin-top: 5rpx; */
font-size: 36rpx;
}
.xinxi {
width: 701rpx;
height: 421rpx;
background: #FFFFFF;
/* box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03); */
border-radius: 20rpx;
margin-top: 3%;
}
.item {
width: 100%;
height: 100rpx;
font-size: 36rpx;
display: flex;
justify-content: space-around;
line-height: 70rpx;
border-bottom: 1rpx solid #D8D4D4;
}
.name {
width: 70%;
/* height: 33rpx; */
font-size: 36rpx;
color: #666666;
}
.title {
width: 90%;
margin: 0 auto;
font-size: 28rpx;
padding-top: 20rpx;
line-height: 34rpx;
color: #000000;
position: relative;
}
.taocan {
font-size: 35rpx;
line-height: 70rpx;
width: 702rpx;
height: 243rpx;
background: #FFFFFF;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin-top: 3%;
}
.haocaibao {
font-size: 33rpx;
line-height: 65rpx;
width: 702rpx;
height: 188rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
}
.beizhu {
font-size: 35rpx;
line-height: 65rpx;
width: 701rpx;
height: 96rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
}
.xiugai {
width: 205rpx;
height: 71rpx;
background: #E1AE3C;
border-radius: 26rpx;
margin-left: 35%;
margin-top: 10%;
line-height: 71rpx;
text-align: center;
color: #ffffff;
}
.queren {
width: 227rpx;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
float: right;
margin-top: -10%;
line-height: 71rpx;
text-align: center;
color: #ffffff;
/* margin-top: 3%; */
/* margin-left: 60%; */
/* margin-top: 10%; */
}
.price {
/* float: right; */
font-size: 32rpx;
color: #D43953;
margin-left: 60%;
/* line-height: 77px; */
}
.price2 {
font-size: 32rpx;
color: #D43953;
margin-left: 56%;
}
.qiguan {
width: 301rpx;
height: 31rpx;
line-height: 31rpx;
font-size: 33rpx;
/* font-family: Adobe Heiti Std; */
/* font-weight: normal; */
color: #666666;
/* text-align: center; */
line-height: 31rpx;
margin-left: 20%;
}
</style>

View File

@ -1,111 +1,170 @@
<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>
<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>
</view>
</view>
</view>
<view class="concenta">
<text class="life">生活护理 </text>
<view class="lifeserve">
<image src="/static/lifeserve.png" mode=""></image>
</view>
</view>
<view class="concentb">
<text class="life">医疗护理 </text>
<view class="lifeserve">
<image src="/static/yiliaohuli.png" mode=""></image>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss">
.CON{
.CON {
// position: relative;
width: 100%;
height: 100%;
// min-height: 100vh;
background-color:: #F4F5F7 ;
// 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%;
}
.life {
// margin: 0 auto;
width: 162rpx;
height: 40rpx;
font-size: 42rpx;
margin-left: 35%;
color: #ffffff;
}
.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;
}
.lifeserve image {
width: 639rpx;
height: 739rpx;
margin-left: 5%;
padding-bottom: 20rpx;
// height: rpx;
// background: #E1AE3C;
// box-shadow: 0px 9px 31px 9px rgba(0,0,0,0.03);
// border-radius: 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;
}
.concentb{
margin: 0 auto;
margin-bottom: 20px;
// position: absolute;
width: 701rpx;
height: 811rpx;
background: #00C176;
// 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>

View File

@ -1,59 +1,40 @@
<template>
<view class="concent">
<view class="nursstation" @tap='detailed()'>
<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">
<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"
<view class="nursetation" @tap='detailed()'>
<text class="what">什么是护理站</text>
<u-icon class="icon" name="arrow-right"></u-icon>
<!-- <image src="../../static/jiantou.png" mode=""></image> -->
</view>
<view class="map">
<!-- <map style="width:100%; height:40vh;" scale="17" :latitude="latitude" :longitude="longitude"
:markers="markers"></map> -->
</view>
</view>
<view class="conNew">
<view class="addressContent">
<view class="lists" v-for="(item,index) in nearbylist" :key="index">
<text class="nurse">{{item.nurseStationName}}</text>
<text class="distance">距离您800米</text>
<view class="background">
<view class="lists">
<text class="nurse">济南护万家护理有限公司</text>
<text class="distance">距离您800米</text>
<view class="background">
<view class="picture">
<image src="/static/logo.png" mode=""></image>
<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()'>
点击了解
</view>
</view>
<text class="qyttext">泉医通</text>
<text class="lianmeng">济卫护理联盟NO.1</text>
</view>
<view class="click">点击了解</view>
<!-- <view class="items"> -->
<!-- <view class="item" v-for="(item,index) in nearbylist" :key="index" @tap='godetails(item)'>
<image :src="baseurl+item.stationPictureUrl" mode=""></image>
<view class="texts">
<view class="text">
{{item.nurseStationName}}
</view>
<view class="" v-if="item.nurseStationLabelList!=null">
<view class="pepole" v-if="item.nurseStationLabelList.length!=0">
<text v-for="(uitem,uindex) in item.nurseStationLabelList" :key="uindex">
{{uitem.labelDescription}}{{' '}}
</text>
</view>
</view> -->
<!-- <view class="address">
{{item.address}}
</view>
<view class="project">
{{item.nurseStationDescription}}
</view> -->
<!-- </view>
<image class="rightimg" src="../../static/jt.png" mode=""></image>
</view> -->
</view>
<view class="masks" style="">
<view class="masks" style="" v-if="mask">
<view class="mask">
<view class="picture2">
<image src="../../static/locatinsmall.png"></image>
@ -61,6 +42,7 @@
<view class="title">
请打开系统定位
</view>
<view class="btns">
<view class="btn1" @tap='cancel()'>取消</view>
<view class="btn2" @tap='getsite()'>去打开</view>
@ -71,144 +53,64 @@
</template>
<script>
import {
getPatientInfo
} from '@/api/details/index.js';
import {
list,
nearbyList
} from '@/api/site/index.js';
import baseurl from '@/api/baseurl.js'
export default {
data() {
return {
iptVal: '',
value: '',
type: 'text',
border: true,
nearbylist: [],
nurseTypeCode: '',
openid: '',
baseurl: '',
id: 0, // 使 marker id
title: 'map',
latitude: 36.661634,
longitude: 117.025323,
title: 'map',
markers: [],
mask: true,
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) {
// } 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)
// }
// });
// }
},
// 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)
// }
// });
// }
// },
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()
onLoad() {
var that = this
this.requestinfo()
},
methods: {
detailed() {
uni.navigateTo({
url: `/pages/detail/detail`
})
},
// getsite() {
// let data={};
// data.surl = '/pages/site/site'
// uni.navigateTo({
// url: `/pages/homePage/homePage`
// })
// },
cancel() {
this.mask = false
uni.reLaunch({
url: `/pages/site/site`
})
},
requestinfo() {
if (this.nurseTypeCode != undefined) {
nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
nearbyList()
.then(res => {
this.nearbylist = res.rows
console.log(this.nearbylist)
@ -216,7 +118,7 @@
} else {
uni.request({
url: baseurl +
`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //
`/nurseApplet/nearbyNursingStation/nearbyList`, //
success: (res) => {
console.log(res)
this.nearbylist = res.data.rows
@ -225,16 +127,67 @@
});
}
},
godetails(item) {
godetails() {
// console.log("111");
uni.navigateTo({
url: `/pages/details/details?id=${item.nurseStationId}`
url: `/pages/nursestation/nursestation`
})
},
detailed() {
uni.navigateTo({
url: `/pages/detail/detail`
})
},
// nurse() {
// uni.navigateTo({
// url: `/pages/nursestation/nursestation`
// })
// },
cancel() {
this.mask = false
// uni.reLaunch({
// url: `/pages/site/site`
// })
},
},
}
</script>
<style lang="scss">
.concent {
width: 100%;
height: 1000px;
background-color: #F4F5F7;
// box-sizing: border-box;
position: relative;
}
.conNew{
width: 100%;
height: 1000000px;
background-color: #F4F5F7;
// box-sizing: border-box;
position: relative;
// box-sizing: border-box;
// padding: 24px;
}
.addressContent {
position: absolute;
top: -91px;
// margin: 0 auto;
width: 100%;
// height: 100%;
// background: #F4F5F7;
// box-sizing: border-box;
padding: 24px;
}
.map {
width: 750rpx;
height: 544rpx;
background-color: red;
}
.picture2 image {
// position: absolute;
display: block;
@ -335,13 +288,18 @@
}
.lists {
position: relative;
margin: 0 auto;
// bottom: 5%;
// display: block;
// position: absolute;
// top: -191px;
// margin: 0 auto;
background-color: #ffffff;
width: 698.8rpx;
// width: 698.8rpx;
width: 100%;
height: 227.8rpx;
margin-top: -10%;
border-radius: 10rpx;
margin-bottom: 3%;
border-radius: 20rpx;
z-index: 99999;
}
.background {
@ -383,7 +341,7 @@
.lianmeng {
display: block;
margin-left: 5%;
font-size: 9px;
font-size: 14rpx;
// font-family: Adobe Heiti Std;
// font-weight: normal;
color: #FFFFFF;
@ -394,19 +352,26 @@
color: #ffffff;
float: right;
width: 167.3rpx;
height: 58.5rpx;
line-height: 58.5rpx;
height: 34px;
line-height: 34px;
// height: 58.5rpx;
// line-height: 58.5rpx;
// margin: 0 auto;
text-align: center;
background-color: #4C7BC9;
margin-top: 20%;
margin-right: 5%;
border-radius: 30rpx;
border-radius: 17px;
// margin-top: 6%;
// margin-left: 40%;
// border-radius: 10rpx;
}
.wenzi {
color: #ffffff;
text-align: center;
}
.nurse {
position: absolute;
float: right;
@ -420,16 +385,16 @@
width: 80%;
line-height: 60rpx;
position: absolute;
margin-left: 55%;
// margin-top: 5%;
// float: right;
margin-left: 85%;
margin-top: -9%;
}
.distance {
position: absolute;
float: right;
margin-top: 12%;
font-size: 27rpx;
font-size: 14rpx;
margin-left: 40%;
font-family: Adobe Heiti Std;
font-weight: normal;
@ -438,11 +403,19 @@
}
.nursstation {
position: fixed;
.nursestation image {
position: relative;
width: 16rpx;
height: 24rpx;
}
.nursetation {
position: relative;
// display: block;
// margin:0 auto;
top: 0;
top: 50px;
left: 0px;
float: left;
// background-color: white;
border: 1px solid #f0f0f0;
width: 80%;
@ -450,36 +423,26 @@
margin: 10rpx 0 10rpx 50%;
transform: translateX(-50%);
border-radius: 20rpx;
background-color: #ffffff;
z-index: 999;
// .input {
// margin: 0 auto;
// position: absolute;
// height: 50rpx;
// top: 5%;
// left: 12%;
// }
// .icon {
// background: url(@/static/sousuo.png) no-repeat;
// width: 40rpx;
// height: 40rpx;
// background-size: cover;
// position: absolute;
// top: 18%;
// left: 3%;
// }
background-color: red;
z-index: 100;
}
.what {
display: block;
// margin: 0 auto;
position: absolute;
height: 50rpx;
top: 5%;
left: 12%;
// background-color: #4486e8;
position: relative;
height: 60rpx;
width: 80%;
line-height: 60rpx;
margin-left: 5%;
// text-align: left padding: 20%;
}
</style>