From 8653124af9427b57ee2213e7d364b9f31112a048 Mon Sep 17 00:00:00 2001
From: zhangzhen <525765282@qq.com>
Date: Mon, 9 Jun 2025 13:31:49 +0800
Subject: [PATCH] 开放问题反馈功能；

---
 src/components/Common/Feedback/Feedback.js                           |  2 +-
 src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js |  2 +-
 src/components/Common/ProblemFeedback/index.less                     |  2 +-
 src/index.less                                                       | 77 ++++++++++++++++++++++++++++++++++++++---------------------------------------
 src/routes/indexPage.js                                              |  6 +++---
 5 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/components/Common/Feedback/Feedback.js b/src/components/Common/Feedback/Feedback.js
index 1e16c0d..055008b 100644
--- a/src/components/Common/Feedback/Feedback.js
+++ b/src/components/Common/Feedback/Feedback.js
@@ -229,7 +229,7 @@ const Feedback = props => {
           // src={`http://localhost:8000/commonFeedback?iframeId=${
           //   iframeId.current
           // }`}
-          src={`https://project.xlyprint.cn/commonFeedback?iframeId=${
+          src={`http://project.xlyprint.cn/commonFeedback?iframeId=${
             iframeId.current
           }`}
           title="问题反馈"
diff --git a/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js b/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js
index 932ade5..0dc698c 100644
--- a/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js
+++ b/src/components/Common/PersonCenter/SwitchCompanyAndLanguage/index.js
@@ -20,7 +20,7 @@ const SwitchCompanyAndLanguageEvent = props => {
       const dataUrl = `${commonConfig.server_host}brand/getBrand/${userinfo.sId}`;
 
       const dataReturn = (await commonServices.getService(token, dataUrl)).data;
-      if (dataReturn.code === 1) {
+      if (dataReturn?.code === 1) {
         const companyList = dataReturn.dataset.rows[0];
         setState(pre => ({ ...pre, companyList, companyData: companyList.find(item => item.sSubsidiaryId === userinfo.sSubsidiaryId) }));
         setTimeout(() => {
diff --git a/src/components/Common/ProblemFeedback/index.less b/src/components/Common/ProblemFeedback/index.less
index 6c3dc40..7ce67a8 100644
--- a/src/components/Common/ProblemFeedback/index.less
+++ b/src/components/Common/ProblemFeedback/index.less
@@ -54,7 +54,7 @@
   }
 }
 
-.modalWrap {
+.modalWrap:not(.antdV5) {
   :global {
     .ant-modal-close {
       color: #4a495f !important;
diff --git a/src/index.less b/src/index.less
index 38d5fde..0d7ecb5 100644
--- a/src/index.less
+++ b/src/index.less
@@ -10,6 +10,7 @@ body,
   background: #888;
   height: 100%;
   font-size: 13px;
+  overflow: hidden;
 }
 
 html {
@@ -138,10 +139,6 @@ html {
   white-space: nowrap;
 }
 
-.ant-modal-body {
-  max-height: unset !important;
-}
-
 .topTable {
   .ant-table-header {
     table {
@@ -1185,32 +1182,50 @@ tr[class*="SetRow_"] {
   height: 28px !important;
 }
 
-.ant-modal-content {
-  border-radius: 0 !important;
-}
+.ant-modal-wrap:not(.antdV5) {
 
-.ant-modal-header {
-  padding: 7px 24px !important;
-  background: var(--xly-skin-modal-bg-color, #646464) !important;
-  color: #fff !important;
-  font-size: 18px;
-  border-radius: 0 !important;
-}
+  .ant-modal-body {
+    max-height: unset !important;
+    padding-top: 12px !important;
+    overflow: hidden;
 
-.ant-modal-close-x {
-  height: 33px !important;
-  line-height: 33px !important;
-}
+    .ant-col-5 {
+      width: 20%;
+    }
+  }
 
-.ant-modal-title {
-  color: #fff !important;
-}
+  .ant-modal-footer {
+    border-top: 0 !important;
+  }
 
-.ant-modal-close {
-  color: #fff !important;
+  .ant-modal-content {
+    border-radius: 0 !important;
+  }
+
+  .ant-modal-header {
+    padding: 7px 24px !important;
+    background: var(--xly-skin-modal-bg-color, #646464) !important;
+    color: #fff !important;
+    font-size: 18px;
+    border-radius: 0 !important;
+  }
+
+  .ant-modal-close-x {
+    height: 33px !important;
+    line-height: 33px !important;
+  }
 
+  .ant-modal-title {
+    color: #fff !important;
+  }
+
+  .ant-modal-close {
+    color: #fff !important;
+
+  }
 }
 
+
 .ant-menu-item i.selected {
   color: #f6c136;
 }
@@ -1575,10 +1590,6 @@ tr[class*="SetRow_"] {
   overflow: auto;
 }
 
-.ant-modal-body {
-  overflow: hidden;
-}
-
 /* 设置通用切换slaveTab */
 .ant-tabs.ant-tabs-card>.ant-tabs-bar .ant-tabs-tab-disabled span {
   color: #6b6868;
@@ -3286,18 +3297,6 @@ th.column-money {
   z-index: 900;
 }
 
-.ant-modal-body {
-  padding-top: 12px !important;
-
-  .ant-col-5 {
-    width: 20%;
-  }
-}
-
-.ant-modal-footer {
-  border-top: 0 !important;
-}
-
 .ant-table-footer {
   background: none !important;
   border-top: none !important;
diff --git a/src/routes/indexPage.js b/src/routes/indexPage.js
index dc41c1a..1731000 100644
--- a/src/routes/indexPage.js
+++ b/src/routes/indexPage.js
@@ -4,8 +4,8 @@ import { ConfigProvider, Layout } from 'antd-v4';
 import zhCN from 'antd-v4/lib/locale-provider/zh_CN';
 // import Search from '../components/Common/Search';
 import PersonCenter from './personCenter/personCenter';
-// import Feedback from './feedback/feedback';
-// import ProblemFeedback from './problemFeedback/problemFeedback';
+import Feedback from './feedback/feedback';
+import ProblemFeedback from './problemFeedback/problemFeedback';
 import TabCon from './tab/tab';
 import styles from './indexPage.less';
 
@@ -41,7 +41,7 @@ function IndexPage() {
          版权所有上海小羚羊软件股份有限公司   咨询电话：400-880-6237
          </Footer> */}
       </Layout>
-      {/* { ['project.xlyprint.cn'].includes(location.hostname) ? <ProblemFeedback /> : <Feedback /> } */}
+      { ['project.xlyprint.cn', 'localhost'].includes(location.hostname) ? <ProblemFeedback /> : <Feedback /> }
     </ConfigProvider>
   );
 }
--
libgit2 0.22.2