From 80c1b986714463650f84d49b1b459efadd3d1c2b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 28 Jun 2024 09:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E9=99=84=E5=8A=A0=E9=A1=B9=E7=9B=AE=20=E6=B7=BB=E5=8A=A0/?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/Products/Index.js         |  8 ++++----
 src/views/products/Detail/Extras.jsx | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/stores/Products/Index.js b/src/stores/Products/Index.js
index fe2fb9f..a5c87cd 100644
--- a/src/stores/Products/Index.js
+++ b/src/stores/Products/Index.js
@@ -27,18 +27,18 @@ export const getAgencyProductsAction = async (param) => {
 };
 
 /**
- * todo:
+ *
  */
 export const addProductExtraAction = async (body) => {
-  const { errcode, result } = await postJSON(`${HT_HOST}/products/extras`, body);
+  const { errcode, result } = await postJSON(`${HT_HOST}/Service_BaseInfoWeb/products_extras_add`, body);
   return errcode === 0 ? true : false;
 };
 
 /**
- * todo:
+ *
  */
 export const delProductExtrasAction = async (body) => {
-  const { errcode, result } = await postJSON(`${HT_HOST}/products/extras/del`, body);
+  const { errcode, result } = await postJSON(`${HT_HOST}/Service_BaseInfoWeb/products_extras_del`, body);
   return errcode === 0 ? true : false;
 };
 
diff --git a/src/views/products/Detail/Extras.jsx b/src/views/products/Detail/Extras.jsx
index 2ee8587..0f2d23c 100644
--- a/src/views/products/Detail/Extras.jsx
+++ b/src/views/products/Detail/Extras.jsx
@@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { App, Table, Button, Modal, Popconfirm } from 'antd';
 import { getAgencyProductExtrasAction, getAgencyProductsAction, addProductExtraAction, delProductExtrasAction } from '@/stores/Products/Index';
-import { cloneDeep } from '@/utils/commons';
+import { cloneDeep, pick } from '@/utils/commons';
 import SearchForm from '@/components/SearchForm';
 
 import RequireAuth from '@/components/RequireAuth';
@@ -46,7 +46,7 @@ const NewAddonModal = ({ onPick, ...props }) => {
       title: t('products:price'),
       dataIndex: ['quotation', '0', 'adult_cost'],
       width: '10rem',
-      render: (_, { quotation }) => `${quotation[0].adult_cost} ${quotation[0].currency} / ${quotation[0].unit_name}`, // todo: 成人 儿童
+      render: (_, { quotation }) => `${quotation[0].adult_cost} ${quotation[0].currency} / ${quotation[0].unit_name}`,
     },
     {
       key: 'action',
@@ -120,15 +120,15 @@ const Extras = ({ productId, onChange, ...props }) => {
   const handleNewAddOn = async (item) => {
     setExtrasData(prev => [].concat(prev, [item]));
     // todo: 提交后端; 重复绑定同一个
-    const newSuccess = await addProductExtraAction({ travel_agency_id, id: productId, extras: [2] });
-    newSuccess ? message.success(t('Action')+t('Success')) : message.error(t('Action')+t('Failed'));
+    const _item = pick(item.info, ['id', 'title', 'code']);
+    const newSuccess = await addProductExtraAction({ travel_agency_id, id: productId, extras: [_item] });
+    newSuccess ? message.success(`${t('Success')}`) : message.error(`${t('Failed')}`);
     await handleGetAgencyProductExtras();
   }
 
   const handleDelAddon = async (item) => {
-    // todo: 提交后端
-    const delSuccess = await delProductExtrasAction({ travel_agency_id, id: productId, extras: [2] });
-    delSuccess ? message.success(t('Action')+t('Success')) : message.error(t('Action')+t('Failed'));
+    const delSuccess = await delProductExtrasAction({ travel_agency_id, id: productId, extras: [item.info.id] });
+    delSuccess ? message.success(`${t('Success')}`) : message.error(`${t('Failed')}`);
     await handleGetAgencyProductExtras();
   };