diff --git a/src/stores/Products/Index.js b/src/stores/Products/Index.js index 61e49d1..850e8c4 100644 --- a/src/stores/Products/Index.js +++ b/src/stores/Products/Index.js @@ -66,7 +66,7 @@ export const delProductExtrasAction = async (body) => { * @param {object} param { id, travel_agency_id, use_year } */ export const getAgencyProductExtrasAction = async (param) => { - const _param = { ...param, use_year: (param.use_year || '').replace('all', '') }; + const _param = { ...param, use_year: String(param.use_year || '').replace('all', '') }; const { errcode, result } = await fetchJSON(`${HT_HOST}/Service_BaseInfoWeb/products_extras`, _param); return errcode !== 0 ? [] : result; }; diff --git a/src/views/products/Detail/Extras.jsx b/src/views/products/Detail/Extras.jsx index 6fbb1b8..0a49089 100644 --- a/src/views/products/Detail/Extras.jsx +++ b/src/views/products/Detail/Extras.jsx @@ -10,12 +10,15 @@ import RequireAuth from '@/components/RequireAuth'; import { PERM_PRODUCTS_MANAGEMENT } from '@/config'; import { useProductsTypesMapVal } from '@/hooks/useProductsSets'; import { usingStorage } from '@/hooks/usingStorage'; +import useProductsStore from '@/stores/Products/Index'; const NewAddonModal = ({ onPick, ...props }) => { - const { travel_agency_id, use_year } = useParams(); + // const { travel_agency_id, use_year } = useParams(); const { t } = useTranslation(); const { notification, message } = App.useApp(); + const [{ travel_agency_id, use_year }] = useProductsStore((state) => [state.switchParams]); + const productsTypesMapVal = useProductsTypesMapVal(); const [open, setOpen] = useState(false); @@ -29,7 +32,7 @@ const NewAddonModal = ({ onPick, ...props }) => { setSearchLoading(true); setSearchResult([]); const search_year = year || use_year; - const result = await searchPublishedProductsAction({ ...param, use_year: search_year, travel_agency_id, }); + const result = await searchPublishedProductsAction({ ...param, use_year: search_year, travel_agency_id }); setSearchResult(result); setSearchLoading(false); }; @@ -110,8 +113,9 @@ const Extras = ({ productId, onChange, ...props }) => { const { t } = useTranslation(); const { notification, message } = App.useApp(); - const { travel_agency_id, use_year } = useParams(); + // const { travel_agency_id, use_year } = useParams(); const { travelAgencyId } = usingStorage(); + const [{travel_agency_id, use_year}] = useProductsStore((state) => [state.switchParams]); const [extrasData, setExtrasData] = useState([]); diff --git a/src/views/products/Detail/ProductInfo.jsx b/src/views/products/Detail/ProductInfo.jsx index 077fac5..c42c29c 100644 --- a/src/views/products/Detail/ProductInfo.jsx +++ b/src/views/products/Detail/ProductInfo.jsx @@ -93,7 +93,7 @@ const ProductInfo = ({ ...props }) => { } } - // console.log(readyToSubInfo, "\n", mergedLgc); + // console.log('before save', '\n lgcEdits:', lgcEdits, '\n mergedLgc', mergedLgc); // return false; // debug: 0 /** 提交保存 */ setLoading(true); diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx index 16259c2..1822321 100644 --- a/src/views/products/Detail/ProductInfoForm.jsx +++ b/src/views/products/Detail/ProductInfoForm.jsx @@ -49,7 +49,7 @@ const InfoForm = ({ onSubmit, onReset, onValuesChange, editablePerm, infoEditabl setShowSave(infoEditable || priceEditable); // setEditable(editable0); return () => {}; - }, [editingProduct?.info?.id, editablePerm, infoEditable, priceEditable]); + }, [editingProduct, editablePerm, infoEditable, priceEditable]); const onFinish = (values) => { console.log('Received values of form, origin form value: \n', values); @@ -250,19 +250,20 @@ function getFields(props) { 99,