Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/common/hooks/useGetLayout.ts

@@ -242,7 +242,7 @@ function useGetLayout() {
         const props = _row.key === 'top' ? {
           imageUrl: currentProps.imageUrl
           } : {
-            visible: currentProps.visible || true,
+            visible: currentProps.visible ?? true,
             theme: currentProps.theme || 0,
             title: currentProps.title,
           };

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/ActivityAreaSetting/activityProductDrawer.tsx

@@ -91,9 +91,11 @@ const columns: ColumnsType<GetMarketingAdornMerchantActivityListAdornResponseDet
     title: `${intl.formatMessage({ id: 'activePage.Activityprice' })}`,
     dataIndex: 'activityPrice',
     render: (_text, _record) => {
+      // const activityId = _record.activityId;
+      // const target = _record.activityList.find((_item: any) => _item.id === activityId)
       return (
         <div className={styles.priceInfo}>
-          <span>￥{_record.activityPrice}</span>
+          <span>￥{_record.activityPrice || _record?.plummetPrice || _record.deductionPrice || 0}</span>
           <span className={styles.unit}>({_record.unit})</span>
         </div>
       );