Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

src/pages/pageCustomized/mallEdit/index.tsx

@@ -51,7 +51,7 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
         type: 1
       }
 
-      PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
+      PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
         if (res.code === 1000) {
           resolve(res.data)
         } else {
@@ -68,7 +68,7 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
         type: 2
       }
 
-      PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
+      PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
         if (res.code === 1000) {
           resolve(res.data)
         } else {

src/pages/pageCustomized/preview/mallPreview/index.tsx

@@ -50,7 +50,7 @@ const MallPreview: React.FC<MallPreviewPropsType> = (props) => {
         type: 1
       }
 
-      PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
+      PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
         if (res.code === 1000) {
           resolve(res.data)
         } else {
@@ -67,7 +67,7 @@ const MallPreview: React.FC<MallPreviewPropsType> = (props) => {
         type: 2
       }
 
-      PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
+      PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
         if (res.code === 1000) {
           resolve(res.data)
         } else {

src/pages/pageCustomized/settingsPanel/propsSettings/components/AdvertSetting/index.tsx

@@ -10,7 +10,7 @@ import { clearSelectedStatus, changeProps } from 'lingxi-editor-core';
 import { ArrowUpOutlined, DeleteOutlined, PlusOutlined, ArrowDownOutlined, CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons'
 import styles from './index.less'
 
-interface advertItemType {
+interface AdvertItemType {
   /**
   * ID
   */
@@ -53,7 +53,7 @@ interface advertItemType {
 
 
 interface AdvertSettingPropsType {
-  advertList: advertItemType[];
+  advertList: AdvertItemType[];
   onChange: Function;
   type: 'top' | 'banner' | 'interact' | 'category';
   templateid: number;
@@ -62,7 +62,7 @@ interface AdvertSettingPropsType {
 
 const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref) => {
   const { advertList = [], templateid, type, categoryid } = props
-  const [list, setList] = useState<advertItemType[]>(advertList)
+  const [list, setList] = useState<AdvertItemType[]>(advertList)
   const [confirmLoading, setConfirmLoading] = useState<boolean>(false)
   const [newProps, setNewProps] = useState(props)
 
@@ -85,10 +85,10 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
     setNewProps(newProps)
   }
 
-  const sortUp = (index: number, item: advertItemType) => {
-    let newList = JSON.parse(JSON.stringify(list))
-    let tempItem = JSON.parse(JSON.stringify(item))
-    let temp = newList[index - 1]
+  const sortUp = (index: number, item: AdvertItemType) => {
+    const newList = JSON.parse(JSON.stringify(list))
+    const tempItem = JSON.parse(JSON.stringify(item))
+    const temp = newList[index - 1]
     newList[index - 1] = item
     newList[index - 1].sort = temp.sort
     newList[index] = temp
@@ -97,10 +97,10 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
     changeNewProps('advertList', newList)
   }
 
-  const sortDown = (index: number, item: advertItemType) => {
-    let newList = JSON.parse(JSON.stringify(list))
-    let temp = newList[index + 1]
-    let tempItem = JSON.parse(JSON.stringify(item))
+  const sortDown = (index: number, item: AdvertItemType) => {
+    const newList = JSON.parse(JSON.stringify(list))
+    const temp = newList[index + 1]
+    const tempItem = JSON.parse(JSON.stringify(item))
     newList[index + 1] = item
     newList[index + 1].sort = temp.sort
     newList[index] = temp
@@ -110,7 +110,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
   }
 
   const addSliderItem = () => {
-    let newList = JSON.parse(JSON.stringify(list))
+    const newList = JSON.parse(JSON.stringify(list))
     let sort = 0
     if (newList.length <= 0) {
       sort = 1
@@ -118,7 +118,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
       sort = newList[newList.length - 1].sort + 1
     }
 
-    let tempItem: any = {
+    const tempItem: any = {
       templateId: Number(templateid),
       type: getAdvertType(type),
       name: '',
@@ -138,7 +138,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
   }
 
   const handleDeleteItem = (index: number) => {
-    let newList = JSON.parse(JSON.stringify(list))
+    const newList = JSON.parse(JSON.stringify(list))
     newList.splice(index, 1)
     let sort = 1
     newList.map(item => {
@@ -150,7 +150,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
   }
 
   const handleExpand = (sort: number, state: boolean) => {
-    let newList = JSON.parse(JSON.stringify(list))
+    const newList = JSON.parse(JSON.stringify(list))
     newList.map(item => {
       if (item.sort === sort) {
         item.expand = state
@@ -160,7 +160,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
   }
 
   const handleKeyChange = (value: string, sort: number, key: string) => {
-    let newList = JSON.parse(JSON.stringify(list))
+    const newList = JSON.parse(JSON.stringify(list))
     newList.map(item => {
       if (item.sort === sort) {
         item[key] = value
@@ -223,7 +223,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
         reject()
         return
       }
-      let param: any = {
+      const param: any = {
         templateId: templateid,
         type: getAdvertType(type),
         adverts: addTempalteIdToList(advertList, templateid)
@@ -231,7 +231,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
       if (type === 'category') {
         param.categoryId = categoryid
       }
-      PublicApi.postTemplatePlatformSaveAdvert(param).then(res => {
+      PublicApi.postTemplateAdornWebEnterpriseSaveAdvert(param).then(res => {
         if (res.code === 1000) {
           resolve()
         } else {
@@ -273,7 +273,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
                 <div className={styles.advert_setting_line_name} onClick={() => handleExpand(item.sort, !item.expand)}>
                   <span>{item.name}</span>
                   {
-                    !!item.expand ? <CaretUpOutlined className={styles.icon} /> : <CaretDownOutlined className={styles.icon} />
+                    item.expand ? <CaretUpOutlined className={styles.icon} /> : <CaretDownOutlined className={styles.icon} />
                   }
                 </div>
                 {
@@ -320,4 +320,6 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
   )
 })
 
-export default AdvertSetting 
\ No newline at end of file
+AdvertSetting.displayName = "AdvertSetting"
+
+export default AdvertSetting

src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.tsx

@@ -4,7 +4,7 @@ import { Row, Col, Button, Input, Pagination, Form, message, Modal } from 'antd'
 import SettingList from '../../../../components/SettingList'
 import BrandItem from './BrandItem'
 import SettingPanel from '../../../../components/SettingPanel'
-import { GetTemplatePlatformFindBrandListResponseDetail } from '@/services'
+import { GetTemplateAdornWebEnterpriseFindBrandListResponseDetail } from '@/services/TemplateApi'
 import { PublicApi } from '@/services/api'
 import { filterProps } from '../../../../utils'
 import styles from './index.less'
@@ -33,7 +33,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
   const { templateid, categoryid, brandList = [] } = props
   const [current, setCurrent] = useState<number>(1)
   const [pageSize, setPageSize] = useState<number>(10)
-  const [noSelectBrands, setNoSelectBrands] = useState<GetTemplatePlatformFindBrandListResponseDetail[]>([])
+  const [noSelectBrands, setNoSelectBrands] = useState<GetTemplateAdornWebEnterpriseFindBrandListResponseDetail[]>([])
   const [selectList, setSelectList] = useState<any>([])
   const [selectBrandList, setSelectBrandList] = useState<any>(brandList)
   const [brandIds, setBrandIds] = useState<any>([])
@@ -56,7 +56,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
       param = Object.assign(param, filterParam)
     }
 
-    PublicApi.getTemplatePlatformFindBrandList(param).then((res: any) => {
+    PublicApi.getTemplateAdornWebEnterpriseFindBrandList(param).then((res: any) => {
       if (res.code === 1000) {
         const dataInfo = res.data
         setTotalCount(dataInfo.totalCount)
@@ -144,7 +144,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
         ids.push(item.brandId)
       }
       param.brandIds = ids
-      PublicApi.postTemplatePlatformSaveBrand(param).then(res => {
+      PublicApi.postTemplateAdornWebEnterpriseSaveBrand(param).then(res => {
         if (res.code === 1000) {
           resolve()
         } else {

src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.tsx

@@ -6,13 +6,13 @@ import { clearSelectedStatus, changeProps } from 'lingxi-editor-core'
 import { PublicApi } from '@/services/api'
 import styles from './index.less'
 
-interface categoryItemType {
+interface CategoryItemType {
   categoryId: number,
   categoryName: string
 }
 
 interface CategoryRecommendSettingPropsType {
-  secondCategoryList: categoryItemType[];
+  secondCategoryList: CategoryItemType[];
   categoryAdvertPicUrl: string;
   onChange: Function;
   templateid: number;
@@ -40,20 +40,20 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
   }, [])
 
   const initSelectKeys = () => {
-    let result: number[] = []
-    for (let item of secondCategoryList) {
+    const result: number[] = []
+    for (const item of secondCategoryList) {
       result.push(item.categoryId)
     }
     setSelectKeys(result)
   }
 
   const fetchCategoryList = () => {
-    let param = {
+    const param: any = {
       categoryId: categoryid,
       templateId: templateid
     }
-    //@ts-ignore
-    PublicApi.getTemplatePlatformFindCategoryList(param).then(res => {
+
+    PublicApi.getTemplateAdornWebEnterpriseFindCategoryList(param).then(res => {
       const data = res.data
       setCategoryResponseList(data.categoryBOList || [])
     })
@@ -61,7 +61,7 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
 
   const handleSecondCategoryChange = (keys: any) => {
     setSelectKeys(keys)
-    let result = categoryResponseList.filter(item => keys.includes(item.categoryId))
+    const result = categoryResponseList.filter(item => keys.includes(item.categoryId))
     changeNewProps('secondCategoryList', result)
   }
 
@@ -115,14 +115,14 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
         message.error('最多推荐3个二级品类')
         return
       }
-      let param = {
+      const param: any = {
         templateId: templateid,
         categoryId: categoryid,
         categoryAdvertPicUrl,
         twoCategoryIds: selectKeys
       }
-      //@ts-ignore
-      PublicApi.postTemplatePlatformSaveCategory(param).then(res => {
+
+      PublicApi.postTemplateAdornWebEnterpriseSaveCategory(param).then(res => {
         if (res.code === 1000) {
           resolve()
         } else {

src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx

@@ -5,7 +5,7 @@ import SettingList from '../../../../components/SettingList'
 import GoodsItem from './GoodsItem'
 import SettingPanel from '../../../../components/SettingPanel'
 import { CaretUpOutlined, CaretDownOutlined } from '@ant-design/icons'
-import { GetTemplatePlatformFindGoodsListResponseDetail } from '@/services'
+import { GetTemplateAdornWebEnterpriseFindGoodsListResponseDetail } from '@/services/TemplateApi'
 import { PublicApi } from '@/services/api'
 import { filterProps } from '../../../../utils'
 import styles from './index.less'
@@ -36,7 +36,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
   const { templateid, categoryid, goodsList = [] } = props
   const [current, setCurrent] = useState<number>(1)
   const [pageSize, setPageSize] = useState<number>(10)
-  const [noSelectGoods, setNoSelectGoods] = useState<GetTemplatePlatformFindGoodsListResponseDetail[]>([])
+  const [noSelectGoods, setNoSelectGoods] = useState<GetTemplateAdornWebEnterpriseFindGoodsListResponseDetail[]>([])
   const [selectList, setSelectList] = useState<any>([])
   const [selectGoodsList, setSelectGoodsList] = useState<any>(goodsList)
   const [goodsIds, setGoodsIds] = useState<any>([])
@@ -70,7 +70,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
       pageSize: 100
     }
 
-    PublicApi.getTemplatePlatformFindCategoryList(param).then(res => {
+    PublicApi.getTemplateAdornWebEnterpriseFindCategoryList(param).then(res => {
        if (res.code === 1000) {
         const data = res.data
         setCategoryResponseList(data.categoryBOList || [])
@@ -109,7 +109,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
     }
 
     setSpinLoading(true)
-    PublicApi.getTemplatePlatformFindGoodsList(param).then((res: any) => {
+    PublicApi.getTemplateAdornWebEnterpriseFindGoodsList(param).then((res: any) => {
       if (res.code === 1000) {
         const dataInfo = res.data
         setTotalCount(dataInfo.totalCount)
@@ -232,7 +232,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
         ids.push(item.goodsId)
       }
       param.goodsIds = ids
-      PublicApi.postTemplatePlatformSaveGoods(param).then(res => {
+      PublicApi.postTemplateAdornWebEnterpriseSaveGoods(param).then(res => {
         if (res.code === 1000) {
           resolve()
         } else {

src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.tsx

@@ -4,7 +4,7 @@ import { Row, Col, Button, Input, Pagination, Form, message, Modal } from 'antd'
 import SettingList from '../../../../components/SettingList'
 import ShopItem from './ShopItem'
 import SettingPanel from '../../../../components/SettingPanel'
-import { GetTemplatePlatformFindShopListResponseDetail } from '@/services'
+import { GetTemplateAdornWebEnterpriseFindShopListResponseDetail } from '@/services/TemplateApi'
 import { PublicApi } from '@/services/api'
 import { filterProps } from '../../../../utils'
 import styles from './index.less'
@@ -33,7 +33,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
   const { templateid, categoryid, shopsList = [] } = props
   const [current, setCurrent] = useState<number>(1)
   const [pageSize, setPageSize] = useState<number>(10)
-  const [noSelectShops, setNoSelectShops] = useState<GetTemplatePlatformFindShopListResponseDetail[]>([])
+  const [noSelectShops, setNoSelectShops] = useState<GetTemplateAdornWebEnterpriseFindShopListResponseDetail[]>([])
   const [selectList, setSelectList] = useState<any>([])
   const [selectShopsList, setSelectShopsList] = useState<any>(shopsList)
   const [shopsIds, setShopsIds] = useState<any>([])
@@ -56,7 +56,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
       param = Object.assign(param, filterParam)
     }
 
-    PublicApi.getTemplatePlatformFindShopList(param).then((res: any) => {
+    PublicApi.getTemplateAdornWebEnterpriseFindShopList(param).then((res: any) => {
       if (res.code === 1000) {
         const dataInfo = res.data
         setTotalCount(dataInfo.totalCount)
@@ -160,7 +160,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
         ids.push(item.shopId)
       }
       param.shopIds = ids
-      PublicApi.postTemplatePlatformSaveShop(param).then(res => {
+      PublicApi.postTemplateAdornWebEnterpriseSaveShop(param).then(res => {
         if (res.code === 1000) {
           resolve()
         } else {