Merge remote-tracking branch 'origin/dev' into dev

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue

@@ -2,37 +2,16 @@
     <div class="home app_content">
         <!-- 顶部蓝色背景区域 -->
         <div class="header-bg">
-            <div class="orbit-line"></div>
-            <div class="orbit-line"></div>
-            <div class="cityscape"></div>
-
-            <!-- 盾牌图标 -->
-            <div class="shield-wrapper">
-                <div class="shield">
-                    <div class="shield-icon">
-                        <div class="shield-text">执法<br>监督</div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- 企业端标签 -->
-            <div class="enterprise-tag">企业端</div>
-
-            <!-- 标语 -->
-            <div class="slogan">
-                <span class="white-text">执法受监督</span>&nbsp;
-                <span class="gold-text">入企须扫码</span>
-            </div>
+            <img src="@/assets/images/logo_top.png" class="logo_top-img" alt="" />
+            <img src="@/assets/images/label_qyd.png" class="label_qyd-img" alt="" />
+            <img src="@/assets/images/slogan_top.png" class="slogan_top-img" alt="" />
         </div>
 
         <!-- 内容区域 -->
         <div class="content-area">
             <!-- 通知栏 -->
             <div class="notice-bar">
-                <svg class="notice-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                    <path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/>
-                    <path d="M13.73 21a2 2 0 0 1-3.46 0"/>
-                </svg>
+                <img src="@/assets/images/icon_notice.png" class="notice-icon" alt="" />
                 <span class="notice-text">暂无新通知</span>
             </div>
 
@@ -52,21 +31,7 @@
             <div class="supervision-card" @click="showEnterpriseQRCode">
                 <h3>执法监督码</h3>
                 <div class="qr-icon-wrap">
-                    <!-- 左侧大QR图标 -->
-                    <div class="qr-main">
-                        <div class="qr-grid">
-                            <span v-for="i in 25" :key="i"></span>
-                        </div>
-                        <div class="qr-check">
-                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3">
-                                <polyline points="20 6 9 17 4 12"/>
-                            </svg>
-                        </div>
-                    </div>
-                    <!-- 右侧小QR装饰 -->
-                    <div class="qr-small">
-                        <span v-for="i in 25" :key="i"></span>
-                    </div>
+                    <img src="@/assets/images/icon_jdm.jpg" class="qr-image" alt="" />
                 </div>
             </div>
 
@@ -76,44 +41,16 @@
                 <div class="info-card" @click="toEnforcementRegistrationListView">
                     <h4>历史执法信息</h4>
                     <div class="card-icon">
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                            <rect x="3" y="3" width="18" height="18" rx="2"/>
-                            <line x1="7" y1="8" x2="17" y2="8"/>
-                            <line x1="7" y1="12" x2="14" y2="12"/>
-                            <line x1="7" y1="16" x2="11" y2="16"/>
-                        </svg>
-                        <div class="card-icon-check">
-                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3">
-                                <polyline points="20 6 9 17 4 12"/>
-                            </svg>
-                        </div>
+                        <img src="@/assets/images/icon_zfxx.jpg" class="card-icon-img" alt="" />
                     </div>
-                    <!-- 放大镜装饰 -->
-                    <svg class="bg-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
-                        <circle cx="11" cy="11" r="8"/><path d="m21 21-4.35-4.35"/>
-                    </svg>
                 </div>
 
                 <!-- 执法案件信息 -->
                 <div class="info-card" @click="toEnforcementCaseInfoView">
                     <h4>执法案件信息</h4>
                     <div class="card-icon">
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                            <path d="M4 4h16v16H4z" rx="2"/>
-                            <path d="M8 2v4M16 2v4"/>
-                            <line x1="7" y1="10" x2="17" y2="10"/>
-                            <line x1="7" y1="14" x2="13" y2="14"/>
-                        </svg>
-                        <div class="card-icon-check">
-                            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3">
-                                <polyline points="20 6 9 17 4 12"/>
-                            </svg>
-                        </div>
+                        <img src="@/assets/images/icon_ajxx.jpg" class="card-icon-img" alt="" />
                     </div>
-                    <!-- 星星装饰 -->
-                    <svg class="bg-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
-                        <polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/>
-                    </svg>
                 </div>
             </div>
         </div>
@@ -128,10 +65,10 @@
 <script setup name="enterpriseHome">
 import * as w6s from 'szient-js-sdk';
 import sha1 from 'crypto-js/sha1';
-import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthMock, siqCode} from '../../../api/enterprise';
+import { getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthMock, siqCode } from '../../../api/enterprise';
 import 'vant/es/toast/style';
 
-const {useCommon} = $globalStore;
+const { useCommon } = $globalStore;
 const router = useRouter();
 const isLoading = ref(true);
 
@@ -205,7 +142,7 @@ const generateRandomNumber = () => {
 }
 
 const getEnterpriseMerchant = (enterpriseNum, phoneNumber) => {
-    getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNum, merchantTel: phoneNumber}, success => {
+    getEnterpriseMerchantAuthorization({ enterpriseNumber: enterpriseNum, merchantTel: phoneNumber }, success => {
         if (success.data != null && success.data.length > 0) {
             useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
         }
@@ -253,8 +190,8 @@ onMounted(() => {
         // 最终还需要转成全小写
         const signature = sha1(str).toString().toLowerCase();
 
-        if(!access_key || !access_secret){
-            console.log("获取深i企认证信息错误!","access_key 或 access_secret 为空");
+        if (!access_key || !access_secret) {
+            console.log("获取深i企认证信息错误!", "access_key 或 access_secret 为空");
         }
 
         // ========== 模拟深i企登录：使用 w6s.init mock 模式 ==========
@@ -272,11 +209,11 @@ onMounted(() => {
                 debug: true,
                 mockData: {
                     config: {
-                        config: () => ({success: true})
+                        config: () => ({ success: true })
                     },
                     szient: {
                         getAuthCode: () => ({
-                            result: {result: {code: 'MOCK_SIQ_' + userInfo.userId}}
+                            result: { result: { code: 'MOCK_SIQ_' + userInfo.userId } }
                         })
                     }
                 }
@@ -291,7 +228,7 @@ onMounted(() => {
                 .then((res) => {
                     console.log("模拟认证成功, code:", res.result.result.code);
                     return new Promise((resolve, reject) => {
-                        getSiqLoginAuthMock({userId: userInfo.userId}, resolve, reject);
+                        getSiqLoginAuthMock({ userId: userInfo.userId }, resolve, reject);
                     });
                 })
                 .then((success) => {
@@ -330,7 +267,7 @@ onMounted(() => {
                     console.log(res)
                     console.log("认证", res);
                     console.log("code: " + res.result.result.code);
-                    getSiqLoginAuth({code: res.result.result.code}, success => {
+                    getSiqLoginAuth({ code: res.result.result.code }, success => {
                         useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
                         useCommon.SET_USER_ID(success.data.userId);
                         useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
@@ -359,7 +296,7 @@ onMounted(() => {
         });
 
     });
-    const {VITE_BASE_URL, access_key, access_secret} = import.meta.env;
+    const { VITE_BASE_URL, access_key, access_secret } = import.meta.env;
     console.log(VITE_BASE_URL);
     const apiUrl = ref(import.meta.env.accessKey);
     console.log(access_key);
@@ -379,163 +316,44 @@ onMounted(() => {
 
 /* ===== 顶部蓝色背景区域 ===== */
 .header-bg {
-    background: linear-gradient(180deg, #2b7de9 0%, #5ba3f5 40%, #a0cdf8 70%, #dceefb 90%, #eef5ff 100%);
-    padding: 20px 20px 20px;
-    text-align: center;
     position: relative;
     overflow: hidden;
     flex-shrink: 0;
-
-    &::after {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        height: 80px;
-        background: linear-gradient(180deg, transparent, rgba(255,255,255,0.3));
-    }
-}
-
-/* 城市天际线装饰 */
-.cityscape {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 120px;
-    opacity: 0.15;
-    background: linear-gradient(0deg, rgba(255,255,255,0.5) 0%, transparent 100%);
-
-    &::before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        left: 5%;
-        width: 8%;
-        height: 60px;
-        background: rgba(255,255,255,0.4);
-        border-radius: 2px 2px 0 0;
-    }
-
-    &::after {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        right: 15%;
-        width: 6%;
-        height: 100px;
-        background: rgba(255,255,255,0.3);
-        border-radius: 2px 2px 0 0;
-        box-shadow:
-            -30px 20px 0 rgba(255,255,255,0.25),
-            -55px 35px 0 rgba(255,255,255,0.2),
-            30px 40px 0 rgba(255,255,255,0.2),
-            60px 15px 0 rgba(255,255,255,0.15);
-    }
-}
-
-/* 轨道线装饰 */
-.orbit-line {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 200px;
-    height: 120px;
-    border: 1.5px solid rgba(255,255,255,0.2);
-    border-radius: 50%;
-    z-index: 0;
-
-    &:nth-child(2) {
-        width: 260px;
-        height: 155px;
-        border-color: rgba(255,255,255,0.12);
-    }
-}
-
-/* 盾牌图标 */
-.shield-wrapper {
-    position: relative;
-    z-index: 1;
-    margin-bottom: 8px;
-}
-
-.shield {
-    display: inline-block;
-    width: 90px;
-    height: 100px;
-    position: relative;
-}
-
-.shield-icon {
-    width: 90px;
-    height: 100px;
-    background: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%);
-    clip-path: polygon(50% 0%, 100% 20%, 100% 65%, 50% 100%, 0% 65%, 0% 20%);
+    line-height: 0;
+    background: url('@/assets/images/bg_sz_top.png') center center no-repeat, linear-gradient(180deg, #fff 0%, #def0ff 20%, #60baff 100%);
+    background-size: cover;
+    width: 100%;
+    height: 200px;
     display: flex;
+    flex-direction: column;
     align-items: center;
     justify-content: center;
-    flex-direction: column;
-    color: white;
-    font-size: 18px;
-    font-weight: bold;
-    letter-spacing: 4px;
-    text-shadow: 0 1px 3px rgba(0,0,0,0.2);
-
-    &::before {
-        content: '';
-        position: absolute;
-        inset: 3px;
-        background: linear-gradient(135deg, #60a5fa 0%, #2563eb 100%);
-        clip-path: polygon(50% 2%, 98% 21%, 98% 64%, 50% 98%, 2% 64%, 2% 21%);
-        z-index: -1;
-    }
-}
-
-.shield-text {
-    line-height: 1.3;
-    margin-top: 12px;
-}
-
-/* 企业端标签 */
-.enterprise-tag {
-    display: inline-block;
-    background: linear-gradient(135deg, #2563eb, #1d4ed8);
-    color: white;
-    padding: 5px 22px;
-    border-radius: 4px;
-    font-size: 15px;
-    font-weight: 500;
-    letter-spacing: 2px;
-    margin: 6px 0 12px;
-    position: relative;
-    z-index: 1;
-}
 
-/* 标语 */
-.slogan {
-    position: relative;
-    z-index: 1;
-    font-size: 22px;
-    font-weight: bold;
-    letter-spacing: 3px;
+    .logo_top-img {
+        width: 100%;
+        height: 200px;
+        display: block;
+    }
 
-    .white-text {
-        color: #ffffff;
-        text-shadow: 0 1px 4px rgba(0,0,0,0.15);
+    .label_qyd-img {
+        height: 30px;
+        display: block;
+        position: absolute;
+        top: 126px;
     }
 
-    .gold-text {
-        color: #fbbf24;
-        text-shadow: 0 1px 4px rgba(0,0,0,0.15);
+    .slogan_top-img {
+        width: 200px;
+        height: 30px;
+        position: absolute;
+        top: 160px;
     }
 }
 
 /* ===== 内容区域 ===== */
 .content-area {
     padding: 0 16px;
-    margin-top: -10px;
+    margin-top: 10px;
     position: relative;
     z-index: 2;
     flex: 1;
@@ -546,20 +364,21 @@ onMounted(() => {
 /* 通知栏 */
 .notice-bar {
     background: #fffbe6;
-    border-radius: 25px;
-    padding: 12px 20px;
+    border-radius: 10px;
+    padding: 8px 10px;
     margin-bottom: 14px;
     display: flex;
     align-items: center;
-    box-shadow: 0 2px 12px rgba(0,0,0,0.04);
-    border: 1px solid rgba(255,220,120,0.4);
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.04);
+    border: 1px solid rgba(255, 220, 120, 0.4);
+    box-sizing: border-box;
 
     .notice-icon {
         width: 18px;
         height: 18px;
         min-width: 18px;
         margin-right: 10px;
-        color: #faad14;
+        object-fit: contain;
     }
 
     .notice-text {
@@ -574,7 +393,7 @@ onMounted(() => {
     overflow: hidden;
     margin-bottom: 14px;
     position: relative;
-    box-shadow: 0 2px 12px rgba(0,0,0,0.06);
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.06);
 }
 
 .banner-inner {
@@ -617,27 +436,17 @@ onMounted(() => {
 
 /* 执法监督码卡片 */
 .supervision-card {
-    background: linear-gradient(135deg, #eaf3ff 0%, #d6eaff 50%, #c0dbf8 100%);
+    background: url('../../../assets/images/bg_jdm.jpg') center center no-repeat;
+    background-size: 100% 100%;
     border-radius: 16px;
     padding: 18px 20px;
     margin-bottom: 14px;
     position: relative;
     overflow: hidden;
-    box-shadow: 0 2px 12px rgba(0,0,0,0.05);
-
-    &::after {
-        content: '';
-        position: absolute;
-        top: -20px;
-        right: -20px;
-        width: 180px;
-        height: 180px;
-        background: radial-gradient(circle, rgba(59,130,246,0.08), transparent 70%);
-        border-radius: 50%;
-    }
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
 
     h3 {
-        font-size: 17px;
+        font-size: 14px;
         color: #1a1a2e;
         font-weight: 600;
         margin-bottom: 6px;
@@ -646,78 +455,15 @@ onMounted(() => {
 
     .qr-icon-wrap {
         display: flex;
-        align-items: flex-end;
-        justify-content: space-between;
-    }
-}
-
-.qr-main {
-    width: 100px;
-    height: 100px;
-    background: linear-gradient(135deg, #3b82f6, #2563eb);
-    border-radius: 16px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    box-shadow: 0 4px 15px rgba(37,99,235,0.3);
-
-    .qr-grid {
-        width: 60px;
-        height: 60px;
-        display: grid;
-        grid-template-columns: repeat(5, 1fr);
-        grid-template-rows: repeat(5, 1fr);
-        gap: 3px;
-
-        span {
-            background: rgba(255,255,255,0.85);
-            border-radius: 2px;
-
-            &:nth-child(3n) {
-                background: rgba(255,255,255,0.4);
-            }
-        }
-    }
-}
-
-.qr-check {
-    position: absolute;
-    bottom: -4px;
-    right: -4px;
-    width: 32px;
-    height: 32px;
-    background: linear-gradient(135deg, #60a5fa, #3b82f6);
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 3px solid #eaf3ff;
-
-    svg {
-        width: 16px;
-        height: 16px;
-        color: white;
+        align-items: center;
+        justify-content: flex-start;
     }
-}
 
-.qr-small {
-    width: 65px;
-    height: 65px;
-    opacity: 0.35;
-    display: grid;
-    grid-template-columns: repeat(5, 1fr);
-    grid-template-rows: repeat(5, 1fr);
-    gap: 2px;
-    margin-right: 10px;
-
-    span {
-        background: #6b7280;
-        border-radius: 1px;
-
-        &:nth-child(even) {
-            background: #9ca3af;
-        }
+    .qr-image {
+        width: 100px;
+        height: 100px;
+        object-fit: contain;
+        border-radius: 16px;
     }
 }
 
@@ -736,10 +482,10 @@ onMounted(() => {
     position: relative;
     overflow: hidden;
     min-height: 90px;
-    box-shadow: 0 2px 12px rgba(0,0,0,0.05);
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
 
     h4 {
-        font-size: 15px;
+        font-size: 14px;
         color: #1a1a2e;
         font-weight: 600;
         margin-bottom: 4px;
@@ -751,50 +497,19 @@ onMounted(() => {
     .card-icon {
         width: 52px;
         height: 52px;
-        background: linear-gradient(135deg, #3b82f6, #2563eb);
         border-radius: 14px;
         display: flex;
         align-items: center;
         justify-content: center;
         position: relative;
-        box-shadow: 0 4px 12px rgba(37,99,235,0.25);
+        overflow: hidden;
 
-        svg {
-            width: 26px;
-            height: 26px;
-            color: white;
+        .card-icon-img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
         }
     }
-
-    .bg-icon {
-        position: absolute;
-        bottom: 8px;
-        right: 8px;
-        width: 50px;
-        height: 50px;
-        opacity: 0.15;
-        color: #6b7280;
-    }
-}
-
-.card-icon-check {
-    position: absolute;
-    bottom: -3px;
-    right: -3px;
-    width: 22px;
-    height: 22px;
-    background: linear-gradient(135deg, #60a5fa, #3b82f6);
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 2px solid #eaf3ff;
-
-    svg {
-        width: 11px;
-        height: 11px;
-        color: white;
-    }
 }
 
 /* ===== 底部导航 ===== */

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue

@@ -495,11 +495,14 @@ onMounted(() => {
 :deep(.message-tabs .van-tabs__wrap) {
     background: #fff;
     border-radius: 12px 12px 0 0;
+    border-top-left-radius: 0.68rem;
+    border-top-right-radius: 0.68rem;
 }
 
 :deep(.message-tabs .van-tab) {
     font-size: 15px;
     color: #999;
+    width: 100%;
 }
 
 :deep(.message-tabs .van-tab--active) {
@@ -509,8 +512,8 @@ onMounted(() => {
 
 :deep(.message-tabs .van-tabs__line) {
     background: #2b7de9;
-    width: 24px;
-    height: 3px;
+    width: 40%;
+    height: 2px;
     border-radius: 2px;
 }