diff --git a/src/lib/ui-components/navbar.svelte b/src/lib/ui-components/navbar.svelte index 4a7b852..600cfaf 100644 --- a/src/lib/ui-components/navbar.svelte +++ b/src/lib/ui-components/navbar.svelte @@ -18,7 +18,7 @@ showMenu = !showMenu; }} tabindex="0" - class="btn btn-ghost 2xl:hidden w-[54px] max-w-[54px] p-1" + class="btn btn-ghost w-[54px] max-w-[54px] p-1" > {#if !showMenu} - diff --git a/src/routes/+layout.js b/src/routes/+layout.js index 4b73734..0a4fd2d 100644 --- a/src/routes/+layout.js +++ b/src/routes/+layout.js @@ -1,4 +1,4 @@ export const prerender = true; export const ssr = false; -// console.log = () => {}; +console.log = () => {}; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index cf5de8b..9d26dca 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -35,7 +35,7 @@
-
+
diff --git a/src/routes/orders/+page.svelte b/src/routes/orders/+page.svelte index e3842c9..0bdd891 100644 --- a/src/routes/orders/+page.svelte +++ b/src/routes/orders/+page.svelte @@ -37,8 +37,8 @@ let external_user_idValue = ""; let searchValue = ""; - async function findDispute() { - if (searchValue.length < 5 || showLoadingFind) return; + async function findDeposit() { + if (searchValue.length < 1 || showLoadingFind) return; showLoadingFind = true; let sData = { @@ -89,6 +89,7 @@ sayInfo("Заявка закрыта!"); showLoadingRollback = false; showFoundedOrderWindow = false; + findDeposit(); } let showChangeSum = false; @@ -119,6 +120,7 @@ showLoadingChangeSum = false; showChangeSum = false; showFoundedOrderWindow = false; + findDeposit(); } async function changeSumWithoutBalance(uuid) { showLoadingChangeSum = true; @@ -142,6 +144,7 @@ showLoadingChangeSum = false; showChangeSum = false; showFoundedOrderWindow = false; + findDeposit(); } let showLoadingSendCallback = false; @@ -190,12 +193,14 @@ sayInfo("Команда изменена"); changingTeam = false; showChangeTeamWindow = false; + showFoundedOrderWindow = false; + findDeposit(); } let img64 = ""; let qrCode = false; - $: if (selectedDispute && selectedDispute["cardnumber"].length > 16) { + $: if (selectedDispute && selectedDispute["requisite_type"] === "p2p_qr") { qrCode = true; QRCode.toDataURL(selectedDispute["cardnumber"], { type: "image/jpeg", @@ -215,7 +220,7 @@
@@ -224,7 +229,7 @@ on:click={() => { maxDepositSearchPages = 1; currentDepositSearchPage = 1; - findDispute(); + findDeposit(); }} class="btn btn-outline mt-2" > @@ -242,7 +247,7 @@ on:click={() => { if (currentDepositSearchPage <= 1) return; currentDepositSearchPage -= 1; - findDispute(); + findDeposit(); }} > < @@ -256,7 +261,7 @@ on:click={() => { if (currentDepositSearchPage >= maxDepositSearchPages) return; currentDepositSearchPage += 1; - findDispute(); + findDeposit(); }} > > @@ -360,8 +365,8 @@

{selectedDispute["name"]}

{/if} {#if selectedDispute["cardnumber"] !== ""} - {#if selectedDispute["cardnumber"].length <= 16} -

Карта

+ {#if selectedDispute["requisite_type"] !== "p2p_qr"} +

Карта/CVU

{selectedDispute["cardnumber"]}

{:else}

QR

diff --git a/src/routes/payouts/+page.svelte b/src/routes/payouts/+page.svelte index fb2da02..3463ca0 100644 --- a/src/routes/payouts/+page.svelte +++ b/src/routes/payouts/+page.svelte @@ -496,7 +496,7 @@ bind:value={searchFilter} type="text" class="input input-bordered max-w-full w-full rounded-[10px]" - placeholder="UUID, External ID или Реквизит" + placeholder="UUID, External UUID, Токен или External User ID" />
+
+ { + reqsCurrentPage = n; + getUserRequisites(); + }} + disableButtons={false} + css={"btn-neutral mt-2"} + /> +

Всего страниц: {reqsMaxPage}

+
+
+
+ {#if showLoadingFind} + + {:else} +
+ + + + + + + + + + + + + + + + + {#each userRequisites as requisite} + + + + + + + + + + + + + + {/each} + +
IDСтатусБанкТип реквизитаРеквизитИмяДевайс
{requisite["uuid"]}{requisite["is_hidden"] !== "t" ? "активен" : "отключен"}{requisite["bank_name"]}{requisite["requisite_type"]}{requisite["requisite"] ?? "-"}{requisite["name"]}{requisite["device_uuid"]}
+
+ {/if} +
+
diff --git a/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte index 784d922..2b9e4db 100644 --- a/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte +++ b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte @@ -1,129 +1,129 @@ -
+ -
-
+ --> diff --git a/src/routes/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte index 578c630..0610a2d 100644 --- a/src/routes/user/profile/[userToken]/+page.svelte +++ b/src/routes/user/profile/[userToken]/+page.svelte @@ -330,7 +330,7 @@ -
+ ID @@ -366,7 +365,6 @@ Объем {userData.code} Лимит {userData.code} Опции - @@ -401,7 +399,7 @@
- + --> @@ -59,7 +135,10 @@ {user["token"]} {user["name"]} {user["surname"]} - {toValidNumberFormat(user["balance"])} {user["code"]} + {toValidNumberFormat(user["total_balance"])} + {user["code"]}