li.shaoyi 2 năm trước cách đây
mục cha
commit
9239a847c2
28 tập tin đã thay đổi với 196 bổ sung113 xóa
  1. 2 2
      src/packages/mobile/assets/themes/global/global.less
  2. 8 0
      src/packages/mobile/components/modules/quote/chart/kline/index.less
  3. 1 1
      src/packages/mobile/components/modules/quote/chart/timeline/index.less
  4. 1 1
      src/packages/mobile/components/modules/quote/forex/index.less
  5. 25 8
      src/packages/mobile/components/modules/quote/price/index.less
  6. 9 9
      src/packages/mobile/components/modules/quote/price/index.vue
  7. 3 0
      src/packages/mobile/components/modules/quote/tik/index.less
  8. 6 2
      src/packages/mobile/components/modules/quote/tik/index.vue
  9. 33 6
      src/packages/mobile/views/goods/detail/components/listing/Index.less
  10. 9 8
      src/packages/mobile/views/goods/detail/components/listing/Index.vue
  11. 6 3
      src/packages/mobile/views/goods/list/Index.vue
  12. 35 8
      src/packages/mobile/views/goods/trade/components/delisting/index.less
  13. 4 4
      src/packages/mobile/views/goods/trade/components/delisting/index.vue
  14. 1 5
      src/packages/mobile/views/market/detail/Index.vue
  15. 0 9
      src/packages/mobile/views/market/detail/index.less
  16. 8 8
      src/packages/mobile/views/order/list/components/goodsorder/history/Index.vue
  17. 2 2
      src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue
  18. 3 3
      src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue
  19. 5 5
      src/packages/mobile/views/order/position/components/goods/close/Index.vue
  20. 7 5
      src/packages/mobile/views/order/position/components/goods/delivery/Index.vue
  21. 6 5
      src/packages/mobile/views/order/position/components/goods/list/Index.vue
  22. 2 2
      src/packages/mobile/views/order/position/components/presale/detail/Index.vue
  23. 3 3
      src/packages/mobile/views/order/position/components/swap/list/Index.vue
  24. 3 4
      src/packages/mobile/views/swap/detail/components/delisting/Index.vue
  25. 5 6
      src/packages/mobile/views/swap/detail/components/listing/Index.vue
  26. 1 1
      src/packages/mobile/views/transfer/detail/Index.vue
  27. 6 1
      src/packages/mobile/views/transfer/list/Index.vue
  28. 2 2
      src/stores/modules/futures.ts

+ 2 - 2
src/packages/mobile/assets/themes/global/global.less

@@ -15,11 +15,11 @@
     }
 }
 
-.g-up-color {
+.g-price-up {
     color: #ff3333;
 }
 
-.g-down-color {
+.g-price-down {
     color: #0baf1f;
 }
 

+ 8 - 0
src/packages/mobile/components/modules/quote/chart/kline/index.less

@@ -33,5 +33,13 @@
 
     .app-tabs {
         height: 3rem;
+
+        .tabs {
+            padding: .1rem;
+
+            &-item {
+                font-size: .24rem;
+            }
+        }
     }
 }

+ 1 - 1
src/packages/mobile/components/modules/quote/chart/timeline/index.less

@@ -1,7 +1,7 @@
 .app-echats-timeline {
     display: flex;
     flex-direction: column;
-    height: 300px;
+    height: 260px;
 
     &__tip {
         margin: auto;

+ 1 - 1
src/packages/mobile/components/modules/quote/forex/index.less

@@ -1,7 +1,7 @@
 .app-quote-forex {
     display: flex;
     background-color: #fff;
-    margin: .2rem 0;
+    margin-top: .2rem;
 
     dl {
         flex: 1;

+ 25 - 8
src/packages/mobile/components/modules/quote/price/index.less

@@ -1,8 +1,12 @@
 .app-quote-price {
-    color: #666;
+    color: #333;
     background-color: #fff;
     padding: .2rem 0;
 
+    .van-divider {
+        margin: 0;
+    }
+
     &__main {
         display: flex;
         align-items: center;
@@ -10,10 +14,12 @@
 
         .block {
             &-left {
+                width: 3rem;
                 padding: 0 .48rem;
 
                 .top-content {
                     font-size: .44rem;
+                    margin-bottom: .1rem;
                 }
 
                 .bottom-content {
@@ -34,6 +40,15 @@
                         display: flex;
                         flex-direction: column;
                         width: calc(~'100% / 3');
+                        margin-bottom: .2rem;
+
+                        span {
+                            &:first-child {
+                                color: #888;
+                                font-size: .24rem;
+                                margin-bottom: .1rem;
+                            }
+                        }
                     }
                 }
             }
@@ -41,12 +56,6 @@
     }
 
     &__more {
-        position: relative;
-
-        .block-icon {
-            text-align: center;
-        }
-
         ul {
             display: flex;
             flex-wrap: wrap;
@@ -56,8 +65,16 @@
             li {
                 display: flex;
                 justify-content: space-between;
+                align-items: center;
                 width: 50%;
-                padding: .1rem .2rem;
+                padding: .1rem .24rem;
+
+                span {
+                    &:first-child {
+                        font-size: .24rem;
+                        color: #888;
+                    }
+                }
             }
         }
     }

+ 9 - 9
src/packages/mobile/components/modules/quote/price/index.vue

@@ -22,7 +22,7 @@
                     </li>
                     <li>
                         <span>涨停</span>
-                        <span>{{ handleNumberValue(quote.limitup) }}</span>
+                        <span class="g-price-up">{{ handleNumberValue(quote.limitup) }}</span>
                     </li>
                     <li>
                         <span>昨结</span>
@@ -34,15 +34,15 @@
                     </li>
                     <li>
                         <span>跌停</span>
-                        <span>{{ handleNumberValue(quote.limitdown) }}</span>
+                        <span class="g-price-down">{{ handleNumberValue(quote.limitdown) }}</span>
                     </li>
                 </ul>
             </div>
         </div>
+        <Divider @click="showMore = !showMore">
+            <Icon name="arrow-down" />
+        </Divider>
         <div class="app-quote-price__more" v-if="quote">
-            <div class="block-icon" @click="showMore = !showMore">
-                <Icon name="arrow-down" />
-            </div>
             <ul v-show="showMore">
                 <li>
                     <span>买量</span>
@@ -54,11 +54,11 @@
                 </li>
                 <li>
                     <span>买价</span>
-                    <span>{{ handleNumberValue(quote.bid) }}</span>
+                    <span :class="quote.bidColor">{{ handleNumberValue(quote.bid) }}</span>
                 </li>
                 <li>
                     <span>卖价</span>
-                    <span>{{ handleNumberValue(quote.ask) }}</span>
+                    <span :class="quote.askColor">{{ handleNumberValue(quote.ask) }}</span>
                 </li>
                 <li>
                     <span>均价</span>
@@ -75,7 +75,7 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Icon } from 'vant'
+import { Icon, Divider } from 'vant'
 import { parsePercent, handleNumberValue } from '@/filters'
 import { useFuturesStore } from '@/stores'
 
@@ -88,7 +88,7 @@ const props = defineProps({
 
 const futuresStore = useFuturesStore()
 const quote = futuresStore.getQuoteInfo(props.goodsCode)
-const showMore = shallowRef(true)
+const showMore = shallowRef(false)
 </script>
 
 <style lang="less">

+ 3 - 0
src/packages/mobile/components/modules/quote/tik/index.less

@@ -0,0 +1,3 @@
+.app-quote-tik {
+    margin-top: .2rem;
+}

+ 6 - 2
src/packages/mobile/components/modules/quote/tik/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <AppList :columns="columns" :data-list="dataList">
+    <AppList class="app-quote-tik" :columns="columns" :data-list="dataList">
         <template #TS="{ value }">
             {{ formatDate(value, 'HH:mm:ss') }}
         </template>
@@ -80,4 +80,8 @@ watch(() => quote.value?.last, () => {
         })
     }
 })
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

+ 33 - 6
src/packages/mobile/views/goods/detail/components/listing/Index.less

@@ -1,12 +1,39 @@
 .goods-listing {
-    &__form {
-        .van-stepper {
+    &__stepper {
+        flex: 1;
+
+        .van-radio-group {
             display: flex;
-            align-items: center;
-            width: 100%;
+            flex-wrap: wrap;
+            margin-top: .2rem;
+        }
+
+        .van-radio {
+            width: calc(~'100% / 3');
+            padding: .04rem;
+            margin-right: 0;
+
+            .van-radio__icon {
+                display: none;
+            }
+
+            &__label {
+                display: block;
+                width: 100%;
+                font-size: .24rem;
+                text-align: center;
+                color: #666;
+                border: 1px solid #e5e5e5;
+                border-radius: .08rem;
+                padding: .04rem;
+                margin-left: 0;
+            }
 
-            &__input {
-                flex: 1;
+            &[aria-checked="true"] {
+                .van-radio__label {
+                    color: var(--van-radio-checked-icon-color);
+                    border-color: var(--van-radio-checked-icon-color);
+                }
             }
         }
     }

+ 9 - 8
src/packages/mobile/views/goods/detail/components/listing/Index.vue

@@ -1,6 +1,6 @@
 <template>
     <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
-        <app-view class="g-form">
+        <app-view class="goods-listing g-form">
             <template #header>
                 <app-navbar :title="quote ? `${quote.goodscode}/${quote.goodsname}` : '挂牌'" @back="closed" />
             </template>
@@ -11,16 +11,16 @@
                 <CellGroup inset>
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="价格">
                         <template #input>
-                            <Stepper v-model="formData.OrderPrice" input-width="100" theme="round" button-size="22"
+                            <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
                                 :auto-fixed="false" :decimal-length="quote?.decimalplace" :step="priceStep" />
                         </template>
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty"
                         :label="`数量(${getGoodsUnitName(quote?.goodunitid)})`">
                         <template #input>
-                            <div>
-                                <Stepper v-model="orderQty" input-width="100" theme="round" button-size="22" :min="0"
-                                    :step="qtyStep" integer />
+                            <div class="goods-listing__stepper">
+                                <Stepper v-model="orderQty" theme="round" button-size="22" :min="0" :step="qtyStep"
+                                    integer />
                                 <RadioGroup v-model="qtyStep" direction="horizontal">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">{{ value }}
                                     </Radio>
@@ -109,7 +109,7 @@ const agreeunit = computed(() => quote.value?.agreeunit ?? 0)
 const priceStep = computed(() => {
     const { quoteminunit = 0, decimalplace = 0 } = quote.value ?? {}
     if (quoteminunit) {
-        return quoteminunit / Math.pow(10, decimalplace * -1)
+        return quoteminunit * Math.pow(10, decimalplace * -1)
     }
     return 1
 })
@@ -261,9 +261,10 @@ const closed = (isRefresh = true) => {
 }
 
 onMounted(() => {
-    const { last = 0, agreeunit = 0 } = quote.value ?? {}
-    formData.OrderPrice = last
+    const { last = 0, agreeunit = 0, presettle = 0 } = quote.value ?? {}
+    formData.OrderPrice = last || presettle
     orderQty.value = agreeunit
+    qtyStep.value = qtyStepList.value[0]
 })
 
 // 暴露组件属性给父组件调用

+ 6 - 3
src/packages/mobile/views/goods/list/Index.vue

@@ -4,6 +4,9 @@
             <app-navbar title="订单挂牌" />
         </template>
         <app-list :columns="columns" :data-list="tableList" @row-click="rowClick">
+            <template #goodsname="{ row }">
+                {{ row.goodsname }}/{{ row.goodscode }}
+            </template>
             <!-- 买价 -->
             <template #bid="{ row }">
                 <span :class="row.bidColor">{{ row.bid }}</span>
@@ -46,11 +49,11 @@
             </template>
             <!-- 涨停 -->
             <template #limitup="{ value }">
-                <span class="g-up-color">{{ value }}</span>
+                <span class="g-price-up">{{ value }}</span>
             </template>
             <!-- 跌停 -->
             <template #limitdown="{ value }">
-                <span class="g-down-color">{{ value }}</span>
+                <span class="g-price-down">{{ value }}</span>
             </template>
         </app-list>
     </app-view>
@@ -116,7 +119,7 @@ const tableList = computed(() => {
 })
 
 const columns: Model.TableColumn[] = [
-    { prop: 'goodsname', label: '商品/标的' },
+    { prop: 'goodsname', label: '商品名称/代码' },
     { prop: 'bid', label: '买价' },
     { prop: 'bidvolume', label: '买量' },
     { prop: 'ask', label: '卖价' },

+ 35 - 8
src/packages/mobile/views/goods/trade/components/delisting/index.less

@@ -1,13 +1,40 @@
 .goods-delisting {
-    &__form {
-        .van-stepper {
+    &__stepper {
+        flex: 1;
+
+        .van-radio-group {
             display: flex;
-            align-items: center;
-            width: 100%;
-  
-            &__input {
-                flex: 1;
+            flex-wrap: wrap;
+            margin-top: .2rem;
+        }
+
+        .van-radio {
+            width: calc(~'100% / 3');
+            padding: .04rem;
+            margin-right: 0;
+
+            .van-radio__icon {
+                display: none;
+            }
+
+            &__label {
+                display: block;
+                width: 100%;
+                font-size: .24rem;
+                text-align: center;
+                color: #666;
+                border: 1px solid #e5e5e5;
+                border-radius: .08rem;
+                padding: .04rem;
+                margin-left: 0;
+            }
+
+            &[aria-checked="true"] {
+                .van-radio__label {
+                    color: var(--van-radio-checked-icon-color);
+                    border-color: var(--van-radio-checked-icon-color);
+                }
             }
         }
     }
-  }
+}

+ 4 - 4
src/packages/mobile/views/goods/trade/components/delisting/index.vue

@@ -1,6 +1,6 @@
 <template>
     <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
-        <app-view class="g-form">
+        <app-view class="goods-delisting g-form">
             <template #header>
                 <app-navbar :title="quote ? `${quote.goodscode}/${quote.goodsname}` : '摘牌'" @back="closed" />
             </template>
@@ -33,9 +33,9 @@
                     </Field>
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="摘牌数量">
                         <template #input>
-                            <div>
-                                <Stepper v-model="orderQty" input-width="100" theme="round" button-size="22" :min="0"
-                                    :step="qtyStep" :max="selectedRow.orderqty" integer />
+                            <div class="goods-delisting__stepper">
+                                <Stepper v-model="orderQty" theme="round" button-size="22" :min="0" :step="qtyStep"
+                                    :max="selectedRow.orderqty" integer />
                                 <RadioGroup v-model="qtyStep" direction="horizontal">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">{{ value }}
                                     </Radio>

+ 1 - 5
src/packages/mobile/views/market/detail/Index.vue

@@ -35,8 +35,4 @@ const onReady = (start: string, end: string) => {
 
 onMounted(() => subscribe.start())
 onUnmounted(() => subscribe.stop())
-</script>
-
-<style lang="less">
-@import './index.less';
-</style>
+</script>

+ 0 - 9
src/packages/mobile/views/market/detail/index.less

@@ -1,9 +0,0 @@
-.market-detail {
-    background-color: #fff;
-
-    .van-tabs {
-        &__nav {
-            background-color: #f2f2f2;
-        }
-    }
-}

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

@@ -6,8 +6,8 @@
                 <app-navbar title="历史订单委托" @back="closed" />
             </template>
             <Cell title="查询日期" :value="date" @click="show = true" is-link></Cell>
-            <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
-        :page-count="pageCount" @refresh="run">
+            <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
+                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
                 <div class="g-order-list">
                     <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                         <div class="g-order-list__titlebar">
@@ -21,8 +21,8 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>时间:</span>
-                                    <span>{{ formatDate(item.ordertime, 'YY/MM/DD HH:mm:ss') }}</span>
+                                    <span>日期</span>
+                                    <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                                 </li>
                                 <li>
                                     <span>方向:</span>
@@ -34,7 +34,7 @@
                                 </li>
                                 <li>
                                     <span>委托价格:</span>
-                                    <span>{{ item.orderprice}}</span>
+                                    <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
                                     <span>成交数量:</span>
@@ -51,11 +51,11 @@
                         </div>
                     </div>
                 </div>
-                <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
-                    v-if="componentId" />
+                <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
+                    @closed="closeComponent" v-if="componentId" />
             </app-pull-refresh>
             <Calendar :show="show" type="range" :max-date="new Date()" :min-date="moment().subtract(1, 'years').toDate()"
-            @close="onClose" @confirm="onConfirm" />
+                @close="onClose" @confirm="onConfirm" />
         </app-view>
     </app-modal>
 </template>

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

@@ -15,8 +15,8 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>时间:</span>
-                            <span>{{ formatDate(item.ordertime, 'HH:mm:ss') }}</span>
+                            <span>日期:</span>
+                            <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
                             <span>方向:</span>

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

@@ -15,8 +15,8 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>时间:</span>
-                            <span>{{ formatDate(item.tradetime, 'HH:mm:ss') }}</span>
+                            <span>日期:</span>
+                            <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
                             <span>类型:</span>
@@ -28,7 +28,7 @@
                         </li>
                         <li>
                             <span>手续费:</span>
-                            <span>{{ formatDecimal(item.charge)}}</span>
+                            <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
                             <span>成交数量:</span>

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

@@ -16,7 +16,7 @@
                     <Cell title="持仓均价" :value="formatDecimal(selectedRow.averageprice)" />
                     <Cell title="参考损益">
                         <template #value>
-                            <span :class="closepl ? 'g-up-color' : 'g-down-color'">{{ formatDecimal(closepl) }}</span>
+                            <span :class="closepl ? 'g-price-up' : 'g-price-down'">{{ formatDecimal(closepl) }}</span>
                         </template>
                     </Cell>
                 </CellGroup>
@@ -25,14 +25,14 @@
                     <Form class="goods-close__form" ref="formRef" @submit="onCloseSumit" v-if="props">
                         <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价格">
                             <template #input>
-                                <Stepper v-model="formData.OrderPrice" input-width="100" theme="round" button-size="22"
-                                    :min="0" :decimal-length="selectedRow.decimalplace" :auto-fixed="false" />
+                                <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
+                                    :decimal-length="selectedRow.decimalplace" :auto-fixed="false" />
                             </template>
                         </Field>
                         <Field name="OrderQty" :rules="formRules.OrderQty" label="转让数量">
                             <template #input>
-                                <Stepper v-model="formData.OrderQty" input-width="100" theme="round" button-size="22"
-                                    :min="0" :max="selectedRow.enableqty" :auto-fixed="false" integer />
+                                <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0"
+                                    :max="selectedRow.enableqty" :auto-fixed="false" integer />
                             </template>
                         </Field>
                     </Form>

+ 7 - 5
src/packages/mobile/views/order/position/components/goods/delivery/Index.vue

@@ -16,7 +16,7 @@
                     <Cell title="持仓均价" :value="formatDecimal(selectedRow.averageprice)" />
                     <Cell title="参考损益">
                         <template #value>
-                            <span :class="closepl ? 'g-up-color' : 'g-down-color'">{{ formatDecimal(closepl) }}</span>
+                            <span :class="closepl ? 'g-price-up' : 'g-price-down'">{{ formatDecimal(closepl) }}</span>
                         </template>
                     </Cell>
                 </CellGroup>
@@ -25,10 +25,12 @@
                     <Form class="goods-close__form" ref="formRef" @submit="onDeliverySumit" v-if="props">
                         <Field name="DeliveryLot" type="digit" :rules="formRules.DeliveryLot" label="交收数量">
                             <template #input>
-                                <Stepper v-model="formData.DeliveryLot" input-width="100" theme="round" button-size="22" :min="0" :max="selectedRow.enableqty" :auto-fixed="false" integer />
+                                <Stepper v-model="formData.DeliveryLot" theme="round" button-size="22" :min="0"
+                                    :max="selectedRow.enableqty" :auto-fixed="false" integer />
                             </template>
                         </Field>
-                        <Field name="DeliveryInfo" v-model="formData.DeliveryInfo" type="textarea" autosize clearable :rules="formRules.DeliveryInfo" maxlength="50" label="交收信息" placeholder="请输入交收信息">
+                        <Field name="DeliveryInfo" v-model="formData.DeliveryInfo" type="textarea" autosize clearable
+                            :rules="formRules.DeliveryInfo" maxlength="50" label="交收信息" placeholder="请输入交收信息">
                         </Field>
                     </Form>
                 </CellGroup>
@@ -43,7 +45,7 @@
 <script lang="ts" setup>
 import { shallowRef, PropType, computed } from 'vue'
 import AppModal from '@/components/base/modal/index.vue'
-import { CellGroup, Cell, Button, FieldRule, Form, Field, Stepper} from 'vant'
+import { CellGroup, Cell, Button, FieldRule, Form, Field, Stepper } from 'vant'
 import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
 import { formatDecimal } from '@/filters'
 import { useOfflineDelivery } from '@/business/trade'
@@ -96,7 +98,7 @@ const onDeliverySumit = () => {
         message: '确认要交收吗?',
         showCancelButton: true,
     }).then(() => {
-        const { marketid, goodsid, goodscode, buyorsell }  = props.selectedRow
+        const { marketid, goodsid, goodscode, buyorsell } = props.selectedRow
         /// 市场ID
         formData.Header = { MarketID: marketid, GoodsID: goodsid }
         formData.GoodsCode = goodscode

+ 6 - 5
src/packages/mobile/views/order/position/components/goods/list/Index.vue

@@ -9,7 +9,8 @@
                         <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
                     </div>
                     <div class="right">
-                        <span :class="!item.buyorsell ? 'g-up-color' : 'g-down-color'">{{ getBuyOrSellName(item.buyorsell) }}</span>
+                        <span :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">{{ getBuyOrSellName(item.buyorsell)
+                        }}</span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
@@ -39,7 +40,7 @@
                         </li>
                         <li>
                             <span>参考损益:</span>
-                            <span :class="closepl(item) ? 'g-up-color' : 'g-down-color'">{{ closepl(item) }}</span>
+                            <span :class="closepl(item) ? 'g-price-up' : 'g-price-down'">{{ closepl(item) }}</span>
                         </li>
                     </ul>
                 </div>
@@ -62,7 +63,7 @@ import { useComponent } from '@/hooks/component'
 import { useRequest } from '@/hooks/request'
 import { queryTradePosition } from '@/services/api/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
-import { getBuyOrSellName, BuyOrSell} from '@/constants/order'
+import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
 import { formatDecimal, handleNumberValue } from '@/filters'
 import { useUserStore, useFuturesStore } from '@/stores'
 
@@ -81,11 +82,11 @@ const pullRefreshRef = shallowRef()
 
 const last = (goodsCode: string) => {
     return futuresStore.getQuotePrice(goodsCode)
-} 
+}
 
 const lastColor = (goodsCode: string) => {
     return futuresStore.getQuoteInfo(goodsCode).value?.lastColor
-} 
+}
 
 /// 计算参考损益
 const closepl = (item: Model.TradePositionRsp) => {

+ 2 - 2
src/packages/mobile/views/order/position/components/presale/detail/Index.vue

@@ -3,11 +3,11 @@
     <app-modal direction="right" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="转让持仓详情" @back="closed" />
+                <app-navbar title="预售持仓详情" @back="closed" />
             </template>
             <div class="g-form__container">
                 <CellGroup title="预售持仓信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodsname+'/'+selectedRow.goodscode" />
+                    <Cell title="商品代码/名称" :value="selectedRow.goodsname + '/' + selectedRow.goodscode" />
                     <Cell title="发售方" :value="selectedRow.sellname" />
                     <Cell title="开始日期" :value="formatDate(selectedRow.starttime)" />
                     <Cell title="结束日期" :value="formatDate(selectedRow.endtime)" />

+ 3 - 3
src/packages/mobile/views/order/position/components/swap/list/Index.vue

@@ -39,7 +39,7 @@
                         </li>
                         <li>
                             <span>参考损益:</span>
-                            <span :class="closepl(item) ? 'g-up-color' : 'g-down-color'">{{ closepl(item) }}</span>
+                            <span :class="closepl(item) ? 'g-price-up' : 'g-price-down'">{{ closepl(item) }}</span>
                         </li>
                     </ul>
                 </div>
@@ -77,11 +77,11 @@ const pullRefreshRef = shallowRef()
 
 const last = (goodsCode: string) => {
     return futuresStore.getQuotePrice(goodsCode)
-} 
+}
 
 const lastColor = (goodsCode: string) => {
     return futuresStore.getQuoteInfo(goodsCode).value?.lastColor
-} 
+}
 
 /// 计算参考损益
 const closepl = (item: Model.TradePositionRsp) => {

+ 3 - 4
src/packages/mobile/views/swap/detail/components/delisting/Index.vue

@@ -36,14 +36,13 @@
             </Field>
             <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌数量">
                 <template #input>
-                    <Stepper v-model="formData.OrderQty" input-width="100" theme="round" button-size="22" :min="0"
-                        :step="0.01" :max="selectedRow.orderqty" :auto-fixed="false" />
+                    <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0" :step="0.01"
+                        :max="selectedRow.orderqty" :auto-fixed="false" />
                 </template>
             </Field>
             <Field name="OrderPrice" v-if="priceMove === 2" :rules="formRules.OrderPrice" label="摘牌价格">
                 <template #input>
-                    <Stepper v-model="formData.OrderPrice" input-width="100" theme="round" button-size="22" :min="0"
-                        :auto-fixed="false" />
+                    <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0" :auto-fixed="false" />
                 </template>
             </Field>
             <Field label="估算金额" v-if="priceMove === 3">

+ 5 - 6
src/packages/mobile/views/swap/detail/components/listing/Index.vue

@@ -20,14 +20,14 @@
             </Field>
             <Field name="OrderPrice" :rules="formRules.OrderPrice" label="挂牌价格" v-if="priceMove === 2">
                 <template #input>
-                    <Stepper v-model="formData.OrderPrice" input-width="100" theme="round" button-size="22"
-                        :auto-fixed="false" :step="0.01" />
+                    <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :auto-fixed="false"
+                        :step="0.01" />
                 </template>
             </Field>
             <Field name="MarketMaxSub" :rules="formRules.MarketMaxSub" label="点差" v-if="priceMove === 3">
                 <template #input>
-                    <Stepper v-model="formData.MarketMaxSub" input-width="100" theme="round" button-size="22"
-                        :auto-fixed="false" :step="0.01" />
+                    <Stepper v-model="formData.MarketMaxSub" theme="round" button-size="22" :auto-fixed="false"
+                        :step="0.01" />
                 </template>
             </Field>
             <Field label="估算价格" v-if="priceMove === 3">
@@ -42,8 +42,7 @@
             </Field>
             <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌数量">
                 <template #input>
-                    <Stepper v-model="formData.OrderQty" input-width="100" theme="round" button-size="22"
-                        :auto-fixed="false" integer />
+                    <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :auto-fixed="false" integer />
                 </template>
             </Field>
             <Field label="挂牌金额" v-if="priceMove === 2">

+ 1 - 1
src/packages/mobile/views/transfer/detail/Index.vue

@@ -23,7 +23,7 @@
                         <span>{{ handleNumberValue(quote?.last) }}</span>
                     </li>
                     <li>
-                        <span>转让比例</span>
+                        <span>转让定金</span>
                         <span>{{ parsePercent(detail.transferdepositratio) }}</span>
                     </li>
                     <li>

+ 6 - 1
src/packages/mobile/views/transfer/list/Index.vue

@@ -3,7 +3,11 @@
         <template #header>
             <app-navbar title="订单转让" :show-back-button="false" />
         </template>
-        <app-list :columns="columns" :data-list="dataList" @row-click="rowClick" />
+        <app-list :columns="columns" :data-list="dataList" @row-click="rowClick">
+            <template #goodscode="{ row }">
+                {{ row.goodscode }}/{{ row.goodsname }}
+            </template>
+        </app-list>
     </app-view>
 </template>
 
@@ -23,6 +27,7 @@ const dataList = computed(() => {
     return list.map((e) => ({
         goodscode: e.goodscode,
         goodsid: e.goodsid,
+        goodsname: e.goodsname,
         ask: handleNumberValue(e.ask),
         last: handleNumberValue(e.last),
         askvolume: handleNumberValue(e.askvolume),

+ 2 - 2
src/stores/modules/futures.ts

@@ -71,9 +71,9 @@ export const useFuturesStore = defineStore(() => {
                 if (value === 0 || value === presettle) {
                     return ''
                 } else if (value > presettle) {
-                    return 'g-up-color'
+                    return 'g-price-up'
                 } else {
-                    return 'g-down-color'
+                    return 'g-price-down'
                 }
             }