update

oem/thj/config/router.json

@@ -8,14 +8,14 @@
             {
                 "authType": 2,
                 "sort": 4,
-                "title": "掉期市场",
+                "title": "合金预售",
                 "code": "bottom_swap",
                 "component": "views/footer/index.vue",
                 "children": [
                     {
                         "authType": 2,
                         "sort": 1,
-                        "title": "持仓汇总",
+                        "title": "订单汇总",
                         "code": "bottom_swap_position",
                         "component": "views/footer/swap/position/index.vue"
                     },
@@ -130,7 +130,7 @@
     {
         "authType": 1,
         "sort": 1,
-        "title": "掉期市场",
+        "title": "合金预售",
         "code": "market",
         "url": "/market",
         "urlType": 1,
@@ -140,7 +140,7 @@
             {
                 "authType": 1,
                 "sort": 1,
-                "title": "掉期市场",
+                "title": "合金预售",
                 "code": "market_trade",
                 "url": "trade",
                 "urlType": 1,
@@ -170,7 +170,7 @@
                     {
                         "authType": 1,
                         "sort": 1,
-                        "title": "掉期市场",
+                        "title": "合金预售",
                         "code": "query_order_swap",
                         "url": "swap",
                         "urlType": 1,
@@ -231,7 +231,7 @@
                     {
                         "authType": 1,
                         "sort": 1,
-                        "title": "掉期市场",
+                        "title": "合金预售",
                         "code": "query_trade_swap",
                         "url": "swap",
                         "urlType": 1,

src/packages/mobile/views/bank/capital/information/index.vue

@@ -16,7 +16,7 @@
             <Cell title="今日入金" :value="formatDecimal(item.inamount)" />
             <Cell title="今日出金" :value="formatDecimal(item.outamount)" />
             <Cell title="今日损益" :value="formatDecimal(item.closepl)" />
-            <Cell title="交易手续费" :value="formatDecimal(item.paycharge)" />
+            <Cell title="贸易手续费" :value="formatDecimal(item.paycharge)" />
             <Cell title="状态" :value="getTradeStatusName(item.tradestatus)" />
         </CellGroup>
     </div>

src/packages/mobile/views/mine/profile/Index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="个人信息" />
+            <app-navbar :title="title" />
         </template>
         <CellGroup>
             <Cell title="发票信息" :to="{ name: 'mine-invoice' }" is-link />
@@ -16,7 +16,14 @@
 import { Cell, CellGroup } from 'vant'
 import { useUserStore } from '@/stores'
 import { decryptAES } from '@/services/websocket/package/crypto'
-import { onActivated } from 'vue';
+import { onActivated } from 'vue'
+
+defineProps({
+    title: {
+        type: String,
+        default: '个人信息'
+    }
+})
 
 // userStore
 const userStore = useUserStore()

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

@@ -3,10 +3,10 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="掉期委托单" @back="closed" />
+                <app-navbar title="委托详情" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="掉期委托信息">
+                <CellGroup title="委托信息">
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
                     <Cell title="委托量" :value="formatDecimal(selectedRow.orderqty)" />

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史掉期委托" @back="closed">
+                <app-navbar title="历史委托" @back="closed">
                     <template #footer>
                         <Cell title="查询日期" :value="dateRange.join('-')" @click="showCalendar = true" is-link />
                     </template>

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

@@ -3,10 +3,10 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="掉期成交单" @back="closed" />
+                <app-navbar title="成交详情" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="掉期成交信息">
+                <CellGroup title="成交信息">
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
                     <Cell title="类型" :value="getBuildTypeName(selectedRow.buildtype)" />
@@ -15,7 +15,7 @@
                     <Cell title="成交金额" :value="formatDecimal(selectedRow.tradeamount)" />
                     <Cell title="手续费" :value="formatDecimal(selectedRow.charge)" />
                     <Cell title="平仓盈亏" :value="formatDecimal(selectedRow.closepl)" />
-                    <Cell title="对手方" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
+                    <Cell title="贸易对方" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
                     <Cell title="成交时间" :value="formatDate(selectedRow.tradetime)" />
                     <Cell title="成交单号" :value="selectedRow.tradeid" />
                 </CellGroup>

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史掉期成交" @back="closed">
+                <app-navbar title="历史成交" @back="closed">
                     <template #footer>
                         <Cell title="查询日期" :value="dateRange.join('-')" @click="showCalendar = true" is-link />
                     </template>

src/packages/mobile/views/report/components/index.vue

@@ -18,9 +18,9 @@
                 <Cell title="期初余额" :value="handleAmount(taaccount?.balance)" />
                 <Cell title="银行入金" :value="handleAmount(taaccount?.inamount)" />
                 <Cell title="银行出金" :value="handleAmount(taaccount?.outamount)" />
-                <Cell title="平仓损益" :value="handleAmount(taaccount?.closepl)" />
+                <Cell title="转让损益" :value="handleAmount(taaccount?.closepl)" />
                 <Cell title="结算损益" :value="handleAmount(taaccount?.reckonpl)" />
-                <Cell title="服务费" :value="handleAmount(taaccount?.paycharge)" />
+                <Cell title="贸易服务费" :value="handleAmount(taaccount?.paycharge)" />
                 <Cell title="期末余额" :value="handleAmount(taaccount?.currentbalance)" />
                 <Cell title="占用资金" :value="handleAmount(taaccount?.oriusedmargin)" />
                 <Cell title="可用资金" :value="handleAmount(taaccount?.avaiablemoney)" />
@@ -29,7 +29,7 @@
             </CellGroup>
             <CellGroup title="报表明细">
                 <Cell title="出入金明细" is-link @click="openComponent('bank')" />
-                <Cell title="持仓汇总" is-link @click="openComponent('position')" />
+                <Cell title="订单汇总" is-link @click="openComponent('position')" />
                 <Cell title="成交明细" is-link @click="openComponent('trade')" />
             </CellGroup>
             <Popup position="bottom" v-model:show="showPicker" round @click-overlay="dropdownItemRef.toggle()">

src/packages/mobile/views/report/components/position/index.vue

@@ -2,7 +2,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view>
             <template #header>
-                <app-navbar title="持仓汇总" @back="closed" />
+                <app-navbar title="订单汇总" @back="closed" />
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
                 v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
@@ -29,7 +29,7 @@
                                     <span>{{ item.frozenqty }}</span>
                                 </li>
                                 <li>
-                                    <span>持仓金额</span>
+                                    <span>订单金额</span>
                                     <span>{{ item.curholderamount }}</span>
                                 </li>
                                 <li>

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

@@ -6,6 +6,11 @@
                     <span>{{ accountStore.currentAccountId }}</span>
                 </template>
             </Field>
+            <Field label="商品/代码">
+                <template #input>
+                    <span>{{ item.goodsname }}/{{ item.goodscode }}</span>
+                </template>
+            </Field>
             <Field label="挂牌方">
                 <template #input>
                     <span>{{ selectedRow.username }}</span>

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

@@ -80,7 +80,7 @@ const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()
 const qtyStepList = [0.25, 0.5, 0.75, 1] // 数量步长列表
-const qtyStep = ref<number>() // 数量步长
+const qtyStep = ref(1) // 数量步长
 
 // 价格步长
 const priceStep = computed(() => {

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

@@ -62,9 +62,9 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'buyorsell', label: '方向' },
     { prop: 'curpositionqty', label: '持有量' },
     { prop: 'lastprice', label: '现价' },
-    { prop: 'averageprice', label: '持仓均价' },
+    { prop: 'averageprice', label: '订单价格' },
     { prop: 'frozenqty', label: '冻结量' },
-    { prop: 'curholderamount', label: '持仓金额' },
+    { prop: 'curholderamount', label: '订单总额' },
     { prop: 'enableqty', label: '可用量' },
     { prop: 'closepl', label: '参考损益' }
 ])

src/packages/sbyj/assets/themes/global/global.less

@@ -431,7 +431,7 @@
     }
 
     .van-radio {
-        width: calc(~'100% / 3');
+        width: calc(~'100% / 4');
         padding: 2px;
         margin-right: 0;
 

src/packages/sbyj/views/market/detail/index.vue

@@ -38,15 +38,15 @@
         </div>
         <div class="market-detail__list">
             <table cellspacing="0" cellpadding="0">
-                <tr :class="item.tHDetailEx.tradeID === selectedRow?.tHDetailEx.tradeID ? 'is-active' : ''" v-for="(item, index) in orderList" :key="index"
-                    @click="showPopup(item)">
+                <tr :class="item.tHDetailEx.tradeID === selectedRow?.tHDetailEx.tradeID ? 'is-active' : ''"
+                    v-for="(item, index) in orderList" :key="index" @click="showPopup(item)">
                     <td>
                         <span :class="item.tHDetailEx.buyOrSell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
                             {{ item.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '买料' : '卖料' }}
                         </span>
                     </td>
                     <td>
-                        <span>{{ item.tHDetailEx.openQty * item.agreeUnit }}{{ getGoodsUnitName(item.goodsUnitID) }}</span>
+                        <span>{{ enableqty(item) + getGoodsUnitName(item.goodsUnitID) }}</span>
                     </td>
                     <td>
                         <span>{{ formatDecimal(item.tHDetailEx.holderPrice) }}</span>
@@ -128,7 +128,9 @@
                         <Button size="small" @click="showComponent('supplement')" round
                             v-if="selectedRow.tHDetailEx.holderQty">补充</Button>
                         <template v-if="enableqty(selectedRow)">
-                            <Button size="small" @click="showComponent('delivery')" round>交料</Button>
+                            <Button size="small" @click="showComponent('delivery')" round>
+                                {{ selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? '提料' : '交料' }}
+                            </Button>
                             <Button size="small" @click="showComponent('closeholder')" round>终止</Button>
                         </template>
                         <Button size="small" @click="showComponent('detail')" round>详情</Button>
@@ -198,7 +200,8 @@ const qtyStepList = computed(() => {
     return [
         agreeunit.value * 100,
         agreeunit.value * 500,
-        agreeunit.value * 1000
+        agreeunit.value * 1000,
+        agreeunit.value * 5000
     ]
 })
 
@@ -260,9 +263,7 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
 }
 
 const onRadioChange = (value: number) => {
-    if (orderQty.value % agreeunit.value > 0) {
-        orderQty.value = value
-    }
+    orderQty.value = value
 }
 
 const showPopup = (row: Model.SBYJMyOrderRsp) => {

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

@@ -22,12 +22,12 @@
                         <template #input>
                             <div class="g-qty-group">
                                 <div class="g-qty-group__stepper">
-                                    <Stepper v-model="orderQty" :min="0" :max="enableqty" :step="qtyStep" integer />
+                                    <Stepper v-model="orderQty" :min="0" :max="enableqty" :step="agreeunit" integer />
                                     <span>{{ getGoodsUnitName(selectedRow.goodsUnitID) }}</span>
                                 </div>
                                 <RadioGroup v-model="qtyStep" direction="horizontal" @change="onRadioChange">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">
-                                        {{ value + getGoodsUnitName(selectedRow.goodsUnitID) }}
+                                        {{ parsePercent(value, 0) }}
                                     </Radio>
                                 </RadioGroup>
                             </div>
@@ -48,7 +48,7 @@
 import { shallowRef, PropType, onMounted, onUnmounted, computed } from 'vue'
 import { CellGroup, Cell, Button, Stepper, Field, Form, FormInstance, FieldRule, RadioGroup, Radio } from 'vant'
 import { fullloading } from '@/utils/vant'
-import { handleRequestBigNumber, handleNumberValue, formatDecimal } from '@/filters'
+import { handleRequestBigNumber, handleNumberValue, formatDecimal, parsePercent } from '@/filters'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useOrder } from '@/business/trade'
 import { useFuturesStore } from '@/stores'
@@ -76,13 +76,7 @@ const subscribe = quoteSocket.createSubscribe()
 // 合约乘数
 const agreeunit = computed(() => props.selectedRow.agreeUnit ?? 0)
 // 数量步长列表
-const qtyStepList = computed(() => {
-    return [
-        agreeunit.value * 100,
-        agreeunit.value * 500,
-        agreeunit.value * 1000
-    ]
-})
+const qtyStepList = [0.25, 0.5, 0.75, 1] // 数量步长列表
 
 // 可用重量
 const enableqty = computed(() => {
@@ -106,9 +100,8 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
 }
 
 const onRadioChange = (value: number) => {
-    if (orderQty.value % agreeunit.value > 0) {
-        orderQty.value = Math.min(enableqty.value, value)
-    }
+    const res = enableqty.value * value
+    orderQty.value = Math.round(res / agreeunit.value) * agreeunit.value
 }
 
 // 下单
@@ -144,7 +137,6 @@ const closed = (isRefresh = false) => {
 
 onMounted(() => {
     subscribe.start(props.selectedRow.goodsCode)
-    qtyStep.value = qtyStepList.value[0]
     orderQty.value = enableqty.value
 })
 

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

@@ -12,12 +12,12 @@
                         <template #input>
                             <div class="g-qty-group">
                                 <div class="g-qty-group__stepper">
-                                    <Stepper v-model="orderQty" :min="0" :max="enableqty" :step="qtyStep" integer />
+                                    <Stepper v-model="orderQty" :min="0" :max="enableqty" :step="agreeunit" integer />
                                     <span>{{ getGoodsUnitName(selectedRow.goodsUnitID) }}</span>
                                 </div>
                                 <RadioGroup v-model="qtyStep" direction="horizontal" @change="onRadioChange">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">
-                                        {{ value + getGoodsUnitName(selectedRow.goodsUnitID) }}
+                                        {{ parsePercent(value, 0) }}
                                     </Radio>
                                 </RadioGroup>
                             </div>
@@ -39,7 +39,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 } from '@/filters'
+import { handleRequestBigNumber,parsePercent } from '@/filters'
 import AppModal from '@/components/base/modal/index.vue'
 import { marketOrderDeliveryApply } from '@/services/api/trade'
 import { getGoodsUnitName } from '@/constants/unit'
@@ -60,13 +60,7 @@ const qtyStep = shallowRef(1) // 数量步长
 // 合约乘数
 const agreeunit = computed(() => props.selectedRow.agreeUnit ?? 0)
 // 数量步长列表
-const qtyStepList = computed(() => {
-    return [
-        agreeunit.value * 100,
-        agreeunit.value * 500,
-        agreeunit.value * 1000,
-    ]
-})
+const qtyStepList = [0.25, 0.5, 0.75, 1] // 数量步长列表
 
 // 可用重量
 const enableqty = computed(() => {
@@ -95,9 +89,8 @@ const getTagName = () => {
 }
 
 const onRadioChange = (value: number) => {
-    if (orderQty.value % agreeunit.value > 0) {
-        orderQty.value = Math.min(enableqty.value, value)
-    }
+    const res = enableqty.value * value
+    orderQty.value = Math.round(res / agreeunit.value) * agreeunit.value
 }
 
 const onSubmit = () => {
@@ -127,7 +120,6 @@ const closed = (isRefresh = false) => {
 
 onMounted(() => {
     orderQty.value = enableqty.value
-    qtyStep.value = qtyStepList.value[0]
 })
 
 // 暴露组件属性给父组件调用

src/packages/thj/router/index.ts

@@ -195,6 +195,9 @@ const routes: Array<RouteRecordRaw> = [
         path: 'profile',
         name: 'mine-profile',
         component: () => import('@mobile/views/mine/profile/Index.vue'),
+        props: {
+          title: '公司信息'
+        }
       },
       {
         path: 'setting',

src/packages/thj/views/mine/Index.vue

@@ -97,7 +97,7 @@
                 </Cell>
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
-                        <Iconfont icon="g-icon-profile">个人信息</Iconfont>
+                        <Iconfont icon="g-icon-profile">公司信息</Iconfont>
                     </template>
                 </Cell>
                 <Cell is-link :to="{ name: 'rules-zcxy' }">

src/packages/thj/views/order/list/Index.vue

@@ -27,15 +27,15 @@ import { Tab, Tabs } from 'vant'
 import { useComponent } from '@/hooks/component'
 
 const components = [
-{
+    {
         name: 'swaporder',
-        title: '掉期委托',
+        title: '贸易委托',
         component: defineAsyncComponent(() => import('@mobile/views/order/list/components/swaporder/list/Index.vue')),
         history: defineAsyncComponent(() => import('@mobile/views/order/list/components/swaporder/history/Index.vue')),
     },
     {
         name: 'swaptrade',
-        title: '掉期成交',
+        title: '贸易成交',
         component: defineAsyncComponent(() => import('@mobile/views/order/list/components/swaptrade/list/Index.vue')),
         history: defineAsyncComponent(() => import('@mobile/views/order/list/components/swaptrade/history/Index.vue')),
     },

src/packages/thj/views/order/position/Index.vue

@@ -20,7 +20,7 @@ import { Tab, Tabs } from 'vant'
 const components = [
     {
         name: 'goods',
-        title: '掉期持仓',
+        title: '贸易持仓',
         component: defineAsyncComponent(() => import('@mobile/views/order/position/components/swap/list/Index.vue')),
     },
     {