任务 #7290

oem/snhl/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "三农互联",
   "version": "1.0.11",
   "versionCode": "100011",
-  "apiUrl": "http://192.168.31.208:8080/cfg?key=test_208",
+  "apiUrl": "http://192.168.31.158:16240/cfg?key=dev_104",
   "tradeChannel": "ws",
   "modules": [
     "register"

oem/snhl/locales/extras/en-US.json

@@ -1,5 +1,11 @@
 {
     "app": {
         "name": "三农互联"
+    },
+    "order": {
+        "goodstrade": {
+            "charge": "实收手续费",
+            "initFeeValue": "交易手续费"
+        }
     }
 }

oem/snhl/locales/extras/th-TH.json

@@ -1,5 +1,11 @@
 {
     "app": {
         "name": "三农互联"
+    },
+    "order": {
+        "goodstrade": {
+            "charge": "实收手续费",
+            "initFeeValue": "交易手续费"
+        }
     }
 }

oem/snhl/locales/extras/vi-VN.json

@@ -1,5 +1,11 @@
 {
     "app": {
         "name": "三农互联"
+    },
+    "order": {
+        "goodstrade": {
+            "charge": "实收手续费",
+            "initFeeValue": "交易手续费"
+        }
     }
 }

oem/snhl/locales/extras/zh-CN.json

@@ -1,5 +1,11 @@
 {
     "app": {
         "name": "三农互联"
+    },
+    "order": {
+        "goodstrade": {
+            "charge": "实收手续费",
+            "initFeeValue": "交易手续费"
+        }
     }
 }

oem/snhl/locales/extras/zh-TW.json

@@ -1,5 +1,11 @@
 {
     "app": {
         "name": "三农互联"
+    },
+    "order": {
+        "goodstrade": {
+            "charge": "实收手续费",
+            "initFeeValue": "交易手续费"
+        }
     }
 }

public/locales/en-US.json

@@ -543,7 +543,8 @@
             "closepl": "Closing profit and loss",
             "tradetime": "Transaction time",
             "tradedate": "Transaction date",
-            "tradeid": "Transaction number"
+            "tradeid": "Transaction number",
+            "initFeeValue": "交易手续费"
         },
         "listingorder": {
             "title": "Listing order",
@@ -1858,6 +1859,7 @@
         "spsl": "TP-SL",
         "sp": "TP",
         "sl": "SL",
-        "quoteprice": "QuotePrice"
+        "quoteprice": "QuotePrice",
+        "contractdetails": "Contract Details"
     }
 }

public/locales/th-TH.json

@@ -546,7 +546,8 @@
             "closepl": "กำไรหรือขาดทุนจากการปิดสถานะ",
             "tradetime": "เวลาทำธุรกรรม",
             "tradedate": "วันที่ทำธุรกรรม",
-            "tradeid": "หมายเลขใบทำธุรกรรม"
+            "tradeid": "หมายเลขใบทำธุรกรรม",
+            "initFeeValue": "交易手续费"
         },
         "listingorder": {
             "title": "คำสั่งซื้อจดทะเบียน",
@@ -1861,6 +1862,7 @@
         "spsl": "TP-SL",
         "sp": "TP",
         "sl": "SL",
-        "quoteprice": "ราคาตลาด"
+        "quoteprice": "ราคาตลาด",
+        "contractdetails": "Contract Details"
     }
 }

public/locales/vi-VN.json

@@ -543,7 +543,8 @@
             "closepl": "Lãi/lỗ đóng vị thế",
             "tradetime": "Thời gian giao dịch",
             "tradedate": "Ngày giao dịch",
-            "tradeid": "Số phiếu giao dịch"
+            "tradeid": "Số phiếu giao dịch",
+            "initFeeValue": "交易手续费"
         },
         "listingorder": {
             "title": "Ủy thác niêm yết",
@@ -1858,6 +1859,7 @@
         "spsl": "Chốt lời cắt lỗ",
         "sp": "Chốt lời",
         "sl": "Cắt lỗ",
-        "quoteprice": "Giá thị trường"
+        "quoteprice": "Giá thị trường",
+        "contractdetails": "Contract Details"
     }
 }

public/locales/zh-CN.json

@@ -546,7 +546,8 @@
             "closepl": "平仓损益",
             "tradetime": "成交时间",
             "tradedate": "成交日期",
-            "tradeid": "成交单号"
+            "tradeid": "成交单号",
+            "initFeeValue": "交易手续费"
         },
         "listingorder": {
             "title": "挂牌委托",
@@ -1861,6 +1862,7 @@
         "spsl": "止盈止损",
         "sp": "止盈",
         "sl": "止损",
-        "quoteprice": "行情价格"
+        "quoteprice": "行情价格",
+        "contractdetails": "合约明细"
     }
 }

public/locales/zh-TW.json

@@ -546,7 +546,8 @@
             "closepl": "平倉損益",
             "tradetime": "成交時間",
             "tradedate": "成交日期",
-            "tradeid": "成交單號"
+            "tradeid": "成交單號",
+            "initFeeValue": "交易手續費"
         },
         "listingorder": {
             "title": "掛牌委託",
@@ -1861,6 +1862,7 @@
         "spsl": "止盈止損",
         "sp": "止盈",
         "sl": "止損",
-        "quoteprice": "行情價格"
+        "quoteprice": "行情價格",
+        "contractdetails": "合約明細"
     }
 }

src/packages/digital/views/contract/detail/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view class="contract-detail g-form">
         <template #header>
-            <app-navbar title="合约明细" />
+            <app-navbar :title="t('digital.contractdetails')" />
         </template>
         <Grid :border="false" :column-num="quotes.length ? 2 : 1">
             <GridItem icon="peer-pay" :text="$t('digital.wallet-transfer')"

src/packages/digital/views/wallet/transfer/index.vue

@@ -2,7 +2,7 @@
 <template>
     <app-view class="wallet-transfer g-form">
         <template #header>
-            <app-navbar title="划转" />
+            <app-navbar :title="t('digital.wallet-transfer')" />
         </template>
         <div class="switch-group">
             <span :class="{ active: formData.DigitalTransferType === 3 }" @click="formData.DigitalTransferType = 3">
@@ -48,13 +48,13 @@ import { formatDecimal } from '@/filters'
 import { useNavigation } from '@mobile/router/navigation'
 import { getCurrencyList, getDigitalCurrencyList } from '@/constants/order'
 import { digitalAccountTransferApply } from '@/services/api/digital'
-import { useAccountStore } from '@/stores'
+import { i18n, useAccountStore } from '@/stores'
 import { useSpotAccountStore } from '../components/spot/composables'
 import AppSelect from '@mobile/components/base/select/index.vue'
 import AppStepper from '@mobile/components/base/stepper/index.vue'
 
 const { routerBack } = useNavigation()
-
+const { global: { t } } = i18n
 const spotAccountStore = useSpotAccountStore()
 const accountStore = useAccountStore()
 

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

@@ -38,6 +38,10 @@
                                     <span>{{ item.charge }}</span>
                                 </li>
                                 <li>
+                                    <span>{{ $t('order.goodstrade.initFeeValue') }}</span>
+                                    <span>{{ item.initfeevalue }}</span>
+                                </li>
+                                <li>
                                     <span>{{ $t('order.goodstrade.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>

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

@@ -27,6 +27,10 @@
                             <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
+                            <span>{{ $t('order.goodstrade.initFeeValue') }}</span>
+                            <span>{{ formatDecimal(item.initfeevalue) }}</span>
+                        </li>
+                        <li>
                             <span>{{ $t('order.goodstrade.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>

src/packages/pc/views/footer/goods/trade/index.vue

@@ -72,6 +72,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'tradeprice', label: 'order.goodstrade.tradeprice' },
     { field: 'tradeqty', label: 'order.goodstrade.tradeqty' },
     { field: 'charge', label: 'order.goodstrade.charge' },
+    { field: 'initfeevalue', label: 'order.goodstrade.initFeeValue' },
     { field: 'closepl', label: 'order.goodstrade.closepl' },
     { field: 'tradeid', label: 'order.goodstrade.tradeid' },
     //{ field: 'matchaccountid', label: '成交对手' },

src/packages/pc/views/query/trade/goods/history/index.vue

@@ -75,6 +75,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'tradeprice', label: 'order.goodstrade.tradeprice' },
     { field: 'tradeqty', label: 'order.goodstrade.tradeqty' },
     { field: 'charge', label: 'order.goodstrade.charge' },
+    { field: 'initfeevalue', label: 'order.goodstrade.initFeeValue' },
     { field: 'closepl', label: 'order.goodstrade.closepl' },
     { field: 'tradeid', label: 'order.goodstrade.tradeid' },
     //{ field: 'matchaccountid', label: '成交对手' },

src/packages/pc/views/query/trade/goods/list/index.vue

@@ -59,6 +59,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'tradeprice', label: 'order.goodstrade.tradeprice' },
     { field: 'tradeqty', label: 'order.goodstrade.tradeqty' },
     { field: 'charge', label: 'order.goodstrade.charge' },
+    { field: 'initfeevalue', label: 'order.goodstrade.initFeeValue' },
     { field: 'closepl', label: 'order.goodstrade.closepl' },
     { field: 'tradeid', label: 'order.goodstrade.tradeid' },
     //{ field: 'matchaccountid', label: '成交对手' },

src/types/model/order.d.ts

@@ -1056,6 +1056,8 @@ declare namespace Model {
         goodunitid: number
         /// 历史交易日
         histradedate: string
+        // 交易手续费
+        initfeevalue: number
         /// 整型盈亏(用于交易结算试算平衡-收益权)
         intclosepl: number
         /// 是否确认行权- 0:否 1:是
@@ -1360,6 +1362,8 @@ declare namespace Model {
         goodsname: string
         /// 商品单位id
         goodunitid: number
+        /// 交易手续费
+        initfeevalue: number
         /// 整型盈亏(用于交易结算试算平衡-收益权)
         intclosepl: number
         /// 是否确认行权- 0:否 1:是