update

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trading",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

oem/gcszt/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.gcszt",
   "appName": "贵茶数字通",
-  "version": "1.0.1",
-  "versionCode": "100001",
+  "version": "1.0.2",
+  "versionCode": "100002",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

oem/tjmd/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tjmd",
   "appName": "海南掉期市场",
-  "version": "1.0.13",
-  "versionCode": "100013",
+  "version": "1.0.14",
+  "versionCode": "100014",
   "apiUrl": "http://192.168.31.132:8080/cfg?key=test_132",
   "tradeChannel": "ws",
   "modules": [

src/packages/mobile/views/swap/detail/Index.vue

@@ -40,7 +40,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent, computed } from 'vue'
-import { Tab, Tabs, Button, showToast,Empty } from 'vant'
+import { Tab, Tabs, Button, showToast, Empty } from 'vant'
 import { useRequest } from '@/hooks/request'
 import { useNavigation } from '@mobile/router/navigation'
 import { useComponent } from '@/hooks/component'
@@ -82,8 +82,9 @@ const { dataList: protocolList } = useRequest(queryMdUserSwapProtocol, {
 
 /// 估算价格
 const estimateprice = (row: Model.TjmdTradeOrderDetailRsp) => {
-    const decimalplace = (item.decimalplace ?? 2.0)
-    return formatDecimal((row.marketmaxsub + (quote.value?.last ?? 0.0)), decimalplace)
+    const { last = 0, presettle = 0 } = quote.value ?? {}
+    const value = row.marketmaxsub + (last || presettle)
+    return formatDecimal(value, item.decimalplace)
 }
 
 const isDisable = (row: Model.TjmdTradeOrderDetailRsp) => {

src/packages/pc/views/market/trade/swap/detail/order/index.vue

@@ -62,8 +62,9 @@ const futuresStore = useFuturesStore()
 const quote = futuresStore.getGoodsQuote(props.quoteGoods?.refgoodsid ?? 0)
 /// 估算价格
 const estimateprice = (row: Model.TjmdTradeOrderDetailRsp) => {
-    const decimalplace = (props.quoteGoods?.decimalplace ?? 2.0)
-    return formatDecimal((row.marketmaxsub+(quote.value?.last ?? 0.0)), decimalplace)
+    const { last = 0, presettle = 0 } = quote.value ?? {}
+    const value = row.marketmaxsub + (last || presettle)
+    return formatDecimal(value, props.quoteGoods?.decimalplace)
 }
 
 /// 查询用户掉期协议签署表