Handy_Cao 1 year ago
parent
commit
327e548fb0

+ 1 - 1
src/packages/mobile/views/order/position/Index.vue

@@ -60,7 +60,7 @@ const components = [
         name: 'pricing',
         title: t('position.pricing.title'),
         component: defineAsyncComponent(() => import('./components/pricing/list/Index.vue')),
-        detail: defineAsyncComponent(() => import('./components/pricing/detail/Index.vue')),
+        detail: defineAsyncComponent(() => import('./components/pricing/detail2/Index.vue')),
     },
 ]
 

+ 13 - 2
src/packages/pc/views/account/sign/index.vue

@@ -21,6 +21,10 @@
         <template #signstatus="{ value }">
             {{ getSignStatusName(value) }}
         </template>
+        <!-- 状态 -->
+        <template #updatetime="{ value }">
+            {{ formatDate(value) }}
+        </template>
         <!-- 展开行 -->
         <template #expand="{ row }">
             <div class="buttonbar">
@@ -53,6 +57,7 @@ import { queryMdUserSwapProtocol } from '@/services/api/swap'
 import { getUserId, getMemberUserId } from '@/services/methods/user'
 import AppTable from '@pc/components/base/table/index.vue'
 import service from '@/services'
+import { formatDate } from '@/filters'
 
 const componentMap = new Map<string, unknown>([
     ['cancel', defineAsyncComponent(() => import('./components/cancel/index.vue'))],
@@ -68,13 +73,18 @@ const signStatus = shallowRef(SignStatus.Unsigned)
 const cusBank = shallowRef<Model.CusBankSignBankRsp>()
 const oem = service.getConfig('oem')
 const { t } = i18n.global
+const dataList = shallowRef<Model.BankAccountSignRsp[]>()
 
 const { rowKey, expandKeys, rowClick, selectedRow } = useComposeTable<Model.BankAccountSignRsp>({ rowKey: 'applyexchticket' })
-const { loading, dataList, run } = useRequest(queryBankAccountSign, {
+// 需求 #5692: 交易系统通用问题2024
+const { loading, run } = useRequest(queryBankAccountSign, {
     onSuccess: (res) => {
         /// 签约状态
         if (res.data.length != 0) {
-            signStatus.value = res.data[0].signstatus
+            dataList.value = res.data.sort((a, b) => {
+                return b.updatetime.localeCompare(a.updatetime)
+            }).slice(0, 1)
+            signStatus.value = dataList.value[0].signstatus
         }
     }
 })
@@ -162,6 +172,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'currency', label: 'banksign.currency' },
     { field: 'signstatus', label: 'banksign.signstatus' },
     { field: 'remark', label: 'banksign.remark' },
+    { field: 'updatetime', label: 'banksign.remark' },
 ])
 
 onMounted(() => {