diff --git a/.env.dev b/.env.dev
index 5a4483b..c1d55b0 100644
--- a/.env.dev
+++ b/.env.dev
@@ -6,9 +6,9 @@ VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}:8099
 VITE_AI_SHOP_BASE_URL=http://192.168.0.115:8081
 VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright
 # 18634604067
-VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671   
+# VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671   
 # VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74   
-# VITE_USERID=5cc90b84-905e-4027-9f6c-ab47e9c320a1
+VITE_USERID=5cc90b84-905e-4027-9f6c-ab47e9c320a1
 # VITE_CURRENT_THEME=fzkj
 VITE_CURRENT_THEME=mzw
 # VITE_HOST=121.36.71.250:58038
diff --git a/src/route/ProductRelease/ProductRelease.tsx b/src/route/ProductRelease/ProductRelease.tsx
index 0acac58..6b791c2 100644
--- a/src/route/ProductRelease/ProductRelease.tsx
+++ b/src/route/ProductRelease/ProductRelease.tsx
@@ -134,7 +134,7 @@ export default function ProductRelease() {
             return {
               ...dataItem,
               goodsStatus: 0
-          
+
             };
           }
           return dataItem;
@@ -142,7 +142,7 @@ export default function ProductRelease() {
 
       })
       // console.log('setData', data);
-      
+
       setOffModalOpen(false)
       messageApi.open({
         type: 'success',
@@ -583,18 +583,18 @@ export default function ProductRelease() {
                                 edit(item)
                               }}>编辑</Button>
                             <Button className='goodsBtn' type="primary" style={{
-                               width: '163px',
-                               background:'#0FADAB',
+                              width: '163px',
+                              background: '#0FADAB',
                               display: item.goodsCheckStatus == '1' || item.goodsCheckStatus == '2' ? 'none' : 'unset'
                             }} onClick={() => submit(item)}>提交审核</Button>
                             <Button className='goodsBtn' type="primary" style={{
-                               width: '80px',
+                              width: '80px',
                               display: item.goodsStatus == '0' && item.goodsCheckStatus == '2' ? 'unset' : 'none'
                             }} onClick={() => sell(item)}>上架</Button>
                             <Button className='goodsBtn' type="primary" style={{
-                               width: '80px',
-                               background:'rgb(248, 97, 97)',
-                              display: item.goodsStatus == '0' || item.goodsOrderStatus == '3' ? 'none' : 'unset'
+                              width: '80px',
+                              background: 'rgb(248, 97, 97)',
+                              display: item.goodsStatus == '0' || item.goodsOrderStatus == '3' || item.goodsOrderStatus == '4' ? 'none' : 'unset'
                             }}
                               onClick={() => off(item)}>下架</Button>
                             <div className='goodsBtnIng' style={{
@@ -602,7 +602,7 @@ export default function ProductRelease() {
                             }}>
                               正在交易中...
                             </div>
-                             <div className='goodsBtnIng' style={{
+                            <div className='goodsBtnIng' style={{
                               display: item.goodsOrderStatus == '4' ? 'unset' : 'none'
                             }}>
                               已完成
diff --git a/src/route/TrademarkMall/components/EditOne/EditOne.tsx b/src/route/TrademarkMall/components/EditOne/EditOne.tsx
index ac0d27f..d898487 100644
--- a/src/route/TrademarkMall/components/EditOne/EditOne.tsx
+++ b/src/route/TrademarkMall/components/EditOne/EditOne.tsx
@@ -3,17 +3,30 @@ import { Button, Radio, Form, Input } from 'antd'
 import './EditOne.css'
 const { TextArea } = Input;
 export default function EditOne(props: any) {
-  const [form] = Form.useForm<any>();
+  const [formA] = Form.useForm<any>(); // 文字商标表单
+  const [formB] = Form.useForm<any>(); // 图形商标表单
   const height = window.innerHeight - 350;
   const [goodsType, setGoodsType] = useState('a')
   const handleSubmit = () => {
     // console.log(form);
     // props.setEditProcess(2);
     // 调用表单实例的 submit 方法
-    form.submit();
+    if (goodsType === 'a') {
+      formA.submit();
+    } else if (goodsType === 'b') {
+      formB.submit();
+    } else {
+      // 表单不显示时，直接更新步骤
+      props.setEditProcess(2);
+    }
 
   };
-  const onFinish = (values: any) => {
+  const onFinishA = (values: any) => {
+    console.log(values);
+    props.setEditProcess(2);
+
+  }
+  const onFinishB = (values: any) => {
     console.log(values);
     props.setEditProcess(2);
 
@@ -55,9 +68,9 @@ export default function EditOne(props: any) {
           display: goodsType === 'a' ? 'unset' : 'none',
         }}>
           <Form
-            name="Form"
-            form={form}
-            onFinish={onFinish}
+            name="FormA"
+            form={formA}
+            onFinish={onFinishA}
             initialValues={{ softWare: '' }}
             style={{ marginTop: 20 }}
           >
@@ -133,6 +146,87 @@ export default function EditOne(props: any) {
         </div>
 
 
+        <div style={{
+          display: goodsType === 'b' ? 'unset' : 'none',
+        }}>
+          <Form
+            name="FormB"
+            form={formB}
+            onFinish={onFinishB}
+            initialValues={{ softWare: '' }}
+            style={{ marginTop: 20 }}
+          >
+            <div className='editFormItem '>
+              <div className='editFormItemTitle'>
+                商标名称<span className='redTitle' >*</span>：
+              </div>
+
+
+              <Form.Item
+                name="titleB"
+                rules={[{ required: true, message: '请输入商标名称!' }]}
+              >
+                <Input style={{
+                  width: 600,
+                  height: 46,
+                  background: '#FFF',
+                  color: 'black'
+                }}
+                  placeholder="商标名称"
+                >
+                </Input>
+
+              </Form.Item>
+
+
+
+            </div>
+            <div className='editFormItem' style={{
+              marginTop: '20px',
+            }}>
+              <div className='editFormItemTitle'>
+                商标说明<span className='redTitle'>*</span>：
+              </div>
+
+
+              <Form.Item
+                name="textB"
+                rules={[{ required: true, message: '请输入商标说明' }]}
+              >
+                <TextArea style={{
+                  width: 600,
+                  height: 150,
+                  background: '#FFF',
+                  color: 'black',
+                  resize: 'none'
+                }}
+                  placeholder="商标说明"
+                >
+                </TextArea>
+
+              </Form.Item>
+
+
+
+            </div>
+
+
+
+
+            {/* <Form.Item>
+              <div className='trademark-btn'>
+                <Button type="primary" htmlType="submit" style={{
+                  width: 273,
+                  height: 52
+                }}
+                >
+                  提交订单
+                </Button>
+              </div>
+            </Form.Item> */}
+          </Form>
+        </div>
+
 
       </div>
       <div className='topLine'></div>