fix: 优化云版功能组件

src/pages/Product/Cloud/components/Detail/TabList.jsx

@@ -106,8 +106,7 @@ const RoadpricingTabList = props => {
                 lockTypeEnum: lockTypeEnum.GIVE,
                 upgradeTypeEnum: upgradeTypeEnum.UPGRADE
               })
-            }
-          >
+            }>
             赠送
           </Button>
           {record.lock === 1 ? (
@@ -126,8 +125,7 @@ const RoadpricingTabList = props => {
                   lockTypeEnum: lockTypeEnum.SALE,
                   upgradeTypeEnum: upgradeTypeEnum.UPGRADE
                 })
-              }
-            >
+              }>
               销售
             </Button>
           ) : null}
@@ -148,8 +146,7 @@ const RoadpricingTabList = props => {
                     compilationListName: record.name,
                     upgradeTypeEnum: upgradeTypeEnum.DEMOTION
                   })
-                }
-              >
+                }>
                 降级
               </Button>
               <Button
@@ -169,8 +166,7 @@ const RoadpricingTabList = props => {
                     lockTypeEnum: record.lock,
                     upgradeTypeEnum: upgradeTypeEnum.DEADLINE
                   })
-                }
-              >
+                }>
                 限期
               </Button>
             </>
@@ -191,8 +187,7 @@ const RoadpricingTabList = props => {
                     lockTypeEnum: lockTypeEnum.LEND,
                     upgradeTypeEnum: upgradeTypeEnum.UPGRADE
                   })
-                }
-              >
+                }>
                 借出
               </Button>
               <Button
@@ -210,8 +205,7 @@ const RoadpricingTabList = props => {
                     lockTypeEnum: lockTypeEnum.SALE,
                     upgradeTypeEnum: upgradeTypeEnum.UPGRADE
                   })
-                }
-              >
+                }>
                 销售
               </Button>
             </>
@@ -266,20 +260,21 @@ const RoadpricingTabList = props => {
       </div>
       <UpgradeModal
         onConfirm={handleRoadPricingUpgrade}
-        loading={roadPricingUpgrade.loading}
-        visible={roadPricingUpgrade.visible}
-        type={roadPricingUpgrade.type}
-        actionPayload={actionPayload}
         onCancel={() => setRoadPricingUpgrade({ ...roadPricingUpgrade, visible: false })}
+        actionPayload={actionPayload}
         projectType={projectType}
         ssoId={ssoId}
         cloudUser={{ mobile, username }}
-        compilationId={roadPricingUpgrade.compilationId}
-        compilationName={roadPricingUpgrade.compilationName}
-        lock={roadPricingUpgrade.lockTypeEnum}
-        upgradeType={roadPricingUpgrade.upgradeTypeEnum}
-        compilationListName={roadPricingUpgrade.compilationListName}
-        deadline={roadPricingUpgrade.deadline}
+        roadPricingUpgrade={roadPricingUpgrade}
+        // loading={roadPricingUpgrade.loading}
+        // visible={roadPricingUpgrade.visible}
+        // type={roadPricingUpgrade.type}
+        // compilationId={roadPricingUpgrade.compilationId}
+        // compilationName={roadPricingUpgrade.compilationName}
+        // lock={roadPricingUpgrade.lockTypeEnum}
+        // upgradeType={roadPricingUpgrade.upgradeTypeEnum}
+        // compilationListName={roadPricingUpgrade.compilationListName}
+        // deadline={roadPricingUpgrade.deadline}
       />
     </div>
   )

src/pages/Product/Cloud/components/Detail/UpgradeModal.jsx

@@ -35,21 +35,38 @@ export const modalTitleEnum = {
 
 const UpgradeModal = props => {
   const {
-    visible,
-    onCancel,
-    loading,
     onConfirm,
-    type,
+    onCancel,
+    actionPayload,
     projectType,
     ssoId,
-    compilationId,
-    compilationName,
-    compilationListName,
-    lock,
-    upgradeType,
     cloudUser,
-    deadline,
-    actionPayload
+    roadPricingUpgrade: {
+      loading,
+      visiblem,
+      type,
+      compilationId,
+      compilationName,
+      lockTypeEnum,
+      upgradeTypeEnum,
+      compilationListName,
+      deadline
+    }
+    // visible,
+    // onCancel,
+    // loading,
+    // onConfirm,
+    // type,
+    // projectType,
+    // ssoId,
+    // compilationId,
+    // compilationName,
+    // compilationListName,
+    // lock,
+    // upgradeType,
+    // cloudUser,
+    // deadline,
+    // actionPayload
   } = props
   const [form] = Form.useForm()
   const dispatch = useDispatch()
@@ -102,8 +119,7 @@ const UpgradeModal = props => {
         onCancel()
         form?.resetFields()
       }}
-      onOk={handleonOk}
-    >
+      onOk={handleonOk}>
       {type === lockTypeEnum.GIVE || type === lockTypeEnum.LEND || type === lockTypeEnum.SALE ? (
         <div className="mb-6">
           <p className="pb-3">

src/pages/Product/Road/Personal/components/Detail/TabList.jsx

@@ -266,15 +266,6 @@ const PersonalTabList = props => {
         ssoId={ssoId}
         cloudUser={{ mobile, username }}
         roadPricingUpgradev2={roadPricingUpgradev2}
-        // loading={roadPricingUpgradev2.loading}
-        // visible={roadPricingUpgradev2.visible}
-        // type={roadPricingUpgradev2.type}
-        // compilationId={roadPricingUpgradev2.compilationId}
-        // compilationName={roadPricingUpgradev2.compilationName}
-        // lock={roadPricingUpgradev2.lockTypeEnum}
-        // upgradeType={roadPricingUpgradev2.upgradeTypeEnum}
-        // compilationListName={roadPricingUpgradev2.compilationListName}
-        // deadline={roadPricingUpgradev2.deadline}
       />
     </div>
   )

src/pages/Product/Road/Personal/components/Detail/UpgradeModal.jsx

@@ -30,18 +30,7 @@ const UpgradeModal = props => {
       upgradeType,
       deadline
     }
-    // type,
-    // loading,
-    // visible,
-    // compilationId,
-    // compilationName,
-    // compilationListName,
-    // lock,
-    // upgradeType,
-    // deadline
   } = props
-  console.log(roadPricingUpgradev2)
-  console.log(roadPricingUpgradev2.type)
   const [form] = Form.useForm()
   const dispatch = useDispatch()
   const [showDeadline, setShowDeadline] = useState(false)
@@ -97,7 +86,8 @@ const UpgradeModal = props => {
       {type === lockTypeEnum.GIVE || type === lockTypeEnum.LEND || type === lockTypeEnum.SALE ? (
         <div className="mb-6">
           <p className="pb-3">
-            为用户<b>{cloudUser.mobile}</b>，<b>{cloudUser.username}</b> {modalTitleEnum[type]} <b>{compilationName}</b>
+            为用户<b>{cloudUser.mobile}</b>，<b>{cloudUser.username}</b> {modalTitleEnum[type]}{' '}
+            <b>{compilationName}</b>
           </p>
           <div className="pb-5">
             <Switch onChange={onChange} checked={showDeadline} />