li.shaoyi 4 ヶ月 前
コミット
51d6168cd6
100 ファイル変更255 行追加164 行削除
  1. 86 0
      src/business/news/index.ts
  2. 11 11
      src/hooks/request/index.ts
  3. 1 1
      src/packages/gcszt/views/account/certification/Index.vue
  4. 1 1
      src/packages/gcszt/views/account/protocol/Index.vue
  5. 1 1
      src/packages/gzcj/views/account/certification/Index.vue
  6. 1 1
      src/packages/gzcj/views/account/protocol/Index.vue
  7. 1 1
      src/packages/mobile/App.vue
  8. 1 1
      src/packages/mobile/components/modules/delivery/index.vue
  9. 1 1
      src/packages/mobile/components/modules/delivery/warehouse-receipt.vue
  10. 1 1
      src/packages/mobile/components/modules/performance/list/index.vue
  11. 2 2
      src/packages/mobile/components/modules/quote/tik/index.vue
  12. 1 1
      src/packages/mobile/views/account/authresult/Index.vue
  13. 1 1
      src/packages/mobile/views/account/certification/Index.vue
  14. 3 3
      src/packages/mobile/views/ballot/list/Index.vue
  15. 1 1
      src/packages/mobile/views/bank/capital/statement/history/index.vue
  16. 1 1
      src/packages/mobile/views/bank/capital/statement/index.vue
  17. 1 1
      src/packages/mobile/views/bank/sign/components/edit/search-bank/index.vue
  18. 1 1
      src/packages/mobile/views/goods/trade/index.vue
  19. 24 22
      src/packages/mobile/views/news/detail/Index.vue
  20. 15 13
      src/packages/mobile/views/news/list/Index.vue
  21. 2 2
      src/packages/mobile/views/notice/list/index.vue
  22. 1 1
      src/packages/mobile/views/order/delivery/components/offline/list/Index.vue
  23. 1 1
      src/packages/mobile/views/order/delivery/components/spot/list/Index.vue
  24. 1 1
      src/packages/mobile/views/order/inout/components/in/list/index.vue
  25. 1 1
      src/packages/mobile/views/order/inout/components/out/list/index.vue
  26. 1 1
      src/packages/mobile/views/order/list/components/goodsorder/history/Index.vue
  27. 1 1
      src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue
  28. 1 1
      src/packages/mobile/views/order/list/components/goodstrade/history/Index.vue
  29. 1 1
      src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue
  30. 1 1
      src/packages/mobile/views/order/list/components/listingorder/history/Index.vue
  31. 1 1
      src/packages/mobile/views/order/list/components/listingorder/list/Index.vue
  32. 1 1
      src/packages/mobile/views/order/list/components/listingtrade/history/Index.vue
  33. 1 1
      src/packages/mobile/views/order/list/components/listingtrade/list/Index.vue
  34. 1 1
      src/packages/mobile/views/order/list/components/presale/history/index.vue
  35. 1 1
      src/packages/mobile/views/order/list/components/presale/list/Index.vue
  36. 1 1
      src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue
  37. 1 1
      src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue
  38. 1 1
      src/packages/mobile/views/order/list/components/swaporder/history/Index.vue
  39. 1 1
      src/packages/mobile/views/order/list/components/swaporder/list/Index.vue
  40. 1 1
      src/packages/mobile/views/order/list/components/swaptrade/history/Index.vue
  41. 1 1
      src/packages/mobile/views/order/list/components/swaptrade/list/Index.vue
  42. 1 1
      src/packages/mobile/views/order/list/components/transferorder/history/index.vue
  43. 1 1
      src/packages/mobile/views/order/list/components/transferorder/list/Index.vue
  44. 1 1
      src/packages/mobile/views/order/list/components/transfertrade/history/index.vue
  45. 1 1
      src/packages/mobile/views/order/list/components/transfertrade/list/Index.vue
  46. 1 1
      src/packages/mobile/views/order/performance/Index.vue
  47. 1 1
      src/packages/mobile/views/order/performance/components/detail/Index.vue
  48. 1 1
      src/packages/mobile/views/order/performance/components/history/Index.vue
  49. 1 1
      src/packages/mobile/views/order/position/components/goods/detail/Index.vue
  50. 1 1
      src/packages/mobile/views/order/position/components/presale/list/Index.vue
  51. 1 1
      src/packages/mobile/views/order/position/components/pricing/detail/Index.vue
  52. 1 1
      src/packages/mobile/views/order/position/components/spot/list/Index.vue
  53. 1 1
      src/packages/mobile/views/order/position/components/swap/close/Index.vue
  54. 1 1
      src/packages/mobile/views/order/position/components/transfer/list/Index.vue
  55. 3 3
      src/packages/mobile/views/presale/list/Index.vue
  56. 1 1
      src/packages/mobile/views/pricing/trade/components/cancel/Index.vue
  57. 1 1
      src/packages/mobile/views/pricing/trade/holdlb/Index.vue
  58. 1 1
      src/packages/mobile/views/report/components/bank/index.vue
  59. 1 1
      src/packages/mobile/views/report/components/position/index.vue
  60. 1 1
      src/packages/mobile/views/report/components/trade/index.vue
  61. 2 2
      src/packages/mobile/views/spot/detail/Index.vue
  62. 1 1
      src/packages/mobile/views/spot/detail/components/delisting/index.vue
  63. 1 1
      src/packages/mobile/views/spot/list/Index.vue
  64. 2 2
      src/packages/mobile/views/swap/detail/Index.vue
  65. 1 1
      src/packages/mobile/views/swap/detail/components/delisting/Index.vue
  66. 1 1
      src/packages/mobile/views/swap/detail/components/listing/Index.vue
  67. 2 2
      src/packages/mobile/views/swap/list/Index.vue
  68. 2 2
      src/packages/mobile/views/transfer/delisting/Index.vue
  69. 2 2
      src/packages/mobile/views/transfer/detail/Index.vue
  70. 1 1
      src/packages/mobile/views/transfer/detail2/index.vue
  71. 1 1
      src/packages/mobile/views/transfer/listing/Index.vue
  72. 1 1
      src/packages/nhgj/views/account/certification/Index.vue
  73. 3 3
      src/packages/pc/components/layouts/header/components/notice/index.vue
  74. 6 5
      src/packages/pc/components/layouts/header/components/setting/index.vue
  75. 2 2
      src/packages/pc/components/modules/delivery/index.vue
  76. 1 1
      src/packages/pc/components/modules/goods-detail/index.vue
  77. 2 2
      src/packages/pc/components/modules/goods-detail/order/index.vue
  78. 1 1
      src/packages/pc/components/modules/performance/index.vue
  79. 2 2
      src/packages/pc/components/modules/quote/tik/index.vue
  80. 1 1
      src/packages/pc/views/account/sign/components/sign/index.vue
  81. 2 2
      src/packages/pc/views/account/sign/index.vue
  82. 2 2
      src/packages/pc/views/footer/capital/summary/index.vue
  83. 1 1
      src/packages/pc/views/footer/goods/detail/index.vue
  84. 1 1
      src/packages/pc/views/footer/goods/order/index.vue
  85. 1 1
      src/packages/pc/views/footer/goods/trade/index.vue
  86. 1 1
      src/packages/pc/views/footer/performance/buy/index.vue
  87. 1 1
      src/packages/pc/views/footer/performance/components/details/index.vue
  88. 1 1
      src/packages/pc/views/footer/performance/sell/index.vue
  89. 1 1
      src/packages/pc/views/footer/presell/transferorder/index.vue
  90. 1 1
      src/packages/pc/views/footer/pricing/detail/index.vue
  91. 1 1
      src/packages/pc/views/footer/pricing/order/index.vue
  92. 1 1
      src/packages/pc/views/footer/pricing/trade/index.vue
  93. 1 1
      src/packages/pc/views/footer/spot/order/index.vue
  94. 1 1
      src/packages/pc/views/footer/spot/trade/index.vue
  95. 1 1
      src/packages/pc/views/footer/swap/order/index.vue
  96. 1 1
      src/packages/pc/views/footer/swap/position/close/index.vue
  97. 1 1
      src/packages/pc/views/footer/swap/trade/index.vue
  98. 1 1
      src/packages/pc/views/market/trade/presell/ballot/index.vue
  99. 1 1
      src/packages/pc/views/market/trade/presell/bidding/index.vue
  100. 1 1
      src/packages/pc/views/market/trade/spot/index.vue

+ 86 - 0
src/business/news/index.ts

@@ -0,0 +1,86 @@
+import { ref, computed } from 'vue'
+import { Language } from '@/constants/language'
+import { i18n } from '@/stores'
+
+export function useNewsColumn() {
+    const dataList = ref<Model.SiteColumnConfigRsp[]>([])
+
+    // 本地化数据
+    const localizedDataList = computed<Model.SiteColumnConfigRsp[]>(() => dataList.value.map((e) => {
+        const localizedTitle = {
+            [Language.Simplified]: e.columnname,
+            [Language.English]: e.columnnameen,
+            [Language.Thai]: e.columnnameth,
+            [Language.Traditional]: e.columnnametw,
+            [Language.Vietnamese]: e.columnnamevi
+        }
+
+        return {
+            ...e,
+            columnname: localizedTitle[i18n.global.locale]
+        }
+    }).filter((e) => e.columnname))
+
+    return {
+        dataList,
+        localizedDataList
+    }
+}
+
+export function useNewsTitle() {
+    const dataList = ref<Model.NewTitlesRsp[]>([])
+
+    // 本地化数据
+    const localizedDataList = computed<Model.NewTitlesRsp[]>(() => dataList.value.map((e) => {
+        const localizedTitle = {
+            [Language.Simplified]: e.title,
+            [Language.English]: e.titleen,
+            [Language.Thai]: e.titleth,
+            [Language.Traditional]: e.titletw,
+            [Language.Vietnamese]: e.titlevi
+        }
+
+        return {
+            ...e,
+            title: localizedTitle[i18n.global.locale]
+        }
+    }).filter((e) => e.title))
+
+    return {
+        dataList,
+        localizedDataList
+    }
+}
+
+export function useNewsContent() {
+    const details = ref<Model.NewContentsRsp>()
+
+    // 本地化数据
+    const localizedDetails = computed(() => {
+        const e = details.value
+
+        if (e) {
+            const localizedProperties = {
+                [Language.Simplified]: { title: e.title, author: e.author, context: e.context, srcname: e.srcname },
+                [Language.English]: { title: e.titleen, author: e.authoren, context: e.contexten, srcname: e.srcnameen },
+                [Language.Thai]: { title: e.titleth, author: e.authorth, context: e.contextth, srcname: e.srcnameth },
+                [Language.Traditional]: { title: e.titletw, author: e.authortw, context: e.contexttw, srcname: e.srcnametw },
+                [Language.Vietnamese]: { title: e.titlevi, author: e.authorvi, context: e.contextvi, srcname: e.srcnamevi }
+            }
+
+            const localizedValues = localizedProperties[i18n.global.locale] // 本地化语言
+
+            return {
+                ...e,
+                ...localizedValues
+            }
+        }
+
+        return e
+    })
+
+    return {
+        details,
+        localizedDetails
+    }
+}

+ 11 - 11
src/hooks/request/index.ts

@@ -3,7 +3,7 @@ import { RequestConfig, CommonResult } from '@/services/http/types'
 import { useDataTable } from '../datatable'
 
 interface RequestOptions<TParams, TResponse> {
-    params?: {
+    defaultParams?: {
         page?: number; // 当前页码
         pagesize?: number; // 每页条数
     } & TParams;
@@ -24,38 +24,38 @@ const isCommonResult = (obj: unknown): obj is CommonResult => {
 }
 
 export function useRequest<TParams extends object, TResponse>(fetcher: (params: RequestConfig<TParams>) => Promise<TResponse>, options?: RequestOptions<TParams, TResponse>) {
-    const { params, localPagination, manual, onBefore, onSuccess, onError, onFinally } = options ?? {}
+    const { defaultParams, localPagination, manual, onBefore, onSuccess, onError, onFinally } = options ?? {}
 
     type Result = TResponse extends CommonResult ? TResponse['data'] : TResponse // 获取返回值的类型
     type ResultType = Result extends (infer U)[] ? U : Result // 如果 U 是数组,取 U 的类型
 
     const { dataList, filters, total, pageIndex, pageSize, pageCount } = useDataTable<ResultType>({
         localPagination,
-        pageIndex: params?.page,
-        pageSize: params?.pagesize,
+        pageIndex: defaultParams?.page,
+        pageSize: defaultParams?.pagesize,
     })
     const data = ref<ResultType>()
     const loading = ref(false)
 
     // 异步函数
-    const runAsync = async (payload: Partial<TParams> = {}) => {
-        if (params && params.pagesize) {
-            params.page = pageIndex.value
-            params.pagesize = pageSize.value
+    const runAsync = async (params: Partial<TParams> = {}) => {
+        if (defaultParams && defaultParams.pagesize) {
+            defaultParams.page = pageIndex.value
+            defaultParams.pagesize = pageSize.value
         }
 
         onBefore && await onBefore()
         const res = await fetcher({
-            data: { ...params, ...payload } as TParams
+            data: { ...defaultParams, ...params } as TParams
         })
 
         return res
     }
 
     // 同步函数
-    const run = (payload: Partial<TParams> = {}) => {
+    const run = (params: Partial<TParams> = {}) => {
         loading.value = true
-        runAsync(payload).then((res) => {
+        runAsync(params).then((res) => {
             if (isCommonResult(res)) {
                 total.value = res.total
                 if (Array.isArray(res.data)) {

+ 1 - 1
src/packages/gcszt/views/account/certification/Index.vue

@@ -116,7 +116,7 @@ useRequest(queryBankAccountSign, {
 
 /// 查询记录
 const { loading: buttonLoading } = useRequest(queryTencentUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: getMemberUserId()
     },

+ 1 - 1
src/packages/gcszt/views/account/protocol/Index.vue

@@ -59,7 +59,7 @@ const thirdStepList = shallowRef<Model.UsereSignRecordsRsq[]>([])
 const { customername, cardnum, bankaccount, bankbankname, mobile2 } = userStore.userInfo
 /// 查询
 const { run } = useRequest(queryUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: memberUserId
     },

+ 1 - 1
src/packages/gzcj/views/account/certification/Index.vue

@@ -116,7 +116,7 @@ useRequest(queryBankAccountSign, {
 
 /// 查询记录
 const { loading: buttonLoading } = useRequest(queryTencentUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: getMemberUserId()
     },

+ 1 - 1
src/packages/gzcj/views/account/protocol/Index.vue

@@ -58,7 +58,7 @@ const thirdStepList = shallowRef<Model.UsereSignRecordsRsq[]>([])
 const { customername, cardnum, bankaccount, bankbankname, mobile2 } = userStore.userInfo
 /// 查询
 const { run } = useRequest(queryUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: memberUserId
     },

+ 1 - 1
src/packages/mobile/App.vue

@@ -136,7 +136,7 @@ watch(() => noticeStore.isInitialized, () => {
   const showUnread = props.showUnread && localValue !== readValue // 未读消息一天内只会弹框一次
 
   // 过滤数据
-  const filteredData = noticeStore.localizedNoticeList.filter((e) => (showUnread && !e.readed) || e.isforcedisplay)
+  const filteredData = noticeStore.localizedDataList.filter((e) => (showUnread && !e.readed) || e.isforcedisplay)
   // 浅拷贝,防止数据引用
   message.dataList = filteredData.map((e) => ({ ...e }))
 

+ 1 - 1
src/packages/mobile/components/modules/delivery/index.vue

@@ -86,7 +86,7 @@ const formData = reactive<Partial<Proto.DeliveryOrderReq>>({
 
 // 查询商品交割关系
 const { data: deliveryRelation } = useRequest(queryDeliveryRelation, {
-    params: {
+    defaultParams: {
         goodsid: props.goodsId,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/components/modules/delivery/warehouse-receipt.vue

@@ -61,7 +61,7 @@ const checkedRow = shallowRef<Model.WrDeliveryAvalidHoldLBRsp>()
 const { t } = i18n.global
 
 const { dataList } = useRequest(queryWrDeliveryAvalidHoldLB, {
-    params: {
+    defaultParams: {
         goodsid: props.goodsId,
     },
 })

+ 1 - 1
src/packages/mobile/components/modules/performance/list/index.vue

@@ -51,7 +51,7 @@ const showModal = computed({
 })
 
 const { dataList } = useRequest(queryPermancePlanTmp, {
-    params: {
+    defaultParams: {
         marketid: props.marketId,
         tmptype: props.tmptype
     },

+ 2 - 2
src/packages/mobile/components/modules/quote/tik/index.vue

@@ -40,7 +40,7 @@ const columns = shallowReactive<Model.TableColumn[]>([
 
 const { run: getHistoryTikDatas } = useRequest(queryHistoryTikDatas, {
     manual: true,
-    params: {
+    defaultParams: {
         goodsCode: props.goodsCode,
         count: 10
     },
@@ -50,7 +50,7 @@ const { run: getHistoryTikDatas } = useRequest(queryHistoryTikDatas, {
 })
 
 useRequest(queryMarketRun, {
-    params: {
+    defaultParams: {
         marketID: quote.value?.marketid
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/account/authresult/Index.vue

@@ -65,7 +65,7 @@ useRequest(queryWrDraftUserInfo, {
 
 // 获取网上开户配置
 useRequest(getWskhOpenAccountConfigs, {
-    params: {
+    defaultParams: {
         configs: '53,54,78'
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/account/certification/Index.vue

@@ -145,7 +145,7 @@ const onConfirm = ({ selectedValues: [value] }: PickerConfirmEventParams) => {
 
 // 获取网上开户配置
 useRequest(getWskhOpenAccountConfigs, {
-    params: {
+    defaultParams: {
         configs: '53,54,78'
     },
     onSuccess: (res) => {

+ 3 - 3
src/packages/mobile/views/ballot/list/Index.vue

@@ -120,7 +120,7 @@ const title = getQueryString('title')
 const titleName = computed(() => title ? decodeURIComponent(title) : props.marketSection?.displayname ?? t('quote.ballot.presalewin'))
 
 const { dataList } = useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 5,
         presalestatusstr: '1'
     },
@@ -130,14 +130,14 @@ const { dataList } = useRequest(queryPresaleAuctions, {
 })
 
 const { dataList: startList } = useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 5,
         presalestatusstr: '2'
     }
 })
 
 useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 5,
         presalestatusstr: '3,4'
     },

+ 1 - 1
src/packages/mobile/views/bank/capital/statement/history/index.vue

@@ -74,7 +74,7 @@ const columns: Model.TableColumn[] = [
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisAmountLog, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         pageflag: 1,
     },

+ 1 - 1
src/packages/mobile/views/bank/capital/statement/index.vue

@@ -68,7 +68,7 @@ const columns: Model.TableColumn[] = [
 ]
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryAmountLog, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         pageflag: 1,
     },

+ 1 - 1
src/packages/mobile/views/bank/sign/components/edit/search-bank/index.vue

@@ -52,7 +52,7 @@ const showModal = computed({
 
 const { dataList, runAsync } = useRequest(queryBankBranChnumInfo, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 30
     }
 })

+ 1 - 1
src/packages/mobile/views/goods/trade/index.vue

@@ -72,7 +72,7 @@ const columns: Model.TableColumn[] = [
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => onRefresh())
 
 const { dataList, pageIndex, loading, run, pageCount } = useRequest(queryWrTradeOrderDetail, {
-    params: {
+    defaultParams: {
         goodsid,
         buyorsell: tabIndex.value
     },

+ 24 - 22
src/packages/mobile/views/news/detail/Index.vue

@@ -12,22 +12,26 @@
                 </template> -->
             </app-navbar>
         </template>
-        <section class="news-details__container" v-if="data">
-            <h1>{{ data.title }}</h1>
+        <section class="news-details__container" v-if="localizedDetails">
+            <h1>{{ localizedDetails.title }}</h1>
             <h4>
                 <span>{{ $t('news.source') }}</span>
-                <img :src="getFileUrl(data.srclogo)" v-if="data.srclogo" />
-                <span @click="openUrl(data?.srcurl)" style="color:dodgerblue" v-if="data.srcname">{{ data.srcname }}</span>
-                <span>{{ formatDate(data.publishdate, 'YYYY-MM-DD') }}</span>
-                <span style="margin-left: auto;">{{ $t('news.numbers') }} {{ data.hits }}</span>
+                <img :src="getFileUrl(localizedDetails.srclogo)" v-if="localizedDetails.srclogo" />
+                <span @click="openUrl(localizedDetails.srcurl)" style="color:dodgerblue"
+                    v-if="localizedDetails.srcname">
+                    {{ localizedDetails.srcname }}
+                </span>
+                <span>{{ formatDate(localizedDetails.publishdate, 'YYYY-MM-DD') }}</span>
+                <span style="margin-left: auto;">{{ $t('news.numbers') }} {{ localizedDetails.hits }}</span>
             </h4>
-            <HtmlContainer class="content" :context="formatHtmlString(data.context)" v-if="data.context" />
-            <p class="footer" v-if="data.author">{{ $t('news.author') }} {{ data.author }}</p>
+            <HtmlContainer class="content" :context="formatHtmlString(localizedDetails.context)"
+                v-if="localizedDetails.context" />
+            <p class="footer" v-if="localizedDetails.author">{{ $t('news.author') }} {{ localizedDetails.author }}</p>
         </section>
-        <template v-if="dataList.length">
+        <template v-if="titleList.length">
             <Divider>{{ $t('news.hotnews') }}</Divider>
             <CellGroup class="news-details__list">
-                <template v-for="(item, index) in dataList" :key="index">
+                <template v-for="(item, index) in titleList" :key="index">
                     <Cell class="article-item" title-class="article-item__title" value-class="article-item__time"
                         :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
                         :to="{ name: 'news-detail', query: { id: item.id } }" replace />
@@ -42,6 +46,7 @@ import { CellGroup, Cell, Divider } from 'vant'
 import { formatDate, getFileUrl, formatHtmlString } from '@/filters'
 import { useNavigation } from '@mobile/router/navigation'
 import { useRequest } from '@/hooks/request'
+import { useNewsContent } from '@/business/news'
 import { queryNewTitles, queryNewContents } from '@/services/api/news'
 import plus from '@/utils/h5plus'
 import HtmlContainer from '@mobile/components/base/html-container/index.vue'
@@ -49,28 +54,25 @@ import HtmlContainer from '@mobile/components/base/html-container/index.vue'
 const { getQueryString } = useNavigation()
 const newsId = getQueryString('id')
 
-const { dataList, run } = useRequest(queryNewTitles, {
+const { details, localizedDetails } = useNewsContent()
+
+const { dataList: titleList, run } = useRequest(queryNewTitles, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 10,
     },
     onSuccess: (res) => {
-        dataList.value = res.data.filter((e) => e.id.toString() !== newsId)
+        titleList.value = res.data.filter((e) => e.id.toString() !== newsId)
     }
 })
 
-const { data } = useRequest(queryNewContents, {
-    params: {
+useRequest(queryNewContents, {
+    defaultParams: {
         ids: newsId
     },
     onSuccess: (res) => {
-        if (res.data.length) {
-            const details = res.data[0]
-            data.value = details
-            run({ columnid: details.columnid })
-        } else {
-            run()
-        }
+        details.value = res.data[0]
+        run({ columnid: details.value?.columnid })
     }
 })
 

+ 15 - 13
src/packages/mobile/views/news/list/Index.vue

@@ -3,15 +3,15 @@
     <template #header>
       <app-navbar :title="title" :show-back-button="showBackButton" />
     </template>
-    <Tabs v-if="siteColumns.length != 0" v-model:active="currentColumnId" @change="onClickTab">
-      <template v-for="(item, index) in siteColumns" :key="index">
+    <Tabs v-if="localizedColumnList.length != 0" v-model:active="currentColumnId" @change="onClickTab">
+      <template v-for="(item, index) in localizedColumnList" :key="index">
         <Tab :name="item.id" :title="item.columnname" />
       </template>
     </Tabs>
     <app-pull-refresh ref="pullRefreshRef" class="news-list__container" v-model:loading="loading" v-model:error="error"
       v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
-      <Empty v-if="!dataList.length" />
-      <template v-for="(item, index) in dataList" :key="index">
+      <Empty v-if="!localizedTitleList.length" />
+      <template v-for="(item, index) in localizedTitleList" :key="index">
         <Cell class="article-item" title-class="article-item__title" value-class="article-item__time"
           :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
           :to="{ name: 'news-detail', query: { id: item.id } }" />
@@ -25,8 +25,9 @@ import { shallowRef } from 'vue'
 import { Cell, Tab, Tabs, Empty } from 'vant'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { i18n } from "@/stores";
-import { querySiteColumnDetail, querySiteColumnConfig } from '@/services/api/news'
+import { useNewsTitle, useNewsColumn } from '@/business/news'
+import { i18n } from "@/stores"
+import { queryNewTitles, querySiteColumnConfig } from '@/services/api/news'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 defineProps({
@@ -41,30 +42,31 @@ defineProps({
 })
 
 const pullRefreshRef = shallowRef()
-const dataList = shallowRef<Model.SiteColumnDetailRsp[]>([])
-const siteColumns = shallowRef<Model.SiteColumnConfigRsp[]>([])
 const currentColumnId = shallowRef(0)
 const error = shallowRef(false)
 
+const { dataList: columnList, localizedDataList: localizedColumnList } = useNewsColumn()
+const { dataList: titleList, localizedDataList: localizedTitleList } = useNewsTitle()
+
 /// 查询栏目配置
 const getSiteColumnConfig = querySiteColumnConfig().then((res) => {
-  siteColumns.value = res.data
+  columnList.value = res.data
   /// 默认第一个
   if (res.data.length) {
     currentColumnId.value = res.data[0].id
   }
 })
 
-const { loading, pageIndex, pageCount, run } = useRequest(querySiteColumnDetail, {
+const { loading, pageIndex, pageCount, run } = useRequest(queryNewTitles, {
   manual: true,
-  params: {
+  defaultParams: {
     pagesize: 20,
   },
   onSuccess: (res) => {
     if (pageIndex.value === 1) {
-      dataList.value = []
+      titleList.value = []
     }
-    dataList.value.push(...res.data)
+    titleList.value.push(...res.data)
   },
   onError: () => {
     error.value = true

+ 2 - 2
src/packages/mobile/views/notice/list/index.vue

@@ -49,7 +49,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 const active = shallowRef(1)
 const selectedRow = shallowRef<Model.NoticeRsp>()
 
-const dataList = computed(() => noticeStore.localizedNoticeList.filter((e) => e.msgtype === active.value))
+const dataList = computed(() => noticeStore.localizedDataList.filter((e) => e.msgtype === active.value))
 
 const openDetail = (item: Model.NoticeRsp) => {
     selectedRow.value = item
@@ -57,6 +57,6 @@ const openDetail = (item: Model.NoticeRsp) => {
 }
 
 const onRefresh = () => {
-    noticeStore.getNoticeList()
+    noticeStore.fetchDataList()
 }
 </script>

+ 1 - 1
src/packages/mobile/views/order/delivery/components/offline/list/Index.vue

@@ -78,7 +78,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeGoodsDeliveryOfflines, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/delivery/components/spot/list/Index.vue

@@ -63,7 +63,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryWrOutInApply, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/inout/components/in/list/index.vue

@@ -96,7 +96,7 @@ const formData = reactive({
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryInTradePositionTransfer, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/inout/components/out/list/index.vue

@@ -59,7 +59,7 @@ const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryOutTradepositiontransfer, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/list/components/goodsorder/history/Index.vue

@@ -89,7 +89,7 @@ const componentMap = new Map<string, unknown>([
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeOrderDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         pageflag: 1,
         tradeMode: '50,16',

+ 1 - 1
src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue

@@ -78,7 +78,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '50,16'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/goodstrade/history/Index.vue

@@ -93,7 +93,7 @@ const componentMap = new Map<string, unknown>([
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         pageflag: 1,
         tradeMode: '50,16',

+ 1 - 1
src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue

@@ -74,7 +74,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '50,16'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/listingorder/history/Index.vue

@@ -88,7 +88,7 @@ const componentMap = new Map<string, unknown>([
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryWrOrderDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         marketid: 17201,
         haswr: 1,

+ 1 - 1
src/packages/mobile/views/order/list/components/listingorder/list/Index.vue

@@ -79,7 +79,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryWrOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         wrtradetype: 1,
         marketid: 17201,

+ 1 - 1
src/packages/mobile/views/order/list/components/listingtrade/history/Index.vue

@@ -85,7 +85,7 @@ const componentMap = new Map<string, unknown>([
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryWrTradeDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         marketid: 17201,
         haswr: 1

+ 1 - 1
src/packages/mobile/views/order/list/components/listingtrade/list/Index.vue

@@ -67,7 +67,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryWrTradeDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         marketid: 17201,
         haswr: 1

+ 1 - 1
src/packages/mobile/views/order/list/components/presale/history/index.vue

@@ -100,7 +100,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeOrderDetails, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         ishis: true,
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/presale/list/Index.vue

@@ -86,7 +86,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeOrderDetails, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue

@@ -80,7 +80,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '10'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue

@@ -72,7 +72,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '10'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/swaporder/history/Index.vue

@@ -87,7 +87,7 @@ const componentMap = new Map<string, unknown>([
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeOrderDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         tradeMode: '46',
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/list/components/swaporder/list/Index.vue

@@ -77,7 +77,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '46'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/swaptrade/history/Index.vue

@@ -90,7 +90,7 @@ const componentMap = new Map<string, unknown>([
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '46'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/swaptrade/list/Index.vue

@@ -71,7 +71,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '46'
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/transferorder/history/index.vue

@@ -79,7 +79,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeOrders, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         ishis: true,
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/transferorder/list/Index.vue

@@ -74,7 +74,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeOrders, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/list/components/transfertrade/history/index.vue

@@ -84,7 +84,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeTradeDetails, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         ishis: true,
     },

+ 1 - 1
src/packages/mobile/views/order/list/components/transfertrade/list/Index.vue

@@ -70,7 +70,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradeTradeDetails, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/performance/Index.vue

@@ -102,7 +102,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryPerformancePlan, {
-    params: {
+    defaultParams: {
         buyorsell: buyorsell.value
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/performance/components/detail/Index.vue

@@ -132,7 +132,7 @@ const formRules: { [key: string]: FieldRule[] } = {
 }
 
 const { dataList } = useRequest(queryWrPerformancePlanStep, {
-    params: {
+    defaultParams: {
         planid: props.selectedRow.performanceplanid
     },
 })

+ 1 - 1
src/packages/mobile/views/order/performance/components/history/Index.vue

@@ -101,7 +101,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryPerformancePlan, {
     manual: true,
-    params: {
+    defaultParams: {
         buyorsell: props.buyorsell
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/position/components/goods/detail/Index.vue

@@ -75,7 +75,7 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { dataList, loading, run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         trademodes: '50,16'
     }
 })

+ 1 - 1
src/packages/mobile/views/order/position/components/presale/list/Index.vue

@@ -88,7 +88,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineCpTradePreSaleResults, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/position/components/pricing/detail/Index.vue

@@ -75,7 +75,7 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { dataList, loading, run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         trademodes: '10'
     }
 })

+ 1 - 1
src/packages/mobile/views/order/position/components/spot/list/Index.vue

@@ -63,7 +63,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHoldLB, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/mobile/views/order/position/components/swap/close/Index.vue

@@ -99,7 +99,7 @@ const refQuote = futuresStore.getGoodsQuote(props.selectedRow.refgoodscode)
 const quote = futuresStore.getGoodsQuote(props.selectedRow.goodscode)
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         /// 交易模式, 格式 1,2,3
         trademodes: ETradeMode.TRADEMODE_TJMD.toString(),

+ 1 - 1
src/packages/mobile/views/order/position/components/transfer/list/Index.vue

@@ -97,7 +97,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryMineTradePositionExs, {
-    params: {
+    defaultParams: {
         pagesize: 20,
     },
     onSuccess: (res) => {

+ 3 - 3
src/packages/mobile/views/presale/list/Index.vue

@@ -121,7 +121,7 @@ const titleName = computed(() => title ? decodeURIComponent(title) : props.marke
 
 // 预售准备
 const { dataList } = useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 4,
         presalestatus: 1
     },
@@ -132,7 +132,7 @@ const { dataList } = useRequest(queryPresaleAuctions, {
 
 // 预售开始
 const { dataList: startList } = useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 4,
         presalestatus: 2
     },
@@ -140,7 +140,7 @@ const { dataList: startList } = useRequest(queryPresaleAuctions, {
 
 // 预售结束
 useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 4,
         presalestatus: 3
     },

+ 1 - 1
src/packages/mobile/views/pricing/trade/components/cancel/Index.vue

@@ -73,7 +73,7 @@ const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         tradeMode: '10',
         orderStatus: '3,7'

+ 1 - 1
src/packages/mobile/views/pricing/trade/holdlb/Index.vue

@@ -67,7 +67,7 @@ const props = defineProps({
 })
 
 const { dataList, loading, run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         trademodes: '10',
         goodsid: props.goodsid
     }

+ 1 - 1
src/packages/mobile/views/report/components/bank/index.vue

@@ -59,7 +59,7 @@ const columns: Model.TableColumn[] = [
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryReportBankAccountOutInLog, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         reporttype: props.reportType,
         tradedate: props.startDate

+ 1 - 1
src/packages/mobile/views/report/components/position/index.vue

@@ -70,7 +70,7 @@ const error = shallowRef(false)
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryReportReckonDayPosition, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         reporttype: props.reportType,
         reckondate: props.startDate

+ 1 - 1
src/packages/mobile/views/report/components/trade/index.vue

@@ -71,7 +71,7 @@ const error = shallowRef(false)
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryReportTradeDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         reporttype: props.reportType,
         histradedate: props.startDate

+ 2 - 2
src/packages/mobile/views/spot/detail/Index.vue

@@ -107,7 +107,7 @@ const wrfactortypeid = getQueryString('wrfactortypeid') ?? '0'
 
 const { data: quoteItem, run: getOrderQuote } = useRequest(queryOrderQuote, {
     manual: true,
-    params: {
+    defaultParams: {
         wrpricetype: 1,
         wrfactortypeid
     },
@@ -118,7 +118,7 @@ const { data: quoteItem, run: getOrderQuote } = useRequest(queryOrderQuote, {
 
 const { runAsync: getOrderQuoteDetail } = useRequest(queryOrderQuoteDetail, {
     manual: true,
-    params: {
+    defaultParams: {
         wrpricetype: 1,
         haswr: 1,
         wrfactortypeid,

+ 1 - 1
src/packages/mobile/views/spot/detail/components/delisting/index.vue

@@ -99,7 +99,7 @@ const selectedRow = shallowRef<Model.HoldLBRsp>() //选中的现货仓单
 
 // 查询履约模板
 const { data: permancePlanTmp } = useRequest(queryPermancePlanTmp, {
-    params: {
+    defaultParams: {
         marketid: props.quoteDetail.marketid,
         tmptype: '0,2'
     },

+ 1 - 1
src/packages/mobile/views/spot/list/Index.vue

@@ -91,7 +91,7 @@ const titleName = computed(() => title ? decodeURIComponent(title) : props.marke
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryOrderQuote, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 20,
         marketid: 17201,
         wrpricetype: 1,

+ 2 - 2
src/packages/mobile/views/swap/detail/Index.vue

@@ -75,7 +75,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 /// 查询用户掉期协议签署表
 const { dataList: protocolList, run: runMdUserSwapProtocol } = useRequest(queryMdUserSwapProtocol, {
     manual: true,
-    params: {
+    defaultParams: {
         userId: getUserId()
     }
 })
@@ -96,7 +96,7 @@ const status = (row: Model.TjmdTradeOrderDetailRsp) => {
 }
 
 const { dataList, run } = useRequest(queryTjmdTradeOrderDetail, {
-    params: {
+    defaultParams: {
         goodsid: item.goodsid,
         buyorsell: tabIndex.value
     }

+ 1 - 1
src/packages/mobile/views/swap/detail/components/delisting/Index.vue

@@ -171,7 +171,7 @@ const onRadioChange = (value: number) => {
 
 /// 查询交易保证金信息
 useRequest(queryTjmdTodayAccountMargin, {
-    params: {
+    defaultParams: {
         goodsid: props.selectedRow.goodsid.toString(),
         accountid: accountStore.currentAccountId.toString()
     },

+ 1 - 1
src/packages/mobile/views/swap/detail/components/listing/Index.vue

@@ -142,7 +142,7 @@ const buyOrSell = shallowRef(props.tabIndex)
 
 /// 查询交易保证金信息
 useRequest(queryTjmdTodayAccountMargin, {
-    params: {
+    defaultParams: {
         goodsid: props.item.goodsid.toString(),
         accountid: accountStore.currentAccountId.toString()
     },

+ 2 - 2
src/packages/mobile/views/swap/list/Index.vue

@@ -74,7 +74,7 @@ const titleName = computed(() => title ? decodeURIComponent(title) : props.marke
 
 const { dataList, run } = useRequest(queryQuoteGoodsList, {
     manual: true,
-    params: {
+    defaultParams: {
         usertype: userStore.userType ?? 0,
         marketids: userStore.getMarketId('TRADEMODE_TJMD').toString()
     },
@@ -141,7 +141,7 @@ const rowClick = (row: Model.QuoteGoodsListRsp) => {
 /// 创建电子签合同
 const { run: initMdUserSwapProtocol } = useRequest(requestInitMdUserSwapProtocol, {
     manual: true,
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: getMemberUserId()
     },

+ 2 - 2
src/packages/mobile/views/transfer/delisting/Index.vue

@@ -44,13 +44,13 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const { data: detail } = useRequest(queryPresaleDefault, {
-    params: {
+    defaultParams: {
         goodsid,
     }
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryWrTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 20,
         goodsid,
         buyorsell: getQueryStringToNumber('buyorsell'),

+ 2 - 2
src/packages/mobile/views/transfer/detail/Index.vue

@@ -87,14 +87,14 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 // 获取转让详情
 const { data: detail, run: getPresaleDefault } = useRequest(queryPresaleDefault, {
-    params: {
+    defaultParams: {
         goodsid,
     }
 })
 
 // 获取转让持仓
 const { dataList, run: getMineTradePositionExs } = useRequest(queryMineTradePositionExs, {
-    params: {
+    defaultParams: {
         goodsid,
     }
 })

+ 1 - 1
src/packages/mobile/views/transfer/detail2/index.vue

@@ -55,7 +55,7 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 // 获取转让详情
 const { data: detail, run: getPresaleDefault } = useRequest(queryPresaleDefault, {
-    params: {
+    defaultParams: {
         goodsid,
     }
 })

+ 1 - 1
src/packages/mobile/views/transfer/listing/Index.vue

@@ -92,7 +92,7 @@ const qtyStep = shallowRef(qtyStepList[0]) // 数量步长
 // 获取转让持仓
 const { dataList, run: getMineTradePositionExs } = useRequest(queryMineTradePositionExs, {
     manual: true,
-    params: {
+    defaultParams: {
         goodsid: quote.value?.goodsid,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/nhgj/views/account/certification/Index.vue

@@ -66,7 +66,7 @@ const isReadonly = false//computed(() => userESignRecords.value.some((e) => e.re
 
 /// 查询记录
 const { loading: buttonLoading } = useRequest(queryTencentUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: getMemberUserId()
     },

+ 3 - 3
src/packages/pc/components/layouts/header/components/notice/index.vue

@@ -59,11 +59,11 @@ const selectedItem = computed(() => dataList.value[active.value])
 const tabChange = (tab: string) => {
     switch (tab) {
         case 'notice': {
-            dataList.value = noticeStore.localizedNoticeList.filter((e) => e.msgtype === 1)
+            dataList.value = noticeStore.localizedDataList.filter((e) => e.msgtype === 1)
             break
         }
         case 'message': {
-            dataList.value = noticeStore.localizedNoticeList.filter((e) => e.msgtype === 2)
+            dataList.value = noticeStore.localizedDataList.filter((e) => e.msgtype === 2)
             break
         }
     }
@@ -81,7 +81,7 @@ const collapseChange = (index: number) => {
 }
 
 onMounted(() => {
-    noticeStore.getNoticeList().then(() => {
+    noticeStore.fetchDataList().then(() => {
         tabChange(selectedTab.value)
     })
 })

+ 6 - 5
src/packages/pc/components/layouts/header/components/setting/index.vue

@@ -76,6 +76,7 @@
 import { ref, computed } from 'vue'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { getBuyOrSellList } from '@/constants/order'
+import { Language } from '@/constants/language'
 import { useGlobalStore, useSettingStore, i18n } from '@/stores'
 import { localData } from '@/stores/storage'
 import { useRequest } from '@/hooks/request'
@@ -115,19 +116,19 @@ const changeLuanguage = (e: string) => {
     ElMessageBox.confirm(t('user.login.tips6'), t('common.tips'), { confirmButtonText: t('common.ikonw'), cancelButtonText: t('operation.cancel') }).then(() => {
         switch (e) {
             case 'zh-CN':
-                i18n.global.locale = 'zh-CN'
+                i18n.global.locale = Language.Simplified
                 break;
             case 'en':
-                i18n.global.locale = 'en-US'
+                i18n.global.locale = Language.English
                 break;
             case 'zh-TW':
-                i18n.global.locale = 'zh-TW'
+                i18n.global.locale = Language.Traditional
                 break;
             case 'vi':
-                i18n.global.locale = 'vi'
+                i18n.global.locale = Language.Vietnamese
                 break;
             default:
-                i18n.global.locale = 'th'
+                i18n.global.locale = Language.Thai
                 break;
         }
         /// 设置语言

+ 2 - 2
src/packages/pc/components/modules/delivery/index.vue

@@ -90,7 +90,7 @@ const quote = futuresStore.getGoodsQuote(props.goodsId) // 商品实时盘面
 const { t } = i18n.global
 
 useRequest(queryWrDeliveryAvalidHoldLB, {
-    params: {
+    defaultParams: {
         goodsid: props.goodsId,
     },
     onSuccess: (res) => {
@@ -103,7 +103,7 @@ useRequest(queryWrDeliveryAvalidHoldLB, {
 
 // 查询商品交割关系
 const { data: deliveryRelation } = useRequest(queryDeliveryRelation, {
-    params: {
+    defaultParams: {
         goodsid: props.goodsId,
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/pc/components/modules/goods-detail/index.vue

@@ -61,7 +61,7 @@ const active = shallowRef(true)
 const goodsCode = computed(() => quote.value?.goodscode ?? '')
 
 const { data: market, run } = useRequest(queryMarketRun, {
-    params: {
+    defaultParams: {
         marketID: quote.value?.marketid
     },
     onSuccess: (res) => {

+ 2 - 2
src/packages/pc/components/modules/goods-detail/order/index.vue

@@ -56,7 +56,7 @@ const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.WrTr
 const { componentRef, componentId, closeComponent } = useComponent()
 
 const { dataList: buyList, run: getBuyList } = useRequest(queryWrTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 10,
         goodsid: props.goodsId,
         buyorsell: BuyOrSell.Buy
@@ -64,7 +64,7 @@ const { dataList: buyList, run: getBuyList } = useRequest(queryWrTradeOrderDetai
 })
 
 const { dataList: sellList, run: getSellList } = useRequest(queryWrTradeOrderDetail, {
-    params: {
+    defaultParams: {
         pagesize: 10,
         goodsid: props.goodsId,
         buyorsell: BuyOrSell.Sell

+ 1 - 1
src/packages/pc/components/modules/performance/index.vue

@@ -27,7 +27,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue'])
 
 const { data, dataList } = useRequest(queryPermancePlanTmp, {
-    params: {
+    defaultParams: {
         marketid: props.marketId,
         tmptype: props.tmptype
     },

+ 2 - 2
src/packages/pc/components/modules/quote/tik/index.vue

@@ -39,7 +39,7 @@ const { t } = i18n.global
 
 const { run: getHistoryTikDatas } = useRequest(queryHistoryTikDatas, {
     manual: true,
-    params: {
+    defaultParams: {
         goodsCode: props.goodsCode,
         count: 30
     },
@@ -49,7 +49,7 @@ const { run: getHistoryTikDatas } = useRequest(queryHistoryTikDatas, {
 })
 
 useRequest(queryMarketRun, {
-    params: {
+    defaultParams: {
         marketID: quoteDay.value?.marketid
     },
     onSuccess: (res) => {

+ 1 - 1
src/packages/pc/views/account/sign/components/sign/index.vue

@@ -185,7 +185,7 @@ const formRules = computed(() => {
 
 const { loading: searchLoading, dataList, runAsync: searchBankBranChnumInfo } = useRequest(queryBankBranChnumInfo, {
     manual: true,
-    params: {
+    defaultParams: {
         pagesize: 30
     }
 })

+ 2 - 2
src/packages/pc/views/account/sign/index.vue

@@ -91,14 +91,14 @@ const { loading, run } = useRequest(queryBankAccountSign, {
 
 /// 查询用户掉期协议签署表
 const { dataList: protocolList } = useRequest(queryMdUserSwapProtocol, {
-    params: {
+    defaultParams: {
         userId: getUserId()
     }
 })
 
 /// 查询爱签签约协议信息
 const { dataList: records} = useRequest(queryUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: getMemberUserId(),
     }

+ 2 - 2
src/packages/pc/views/footer/capital/summary/index.vue

@@ -60,14 +60,14 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 /// 查询用户掉期协议签署表
 const { dataList: protocolList} = useRequest(queryMdUserSwapProtocol, {
-    params: {
+    defaultParams: {
         userId: getUserId()
     }
 })
 
 /// 查询爱签签约协议信息
 const { dataList: records} = useRequest(queryUsereSignRecords, {
-    params: {
+    defaultParams: {
         userId: getUserId(),
         memberUserId: getMemberUserId(),
     }

+ 1 - 1
src/packages/pc/views/footer/goods/detail/index.vue

@@ -44,7 +44,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([])
 const { t } = i18n.global
 
 const { run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         trademodes: '50,16'
     },
     onSuccess: (res) => initTableData(res.data)

+ 1 - 1
src/packages/pc/views/footer/goods/order/index.vue

@@ -62,7 +62,7 @@ const selectedRows = ref<Model.TradeOrderDetailRsp[]>([])
 const { global: { t } } = i18n
 
 const { dataList, loading, run, runAsync } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         tradeMode: '50,16',
         orderStatus: '3,7,12',
     },

+ 1 - 1
src/packages/pc/views/footer/goods/trade/index.vue

@@ -59,7 +59,7 @@ const { getSummaries } = useComposeTable<Model.TradeDetailRsp>({
 const { tableList, showLoadMore, initTableData, loadMore } = useLocalPagination<Model.TradeDetailRsp>()
 
 const { dataList, loading, runAsync } = useRequest(queryTradeDetail, {
-    params: {
+    defaultParams: {
         tradeMode: '50,16'
     },
     onSuccess: (res) => initTableData(res.data)

+ 1 - 1
src/packages/pc/views/footer/performance/buy/index.vue

@@ -66,7 +66,7 @@ const selectedRow = shallowRef<Model.PerformancePlanRsp>()
 const { t } = i18n.global
 
 const { loading, dataList, run } = useRequest(queryPerformancePlan, {
-    params: {
+    defaultParams: {
         buyorsell: BuyOrSell.Buy,
         status: '2'
     },

+ 1 - 1
src/packages/pc/views/footer/performance/components/details/index.vue

@@ -107,7 +107,7 @@ const show = ref(true)
 const refresh = ref(false)
 
 const { loading, dataList } = useRequest(queryWrPerformancePlanStep, {
-    params: {
+    defaultParams: {
         planid: props.selectedRow.performanceplanid
     },
 })

+ 1 - 1
src/packages/pc/views/footer/performance/sell/index.vue

@@ -66,7 +66,7 @@ const selectedRow = shallowRef<Model.PerformancePlanRsp>()
 const { t } = i18n.global
 
 const { loading, dataList, run } = useRequest(queryPerformancePlan, {
-    params: {
+    defaultParams: {
         buyorsell: BuyOrSell.Sell,
         status: '2'
     },

+ 1 - 1
src/packages/pc/views/footer/presell/transferorder/index.vue

@@ -51,7 +51,7 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { loading, run, dataList } = useRequest(queryMineTradeOrders, {
-    params: {
+    defaultParams: {
         status: '3,7,12'
     }
 })

+ 1 - 1
src/packages/pc/views/footer/pricing/detail/index.vue

@@ -45,7 +45,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([])
 const { t } = i18n.global
 
 const { run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         trademodes: ' 10',
         riskcontrolmode: 1
     },

+ 1 - 1
src/packages/pc/views/footer/pricing/order/index.vue

@@ -67,7 +67,7 @@ const selectedRows = ref<Model.TradeOrderDetailRsp[]>([])
 const { t } = i18n.global
 
 const { loading, dataList, run, runAsync } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         tradeMode: '10',
         orderStatus: '3,7,12',
     },

+ 1 - 1
src/packages/pc/views/footer/pricing/trade/index.vue

@@ -33,7 +33,7 @@ const { getTableColumns } = useTableColumnsStore()
 const tableColumns = shallowRef<Model.TableColumn[]>([])
 
 const { loading, dataList } = useRequest(queryTradeDetail, {
-    params: {
+    defaultParams: {
         tradeMode: '10'
     },
 })

+ 1 - 1
src/packages/pc/views/footer/spot/order/index.vue

@@ -52,7 +52,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([])
 const { t } = i18n.global
 
 const { loading, dataList, run } = useRequest(queryWrOrderDetail, {
-    params: {
+    defaultParams: {
         wrtradetype: 1,
         marketid: 17201,
         haswr: 1,

+ 1 - 1
src/packages/pc/views/footer/spot/trade/index.vue

@@ -29,7 +29,7 @@ const { getTableColumns } = useTableColumnsStore()
 const tableColumns = shallowRef<Model.TableColumn[]>([])
 
 const { loading, dataList } = useRequest(queryWrTradeDetail, {
-    params: {
+    defaultParams: {
         marketid: 17201,
         haswr: 1
     },

+ 1 - 1
src/packages/pc/views/footer/swap/order/index.vue

@@ -56,7 +56,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([])
 const { t } = i18n.global
 
 const { loading, dataList, run } = useRequest(queryTradeOrderDetail, {
-    params: {
+    defaultParams: {
         tradeMode: '46'
     },
 })

+ 1 - 1
src/packages/pc/views/footer/swap/position/close/index.vue

@@ -72,7 +72,7 @@ const refQuote = futuresStore.getGoodsQuote(props.position.refgoodscode)
 const quote = futuresStore.getGoodsQuote(props.position.goodscode)
 
 const { dataList, loading, run } = useRequest(queryTradeHolderDetail, {
-    params: {
+    defaultParams: {
         /// 交易模式, 格式 1,2,3
         trademodes: ETradeMode.TRADEMODE_TJMD.toString(),
         /// marketid

+ 1 - 1
src/packages/pc/views/footer/swap/trade/index.vue

@@ -33,7 +33,7 @@ const { getTableColumns } = useTableColumnsStore()
 const tableColumns = shallowRef<Model.TableColumn[]>([])
 
 const { loading, dataList } = useRequest(queryTradeDetail, {
-    params: {
+    defaultParams: {
         tradeMode: '46'
     },
 })

+ 1 - 1
src/packages/pc/views/market/trade/presell/ballot/index.vue

@@ -40,7 +40,7 @@ const selectedRow = shallowRef<Model.PresaleAuctionsRsp>()
 const { t } = i18n.global
 
 const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 5,
         presalestatus: 2
     }

+ 1 - 1
src/packages/pc/views/market/trade/presell/bidding/index.vue

@@ -40,7 +40,7 @@ const selectedRow = shallowRef<Model.PresaleAuctionsRsp>()
 const { t } = i18n.global
 
 const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
-    params: {
+    defaultParams: {
         presalemode: 4,
         presalestatus: 2
     }

+ 1 - 1
src/packages/pc/views/market/trade/spot/index.vue

@@ -44,7 +44,7 @@ const selectedRow = shallowRef<Model.OrderQuoteRsp>()
 const { global: { t } } = i18n
 
 const { dataList, loading, run } = useRequest(queryOrderQuote, {
-    params: {
+    defaultParams: {
         marketid: 17201,
         wrpricetype: 1,
     },

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません