update

src/packages/mobile/assets/themes/default/default.less

@@ -31,7 +31,8 @@
 
     /* Vant-Button */
     --van-button-border-width: 0;
-    --van-button-primary-background: linear-gradient(31deg, #C30D23 0%, #DD364A 100%);
+    // --van-button-primary-background: linear-gradient(31deg, #C30D23 0%, #DD364A 100%);
+    // --van-button-danger-background: linear-gradient(31deg, #C30D23 0%, #DD364A 100%);
 
     /* Vant-Checkbox */
     --van-checkbox-checked-icon-color: #DD364A !important;

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

@@ -55,12 +55,15 @@
     &__footer {
         display: flex;
         align-items: center;
-        gap: .2rem;
-        padding: .2rem .32rem;
 
         &:empty {
             display: none;
         }
+
+        &.inset {
+            gap: .2rem;
+            padding: .2rem .32rem;
+        }
     }
 }
 

src/packages/mobile/components/base/list/index.less

@@ -36,11 +36,11 @@
     }
 
     &__column {
-        padding: .12rem;
+        padding: .12rem .16rem;
     }
 
     &__header &__column {
-        padding: 0 .12rem;
+        padding: 0 .16rem;
     }
 
     &__column:first-child &__cell {
@@ -58,6 +58,11 @@
         flex-direction: column;
         justify-content: center;
         min-height: .72rem;
+
+        .text-small {
+            font-size: .24rem;
+            color: #999;
+        }
     }
 
     &__body &__cell {

src/packages/mobile/components/modules/quote/forex/index.vue

@@ -9,27 +9,27 @@
             </dt>
             <dd @click="onSellClick(1)">
                 <span>卖一</span>
-                <span>{{ handleNumberValue(quote?.ask) }}</span>
+                <span :class="quote?.askColor">{{ handleNumberValue(quote?.ask) }}</span>
                 <span>{{ handleNumberValue(quote?.askvolume) }}</span>
             </dd>
             <dd @click="onSellClick(2)">
                 <span>卖二</span>
-                <span>{{ handleNumberValue(quote?.ask2) }}</span>
+                <span :class="quote?.ask2Color">{{ handleNumberValue(quote?.ask2) }}</span>
                 <span>{{ handleNumberValue(quote?.askvolume2) }}</span>
             </dd>
             <dd @click="onSellClick(3)">
                 <span>卖三</span>
-                <span>{{ handleNumberValue(quote?.ask3) }}</span>
+                <span :class="quote?.ask3Color">{{ handleNumberValue(quote?.ask3) }}</span>
                 <span>{{ handleNumberValue(quote?.askvolume3) }}</span>
             </dd>
             <dd @click="onSellClick(4)">
                 <span>卖四</span>
-                <span>{{ handleNumberValue(quote?.ask4) }}</span>
+                <span :class="quote?.ask4Color">{{ handleNumberValue(quote?.ask4) }}</span>
                 <span>{{ handleNumberValue(quote?.askvolume4) }}</span>
             </dd>
             <dd @click="onSellClick(5)">
                 <span>卖五</span>
-                <span>{{ handleNumberValue(quote?.ask5) }}</span>
+                <span :class="quote?.ask5Color">{{ handleNumberValue(quote?.ask5) }}</span>
                 <span>{{ handleNumberValue(quote?.askvolume5) }}</span>
             </dd>
         </dl>
@@ -42,27 +42,27 @@
             </dt>
             <dd @click="onBuyClick(1)">
                 <span>买一</span>
-                <span>{{ handleNumberValue(quote?.bid) }}</span>
+                <span :class="quote?.bidColor">{{ handleNumberValue(quote?.bid) }}</span>
                 <span>{{ handleNumberValue(quote?.bidvolume) }}</span>
             </dd>
             <dd @click="onBuyClick(2)">
                 <span>买二</span>
-                <span>{{ handleNumberValue(quote?.bid2) }}</span>
+                <span :class="quote?.bid2Color">{{ handleNumberValue(quote?.bid2) }}</span>
                 <span>{{ handleNumberValue(quote?.bidvolume2) }}</span>
             </dd>
             <dd @click="onBuyClick(3)">
                 <span>买三</span>
-                <span>{{ handleNumberValue(quote?.bid3) }}</span>
+                <span :class="quote?.bid3Color">{{ handleNumberValue(quote?.bid3) }}</span>
                 <span>{{ handleNumberValue(quote?.bidvolume3) }}</span>
             </dd>
             <dd @click="onBuyClick(4)">
                 <span>买四</span>
-                <span>{{ handleNumberValue(quote?.bid4) }}</span>
+                <span :class="quote?.bid4Color">{{ handleNumberValue(quote?.bid4) }}</span>
                 <span>{{ handleNumberValue(quote?.bidvolume4) }}</span>
             </dd>
             <dd @click="onBuyClick(5)">
                 <span>买五</span>
-                <span>{{ handleNumberValue(quote?.bid5) }}</span>
+                <span :class="quote?.bid5Color">{{ handleNumberValue(quote?.bid5) }}</span>
                 <span>{{ handleNumberValue(quote?.bidvolume5) }}</span>
             </dd>
         </dl>
@@ -111,4 +111,6 @@ const navigateTo = (buyorsell: BuyOrSell) => {
 }
 </script>
 
-<style lang="less">@import './index.less';</style>
+<style lang="less">
+@import './index.less';
+</style>

src/packages/mobile/components/modules/quote/price/index.less

@@ -15,16 +15,25 @@
         .block {
             &-left {
                 width: 3rem;
-                padding: 0 .48rem;
 
                 .top-content {
-                    font-size: .44rem;
+                    font-size: .56rem;
                     margin-bottom: .1rem;
                 }
 
                 .bottom-content {
-                    span+span {
-                        margin-left: .2rem;
+                    font-size: .32rem;
+
+                    span {
+                        +span {
+                            margin-left: .2rem;
+                        }
+
+                        &.g-price-up {
+                            &::before {
+                                content: '+';
+                            }
+                        }
                     }
                 }
             }

src/packages/mobile/components/modules/quote/price/index.vue

@@ -40,7 +40,7 @@
             </div>
         </div>
         <Divider @click="showMore = !showMore">
-            <Icon name="arrow-down" />
+            <Icon :name="showMore ? 'arrow-up' : 'arrow-down'" />
         </Divider>
         <div class="app-quote-price__more" v-if="quote">
             <ul v-show="showMore">

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

@@ -9,8 +9,8 @@
         <component :is="Tik" v-bind="{ goodsCode, startTime, endTime }" />
         <template #footer>
             <div class="g-form__footer">
-                <Button block round type="primary" @click="onListing(EBuildType.BUILDTYPE_OPEN)">订立</Button>
-                <Button block round type="primary" :disabled="isDisabledClose"
+                <Button block type="danger" square @click="onListing(EBuildType.BUILDTYPE_OPEN)">订立</Button>
+                <Button block type="primary" square :disabled="isDisabledClose"
                     @click="onListing(EBuildType.BUILDTYPE_CLOSE)">转让</Button>
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ goodsCode, buildType }"

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

@@ -38,16 +38,16 @@
             <template #footer>
                 <div class="g-form__footer">
                     <template v-if="buildType === EBuildType.BUILDTYPE_OPEN">
-                        <Button type="primary" block round @click="onBeforeSubmit(BuyOrSell.Buy)">订立买入</Button>
-                        <Button type="primary" block round @click="onBeforeSubmit(BuyOrSell.Sell)">订立卖出</Button>
+                        <Button type="danger" block square @click="onBeforeSubmit(BuyOrSell.Buy)">订立买入</Button>
+                        <Button type="primary" block square @click="onBeforeSubmit(BuyOrSell.Sell)">订立卖出</Button>
                     </template>
                     <template v-if="buildType === EBuildType.BUILDTYPE_CLOSE">
-                        <Button type="primary" :disabled="(sellQty === 0) || (orderQty > sellQty)" block round
+                        <Button type="danger" :disabled="(sellQty === 0) || (orderQty > sellQty)" block square
                             @click="onBeforeSubmit(BuyOrSell.Buy)">
                             <span>转让买入</span>
                             <span v-if="sellQty">(≤{{ sellQty }})</span>
                         </Button>
-                        <Button type="primary" :disabled="(buyQty === 0) || (orderQty > buyQty)" block round
+                        <Button type="primary" :disabled="(buyQty === 0) || (orderQty > buyQty)" block square
                             @click="onBeforeSubmit(BuyOrSell.Sell)">
                             <span>转让卖出</span>
                             <span v-if="buyQty">(≤{{ buyQty }})</span>

src/packages/mobile/views/goods/list/Index.vue

@@ -4,8 +4,10 @@
             <app-navbar title="订单挂牌" :show-back-button="false" />
         </template>
         <app-list :columns="columns" :data-list="tableList" @row-click="rowClick">
+            <!-- 商品名称/代码 -->
             <template #goodsname="{ row }">
-                {{ row.goodsname }}/{{ row.goodscode }}
+                <span>{{ row.goodsname }}</span>
+                <span class="text-small">{{ row.goodscode }}</span>
             </template>
             <!-- 买价 -->
             <template #bid="{ row }">

src/packages/mobile/views/goods/trade/index.vue

@@ -6,13 +6,14 @@
         <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
             :page-count="pageCount" @refresh="onRefresh">
             <Tabs v-model:active="tabIndex" @click="onTabChange">
-                <Tab title="买大厅" :name="BuyOrSell.Buy" />
                 <Tab title="卖大厅" :name="BuyOrSell.Sell" />
+                <Tab title="买大厅" :name="BuyOrSell.Buy" />
             </Tabs>
             <div class="trade-section sell" v-if="dataList.length">
                 <app-list :columns="columns" :data-list="dataList">
                     <template #username="{ row }">
-                        <span>{{ row.userid }}/{{ row.username }}</span>
+                        <span>{{ row.userid }}</span>
+                        <span class="text-small">{{ row.username }}</span>
                     </template>
                     <template #operate="{ row }">
                         <Button size="small" type="primary" round @click="onDelisting(row)">

src/packages/mobile/views/home/main/Index.vue

@@ -1,17 +1,15 @@
 <template>
-  <app-scroll-view class="home-main">
-    <template #afterHeader>
+  <app-view class="home-main">
+    <template #header>
       <app-navbar title="多元世纪" :show-back-button="false" />
     </template>
-    <app-statusbar class="home-main__header">
-      <div class="home-main__banner home-main__banner--header">
-        <Swipe :autoplay="5000" indicator-color="white" lazy-render>
-          <SwipeItem v-for="(item, index) in topBanners" :key="index">
-            <img :src="getFileUrl(item.imagepath)" />
-          </SwipeItem>
-        </Swipe>
-      </div>
-    </app-statusbar>
+    <div class="home-main__banner">
+      <Swipe :autoplay="5000" indicator-color="white" lazy-render>
+        <SwipeItem v-for="(item, index) in topBanners" :key="index">
+          <img :src="getFileUrl(item.imagepath)" />
+        </SwipeItem>
+      </Swipe>
+    </div>
     <PullRefresh class="home-main__container" v-model="refreshing" @refresh="onRefresh">
       <app-block>
         <Cell title="通知公告" value="更多" :to="{ name: 'notice-list' }" icon="volume" is-link />
@@ -130,7 +128,7 @@
         </CellGroup>
       </app-block>
     </PullRefresh>
-  </app-scroll-view>
+  </app-view>
 </template>
 
 <script lang="ts" setup>

src/packages/mobile/views/home/main/index.less

@@ -8,9 +8,11 @@
 
     &__banner {
         .van-swipe {
+            min-height: 3rem;
             background-color: #ddd;
 
             &-item {
+                height: 3rem;
                 font-size: 0;
 
                 img {
@@ -20,30 +22,6 @@
                 }
             }
         }
-
-        &--header {
-            margin-top: .28rem;
-
-            .van-swipe {
-                min-height: 3rem;
-                border-radius: .1rem;
-
-                &-item {
-                    height: 3rem;
-                }
-            }
-        }
-
-        &--body {
-            .van-swipe {
-                min-height: 1.5rem;
-                border-radius: .1rem;
-
-                &-item {
-                    height: 1.5rem;
-                }
-            }
-        }
     }
 
     &__iconbar {

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

@@ -44,7 +44,7 @@
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('1')">提现</Button>
-                    <Button type="primary" size="small" round @click="doInOutMoney('0')">充值</Button>
+                    <Button type="danger" size="small" round @click="doInOutMoney('0')">充值</Button>
                 </div>
             </div>
         </div>
@@ -114,7 +114,7 @@
             </CellGroup>
         </app-block>
         <div class="mine-footer">
-            <Button class="button-logout" type="primary" size="small" round @click="userLogout">退出登录</Button>
+            <Button class="button-logout" type="danger" size="small" round @click="userLogout">退出登录</Button>
         </div>
     </app-view>
 </template>

src/packages/mobile/views/order/delivery/components/offline/list/Index.vue

@@ -7,10 +7,9 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.goodsnamedisplay }}</h4>
-                        <span>{{ item.deliveryorderid }}</span>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderstatus }}</span>
+                        <span>{{ item.orderstatusdisplay }}</span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
@@ -36,7 +35,7 @@
                             <span>{{ item.deliveryinfo }}</span>
                         </li>
                         <li>
-                            <span>申请时间</span>
+                            <span>申请日期</span>
                             <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

src/packages/mobile/views/order/delivery/components/online/list/Index.vue

@@ -9,7 +9,7 @@
                         <h4>{{ item.wrtypename }}</h4>
                     </div>
                     <div class="right">
-                        <span>{{ item.deliveryid }}</span>
+                        <span>{{ item.warehousename }}</span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
@@ -31,11 +31,7 @@
                             <span>{{ item.remaintotalamount }}</span>
                         </li>
                         <li>
-                            <span>仓库</span>
-                            <span>{{ item.warehousename }}</span>
-                        </li>
-                        <li>
-                            <span>申请时间</span>
+                            <span>申请日期</span>
                             <span>{{ formatDate(item.deliverytime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

src/packages/mobile/views/order/delivery/components/spot/list/Index.vue

@@ -7,7 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.wrstandardname }}</h4>
-                        <span>{{ item.applyid }}</span>
+                        <span>{{ item.warehousename }}</span>
                     </div>
                     <div class="right">
                         <span>{{ getApplyStatusName(item.applystatus) }}</span>
@@ -24,11 +24,7 @@
                             <span>{{ item.appointmentmodeldisplay }}</span>
                         </li>
                         <li>
-                            <span>仓库</span>
-                            <span>{{ item.warehousename }}</span>
-                        </li>
-                        <li>
-                            <span>时间</span>
+                            <span>日期</span>
                             <span>{{ formatDate(item.applytime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

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

@@ -15,35 +15,31 @@
                                 <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
                             </div>
                             <div class="right">
-                                <span>{{ item.orderid }}</span>
+                                <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                             </div>
                         </div>
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>日期</span>
+                                    <span>委托日期</span>
                                     <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</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>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
-                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -9,35 +9,31 @@
                         <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderid }}</span>
+                        <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>日期：</span>
+                            <span>委托日期</span>
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>方向：</span>
+                            <span>方向</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>委托数量：</span>
+                            <span>委托数量</span>
                             <span>{{ formatDecimal(item.orderqty) }}</span>
                         </li>
                         <li>
-                            <span>委托价格：</span>
+                            <span>委托价格</span>
                             <span>{{ formatDecimal(item.orderprice) }}</span>
                         </li>
                         <li>
-                            <span>成交数量：</span>
+                            <span>成交数量</span>
                             <span>{{ formatDecimal(item.tradeqty) }}</span>
                         </li>
-                        <li>
-                            <span>委托状态：</span>
-                            <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
-                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

src/packages/mobile/views/order/list/components/goodstrade/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,27 +21,28 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>时间：</span>
-                                    <span>{{ formatDate(item.tradetime, 'YY/MM/DD HH:mm:ss') }}</span>
+                                    <span>成交日期</span>
+                                    <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                                 </li>
                                 <li>
-                                    <span>类型：</span>
-                                    <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell) }}</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>{{ item.charge}}</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>
                             </ul>
@@ -51,11 +52,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>

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

@@ -15,27 +15,27 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>日期：</span>
+                            <span>成交日期</span>
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</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>
                     </ul>

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

@@ -12,7 +12,11 @@
                     <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                         <div class="g-order-list__titlebar">
                             <div class="left">
-                                <h5>{{ item.deliverygoodscode }}/{{ item.deliverygoodsname }}</h5>
+                                <h4>{{ item.deliverygoodscode }}/{{ item.deliverygoodsname }}</h4>
+                                <span>{{ item.warehousename }}</span>
+                            </div>
+                            <div class="right">
+                                <span>{{ getWRTradeOrderStatusName(item.wrtradeorderstatus) }}</span>
                             </div>
                         </div>
                         <div class="g-order-list__content">
@@ -37,18 +41,6 @@
                                     <span>成交数量：</span>
                                     <span>{{ formatDecimal(item.tradeqty) }}</span>
                                 </li>
-                                <li>
-                                    <span>仓库：</span>
-                                    <span>{{ item.warehousename }}</span>
-                                </li>
-                                <li>
-                                    <span>委托状态：</span>
-                                    <span>{{ getWRTradeOrderStatusName(item.wrtradeorderstatus) }}</span>
-                                </li>
-                                <li>
-                                    <span>单号：</span>
-                                    <span>{{ item.wrtradeorderid }}</span>
-                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">

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

@@ -7,7 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.deliverygoodscode }}/{{ item.deliverygoodsname }}</h4>
-                        <span>{{ item.wrtradeorderid }}</span>
+                        <span>{{ item.warehousename }}</span>
                     </div>
                     <div class="right">
                         <span>{{ getWRTradeOrderStatusName(item.wrtradeorderstatus) }}</span>
@@ -35,10 +35,6 @@
                             <span>成交数量</span>
                             <span>{{ formatDecimal(item.tradeqty) }}</span>
                         </li>
-                        <li>
-                            <span>仓库</span>
-                            <span>{{ item.warehousename }}</span>
-                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -6,13 +6,14 @@
                 <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">
                             <div class="left">
-                                <h5>{{ item.deliverygoodscode }}/{{ item.deliverygoodsname }}</h5>
+                                <h4>{{ item.deliverygoodscode }}/{{ item.deliverygoodsname }}</h4>
+                                <span>{{ item.warehousename }}</span>
                             </div>
                         </div>
                         <div class="g-order-list__content">
@@ -35,15 +36,7 @@
                                 </li>
                                 <li>
                                     <span>成交金额：</span>
-                                    <span>{{ formatDecimal(item.tradeprice*item.tradeqty) }}</span>
-                                </li>
-                                <li>
-                                    <span>仓库：</span>
-                                    <span>{{ item.warehousename }}</span>
-                                </li>
-                                <li>
-                                    <span>成交单号：</span>
-                                    <span>{{ item.wrtradedetailid }}</span>
+                                    <span>{{ formatDecimal(item.tradeprice * item.tradeqty) }}</span>
                                 </li>
                             </ul>
                         </div>
@@ -52,11 +45,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>

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

@@ -7,7 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.deliverygoodscode }}/{{ item.deliverygoodsname }}</h4>
-                        <span>{{ item.wrtradedetailid }}</span>
+                        <span>{{ item.warehousename }}</span>
                     </div>
                     <div class="right">
                         <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
@@ -31,10 +31,6 @@
                             <span>成交金额</span>
                             <span>{{ formatDecimal(item.tradeprice * item.tradeqty) }}</span>
                         </li>
-                        <li>
-                            <span>仓库</span>
-                            <span>{{ item.warehousename }}</span>
-                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

src/packages/mobile/views/order/list/components/presale/history/index.vue

@@ -16,7 +16,6 @@
                         <div class="g-order-list__titlebar">
                             <div class="left">
                                 <h4>{{ item.goodsname }}</h4>
-                                <span>{{ item.orderid }}</span>
                             </div>
                             <div class="right">
                                 <span>{{ getOrderStatusName(item.orderstatus) }}</span>
@@ -57,7 +56,7 @@
                                     <span>{{ handleNumberValue(item.tradeqty) }}</span>
                                 </li>
                                 <li>
-                                    <span>日期</span>
+                                    <span>委托日期</span>
                                     <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

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

@@ -7,7 +7,6 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.goodsname }}</h4>
-                        <span>{{ item.orderid }}</span>
                     </div>
                     <div class="right">
                         <span>{{ getOrderStatusName(item.orderstatus) }}</span>
@@ -48,7 +47,7 @@
                             <span>{{ handleNumberValue(item.tradeqty) }}</span>
                         </li>
                         <li>
-                            <span>日期</span>
+                            <span>委托日期</span>
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

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

@@ -6,38 +6,34 @@
             <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-order-list__titlebar">
                     <div class="left">
-                        <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
+                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderid }}</span>
+                        <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                     </div>
                 </div>
                 <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>
+                            <span>方向</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>委托数量：</span>
+                            <span>委托数量</span>
                             <span>{{ formatDecimal(item.orderqty) }}</span>
                         </li>
                         <li>
-                            <span>委托价格：</span>
+                            <span>委托价格</span>
                             <span>{{ formatDecimal(item.orderprice) }}</span>
                         </li>
                         <li>
-                            <span>成交数量：</span>
+                            <span>成交数量</span>
                             <span>{{ formatDecimal(item.tradeqty) }}</span>
                         </li>
-                        <li>
-                            <span>委托状态：</span>
-                            <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
-                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -6,36 +6,33 @@
             <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-order-list__titlebar">
                     <div class="left">
-                        <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
-                    </div>
-                    <div class="right">
-                        <span>{{ item.tradeid }}</span>
+                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
                     </div>
                 </div>
                 <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>
+                            <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>{{ formatDecimal(item.charge)}}</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>
                     </ul>

src/packages/mobile/views/order/list/components/swaporder/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">
@@ -15,7 +15,7 @@
                                 <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
                             </div>
                             <div class="right">
-                                <span>{{ item.orderid }}</span>
+                                <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                             </div>
                         </div>
                         <div class="g-order-list__content">
@@ -34,16 +34,12 @@
                                 </li>
                                 <li>
                                     <span>委托价格：</span>
-                                    <span>{{ item.orderprice}}</span>
+                                    <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
                                     <span>成交数量：</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
-                                <li>
-                                    <span>委托状态：</span>
-                                    <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
-                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
@@ -51,11 +47,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>

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

@@ -6,10 +6,10 @@
             <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-order-list__titlebar">
                     <div class="left">
-                        <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
+                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderid }}</span>
+                        <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
@@ -34,10 +34,6 @@
                             <span>成交数量：</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
-                        <li>
-                            <span>委托状态：</span>
-                            <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
-                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -6,16 +6,13 @@
                 <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">
                             <div class="left">
-                                <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
-                            </div>
-                            <div class="right">
-                                <span>{{ item.tradeid }}</span>
+                                <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
                             </div>
                         </div>
                         <div class="g-order-list__content">
@@ -26,7 +23,8 @@
                                 </li>
                                 <li>
                                     <span>类型：</span>
-                                    <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell) }}</span>
+                                    <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell)
+                                    }}</span>
                                 </li>
                                 <li>
                                     <span>成交价格：</span>
@@ -34,7 +32,7 @@
                                 </li>
                                 <li>
                                     <span>手续费：</span>
-                                    <span>{{ item.charge}}</span>
+                                    <span>{{ item.charge }}</span>
                                 </li>
                                 <li>
                                     <span>成交数量：</span>
@@ -51,11 +49,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>

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

@@ -6,10 +6,7 @@
             <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-order-list__titlebar">
                     <div class="left">
-                        <h5>{{ item.goodscode }}/{{ item.goodsname }}</h5>
-                    </div>
-                    <div class="right">
-                        <span>{{ item.tradeid }}</span>
+                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
                     </div>
                 </div>
                 <div class="g-order-list__content">
@@ -28,7 +25,7 @@
                         </li>
                         <li>
                             <span>手续费：</span>
-                            <span>{{ formatDecimal(item.charge)}}</span>
+                            <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
                             <span>成交数量：</span>

src/packages/mobile/views/order/list/components/transferorder/history/index.vue

@@ -16,6 +16,8 @@
                         <div class="g-order-list__titlebar">
                             <div class="left">
                                 <h4>{{ item.goodsname }}</h4>
+                            </div>
+                            <div class="right">
                                 <span>{{ item.orderid }}</span>
                             </div>
                         </div>

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

@@ -7,7 +7,6 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.goodsname }}</h4>
-                        <span>{{ item.orderid }}</span>
                     </div>
                     <div class="right">
                         <span>{{ getOrderStatusName(item.orderstatus) }}</span>

src/packages/mobile/views/order/list/components/transfertrade/history/index.vue

@@ -16,7 +16,6 @@
                         <div class="g-order-list__titlebar">
                             <div class="left">
                                 <h4>{{ item.goodsname }}</h4>
-                                <span>{{ item.orderid }}</span>
                             </div>
                             <div class="right">
                                 <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
@@ -41,7 +40,7 @@
                                     <span>{{ handleNumberValue(item.closepl) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交时间</span>
+                                    <span>成交日期</span>
                                     <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

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

@@ -7,7 +7,6 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.goodsname }}</h4>
-                        <span>{{ item.orderid }}</span>
                     </div>
                     <div class="right">
                         <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
@@ -32,7 +31,7 @@
                             <span>{{ handleNumberValue(item.closepl) }}</span>
                         </li>
                         <li>
-                            <span>成交时间</span>
+                            <span>成交日期</span>
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

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

@@ -40,7 +40,8 @@
                         </li>
                         <li>
                             <span>参考损益：</span>
-                            <span :class="closepl(item) ? 'g-price-up' : 'g-price-down'">{{ closepl(item) }}</span>
+                            <span :class="closepl(item) ? 'g-price-up' : 'g-price-down'">{{ formatDecimal(closepl(item))
+                            }}</span>
                         </li>
                     </ul>
                 </div>

src/packages/mobile/views/order/position/components/spot/list/Index.vue

@@ -7,6 +7,7 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.wrstandardname }}</h4>
+                        <span>{{ item.warehousename }}</span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
@@ -23,10 +24,6 @@
                             <span>可用量</span>
                             <span>{{ item.enableqty }}</span>
                         </li>
-                        <li>
-                            <span>仓库</span>
-                            <span>{{ item.warehousename }}</span>
-                        </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">

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

@@ -39,7 +39,9 @@
                         </li>
                         <li>
                             <span>参考损益：</span>
-                            <span :class="closepl(item) ? 'g-price-up' : 'g-price-down'">{{ closepl(item) }}</span>
+                            <span :class="closepl(item) ? 'g-price-up' : 'g-price-down'">
+                                {{ formatDecimal(closepl(item)) }}
+                            </span>
                         </li>
                     </ul>
                 </div>

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

@@ -4,6 +4,11 @@
             <app-navbar title="掉期贸易" />
         </template>
         <app-list :columns="columns" :data-list="tableList" @row-click="rowClick">
+            <!-- 商品/标的 -->
+            <template #goodsname="{ row }">
+                <span>{{ row.goodsname }}</span>
+                <span class="text-small">{{ row.goodscode }}</span>
+            </template>
             <!-- 当前价 -->
             <template #last="{ row }">
                 <span :class="row.lastColor">{{ row.last }}</span>

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

@@ -4,8 +4,10 @@
             <app-navbar title="订单转让" :show-back-button="false" />
         </template>
         <app-list :columns="columns" :data-list="dataList" @row-click="rowClick">
+            <!-- 商品名称/代码 -->
             <template #goodscode="{ row }">
-                {{ row.goodscode }}/{{ row.goodsname }}
+                <span>{{ row.goodsname }}</span>
+                <span class="text-small">{{ row.goodscode }}</span>
             </template>
         </app-list>
     </app-view>
@@ -38,7 +40,7 @@ const goodsCodes = dataList.value.map((e) => e.goodscode.toUpperCase())
 const subscribe = quoteSocket.addSubscribe(goodsCodes)
 
 const columns: Model.TableColumn[] = [
-    { prop: 'goodscode', label: '商品代码/名称' },
+    { prop: 'goodscode', label: '商品名称/代码' },
     { prop: 'last', label: '最新价' },
     { prop: 'ask', label: '卖价' },
     { prop: 'askvolume', label: '卖量' },

src/stores/modules/futures.ts

@@ -127,7 +127,15 @@ export const useFuturesStore = defineStore(() => {
                 limitdown,
                 quoteminunit,
                 bidColor: handleColor(bid),
+                bid2Color: handleColor(bid2),
+                bid3Color: handleColor(bid3),
+                bid4Color: handleColor(bid4),
+                bid5Color: handleColor(bid5),
                 askColor: handleColor(ask),
+                ask2Color: handleColor(ask2),
+                ask3Color: handleColor(ask3),
+                ask4Color: handleColor(ask4),
+                ask5Color: handleColor(ask5),
                 lastColor: handleColor(last),
                 openedColor: handleColor(opened),
                 highestColor: handleColor(highest),

src/types/model/market.d.ts

@@ -111,7 +111,15 @@ declare namespace Model {
         highest: number; // 最高
         lowest: number; // 最低
         bidColor: string;// 买价颜色
+        bid2Color: string;// 买价颜色
+        bid3Color: string;// 买价颜色
+        bid4Color: string;// 买价颜色
+        bid5Color: string;// 买价颜色
         askColor: string;// 卖价颜色
+        ask2Color: string;// 卖价颜色
+        ask3Color: string;// 卖价颜色
+        ask4Color: string;// 卖价颜色
+        ask5Color: string;// 卖价颜色
         lastColor: string;// 最新价颜色
         openedColor: string;// 开盘颜色
         highestColor: string;// 最高颜色