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

package.json

@@ -69,7 +69,7 @@
     "@linkseeks/design-core": "^1.0.0",
     "@linkseeks/design-react": "^1.0.0",
     "@linkseeks/design-react-web": "^1.0.0",
-    "@linkseeks/design-ui": "^1.0.0",
+    "@linkseeks/design-ui": "^1.0.3",
     "@turf/turf": "^6.4.0",
     "@types/crypto-js": "^4.0.1",
     "@types/js-cookie": "^2.2.6",

src/pages/editor/channelEdit/defaultData.ts

@@ -2,7 +2,7 @@
 export const mallLayoutConfig = {
   key: "0",
   "0": {
-    "componentName": "MallLayout",
+    "componentName": "LocaleProvide",
     "props": {
       "style": {
         "width": "100%",

src/pages/editor/configs/componentConfigs/LingXiUI/LocaleProvide.ts

+import { ComponentSchemaType, PROPS_TYPES } from '@linkseeks/design-core';;
+
+const LocaleProvide: ComponentSchemaType = {
+  propsConfig: {
+    children: {
+      label: '文本内容',
+      type: PROPS_TYPES.string,
+    },
+  },
+};
+
+export default LocaleProvide;

src/pages/editor/configs/componentConfigs/LingXiUI/index.ts

@@ -59,6 +59,7 @@ import MallHeader from './MallHeader'
 import OwnMainNav from './OwnMainNav'
 import MobileBrand from './MobileBrand'
 import MallMainNav from './MallMainNav'
+import LocaleProvide from './LocaleProvide'
 
 export default {
   View,
@@ -112,4 +113,5 @@ export default {
   MallHeader,
   OwnMainNav,
   ...MobileBrand,
+  LocaleProvide,
 }

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

@@ -39,7 +39,7 @@ const SuggestProductCommodity: React.FC<SuggestProductCommodityProps> = (props:
     if (id && id != record.id) {
       const _params: any = {
         shopId,
-        idInList: id,
+        idInList: Array.isArray(id) ? id.join(',') : id,
         current: 1,
         pageSize: 10
       }

src/pages/editor/shopEdit/defaultData.ts

@@ -2,7 +2,7 @@
 export const mallLayoutConfig = {
   key: "0",
   "0": {
-    "componentName": "MallLayout",
+    "componentName": "LocaleProvide",
     "props": {
       "style": {
         "width": "100%",

src/pages/editor/shopEdit/index.tsx

@@ -159,15 +159,19 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
     serviceAdvertConfig[serviceAdvertConfig.key].props.advertList = await findSecondAdvertsByType()
     //店铺信息
     const shopList = GlobalConfig.web.shopInfo
-    const webMallInfo = shopList.filter(item => item.environment === 1 && item.type === 1)[0]
-    const shopInfo: any = await fetchShopInfo(webMallInfo.id)
-    headerConfig[headerConfig.key].props.shopInfo = shopInfo
-    headerConfig[headerConfig.key].props.logoUrl = webMallInfo.logoUrl
-    topBarConfig[topBarConfig.key].props.shopname = webMallInfo.name
+    const webMallInfo = shopList.filter(item => item.id === Number(shopId))[0]
+
+    if (webMallInfo) {
+      const shopInfo: any = await fetchShopInfo(webMallInfo.id)
+      headerConfig[headerConfig.key].props.shopInfo = shopInfo
+      headerConfig[headerConfig.key].props.logoUrl = webMallInfo.logoUrl
+      topBarConfig[topBarConfig.key].props.shopname = webMallInfo.name
+
+      CompanyInfoConfig[CompanyInfoConfig.key].props.shopInfo = shopInfo || {}
+      AlbumConfig[AlbumConfig.key].props.workshopPics = shopInfo.workshopPics || []
+      HonroPicConfig[HonroPicConfig.key].props.honorPics = shopInfo.honorPics || []
+    }
 
-    CompanyInfoConfig[CompanyInfoConfig.key].props.shopInfo = shopInfo || {}
-    AlbumConfig[AlbumConfig.key].props.workshopPics = shopInfo.workshopPics || []
-    HonroPicConfig[HonroPicConfig.key].props.honorPics = shopInfo.honorPics || []
     // AboutUsConfig[AboutUsConfig.key].props.shopInfo = shopInfo
     let initIndex = 100
     let floorLineConfig: any = {}

src/pages/mobileTemplate/categoryNavigation/common/schema/layoutSchema.tsx

@@ -2,6 +2,15 @@ import { ComponentSchemaType, PROPS_SETTING_TYPES, PROPS_TYPES } from '@linkseek
 import { getIntl } from 'umi'
 const intl = getIntl()
 
+const LocaleProvide: ComponentSchemaType = {
+  propsConfig: {
+    children: {
+      label: '文本内容',
+      type: PROPS_TYPES.string,
+    },
+  },
+};
+
 const HeaderNav: {[key: string]: ComponentSchemaType} = {
   HeaderNav: {
     propsConfig: {
@@ -134,6 +143,7 @@ const ProductContainer: ComponentSchemaType = {
 };
 
 export default {
+  LocaleProvide,
   ...HeaderNav,
   ...SecondaryNavigation,
   ...SimpleCommodity,

src/pages/mobileTemplate/categoryNavigation/common/schema/pageConfig.tsx

@@ -95,7 +95,7 @@ const template = {
  */
 const mallLayoutConfig: PageConfigType = {
   "0": {
-    "componentName": "div",
+    "componentName": "LocaleProvide",
     title: intl.formatMessage({ id: 'editor.node.tree' }),
     "props": {
       "style": {

src/pages/mobileTemplate/categoryNavigation/components/CommodityDrawer/index.tsx

@@ -136,7 +136,7 @@ const CommodityDrawer: React.FC<CommodityDrawerProps> = (props: CommodityDrawerP
     const _params = {
       // ...params,
       shopId,
-      idNotInList: Array.isArray(selectId) ? selectId : [selectId],
+      idNotInList: Array.isArray(selectId) ? selectId.join(',') : selectId,
       ...formated
     };
     const fetchService = service || getMarketingAdornChannelGoodsListAdorn;

src/pages/mobileTemplate/categoryNavigation/components/Layout/Tabs/index.tsx

@@ -65,7 +65,7 @@ const CustomizeTabs: React.FC<Iprops> & { TabItem: typeof TabItem } = (props: Ip
       ? getMarketingAdornGoodsListAdorn
       : getMarketingAdornChannelGoodsListAdorn
     return service({
-      idInList: ids as any || [],
+      idInList: Array.isArray(ids) ? ids.join(",") : ids,
       shopId: shopId,
       current: 1,
       pageSize: ids?.length,

src/pages/mobileTemplate/channelTemplateEdit/config.ts

@@ -24,7 +24,7 @@ export const defaultHeaderNavData = [
 
 export const channelLayoutConfig : PageConfigType = {
   '0': {
-    componentName: 'MallLayout',
+    componentName: 'LocaleProvide',
     props: {
       style: {
         "width": "100%",

src/pages/mobileTemplate/ownMallTemplateEdit/config.ts

@@ -15,7 +15,7 @@ const intl = getIntl()
 
 export const channelLayoutConfig : PageConfigType = {
   '0': {
-    componentName: 'MallLayout',
+    componentName: 'LocaleProvide',
     props: {
       style: {
         "width": "100%",

src/pages/mobileTemplate/shopTemplateEdit/config.ts

@@ -7,7 +7,7 @@ const intl = getIntl()
 
 export const shopLayoutConfig : PageConfigType = {
   '0': {
-    componentName: 'MallLayout',
+    componentName: 'LocaleProvide',
     props: {
       style: {
         "width": "100%",

src/pages/mobileTemplate/shopTemplateEdit/index.tsx

@@ -220,7 +220,7 @@ const  mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = (props) => {
       })
       if (commodityIds && commodityIds.length > 0) {
         const param: any = {
-          idInList: commodityIds,
+          idInList: commodityIds.join(','),
           shopId: shopId,
           current: 1,
           pageSize: 80

src/pages/mobileTemplate/shopTemplatePreview/index.tsx

@@ -205,7 +205,7 @@ const  mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = (props) => {
       })
       if (commodityIds && commodityIds.length > 0) {
         const param: any = {
-          idInList: commodityIds,
+          idInList: commodityIds.join(','),
           shopId: shopId,
           current: 1,
           pageSize: 80

src/pages/preview/shopPreview/index.tsx

@@ -159,15 +159,18 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
     serviceAdvertConfig[serviceAdvertConfig.key].props.advertList = await findSecondAdvertsByType()
     //店铺信息
     const shopList = GlobalConfig.web.shopInfo
-    const webMallInfo = shopList.filter(item => item.environment === 1 && item.type === 1)[0]
-    const shopInfo: any = await fetchShopInfo(webMallInfo.id)
-    headerConfig[headerConfig.key].props.shopInfo = shopInfo
-    headerConfig[headerConfig.key].props.logoUrl = webMallInfo.logoUrl
-    topBarConfig[topBarConfig.key].props.shopname = webMallInfo.name
+    const webMallInfo = shopList.filter(item => item.id === Number(shopId))[0]
 
-    CompanyInfoConfig[CompanyInfoConfig.key].props.shopInfo = shopInfo || {}
-    AlbumConfig[AlbumConfig.key].props.workshopPics = shopInfo.workshopPics || []
-    HonroPicConfig[HonroPicConfig.key].props.honorPics = shopInfo.honorPics || []
+    if (webMallInfo) {
+      const shopInfo: any = await fetchShopInfo(webMallInfo.id)
+      headerConfig[headerConfig.key].props.shopInfo = shopInfo
+      headerConfig[headerConfig.key].props.logoUrl = webMallInfo.logoUrl
+      topBarConfig[topBarConfig.key].props.shopname = webMallInfo.name
+
+      CompanyInfoConfig[CompanyInfoConfig.key].props.shopInfo = shopInfo || {}
+      AlbumConfig[AlbumConfig.key].props.workshopPics = shopInfo.workshopPics || []
+      HonroPicConfig[HonroPicConfig.key].props.honorPics = shopInfo.honorPics || []
+    }
     // AboutUsConfig[AboutUsConfig.key].props.shopInfo = shopInfo
     let initIndex = 100
     let floorLineConfig: any = {}

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/common/configs/index.tsx

@@ -10,7 +10,7 @@ const intl = getIntl();
 
 const mallLayoutConfig: PageConfigType = {
   "0": {
-    "componentName": "MallLayout",
+    "componentName": "LocaleProvide",
     title: `${intl.formatMessage({ id: 'activePage.compoentTree'})}`,
     "props": {
       "style": {