fix: 修改营销活动详情页

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/index.tsx

@@ -73,7 +73,6 @@ const Add = () => {
       message.error(intl.formatMessage({ id: 'activityPage.inputActivityTemplate' }));
       return;
     }
-    console.log(startTime);
     const startTimeStamp = startTime?.valueOf();
     const endTimeStamp = endTime?.valueOf();
     setLoading(true);
@@ -149,7 +148,7 @@ const Add = () => {
     async function setMall() {
       const data = await fetchMallData({environment: initialValue.environment.toString(), siteId: GlobalConfig.global.siteInfo.id} as any);
       actions.setFieldState("shopId", state => {
-        state.props.enum = data;
+        state.props.enum = [...data, { label: initialValue.shopName, value: initialValue.shopId }];
       });
     }
     setMall();

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/components/ActivityItem/index.tsx

@@ -23,7 +23,7 @@ interface Iprops {
   /** 商城子域名 */
   url: string,
   // 是否是自营商城
-  self: 1 | 0,
+  self: 1 | 0 | number,
   /**  1.WEB 2.H5 3.小程序 4.APP */
   environment: 1 | 2 | 3 | 4 | number,
   onRemove?: ((id: number) => void )| null,

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

@@ -71,10 +71,7 @@ const columns: ColumnsType<GetMarketingAdornMerchantActivityListAdornResponseDet
     title: `${intl.formatMessage({ id: 'activePage.brand' })}`,
     dataIndex: 'brand'
   },
-  {
-    title: `${intl.formatMessage({ id: 'activePage.Merchantname' })}`,
-    dataIndex: 'memberName',
-  },
+ 
   {
     title: `${intl.formatMessage({ id: 'activePage.UnitPrice' })}`,
     dataIndex: 'unit',
@@ -297,7 +294,9 @@ const ActivityProductDrawer: React.FC<Iprops> = (props: Iprops) => {
             rowSelection={rowSelection as any}
             rowKey={(_record) => `${_record.activityId!}-${_record.id!}`}
             loading={loading}
-            columns={columns} dataSource={selectedActivityProductList}></Table>
+            columns={columns} 
+            dataSource={selectedActivityProductList}
+          />
         </div>
         <div className={styles.pagination}>
           <Pagination pageSize={currentPageSize} current={current} showQuickJumper total={totalCount} onChange={onChange} />