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

This commit is contained in:
曹辉 2022-10-25 10:09:34 +08:00
commit cb6394a742
11 changed files with 759 additions and 612 deletions

View File

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

View File

@ -97,8 +97,14 @@
"key" : "08e138f3f5e8595453526cbbeed38124",
"securityJsCode" : "e50d5cf4e75c0a2b3f5cbfcc96cc4d8f",
"serviceHost" : ""
},
"qqmap" : {
"key" : "7NIBZ-PCVLJ-UEDFB-KUTCS-Z2O7Z-K6BHO"
}
}
},
"devServer" : {
"port" : ""
}
}
}

View File

@ -27,7 +27,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#4C7BC9" ,//
"navigationBarTextStyle": "white"
}
},
{
@ -124,7 +124,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
}, {
"path": "pages/site/site",
"style": {
@ -141,7 +141,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
}, {
"path": "pages/detail/detail",
"style": {
@ -163,7 +163,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
}
},
{
"path": "pages/Doctordetails/Doctordetails",

View File

@ -0,0 +1,176 @@
.app {
.money {
font-size: 32rpx;
color: #D43953;
margin-left: 90%;
}
font-size: 36rpx;
padding-top: 10rpx;
.user {
background: #FFFFFF;
width: 94%;
margin: 10rpx auto;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
line-height: 93rpx;
.selecttime {
height: 93rpx;
margin-left: 3%;
text {
font-size: 34rpx;
color: #878987;
}
image {
width: 18rpx;
height: 27rpx;
margin-left:50%;
}
}
.item {
width: 97%;
height: 93rpx;
border-bottom: 1rpx solid #D8D4D4;
margin-left: 3%;
}
}
.remarks {
width: 94%;
height: 382rpx;
margin: 10rpx auto;
padding: 3%;
font-size: 35rpx;
height: 96rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 2%;
input {
margin-top: -6%;
margin-left: 15%;
}
}
.priceback {
width: 99%;
height: 40rpx;
background: #FFFFFF;
// margin-top: 10rpx;
// position:fixed;
// bottom:0;
display: flex;
.prices {
font-size: 54rpx;
color: #D43953;
line-height: 73rpx;
// margin-top: 5%;
}
.xiugai {
width: 205rpx;
height: 71rpx;
background: #E1AE3C;
border-radius: 26rpx;
margin-left: 20%;
margin-top: 5%;
line-height: 71rpx;
text-align: center;
color: #ffffff;
}
.queren {
width: 227rpx;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
margin-top: 5%;
line-height: 71rpx;
text-align: center;
color: #ffffff;
}
}
.radio-content {
height: 80rpx;
line-height: 2rpx;
font-size: 34rpx;
.agreement {
font-size: 34rpx;
color: #878987;
margin-left: 14%;
}
.radio-right {
margin-left: 66rpx;
.radio-default {
border: 2rpx solid #0fbda6;
}
.radio {
width: 34rpx;
height: 34rpx;
border-radius: 70%;
border: 2rpx solid #178ffb;
margin: 6px 25px -10px -10px;
.radio-active {
width: 16rpx;
height: 16rpx;
border-radius: 50%;
background-color: #178ffb;
margin-left: 26%;
margin-top: 22%;
// margin: 0 auto;
}
}
}
}
/* 耗材包 */
.Consumablespackage {
width: 94%;
// height: 188rpx;
margin: 10rpx auto;
padding: 3%;
font-size: 35rpx;
height: 188rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 2%;
.detail {
width: 301rpx;
height: 31rpx;
line-height: 31rpx;
font-size: 33rpx;
color: #666666;
line-height: 31rpx;
margin-left: 20%;
}
}
/* 套餐 */
.Package {
width: 94%;
// height: 243rpx;
margin: 10rpx auto;
padding: 3%;
font-size: 35rpx;
height: 243rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top:2%;
.detail {
width: 301rpx;
height: 31rpx;
line-height: 31rpx;
font-size: 33rpx;
color: #666666;
line-height: 31rpx;
margin-left: 20%;
}
}
.message {
width: 94%;
// height: 96rpx;
background: white;
border-radius: 20rpx;
margin: 0 auto;
text-align: center;
line-height: 96rpx;
}
}

View File

@ -16,9 +16,10 @@
</view>
<view class="selecttime" @tap='timeshow=true'>
<span>时间</span>
<text v-if="usertime==''" style="color: black;">请选择时间</text>
<text v-if="usertime==''" style="color: black;">请选择时间
<image src="../../static/jiantou.png"></image></text>
<text v-else style="color: black;">{{usertime}}</text>
<image src="../../static/jiantou.png"></image>
</view>
</view>
<view class="remarks">
@ -65,7 +66,7 @@
submitAppointment
} from '@/api/appointmenttime/appointmenttime.js'
import baseurl from '@/api/baseurl.js'
import upicker from '../picker/picker.vue'
import upicker from './@/pages/u-picker/u-picker.vue'
export default {
components: {
upicker
@ -150,8 +151,7 @@
getAppStationItemInfo(this.stationId, this.stationItemId, this.stationItemPriceId).then(res => {
console.log(res)
this.orderlist = res.data
//
//
})
},
//
@ -173,205 +173,5 @@
}
</script>
<style lang="scss">
.app {
.money {
font-size: 32rpx;
color: #D43953;
margin-left: 90%;
}
font-size: 36rpx;
padding-top: 10rpx;
.user {
background: #FFFFFF;
width: 94%;
margin: 10rpx auto;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
line-height: 93rpx;
.selecttime {
height: 93rpx;
margin-left: 3%;
text {
font-size: 34rpx;
color: #878987;
}
image {
width: 18rpx;
height: 27rpx;
margin-left: 50%;
}
}
.item {
width: 97%;
height: 93rpx;
border-bottom: 1rpx solid #D8D4D4;
margin-left: 3%;
}
}
.remarks {
width: 94%;
height: 382rpx;
margin: 10rpx auto;
padding: 3%;
font-size: 35rpx;
height: 96rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
input {
margin-top: -6%;
margin-left: 15%;
}
}
.priceback {
width: 99%;
height: 141rpx;
background: #FFFFFF;
margin-top: 10%;
display: flex;
.prices {
font-size: 54rpx;
color: #D43953;
line-height: 73rpx;
margin-top: 5%;
}
.xiugai {
width: 205rpx;
height: 71rpx;
background: #E1AE3C;
border-radius: 26rpx;
margin-left: 35%;
margin-top: 5%;
line-height: 71rpx;
text-align: center;
color: #ffffff;
}
.queren {
width: 227rpx;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
margin-top: 5%;
line-height: 71rpx;
text-align: center;
color: #ffffff;
}
}
//
.radio-content {
height: 80rpx;
line-height: 2rpx;
font-size: 34rpx;
.agreement {
font-size: 34rpx;
color: #878987;
margin-left: 14%;
}
.radio-right {
margin-left: 66rpx;
.radio-default {
border: 2rpx solid #0fbda6;
}
.radio {
width: 34rpx;
height: 34rpx;
border-radius: 70%;
border: 2rpx solid #178ffb;
margin: 6px 25px -10px -10px;
.radio-active {
width: 16rpx;
height: 16rpx;
border-radius: 50%;
background-color: #178ffb;
margin-left: 20%;
margin-top: 20%;
// margin: 0 auto;
}
}
}
}
/* 耗材包 */
.Consumablespackage {
width: 94%;
height: 188rpx;
margin: 10rpx auto;
padding: 3%;
font-size: 35rpx;
height: 188rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
.detail {
width: 301rpx;
height: 31rpx;
line-height: 31rpx;
font-size: 33rpx;
color: #666666;
line-height: 31rpx;
margin-left: 20%;
}
}
/* 套餐 */
.Package {
width: 94%;
height: 243rpx;
;
margin: 10rpx auto;
padding: 3%;
font-size: 35rpx;
height: 243rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
.detail {
width: 301rpx;
height: 31rpx;
line-height: 31rpx;
font-size: 33rpx;
color: #666666;
line-height: 31rpx;
margin-left: 20%;
}
}
.message {
width: 94%;
height: 96rpx;
background: white;
border-radius: 20rpx;
margin: 0 auto;
text-align: center;
line-height: 96rpx;
}
}
@import './appointmenttime.scss'
</style>

115
pages/detail/detail.scss Normal file
View File

@ -0,0 +1,115 @@
.app {
// font-size: 36rpx;
padding-top: 10rpx;
.concent {
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;
.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%);
image {
width: 178rpx;
height: 84rpx;
background: #FFFFFF;
border-radius: 25px;
// float: right;
margin-left: 68%;
margin-top: 5%;
}
// text-align:center;
}
}
}
.life {
// margin: 0 auto;
width: 162rpx;
height: 40rpx;
font-size: 42rpx;
margin-left: 35%;
color: #ffffff;
}
.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;
}
.detailed {
// font-size: 29rpx;
width: 657rpx;
height: 727rpx;
padding: 0 42rpx;
line-height: 56rpx;
}
.detailed view {
// height: 100%;
text-indent: 2em;
}

View File

@ -0,0 +1,195 @@
.app {
font-size: 36rpx;
padding-top: 10rpx;
.tive {
width: 94%;
background-color: #ffffff;
margin: 0 auto;
margin-top: 3%;
border-radius: 11px;
.item {
width: 99%;
height: 184rpx;
image {
width: 170rpx;
height: 170rpx;
margin-left: 3%;
}
.servicetime {
color: #999999;
line-height: 37rpx;
margin-left: 35%;
}
.appointment {
width: 125rpx;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
float: right;
margin-top: -5%;
color: #ffffff;
text-align: center;
line-height: 71rpx;
}
.price {
color: red;
font-size: 32rpx;
margin-top: 3%;
margin-left: 35%;
}
.product {
margin-top: -26%;
margin-left: 28%;
}
.huanyao {
margin-left: 35%;
margin-top: -24%;
color: #000000;
.pingfen {
float: right;
}
}
}
.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;
}
}
}
}
}
.Nursestationconfiguration {
width: 94%;
height: 184rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin: 0 auto;
.configuration {
font-size: 31rpx;
color: #333333;
line-height: 12rpx;
padding: 6%;
margin-left: -3%;
margin-top: 3%;
.config {
display: flex;
.measure {
background: #F6F6F6;
border-radius: 33rpx;
text-align: center;
line-height: 50rpx;
// display: inline-block;
margin-left: 10%;
}
}
}
}
.detail {
position: relative;
width: 94%;
height: 443rpx;
margin: 0 auto;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
font-size: 31rpx;
padding: 3%;
.textInfo {
font-size: 29rpx;
text-indent: 2rem;
line-height: 42rpx;
color: #666666;
}
.Introduction {
font-size: 31rpx;
color: #333333;
line-height: 12rpx;
margin-left: -3%;
padding: 3%;
}
}
.righttext {
position: relative;
width: 94%;
height: 252rpx;
background-color: #ffffff;
border-radius: 20rpx;
margin: 10px auto;
.picture {
position: absolute;
width: 170rpx;
height: 170rpx;
margin-left: 5%;
margin-top: 5%;
}
.title {
margin-left: 35%;
line-height: 49px;
font-size: 33rpx;
}
.call {
display: flex;
.Navigation {
width: 103rpx;
height: 48rpx;
background: #00C176;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 5%;
text-align: center;
margin-top: 3%;
image {
width: 24rpx;
height: 24rpx;
}
}
.callme {
width: 149rpx;
height: 48rpx;
background: #D43953;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 35%;
margin-top: 3%;
text-align: center;
}
}
.address {
font-size: 25rpx;
margin-left: 35%;
color: #999999;
line-height: 37rpx;
}
}
}

View File

@ -31,6 +31,7 @@
<view class="measure">
<text>{{item.labelDescription}}</text>
</view>
</view>
</view>
</view>
@ -84,7 +85,7 @@
servelist: [], //
productlist: [], //
stationid: '', //id
nurseStationId: 2,
nurseStationId:'',
nurseStationLabelList: [], //
nearbyNursingStationItemList: [],
patientId: 46,
@ -102,7 +103,9 @@
}
},
onLoad() {
onLoad(options) {
console.log(options)
this.list.stationId = options.stationId
this.getInfo(),
this.serveinfo(),
this.productinfo()
@ -145,261 +148,38 @@
}
},
// 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);
// }
// });
// }
// }
// });
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>
.app {
font-size: 36rpx;
padding-top: 10rpx;
.tive {
width: 94%;
background-color: #ffffff;
margin: 0 auto;
margin-top: 3%;
border-radius: 11px;
.item {
width: 99%;
height: 184rpx;
image {
width: 170rpx;
height: 170rpx;
margin-left: 3%;
}
.servicetime {
color: #999999;
line-height: 37rpx;
margin-left: 35%;
}
.appointment {
width: 125rpx;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
float: right;
margin-top: -5%;
color: #ffffff;
text-align: center;
line-height: 71rpx;
}
.price {
color: red;
font-size: 32rpx;
margin-top: 3%;
margin-left: 35%;
}
.product {
margin-top: -26%;
margin-left: 28%;
}
.huanyao {
margin-left: 35%;
margin-top: -24%;
color: #000000;
.pingfen {
float: right;
}
}
}
.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;
}
}
}
}
}
.Nursestationconfiguration {
width: 94%;
height: 184rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin: 0 auto;
.configuration {
font-size: 31rpx;
color: #333333;
line-height: 12rpx;
padding: 6%;
margin-left: -3%;
margin-top: 3%;
.config {
display: flex;
.measure {
background: #F6F6F6;
border-radius: 33rpx;
text-align: center;
line-height: 67rpx;
display: inline-block;
margin-left: 5%;
}
}
}
}
.detail {
position: relative;
width: 94%;
height: 443rpx;
margin: 0 auto;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
font-size: 31rpx;
padding: 3%;
.textInfo {
font-size: 29rpx;
text-indent: 2rem;
line-height: 42rpx;
color: #666666;
}
.Introduction {
font-size: 31rpx;
color: #333333;
line-height: 12rpx;
margin-left: -3%;
padding: 3%;
}
}
.righttext {
position: relative;
width: 94%;
height: 252rpx;
background-color: #ffffff;
border-radius: 20rpx;
margin: 10px auto;
.picture {
position: absolute;
width: 170rpx;
height: 170rpx;
margin-left: 5%;
margin-top: 5%;
}
.title {
margin-left: 35%;
line-height: 49px;
font-size: 33rpx;
}
.call {
display: flex;
.Navigation {
width: 103rpx;
height: 48rpx;
background: #00C176;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 5%;
text-align: center;
margin-top: 3%;
image {
width: 24rpx;
height: 24rpx;
}
}
.callme {
width: 149rpx;
height: 48rpx;
background: #D43953;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 35%;
margin-top: 3%;
text-align: center;
}
}
.address {
font-size: 25rpx;
margin-left: 35%;
color: #999999;
line-height: 37rpx;
}
}
}
@import './nursestation.scss'
</style>

View File

@ -0,0 +1,7 @@
// 定义混入指令用于在非nvue环境下的flex定义因为nvue没有display属性会报错
@mixin vue-flex($direction: row) {
/* #ifndef APP-NVUE */
display: flex;
flex-direction: $direction;
/* #endif */
}

176
pages/site/site.scss Normal file
View File

@ -0,0 +1,176 @@
//护理站列表
.conNew {
width: 96%;
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;
.qyttext {
margin-left: 28%;
display: block;
font-size: 25rpx;
color: #FFFFFF;
}
.lianmeng {
display: block;
margin-left: 5%;
font-size: 14rpx;
color: #FFFFFF;
}
}
.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;
}
}
}
.masks {
height: 100%;
width: 100%;
position: absolute;
opacity: 0.9;
top: 0;
z-index: 999;
.mask {
width: 72%;
height: 348rpx;
background-color: #fff;
margin: 47% auto;
border-radius: 30rpx;
padding: 3%;
.picture {
margin: 0 auto;
width: 86rpx;
image {
height: 102rpx;
width: 86rpx;
}
}
.text {
font-size: 37rpx;
color: #000000;
line-height: 70rpx;
text-align: center;
}
.btns {
display: flex;
color: #fff;
text-align: center;
line-height: 62rpx;
justify-content: center;
margin-top: 5%;
.bt {
background: #C5BFBF;
width: 198rpx;
height: 62rpx;
border-radius: 23rpx;
margin: 25rpx;
}
.btn {
width: 198rpx;
height: 62rpx;
border-radius: 23rpx;
background: #4C7BC9;
margin: 25rpx;
}
}
}
}
//什么是护理站
.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%;
}
}

View File

@ -1,43 +1,47 @@
<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 +54,8 @@
export default {
data() {
return {
nearbylist: [],
locationmask: false,
nursestationlist: [],
mask: true,
pageNum: 1,
pageSize: 10,
//map
@ -67,11 +71,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 +84,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 +106,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 +130,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>