li.shaoyi пре 2 година
родитељ
комит
e5c8a51914

+ 1 - 1
src/packages/pc/components/layouts/footer/index.less

@@ -1,6 +1,6 @@
 .app-footer {
 .app-footer {
     display: flex;
     display: flex;
-    height: 280px;
+    height: 300px;
     color: #fff;
     color: #fff;
     background-color: #0e0e0f;
     background-color: #0e0e0f;
     border-top: 1px solid #363f45;
     border-top: 1px solid #363f45;

+ 3 - 3
src/packages/pc/components/layouts/footer/index.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-    <div class="app-footer" v-if="accountComputedList.length">
+    <div class="app-footer" v-if="accountList.length">
         <div class="app-footer__left" v-if="false">
         <div class="app-footer__left" v-if="false">
             <div>{{ currentAccount.accountid }}</div>
             <div>{{ currentAccount.accountid }}</div>
             <table>
             <table>
@@ -36,7 +36,7 @@
             <app-auth-component code="bottom">
             <app-auth-component code="bottom">
                 <el-select placeholder="请选择资金账户" :disabled="loading" v-model="currentAccountId" @change="onAccountChange"
                 <el-select placeholder="请选择资金账户" :disabled="loading" v-model="currentAccountId" @change="onAccountChange"
                     v-if="false">
                     v-if="false">
-                    <el-option :label="item.accountid" :value="item.accountid" v-for="(item, index) in accountComputedList"
+                    <el-option :label="item.accountid" :value="item.accountid" v-for="(item, index) in accountList"
                         :key="index" />
                         :key="index" />
                 </el-select>
                 </el-select>
             </app-auth-component>
             </app-auth-component>
@@ -52,7 +52,7 @@ import { useAccountStore } from '@/stores'
 import AppAuthComponent from '@pc/components/modules/auth-component/index.vue'
 import AppAuthComponent from '@pc/components/modules/auth-component/index.vue'
 import AppListing from '@pc/components/modules/listing/index.vue'
 import AppListing from '@pc/components/modules/listing/index.vue'
 
 
-const { accountComputedList, currentAccount, currentAccountId, loading, getAccountPositionList } = useAccountStore()
+const { accountList, currentAccount, currentAccountId, loading, getAccountPositionList } = useAccountStore()
 
 
 // 切换资金账户
 // 切换资金账户
 const onAccountChange = () => {
 const onAccountChange = () => {

+ 4 - 2
src/packages/pc/components/modules/quote/forex/index.vue

@@ -121,17 +121,19 @@ const sellList = computed(() => {
 
 
 const onBuyClick = (index: number) => {
 const onBuyClick = (index: number) => {
     if (attrs.onBuyClick) {
     if (attrs.onBuyClick) {
+        const { bid, presettle } = quote.value ?? {}
         const item = buyList.value[index]
         const item = buyList.value[index]
         active.value = 'buy_' + index
         active.value = 'buy_' + index
-        emit('buyClick', item.price || quote.value?.bid)
+        emit('buyClick', item.price || bid || presettle)
     }
     }
 }
 }
 
 
 const onSellClick = (index: number) => {
 const onSellClick = (index: number) => {
     if (attrs.onSellClick) {
     if (attrs.onSellClick) {
+        const { ask, presettle } = quote.value ?? {}
         const item = sellList.value[index]
         const item = sellList.value[index]
         active.value = 'sell_' + index
         active.value = 'sell_' + index
-        emit('sellClick', item.price || quote.value?.ask)
+        emit('sellClick', item.price || ask || presettle)
     }
     }
 }
 }
 
 

+ 1 - 1
src/packages/pc/router/index.ts

@@ -16,7 +16,7 @@ const routes: Array<RouteRecordRaw> = [
         name: 'login',
         name: 'login',
         component: () => import('../views/auth/login/index.vue'),
         component: () => import('../views/auth/login/index.vue'),
         meta: {
         meta: {
-            title: "登",
+            title: "登",
             keepAlive: false
             keepAlive: false
         },
         },
     },
     },

+ 1 - 1
src/packages/pc/views/footer/capital/summary/index.vue

@@ -38,7 +38,7 @@ const { selectedRow, rowKey, expandKeys, rowClick } = useComposeTable<Model.TaAc
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'accountid', label: '资金账号', decimal: 2 },
+    { prop: 'accountid', label: '资金账号', width: 160 },
     { prop: 'balance', label: '期初余额', decimal: 2 },
     { prop: 'balance', label: '期初余额', decimal: 2 },
     { prop: 'currentbalance', label: '期末余额', decimal: 2 },
     { prop: 'currentbalance', label: '期末余额', decimal: 2 },
     { prop: 'avaiableMoney', label: '可用资金', decimal: 2 },
     { prop: 'avaiableMoney', label: '可用资金', decimal: 2 },