Skip to content

F
frontend-h5
Commit 5c6625f6 authored by gengchunlei's avatar gengchunlei
Browse files
Options

Merge branch 'chronic-master' of… 

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master
parents e53e4755 3a9d20e1
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 4 deletions
src/assets/icons/doctor/doc-camera.svg 0 → 100644
View file @ 5c6625f6
<svg width="17" height="15" viewBox="0 0 17 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.6699 2.6466H8.49851C8.49851 1.71832 7.74259 0.962402 6.81432 0.962402H5.69253C4.76426 0.962402 4.00834 1.71832 4.00834 2.6466H2.33019C1.40192 2.6466 0.645996 3.40252 0.645996 4.33079V13.3051C0.645996 14.2334 1.40192 14.9893 2.33019 14.9893H14.6699C15.5981 14.9893 16.354 14.2334 16.354 13.3051V4.33079C16.351 3.40252 15.5951 2.6466 14.6699 2.6466ZM8.49851 12.1833C6.64197 12.1833 5.13315 10.6745 5.13315 8.81794C5.13315 6.9614 6.64197 5.45258 8.49851 5.45258C10.3551 5.45258 11.8639 6.9614 11.8639 8.81794C11.8639 10.6745 10.3551 12.1833 8.49851 12.1833ZM13.8262 6.57436C13.3606 6.57436 12.9857 6.1964 12.9857 5.73378C12.9857 5.27115 13.3636 4.89319 13.8262 4.89319C14.2919 4.89319 14.6668 5.27115 14.6668 5.73378C14.6668 6.1964 14.2919 6.57436 13.8262 6.57436Z" fill="#575B66"/>
</svg>
src/assets/icons/doctor/doc-delete.svg 0 → 100644
View file @ 5c6625f6
<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.8334 2.68888H14.1667V4.02222H12.8334V12.6889C12.8334 12.8657 12.7631 13.0353 12.6381 13.1603C12.5131 13.2853 12.3435 13.3556 12.1667 13.3556H2.83337C2.65656 13.3556 2.48699 13.2853 2.36197 13.1603C2.23695 13.0353 2.16671 12.8657 2.16671 12.6889V4.02222H0.833374V2.68888H4.16671V0.688883C4.16671 0.512072 4.23695 0.342503 4.36197 0.217479C4.48699 0.0924547 4.65656 0.0222168 4.83337 0.0222168H10.1667C10.3435 0.0222168 10.5131 0.0924547 10.6381 0.217479C10.7631 0.342503 10.8334 0.512072 10.8334 0.688883V2.68888ZM11.5 4.02222H3.50004V12.0222H11.5V4.02222ZM5.50004 6.02222H6.83337V10.0222H5.50004V6.02222ZM8.16671 6.02222H9.50004V10.0222H8.16671V6.02222ZM5.50004 1.35555V2.68888H9.50004V1.35555H5.50004Z" fill="#8C8C8C"/>
</svg>
src/assets/icons/doctor/doc-left-1.svg 0 → 100644
View file @ 5c6625f6
<svg width="9" height="15" viewBox="0 0 9 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.5 13.689L1.5 7.68896L7.5 1.68896" stroke="#262626" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
src/assets/icons/doctor/doc-search.svg 0 → 100644
View file @ 5c6625f6
<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="7.5" cy="7" r="6.2" stroke="#595959" stroke-width="1.6"/>
<path d="M15.5 15L12.5 12" stroke="#595959" stroke-width="1.6" stroke-linecap="round"/>
</svg>
src/doctor/followUp/search/Search.vue 0 → 100644
View file @ 5c6625f6
<template>
<div class="flex flex-col pt-2 search">
<div class="flex items-center px-4 pb-1 shrink-0 top-bar">
<span class="shrink-0 pr-2 back-bt">
<doc-icon type="doc-left-1" style="color: #262626"/>
</span>
<div class="grow flex items-center px-2 input-box">
<doc-icon type="doc-search" class="shrink-0" style="color: #595959"/>
<van-field v-model="digit" type="digit" placeholder="请输入身份证号查询" />
<doc-icon type="doc-camera" class="shrink-0 mr-3" style="color: #575B66"/>
<van-button type="primary" size="mini" class="shrink-0" @click="search">搜 索</van-button>
</div>
</div>
<div class="grow px-4 overflow-y-auto">
<div class="pt-3" v-if="state === 1">
<div class="flex justify-between items-end pt-2 pb-1">
<span class="text-16 font-semibold">搜索历史</span>
<span class="flex items-center">
<doc-icon type="doc-delete" style="color: #8c8c8c"/>
<span class="ml-1" style="color: #595959">清除历史</span>
</span>
</div>
<div class="flex flex-wrap mt-4 history-list">
<span>152525*******47541</span>
<span>152525*******47541</span>
<span>152525*******47541</span>
<span>152525*******47541</span>
</div>
</div>
<div class="pt-2" v-if="state === 2">
<div class="text-12" style="color: #8c8c8c">查找结果：</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
state: 2
}
},
methods: {
search() {
}
}
}
</script>
<style lang="less" scoped>
.search {
height: 100vh;
}
.top-bar {
border-bottom: 1px solid #e5e5e5;
.back-bt {
flex-basis: 24px;
text-align: center;
}
.input-box {
background-color: #FAFAFA;
border: 1px solid #F5F5F5;
border-radius: 4px;
.svg-icon {
font-size: 16px;
}
.van-cell {
font-size: 14px;
padding: 4px 10px;
background: transparent;
&::after {
display: none;
}
}
.van-button {
font-size: 14px;
line-height: 20px;
padding: 0 8px;
}
}
}
.history-list {
gap: 10px;
>span {
border-radius: 34px;
background-color: #EFF2F7;
padding: 2px 12px;
}
}
</style>
src/router/index.js
View file @ 5c6625f6
...@@ -26,22 +26,27 @@ const routes = [ ...@@ -26,22 +26,27 @@ const routes = [
{ {
path: '/doctor', path: '/doctor',
name: 'doctor', name: 'doctor',
component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/Doctor'), component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/Doctor'),
children: [ children: [
{ {
path: 'followUp/list', path: 'followUp/list',
name: 'followUp-list', name: 'followUp-list',
component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/followUp/List') component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/followUp/List')
},
{
path: 'followUp/search',
name: 'followUp-search',
component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/followUp/search/Search.vue')
}, },
{ {
path: 'followUp/generalFU/detail', path: 'followUp/generalFU/detail',
name: 'followUp-generalFU-detail', name: 'followUp-generalFU-detail',
component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/followUp/generalFU/detail/Detail') component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/followUp/generalFU/detail/Detail')
}, },
{ {
path: 'followUp/generalFU/add', path: 'followUp/generalFU/add',
name: 'followUp-generalFU-add', name: 'followUp-generalFU-add',
component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/followUp/generalFU/form/Index') component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/followUp/generalFU/form/Index')
}, },
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment