From 9efeb109e9595a28ea957f7283c5a009a1bc20e9 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 30 Oct 2025 10:17:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CustomSelect/index.less          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pc4mobx/hrmSalary/components/CustomSelect/index.less b/pc4mobx/hrmSalary/components/CustomSelect/index.less
index 2f2d7288..1ce20fb4 100644
--- a/pc4mobx/hrmSalary/components/CustomSelect/index.less
+++ b/pc4mobx/hrmSalary/components/CustomSelect/index.less
@@ -11,6 +11,23 @@
     min-height: 30px;
     border: 1px solid #d9d9d9;
     user-select: none;
+    height: 30px;
+    white-space: nowrap;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    -o-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+    overflow: hidden;
+
+    .wdb {
+      word-break: break-all !important;
+      word-wrap: break-word !important;
+    }
+
+    .cursor-pointer {
+      cursor: pointer;
+    }
 
     &:hover, &:focus {
       border-color: #57c5f7;

From 372d9d53eee7f835141cb2b4664e2daa9f00c739 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 13 Nov 2025 16:40:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
index e8b7cc58..51fba0f7 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@@ -13,9 +13,8 @@ import Content from "../../components/pcTemplate/content";
 import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll";
 import CaptchaModal from "../../components/captchaModal";
 import "./index.less";
-import { getQueryString } from "../../util/url";
 
-const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent);
+const isPhone = /(iPhone|iPad|iPod|iOS|Android)/i.test(window.navigator.userAgent);
 const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
 const { getLabel } = WeaLocaleProvider;
 
@@ -132,8 +131,8 @@ export const ConfirmBtns = (props) => {
       <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
     }
     {
-      ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) &&
+      ((props.showFeedback === "1" && !isPhone) || (props.showFeedback === "1" && isEm)) &&
       <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
     }
   </div>;
-};
+};
\ No newline at end of file