Merge pull request #1977 from QuantumNous/fix/bills

❤ fix(topup): prevent nil-pointer in Epay callback; reset page on search

controller/topup.go

@@ -237,8 +237,8 @@ func EpayNotify(c *gin.Context) {
 		_, err := c.Writer.Write([]byte("fail"))
 		_, err := c.Writer.Write([]byte("fail"))
 		if err != nil {
 		if err != nil {
 			log.Println("易支付回调写入失败")
 			log.Println("易支付回调写入失败")
-			return
 		}
 		}
+		return
 	}
 	}
 	verifyInfo, err := client.Verify(params)
 	verifyInfo, err := client.Verify(params)
 	if err == nil && verifyInfo.VerifyStatus {
 	if err == nil && verifyInfo.VerifyStatus {

web/src/components/topup/modals/TopupHistoryModal.jsx

@@ -102,6 +102,11 @@ const TopupHistoryModal = ({ visible, onCancel, t }) => {
     setPage(1);
     setPage(1);
   };
   };
 
 
+  const handleKeywordChange = (value) => {
+    setKeyword(value);
+    setPage(1);
+  };
+
   // 管理员补单
   // 管理员补单
   const handleAdminComplete = async (tradeNo) => {
   const handleAdminComplete = async (tradeNo) => {
     try {
     try {
@@ -231,7 +236,7 @@ const TopupHistoryModal = ({ visible, onCancel, t }) => {
           prefix={<IconSearch />}
           prefix={<IconSearch />}
           placeholder={t('订单号')}
           placeholder={t('订单号')}
           value={keyword}
           value={keyword}
-          onChange={setKeyword}
+          onChange={handleKeywordChange}
           showClear
           showClear
         />
         />
       </div>
       </div>