feat:support ratio 0 (labring#5286)

eos-octopus · Dec 13, 2024 · 6e6f940 · 6e6f940
1 parent 4a6fcd0
commit 6e6f940
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/frontend/providers/costcenter/src/components/CurrencySymbol.tsx b/frontend/providers/costcenter/src/components/CurrencySymbol.tsx
@@ -8,7 +8,7 @@ export default function CurrencySymbol({
 } & IconProps &
   TextProps) {
   return type === 'shellCoin' ? (
-    <Img src={sealosCoin.src} boxSize={'16px'} maxW={'unset'} {...props}></Img>
+    <Img src={sealosCoin.src} boxSize={'16px'} maxW={'unset'} {...props} w={'auto'}></Img>
   ) : type === 'cny' ? (
     <Text {...props}>￥</Text>
   ) : (

diff --git a/frontend/providers/costcenter/src/components/RechargeModal.tsx b/frontend/providers/costcenter/src/components/RechargeModal.tsx
@@ -195,7 +195,7 @@ const BonusBox = (props: {
             </Flex>
           </Flex>
         </Flex>
-      ) : (
+      ) : props.bouns !== 0 ? (
         <Flex
           position={'absolute'}
           minW={'max-content'}
@@ -216,6 +216,8 @@ const BonusBox = (props: {
           <CurrencySymbol boxSize={'10px'} mr={'2px'} />
           <Text> {props.bouns}</Text>
         </Flex>
+      ) : (
+        <></>
       )}
       <Flex align={'center'}>
         <Currencysymbol boxSize="20px" type={currency} />
@@ -345,6 +347,7 @@ const RechargeModal = forwardRef(
         >('/api/price/bonus'),
       {}
     );
+
     const [defaultSteps, ratios, steps, specialBonus] = useMemo(() => {
       const defaultSteps = Object.entries(bonuses?.data?.discount.defaultSteps || {}).sort(
         (a, b) => +a[0] - +b[0]
@@ -377,7 +380,12 @@ const RechargeModal = forwardRef(
     const { stripeEnabled, wechatEnabled } = useEnvStore();
     useEffect(() => {
       if (steps && steps.length > 0) {
-        setAmount(steps[0]);
+        const result = steps.map((v, idx) => [v, getBonus(v), idx]).filter(([k, v]) => v > 0);
+        if (result.length > 0) {
+          const [key, bouns, idx] = result[0];
+          setSelectAmount(idx);
+          setAmount(key);
+        }
       }
     }, [steps]);
     const handleWechatConfirm = () => {
@@ -674,6 +682,7 @@ const RechargeModal = forwardRef(
                       .filter(([_, _2, ratio], idx) => {
                         return ratio > 0;
                       })
+
                       .map(([pre, next, ratio], idx) => (
                         <>
                           <Text key={idx} pl={'24px'} color={'grayModern.900'}>