From 4dca7ee290df11f5abe949b3107e40453b83734b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Sep 2024 11:46:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1:=20?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Manage.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/products/Manage.jsx b/src/views/products/Manage.jsx
index 165805c..23c622f 100644
--- a/src/views/products/Manage.jsx
+++ b/src/views/products/Manage.jsx
@@ -74,7 +74,7 @@ function Index() {
         return <span className={stateCls}>{stateMapVal[`${r.audit_state_id}`]?.label}</span>;
       },
     },
-    { title: t('products:AuditedBy'), key: 'audited_by', dataIndex: 'audited_by_name' },
+    { title: t('products:AuditedBy'), key: 'audited_by', dataIndex: 'audited_by' },
     { title: t('products:AuditDate'), key: 'audit_date', dataIndex: 'audit_date' },
     {
       title: '',

From f182ded513187449be873ffe05ded92330a07989 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Sep 2024 13:57:36 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?:=20=E7=BC=96=E8=BE=91:=20=E6=8E=A8=E8=8D=90=E6=8C=87=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Detail/ProductInfoForm.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx
index 16259c2..7c55328 100644
--- a/src/views/products/Detail/ProductInfoForm.jsx
+++ b/src/views/products/Detail/ProductInfoForm.jsx
@@ -256,11 +256,11 @@ function getFields(props) {
           style={{ width: '100%' }}
           labelInValue={false}
           options={[
-            { value: '1', label: 'Top 1' },
-            { value: '2', label: 'Top 2' },
-            { value: '3', label: 'Top 3' },
-            { value: '4', label: '4' },
-            { value: '5', label: '5' },
+            { value: 1, label: 'Top 1' },
+            { value: 2, label: 'Top 2' },
+            { value: 3, label: 'Top 3' },
+            { value: 4, label: '4' },
+            { value: 5, label: '5' },
           ]}
         />
       </Form.Item>,
@@ -376,7 +376,7 @@ const formValuesMapper = (values) => {
     ],
     'dept': { key: 'dept_id', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
     'open_weekdays': { key: 'open_weekdays', transform: (value) => (Array.isArray(value) ? value.join(',') : value) },
-    'recommends_rate': { key: 'recommends_rate', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
+    'recommends_rate': { key: 'recommends_rate', transform: (value) => ((typeof value === 'string' || typeof value === 'number') ? value : value?.value || value?.key || '') },
     // 'lgc_details': [
     //   {
     //     key: 'lgc_details',

From 3bf491d8adbc59c32f27d4aa3b5e65a349a6236d Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Sep 2024 14:04:26 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?:=20=E7=BC=96=E8=BE=91:=20=E6=8E=A8=E8=8D=90=E6=8C=87=E6=95=B0,?=
 =?UTF-8?q?=20=E8=87=AA=E7=94=B1=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Detail/ProductInfoForm.jsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx
index 7c55328..5f3a815 100644
--- a/src/views/products/Detail/ProductInfoForm.jsx
+++ b/src/views/products/Detail/ProductInfoForm.jsx
@@ -250,7 +250,8 @@ function getFields(props) {
       99,
       <Form.Item name='recommends_rate' label={t('RecommendsRate')} {...fieldProps.recommends_rate} tooltip={t('FormTooltip.RecommendsRate')}>
         {/* <Input placeholder={t('RecommendsRate')} allowClear /> */}
-        <Select
+        <InputNumber {...styleProps} {...editableProps('recommends_rate')} />
+        {/* <Select
           {...styleProps}
           {...editableProps('recommends_rate')}
           style={{ width: '100%' }}
@@ -262,7 +263,7 @@ function getFields(props) {
             { value: 4, label: '4' },
             { value: 5, label: '5' },
           ]}
-        />
+        /> */}
       </Form.Item>,
       fieldProps?.recommends_rate?.col || midCol
     ),
@@ -376,7 +377,7 @@ const formValuesMapper = (values) => {
     ],
     'dept': { key: 'dept_id', transform: (value) => (typeof value === 'string' ? value : value?.value || value?.key || '') },
     'open_weekdays': { key: 'open_weekdays', transform: (value) => (Array.isArray(value) ? value.join(',') : value) },
-    'recommends_rate': { key: 'recommends_rate', transform: (value) => ((typeof value === 'string' || typeof value === 'number') ? value : value?.value || value?.key || '') },
+    // 'recommends_rate': { key: 'recommends_rate', transform: (value) => ((typeof value === 'string' || typeof value === 'number') ? value : value?.value || value?.key || '') },
     // 'lgc_details': [
     //   {
     //     key: 'lgc_details',

From df1a1f43bf2aeb55236f144fe07b03d7c886a7cf Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Sep 2024 14:08:31 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?:=20=E7=BC=96=E8=BE=91:=20=E6=8E=A8=E8=8D=90=E6=8C=87=E6=95=B0,?=
 =?UTF-8?q?=20=E8=87=AA=E7=94=B1=E8=BE=93=E5=85=A5=201-1000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Detail/ProductInfoForm.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx
index 5f3a815..697c515 100644
--- a/src/views/products/Detail/ProductInfoForm.jsx
+++ b/src/views/products/Detail/ProductInfoForm.jsx
@@ -250,7 +250,7 @@ function getFields(props) {
       99,
       <Form.Item name='recommends_rate' label={t('RecommendsRate')} {...fieldProps.recommends_rate} tooltip={t('FormTooltip.RecommendsRate')}>
         {/* <Input placeholder={t('RecommendsRate')} allowClear /> */}
-        <InputNumber {...styleProps} {...editableProps('recommends_rate')} />
+        <InputNumber {...styleProps} {...editableProps('recommends_rate')} min={1} max={1000} />
         {/* <Select
           {...styleProps}
           {...editableProps('recommends_rate')}

From 5d56479f3592c99814476406b6d70934aa6d9cf6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Sep 2024 15:02:47 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?:=20=E7=BB=91=E5=AE=9A=E9=A1=B9=E7=9B=AE:=20=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0travel=20agency=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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([]);
 

From e66597d4fa621ad215dc08509d3891f93032f1dc Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Sep 2024 15:12:48 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?:=20=E7=BC=96=E8=BE=91:=20=E8=AF=AD=E7=A7=8D=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81,=20=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=90=8E=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/products/Detail/ProductInfo.jsx     | 2 +-
 src/views/products/Detail/ProductInfoForm.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 697c515..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);