Merge remote-tracking branch 'origin/main'

src/stores/Products/Index.js

@@ -193,6 +193,7 @@ export const useProductsStore = create(
       const generatedList = []
 
       defList.forEach(definition => {
+        // 增加多个有效日期批量设置：
         const mappedPriceList = definition?.priceList.map(price => {
           return {
             id: null,

src/views/App.jsx

@@ -40,7 +40,6 @@ function App() {
 	const href = useHref()
   const navigate = useNavigate()
 
-  // 除了路由 /p...以外都需要登陆系统
   const needToLogin = href !== '/login' && isEmpty(loginToken)
 
 	useEffect(() => {

src/views/products/Detail/PriceCompactInput.jsx

@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { Input, Space } from 'antd'
 
-export const PriceCompactInput = (props) => {
+const PriceCompactInput = (props) => {
   const { id, value = {}, onChange } = props
   const [numberStart, setNumberStart] = useState(0)
   const [numberEnd, setNumberEnd] = useState(0)
@@ -19,7 +19,7 @@ export const PriceCompactInput = (props) => {
   }
   const onNumberStartChange = (e) => {
     const newNumber = parseInt(e.target.value || '0', 10)
-    if (Number.isNaN(numberStart)) {
+    if (Number.isNaN(newNumber)) {
       return
     }
     if (!('numberStart' in value)) {
@@ -31,7 +31,7 @@ export const PriceCompactInput = (props) => {
   }
   const onNumberEndChange = (e) => {
     const newNumber = parseInt(e.target.value || '0', 10)
-    if (Number.isNaN(numberEnd)) {
+    if (Number.isNaN(newNumber)) {
       return
     }
     if (!('numberEnd' in value)) {
@@ -43,7 +43,7 @@ export const PriceCompactInput = (props) => {
   }
   const onAudultPriceChange = (e) => {
     const newNumber = parseInt(e.target.value || '0', 10)
-    if (Number.isNaN(audultPrice)) {
+    if (Number.isNaN(newNumber)) {
       return
     }
     if (!('audultPrice' in value)) {
@@ -55,7 +55,7 @@ export const PriceCompactInput = (props) => {
   }
   const onChildrenPriceChange = (e) => {
     const newNumber = parseInt(e.target.value || '0', 10)
-    if (Number.isNaN(childrenPrice)) {
+    if (Number.isNaN(newNumber)) {
       return
     }
     if (!('childrenPrice' in value)) {

src/views/products/Detail/ProductInfoQuotation.jsx

@@ -5,7 +5,7 @@ import { CloseOutlined, StarTwoTone, PlusOutlined, ExclamationCircleFilled } fro
 import { useDatePresets } from '@/hooks/useDatePresets'
 import dayjs from 'dayjs'
 import useProductsStore from '@/stores/Products/Index'
-import PriceCompactInput from './PriceCompactInput'
+import PriceCompactInput from '@/views/products/Detail/PriceCompactInput'
 
 const { RangePicker } = DatePicker
 
@@ -294,16 +294,18 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
                     }} />}
                   >
                     <Form.Item label='币种' name={[field.name, 'currency']}>
-                      <Select placeholder='选择币种'>
+                      <Radio.Group>
-                        <Select.Option value='RMB'>RMB</Select.Option>
+                        <Radio value='RMB'>RMB</Radio>
-                        <Select.Option value='USD'>USD</Select.Option>
+                        <Radio value='USD'>USD</Radio>
-                      </Select>
+                        <Radio value='THB'>THB</Radio>
+                        <Radio value='JPY'>JPY</Radio>
+                      </Radio.Group>
                     </Form.Item>
                     <Form.Item label='类型' name={[field.name, 'unitId']}>
-                      <Select placeholder='选择类型'>
+                      <Radio.Group>
-                        <Select.Option value='0'>每人</Select.Option>
+                        <Radio value='0'>每人</Radio>
-                        <Select.Option value='1'>每团</Select.Option>
+                        <Radio value='1'>每团</Radio>
-                      </Select>
+                      </Radio.Group>
                     </Form.Item>
                     <Form.Item label='周末' name={[field.name, 'weekend']}>
                       <Checkbox.Group
@@ -407,6 +409,8 @@ const ProductInfoQuotation = ({ editable, ...props }) => {
           <Radio.Group>
             <Radio value='RMB'>RMB</Radio>
             <Radio value='USD'>USD</Radio>
+            <Radio value='THB'>THB</Radio>
+            <Radio value='JPY'>JPY</Radio>
           </Radio.Group>
         </Form.Item>
         <Form.Item

src/views/products/Detail/addValidityWithWeekend.jsx

@@ -1,55 +0,0 @@
-
-import React, { useState } from 'react';
-import { DatePicker, Button } from 'antd';
-import dayjs from 'dayjs';
-import { useDatePresets } from '@/hooks/useDatePresets';
-const addValidityWithWeekend = ({ onDateChange }) => {
-  const dateFormat = 'YYYY/MM/DD';
-  const { RangePicker } = DatePicker;
-  const [dateRange, setDateRange] = useState(null);
-  const [selectedDays, setSelectedDays] = useState([]);
-  const presets = useDatePresets();
-  const days = [
-    'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'
-  ];
-
-
-  const handleChange = (date, dateString) => {
-    console.log("dateString",dateString)
-    onDateChange({ dateRange: dateString, selectedDays });
-  };
-
-
-
-  const handleDayClick = (day) => {
-    setSelectedDays((prevSelectedDays) => {
-      const updatedDays = prevSelectedDays.includes(day)
-        ? prevSelectedDays.filter((d) => d !== day)
-        : [...prevSelectedDays, day];
-      onDateChange({ dateRange, selectedDays: updatedDays });
-      return updatedDays;
-    });
-  };
-
-  return (
-    <div>
-      <h4>Data</h4>
-      {<RangePicker allowClear={true} inputReadOnly={true} presets={presets} placeholder={['From', 'Thru']} onChange={handleChange}/>}
-      <h4>Weekdays</h4>
-      <div>
-        {days.map((day, index) => (
-          <Button
-            key={index}
-            type={selectedDays.includes(day) ? 'primary' : 'default'}
-            onClick={() => handleDayClick(day)}
-            style={{ margin: '5px' }}
-          >
-            {day}
-          </Button>
-        ))}
-      </div>
-    </div>
-  );
-};
-
-export default addValidityWithWeekend;