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

This commit is contained in:
曹辉 2022-10-21 11:01:28 +08:00
commit 4386ebdc78

View File

@ -1,23 +1,23 @@
<template> <template>
<view> <view>
<view class="top"> <view class="app">
<view class="righttext"> <view class="righttext">
<image class="picture" src="../../static/mentoutu.png"></image> <image class="picture" src="../../static/mentoutu.png"></image>
<view class="title"> <view class="title">
{{list.nurseStationName}} {{list.nurseStationName}}
</view> </view>
<view class="address">{{list.address}} </view> <view class="address">{{list.address}} </view>
<view class="title2" @tap="gophone()"> <view class="callme" @tap="gophone()">
<u-icon name="phone-fill" color="#ffffff" size="28"></u-icon> <u-icon name="phone-fill" color="#ffffff" size="28"></u-icon>
联系我们 联系我们
</view> </view>
<view class="title3"> <view class="Navigation">
<image src="/static/daohang.png" mode="">导航</image> <image src="/static/daohang.png" mode="">导航</image>
</view> </view>
</view> </view>
<view class="detail"> <view class="detail">
<view class="detail2">机构简介</view> <view class="Introduction">机构简介</view>
<view class="textIn14"> <view class="textInfo">
{{list.agencyIntroduce}} {{list.agencyIntroduce}}
</view> </view>
</view> </view>
@ -32,8 +32,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="tive" <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-box">
<view class="tab-item" @tap="testTabClick(index)" :class="tabIndex == index?'active':''" <view class="tab-item" @tap="testTabClick(index)" :class="tabIndex == index?'active':''"
v-for="(item,index) in tabList" :key="index"> v-for="(item,index) in tabList" :key="index">
@ -41,25 +40,23 @@
</view> </view>
</view> </view>
<view class="item" v-for="(item,index) in servelist" :key="index" v-show='choicetab==false'> <view class="item" v-for="(item,index) in servelist" :key="index" v-show='choicetab==false'>
<view> <image src="../../static/fuwutu.png"></image>
<image class="picture2" src="../../static/fuwutu.png"></image>
</view>
<view class="huanyao">{{item.nurseItemName}} <view class="huanyao">{{item.nurseItemName}}
<view class="pingfen"> <u-rate :count="5" value="2"></u-rate></view> <view class="pingfen">
<u-rate :count="5" value="2"></u-rate>
</view>
</view> </view>
<view class="servicetime">服务时长:{{item.serveDurationUnit}}</view> <view class="servicetime">服务时长:{{item.serveDurationUnit}}</view>
<view class="appointment" @tap='goappointments()'>预约</view> <view class="appointment" @tap='goappointments(item)'>预约</view>
<view class="price">{{item.price}}</view> <view class="price">{{item.price}}</view>
</view> </view>
<view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index"> <view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index">
<view> <view>
<image class="pictures" src="../../static/fuwutu.png"></image> <image src="../../static/fuwutu.png"></image>
</view> </view>
<view class="product">{{item.goodsName}} <view class="product">{{item.goodsName}}</view>
</view>
<!-- <view class="price">60</view> -->
<view class="appointment">购买</view> <view class="appointment">购买</view>
</view> </view>
@ -74,7 +71,8 @@
import { import {
introductionList, introductionList,
itemList, itemList,
productInformation productInformation,
} from '@/api/nursestation/nursestation.js'; } from '@/api/nursestation/nursestation.js';
import baseurl from '@/api/baseurl.js' import baseurl from '@/api/baseurl.js'
export default { export default {
@ -84,10 +82,15 @@
list: [], list: [],
servelist: [], // servelist: [], //
productlist: [], // productlist: [], //
stationid: '', //id
nurseStationId: 2, nurseStationId: 2,
nurseStationLabelList: [], // nurseStationLabelList: [], //
nearbyNursingStationItemList: [], nearbyNursingStationItemList: [],
patientId: 46,
pageNum: 1, pageNum: 1,
stationId: 2,
stationItemId: 2,
stationItemPriceId: 3,
pageSize: 10, pageSize: 10,
tabIndex: 0, tabIndex: 0,
tabList: [{ tabList: [{
@ -104,9 +107,10 @@
this.productinfo() this.productinfo()
}, },
methods: { methods: {
goappointments() { //
goappointments(item) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/appointmenttime/appointmenttime`, url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
}) })
}, },
@ -122,7 +126,6 @@
itemList(this.nurseStationId, this.pageSize, this.pageNum).then(res => { itemList(this.nurseStationId, this.pageSize, this.pageNum).then(res => {
this.servelist = res.rows this.servelist = res.rows
console.log(this.servelist) console.log(this.servelist)
}) })
}, },
productinfo() { productinfo() {
@ -135,11 +138,6 @@
console.log(index) console.log(index)
this.tabIndex = index this.tabIndex = index
this.choicetab = !this.choicetab this.choicetab = !this.choicetab
// if (this.index == 0) {
// // this.servelist = res.rows
// })
// }
} }
}, },
@ -154,7 +152,7 @@
}); });
} else { } else {
uni.showActionSheet({ uni.showActionSheet({
itemList: [`呼叫`, ], itemList: ['呼叫', ],
success: function(res) { success: function(res) {
if (res.tapIndex + 1 == 1) { if (res.tapIndex + 1 == 1) {
uni.makePhoneCall({ uni.makePhoneCall({
@ -176,14 +174,67 @@
</script> </script>
<style lang="scss" scoped> <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 { .pingfen {
float: right; float: right;
} }
.product { }
font-size: 38rpx;
margin-top: -26%;
margin-left: 28%;
} }
.tab-box { .tab-box {
@ -196,7 +247,6 @@
transition: all 0.2s linear; transition: all 0.2s linear;
font-size: 31rpx; font-size: 31rpx;
&::after { &::after {
transition: all 0.2s linear; transition: all 0.2s linear;
transform: translateX(-50%) scaleX(0); transform: translateX(-50%) scaleX(0);
@ -222,82 +272,72 @@
} }
} }
} }
}
.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 { .config {
display: flex; display: flex;
// flex-wrap: wrap;
// justify-content: space-around; .measure {
background: #F6F6F6;
border-radius: 33rpx;
text-align: center;
line-height: 67rpx;
display: inline-block;
margin-left: 5%;
}
} }
//
.pictures {
// position: absolute;
width: 170rpx;
height: 170rpx;
margin-left: 3%;
} }
//
.top {
background-color: #F4F5F7;
width: 100%;
height: 100vh;
padding: 3%;
} }
.detail { .detail {
position: relative; position: relative;
width: 99%; width: 94%;
height: 443rpx; height: 443rpx;
margin: 0 auto;
background: #FFFFFF; background: #FFFFFF;
border-radius: 20rpx; border-radius: 20rpx;
margin-top: 3%; margin-top: 3%;
font-size: 31rpx; font-size: 31rpx;
padding: 1px 20px 0 20px; padding: 3%;
box-sizing: border-box;
.textInfo {
font-size: 29rpx;
text-indent: 2rem;
line-height: 42rpx;
color: #666666;
} }
.title3 image { .Introduction {
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; font-size: 31rpx;
color: #333333; color: #333333;
line-height: 12rpx; line-height: 12rpx;
margin-left: -3%; margin-left: -3%;
margin-top: 3%;
padding: 3%; padding: 3%;
font-weight: 500; }
/* margin-bottom: 20px; */
} }
.address { .righttext {
width: 396rpx; position: relative;
height: 62rpx; width: 94%;
font-size: 25rpx; height: 252rpx;
margin-left: 35%; background-color: #ffffff;
margin-top: -2%; border-radius: 20rpx;
font-family: Adobe Heiti Std; margin: 10px auto;
font-weight: normal;
color: #999999;
line-height: 37rpx;
}
.picture { .picture {
position: absolute; position: absolute;
@ -307,187 +347,46 @@
margin-top: 5%; margin-top: 5%;
} }
.picture2 { .Navigation {
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; width: 103rpx;
height: 48rpx; height: 48rpx;
background: #00C176; background: #00C176;
border-radius: 24px; border-radius: 24px;
font-size: 21rpx; font-size: 21rpx;
font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff; color: #ffffff;
line-height: 48rpx; line-height: 48rpx;
margin-left: 60%; margin-left: 60%;
margin-top: -7%;
text-align: center; text-align: center;
margin-top: -6%;
image {
width: 24rpx;
height: 24rpx;
} }
.textIn14 {
font-size: 29rpx;
text-indent: 2rem;
line-height: 42rpx;
color: #666666;
} }
.callme {
.Nursestationconfiguration { width: 149rpx;
width: 700rpx; height: 48rpx;
height: 184rpx; background: #D43953;
background: #FFFFFF; border-radius: 24px;
border-radius: 20rpx; font-size: 21rpx;
margin-top: 3%; color: #ffffff;
} line-height: 48rpx;
.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-left: 35%;
margin-top: 3%;
margin-top: -24%; text-align: center;
color: #000000;
// line-height: 37rpx;
// margin: -160px -34px 42px 189px;
} }
.title {
.picture3 { margin-left: 35%;
width: 137rpx; line-height: 49px;
height: 23rpx; font-size: 33rpx;
float: right;
} }
.address {
.servicetime { font-size: 25rpx;
font-size: 34rpx; margin-left: 35%;
color: #999999; color: #999999;
line-height: 37rpx; 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> </style>