From 8548013e11a19cb53de615ea91e20e694a256e3d Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 20 Feb 2024 11:52:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E5=8C=85=E5=90=97?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UseExchangeAddEdit/index.jsx | 23 +++++++++++++++------
 src/components/UseProductPop/index.jsx      | 21 ++-----------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/components/UseExchangeAddEdit/index.jsx b/src/components/UseExchangeAddEdit/index.jsx
index d7a838a4..aeae656c 100644
--- a/src/components/UseExchangeAddEdit/index.jsx
+++ b/src/components/UseExchangeAddEdit/index.jsx
@@ -578,10 +578,6 @@ const UseExchangeAddEdit = forwardRef((props, ref) => {
   return (
     <div className="draw">
       <Card style={{ width: "95%", margin: "10px auto" }} title={"基本信息"}>
-        <p>
-          2222222222
-          {props.isSettlement} {JSON.stringify(props.settlementData)}
-        </p>
         <div className="addcode">
           <Form model={codeInfo} rules={codeInfoRules} ref={codeInfoEl} className="addform">
             <FormItem labelname="兑换码名称" prop="code_name" id="code_name">
@@ -673,6 +669,11 @@ const UseExchangeAddEdit = forwardRef((props, ref) => {
                   type="primary"
                   style={{ marginLeft: "20px" }}
                   loading={state.addProductBtnLoading}
+                  disabled={
+                    props.isSettlement === 1 &&
+                    props.settlementData &&
+                    (props.settlementData.key === 8 || props.settlementData.key === 9)
+                  }
                   onClick={() => {
                     addProduct("addProduct")
                   }}
@@ -685,7 +686,12 @@ const UseExchangeAddEdit = forwardRef((props, ref) => {
                   onClick={() => {
                     addProduct("addKnockGold")
                   }}
-                  disabled={!JSON.parse(sessionStorage.getItem("isEarlyWarningMan"))}
+                  disabled={
+                    !JSON.parse(sessionStorage.getItem("isEarlyWarningMan")) ||
+                    (props.isSettlement === 1 &&
+                      props.settlementData &&
+                      props.settlementData.key === 7)
+                  }
                 >
                   新建立减金
                 </Button>
@@ -695,7 +701,12 @@ const UseExchangeAddEdit = forwardRef((props, ref) => {
                   onClick={() => {
                     addProduct("redPackets")
                   }}
-                  disabled={!JSON.parse(sessionStorage.getItem("isEarlyWarningMan"))}
+                  disabled={
+                    !JSON.parse(sessionStorage.getItem("isEarlyWarningMan")) ||
+                    (props.isSettlement === 1 &&
+                      props.settlementData &&
+                      (props.settlementData.key === 7 || props.settlementData.key === 8))
+                  }
                 >
                   新建红包
                 </Button>
diff --git a/src/components/UseProductPop/index.jsx b/src/components/UseProductPop/index.jsx
index 0ec73cbb..63158a82 100644
--- a/src/components/UseProductPop/index.jsx
+++ b/src/components/UseProductPop/index.jsx
@@ -496,10 +496,6 @@ const UseProductPop = forwardRef((props, ref) => {
         iconText="加载中"
       >
         <Form model={model} rules={formRules} ref={formEl}>
-          <p>
-            2222222222
-            {props.isSettlement} {JSON.stringify(props.settlementData)}
-          </p>
           <FormItem labelname="商品类型" prop="type" id="type">
             <RadioGroup
               onChange={(e) => {
@@ -508,24 +504,11 @@ const UseProductPop = forwardRef((props, ref) => {
               value={model.product_type}
               disabled={!!model.code_batch_id}
             >
-              <RadioButton
-                value={1}
-                disabled={
-                  props.isSettlement === 1 &&
-                  props.settlementData &&
-                  (props.settlementData.key === 8 || props.settlementData.key === 9)
-                }
-              >
-                直充
-              </RadioButton>
+              <RadioButton value={1}>直充</RadioButton>
               <RadioButton
                 value={2}
                 disabled={
-                  props.isSettlement === 1 &&
-                  props.settlementData &&
-                  (props.settlementData.key === 3 ||
-                    props.settlementData.key === 8 ||
-                    props.settlementData.key === 9)
+                  props.isSettlement === 1 && props.settlementData && props.settlementData.key === 7
                 }
               >
                 卡密