From de18ebf37095154c8605fea48fc0ad2733590956 Mon Sep 17 00:00:00 2001
From: Seven <qiqiwatermelon@gmail.com>
Date: Mon, 22 Dec 2025 04:43:46 +0700
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20useRouterBack=20?=
 =?UTF-8?q?=E7=BB=84=E5=90=88=E5=87=BD=E6=95=B0=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20API=20=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                             |  3 +
 components.d.ts                               |  2 -
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 12 +--
 src/api/types.ts                              |  2 +-
 src/composables/useRouterBack.ts              | 10 +++
 src/router/auth.ts                            | 14 ----
 src/views/auth/login/index.vue                |  5 +-
 src/views/deposit/fiat.vue                    | 16 ++--
 src/views/issue/issuing-apply/done.vue        | 11 +--
 .../my-subscribe/components/category.vue      | 47 ++++++++++++
 .../components/my-subscribe-list.vue          | 76 +++++++++++++++++++
 .../trade-settings/my-subscribe/index.vue     | 51 +++++++++++--
 src/views/withdraw/index.vue                  | 25 +++---
 14 files changed, 227 insertions(+), 49 deletions(-)
 create mode 100644 src/composables/useRouterBack.ts
 create mode 100644 src/views/trade-settings/my-subscribe/components/category.vue
 create mode 100644 src/views/trade-settings/my-subscribe/components/my-subscribe-list.vue

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 82507d6..1350f2a 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -156,6 +156,7 @@ declare global {
   const useAsyncState: typeof import('@vueuse/core').useAsyncState
   const useAttrs: typeof import('vue').useAttrs
   const useAuth: typeof import('./src/composables/useAuth').useAuth
+  const useBack: typeof import('./src/composables/useBack').useBack
   const useBase64: typeof import('@vueuse/core').useBase64
   const useBattery: typeof import('@vueuse/core').useBattery
   const useBluetooth: typeof import('@vueuse/core').useBluetooth
@@ -263,6 +264,7 @@ declare global {
   const useResizeObserver: typeof import('@vueuse/core').useResizeObserver
   const useRoute: typeof import('vue-router').useRoute
   const useRouter: typeof import('vue-router').useRouter
+  const useRouterBack: typeof import('./src/composables/useRouterBack').useRouterBack
   const useSSRWidth: typeof import('@vueuse/core').useSSRWidth
   const useScreenOrientation: typeof import('@vueuse/core').useScreenOrientation
   const useScreenSafeArea: typeof import('@vueuse/core').useScreenSafeArea
@@ -623,6 +625,7 @@ declare module 'vue' {
     readonly useResizeObserver: UnwrapRef<typeof import('@vueuse/core')['useResizeObserver']>
     readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
     readonly useRouter: UnwrapRef<typeof import('vue-router')['useRouter']>
+    readonly useRouterBack: UnwrapRef<typeof import('./src/composables/useRouterBack')['useRouterBack']>
     readonly useSSRWidth: UnwrapRef<typeof import('@vueuse/core')['useSSRWidth']>
     readonly useScreenOrientation: UnwrapRef<typeof import('@vueuse/core')['useScreenOrientation']>
     readonly useScreenSafeArea: UnwrapRef<typeof import('@vueuse/core')['useScreenSafeArea']>
diff --git a/components.d.ts b/components.d.ts
index d4552fa..fc91f2d 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -51,7 +51,6 @@ declare module 'vue' {
     IonTabButton: typeof import('@ionic/vue')['IonTabButton']
     IonTabs: typeof import('@ionic/vue')['IonTabs']
     IonText: typeof import('@ionic/vue')['IonText']
-    IonTextarea: typeof import('@ionic/vue')['IonTextarea']
     IonTitle: typeof import('@ionic/vue')['IonTitle']
     IonToolbar: typeof import('@ionic/vue')['IonToolbar']
     LayoutDefault: typeof import('./src/components/layout/default.vue')['default']
@@ -115,7 +114,6 @@ declare global {
   const IonTabButton: typeof import('@ionic/vue')['IonTabButton']
   const IonTabs: typeof import('@ionic/vue')['IonTabs']
   const IonText: typeof import('@ionic/vue')['IonText']
-  const IonTextarea: typeof import('@ionic/vue')['IonTextarea']
   const IonTitle: typeof import('@ionic/vue')['IonTitle']
   const IonToolbar: typeof import('@ionic/vue')['IonToolbar']
   const LayoutDefault: typeof import('./src/components/layout/default.vue')['default']
diff --git a/package.json b/package.json
index f7b7725..61b83e5 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "@elysiajs/eden": "^1.4.5",
     "@ionic/vue": "^8.7.11",
     "@ionic/vue-router": "^8.7.11",
-    "@riwa/api-types": "http://192.168.1.27:9527/api/riwa-api-types-0.0.41.tgz",
+    "@riwa/api-types": "http://192.168.1.27:9527/api/riwa-api-types-0.0.44.tgz",
     "@tailwindcss/vite": "^4.1.18",
     "@vee-validate/yup": "^4.15.1",
     "@vueuse/core": "^14.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c7f0907..12a46dd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -54,8 +54,8 @@ importers:
         specifier: ^8.7.11
         version: 8.7.11(@stencil/core@4.39.0)(vue-router@4.6.3(vue@3.5.25(typescript@5.9.3)))(vue@3.5.25(typescript@5.9.3))
       '@riwa/api-types':
-        specifier: http://192.168.1.27:9527/api/riwa-api-types-0.0.41.tgz
-        version: http://192.168.1.27:9527/api/riwa-api-types-0.0.41.tgz(@elysiajs/eden@1.4.5(elysia@1.4.18(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))
+        specifier: http://192.168.1.27:9527/api/riwa-api-types-0.0.44.tgz
+        version: http://192.168.1.27:9527/api/riwa-api-types-0.0.44.tgz(@elysiajs/eden@1.4.5(elysia@1.4.18(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))
       '@tailwindcss/vite':
         specifier: ^4.1.18
         version: 4.1.18(vite@7.2.7(@types/node@24.10.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.1)(yaml@2.8.2))
@@ -1354,9 +1354,9 @@ packages:
     resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
-  '@riwa/api-types@http://192.168.1.27:9527/api/riwa-api-types-0.0.41.tgz':
-    resolution: {tarball: http://192.168.1.27:9527/api/riwa-api-types-0.0.41.tgz}
-    version: 0.0.41
+  '@riwa/api-types@http://192.168.1.27:9527/api/riwa-api-types-0.0.44.tgz':
+    resolution: {tarball: http://192.168.1.27:9527/api/riwa-api-types-0.0.44.tgz}
+    version: 0.0.44
     peerDependencies:
       '@elysiajs/eden': ^1.4.5
 
@@ -6453,7 +6453,7 @@ snapshots:
 
   '@pkgr/core@0.2.9': {}
 
-  '@riwa/api-types@http://192.168.1.27:9527/api/riwa-api-types-0.0.41.tgz(@elysiajs/eden@1.4.5(elysia@1.4.18(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))':
+  '@riwa/api-types@http://192.168.1.27:9527/api/riwa-api-types-0.0.44.tgz(@elysiajs/eden@1.4.5(elysia@1.4.18(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3)))':
     dependencies:
       '@elysiajs/eden': 1.4.5(elysia@1.4.18(@sinclair/typebox@0.34.41)(exact-mirror@0.2.5(@sinclair/typebox@0.34.41))(file-type@21.1.1)(openapi-types@12.1.3)(typescript@5.9.3))
 
diff --git a/src/api/types.ts b/src/api/types.ts
index 1f77960..40fafb7 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -51,7 +51,7 @@ export type RwaData = Treaty.Data<typeof client.api.rwa.subscription.available_e
 
 export type MyIssueRwaData = Treaty.Data<typeof client.api.rwa.issuance.products.get>["data"][number];
 
-export type MySubscribeRwaData = Treaty.Data<typeof client.api.rwa.subscription.my_subscriptions.get>;
+export type MySubscribeRwaData = Treaty.Data<typeof client.api.rwa.subscription.my_subscriptions.get>["data"][number];
 
 export type MySubscribeRwaBody = TreatyQuery<typeof client.api.rwa.subscription.my_subscriptions.get>;
 
diff --git a/src/composables/useRouterBack.ts b/src/composables/useRouterBack.ts
new file mode 100644
index 0000000..8927109
--- /dev/null
+++ b/src/composables/useRouterBack.ts
@@ -0,0 +1,10 @@
+import { router } from "@/router";
+
+export function useRouterBack() {
+  if (window.history.state.back) {
+    router.back();
+  }
+  else {
+    router.replace("/");
+  }
+}
diff --git a/src/router/auth.ts b/src/router/auth.ts
index 77f2195..985442c 100644
--- a/src/router/auth.ts
+++ b/src/router/auth.ts
@@ -1,20 +1,6 @@
 import type { RouteRecordRaw } from "vue-router";
 
 const routes: Array<RouteRecordRaw> = [
-  // {
-  //   path: "/auth",
-  //   component: () => import("@/views/auth/index.vue"),
-  //   children: [
-  //     {
-  //       path: "/auth/login",
-  //       component: () => import("@/views/auth/login/index.vue"),
-  //     },
-  //     {
-  //       path: "/auth/signup",
-  //       component: () => import("@/views/auth/signup/index.vue"),
-  //     },
-  //   ],
-  // },
   {
     path: "/auth/login",
     component: () => import("@/views/auth/login/index.vue"),
diff --git a/src/views/auth/login/index.vue b/src/views/auth/login/index.vue
index 235f1dd..1f7f0d5 100644
--- a/src/views/auth/login/index.vue
+++ b/src/views/auth/login/index.vue
@@ -34,6 +34,9 @@ async function handleSignInPhoneNumber(value: PhoneNumberVerifyClient) {
     useNavigateToRedirect(route.query.redirect as string);
   }
 }
+function onClose() {
+  useRouterBack();
+}
 </script>
 
 <template>
@@ -41,7 +44,7 @@ async function handleSignInPhoneNumber(value: PhoneNumberVerifyClient) {
     <IonHeader class="ion-no-border">
       <IonToolbar class="ui-toolbar">
         <ion-buttons slot="start">
-          <ion-button @click="$router.back()">
+          <ion-button @click="onClose">
             <ion-icon slot="icon-only" :icon="closeOutline" />
           </ion-button>
         </ion-buttons>
diff --git a/src/views/deposit/fiat.vue b/src/views/deposit/fiat.vue
index 487b88a..8c70e50 100644
--- a/src/views/deposit/fiat.vue
+++ b/src/views/deposit/fiat.vue
@@ -1,7 +1,7 @@
 <script lang='ts' setup>
 import type { DepositFiatBody } from "@/api/types";
-import { toastController } from "@ionic/vue";
-import { client } from "@/api";
+import { loadingController, toastController } from "@ionic/vue";
+import { client, safeClient } from "@/api";
 import { AssetCodeEnum, PaymentChannelEnum } from "@/api/enum";
 
 const { t } = useI18n();
@@ -12,6 +12,7 @@ const form = ref<DepositFiatBody>({
   paymentChannel: PaymentChannelEnum.FIAT,
 });
 const inputInstance = useTemplateRef<InputInstance>("inputInstance");
+const router = useRouter();
 
 function markTouched() {
   inputInstance.value?.$el.classList.add("ion-touched");
@@ -31,8 +32,11 @@ function validate(value: string) {
 }
 
 async function onSubmit() {
-  const { data, status } = await client.api.deposit.fiat.post(form.value);
-  if (status === 200) {
+  const loading = await loadingController.create({
+    message: "提交中...",
+  });
+  await loading.present();
+  await safeClient(client.api.deposit.fiat.post(form.value)).finally(async () => {
     const toast = await toastController.create({
       message: t("recharge.fiat.submitSuccess"),
       duration: 1500,
@@ -40,7 +44,9 @@ async function onSubmit() {
     });
 
     await toast.present();
-  }
+    loading.dismiss();
+    router.back();
+  });
 }
 </script>
 
diff --git a/src/views/issue/issuing-apply/done.vue b/src/views/issue/issuing-apply/done.vue
index b8c431e..e605c83 100644
--- a/src/views/issue/issuing-apply/done.vue
+++ b/src/views/issue/issuing-apply/done.vue
@@ -2,6 +2,11 @@
 import { ribbonOutline } from "ionicons/icons";
 
 const { t } = useI18n();
+const router = useRouter();
+
+function gotoMyIssues() {
+  router.replace("/trade-settings/my-issues");
+}
 </script>
 
 <template>
@@ -12,11 +17,7 @@ const { t } = useI18n();
       :description="t('asset.issue.apply.done.description')"
     >
       <template #extra>
-        <ion-button
-          expand="block"
-          color="primary"
-          router-link="/layout/market"
-        >
+        <ion-button expand="block" color="primary" @click="gotoMyIssues">
           {{ t('asset.issue.apply.done.viewProducts') }}
         </ion-button>
       </template>
diff --git a/src/views/trade-settings/my-subscribe/components/category.vue b/src/views/trade-settings/my-subscribe/components/category.vue
new file mode 100644
index 0000000..d6cc15e
--- /dev/null
+++ b/src/views/trade-settings/my-subscribe/components/category.vue
@@ -0,0 +1,47 @@
+<script lang='ts' setup>
+import { client, safeClient } from "@/api";
+
+const { t } = useI18n();
+const model = defineModel({ type: String, default: "" });
+
+const { data: categories } = await safeClient(() => client.api.rwa.category.categories.get());
+</script>
+
+<template>
+  <ion-content :scroll-x="true" :scroll-y="false" class="w-full h-6">
+    <div class="flex items-center whitespace-nowrap space-x-4">
+      <div class="item" :class="{ active: model === '' }" @click="model = ''">
+        {{ t('market.category.all') }}
+      </div>
+      <div
+        v-for="item in categories?.data"
+        :key="item.id"
+        class="item"
+        :class="{ active: model === item.id }"
+        @click="model = item.id"
+      >
+        {{ item.name }}
+      </div>
+    </div>
+  </ion-content>
+</template>
+
+<style scoped>
+@reference "tailwindcss";
+
+ion-content::part(scroll) {
+  scrollbar-width: none;
+}
+
+.item {
+  @apply px-3 py-1 rounded-full text-xs transition-all;
+}
+.ion-palette-dark {
+  .item {
+    @apply bg-(--ion-color-step-800);
+  }
+}
+.item.active {
+  @apply bg-(--ion-color-success) text-white;
+}
+</style>
diff --git a/src/views/trade-settings/my-subscribe/components/my-subscribe-list.vue b/src/views/trade-settings/my-subscribe/components/my-subscribe-list.vue
new file mode 100644
index 0000000..0223067
--- /dev/null
+++ b/src/views/trade-settings/my-subscribe/components/my-subscribe-list.vue
@@ -0,0 +1,76 @@
+<script lang='ts' setup>
+import type { MySubscribeRwaData } from "@/api/types";
+import CryptocurrencyColorNuls from "~icons/cryptocurrency-color/nuls";
+
+defineProps<{
+  data: MySubscribeRwaData[];
+}>();
+</script>
+
+<template>
+  <div class="space-y-3 antialiased mt-5">
+    <ion-grid>
+      <ion-row class="ion-align-items-center text-xs text-text-500">
+        <ion-col size="6">
+          <div>名称/编号</div>
+        </ion-col>
+        <ion-col>
+          <div class="text-right">
+            单价
+          </div>
+        </ion-col>
+        <ion-col size="2">
+          <div class="text-right">
+            状态
+          </div>
+        </ion-col>
+        <ion-col size="3">
+          <div class="text-right">
+            总金额
+          </div>
+        </ion-col>
+      </ion-row>
+    </ion-grid>
+    <div v-for="item in data" :key="item.id">
+      <ion-grid>
+        <ion-row class="ion-align-items-center my-5">
+          <ion-col size="6" class="flex items-center">
+            <div class="mr-3">
+              <CryptocurrencyColorNuls class="text-3xl" />
+            </div>
+            <div>
+              <div class="text-sm font-semibold mb-1 truncate">
+                <!-- {{ item.product?.name }} -->
+              </div>
+              <div class="flex items-center space-x-2">
+                <div class="text-xs text-text-500">
+                  <!-- {{ item.product?.code }} -->
+                </div>
+                <div class="text-xs rounded-md px-1 py-0.5 bg-text-800">
+                  <!-- {{ item.product.category?.name }} -->
+                </div>
+              </div>
+            </div>
+          </ion-col>
+          <ion-col>
+            <div class="text-xs text-right">
+              ${{ Number(item.unitPrice) }}
+            </div>
+          </ion-col>
+          <ion-col size="2">
+            <div class="text-xs text-right">
+              {{ item.status }}
+            </div>
+          </ion-col>
+          <ion-col size="3">
+            <div class="text-lg font-bold text-primary text-right">
+              ${{ Number(item.totalAmount) }}
+            </div>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+    </div>
+  </div>
+</template>
+
+<style lang='css' scoped></style>
diff --git a/src/views/trade-settings/my-subscribe/index.vue b/src/views/trade-settings/my-subscribe/index.vue
index 6100494..7db65ee 100644
--- a/src/views/trade-settings/my-subscribe/index.vue
+++ b/src/views/trade-settings/my-subscribe/index.vue
@@ -1,22 +1,55 @@
 <script lang='ts' setup>
+import type { InfiniteScrollCustomEvent, RefresherCustomEvent } from "@ionic/vue";
 import type { MySubscribeRwaBody, MySubscribeRwaData } from "@/api/types";
 import { client, safeClient } from "@/api";
+import Category from "./components/category.vue";
+import MySubscribeList from "./components/my-subscribe-list.vue";
 
 const [query] = useResetRef<MySubscribeRwaBody>({
+  categoryId: "",
   limit: 20,
   offset: 0,
 });
 
-const subscribeData = ref<MySubscribeRwaData>([]);
+const subscribeData = ref<MySubscribeRwaData[]>([]);
 const isFinished = ref(false);
 
 async function fetchRwaData() {
   const { data } = await safeClient(() => client.api.rwa.subscription.my_subscriptions.get({
     query: query.value,
   }));
-  subscribeData.value.push(...(data.value || []));
-  isFinished.value = (data.value?.length || 0) < query.value.limit!;
+  subscribeData.value.push(...(data.value?.data || []));
+  isFinished.value = (data.value?.data?.length || 0) < query.value.limit!;
 }
+function resetData() {
+  query.value.offset = 0;
+  subscribeData.value = [];
+  isFinished.value = false;
+}
+async function handleRefresh(event: RefresherCustomEvent) {
+  resetData();
+  await fetchRwaData();
+  setTimeout(() => {
+    event.target.complete();
+  }, 500);
+}
+async function handleInfinite(event: InfiniteScrollCustomEvent) {
+  if (isFinished.value) {
+    event.target.complete();
+    event.target.disabled = true;
+    return;
+  }
+  query.value.offset! += query.value.limit!;
+  await fetchRwaData();
+  setTimeout(() => {
+    event.target.complete();
+  }, 500);
+}
+
+watch(() => query.value.categoryId, async () => {
+  resetData();
+  await fetchRwaData();
+});
 
 onBeforeMount(() => {
   fetchRwaData();
@@ -33,11 +66,19 @@ onBeforeMount(() => {
     </ion-header>
 
     <ion-content :fullscreen="true" class="ion-padding">
-      <ion-refresher slot="fixed">
+      <ion-refresher slot="fixed" @ion-refresh="handleRefresh($event)">
         <ion-refresher-content />
       </ion-refresher>
 
-      <div class="space-y-3 antialiased mt-5" />
+      <Category v-model="query!.categoryId" />
+      <MySubscribeList :data="subscribeData" />
+
+      <ion-infinite-scroll threshold="100px" @ion-infinite="handleInfinite">
+        <ion-infinite-scroll-content
+          loading-spinner="bubbles"
+          loading-text="加载中..."
+        />
+      </ion-infinite-scroll>
     </ion-content>
   </ion-page>
 </template>
diff --git a/src/views/withdraw/index.vue b/src/views/withdraw/index.vue
index 555a62e..72ac082 100644
--- a/src/views/withdraw/index.vue
+++ b/src/views/withdraw/index.vue
@@ -1,7 +1,7 @@
 <script lang='ts' setup>
 import type { GenericObject } from "vee-validate";
 import type { WithdrawBody } from "@/api/types";
-import { toastController } from "@ionic/vue";
+import { loadingController, toastController } from "@ionic/vue";
 import { ErrorMessage, Field, Form } from "vee-validate";
 import { client, safeClient } from "@/api";
 import { AssetCodeEnum, ChainEnum, WithdrawMethodEnum } from "@/api/enum";
@@ -29,16 +29,23 @@ const maxAmount = computed(() => {
 const schema = computed(() => createWithdrawSchema(t, maxAmount.value));
 
 async function onSubmit(values: GenericObject) {
-  await safeClient(() => client.api.withdraw.post(values as WithdrawBody));
-  const toast = await toastController.create({
-    message: t("withdraw.successMessage"),
-    duration: 2000,
-    position: "bottom",
-    color: "success",
+  const loading = await loadingController.create({
+    message: "提交中...",
   });
+  await loading.present();
 
-  await toast.present();
-  router.back();
+  await safeClient(() => client.api.withdraw.post(values as WithdrawBody)).finally(async () => {
+    const toast = await toastController.create({
+      message: t("withdraw.successMessage"),
+      duration: 2000,
+      position: "bottom",
+      color: "success",
+    });
+
+    await toast.present();
+    loading.dismiss();
+    router.back();
+  });
 }
 </script>