update

src/components/base/modal/index.vue

@@ -80,18 +80,16 @@ export default defineComponent({
 
         const containerStyles = computed(() => {
             const getWidth = () => {
-                const width = props.width.toString();
-                if (width.endsWith('%')) {
-                    return width;
+                if (typeof props.width === 'number') {
+                    return props.width + 'px';
                 }
-                return width === 'auto' ? width : width + 'px';
+                return props.width;
             }
             const getHeight = () => {
-                const height = props.height.toString();
-                if (height.endsWith('%')) {
-                    return height;
+                if (typeof props.height === 'number') {
+                    return props.height + 'px';
                 }
-                return height === 'auto' ? height : height + 'px';
+                return props.height;
             }
             return {
                 ...transitionStyles.value,

src/hooks/component/index.ts

@@ -1,6 +1,7 @@
 import { ref, Ref, onUnmounted } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 import { v4 } from 'uuid'
+import { useLoginStore } from '@/stores'
 
 // 缓存已打开的组件实例
 const componentInstanceMap = new Map<string, Ref>()
@@ -12,6 +13,7 @@ const componentInstanceMap = new Map<string, Ref>()
  * @returns 
  */
 export function useComponent(callback?: (componentName?: string) => void, routeListener = true) {
+    const loginStore = useLoginStore()
     const uuid = v4()
     const components = new Set<string>() // 已打开的组件列表
     const componentId = ref<string>() // 当前显示的组件
@@ -84,10 +86,15 @@ export function useComponent(callback?: (componentName?: string) => void, routeL
      * 路由守卫，离开页面前关闭组件
      */
     onBeforeRouteLeave((to, from, next) => {
-        if (closeComponentEach()) {
-            next()
+        if ((to.meta.ignoreAuth && from.meta.ignoreAuth) || loginStore.token) {
+            if (closeComponentEach()) {
+                next()
+            } else {
+                next(false)
+            }
         } else {
-            next(false)
+            components.clear()
+            next()
         }
     })
 

src/packages/mobile/components/modules/contact/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-address :show-radio="true" @change="onChange" />
     </app-modal>
 </template>

src/packages/mobile/components/modules/delivery/index.vue

@@ -1,6 +1,6 @@
 <!-- 交收操作 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="交收" @back="closed" />

src/packages/mobile/components/modules/delivery/warehouse-receipt.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%">
+    <app-modal direction="right-top" height="100%">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="选择点选仓单" @back="closed" />

src/packages/mobile/components/modules/performance/list/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="app-performance">
             <template #header>
                 <app-navbar title="履约模板" @back="showModal = false" />

src/packages/mobile/components/modules/receipt/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-invoice :show-radio="true" @change="onChange" />
     </app-modal>
 </template>

src/packages/mobile/router/animateRouter.ts

@@ -115,10 +115,10 @@ export default new (class {
         // 如果是替换动作，必定是前进
         if (actionName.value === 'replace') {
             const lastIndex = historyRoutes.value.length - 1
-            const lastView = historyRoutes.value[lastIndex]
+            const lastRecord = historyRoutes.value[lastIndex]
 
-            if (lastView) {
-                excludeViews.value.push(lastView.name as string)
+            if (lastRecord) {
+                excludeViews.value.push(lastRecord.name as string)
                 historyRoutes.value[lastIndex] = newRoute // 更新最后一条记录
             } else {
                 historyRoutes.value.push(newRoute)
@@ -167,6 +167,10 @@ export default new (class {
                         historyRoutes.value[lastIndex] = newRoute // 更新最后一条记录
                         transitionName.value = 'route-out' //后退动画
                     } else {
+                        const [lastRecord] = historyRoutes.value.slice(-1)
+                        if (route.redirectedFrom.fullPath !== lastRecord?.fullPath) {
+                            historyRoutes.value.push(newRoute)
+                        }
                         transitionName.value = 'route-in' // 前进动画
                     }
                 } else {

src/packages/mobile/views/bank/capital/statement/history/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="bank-hisstatement">
             <template #header>
                 <app-navbar title="历史资金流水" @back="closed">

src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar :title="isedit ? '修改签约账户' : '添加签约账户'" @back="closed" />

src/packages/mobile/views/bank/sign/components/edit/search/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="查询支行">

src/packages/mobile/views/bank/wallet/components/inoutapply/Index.vue

@@ -1,6 +1,6 @@
 <!-- 出入金- 申请流水 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="申请流水" @back="closed" />

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

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="goods-listing g-form">
             <template #header>
                 <app-navbar :title="quote ? `${quote.goodscode}/${quote.goodsname}` : '挂牌'" @back="closed" />

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

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="goods-delisting g-form">
             <template #header>
                 <app-navbar :title="quote ? `${quote.goodscode}/${quote.goodsname}` : '摘牌'" @back="closed" />

src/packages/mobile/views/mine/address/components/edit/Index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <template #default="{ animation }">
             <app-view class="g-form">
                 <template #header>

src/packages/mobile/views/mine/invoice/components/edit/Index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar :title="selectedRow.autoid ? '修改发票信息' : '新增发票信息'" @back="closed">

src/packages/mobile/views/notice/list/components/detail/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="notice-detail">
             <template #header>
                 <app-navbar title="公告详情" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 交收提货-线下交收单-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="线下交收单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 交收提货-点选交收单-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="点选交收单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 交收提货-现货提货单-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="现货提货单" @back="closed" />

src/packages/mobile/views/order/inout/components/add/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="新增" @back="closed" />

src/packages/mobile/views/order/inout/components/add/search/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="选择客户">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 订单委托 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单委托单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 订单订单 - 委托 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史订单委托" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 订单成交 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单成交单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 订单订单 - 成交 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史订单成交" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 挂牌委托 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="挂牌委托单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 历史挂牌订单 - 委托 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史挂牌委托" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 挂牌成交 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="挂牌成交单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 历史挂牌订单 - 成交 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史挂牌成交" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单-预售认购-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="预售认购单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单-预售认购-历史 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史预售认购" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 订单委托 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="详细" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 点价成交 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="详细" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 掉期委托 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="掉期委托单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 历史掉期订单 - 委托 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史掉期委托" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 掉期成交 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="掉期成交单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单- 历史掉期订单 - 成交 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史掉期成交" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单-转让委托-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让委托单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单-转让委托-历史 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史转让委托" @back="closed">

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

@@ -1,6 +1,6 @@
 <!-- 我的订单-转让成交-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让成交单" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的订单-转让成交-历史 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="历史转让成交" @back="closed">

src/packages/mobile/views/order/performance/components/breach/Index.vue

@@ -1,6 +1,6 @@
 <!-- 我的订单- 我的履约 - 违约申请 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="违约申请 " @back="closed" />

src/packages/mobile/views/order/performance/components/detail/Index.vue

@@ -1,6 +1,6 @@
 <!-- 我的订单- 我的履约 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="履约详情" @back="closed" />

src/packages/mobile/views/order/performance/components/modify/Index.vue

@@ -1,6 +1,6 @@
 <!-- 我的订单- 我的履约 - 修改 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar :title="selectedRow.buyorsell === 0 ? '买方信息' : '卖方信息'" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓- 订单持仓 - 转让 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让" @back="closed" />

src/packages/mobile/views/order/position/components/goods/delivery50/index.vue

@@ -1,6 +1,6 @@
 <!-- 我的订单- 订单持仓 - 交收 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="交收" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓-订单明细 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单明细" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓- 明细 - 转让 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓-预售持仓-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="预售持仓详情" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓-现货持仓-挂牌 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="挂牌" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓-现货持仓-提货 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <template #default="{ animation }">
             <app-view class="g-form">
                 <template #header>

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓- 掉期持仓 - 平仓 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="掉期持仓-明细" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓-转让持仓-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让持仓详情" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 我的持仓-转让持仓-转让 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让" @back="closed" />

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

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view>
             <template #header>
                 <app-navbar title="出入金明细" @back="closed" />

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

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view>
             <template #header>
                 <app-navbar title="持仓汇总" @back="closed" />

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

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view>
             <template #header>
                 <app-navbar title="成交明细" @back="closed" />

src/packages/mobile/views/spot/add/components/buy/warehouse-receipt.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%">
+    <app-modal direction="right-top" height="100%">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="选择现货仓单" @back="closed" />

src/packages/mobile/views/transfer/delisting/components/delisting/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="买入" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 定金转让-挂牌 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="挂牌" @back="closed" />

src/packages/pc/components/layouts/header/components/notice/index.less

@@ -17,6 +17,7 @@
         display: flex;
 
         &__item {
+            width: 120px;
             border-right: 1px solid #263749;
 
             ul {

src/packages/pc/components/layouts/header/components/setting/index.vue

@@ -1,6 +1,6 @@
 <!-- 快捷设置 -->
 <template>
-    <app-drawer title="快捷设置" width="800" v-model:show="show">
+    <app-drawer title="快捷设置" :width="800" v-model:show="show">
         <fieldset class="g-fieldset">
             <legend class="g-fieldset__legend">下单设置</legend>
             <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData">

src/packages/pc/components/layouts/header/index.vue

@@ -55,7 +55,7 @@ const componentMap = new Map<string, unknown>([
     ['setting', defineAsyncComponent(() => import('./components/setting/index.vue'))],
 ])
 
-const { componentId, openComponent, closeComponent } = useComponent(undefined, false)
+const { componentId, openComponent, closeComponent } = useComponent()
 const loginStore = useLoginStore()
 const globalStore = useGlobalStore()
 const userStore = useUserStore()

src/packages/pc/views/system/menu/components/edit/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-drawer class="system-menu-edit" title="编辑" width="680" v-model:show="show">
+    <app-drawer class="system-menu-edit" title="编辑" :width="680" v-model:show="show">
         <template #default>
             <el-form label-width="90px" :model="form">
                 <el-form-item label="权限类型" prop="authType" required>

src/packages/pc/views/system/role/components/auth/index.vue

@@ -1,6 +1,6 @@
 <!-- 账号权限 -->
 <template>
-    <app-drawer class="role-auth" title="权限设置" width="680" v-model:show="show">
+    <app-drawer class="role-auth" title="权限设置" :width="680" v-model:show="show">
         <el-breadcrumb separator-icon="ArrowRight">
             <el-breadcrumb-item>当前角色</el-breadcrumb-item>
             <el-breadcrumb-item>{{ selectedRow.roleName }}</el-breadcrumb-item>

src/packages/qxst/views/account/certification/components/certification-next/Index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="实名认证" @back="closed" />

src/packages/sbyj/views/delivery/components/processing/components/files/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="bank-statement">
             <template #header>
                 <app-navbar title="货款明细">

src/packages/sbyj/views/delivery/components/processing/components/pay-detail/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="bank-statement">
             <template #header>
                 <app-navbar title="货款明细" @back="closed" />

src/packages/sbyj/views/delivery/components/processing/components/pay/index.vue

@@ -1,6 +1,6 @@
 <!-- 我的交收 - 付款 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view>
             <template #header>
                 <app-navbar title="交料付款" @back="closed" />

src/packages/sbyj/views/delivery/detail/file-list/index.vue

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵-我的交收-详情-文件列表 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="文件列表" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵-我的交收-详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="交料详情" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵-我的交收-详情-订单明细 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单明细" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵 - 我的订单 - 详情 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单详情" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵-我的订单-转让 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单终止" @back="closed" />

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

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵-我的订单-交收 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="交料申请" @back="closed" />

src/packages/sbyj/views/order/list/components/supplement-deposit/index.vue

@@ -1,6 +1,6 @@
 <!-- 水贝亿爵-我的订单-补充（订金） -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
+    <app-modal direction="right-top" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="补充订金" @back="closed" />