diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-available.png b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-available.png new file mode 100644 index 00000000..e7a8468a Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-available.png differ diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-disabled.png b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-disabled.png new file mode 100644 index 00000000..076d6d0f Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-disabled.png differ diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-mine.png b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-mine.png new file mode 100644 index 00000000..be5c56e1 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-mine.png differ diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-occupied.png b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-occupied.png new file mode 100644 index 00000000..3f367597 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-occupied.png differ diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-selected.png b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-selected.png new file mode 100644 index 00000000..25979f34 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-selected.png differ diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-status-icon.png b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-status-icon.png new file mode 100644 index 00000000..f23cf617 Binary files /dev/null and b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-status-icon.png differ diff --git a/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-status-icon.svg b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-status-icon.svg new file mode 100644 index 00000000..bc20f7de --- /dev/null +++ b/src/main/resources/static/assets/mobile/img/democratic/teachercongress/seat-status-icon.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html index 7a3f24f7..0ef41102 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html @@ -1005,7 +1005,7 @@ layout("/layouts/platform_h5.html"){ width: 100%; height: 100%; object-fit: contain; - transform: scale(1.45); + transform: scale(1.6); transform-origin: center; } @@ -1126,32 +1126,79 @@ layout("/layouts/platform_h5.html"){ } .mobile-bottom-panel { - padding: 11px 14px calc(11px + env(safe-area-inset-bottom)); - border-top: 1px solid #edf0f5; + padding: 0 0 env(safe-area-inset-bottom); + border-top: 0; background: #fff; - box-shadow: 0 -5px 18px rgba(36, 55, 80, .08); + box-shadow: none; } .mobile-bottom-panel.is-empty { - padding-top: 12px; + padding-top: 0; } .mobile-bottom-selected { display: grid; - grid-template-columns: 105px minmax(0, 1fr); - gap: 12px; + grid-template-columns: 42px max-content 1px minmax(0, 1fr); + gap: 9px; align-items: center; + padding: 15px 9px; + background: #fff; + border: 1px solid #e8eef7; + border-radius: 0; + box-shadow: 0 5px 15px rgba(49, 93, 157, .12); } .mobile-bottom-summary { - display: block; - min-height: auto; + display: flex; + height: 50px; margin: 0; + padding: 5px 8px; + align-items: center; + box-sizing: border-box; color: #202b3c; font-size: 15px; + background: #fff; + border: 1px solid #e8eef7; + border-radius: 23px; + box-shadow: 0 4px 12px rgba(51, 103, 178, .1); white-space: nowrap; } + .mobile-seat-status-icon { + width: 42px; + height: 42px; + object-fit: contain; + } + + .mobile-seat-status-copy { + display: flex; + min-width: 0; + flex-direction: column; + align-items: flex-start; + justify-content: center; + text-align: left; + } + + .mobile-seat-status-value { + color: #1677ff; + font-size: 15px; + font-weight: 600; + line-height: 20px; + } + + .mobile-seat-status-tag { + margin-bottom: 1px; + color: #7d899a; + font-size: 10px; + line-height: 14px; + } + + .mobile-seat-status-divider { + width: 1px; + height: 28px; + background: #dfe5ed; + } + .mobile-bottom-summary strong { margin: 0 4px; color: #1677ff; @@ -1160,12 +1207,13 @@ layout("/layouts/platform_h5.html"){ } .mobile-confirm-button { - height: 46px; + height: 38px; border: 0; - border-radius: 8px; - background: #1677ff; - font-size: 16px; - font-weight: 500; + border-radius: 9px; + background: linear-gradient(90deg, #458df8 0%, #0869f5 100%); + box-shadow: none; + font-size: 14px; + font-weight: 600; } .mobile-confirm-button.van-button--disabled { @@ -1174,12 +1222,13 @@ layout("/layouts/platform_h5.html"){ opacity: 1; } - .seat-confirm-sheet { - border-radius: 18px 18px 0 0; + .seat-confirm-dialog { + width: calc(100% - 48px); + border-radius: 12px; } - .seat-confirm-content { - padding: 21px 18px calc(18px + env(safe-area-inset-bottom)); + .seat-confirm-dialog .seat-confirm-content { + padding: 21px 18px 18px; } .seat-confirm-header { @@ -1216,17 +1265,28 @@ layout("/layouts/platform_h5.html"){ .seat-confirm-submit { height: 46px; + margin-top: 18px; border: 0; border-radius: 8px; - background: #ff3344; + background: #69aefc; font-size: 16px; font-weight: 600; } @media (max-width: 375px) { .mobile-bottom-selected { - grid-template-columns: 95px minmax(0, 1fr); - gap: 9px; + grid-template-columns: 38px max-content 1px minmax(0, 1fr); + gap: 8px; + } + + .mobile-bottom-summary { + padding: 5px 6px; + font-size: 14px; + } + + .mobile-seat-status-icon { + width: 38px; + height: 38px; } .mobile-seat { @@ -1248,7 +1308,8 @@ layout("/layouts/platform_h5.html"){
{{ meeting.name }}
-
{{ formatMeetingRange(meeting) }}
+
开始时间:{{ formatMeetingTime(meeting.startTime) }}
+
结束时间:{{ formatMeetingTime(meeting.endTime) }}
{{ meeting.address || '会议地点待定' }}
会议主席台 @@ -1337,68 +1398,23 @@ layout("/layouts/platform_h5.html"){
- - - - - - + 可选
- - - - - - + 占用
- - - - - - + 选中
- - - - - - - 我的 + + 已选
- - - - - - + 禁用
@@ -1426,13 +1442,7 @@ layout("/layouts/platform_h5.html"){ class="mobile-seat" :class="[seat ? getSeatClass(seat) : 'seat-placeholder', {'has-aisle': seatIndex + 1 === aisleStartColumn}]" @click="seat && selectSeat(seat)"> - - - - - - - +
@@ -1444,32 +1454,33 @@ layout("/layouts/platform_h5.html"){
-
- - -
+ 座位 + + {{ myCurrentSeat ? '已选座位' : '座位状态' }} + + + + + + - +
- +
- 已选座位 - + 确认{{ myCurrentSeat ? '换座' : '选座' }} {{ selectedSeat.rowNumber }}排{{ selectedSeat.colNumber }}列吗?
-
- {{ selectedSeat.rowNumber }}排{{ selectedSeat.colNumber }}座 -
-
请确认座位信息
- 确认选座
-
+