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

This commit is contained in:
2023-09-28 10:35:19 +08:00
commit 76e4750a6d
7 changed files with 267 additions and 9 deletions

View File

@ -341,12 +341,50 @@
}, { }, {
"root": "pagesC", "root": "pagesC",
"pages": [{ "pages": [{
"path": "ServiceAppointmenttime/ServiceAppointmenttime", "path": "ServiceAppointment/ServiceAppointment",
"style": { "style": {
"navigationBarTitleText": "服务预约", "navigationBarTitleText": "服务预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "appointmenttime/appointmenttime",
"style": {
"navigationBarTitleText": "服务预约",
"enablePullDownRefresh": false
}
},
{
"path": "Screeningdetails/Screeningdetails",
"style": {
"navigationBarTitleText": "筛查详情",
"enablePullDownRefresh": false
}
},
{
"path": "Healthrecords/Healthrecords",
"style": {
"navigationBarTitleText": "健康档案",
"enablePullDownRefresh": false
}
},
{
"path": "Screeningrecords/Screeningrecords",
"style": {
"navigationBarTitleText": "筛查记录",
"enablePullDownRefresh": false
}
},
{
"path": "ServiceAppointment/ServiceAppointment",
"style": {
"navigationStyle": "custom", //
// "navigationBarTitleText": "商品订单",
"onReachBottomDistance": 20, // px
"enablePullDownRefresh": true //true
}
},
{ {
"path": "ServiceAppointment/ServiceAppointment", "path": "ServiceAppointment/ServiceAppointment",
"style": { "style": {

View File

@ -14,13 +14,13 @@
家医签约 家医签约
</view> </view>
</view> </view>
<view class="home"> <view class="home" @tap="goHealthrecords">
<image src="/static/pageC/health.png" mode=""></image> <image src="/static/pageC/health.png" mode=""></image>
<view class="name"> <view class="name">
健康档案 健康档案
</view> </view>
</view> </view>
<view class="home" @tap="goappoint"> <view class="home" @tap="goappoint">
<image src="/static/pageC/serveappoint.png" mode=""></image> <image src="/static/pageC/serveappoint.png" mode=""></image>
<view class="name"> <view class="name">
服务预约 服务预约
@ -56,7 +56,7 @@
</view> </view>
<view class="sign"> <view class="sign">
<image src="/static/pageC/healthmyself.png" mode=""></image> <image src="/static/pageC/healthmyself.png" mode=""></image>
<image src="/static/pageC/records.png" mode=""></image> <image @tap="gorecords" src="/static/pageC/records.png" mode=""></image>
</view> </view>
</view> </view>
</view> </view>
@ -75,6 +75,16 @@
this.login() this.login()
}, },
methods: { methods: {
goHealthrecords() {
uni.navigateTo({
url: '/pagesC/Healthrecords/Healthrecords'
})
},
gorecords() {
uni.navigateTo({
url: '/pagesC/Screeningrecords/Screeningrecords'
})
},
goappoint() { goappoint() {
uni.navigateTo({ uni.navigateTo({
url: '/pagesC/ServiceAppointment/ServiceAppointment' url: '/pagesC/ServiceAppointment/ServiceAppointment'
@ -106,4 +116,4 @@
<style lang="scss"> <style lang="scss">
@import "./homepage.scss"; @import "./homepage.scss";
</style> </style>

View File

@ -0,0 +1,56 @@
<template>
<view class="app">
<view class="content">
<view class="health">
前往建档
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {};
},
methods: {
goapponint() {
uni.navigateTo({
url: '/pagesC/Screeningdetails/Screeningdetails'
});
},
},
}
</script>
<style lang="scss">
.app {
height: 100vh;
background-color: #F7F5F5;
padding: 30rpx 0 0 0;
.content {
background-color: #fff;
position: relative;
width: 95%;
height: 100%;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 5rpx;
margin: 15rpx auto;
.health{
margin: 0 auto;
left: 50%;
transform: translateX(-50%);
width: 496rpx;
position: absolute;
height: 61rpx;
background: #26A888;
border-radius: 5rpx;
bottom: 5%;
line-height: 61rpx;
text-align: center;
color: #fff;
}
}}
</style>

View File

@ -0,0 +1,140 @@
<template>
<view class="app">
<view class="content">
<view class="item">
筛查项目
<span>眼底筛查</span>
</view>
<view class="item">
筛查时间
<span>2023-14-14 13:13:13</span>
</view>
<view class="item">
筛查机构
<span>河口社区卫生服务中心</span>
</view>
<view class="item">
筛查项目
<span>眼底筛查</span>
</view>
<view class="item">
筛查医生
<span>张三</span>
</view>
<view class="itemend">
筛查结果:
</view>
<view class="image">
<view class="imageitem">
<image src="../../static/pagesB/Behave.png" mode=""></image>
</view>
<view class="imageitem">
<image src="../../static/pagesB/Behave.png" mode=""></image>
</view>
<view class="imageitem">
<image src="../../static/pagesB/Behave.png" mode=""></image>
</view>
</view>
<view class="item">
诊断结果
<span>诊断结果内容</span>
</view>
<view class="item">
健康处方
</view>
<view class="word">
处方内容内容处方处内容方内处方容容内处 方内容处方容处方处内容方内处方容容内处 方容处方内容
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {};
},
methods: {
goapponint() {
uni.navigateTo({
url: '/pagesC/Screeningdetails/Screeningdetails'
});
},
},
}
</script>
<style lang="scss">
.app {
height: 100vh;
background-color: #F7F5F5;
padding: 30rpx 0 0 0;
.content {
background-color: #fff;
position: relative;
width: 95%;
height: 100%;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 5rpx;
margin: 15rpx auto;
.word {
width: 90%;
margin: 10rpx auto;
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #868585;
line-height: 38rpx;
text-indent: 35rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 5;
line-clamp: 5;
-webkit-box-orient: vertical;
text-align: justify;
}
.itemend {
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 38rpx;
padding: 50rpx 30rpx 0 30rpx;
}
.image {
display: flex;
justify-content: space-around;
padding-top: 20rpx;
}
.imageitem {
image {
width: 195rpx;
height: 276rpx;
}
}
.item {
padding: 30rpx 30rpx 0 30rpx;
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 38rpx;
span {
color: #868585;
}
}
}
}
</style>

View File

@ -11,6 +11,19 @@
详情 详情
</view> </view>
</view> </view>
<view class="content">
<view class="big">眼底筛查
</view>
<view class="servename">
2023-12-12 12:12:12
</view>
<view class="appoint" @tap="goapponint">
详情
</view>
</view>
</view> </view>
</template> </template>
@ -78,4 +91,4 @@
} }
} }
} }
</style> </style>

View File

@ -43,6 +43,7 @@
background: { background: {
backgroundColor: '#26A888', backgroundColor: '#26A888',
}, },
goodsName:'',
}; };
}, },
methods: { methods: {
@ -53,7 +54,7 @@
}, },
goapponint() { goapponint() {
uni.navigateTo({ uni.navigateTo({
url: '/pagesC/ServiceAppointmenttime/ServiceAppointmenttime' url: '/pagesC/appointmenttime/appointmenttime'
}) })
} }
}, },
@ -168,4 +169,4 @@
} }
} }
} }
</style> </style>

View File

@ -11,7 +11,6 @@
提交 提交
</view> </view>
</view> </view>
</view> </view>
</template> </template>
@ -44,6 +43,7 @@
.submit { .submit {
width: 496rpx; width: 496rpx;
height: 61rpx; height: 61rpx;
background: #26A888; background: #26A888;
border-radius: 5rpx; border-radius: 5rpx;
line-height: 61rpx; line-height: 61rpx;