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

src/pages/pageCustomized/mobileSettingPanel/index.less

 .mobileSettingPanel {
-  height: 100%;
   overflow-y: auto;
   background-color: #FFF;
   transition: width .25s;

src/pages/pageCustomized/mobileSettingPanel/propsSettings/components/marketingCardGood/index.tsx

@@ -14,6 +14,8 @@ import ActivityImage from '@/asserts/activity/ActivityImage.svg';
 
 import { priceFormat } from '@/utils/numberFomat';
 
+import useSamLevelProps from '../../../common/hooks/useSameLevelProps';
+
 
 
 interface MarketingCardGoodProps {
@@ -26,12 +28,13 @@ interface MarketingCardGoodProps {
 }
 
 const MarketingCardGood: React.FC<MarketingCardGoodProps> = (props: MarketingCardGoodProps) => {
-  const { id, actType, exType, pageConfig } = props;
+  const { id, actType, exType, pageConfig, selectedKey } = props;
   const { query: { shopId } }: any = history.location;
 
   const [record, setRecord] = useState<any>([]);
   const [actVisible, setActVisible] = useState(false);
   const [ignoresfilters] = useState(['activityType']);
+  const sameLevelPropsList = useSamLevelProps({ key: selectedKey })
 
   useEffect(() => {
     if (id && id != record[0]?.id) {
@@ -251,6 +254,7 @@ const MarketingCardGood: React.FC<MarketingCardGoodProps> = (props: MarketingCar
         onCancel={() => setActVisible(false)}
         mode='radio'
         ignoresFilters={ignoresfilters}
+        disabledList={sameLevelPropsList ? sameLevelPropsList.map((item) => `${item.id}_${item.activityId}`) : []}
       />
     </div>
   );