diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java index 331fbf25..b829cf46 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCarouselBannerController.java @@ -47,6 +47,7 @@ public class AppEnfCarouselBannerController extends BaseController { if (bo.getTargetPlatforms() == null || bo.getTargetPlatforms().isEmpty()) { bo.setTargetPlatforms(Arrays.asList(0, 2)); } + bo.setStatus(2L);//状态 1-待发布 2-已发布 3-已下架 后续加入枚举 return enforcementCarouselBannerService.queryPageList(bo, pageQuery); } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/nos/off_site_bottom_icon.png b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/nos/off_site_bottom_icon.png new file mode 100644 index 00000000..83c25090 Binary files /dev/null and b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/nos/off_site_bottom_icon.png differ diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/nos/tab_bar_bg.png b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/nos/tab_bar_bg.png new file mode 100644 index 00000000..4a491bde Binary files /dev/null and b/zdxt-web-client/zdxt-efcode-enforcement-app/src/assets/images/nos/tab_bar_bg.png differ diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue index 27c8eec8..8264579b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue @@ -1,13 +1,15 @@ @@ -16,6 +18,8 @@ import { useRouter } from 'vue-router'; import { onMounted } from 'vue'; import { getMessageUnreadCount } from '@/api/enforcement/index'; +import nosIcon from '@/assets/images/nos/off_site_bottom_icon.png'; +import tabBarBg from '@/assets/images/nos/tab_bar_bg.png'; const props = defineProps({ active: { @@ -39,8 +43,7 @@ const tabs = [ key: "nos", label: "非现场", route: "/enforcement/nos", - viewBox: "10 6 60 60", - path: '' + imgSrc: nosIcon }, // { key: 'query', label: '查询', route: '/enforcement/query', // path: '' }, @@ -85,12 +88,13 @@ onMounted(() => { .footer-bar { flex-shrink: 0; display: flex; - align-items: center; + align-items: flex-end; justify-content: space-around; - background: #fff; - padding: 8px 0; + background: url(~@/assets/images/nos/tab_bar_bg.png) no-repeat center top; + background-size: 100% auto; + padding: 0; padding-bottom: calc(8px + env(safe-area-inset-bottom)); - box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.06); + height: 80px; } .footer-item { @@ -103,12 +107,30 @@ onMounted(() => { font-size: 11px; cursor: pointer; user-select: none; + position: relative; + padding-bottom: 4px; svg { width: 24px; height: 24px; } + &--nos { + flex-shrink: 0; + display: flex; + align-items: flex-start; + justify-content: center; + padding-top: 0; + padding-bottom: 4px; + } + + .footer-icon-img { + width: 86px; + height: 86px; + position: relative; + top: 20px; + } + &--active { color: #2b7de9; } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue index 3b283fd5..9dd0565a 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue @@ -125,6 +125,7 @@ const doLogin = (secretName, secretKey) => { useCommon.SET_ORGAN_NAME(response.data.organName || ""); useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId); useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || ""); + useCommon.SET_HAS_LAW(response.data.lawOfficer || ""); console.log("bureauUnitName", response.data.bureauUnitName); console.log("enforcement login success", useCommon.userId); showNavigatePicker.value = true; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue index ee62fd25..7de9fe84 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByV1System.vue @@ -126,6 +126,7 @@ const doLogin = (secretName, secretKey) => { useCommon.SET_ORGAN_NAME(response.data.organName || ""); useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId); useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || ""); + useCommon.SET_HAS_LAW(response.data.lawOfficer || ""); console.log("bureauUnitName", response.data.bureauUnitName); console.log("enforcement login success", useCommon.userId); showNavigatePicker.value = true;