feat: 平台首页装修

src/pages/pageCustomized/configs/componentConfigs/LingXiUI/PlatformIndex.ts

@@ -135,7 +135,7 @@ const Merchant: ComponentConfigTypes = {
 const Information: ComponentConfigTypes = {
   propsConfig: {
     componentType: {
-      label: '行情资讯',
+      label: '行情资讯设置',
       type: PROPS_TYPES.platformInformation
     },
   },

src/pages/pageCustomized/configs/componentConfigs/LingXiUI/PlatformInformation.ts

@@ -3,9 +3,9 @@ import { ComponentConfigTypes, PROPS_TYPES } from 'lingxi-editor-core';
 // 平台首页行情资讯
 const PlatformInformation: ComponentConfigTypes = {
   propsConfig: {
-    children: {
-      label: '文本内容',
-      type: PROPS_TYPES.string,
+    componentType: {
+      label: '行情资讯设置',
+      type: PROPS_TYPES.platformInformation
     },
   },
 };

src/pages/pageCustomized/platformEdit/defaultData.ts

@@ -234,8 +234,8 @@ export const PurchaseAdvertConfig = {
 }
 
 export const FooterConfig = {
-  key: '22',
-  "22": {
+  key: '40',
+  "40": {
     "componentName": "Footer",
     "props": {},
   },

src/pages/pageCustomized/platformEdit/types.ts

 export interface DesingConfigItemType {
   name: string,
   status: boolean,
+  sort?: number,
   content: any
 }
 

src/pages/pageCustomized/platformEdit/utils.ts

@@ -227,18 +227,63 @@ export const defaultDesignConfig = [
         "thirdlyId": undefined,
         "name": "",
         "describe": "",
-        "goodsIdList": []
+        "goodsIdList": [],
+        "visible": false,
       },
-      // {
-      //   "advertImg": "",
-      //   "shopId": undefined,
-      //   "firstId": undefined,
-      //   "secondId": undefined,
-      //   "thirdlyId": undefined,
-      //   "name": "",
-      //   "describe": "",
-      //   "goodsIdList": []
-      // }
+      {
+        "advertImg": "",
+        "shopId": undefined,
+        "firstId": undefined,
+        "secondId": undefined,
+        "thirdlyId": undefined,
+        "name": "",
+        "describe": "",
+        "goodsIdList": [],
+        "visible": false,
+      },
+      {
+        "advertImg": "",
+        "shopId": undefined,
+        "firstId": undefined,
+        "secondId": undefined,
+        "thirdlyId": undefined,
+        "name": "",
+        "describe": "",
+        "goodsIdList": [],
+        "visible": false,
+      },
+      {
+        "advertImg": "",
+        "shopId": undefined,
+        "firstId": undefined,
+        "secondId": undefined,
+        "thirdlyId": undefined,
+        "name": "",
+        "describe": "",
+        "goodsIdList": [],
+        "visible": false,
+      },
+      {
+        "advertImg": "",
+        "shopId": undefined,
+        "firstId": undefined,
+        "secondId": undefined,
+        "thirdlyId": undefined,
+        "name": "",
+        "describe": "",
+        "goodsIdList": [],
+        "visible": false,
+      }, {
+        "advertImg": "",
+        "shopId": undefined,
+        "firstId": undefined,
+        "secondId": undefined,
+        "thirdlyId": undefined,
+        "name": "",
+        "describe": "",
+        "goodsIdList": [],
+        "visible": false,
+      }
     ]
   },
   {
@@ -257,6 +302,9 @@ export const defaultDesignConfig = [
     content: {
       marketList: [],
       information: {
+        allList: [],
+        bazaarList: [],
+        hotList: [],
         allIdList: [],
         bazaarIdList: [],
         hotIdList: [],

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

@@ -41,7 +41,7 @@ interface AdvertItemType {
 interface AdvertSettingPropsType {
   advertList: AdvertItemType[];
   onChange: Function;
-  type: 'banner' | 'bannerRight' | 'bannerBottom';
+  type: 'banner' | 'bannerRight' | 'bannerBottom' | 'floorBanner' | 'service';
   templateId: number;
   categoryid?: number;
 }

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

@@ -10,7 +10,6 @@ import { PublicApi } from '@/services/api'
 import { clearSelectedStatus, changeProps } from 'lingxi-editor-core'
 import SettingPanel from '../../../../components/SettingPanel'
 import styles from './index.less'
-import { useEffect } from 'react';
 interface PlatformGoodsProps {
   dataList: BrandItemType[],
   templateId: number

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

@@ -262,7 +262,6 @@ const PlatformGoods: React.FC<PlatformGoodsProps> = (props) => {
   const rowSelection = {
     selectedRowKeys: selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
-      console.log(selectedRowKeys, selectedRows)
       setSelectedRowKeys(selectedRowKeys)
       setSelectedRows(selectedRows)
     },

src/pages/pageCustomized/settingsPanel/propsSettings/components/PlatformInformation/index.less

+@import '../common.less';
+
+.tb_line {
+  background-color: #FFF;
+  height: 48px;
+  display: flex;
+  align-items: center;
+
+  &:not(:last-child) {
+    border-bottom: 1px solid #F4F5F7;
+  }
+
+  &.tb_head {
+    background-color: #F7F8FA;
+    height: 40px;
+    font-size: 12px;
+    color: #909399;
+  }
+
+  &_item {
+    padding-left: 8px;
+
+    &.w32 {
+      width: 32px;
+    }
+
+    &.w160 {
+      width: 160px;
+    }
+
+    &.w320 {
+      width: 320px;
+    }
+
+    &.w280 {
+      width: 280px;
+    }
+
+    &.w448 {
+      width: 448px;
+    }
+
+    &.w576 {
+      width: 576px;
+    }
+
+    &.w128 {
+      width: 128px;
+    }
+
+    &_btn_group {
+      display: flex;
+
+    }
+
+    :global {
+      .ant-input-group-addon {
+        color: #d9d9d9;
+      }
+    }
+  }
+}
+
+.add_btn {
+  background-color: #F7F8FA;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 32px;
+  color: #00B37A;
+  cursor: pointer;
+
+  &.martop {
+    margin-top: 48px;
+  }
+
+  &>span {
+    margin-left: 4px;
+
+  }
+}
+
+.form_line {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16px;
+
+  .date_picker {
+    width: 160px;
+  }
+
+  .date_picker_split {
+    font-size: 12px;
+    color: #909399;
+    margin: 0 8px;
+  }
+}
+
+.information_titl {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

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

@@ -61,7 +61,6 @@ const PlatformService: React.FC<PlatformLogisticsProps> = (props) => {
       }
       newList.push(newItem)
     })
-    console.log(newList, 'newList')
     changeNewProps('dataList', newList)
   }
 

src/pages/pageCustomized/settingsPanel/propsSettings/components/common.less

+.setting_line {
+  margin-bottom: 12px;
+  display: flex;
+  background-color: #FFF;
+
+  &_main {
+    position: relative;
+    flex: 1;
+
+  }
+
+  &_addItem {
+    flex: 1;
+    margin-top: 16px;
+
+    &_input {
+      width: 100%;
+    }
+
+    &_line {
+      display: flex;
+      margin-bottom: 16px;
+
+      &_label {
+        width: 80px;
+        font-size: 12px;
+        color: #909399;
+
+        &.height32 {
+          display: flex;
+          height: 32px;
+          align-items: center;
+        }
+      }
+
+      &_brief {
+        flex: 1;
+
+        .select_line {
+          display: flex;
+          flex-wrap: nowrap;
+          justify-content: space-between;
+        }
+      }
+    }
+  }
+
+  &_sort {
+    width: 32px;
+    background-color: #FAFBFC;
+    height: 32px;
+    line-height: 32px;
+    text-align: center;
+    margin-right: 8px;
+  }
+
+  &_name {
+    display: flex;
+    flex: 1;
+    height: 32px;
+    align-items: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    background-color: #FAFBFC;
+
+
+    &>.icon {
+      cursor: pointer;
+      // width: 32px;
+      // height: 32px;
+      // line-height: 32px;
+      margin: 0 12px;
+    }
+  }
+
+  &_operation {
+    margin-left: auto;
+    background-color: #FAFBFC;
+    height: 32px;
+
+    &_btn {
+      margin-left: 16px;
+      width: 16px;
+
+      &_icon {
+        width: 16px;
+        height: 16px;
+
+      }
+    }
+  }
+}

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

@@ -12,6 +12,7 @@ import PlatformMerchant from './components/PlatformMerchant'
 import PlatformLogistics from './components/PlatformLogistics'
 import PlatformProcess from './components/PlatformProcess'
 import PlatformService from './components/PlatformService'
+import PlatformInformation from './components/PlatformInformation'
 import MallNav from './components/MallNav'
 import CategoryRecommendSetting from './components/CategoryreCommendSetting'
 import { SelectedInfoType, clearSelectedStatus, PROPS_TYPES, addPropsConfig } from 'lingxi-editor-core';
@@ -69,6 +70,8 @@ const PropsSettings: React.FC<PropsSettingsPropsType> = (props) => {
           return <PlatformProcess templateId={templateId} {...initProps} />
         case PROPS_TYPES.platformService:
           return <PlatformService templateId={templateId} {...initProps} />
+        case PROPS_TYPES.platformInformation:
+          return <PlatformInformation templateId={templateId} {...initProps} />
         case PROPS_TYPES.platformAddGoodsItem:
           console.log(selectedInfo, 'selectedInfo')
 

src/services/api.ts

@@ -3,6 +3,7 @@ import * as PassApi from './PassApi'
 import * as WarehouseApi from './WarehouseApi'
 import * as MemberApi from './MemberApi'
 import * as ProductApi from './ProductApi'
+import * as Product2Api from './Product2Api'
 import * as TemplateApi from './TemplateApi'
 import * as Template2Api from './Template2Api'
 import * as PayApi from './PayApi'
@@ -29,6 +30,7 @@ export const PublicApi = {
   ...WarehouseApi,
   ...MemberApi,
   ...ProductApi,
+  ...Product2Api,
   ...TemplateApi,
   ...Template2Api,
   ...PayApi,

ytt.config.ts

@@ -4,6 +4,7 @@ const tokenList = [
   { name: 'Logistics', token: '8d14d945507d1f8cd89afe139ca6d111bbad25f702fafe0aec59d3c9cd2e0ffe', categoryIds: [0] },  // 物流服务
   { name: 'Member', token: '3a46198c5b97ac7147e5b07ad2dff5ac5c93c1afed47e1911961db87149e6ebf', categoryIds: [0] },  // 商户会员管理服务
   { name: 'Product', token: 'efe99e20ed1375dc0db3e809e4fc7692f42ecebaf60cd77e65c50ed65d6ba6c4', categoryIds: [0] },  // 商品服务
+  { name: 'Product2', token: 'df37f2a0e3829c4288708ae211920bdbdee55e5e2f48b1e8cf7d1925ac618d9a', categoryIds: [0] },  // 商品服务V2
   { name: 'Template', token: '7ec923520215c7e2f771867cb4d29cafbf823daf0fb2d3d9fa70b57a523c8bfb', categoryIds: [0] },  // 店铺模板服务
   { name: 'Template2', token: '7bb5578bc50e4e7935cbc146a2192e978053d5380cc96fcfdc0a754cfe885ec5', categoryIds: [0] },  // 店铺模板服务
   { name: 'Pay', token: 'c789e0e56ee8a8cc2fbd85f930eb2928c58fc1014583c6643acf29cff954da49', categoryIds: [0] }, // 支付服务