diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 394660d..456d9e2 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -46,8 +46,6 @@ body { background-color: #fff; @include base.center-wrapper; //@include base.padding; - @include base.border-radius; - @include base.box-shadow; } .space { diff --git a/src/components/common/Calendar.vue b/src/components/common/Calendar.vue index 1782336..aef8ee5 100644 --- a/src/components/common/Calendar.vue +++ b/src/components/common/Calendar.vue @@ -46,17 +46,17 @@ const generateCalendarData = ( // 当前月日期 if ((isFirstWeek && day >= firstDayIndex) || (!isFirstWeek && dayCounter <= daysInMonth)) { const isToday = dayCounter === currentDay && month === currentMonth && year === currentYear; - weekDays.push({ day: dayCounter, isCurrentMonth: true, isCurrentDay: isToday }); + weekDays.push({day: dayCounter, isCurrentMonth: true, isCurrentDay: isToday}); dayCounter++; } // 前月日期 else if (isFirstWeek) { const prevDay = daysInPrevMonth - firstDayIndex + day + 1; - weekDays.push({ day: prevDay, isCurrentMonth: false, isCurrentDay: false }); + weekDays.push({day: prevDay, isCurrentMonth: false, isCurrentDay: false}); } // 下月日期 else { - weekDays.push({ day: nextMonthDayCounter, isCurrentMonth: false, isCurrentDay: false }); + weekDays.push({day: nextMonthDayCounter, isCurrentMonth: false, isCurrentDay: false}); nextMonthDayCounter++; } } @@ -74,9 +74,79 @@ console.log(calendarData); \ No newline at end of file diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue index 3b0ebfe..7947347 100644 --- a/src/components/settings/MemberEdit.vue +++ b/src/components/settings/MemberEdit.vue @@ -19,11 +19,6 @@ - - - - - diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue index 1f33734..ed62df9 100644 --- a/src/views/registration/index.vue +++ b/src/views/registration/index.vue @@ -2,57 +2,65 @@
-
- +
+ + +
-
-
-
- -
-
- + +
+
+
+ +
+
+
- +
+
+
+ +
+
-
-
-
- -
-
+
@@ -66,6 +74,8 @@ import Edit from "@/components/registration/Edit.vue"; import List from "@/components/registration/List.vue"; import {post} from "@/utils/request"; import {formatDate, getToday, formatDateArray} from "@/utils/dateUtils.ts"; +import Calendar from "@/components/common/Calendar.vue"; +import Panel from "@/components/common/Panel.vue"; const isShowNum = ref(0) const roleList = ref([]) @@ -77,11 +87,11 @@ onMounted(() => { const keyword = ref(''); const initDoctor = () => { - let query={ + let query = { keyword: keyword.value, - role:1 + role: 1 } - post('organization/member/search',{query:query}).then((res: any) => { + post('organization/member/search', {query: query}).then((res: any) => { roleList.value = res }) } @@ -125,7 +135,7 @@ const openDialog = (item: any) => { editRef.value?.init() }) } -const close=()=>{ +const close = () => { id.value = null getPatientList() } @@ -144,19 +154,35 @@ const close=()=>{ .left { height: 100%; width: 319px; - background: #fff; + display: flex; + flex-direction: column; + + .left-top { + height: 380px; + } + + .left-bottom { + flex: 1; + min-height: 0; + margin-top: 20px; + } li { height: 50px; display: flex; + font-size: 14px; justify-content: space-between; align-items: center; padding: 0 10px; border-radius: 5px; - cursor: pointer; .name { - color: #000000; + color: #999; + + } + + .section_name { + color: #999; } .btn { @@ -164,53 +190,59 @@ const close=()=>{ border: 1px solid #b9b9ba; padding: 5px; border-radius: 3px; + cursor: pointer; + + &:hover { + color: #fff; + background: #4D6DE4; + } } - .active_name { - color: #fff; - } - - .active_btn { - color: #fff; - background: #67C23A; - border: none; - } } - .active { - background-color: #5078c8; - } - .search{ + .search { margin-top: 10px; } - .content_list{ + + .content_list { margin-top: 10px; } } .right { + margin-left: 20px; flex: 1; - padding-left: 20px; - display: flex; - flex-direction: column; + height: 100%; - .middle { - flex: 1; - min-height: 0; - background: #fff; + .right-content { + padding-left: 20px; display: flex; flex-direction: column; + height: 100%; - .date { - margin: 30px auto 0; - height: 60px; + .top { + height: 40px; } - .list { + .middle { flex: 1; + min-height: 0; + background: #fff; + display: flex; + flex-direction: column; + + .date { + margin: 30px auto 0; + height: 60px; + } + + .list { + flex: 1; + } } + } .bottom {