From 882229665634aa181f8b7069104af270449ee276 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Tue, 6 Feb 2024 17:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=95=86=E6=88=B7=E5=AF=86?=
 =?UTF-8?q?=E9=92=A5=E5=8F=97=E5=AF=B9=E6=8E=A5=E7=B1=BB=E5=9E=8B=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/api.js                        |  4 ++--
 src/pages/distributor/merchant/index.jsx | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/assets/api.js b/src/assets/api.js
index 4247f568..6fe4a6c4 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -975,8 +975,8 @@ export const setResellMerchant = (id, data) => {
 }
 
 /* 获取开发信息密钥 */
-export const generateRsaKey = () => {
-  return req("get", baseurl + "/reseller/merchant/generateRsaKey")
+export const generateRsaKey = (data) => {
+  return req("get", baseurl + "/reseller/merchant/generateRsaKey", data)
 }
 
 /* 设置分销商通知地址 */
diff --git a/src/pages/distributor/merchant/index.jsx b/src/pages/distributor/merchant/index.jsx
index f3c6b3f2..c3b20bf1 100644
--- a/src/pages/distributor/merchant/index.jsx
+++ b/src/pages/distributor/merchant/index.jsx
@@ -4,7 +4,7 @@ import Form from "@/components/form/main"
 import Ipt from "@/components/input/main"
 import { omit } from "lodash-es"
 import { useEffect, useRef, useState } from "react"
-import { Button, Card, Checkbox, Input, Notify, Radio, RadioGroup } from "zent"
+import { Button, Card, Checkbox, Input, Notify, Radio, RadioGroup, Pop } from "zent"
 import "./index.less"
 export default function Merchant() {
   const [state, setState] = useState({
@@ -50,7 +50,7 @@ export default function Merchant() {
 
   /* 获取密钥 */
   function getKey() {
-    generateRsaKey().then(({ data }) => {
+    generateRsaKey({ api_mode: state.api_mode }).then(({ data }) => {
       setState({ ...state, ...data })
     })
   }
@@ -186,9 +186,11 @@ export default function Merchant() {
               />
             </FormItem>
             <FormItem labelname="" required="">
-              <Button type="primary" onClick={getKey}>
-                重新获取密钥
-              </Button>
+              <Pop trigger="hover" content="密钥受 “对接类型” 影响">
+                <Button type="primary" onClick={getKey}>
+                  重新获取密钥
+                </Button>
+              </Pop>
             </FormItem>
             <FormItem labelname="商户公钥" prop="merchant_public_key">
               <Input