Merge branch 'dev' into feature-XianCH

.gitignore

@@ -12,6 +12,8 @@
 # next.js
 /.next/
 /out/
+.idea
+.vscode
 # production
 /build
 
@@ -32,4 +34,4 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
-certificates
+certificates

.idea/bookmarks.json

@@ -0,0 +1,3 @@
+{
+  "site_front": []
+}

.idea/workspace.xml

@@ -5,13 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cefcab87-0337-4425-a7d4-cfe46845b330" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/material_theme_project_new.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/material_theme_project_new.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/@actionWidget/Service.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/@actionWidget/Service.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/app/[locale]/(navbar)/about/page.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/[locale]/(navbar)/about/page.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Header/HerderTitle.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Header/HerderTitle.tsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Header/style.module.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Header/style.module.scss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/Layout/Sidebar.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Layout/Sidebar.tsx" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -19,6 +14,11 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="dev" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectColorInfo">{
@@ -30,23 +30,23 @@
     <option name="openDirectoriesWithSingleClick" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;JavaScript Debug.localhost:3000.executor&quot;: &quot;Debug&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;feature-Before&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;pnpm&quot;,
-    &quot;npm.dev.executor&quot;: &quot;Run&quot;,
-    &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;F:\\project\\site_front\\node_modules\\prettier&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;F:\\project\\site_front\\node_modules\\typescript\\lib&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "JavaScript Debug.localhost:3000.executor": "Debug",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "dev",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "pnpm",
+    "npm.dev.executor": "Run",
+    "prettierjs.PrettierConfiguration.Package": "F:\\project\\site_front\\node_modules\\prettier",
+    "ts.external.directory.path": "F:\\project\\site_front\\node_modules\\typescript\\lib",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="F:\project\site_front\public" />
@@ -70,6 +70,9 @@
       <list>
         <item itemvalue="JavaScript Debug.localhost:3000" />
         <item itemvalue="npm.dev" />
+        <item itemvalue="npm.dev" />
+        <item itemvalue="JavaScript Debug.localhost:3000" />
+        <item itemvalue="JavaScript Debug.localhost:3000" />
       </list>
     </recent_temporary>
   </component>

messages/br.json

@@ -164,11 +164,13 @@
     "freeDesc1": "As moedas grátis só podem ser usadas nos jogos grátis especificados",
     "freeDesc2": "Completar a quantidade de código de moeda livre, o saldo é transferido para a carteira de dinheiro",
     "freeDesc3": "Taxa de câmbio de FREE para CASH:",
+    "freeDesc4": "FREE Troca máxima diária: {n}, a parte excedente não é reservada",
     "replay": "Replay",
     "replayArticle": "Replay Article",
     "replayDesc1": "As moedas de repetição só podem ser jogadas nos jogos de repetição especificados",
     "replayDesc2": "Termine a quantidade de codificação de moedas de repetição, e o saldo será transferido para a carteira de dinheiro",
     "replayDesc3": "Taxa de câmbio de REPLAY para CASH:",
+    "replayDesc4": "REPLAY Troca máxima diária: {n}, a parte excedente não é reservada",
     "modalTitle": "Proxima retirada de bonus",
     "modalBottomTips": " FALTA APOSTAR R$ ",
     "expTips": "{exp} Bet to ",

messages/en.json

@@ -164,10 +164,12 @@
     "freeDesc1": "As moedas grátis só podem ser usadas nos jogos grátis especificados",
     "freeDesc2": "Completar a quantidade de código de moeda livre, o saldo é transferido para a carteira de dinheiro",
     "freeDesc3": "Taxa de câmbio de FREE para CASH:",
+    "freeDesc4": "FREE Troca máxima diária: {n}, a parte excedente não é reservada",
     "replayArticle": "Replay Article",
     "replayDesc1": "As moedas de repetição só podem ser jogadas nos jogos de repetição especificados",
     "replayDesc2": "Termine a quantidade de codificação de moedas de repetição, e o saldo será transferido para a carteira de dinheiro",
     "replayDesc3": "Taxa de câmbio de REPLAY para CASH:",
+    "replayDesc4": "REPLAY Troca máxima diária: {n}, a parte excedente não é reservada",
     "modalBottomTips": " FALTA APOSTAR R$ ",
     "replay": "Replay",
     "modalTitle": "Proxima retirada de bonus",

src/api/user.ts

@@ -273,6 +273,14 @@ export interface Wallet {
      * 重玩币转移最小金额
      */
     lose_transfer_min?: number;
+    /**
+     * 免费币最大提现金额
+     */
+    free_transfer_max?:number
+    /**
+     * 重玩币最小提现金额
+     */
+    lose_transfer_max?:number
 }
 // 前台用户获取金额信息
 export const getUserMoneyApi = () => {

src/components/HeaderBack/index.tsx

@@ -69,7 +69,6 @@ const HeaderBack: FC<PropsWithChildren<HeaderBackProps>> = ({
     };
 
     const cls = clsx(styles.headerBack, className, useBg && styles.useBg);
-    console.log(11, cls);
     return (
         <div className={cls}>
             <div className={styles.left}>

src/components/ModalPopup/WalletDescribeModal/index.tsx

@@ -108,6 +108,7 @@ export const FreeContent = (props: { wallet: Wallet; handleAcquire?: any }) => {
                 <li>{t("freeDesc1")}</li>
                 <li>{t("freeDesc2")}</li>
                 <li>{t("freeDesc3")}{wallet?.free_transfer_ratio}:1</li>
+                <li>{t("freeDesc4", {n: wallet.free_transfer_max ?? 0})}</li>
             </ul>
             {handleAcquire && (
                 <a
@@ -139,7 +140,11 @@ export const ReplayContent = (props: { wallet: Wallet; handleAcquire?: any }) =>
             <ul className={"ml-[0.1389rem] list-decimal text-[0.12rem] text-[#666]"}>
                 <li>{t("replayDesc1")}</li>
                 <li>{t("replayDesc2")}</li>
-                <li>{t("replayDesc3")}{wallet?.lose_transfer_ratio}:1</li>
+                <li>
+                    {t("replayDesc3")}
+                    {wallet?.lose_transfer_ratio}:1
+                </li>
+                <li>{t("replayDesc4", { n: wallet.lose_transfer_max ?? 0 })}</li>
             </ul>
             {handleAcquire && (
                 <a
@@ -149,7 +154,9 @@ export const ReplayContent = (props: { wallet: Wallet; handleAcquire?: any }) =>
                     {t("carteira")}
                 </a>
             )}
-            <p className={"text-[0.12rem] text-[#666] text-center"}>Valor minimo de transferência de {wallet?.lose_transfer_min}</p>
+            <p className={"text-center text-[0.12rem] text-[#666]"}>
+                Valor minimo de transferência de {wallet?.lose_transfer_min}
+            </p>
         </div>
     );
 };

src/stores/useWalletStore.ts

@@ -43,6 +43,8 @@ const initialState: State = {
         notice: {
             lose_score: 0,
         },
+      free_transfer_max: 0,
+      lose_transfer_max: 0,
     },
     score: undefined,
 };