xxxxx

src/packages/digital/views/contract/components/trade/history/index.vue

@@ -5,7 +5,7 @@
             <thead>
                 <tr>
                     <th>
-                        <span>{{ item.goodscode }}/{{ item.goodsname }}</span>
+                        <span>{{ item.goodscode }}/{{ goodsname(item.goodscode) }}</span>
                         <span class="text-small">
                             {{ formatDate(item.tradetime) }}
                         </span>
@@ -45,7 +45,7 @@
                         <span>{{ item.tradeqty }}</span>
                     </td>
                     <td>
-                        <span class="text-small">{{ `${t('order.pricingtrade.tradecloseplqty')}(${enumName(item.goodsid)})` }}</span>
+                        <span class="text-small">{{ `${t('order.pricingtrade.closepl')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.closepl) }}</span>
                     </td>
                 </tr>
@@ -60,7 +60,7 @@ import { formatDate, formatDecimal } from '@/filters'
 import { getBuyOrSellName, getBuildTypeName, getOrderhandleStatusName, getGoodsCurrencyItemName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeDetail } from '@/services/api/order'
-import { useFuturesStore } from '@/stores'
+import { i18n, useFuturesStore } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const props = defineProps({
@@ -73,6 +73,11 @@ const props = defineProps({
 const futuresStore = useFuturesStore()
 const pullRefreshRef = shallowRef()
 const dataList = shallowRef<Model.HisTradeDetailRsp[]>([])
+const { global: { t } } = i18n
+
+const goodsname = (code: string) => {
+    return futuresStore.getI18nGoodsName(code)
+}
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeDetail, {
     manual: true,

src/packages/digital/views/contract/components/trade/list/index.vue

@@ -5,7 +5,7 @@
             <thead>
                 <tr>
                     <th>
-                        <span>{{ item.goodscode }}/{{ item.goodsname }}</span>
+                        <span>{{ item.goodscode }}/{{ goodsname(item.goodscode) }}</span>
                         <span class="text-small">
                             {{ formatDate(item.tradetime) }}
                         </span>
@@ -45,7 +45,7 @@
                         <span>{{ item.tradeqty }}</span>
                     </td>
                     <td>
-                        <span class="text-small">{{ `${t('order.pricingtrade.tradecloseplqty')}(${enumName(item.goodsid)})` }}</span>
+                        <span class="text-small">{{ `${t('order.pricingtrade.closepl')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.closepl) }}</span>
                     </td>
                 </tr>
@@ -60,7 +60,7 @@ import { formatDate, formatDecimal } from '@/filters'
 import { getBuyOrSellName, getBuildTypeName, getGoodsCurrencyItemName, getOrderhandleStatusName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryTradeDetail } from '@/services/api/order'
-import { useFuturesStore } from '@/stores'
+import { i18n, useFuturesStore } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const props = defineProps({
@@ -70,10 +70,15 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const futuresStore = useFuturesStore()
 const pullRefreshRef = shallowRef()
 const dataList = shallowRef<Model.TradeDetailRsp[]>([])
 
+const goodsname = (code: string) => {
+    return futuresStore.getI18nGoodsName(code)
+}
+
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeDetail, {
     manual: true,
     defaultParams: {