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

# Conflicts:
#	pages.json
This commit is contained in:
闫晓茹 2023-10-09 09:32:51 +08:00
commit 4e171bb456
9 changed files with 526 additions and 136 deletions

View File

@ -3,13 +3,19 @@
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pages/startup/startup",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
{
"path": "pages/homepage/homepage",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
"path": "pages/startup/startup",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
{
"path": "pages/medicalservice/medicalservice",
"style": {
@ -28,12 +34,6 @@
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false
}
}, {
"path": "pages/homepage/homepage",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
"path": "pages/message/message",
"style": {
@ -41,13 +41,6 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/login1/login",
"style": {
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false
}
},
{
"path": "pages/register/register",
"style": {
@ -79,7 +72,7 @@
"navigationStyle": "default",
"navigationBarBackgroundColor": "#4ac4ab"
}
},{
}, {
"path": "managefamily/managefamily",
"style": {
"navigationBarTitleText": "管理家庭成员",
@ -245,9 +238,8 @@
}, {
"path": "ProductList/ProductList", //
"style": {
"navigationStyle": "custom", //
"navigationBarTitleText": "医路优品",
"onReachBottomDistance": 20, // px
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
}, {
@ -347,34 +339,34 @@
"navigationBarTitleText": "积分商城",
"enablePullDownRefresh": false
}
}, {
"path": "screeningResult/screeningResult",
"style": {
"navigationBarTitleText": "筛查结果",
"enablePullDownRefresh": false
}
}, {
"path": "screeningRecord/screeningRecord",
"style": {
"navigationBarTitleText": "筛查记录",
"enablePullDownRefresh": false
}
}, {
"path": "SelectItem/SelectItem",
"style": {
"navigationBarTitleText": "选择项目",
"enablePullDownRefresh": false
}
}, {
"path": "mysigning/mysigning",
"style": {
"navigationBarTitleText": "我的签约",
"enablePullDownRefresh": false
}
}
,{
"path" : "screeningResult/screeningResult",
"style" :
{
"navigationBarTitleText": "筛查结果",
"enablePullDownRefresh": false
}
}
,{
"path" : "screeningRecord/screeningRecord",
"style" :
{
"navigationBarTitleText": "筛查记录",
"enablePullDownRefresh": false
}
},{
"path" : "SelectItem/SelectItem",
"style" :
{
"navigationBarTitleText": "选择项目",
"enablePullDownRefresh": false
}
}
]
]
}, {
"root": "pagesC",
"pages": [
@ -448,28 +440,27 @@
"navigationBarTitleText": "我的预约",
"enablePullDownRefresh": false
}
}
,{
"path" : "healthtest/healthtest",
"style" :
{
"navigationBarTitleText": "健康自评",
"enablePullDownRefresh": false
}
}
,{
"path" : "Physicalexamination/Physicalexamination",
"style" :
{
"navigationBarTitleText": "体征检测",
"enablePullDownRefresh": false
}
}
]
}, {
"path": "healthtest/healthtest",
"style": {
"navigationBarTitleText": "健康自评",
"enablePullDownRefresh": false
}
}, {
"path": "Physicalexamination/Physicalexamination",
"style": {
"navigationBarTitleText": "体征检测",
"enablePullDownRefresh": false
}
}
, {
"path": "Mysigning/Mysigning",
"style": {
"navigationBarTitleText": "我的签约",
"enablePullDownRefresh": false
}
}
]
}],
"globalStyle": {
"navigationBarTextStyle": "white",
@ -508,6 +499,14 @@
"selectedIconPath": "static/myinformations.png",
"text": "我的"
}
// ,
// {
// "path": "Mysigning/Mysigning",
// "style": {
// "navigationBarTitleText": "我的签约",
// "enablePullDownRefresh": false
// }
// }
]
}
}

View File

@ -32,7 +32,6 @@
积分兑换
</view>
</view>
<view class="home" @tap="myappointment">
<image src="/static/pageC/appointmen.png" mode=""></image>
<view class="name">
@ -55,7 +54,7 @@
<image src="/static/pageC/tizheng.png" mode=""></image>
</view>
<view class="sign">
<image @tap="healthtest" src="/static/pageC/healthmyself.png" mode=""></image>
<image @tap="healthtest" src="/static/pageC/healthmyself.png" mode=""></image>
<image @tap="gorecords" src="/static/pageC/records.png" mode=""></image>
</view>
</view>
@ -78,10 +77,13 @@
this.login()
},
methods: {
goonline(){
goonline() {
uni.navigateTo({
url: '/pagesC/Onlinesigning/Onlinesigning'
url: '/pagesB/mysigning/mysigning'
})
// uni.navigateTo({
// url: '/pagesC/Onlinesigning/Onlinesigning'
// })
},
goHealthrecords() {
uni.navigateTo({
@ -101,7 +103,7 @@
})
},
//
sign(){
sign() {
uni.navigateTo({
url: '/pagesC/Physicalexamination/Physicalexamination'
})
@ -114,15 +116,15 @@
})
},
//
servicerecord(){
servicerecord() {
uni.navigateTo({
url: '/pagesC/servicerecord/servicerecord'
})
},
//
myappointment(){
myappointment() {
uni.navigateTo({
url:'/pagesC/Myappointment/Myappointment'
url: '/pagesC/Myappointment/Myappointment'
})
},
login() {
@ -151,4 +153,4 @@
<style lang="scss">
@import "./homepage.scss";
</style>
</style>

View File

@ -1,54 +0,0 @@
<template>
<view class="login">
<image src="../../static/logo.png"></image>
<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">手机号快捷登录</button>
</view>
</template>
<script>
import {
getwxPhoneNumber
} from '@/api/pages/login/index.js'
export default {
methods: {
getPhoneNumber(e) {
if (e.detail.code) {
getwxPhoneNumber(e.detail.code).then(res => {
if (res.code == 200) {
const phoneNumber = res.data.phone_info.phoneNumber
uni.navigateTo({
url: `../register/register?phoneNumber=${phoneNumber}`
})
}
})
}
}
}
}
</script>
<style lang="less" scoped>
.login {
text-align: center;
margin-top: 50%;
image {
width: 196rpx;
height: 203rpx;
margin-bottom: 136rpx;
}
button {
margin-top: 136rpx;
width: 496rpx;
height: 61rpx;
background: #26A888;
border-radius: 5rpx;
font-size: 31rpx;
color: #FFF;
font-weight: 500;
line-height: 61rpx;
margin: 0 auto;
}
}
</style>

View File

@ -1,6 +1,92 @@
<template>
<view class="app">
<view class="title">
<view class="left">
</view>
<view class="right">
第一步填写个人信息
</view>
</view>
<view class="item">
<view class="text">
现住址所在区
</view>
<view class="input">
<input class="uinput" placeholder="请选择所属地区" type="text" placeholder-class="phsy" />
<image src="../../static/huijiantou.png" mode=""></image>
</view>
<view class="text">
患者姓名
</view>
<view class="input">
<input class="uinput noimageuinput" placeholder="请输入患者姓名" type="text" placeholder-class="phsy" />
</view>
<view class="text">
患者身份证号
</view>
<view class="input">
<input class="uinput noimageuinput" placeholder="请输入患者身份证号" type="text" placeholder-class="phsy" />
</view>
<view class="text">
患者联系电话
</view>
<view class="input">
<input class="uinput noimageuinput" placeholder="请输入患者联系电话" type="text" placeholder-class="phsy" />
</view>
</view>
<view class="title">
<view class="left">
</view>
<view class="right">
第二步填写问诊信息
</view>
</view>
<view class="item">
<view class="text">
问题简述
</view>
<view class="input">
<input class="uinput noimageuinput" placeholder="不多于五个字" type="text" placeholder-class="phsy" />
</view>
<view class="text">
患者个体情况说明
</view>
<view class="input" style="height: 200rpx;overflow-Y: scroll;">
<u-input class="uinput noimageuinput" placeholder=" " type="textarea" :maxlength="100" />
</view>
<view class="text">
问题描述
</view>
<view class="input" style="height: 200rpx;overflow-Y: scroll;">
<u-input class="uinput noimageuinput" placeholder=" " type="textarea" :maxlength="500" />
</view>
<view class="text">
既往疾病史
</view>
<view class="input" style="height: 200rpx;overflow-Y: scroll;">
<u-input class="uinput noimageuinput" placeholder=" " type="textarea" :maxlength="100" />
</view>
</view>
<view class="title">
<view class="left">
</view>
<view class="right">
第三步上传附件文件
</view>
</view>
<view class="item">
<view class="text">
附件材料上传
</view>
</view>
<view class="btns">
<view class="btnleft">
返回
</view>
<view class="btnright">
保存
</view>
</view>
</view>
</template>
@ -15,5 +101,127 @@
</script>
<style lang="scss">
page {
background-color: #F4F5F7;
}
.app {
padding-top: 10rpx;
width: 100%;
.btns {
width: 100%;
display: flex;
font-size: 31rpx;
justify-content: space-around;
text-align: center;
font-weight: 500;
margin-top: 80rpx;
padding-bottom: 50rpx;
.btnleft {
width: 290rpx;
height: 62rpx;
background: #FFFFFF;
border: 1px solid #26A888;
border-radius: 5rpx;
color: #26A888;
line-height: 62rpx
}
.btnright {
width: 289rpx;
height: 62rpx;
background: #26A888;
border-radius: 5rpx;
color: #FFFFFF;
line-height: 62rpx;
}
}
.item {
width: 96%;
margin: 20rpx auto;
background-color: #fff;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 5rpx;
padding-bottom: 50rpx;
.text {
font-size: 30rpx;
font-weight: 400;
color: #333333;
padding: 30rpx 0 0 40rpx;
}
.input {
width: 90%;
height: 80rpx;
border-radius: 5rpx;
background: #f6f6f6;
margin: 20rpx 0 0 40rpx;
position: relative;
padding-left: 10rpx;
image {
width: 10rpx;
height: 20rpx;
position: absolute;
top: 50%;
right: 5%;
transform: translateY(-50%);
}
.uni-textarea-placeholder {
padding-left: 12rpx;
font-size: 22rpx;
font-weight: 400;
color: #8E8E8E !important;
}
.phsy {
padding-left: 12rpx;
font-size: 22rpx;
font-weight: 400;
color: #8E8E8E !important;
}
.uinput {
color: black;
font-size: 26rpx;
width: 90%;
height: 80rpx;
line-height: 80rpx;
}
.noimageuinput {
width: 98% !important;
}
}
}
.title {
width: 100%;
padding: 10rpx 0 10rpx 35rpx;
.left {
vertical-align: middle;
display: inline-block;
width: 10rpx;
height: 30rpx;
background: #26A888;
border-radius: 1rpx;
}
.right {
vertical-align: middle;
display: inline-block;
font-size: 30rpx;
font-weight: 500;
color: #26A888;
line-height: 30rpx;
margin-left: 20rpx;
}
}
}
</style>

View File

@ -0,0 +1,235 @@
<template>
<view class="app">
<view class="title">
<image src="../../static/pagesB/jibenxinxi.png" mode=""></image>
<view class="text">
基本信息
</view>
</view>
<view class="name">
<view class="text">
张三
</view>
<view class="card">
高血压
</view>
<view class="card">
糖尿病
</view>
</view>
<view class="item">
&nbsp;&nbsp;&nbsp; 65
</view>
<view class="item">
1786982345
</view>
<view class="item">
37029828873746473
</view>
<view class="item">
山东省济南市槐荫区腊山河街道首诺城市之光
山东省济南市槐荫区腊山河街道首诺城市之光
山东省济南市槐荫区腊山河街道首诺城市之光
山东省济南市槐荫区腊山河街道首诺城市之光
山东省济南市槐荫区腊山河街道首诺城市之光
</view>
<view class="border">
</view>
<view class="title">
<image src="../../static/pagesB/qianyuexinxi.png" mode=""></image>
<view class="text">
签约信息
</view>
</view>
<view class="item">
年限2023年1月12日-2024年1月12日
</view>
<view class="item">
机构河口区卫生服务中心
</view>
<view class="item flexitem">
<view class="left">
医生张三
</view>
<view class="right">
<image src="../../static/pagesB/zixun.png" mode=""></image>
<text>
咨询
</text>
</view>
</view>
<view class="lookbtn">
查看我的家庭医生团队
</view>
<view class="border">
</view>
<view class="title">
<image src="../../static/pagesB/wodefuwubao.png" mode=""></image>
<view class="text">
我的服务包
</view>
</view>
<view class="item">
高血压个性服务包
</view>
<view class="item">
糖尿病个性服务包
</view>
<view class="lookbtn">
查看履约详情
</view>
<view class="border">
</view>
<view class="btns">
<view class="leftbtn">
申请解约
</view>
<view class="rightbtn">
查看签约协议
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss">
page {
background-color: #F4F5F7;
}
.app {
width: 96%;
margin: 20rpx auto;
background-color: #fff;
padding-bottom: 50rpx;
font-size: 31rpx;
.btns {
width: 100%;
display: flex;
justify-content: space-evenly;
padding-bottom: 100rpx;
.leftbtn,
.rightbtn {
width: 290rpx;
height: 62rpx;
background: #FFFFFF;
border: 1px solid #26A888;
border-radius: 5rpx;
text-align: center;
font-weight: 500;
color: #26A888;
line-height: 62rpx;
}
.rightbtn {
color: #fff;
background: #26A888;
}
}
.lookbtn {
margin: 50rpx auto 0;
width: 497rpx;
height: 62rpx;
background: #FFFFFF;
border: 1px solid #26A888;
border-radius: 5rpx;
font-weight: 500;
color: #26A888;
text-align: center;
line-height: 62rpx;
}
.border {
width: 94%;
height: 2rpx;
margin: 60rpx auto 30rpx;
background: #E6E6E6;
}
.item {
width: 100%;
padding: 30rpx 50rpx 0 50rpx;
font-size: 30rpx;
font-weight: 400;
color: #333333;
word-break: break-all;
}
.flexitem {
display: flex;
justify-content: space-between;
.right {
display: flex;
align-items: flex-end;
image {
width: 30rpx;
height: 30rpx;
}
text {
padding-left: 10rpx;
}
}
}
.name {
width: 100%;
font-size: 38rpx;
font-weight: 500;
color: #333333;
padding: 60rpx 50rpx 0 50rpx;
display: flex;
align-items: flex-end;
.text {
margin-right: 40rpx;
}
.card {
font-size: 18rpx;
font-weight: 400;
color: #FFA115;
width: 85rpx;
height: 35rpx;
background: #FFFFFF;
border: 1px solid #FFA115;
border-radius: 5rpx;
margin-right: 14rpx;
text-align: center;
}
}
.title {
width: 100%;
padding: 20rpx 0 0 30rpx;
display: flex;
align-items: flex-end;
.text {
font-size: 28rpx;
font-weight: 500;
color: #000000;
padding-left: 20rpx;
}
image {
width: 35rpx;
height: 35rpx;
}
}
}
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 852 B

BIN
static/pagesB/zixun.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B