首页-3

.env.development

@@ -11,9 +11,9 @@ VITE_BASE_URL = "/dev-api"
 VITE_BASE_MOCK_URL = "/mock-api"
 
 # boot服务端接口路径
-VITE_BASE_SERVER_URL = "http://192.168.101.93:8000"
-# VITE_BASE_SERVER_URL = "http://10.236.2.146:8080/dev-api" # 线上
-# VITE_BASE_SERVER_URL = "http://10.206.20.153:8000" # 青岛港-内网
+# VITE_BASE_SERVER_URL = "http://192.168.101.93:8000"
+VITE_BASE_SERVER_URL = "http://10.236.2.146:8080/dev-api" # 线上 
+# VITE_BASE_SERVER_URL = "http://10.206.20.153:8000" # 青岛港-内网 dns: 10.201.192.1
 # VITE_BASE_SERVER_URL = "http://192.168.43.231:8000" # 热点
 # VITE_BASE_SERVER_URL = "http://192.168.1.133:8000" # 青岛港-7楼
 # 微前端-工作流

src/components/ReplyCard/index.vue

@@ -1,12 +1,12 @@
 <template>
-    <el-card :class="['reply-card', total > 0 && 'header-has-border']" shadow="never">
+    <el-card :class="['reply-card', total > 0 && 'header-has-border', showInput && 'card-has-padding']" shadow="never">
         <template #header>
             <el-button type="primary" link @click="showInput = !showInput">留言
                 <template #icon><el-icon size="16"><tjm-icon-mdi-comment-text-outline /></el-icon></template>
             </el-button>
 
             <div v-show="showInput" class="reply-form">
-                <el-input v-model="messageContent" type="textarea" autosize clearable show-word-limit maxlength="140" placeholder="发布你的留言"></el-input>
+                <el-input v-model="messageContent" type="textarea" clearable autosize show-word-limit maxlength="140" placeholder="发布你的留言"></el-input>
                 <el-button :loading="isSaving" type="primary" :disabled="!messageContent" @click="submit">发布</el-button>
             </div>
         </template>
@@ -23,7 +23,7 @@
         <div class="reply-card__footer">
             <template v-if="total > replyCount">
                 <el-divider></el-divider>
-                <el-button class="text-reverse" type="primary" icon="arrow-right" link>查看全部11条留言</el-button>
+                <el-button class="text-reverse" type="primary" icon="arrow-right" link>查看全部{{ replyTotal }}条留言</el-button>
             </template>
             <template v-else><el-divider v-if="total">已加载全部留言</el-divider></template>
         </div>
@@ -70,6 +70,12 @@ export default {
         }
     },
 
+    computed: {
+        replyTotal() {
+            return (this.replyData && this.replyData.length && (this.total + this.replyData.map(r => r.childrenCount).reduce((p, v) => p + v))) || 0;
+        }
+    },
+
     mounted() {
         this.reloadTree();
     },
@@ -142,10 +148,9 @@ export default {
       align-items: flex-end;
       width: 80%;
       margin-top: calc(var(--el-card-padding) / 2);
-      padding-bottom: calc(var(--el-card-padding) / 2);
 
       .el-button {
-        margin-top: calc(var(--el-card-padding) / 2);
+        margin-top: 18px;
       }
     }
   }
@@ -198,14 +203,20 @@ export default {
       content: '';
       position: absolute;
       bottom: 0;
-      width: 80%;
+      width: calc(100% - 2 * var(--el-card-padding));
       height: 1px;
       background: var(--el-card-border-color);
     }
   }
 
   .el-card__body {
-    padding: calc(var(--el-card-padding) / 2) 10%;
+    padding: calc(var(--el-card-padding) / 2) var(--el-card-padding);
+  }
+}
+
+.card-has-padding.reply-card > :deep {
+  .el-card__header {
+    padding: var(--el-card-padding);
   }
 }
 </style>

src/layout/components/NavBar/index.vue

@@ -48,6 +48,7 @@ const { collapse, layoutStyle } = storeToRefs(settingStore)
 import { useUserStore } from '@/store/user.js'
 const router = useRouter()
 const avatar = ref(useUserStore().userInfo.avatar || "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png");
+layoutStyle.value = "vertical";
 
 function goUserInfo() {
     router.push('/userInfo')

src/store/permission.js

@@ -42,7 +42,6 @@ export const usePermissionStore = defineStore(
 function filterAsyncRouter(asyncRouterMap, httpSave = true) {
     const blackList = ["/system/dataList",
         "/progress", // 进度
-        "/caseShare",
         "/policyShare/message" // 留言
     ]
     const hideList = ["/publicDomain",

src/views/home/index.vue

@@ -115,6 +115,8 @@ export default {
   left: 0;
   right: 0;
   bottom: 0;
+  width: 100%;
+  height: 100%;
 }
 
 .home-container {

src/views/home/policyDetail.vue

@@ -5,7 +5,7 @@
         </template>
 
         <el-collapse v-model="activeNames">
-            <el-collapse-item v-loading="loading" title="政策内容" name="detail">
+            <el-collapse-item class="form-collapse-item" v-loading="loading" title="政策内容" name="detail">
                 <share-form ref="shareForm" mode="detail" @formSuccess="formSuccess" @formError="loading=false"></share-form>
             </el-collapse-item>
             <el-collapse-item title="政策关联" name="link">
@@ -14,8 +14,8 @@
                     <strive-link :docNo="form.docNo" tableHeight="auto"></strive-link>
                 </template>
             </el-collapse-item>
-            <el-collapse-item title="政策留言" name="reply">
-                <!-- <yh-reply-card :refId="$route.query.id"></yh-reply-card> -->
+            <el-collapse-item class="reply-collapse-item" title="政策留言" name="reply">
+                <yh-reply-card :refId="$route.query.id" :replyCount="2" :replyChildrenCount="3"></yh-reply-card>
             </el-collapse-item>
         </el-collapse>
     </el-card>
@@ -78,6 +78,7 @@ export default {
   }
 
   :deep(.el-card__body) {
+    padding-bottom: calc(var(--el-card-padding) + 25px);
     .el-collapse {
       border: none;
 
@@ -86,9 +87,17 @@ export default {
         font-weight: 600;
       }
 
-      .el-collapse-item:first-child .el-form {
+      .form-collapse-item .el-form {
         padding-right: calc(var(--el-card-padding) * 2);
       }
+
+      .reply-collapse-item .el-collapse-item__wrap {
+        border-bottom: none;
+
+        .el-collapse-item__content {
+          padding-bottom: 0;
+        }
+      }
     }
   }
 }