🦀️ fix: 修复时间bug

src/components/combining/index.jsx

@@ -660,6 +660,13 @@ const Combining = forwardRef((props, ref) => {
               if (com === "type") {
                 return <>立减金</>
               }
+              if (com == "effectDate") {
+                return (
+                  <>
+                    {info.date_time[0]} 至 {info.date_time[1]}
+                  </>
+                )
+              }
             }}
           />
         </FormItem>

src/components/combining/static.js

@@ -36,10 +36,10 @@ export const tableColumn = [
   },
   {
     title: "有效时间段",
-    width: "350px",
+    width: "300px",
     prop: "effectDate",
     name: "effectDate",
-    type: "normal"
+    type: "slot"
   },
   {
     title: "总预算",

src/pages/exchangecode/combiningAdd/index.jsx

@@ -1230,15 +1230,12 @@ export default class combiningAdd extends React.Component {
                     }}
                     ComponentHandler={(com, rowData) => {
                       if (com == "type") {
+                        return <>立减金</>
+                      }
+                      if (com == "effectDate") {
                         return (
                           <>
-                            {rowData.type === 2
+                            {this.state.codeInfo.date_time[0]} 至 {this.state.codeInfo.date_time[1]}
-                              ? "立减金"
-                              : rowData.type === 3
-                              ? rowData.origin.cash_amount_type === "2"
-                                ? "随机红包"
-                                : "固额红包"
-                              : "商品"}
                           </>
                         )
                       }

src/pages/exchangecode/combiningAdd/utils.js

@@ -75,10 +75,10 @@ export const Column2 = [
   },
   {
     title: "有效时间段",
-    width: "auto",
+    width: "300px",
     prop: "effectDate",
     name: "effectDate",
-    type: "normal"
+    type: "slot"
   },
   {
     title: "当前成本价格",
@@ -207,9 +207,6 @@ export function reductionFn(params) {
   newObj.edit = "edit"
   newObj.all_budget = params.all_budget
   newObj.send_num = params.send_num || 1
-  newObj.effectDate =
-    params.effectDate ||
-    params.time_limit?.effect_time.start_time + " 至 " + params.time_limit?.effect_time.end_time //有效时间
   newObj.contract_price = params.contract_price || params.price //单价
   newObj.official_price = params.official_price || params.reduce_amount //官方价
   newObj.quantity = params.quantity || all //总库