From d6b779bde4240064195f6ba578282eef7aae3116 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Mon, 23 Jun 2025 19:18:17 +0800 Subject: [PATCH] update --- src/layouts/BasicLayout.tsx | 16 + .../travelMember/MallBrandManage/index.tsx | 419 ++++++++++++++++- .../MallClassificationManage/index.tsx | 440 +++++++++++++++++- .../ProductSpecificationManage/index.tsx | 365 ++++++++++++++- src/pages/travelMember/service.ts | 50 ++ 5 files changed, 1287 insertions(+), 3 deletions(-) diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 62b0b2b..fdd818f 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -235,6 +235,22 @@ const BasicLayout: React.FC = (props) => { } }) + // 品牌分类 + getFieldEnumTree({ FieldExplainField: 'BRAND_CATEGORY' }).then((BRANDCATEGORY: any) => { + if (BRANDCATEGORY && BRANDCATEGORY.length > 0) { + const obj: any = {} + const list: any = [] + BRANDCATEGORY.forEach((item: any) => { + list.push({ label: item.label, value: item.value }) + obj[item.value] = item.label + }) + session.set('BRANDCATEGORYList', list); + session.set('BRANDCATEGORYObj', obj); + session.set('BRANDCATEGORYTree', BRANDCATEGORY); + } + }) + + // 消费类型 getFieldEnumTree({ FieldExplainField: 'CONSUMPTIONRECORD_TYPE' }).then((CONSUMPTIONRECORDTYPE: any) => { diff --git a/src/pages/travelMember/MallBrandManage/index.tsx b/src/pages/travelMember/MallBrandManage/index.tsx index 3f4b2dd..9ec58e0 100644 --- a/src/pages/travelMember/MallBrandManage/index.tsx +++ b/src/pages/travelMember/MallBrandManage/index.tsx @@ -1 +1,418 @@ -// 商城品牌管理 \ No newline at end of file +// 商城品牌管理 +import { connect } from "umi"; +import type { CurrentUser } from "umi"; +import type { ConnectState } from "@/models/connect"; +import React, { useRef, useState } from "react"; +import ProCard from "@ant-design/pro-card"; +import { MenuFoldOutlined, PlusOutlined } from "@ant-design/icons"; +import type { FormInstance } from "antd"; +import { Button, Col, Form, message, Modal, Popconfirm, Row, Space, Spin, Tree, TreeSelect } from "antd"; +import useRequest from "@ahooksjs/use-request"; +import { getServerpartTree } from "@/services/options"; +import type { ActionType } from "@ant-design/pro-table"; +import ProTable from "@ant-design/pro-table"; +import ReactHTMLTableToExcel from "react-html-table-to-excel"; +import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSelectTree"; +import { handlDeleteBRAND, handleGetBRANDList, handleSynchroBRAND } from "../service"; +import session from "@/utils/session"; +import Draggable from "react-draggable"; +import ProForm, { ProFormDatePicker, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea } from "@ant-design/pro-form"; +import moment from 'moment' + + +const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => { + const { currentUser } = props + const downloadBtnRef = useRef() + const actionRef = useRef(); + const formRef = useRef(); + const [reqDetailList, setReqDetailList] = useState(); // 合计项数据源 + const [printOut, setPrintOut] = useState(); // 打印数据的内容 + const [collapsible, setCollapsible] = useState(false) + const [treeView, setTreeView] = useState() + const [printIndex, setPrintIndex] = useState(new Date().getTime()) + + let BRANDCATEGORYObj = session.get('BRANDCATEGORYObj') + let BRANDCATEGORYList = session.get('BRANDCATEGORYList') + let brandObj = session.get('brandObj') + let brandList = session.get('brandList') + + // 树相关的属性和方法 + const [selectedId, setSelectedId] = useState() + // 导出的加载效果 + const [showLoading, setShowLoading] = useState(false) + // 是否显示打印的表格 + const [showExportTable, setShowExportTable] = useState(false) + // 查询的条件 + const [searchParams, setSearchParams] = useState() + const [modalVisible, handleModalVisible] = useState(); + const [disabled, setDraggleDisabled] = useState() // 是否拖动 + const draggleRef = React.createRef() + const [currentRow, setCurrentRow] = useState(); + const [confirmLoading, handleConfirmLoading] = useState(false) // 弹出框的内容表单是否在提交 + const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置 + + + const onDraggaleStart = (event, uiData) => { + const { clientWidth, clientHeight } = window.document.documentElement; + const targetRect = draggleRef.current?.getBoundingClientRect(); + if (!targetRect) { + return; + } + setBounds({ + left: -targetRect.left + uiData.x, + right: clientWidth - (targetRect.right - uiData.x), + top: -targetRect.top + uiData.y, + bottom: clientHeight - (targetRect.bottom - uiData.y), + }); + }; + const columns: any = [ + { + dataIndex: 'BRAND_INDEX', + title: '品牌索引', + width: 120, + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'BRAND_NAME', + title: '品牌名称', + align: 'center', + width: 150, + hideInSearch: true, + ellipsis: true, + }, + { + dataIndex: 'BRAND_CATEGORY', + title: '品牌分类', + width: 120, + valueType: 'select', + align: 'center', + ellipsis: true, + valueEnum: BRANDCATEGORYObj + // request: async () => { + // return await getFieldEnumTree({ FieldExplainField: 'BRAND_CATEGORY', sessionName: 'BRAND_CATEGORY' }); + // }, + // render: (_, record) => { + // return + // {getFieldEnumName('BRAND_CATEGORY', record?.BRAND_CATEGORY)} + // + // }, + }, + { + dataIndex: 'BRAND_TYPE', + title: '品牌类型', + valueType: 'select', + align: 'center', + width: 120, + ellipsis: true, + valueEnum: brandObj + // request: async () => { + // return await getFieldEnumTree({ FieldExplainField: 'BRAND_TYPE', sessionName: 'BRAND_TYPE' }); + // }, + // render: (_, record) => { + // return + // {getFieldEnumName('BRAND_TYPE', record?.BRAND_TYPE)} + // + // }, + }, + { + dataIndex: 'BRAND_STATE', + title: '有效状态', + align: 'center', + width: 120, + hideInSearch: true, + valueType: 'select', + valueEnum: { + "1": "有效", + "0": "无效" + } + }, + { + dataIndex: 'BRAND_DESC', + title: '品牌介绍', + align: 'center', + width: 120, + hideInSearch: true, + ellipsis: true, + }, + + { + dataIndex: 'option', + title: '操作', + width: 120, + valueType: 'option', + align: 'center', + hideInSearch: true, + render: (_, record) => { + return ( + + { + // setCurrentRow({ ...record }); + // handleModalVisible(true); + }} + > + 编辑 + + { + // await handelDelete(record.BRAND_ID); + }}> + 删除 + + + ); + }, + }, + ]; + + + const handelDelete = async (id: number) => { + console.log('fjsdfsdflksa', id); + const req: any = { + SERVERPARTSELLERId: id + } + const result = await handlDeleteBRAND(req) + if (result.Result_Code !== 100) { + message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`); + } else { + message.success('删除成功！'); + actionRef.current?.reload() + } + }; + + const handleAddUpdate = async (res: any) => { + let req: any = {} + if (currentRow?.SELLER_ID) { + req = { + ...currentRow, + ...res, + UPDATE_STAFF_ID: currentUser?.ID, + UPDATE_STAFF_NAME: currentUser?.Name, + UPDATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), + } + } else { + req = { + ...res, + PROVINCE_CODE: currentUser?.ProvinceCode, + ISVALID: 1, + CREATE_STAFF_ID: currentUser?.ID, + CREATE_STAFF_NAME: currentUser?.Name, + CREATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'), + } + } + + const data = await handleSynchroBRAND(req) + handleConfirmLoading(false) + if (data.Result_Code === 100) { + message.success(data.Result_Desc) + formRef?.current?.resetFields() + setCurrentRow(undefined) + handleModalVisible(false) + actionRef.current?.reload() + } else { + message.error(data.Result_Desc) + } + + }; + + + return ( +
{ + // 打印报表 + if (!reqDetailList || reqDetailList.length === 0) return; + setPrintOut(el); + }} > + +
+
+ 单品销售排行统计} + search={{ span: 6 }} + request={async (params) => { + + setSearchParams(params) + const req: any = { + searchParameter: { + OWNERUNIT_ID: currentUser?.OwnerUnitId, + PROVINCE_CODE: currentUser?.ProvinceCode, + BRAND_CATEGORY: 2000 + }, + PageIndex: 1, + PageSize: 999999, + } + const data = await handleGetBRANDList(req) + console.log('datadatadatadatadata', data); + if (data.List && data.List.length > 0) { + return { data: data.List, success: true, total: data.TotalCount } + } + return { data: [], success: true } + }} + toolbar={{ + actions: [ + , + ] + }} + /> +
+
+ + + { + if (disabled) { + setDraggleDisabled(false) + } + }} + onMouseOut={() => { + setDraggleDisabled(true) + }} + + onFocus={() => { }} + onBlur={() => { }} + > + {currentRow ? '更新品牌' : '新建品牌'} +
+ } + destroyOnClose={true} + width={900} + visible={modalVisible} + confirmLoading={confirmLoading} + afterClose={() => { + formRef.current?.resetFields(); + setCurrentRow(undefined); + }} + onCancel={() => { + handleConfirmLoading(false) + handleModalVisible(false) + }} + + onOk={async () => { // 提交框内的数据 + formRef?.current?.validateFields().then(() => { + handleConfirmLoading(true) + formRef?.current?.submit() + }) + }} + modalRender={(modal) => { + return onDraggaleStart(event, uiData)} + > +
{modal}
+ + }} + > + { + let newValue: any = { ...values }; + if (currentRow) { + // 编辑数据 + newValue = { ...values, BRAND_ID: currentRow.BRAND_ID }; + } + // 如果有开关，要把开关的代码写进去 + await handleAddUpdate(newValue); + handleConfirmLoading(false) + }} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) +} + +export default connect(({ user }: ConnectState) => ({ + currentUser: user.currentUser +}))(MallBrandManage); + + diff --git a/src/pages/travelMember/MallClassificationManage/index.tsx b/src/pages/travelMember/MallClassificationManage/index.tsx index 1713770..625a798 100644 --- a/src/pages/travelMember/MallClassificationManage/index.tsx +++ b/src/pages/travelMember/MallClassificationManage/index.tsx @@ -1 +1,439 @@ -// 商城分类管理 \ No newline at end of file +// 商城分类管理 +import React, { useRef, useState, Suspense } from 'react'; +import moment from 'moment'; // 时间相关引用，没有使用可以删除 +import numeral from "numeral"; // 数字相关引用，没有使用可以删除 +import { connect } from 'umi'; + +import useRequest from '@ahooksjs/use-request'; // 请求数据的引用 +import Draggable from 'react-draggable'; +import SubMenu from "antd/lib/menu/SubMenu"; +import ProTable from '@ant-design/pro-table'; +import ProDescriptions from '@ant-design/pro-descriptions'; +import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from '@ant-design/pro-form'; +import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; +import { PageContainer } from '@ant-design/pro-layout'; +import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect } from 'antd'; + +import type { CurrentUser } from "umi"; +import type { ConnectState } from '@/models/connect'; +import type { ActionType, ProColumns } from '@ant-design/pro-table'; +import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions'; +import type { FormInstance } from 'antd'; + +import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 +import { handlGetUSERDEFINEDTYPEList } from '../service'; + + +const MallClassificationManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => { + const { currentUser } = props + const actionRef = useRef(); + const formRef = useRef(); + const [currentRow, setCurrentRow] = useState(); + const [showDetail, setShowDetail] = useState(); + const [modalVisible, handleModalVisible] = useState(); + const [confirmLoading, handleConfirmLoading] = useState(false) // 弹出框的内容表单是否在提交 + const [searchParams, setSearchParams] = useState(); + + // 弹出框拖动效果 + const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置 + const [disabled, setDraggleDisabled] = useState() // 是否拖动 + const draggleRef = React.createRef() + + const onDraggaleStart = (event, uiData) => { + const { clientWidth, clientHeight } = window.document.documentElement; + const targetRect = draggleRef.current?.getBoundingClientRect(); + if (!targetRect) { + return; + } + setBounds({ + left: -targetRect.left + uiData.x, + right: clientWidth - (targetRect.right - uiData.x), + top: -targetRect.top + uiData.y, + bottom: clientHeight - (targetRect.bottom - uiData.y), + }); + }; + // 拖动结束 + + // 定义列表字段内容 + const columns = [ + { + dataIndex: 'USERDEFINEDTYPE_NAME', + title: '类别名称', + align: 'center', + hideInSearch: true, + hideInDescriptions: true, + }, + { + dataIndex: 'USERDEFINEDTYPE_INDEX', + title: '类别索引', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'USERDEFINEDTYPE_STATE', + title: '有效状态', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'OWNERUNIT_NAME', + title: '业主单位', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'option', + title: '操作', + valueType: 'option', + hideInSearch: true, + render: (_, record) => { + return ( + + + { + setCurrentRow({ ...record }); + handleModalVisible(true); + }} + > + 编辑 + + { + handelDelete(record.USERDEFINEDTYPE_ID); + + }} + > + 删除 + + + ); + }, + }, + ]; + + return ( + + { + return `${record?.USERDEFINEDTYPE_ID}` + }} + formRef={formRef} + headerTitle="商品自定义类别列表" // 列表表头 + actionRef={actionRef} + search={{ span: 6, labelWidth: 'auto' }} + // 请求数据 + request={async (params, sorter) => { + + const req = { + searchParameter: { + + }, + PageIndex: 1, + PageSize: 999999 + } + const data = await handlGetUSERDEFINEDTYPEList(req); + console.log('datadatadatadatadata', data); + if (data.List && data.List.length > 0) { + return { data: data.List, success: true, total: data.TotalCount } + } + return { data: [], success: true } + }} + columns={columns} + toolbar={{ + actions: [ + // 新增按钮 + , + ], + }} + pagination={{ defaultPageSize: 10 }} + /> + + { + if (disabled) { + setDraggleDisabled(false) + } + }} + onMouseOut={() => { + setDraggleDisabled(true) + }} + + onFocus={() => { }} + onBlur={() => { }} + > + {currentRow ? '更新商品自定义类别' : '新建商品自定义类别'} + + } + destroyOnClose={true} + width={900} + visible={modalVisible} + confirmLoading={confirmLoading} + afterClose={() => { + formRef.current?.resetFields(); + setCurrentRow(undefined); + }} + onCancel={() => { + handleConfirmLoading(false) + handleModalVisible(false) + }} + + onOk={async () => { // 提交框内的数据 + formRef?.current?.validateFields().then(() => { + handleConfirmLoading(true) + formRef?.current?.submit() + }) + }} + modalRender={(modal) => { + return onDraggaleStart(event, uiData)} + > +
{modal}
+ + }} + > + { + let newValue = { ...values }; + if (currentRow) { + // 编辑数据 + newValue = { ...values, USERDEFINEDTYPE_ID: currentRow.USERDEFINEDTYPE_ID }; + } + // 如果有开关，要把开关的代码写进去 + handleAddUpdate(newValue); + + handleConfirmLoading(false) + + }} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; +export default connect(({ user }: ConnectState) => ({ + currentUser: user.currentUser +}))(MallClassificationManage); diff --git a/src/pages/travelMember/ProductSpecificationManage/index.tsx b/src/pages/travelMember/ProductSpecificationManage/index.tsx index 9f325ad..42f1068 100644 --- a/src/pages/travelMember/ProductSpecificationManage/index.tsx +++ b/src/pages/travelMember/ProductSpecificationManage/index.tsx @@ -1 +1,364 @@ -// 商品规格管理 \ No newline at end of file +// 商品规格管理 +import React, { useRef, useState, Suspense } from 'react'; +import moment from 'moment'; // 时间相关引用，没有使用可以删除 +import numeral from "numeral"; // 数字相关引用，没有使用可以删除 +import { connect } from 'umi'; + +import useRequest from '@ahooksjs/use-request'; // 请求数据的引用 +import Draggable from 'react-draggable'; +import SubMenu from "antd/lib/menu/SubMenu"; +import ProTable from '@ant-design/pro-table'; +import ProDescriptions from '@ant-design/pro-descriptions'; +import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormUploadButton } from '@ant-design/pro-form'; +import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons'; +import { PageContainer } from '@ant-design/pro-layout'; +import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect } from 'antd'; + +import type { CurrentUser } from "umi"; +import type { ConnectState } from '@/models/connect'; +import type { ActionType, ProColumns } from '@ant-design/pro-table'; +import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions'; +import type { FormInstance } from 'antd'; + +import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除 +import PageTitleBox from "@/components/PageTitleBox"; + + +const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => { + const { currentUser } = props + const actionRef = useRef(); + const formRef = useRef(); + const [currentRow, setCurrentRow] = useState(); + const [showDetail, setShowDetail] = useState(); + const [modalVisible, handleModalVisible] = useState(); + const [confirmLoading, handleConfirmLoading] = useState(false) // 弹出框的内容表单是否在提交 + const [searchParams, setSearchParams] = useState(); + + // 弹出框拖动效果 + const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置 + const [disabled, setDraggleDisabled] = useState() // 是否拖动 + const draggleRef = React.createRef() + + const onDraggaleStart = (event, uiData) => { + const { clientWidth, clientHeight } = window.document.documentElement; + const targetRect = draggleRef.current?.getBoundingClientRect(); + if (!targetRect) { + return; + } + setBounds({ + left: -targetRect.left + uiData.x, + right: clientWidth - (targetRect.right - uiData.x), + top: -targetRect.top + uiData.y, + bottom: clientHeight - (targetRect.bottom - uiData.y), + }); + }; + + // 定义列表字段内容 + const columns: any = [ + { + dataIndex: 'PROVINCE_CODE', + title: '省份编码', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'COMMODITY_NAME', + title: '商品名称', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'USERDEFINEDTYPE_NAME', + title: '类别名称', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'COMMODITY_STATE', + title: '商品状态', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'OPERATE_DATE', + title: '操作时间', + valueType: 'fromNow', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'COMMODITY_DESC', + title: '备注说明', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'STAFF_NAME', + title: '操作员名称', + align: 'center', + hideInSearch: true, + }, + { + dataIndex: 'option', + title: '操作', + valueType: 'option', + hideInSearch: true, + render: (_, record) => { + return ( + + { + setCurrentRow({ ...record }); + handleModalVisible(true); + }} + > + 编辑 + + { + await handelDelete(record.COMMODITY_MULTI_ID); + }} + > + 删除 + + + ); + }, + }, + ]; + + // const handelDelete = async (commodity_multiid: number) => { + // const result = await delcommodity_multi({ commodity_multiid: commodity_multiid }); + + // if (result.Result_Code !== 100) { + // message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`); + // } else { + // message.success('删除成功！'); + // actionRef.current?.reload() + // } + // }; + + // const handleAddUpdate = async (fields: COMMODITY_MULTIModel) => { + // const hide = message.loading('正在提交...'); + + // const result = await updatecommodity_multi(fields); + // hide(); + // if (result.Result_Code !== 100) { + // message.error(`${result.Result_Desc}` || `${result.Result_Code}:提交失败`); + // return false; + // } + // return result.Result_Data ? result.Result_Data : true; + // }; + + return ( +
+
+ + style={{ height: 'calc(100vh - 135px)', background: '#fff' }} + scroll={{ y: 'calc(100vh - 410px)' }} + rowKey={(record) => { + return `${record?.COMMODITY_MULTI_ID}` + }} + formRef={formRef} + headerTitle={} // 列表表头 + actionRef={actionRef} + search={{ span: 6, labelWidth: 'auto' }} + // 请求数据 + request={async (params, sorter) => { + + const searchWholeParams = { + searchParameter: { ...params }, + sortstr: sortstr.length ? sortstr.toString() : "", + pagesize: 999999 + } + setSearchParams(searchWholeParams) + const data = await getList(searchWholeParams); + return data; + }} + columns={columns} + toolbar={{ + actions: [ + // 新增按钮 + , + ], + }} + /> + + { + if (disabled) { + setDraggleDisabled(false) + } + }} + onMouseOut={() => { + setDraggleDisabled(true) + }} + + onFocus={() => { }} + onBlur={() => { }} + > + {currentRow ? '更新商品多规格' : '新建商品多规格'} +
+ } + destroyOnClose={true} + width={900} + visible={modalVisible} + confirmLoading={confirmLoading} + afterClose={() => { + formRef.current?.resetFields(); + setCurrentRow(undefined); + }} + onCancel={() => { + handleConfirmLoading(false) + handleModalVisible(false) + }} + + onOk={async () => { // 提交框内的数据 + formRef?.current?.validateFields().then(() => { + handleConfirmLoading(true) + formRef?.current?.submit() + }) + }} + modalRender={(modal) => { + return onDraggaleStart(event, uiData)} + > +
{modal}
+ + }} + > + { + let newValue: COMMODITY_MULTIModel = { ...values }; + if (currentRow) { + // 编辑数据 + newValue = { ...values, COMMODITY_MULTI_ID: currentRow.COMMODITY_MULTI_ID }; + } + // 如果有开关，要把开关的代码写进去 + const success = await handleAddUpdate(newValue as COMMODITY_MULTIModel); + + handleConfirmLoading(false) + if (success) { + if (actionRef.current) { + actionRef.current.reload(); + } + handleModalVisible(false); + } + }} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + ); +}; +export default connect(({ user }: ConnectState) => ({ + currentUser: user.currentUser +}))(ProductSpecificationManage); diff --git a/src/pages/travelMember/service.ts b/src/pages/travelMember/service.ts index 4751d94..abda542 100644 --- a/src/pages/travelMember/service.ts +++ b/src/pages/travelMember/service.ts @@ -163,4 +163,54 @@ export async function handleDeleteMEMBERADDRESS(params: any) { return [] } return data +} + + +// 获取品牌管理列表 +export async function handleGetBRANDList(params: any) { + const data = await requestEncryption(`/BaseInfo/GetBRANDList`, { + method: 'POST', + data: { ...params, requestEncryption: true } + }) + if (data.Result_Code !== 100) { + return [] + } + return data +} + +// 同步品牌信息 +export async function handleSynchroBRAND(params: any) { + const data = await requestEncryption(`/MallBasic/SynchroBRAND`, { + method: 'POST', + data: { ...params, requestEncryption: true } + }) + if (data.Result_Code !== 100) { + return [] + } + return data +} + +// 删除品牌信息 +export async function handlDeleteBRAND(params: any) { + const data = await requestEncryption(`/MallBasic/DeleteBRAND`, { + method: 'POST', + data: { ...params, requestEncryption: true } + }) + if (data.Result_Code !== 100) { + return [] + } + return data +} + + +// 获取商城分类管理 +export async function handlGetUSERDEFINEDTYPEList(params: any) { + const data = await requestEncryption(`/MemberBasic/GetUSERDEFINEDTYPEList`, { + method: 'POST', + data: { ...params, requestEncryption: true } + }) + if (data.Result_Code !== 100) { + return [] + } + return data } \ No newline at end of file