Browse Source

Merge branch 'feature-year0415' into v1.4

year 3 months ago
parent
commit
0b18744eca

File diff suppressed because it is too large
+ 466 - 489
messages/en.json


+ 6 - 1
src/app/[locale]/(TabBar)/[[...share]]/@actionWidget/Service.tsx

@@ -67,7 +67,7 @@ const SlotSection = () => {
 /**
  * 轮盘
  */
-const WheelSection = () => {
+const WheelSection = ({ onDestory }: any) => {
     const wheelModalRef = useRef<WheelModalProps | null>(null);
     const { wheelStatus, wheelCurrent, setWheel } = useWheelStore((state) => ({
         wheelStatus: state.status,
@@ -358,6 +358,7 @@ const SignInSection: FC = () => {
 
 const ServiceWidget: FC<Props> = (props) => {
     const { services } = props;
+    // const [isShowSign, setIsShowSign] = useState(false);
 
     const { eventView } = useEventPoint();
     const newServices = services?.filter((item) => item.status === 1) || [];
@@ -378,6 +379,10 @@ const ServiceWidget: FC<Props> = (props) => {
 
     const t = useTranslations("HomePage");
 
+    // const wheelDestory = () => {
+    //     setIsShowSign(true);
+    // };
+
     return (
         <>
             <div

+ 2 - 2
src/app/[locale]/(doings)/jackpot/page.tsx

@@ -215,7 +215,7 @@ const Jackpot: React.FC = () => {
                             <div className={clsx(styles.name, styles.coin)}>
                                 Depósito total de {actKey} Dias:
                             </div>
-                            <div>R$ {formatAmount(curTabData.extra_pay_amount)}</div>
+                            <div>R$ {formatAmount(infoData?.pay_amount || 0)}</div>
                         </div>
                     </div>
                     <div className={clsx(styles.introBottom, styles.big)}>
@@ -239,7 +239,7 @@ const Jackpot: React.FC = () => {
                             Bónus misterioso
                         </div>
                         <div className={clsx("mt-[.08rem] text-[.18rem] font-bold text-[#ffd200]")}>
-                            R$ {formatAmount(curTabData.extra_num)}
+                            R$ {formatAmount(infoData?.reward || 0)}
                         </div>
                     </div>
                 </div>

+ 5 - 4
src/app/[locale]/(doings)/signin/page.tsx

@@ -132,11 +132,12 @@ const SignIn: FC = () => {
                     {/* 右上角文本 */}
                     <div className="absolute right-[0.1rem] top-0 z-50 h-[0.32rem] w-[20%] text-center text-[0.11rem] font-bold text-[white]">
                         <p className={"h-[0.16rem]"}>
-                            {signData?.cur_num ? signData?.cur_num + 1 : 0}
-                        </p>
-                        <p className={"h-[0.16rem] text-[yellow]"}>
-                            Day {signData?.list?.length || 0}
+                            {signData?.cur_num ? signData?.cur_num + 1 : 0} /
+                            {signData?.list?.length || 0}
                         </p>
+                        {/* <p className={"h-[0.16rem] text-[yellow]"}>
+                            /{signData?.list?.length || 0}
+                        </p> */}
                     </div>
                     <img
                         src="/signDetails/bg3.png"

+ 1 - 1
src/app/[locale]/providers.tsx

@@ -254,7 +254,7 @@ const Layout = ({ children, themeProps }: ProvidersProps) => {
 
     const isShowBg = useMemo(() => {
         const local = pathname.split("/")[1];
-        console.log(local);
+
         if (`/${local}` === pathname) return true;
         return [`/${local}/freeGames`, "/br/replayGames", "/br/promo", "/br/gameList"].includes(
             pathname

Some files were not shown because too many files changed in this diff