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

src/pages/editor/mobileSettingPanel/propsSettings/components/cardNavItem/index.tsx

@@ -148,7 +148,11 @@ const CardNavItem: React.FC<CardNavItemProps> = (props: CardNavItemProps) => {
       case 2:
         return PublicApi.getTemplateWebActivityPageGet
       case 5:
-        return PublicApi.getManageShopDetails
+        if (layoutType === 'own') {
+          return PublicApi.getManageActivityShopRuleDetails
+        } else {
+          return PublicApi.getManageShopDetails
+        }
       default:
         return async () => { }
     }
@@ -323,10 +327,8 @@ const CardNavItem: React.FC<CardNavItemProps> = (props: CardNavItemProps) => {
     }
     if (values.channel && values.type === 3) {
       newProps.id = values.channel
-    } else if (values.type === 2) {
+    } else if (values.type === 2 || values.type === 5) {
       newProps.id = record ? record?.id : undefined
-    } else if (values.type === 5) {
-      newProps.id = record ? record?.shopId : undefined
     }
 
     changeProps({