diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index 6b5ed31..73194f6 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,17 +1,26 @@ @font-face { font-family: "iconfont"; /* Project id 4921806 */ - src: url('iconfont.woff?t=1747274949107') format('woff'), - url('iconfont.ttf?t=1747274949107') format('truetype'); + src: url('iconfont.woff2?t=1747988318985') format('woff2'), + url('iconfont.woff?t=1747988318985') format('woff'), + url('iconfont.ttf?t=1747988318985') format('truetype'); } .iconfont { - font-family: "iconfont", serif !important; + font-family: "iconfont" !important; font-size: 16px; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-qunzutaozhuang:before { + content: "\eac9"; +} + +.icon-jia:before { + content: "\e6a9"; +} + .icon-RectangleCopy:before { content: "\e6a2"; } diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index dd739fc..be1dd0a 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index 357b10f..207812b 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 27d71bb..bfc7774 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -143,6 +143,10 @@ $lighter-color: rgba(#4D6DE4, 0.5); color: #FFF; font-size: 16px; text-align: center; + margin-left: 10px; + &:first-child{ + margin-left: 0; + } &:hover{ background: $lighter-color; } diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index 1f385a8..adb4afc 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -248,8 +248,8 @@ const rules = ref({ phone: [ {required: true, message: '请输入手机号', trigger: 'blur'}, ], - organzationDoctorId: [ - {required: true, message: '请选择医生', trigger: 'blur'}, + organizationDoctorId: [ + {required: true, message: '请选择医生', trigger: 'change'}, ], certType: [ {required: true, message: '请选择证件类型', trigger: 'change'}, diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue index 40618fe..d7e1245 100644 --- a/src/views/inventory/supplier.vue +++ b/src/views/inventory/supplier.vue @@ -33,18 +33,18 @@
- + - + - - - - + + + +
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue index 78c7bb3..b273ab2 100644 --- a/src/views/settings/item.vue +++ b/src/views/settings/item.vue @@ -17,10 +17,22 @@
- 查询 - 重置 - 新建项目 - 组套 + + + 查询 + + + + 重置 + + + + 新建项目 + + + + 组套 +
@@ -119,27 +131,14 @@ const loading= ref(true) background: #fff; display: flex; flex-direction: column; -.title-btn{ - .default-btn{ - margin-right: 24px; - &:last-child{ - margin-right: 0; - } - } - -} .title { display: flex; height: 60px; - align-items: center; justify-content: space-between; .title-search { - padding: 10px; border-radius: 10px; box-sizing: border-box; - margin-top: 10px; - margin-bottom: 10px; display: flex; } diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue index 5ac2caa..fe21471 100644 --- a/src/views/settings/log.vue +++ b/src/views/settings/log.vue @@ -13,7 +13,7 @@ /> - 查询 + 查询
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue index 148ab4d..7489a4d 100644 --- a/src/views/settings/member.vue +++ b/src/views/settings/member.vue @@ -25,9 +25,15 @@
- 查询 - 重置 - 新增 + + + 重置 + + 查询 + + + 新增 +
@@ -49,7 +55,7 @@ @@ -71,7 +77,7 @@ />
- +