update

public/config/appconfig.json

@@ -1,6 +1,6 @@
 {
   "appId": "com.muchinfo.app",
-  "appName": "多元世纪",
+  "appName": "多元世纪交易中心",
   "appTitle": "多元世纪交易中心",
   "version": "1.0.5",
   "versionCode": "10005",

src/filters/index.ts

@@ -180,7 +180,7 @@ export function pow(base:number, exponent:number) {
     }  
     if (exponent < 0) {  
         return 1 / result
-    }  
+    }
     return result
 }
 

src/packages/mobile/views/goods/detail/components/listing/Index.vue

@@ -19,7 +19,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="价格">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
-                                :auto-fixed="false" :decimal-length="quote?.decimalplace" :step="priceStep" />
+                                :auto-fixed="false" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="数量">
@@ -88,7 +88,6 @@
 import { shallowRef, defineAsyncComponent, onMounted, computed } from 'vue'
 import { Form, FormInstance, Button, CellGroup, FieldRule, Field, RadioGroup, Radio } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
-import { pow } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { useOrder } from '@/business/trade'
 import { useAccountStore, useFuturesStore, usePositionStore } from '@/stores'
@@ -125,15 +124,6 @@ const qtyStep = shallowRef(qtyStepList[0]) // 数量步长
 
 const isTrademode16 = computed(() => quote.value?.trademode === 16)
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 const total = computed(() => {
     const { avaiableMoney = 0 } = accountStore.currentAccount
     const { marketmarginalgorithm = 0, marketmarginvalue = 0, agreeunit = 0 } = quote.value ?? {}

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

@@ -24,10 +24,6 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>委托日期</span>
-                                    <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
-                                </li>
-                                <li>
                                     <span>方向类型</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype)
                                     }}</span>
@@ -44,6 +40,10 @@
                                     <span>成交量</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
+                                <li>
+                                    <span>委托日期</span>
+                                    <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -15,10 +15,6 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>委托日期</span>
-                            <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                        <li>
                             <span>方向类型</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype) }}</span>
                         </li>
@@ -34,6 +30,10 @@
                             <span>成交量</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
+                        <li>
+                            <span>委托日期</span>
+                            <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -24,10 +24,6 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>成交日期</span>
-                                    <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
-                                </li>
-                                <li>
                                     <span>类型</span>
                                     <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell)
                                     }}</span>
@@ -48,6 +44,10 @@
                                     <span>平仓盈亏</span>
                                     <span>{{ item.closepl }}</span>
                                 </li>
+                                <li>
+                                    <span>成交日期</span>
+                                    <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
+                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -15,10 +15,6 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>成交日期</span>
-                            <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                        <li>
                             <span>类型/方向</span>
                             <span>{{ getBuildTypeName(item.buildtype) }}/{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
@@ -38,6 +34,10 @@
                             <span>平仓盈亏</span>
                             <span>{{ formatDecimal(item.closepl) }}</span>
                         </li>
+                        <li>
+                            <span>成交日期</span>
+                            <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
+                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -25,25 +25,25 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>时间：</span>
-                                    <span>{{ formatDate(item.ordertime, 'HH:mm:ss') }}</span>
-                                </li>
-                                <li>
-                                    <span>方向：</span>
+                                    <span>方向</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                                 </li>
                                 <li>
-                                    <span>挂牌量：</span>
+                                    <span>挂牌量</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>挂牌价格：</span>
+                                    <span>挂牌价格</span>
                                     <span>{{ formatDecimal(item.fixedprice) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量：</span>
+                                    <span>成交量</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
+                                <li>
+                                    <span>委托日期</span>
+                                    <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -16,10 +16,6 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>委托日期</span>
-                            <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                        <li>
                             <span>方向</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
@@ -35,6 +31,10 @@
                             <span>成交量</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
+                        <li>
+                            <span>委托日期</span>
+                            <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -22,25 +22,25 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>成交日期：</span>
-                                    <span>{{ formatDate(item.tradedate, 'YYYY-MM-DD') }}</span>
-                                </li>
-                                <li>
-                                    <span>方向：</span>
+                                    <span>方向</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量：</span>
+                                    <span>成交量</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>成交价格：</span>
+                                    <span>成交价格</span>
                                     <span>{{ formatDecimal(item.tradeqty) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交金额：</span>
+                                    <span>成交金额</span>
                                     <span>{{ formatDecimal(item.tradeprice * item.tradeqty) }}</span>
                                 </li>
+                                <li>
+                                    <span>成交日期</span>
+                                    <span>{{ formatDate(item.tradedate, 'YYYY-MM-DD') }}</span>
+                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -16,10 +16,6 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>成交日期</span>
-                            <span>{{ formatDate(item.tradedate, 'YYYY-MM-DD') }}</span>
-                        </li>
-                        <li>
                             <span>成交量</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
@@ -31,6 +27,10 @@
                             <span>成交金额</span>
                             <span>{{ formatDecimal(item.tradeprice * item.tradeqty) }}</span>
                         </li>
+                        <li>
+                            <span>成交日期</span>
+                            <span>{{ formatDate(item.tradedate, 'YYYY-MM-DD') }}</span>
+                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -24,25 +24,25 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>时间：</span>
-                                    <span>{{ formatDate(item.ordertime, 'YY/MM/DD HH:mm:ss') }}</span>
-                                </li>
-                                <li>
-                                    <span>方向：</span>
+                                    <span>方向</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                                 </li>
                                 <li>
-                                    <span>委托量：</span>
+                                    <span>委托量</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>委托价格：</span>
+                                    <span>委托价格</span>
                                     <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量：</span>
+                                    <span>成交量</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
+                                <li>
+                                    <span>委托日期</span>
+                                    <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -15,25 +15,25 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>时间：</span>
-                            <span>{{ formatDate(item.ordertime, 'HH:mm:ss') }}</span>
-                        </li>
-                        <li>
-                            <span>方向：</span>
+                            <span>方向</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>委托量：</span>
+                            <span>委托量</span>
                             <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
-                            <span>委托价格：</span>
+                            <span>委托价格</span>
                             <span>{{ formatDecimal(item.orderprice) }}</span>
                         </li>
                         <li>
-                            <span>成交量：</span>
+                            <span>成交量</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
+                        <li>
+                            <span>委托日期</span>
+                            <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -21,30 +21,30 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>时间：</span>
-                                    <span>{{ formatDate(item.tradetime, 'YY/MM/DD HH:mm:ss') }}</span>
-                                </li>
-                                <li>
-                                    <span>类型：</span>
+                                    <span>类型</span>
                                     <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell)
                                     }}</span>
                                 </li>
                                 <li>
-                                    <span>成交价格：</span>
+                                    <span>成交价格</span>
                                     <span>{{ item.tradeprice }}</span>
                                 </li>
                                 <li>
-                                    <span>手续费：</span>
+                                    <span>手续费</span>
                                     <span>{{ item.charge }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量：</span>
+                                    <span>成交量</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>平仓盈亏：</span>
+                                    <span>平仓盈亏</span>
                                     <span>{{ item.closepl }}</span>
                                 </li>
+                                <li>
+                                    <span>成交日期</span>
+                                    <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
+                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -12,29 +12,29 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>时间：</span>
-                            <span>{{ formatDate(item.tradetime, 'HH:mm:ss') }}</span>
-                        </li>
-                        <li>
-                            <span>类型：</span>
+                            <span>类型</span>
                             <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>成交价格：</span>
+                            <span>成交价格</span>
                             <span>{{ formatDecimal(item.tradeprice) }}</span>
                         </li>
                         <li>
-                            <span>手续费：</span>
+                            <span>手续费</span>
                             <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
-                            <span>成交量：</span>
+                            <span>成交量</span>
                             <span>{{ formatDecimal(item.tradeqty) }}</span>
                         </li>
                         <li>
-                            <span>平仓盈亏：</span>
+                            <span>平仓盈亏</span>
                             <span>{{ formatDecimal(item.closepl) }}</span>
                         </li>
+                        <li>
+                            <span>成交日期</span>
+                            <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
+                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

src/packages/mobile/views/order/list/components/transfertrade/detail/Index.vue

@@ -13,8 +13,8 @@
                     <Cell title="转让价" :value="selectedRow.tradeprice" />
                     <Cell title="订货价" :value="selectedRow.presaleprice" />
                     <Cell title="损益" :value="selectedRow.closepl" />
-                    <Cell title="对手方" :value="selectedRow.accountname" />
-                    <Cell title="成交时间" :value="selectedRow.tradedate" />
+                    <Cell title="对手方" :value="selectedRow.accountname || selectedRow.accountid" />
+                    <Cell title="成交时间" :value="selectedRow.tradetime" />
                     <Cell title="成交单号" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>

src/packages/mobile/views/order/position/components/goods/close/Index.vue

@@ -27,7 +27,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价格">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
-                                :decimal-length="selectedRow.decimalplace" :step="priceStep" :auto-fixed="false" />
+                                :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" :auto-fixed="false" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="转让量">
@@ -54,11 +54,11 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType, onMounted, computed } from 'vue'
+import { shallowRef, PropType, onMounted } from 'vue'
 import AppModal from '@/components/base/modal/index.vue'
 import { CellGroup, Cell, Button, FieldRule, Form, Field, RadioGroup, Radio, FormInstance } from 'vant'
 import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
-import { formatDecimal, handleNumberValue, pow } from '@/filters'
+import { formatDecimal, handleNumberValue } from '@/filters'
 import { useOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
 import { useFuturesStore } from '@/stores'
@@ -85,15 +85,6 @@ const qtyStepList = [1, 5, 10, 20, 30, 50] // 数量步长列表
 const qtyStep = shallowRef(qtyStepList[0]) // 数量步长
 const { formSubmit, formData } = useOrder()
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
     OrderPrice: [{

src/packages/mobile/views/order/position/components/goods/detail/components/transfer/Index.vue

@@ -28,7 +28,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价格">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
-                                :decimal-length="selectedRow.decimalplace" :step="priceStep" :auto-fixed="false" />
+                                :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" :auto-fixed="false" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="转让量">
@@ -51,7 +51,7 @@ import { shallowRef, PropType, onMounted, computed } from 'vue'
 import AppModal from '@/components/base/modal/index.vue'
 import { CellGroup, Cell, Button, FieldRule, Form, Field, Stepper, FormInstance } from 'vant'
 import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
-import { formatDecimal, handleNumberValue, handleRequestBigNumber, handlePriceColor, pow } from '@/filters'
+import { formatDecimal, handleNumberValue, handleRequestBigNumber, handlePriceColor } from '@/filters'
 import { useOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
 import { useFuturesStore, usePositionStore } from '@/stores'
@@ -68,15 +68,6 @@ const futuresStore = useFuturesStore()
 const positionStore = usePositionStore()
 const quote = futuresStore.getGoodsQuote(props.selectedRow.goodscode)
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 // 可用数量
 const maxQty = computed(() => {
     const record = positionStore.positionList.find((e) => e.goodsid === props.selectedRow.goodsid && e.buyorsell === props.selectedRow.buyorsell)

src/packages/mobile/views/order/position/components/transfer/listing/Index.vue

@@ -35,7 +35,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" :min="quote?.limitdown"
-                                :max="quote?.limitup" :step="Math.pow(10, -selectedRow.decimalplace)"
+                                :max="quote?.limitup" :step="quote?.decimalvalue"
                                 :decimal-length="selectedRow.decimalplace" :auto-fixed="false" button-size="22" />
                         </template>
                     </Field>

src/packages/mobile/views/presale/detail/components/delisting/index.vue

@@ -8,7 +8,7 @@
             </Field>
             <Field name="OrderPrice" :rules="formRules.OrderPrice" label="认购价">
                 <template #input>
-                    <Stepper v-model="formData.OrderPrice" theme="round" :min="detail.startprice" :decimal-length="quote?.decimalplace"
+                    <Stepper v-model="formData.OrderPrice" theme="round" :min="detail.startprice" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue"
                         :auto-fixed="false" button-size="22" />
                 </template>
             </Field>

src/packages/mobile/views/transfer/listing/Index.vue

@@ -12,7 +12,7 @@
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="价格">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
-                                :auto-fixed="false" :decimal-length="quote?.decimalplace" :step="priceStep" />
+                                :auto-fixed="false" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="数量">
@@ -56,7 +56,6 @@
 import { shallowRef, defineAsyncComponent, computed, onMounted } from 'vue'
 import { CellGroup, Form, Field, Stepper, Button, FieldRule, FormInstance, RadioGroup, Radio } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
-import { pow } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradePositionExs } from '@/services/api/transfer'
 import { useOrder } from '@/business/trade'
@@ -103,15 +102,6 @@ const { dataList, run: getMineTradePositionExs } = useRequest(queryMineTradePosi
     }
 })
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 // 表单验证规则
 const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
     OrderPrice: [{

src/packages/pc/views/footer/goods/detail/components/transfer/index.vue

@@ -27,8 +27,8 @@
                 <span>{{ maxQty }}</span>
             </el-form-item>
             <el-form-item prop="OrderPrice" label="转让价格">
-                <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :step="priceStep"
-                    :precision="selectedRow.decimalplace" />
+                <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :step="quote?.decimalvalue"
+                    :precision="quote?.decimalplace" />
             </el-form-item>
             <el-form-item prop="OrderQty" label="转让量">
                 <div class="g-qty-group">
@@ -48,7 +48,7 @@
 import { ref, PropType, computed, onMounted } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useOrder } from '@/business/trade'
-import { formatDecimal, handlePriceColor, handleRequestBigNumber, pow } from '@/filters'
+import { formatDecimal, handlePriceColor, handleRequestBigNumber } from '@/filters'
 import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
 import { useFuturesStore, usePositionStore } from '@/stores'
 import { EBuildType, EDelistingType, EListingSelectType, EPriceMode, EValidType } from '@/constants/client'
@@ -72,15 +72,6 @@ const maxQty = computed(() => {
     return Math.min(record?.enableqty ?? 0, qty)
 })
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 // 损益
 const closepl = computed(() => {
     const { presettle = 0, last = 0 } = quote.value ?? {}

src/packages/pc/views/footer/goods/position/components/transfer/index.vue

@@ -41,8 +41,8 @@
                 </div>
             </el-form-item>
             <el-form-item prop="OrderPrice" label="转让价格">
-                <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :step="priceStep"
-                    :precision="selectedRow.decimalplace" />
+                <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :step="quote?.decimalvalue"
+                    :precision="quote?.decimalplace" />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -53,10 +53,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, PropType, onMounted, computed } from 'vue'
+import { ref, PropType, onMounted } from 'vue'
 import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useOrder } from '@/business/trade'
-import { formatDecimal, parsePercent, pow } from '@/filters'
+import { formatDecimal, parsePercent } from '@/filters'
 import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
 import { useFuturesStore } from '@/stores'
 import { EBuildType, EDelistingType, EListingSelectType, EOrderOperateType, EPriceMode, EValidType } from '@/constants/client'
@@ -82,15 +82,6 @@ const formRef = ref<FormInstance>()
 const qtyStepList = [0.25, 0.5, 0.75, 1] // 数量步长列表
 const qtyStep = ref(1) // 数量步长
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 const formRules: FormRules = {
     OrderPrice: [{
         message: '请输入转让价格',

src/packages/pc/views/footer/presell/transferposition/listing/index.vue

@@ -22,7 +22,7 @@
             </el-form-item>
             <el-form-item prop="OrderPrice" label="转让价">
                 <el-input-number placeholder="请输入转让价格" :max="quote?.limitup" :min="quote?.limitdown"
-                    :step="Math.pow(10, -selectedRow.decimalplace)" :precision="selectedRow.decimalplace"
+                    :step="quote?.decimalvalue" :precision="quote?.decimalplace"
                     v-model="formData.OrderPrice" />
             </el-form-item>
         </el-form>

src/packages/pc/views/footer/spot/position/index.vue

@@ -22,13 +22,14 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent, onUnmounted } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { useComponent } from '@/hooks/component'
 import { queryHoldLB } from '@/services/api/order'
 import { useComposeTable } from '@pc/components/base/table'
-import { useUserStore ,useTableColumnsStore} from '@/stores'
+import { useUserStore, useTableColumnsStore } from '@/stores'
+import eventBus from '@/services/bus'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -58,4 +59,9 @@ const showComponent = (componentName: string, row: Model.HoldLBRsp) => {
 getTableColumns('spot-position').then((res) => {
     tableColumns.value = res
 })
+
+// 挂牌委托变更广播通知
+const listingOrderChangeNtf = eventBus.$on('ListingOrderChangeNtf', () => run())
+
+onUnmounted(() => listingOrderChangeNtf.cancel())
 </script>

src/packages/pc/views/market/trade/goods/list/listing/index.vue

@@ -22,7 +22,7 @@
                 </el-form-item>
                 <el-form-item prop="OrderPrice" label="价格">
                     <div class="el-form-item--col">
-                        <el-input-number ref="priceRef" placeholder="请输入" :min="0" :step="priceStep"
+                        <el-input-number ref="priceRef" placeholder="请输入" :min="0" :step="selectedGoods?.decimalvalue"
                             :precision="selectedGoods?.decimalplace" :disabled="isDisabled" v-model="formData.OrderPrice"
                             @keyup.enter="qtyInputFocus" />
                         <div v-if="selectedGoods">
@@ -85,7 +85,6 @@
 <script lang="ts" setup>
 import { shallowRef, computed, watch, onMounted } from 'vue'
 import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus'
-import { pow } from '@/filters'
 import { EPriceMode, EListingSelectType, EDelistingType, EBuildType, EValidType, EOrderOperateType } from '@/constants/client'
 import { BuyOrSell, getBuyOrSellList } from '@/constants/order'
 import { useOrder } from '@/business/trade'
@@ -110,15 +109,6 @@ const submitRef = shallowRef()
 
 const isTrademode16 = computed(() => selectedGoods.value?.trademode === 16)
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = selectedGoods.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 const total = computed(() => {
     const { avaiableMoney = 0 } = accountStore.currentAccount
     const { marketmarginalgorithm = 0, marketmarginvalue = 0, agreeunit = 0 } = selectedGoods.value ?? {}

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

@@ -47,7 +47,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'attachmenturl', label: '图片' },
     { field: 'goodscode', label: '代码' },
     { field: 'goodsname', label: '名称' },
-    { field: 'refprice', label: '价格' },
+    { field: 'refprice', label: '预售价' },
     { field: 'starttime', label: '开始时间' },
     { field: 'endtime', label: '结束时间' },
     { field: 'presalestatus', label: '预售状态' },

src/packages/pc/views/market/trade/presell/bidding/detail/delisting/index.vue

@@ -6,7 +6,7 @@
                 <span>{{ selectedRow.startprice }}</span>
             </el-form-item>
             <el-form-item prop="OrderPrice" label="认购价">
-                <el-input-number placeholder="请输入" :min="selectedRow.startprice" :precision="2"
+                <el-input-number placeholder="请输入" :min="selectedRow.startprice" :precision="quote?.decimalplace" :step="quote?.decimalvalue"
                     v-model="formData.OrderPrice" />
             </el-form-item>
             <el-form-item prop="OrderQty" label="认购量">
@@ -33,7 +33,7 @@ import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { handleRequestBigNumber, parsePercent } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { useOrder } from '@/business/trade'
-import { useAccountStore } from '@/stores'
+import { useAccountStore, useFuturesStore } from '@/stores'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import { EPriceMode, EValidType } from '@/constants/client'
 
@@ -46,10 +46,13 @@ const props = defineProps({
 
 const { formData, formSubmit, loading } = useOrder()
 const accountStore = useAccountStore()
+const futuresStore = useFuturesStore()
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 const formRef = shallowRef<FormInstance>()
 
+const quote = futuresStore.getGoodsQuote(props.selectedRow.goodsid)
+
 // 预售定金
 const deposit = computed(() => {
     const { presaledepositalgorithm, presaledepositvalue } = props.selectedRow

src/packages/pc/views/market/trade/presell/bidding/detail/index.vue

@@ -47,13 +47,13 @@ const props = defineProps({
 })
 
 const detailProps = [
-    { field: 'startprice', label: '起拍价：' },
-    { field: 'sellname', label: '销售方：' },
-    { field: 'starttime', label: '开始时间：' },
-    { field: 'earnest', label: '预售定金：' },
-    { field: 'endtime', label: '结束时间：' },
-    { field: 'transferdepositratio', label: '转让定金：' },
-    { field: 'presaleqty', label: '总量：' },
+    { prop: 'startprice', label: '起拍价：' },
+    { prop: 'sellname', label: '销售方：' },
+    { prop: 'starttime', label: '开始时间：' },
+    { prop: 'earnest', label: '预售定金：' },
+    { prop: 'endtime', label: '结束时间：' },
+    { prop: 'transferdepositratio', label: '转让定金：' },
+    { prop: 'presaleqty', label: '总量：' },
 ]
 
 // 预售定金

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

@@ -47,7 +47,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'attachmenturl', label: '图片' },
     { field: 'goodscode', label: '代码' },
     { field: 'goodsname', label: '名称' },
-    { field: 'refprice', label: '价格' },
+    { field: 'startprice', label: '起拍价' },
     { field: 'starttime', label: '开始时间' },
     { field: 'endtime', label: '结束时间' },
     { field: 'presalestatus', label: '预售状态' },

src/packages/pc/views/market/trade/presell/transfer/listing/index.vue

@@ -21,7 +21,7 @@
                 </el-form-item>
                 <el-form-item prop="OrderPrice" label="价格">
                     <div class="el-form-item--col">
-                        <el-input-number ref="priceRef" placeholder="请输入" :min="0" :step="priceStep"
+                        <el-input-number ref="priceRef" placeholder="请输入" :min="0" :step="selectedGoods?.decimalvalue"
                             :precision="selectedGoods?.decimalplace" :disabled="isDisabled" v-model="formData.OrderPrice"
                             @keyup.enter="qtyInputFocus" />
                         <div v-if="selectedGoods">
@@ -103,15 +103,6 @@ const enableqty = computed(() => {
     return firstItem ? firstItem.buycurpositionqty - firstItem.buyfrozenqty : 0
 })
 
-// 价格步长
-const priceStep = computed(() => {
-    const { quoteminunit = 0, decimalplace = 0 } = selectedGoods.value ?? {}
-    if (quoteminunit) {
-        return quoteminunit * pow(10, decimalplace * -1)
-    }
-    return 1
-})
-
 // 价格类型
 const orderPriceType = computed(() => settingStore.getSettingValue('orderPriceType'))
 

src/packages/sbyj/views/order/list/components/close-holder/index.vue

@@ -17,6 +17,8 @@
             </div>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
                 <CellGroup inset>
+                    <Cell title="订单方向" :value="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '买料' : '卖料'" />
+                    <Cell title="订单价格" :value="formatDecimal(selectedRow.tHDetailEx.holderPrice)" />
                     <Cell title="可用重量" :value="enableqty + getGoodsUnitName(selectedRow.goodsUnitID)" />
                     <Field name="OrderQty" label="终止重量" :rules="formRules.OrderQty">
                         <template #input>

src/packages/sbyj/views/order/list/components/market-order-delivery/index.vue

@@ -7,6 +7,8 @@
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
                 <CellGroup inset>
+                    <Cell title="订单方向" :value="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '买料' : '卖料'" />
+                    <Cell title="订单价格" :value="formatDecimal(selectedRow.tHDetailEx.holderPrice)" />
                     <Cell title="可用重量" :value="enableqty + getGoodsUnitName(selectedRow.goodsUnitID)" />
                     <Field name="OrderQty" :label="getTagName() + '重量'" :rules="formRules.OrderQty">
                         <template #input>
@@ -39,7 +41,7 @@ import { shallowRef, PropType, onMounted, computed, reactive } from 'vue'
 import { CellGroup, Cell, Button, Stepper, Field, Form, FormInstance, FieldRule, RadioGroup, Radio } from 'vant'
 import { BuyOrSell } from '@/constants/order'
 import { fullloading } from '@/utils/vant'
-import { handleRequestBigNumber,parsePercent } from '@/filters'
+import { handleRequestBigNumber, parsePercent, formatDecimal } from '@/filters'
 import AppModal from '@/components/base/modal/index.vue'
 import { marketOrderDeliveryApply } from '@/services/api/trade'
 import { getGoodsUnitName } from '@/constants/unit'

src/stores/modules/futures.ts

@@ -177,8 +177,8 @@ export const useFuturesStore = defineStore(() => {
 
     // 获取商品名称
     const getGoodsName = (code: string | number) => {
-        const quote = state.goodsList.find((e) => e.goodscode === code || e.goodsid === code)
-        return quote?.goodsname ?? ''
+        const goods = getGoods(code)
+        return goods?.goodsname ?? ''
     }
 
     // 获取对应的商品
@@ -234,6 +234,7 @@ export const useFuturesStore = defineStore(() => {
             trademode: 0,
             agreeunit: 0,
             decimalplace: 0,
+            decimalvalue:0,
             quoteminunit: 0,
             quotegear: 0,
             last: quote.last ?? 0,
@@ -365,6 +366,9 @@ export const useFuturesStore = defineStore(() => {
         item.change = item.presettle ? item.rise / item.presettle : 0 // 涨跌幅/幅度: (最新价 - 昨结价) / 昨结价
         item.amplitude = item.presettle ? (item.highest - item.lowest) / item.presettle : 0 // 振幅: (最高价 - 最低价 ) / 最新价
 
+        // 计算小数单位值
+        item.decimalvalue= item.quoteminunit * Math.pow(10, item.decimalplace * -1)
+
         // 处理行情价格颜色
         const handleColor = (value: number | string) => handlePriceColor(Number(value), item.presettle)
 

src/types/model/market.d.ts

@@ -75,6 +75,7 @@ declare namespace Model {
         goodsname: string; // 商品名称
         goodunitid: number;//报价单位ID
         decimalplace: number;//报价小数位
+        decimalvalue: number;//小数单位值
         last: number; // 最新价
         lasttime: string; // 行情时间（只有现价变化行情时间才变化）
         rise: number; // 涨跌