update

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trading",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

oem/gcszt/config/router.json

@@ -156,7 +156,7 @@
                         "sort": 3,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/order/presell/index.vue",
                         "hidden": true,
@@ -258,7 +258,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/trade/presell/index.vue",
                         "hidden": true,

oem/gzcj/config/router.json

@@ -174,7 +174,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/order/presell/index.vue",
                         "children": [
@@ -299,7 +299,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/trade/presell/index.vue",
                         "children": [

oem/nhgj/config/router.json

@@ -174,7 +174,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/order/presell/index.vue",
                         "children": [
@@ -299,7 +299,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/trade/presell/index.vue",
                         "children": [

oem/qdhs/config/router.json

@@ -356,7 +356,7 @@
                         "sort": 3,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "hidden": true,
                         "component": "views/query/order/presell/index.vue",
@@ -458,7 +458,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "hidden": true,
                         "component": "views/query/trade/presell/index.vue",

oem/qxst/config/router.json

@@ -159,7 +159,7 @@
                         "sort": 3,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/order/presell/index.vue",
                         "hidden": true,
@@ -261,7 +261,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/trade/presell/index.vue",
                         "hidden": true,

oem/tc/config/router.json

@@ -241,7 +241,7 @@
                         "sort": 3,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/order/presell/index.vue",
                         "children": [
@@ -316,7 +316,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/trade/presell/index.vue",
                         "children": [

oem/zrwyt/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.zrwyt",
   "appName": "中融文遗通",
-  "version": "1.0.34",
-  "versionCode": "100034",
+  "version": "1.0.35",
+  "versionCode": "100035",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

oem/zrwyt2/config/router.json

@@ -303,7 +303,7 @@
                         "sort": 3,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "hidden": true,
                         "component": "views/query/order/presell/index.vue",
@@ -379,7 +379,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "hidden": true,
                         "component": "views/query/trade/presell/index.vue",

public/config/router.json

@@ -331,7 +331,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_order_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/order/presell/index.vue",
                         "children": [
@@ -456,7 +456,7 @@
                         "sort": 2,
                         "title": "预售转让",
                         "code": "query_trade_presell",
-                        "url": "spot",
+                        "url": "presell",
                         "urlType": 1,
                         "component": "views/query/trade/presell/index.vue",
                         "children": [

src/packages/mobile/components/base/calendar/index.vue

@@ -23,7 +23,7 @@ const props = defineProps({
     },
     type: {
         type: String as PropType<CalendarType>,
-        default: 'range'
+        default: 'single'
     },
     defaultDate: {
         type: Array as PropType<Date[]>,

src/packages/mobile/components/base/pull-refresh/index.vue

@@ -1,7 +1,8 @@
 <template>
     <PullRefresh class="app-pull-refresh" v-model="refreshing" @refresh="onRefresh">
         <slot name="header"></slot>
-        <List ref="listRef" v-model:loading="showLoading" v-model:error="showError" :finished="finished" @load="onLoad">
+        <List ref="listRef" v-model:loading="showLoading" v-model:error="showError" :finished="finished"
+            :immediate-check="immediateCheck" @load="onLoad">
             <slot></slot>
             <template #finished>
                 <span>{{ finishedText }}</span>
@@ -31,6 +32,11 @@ const props = defineProps({
         type: Number,
         default: 1,
     },
+    // 是否在初始化时立即执行滚动位置检查
+    immediateCheck: {
+        type: Boolean,
+        default: true,
+    },
     error: {
         type: Boolean,
         default: false,
@@ -48,7 +54,7 @@ const props = defineProps({
 const emit = defineEmits(['update:loading', 'update:pageIndex', 'update:error', 'refresh'])
 const listRef = shallowRef<ListInstance>()
 const refreshing = shallowRef(false) // 是否处于下拉加载状态
-const finished = shallowRef(false) // 是否已加载完成所有数据
+const finished = shallowRef(!props.immediateCheck) // 是否已加载完成所有数据
 const currentPage = shallowRef(props.pageIndex)
 
 const showLoading = computed({

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

@@ -4,7 +4,7 @@
             <template #header>
                 <app-navbar title="历史资金流水" @back="closed">
                     <template #footer>
-                        <app-calendar type="single" :default-date="[currentDate]" @confirm="onConfirm">
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm">
                             <app-select v-model="operatetype" :options="operateTypeSearchList"
                                 :optionProps="{ label: 'label', value: 'value' }" @confirm="onSelectConfirm">
                                 <template #default="{ label }">
@@ -16,7 +16,7 @@
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <app-list class="bank-hisstatement__table" :columns="columns" :data-list="dataList">
                     <template #createtime="{ value }">
                         <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史点选交收单" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -58,7 +58,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryWrDeliveryDetail } from '@/services/api/transfer'
 import { formatDate } from '@/filters'
@@ -74,7 +74,7 @@ const selectedRow = shallowRef<Model.WrDeliveryDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -103,17 +103,18 @@ const showComponent = (componentName: string, row: Model.WrDeliveryDetailRsp) =>
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [startDate, endDate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        begindate: startDate,
-        enddate: endDate,
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史订单委托" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -25,8 +25,9 @@
                             <ul>
                                 <li>
                                     <span>方向类型</span>
-                                    <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype)
-                                        }}</span>
+                                    <span>
+                                        {{ getBuyOrSellName(item.buyorsell) + getBuildTypeName(item.buildtype) }}
+                                    </span>
                                 </li>
                                 <li>
                                     <span>委托量</span>
@@ -59,7 +60,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuyOrSellName, getWRTradeOrderStatusName, getBuildTypeName } from '@/constants/order'
@@ -76,7 +77,7 @@ const selectedRow = shallowRef<Model.HisTradeOrderDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -110,17 +111,18 @@ const showComponent = (componentName: string, row: Model.HisTradeOrderDetailRsp)
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [startDate, endDate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYY-MM-DD')
     run({
-        startDate,
-        endDate,
+        startDate: dateValue,
+        endDate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史订单成交" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -25,8 +25,9 @@
                             <ul>
                                 <li>
                                     <span>类型</span>
-                                    <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell)
-                                    }}</span>
+                                    <span>
+                                        {{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}
+                                    </span>
                                 </li>
                                 <li>
                                     <span>成交价格</span>
@@ -63,7 +64,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeDetail } from '@/services/api/order'
 import { getBuyOrSellName, getBuildTypeName } from '@/constants/order'
@@ -80,7 +81,7 @@ const selectedRow = shallowRef<Model.HisTradeDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -114,17 +115,18 @@ const showComponent = (componentName: string, row: Model.HisTradeDetailRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [startDate, endDate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYY-MM-DD')
     run({
-        startDate,
-        endDate,
+        startDate: dateValue,
+        endDate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史挂牌委托" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -59,7 +59,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryWrOrderDetail } from '@/services/api/order'
 import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
@@ -76,7 +76,7 @@ const selectedRow = shallowRef<Model.WrOrderDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -110,17 +110,18 @@ const showComponent = (componentName: string, row: Model.WrOrderDetailRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        begindate,
-        enddate,
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史挂牌成交" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -56,7 +56,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryWrTradeDetail } from '@/services/api/order'
 import { getBuyOrSellName } from '@/constants/order'
@@ -73,7 +73,7 @@ const selectedRow = shallowRef<Model.WrTradeDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -107,17 +107,18 @@ const showComponent = (componentName: string, row: Model.WrTradeDetailRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        begindate,
-        enddate,
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

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

@@ -5,17 +5,17 @@
             <template #header>
                 <app-navbar title="历史预售认购" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
-                                <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                                <h4>{{ item.goodsnamedisplay }}</h4>
                             </div>
                             <div class="right">
                                 <span>{{ getOrderStatusName(item.orderstatus) }}</span>
@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { formatDate, handleNumberValue, parsePercent } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrderDetails } from '@/services/api/presale'
@@ -94,7 +94,7 @@ const selectedRow = shallowRef<Model.MineTradeOrderDetailsRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const showModal = shallowRef(true)
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
@@ -121,17 +121,18 @@ const showComponent = (row: Model.MineTradeOrderDetailsRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        begindate,
-        enddate,
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

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

@@ -6,7 +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">
-                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                        <h4>{{ item.goodsnamedisplay }}</h4>
                     </div>
                     <div class="right">
                         <span>{{ getOrderStatusName(item.orderstatus) }}</span>

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史委托" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -58,7 +58,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
@@ -75,7 +75,7 @@ const selectedRow = shallowRef<Model.HisTradeOrderDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -107,17 +107,18 @@ const showComponent = (componentName: string, row: Model.HisTradeOrderDetailRsp)
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [startDate, endDate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYY-MM-DD')
     run({
-        startDate,
-        endDate,
+        startDate: dateValue,
+        endDate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史成交" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -60,7 +60,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeDetail } from '@/services/api/order'
 import { getBuyOrSellName, getBuildTypeName } from '@/constants/order'
@@ -77,7 +77,7 @@ const selectedRow = shallowRef<Model.HisTradeDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -110,17 +110,18 @@ const showComponent = (componentName: string, row: Model.HisTradeDetailRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [startDate, endDate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYY-MM-DD')
     run({
-        startDate,
-        endDate,
+        startDate: dateValue,
+        endDate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史转让委托" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -54,7 +54,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrders } from '@/services/api/transfer'
@@ -73,7 +73,7 @@ const selectedRow = shallowRef<Model.MineTradeOrdersRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const showModal = shallowRef(true)
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
@@ -100,17 +100,18 @@ const showComponent = (row: Model.MineTradeOrdersRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        begindate,
-        enddate,
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

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

@@ -5,12 +5,12 @@
             <template #header>
                 <app-navbar title="历史转让成交" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
-                v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -58,7 +58,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, ref, defineAsyncComponent } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { formatDate, handleNumberValue } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeTradeDetails } from '@/services/api/transfer'
@@ -78,7 +78,7 @@ const selectedRow = shallowRef<Model.MineTradeTradeDetailsRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const showModal = shallowRef(true)
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
@@ -105,17 +105,18 @@ const showComponent = (row: Model.MineTradeTradeDetailsRsp) => {
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        begindate,
-        enddate,
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

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

@@ -4,12 +4,12 @@
             <template #header>
                 <app-navbar :title="buyorsell === 0 ? '买历史履约信息' : '卖历史履约信息'" @back="closed">
                     <template #footer>
-                        <app-calendar @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
                 </app-navbar>
             </template>
-            <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
-                :page-count="pageCount" @refresh="onRefresh">
+            <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
+                v-model:pageIndex="pageIndex" :page-count="pageCount" :immediate-check="false" @refresh="onRefresh">
                 <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">
@@ -65,7 +65,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, defineAsyncComponent, ref } from 'vue'
+import { shallowRef, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { Button } from 'vant'
 import { useRequest } from '@/hooks/request'
@@ -93,13 +93,14 @@ const selectedRow = shallowRef<Model.PerformancePlanRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 const refresh = shallowRef(false) // 是否刷新父组件数据
-const dateRange = ref<string[]>([]) // 日期范围
+const currentDate = shallowRef(new Date())
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
 })
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryPerformancePlan, {
+    manual: true,
     params: {
         buyorsell: props.buyorsell
     },
@@ -120,18 +121,18 @@ const showComponent = (componentName: string, row: Model.PerformancePlanRsp) =>
 }
 
 // 选择日期
-const onConfirm = ([start, end]: Date[]) => {
-    dateRange.value = [formatDate(start.toISOString(), 'YYYYMMDD'), formatDate(end.toISOString(), 'YYYYMMDD')]
+const onConfirm = (value: Date) => {
+    currentDate.value = value
     pageIndex.value = 1
     pullRefreshRef.value?.refresh()
 }
 
 const onRefresh = () => {
-    const [startDate, endDate] = dateRange.value
+    const dateString = currentDate.value.toISOString()
+    const dateValue = formatDate(dateString, 'YYYYMMDD')
     run({
-        buyorsell: props.buyorsell,
-        begindate: startDate,
-        enddate: endDate
+        begindate: dateValue,
+        enddate: dateValue,
     })
 }
 

src/packages/pc/views/footer/presell/presellposition/index.vue

@@ -4,7 +4,7 @@
             :expand-row-keys="expandKeys" @row-click="rowClick">
         <!-- 商品代码/名称 -->
         <template #goodsname="{ row }">
-            {{ row.goodscode }}/{{ row.goodsname }}
+            {{ row.goodsnamedisplay }}
         </template>
         <!-- 开始日期 -->
         <template #starttime="{ value }">

src/packages/pc/views/query/order/goods/history/index.vue

@@ -4,9 +4,8 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYY-MM-DD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
@@ -33,10 +32,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName, getWRTradeOrderStatusList } from '@/constants/order'
@@ -44,20 +42,19 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeOrderDetailReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const dataList = ref<Model.HisTradeOrderDetailRsp[]>([])
-
-const startDate = computed(() => dateValue.value[0])
-const endDate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeOrderDetail, {
+    manual: true,
     params: {
         pagesize: 30,
         pageflag: 1,
         tradeMode: '50,16',
         orderStatus: '3',
-        startDate: startDate.value,
-        endDate: endDate.value
+        startDate: dateValue.value,
+        endDate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -106,8 +103,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.startDate = startDate.value
-        qs.endDate = endDate.value
+        qs.startDate = dateValue.value
+        qs.endDate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/order/presell/history/index.vue

@@ -4,16 +4,11 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYYMMDD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
-        <!-- 商品代码/名称' -->
-        <template #goodsname="{ row }">
-            {{ row.goodscode }}/{{ row.goodsname }}
-        </template>
         <!-- 认购金额 -->
         <template #orderamount="{ row }">
             {{ (row.orderprice * row.orderqty).toFixed(2) }}
@@ -45,9 +40,8 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { formatDate, parsePercent } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrderDetails } from '@/services/api/presale'
@@ -56,18 +50,17 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeOrderDetailsReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const dataList = ref<Model.MineTradeOrderDetailsRsp[]>([])
-
-const begindate = computed(() => dateValue.value[0])
-const enddate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrderDetails, {
+    manual: true,
     params: {
         pagesize: 30,
         ishis: true,
-        begindate: begindate.value,
-        enddate: enddate.value
+        begindate: dateValue.value,
+        enddate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -78,7 +71,7 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrderDet
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsname', label: '商品代码/名称' },
+    { field: 'goodsnamedisplay', label: '商品代码/名称' },
     { field: 'orderqty', label: '认购量' },
     { field: 'orderprice', label: '认购价' },
     { field: 'orderamount', label: '认购金额' },
@@ -113,8 +106,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.begindate = begindate.value
-        qs.enddate = enddate.value
+        qs.begindate = dateValue.value
+        qs.enddate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/order/presell/transferhistory/index.vue

@@ -4,16 +4,11 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYYMMDD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
-        <!-- 商品代码/名称 -->
-        <template #goodsname="{ row }">
-            {{ row.goodscode }}/{{ row.goodsname }}
-        </template>
         <!-- 委托状态 -->
         <template #orderstatus="{ value }">
             {{ getOrderStatusName(value) }}
@@ -29,10 +24,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrders } from '@/services/api/transfer'
 import { getOrderStatusName } from '@/constants/order'
@@ -40,18 +34,17 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeOrdersReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const dataList = ref<Model.MineTradeOrdersRsp[]>([])
-
-const begindate = computed(() => dateValue.value[0])
-const enddate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrders, {
+    manual: true,
     params: {
         pagesize: 30,
         ishis: true,
-        begindate: begindate.value,
-        enddate: enddate.value
+        begindate: dateValue.value,
+        enddate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -62,7 +55,7 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrders,
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsname', label: '商品代码/名称' },
+    { field: 'goodsnamedisplay', label: '商品代码/名称' },
     { field: 'orderqty', label: '转让量' },
     { field: 'orderprice', label: '转让价' },
     { field: 'presaleprice', label: '订货价' },
@@ -90,8 +83,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.begindate = begindate.value
-        qs.enddate = enddate.value
+        qs.begindate = dateValue.value
+        qs.enddate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/order/spot/history/index.vue

@@ -4,9 +4,8 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYYMMDD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
@@ -33,10 +32,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { useRequest } from '@/hooks/request'
 import { queryWrOrderDetail } from '@/services/api/order'
 import { getWrTradeTypeName, getWrPriceTypeName, getWRTradeOrderStatusName } from '@/constants/order'
@@ -46,21 +44,20 @@ import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { getTableColumns } = useTableColumnsStore()
 const { filterOptons, getQueryParams } = useDataFilter<Model.WrOrderDetailRsp>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.WrOrderDetailRsp[]>([])
-
-const begindate = computed(() => dateValue.value[0])
-const enddate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryWrOrderDetail, {
+    manual: true,
     params: {
         pagesize: 30,
         wrtradetype: 1,
         marketid: 17201,
         haswr: 1,
-        begindate: begindate.value,
-        enddate: enddate.value
+        begindate: dateValue.value,
+        enddate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -100,8 +97,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.begindate = begindate.value
-        qs.enddate = enddate.value
+        qs.begindate = dateValue.value
+        qs.enddate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/order/swap/history/index.vue

@@ -4,9 +4,8 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYY-MM-DD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
@@ -37,10 +36,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuyOrSellName, getWRTradeOrderStatusName, getWRTradeOrderStatusList } from '@/constants/order'
@@ -50,21 +48,20 @@ import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { getTableColumns } = useTableColumnsStore()
 const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeOrderDetailReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.HisTradeOrderDetailRsp[]>([])
-
-const startDate = computed(() => dateValue.value[0])
-const endDate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeOrderDetail, {
+    manual: true,
     params: {
         pagesize: 30,
         pageflag: 1,
         tradeMode: '46',
         orderStatus: '3',
-        startDate: startDate.value,
-        endDate: endDate.value
+        startDate: dateValue.value,
+        endDate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -101,8 +98,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.startDate = startDate.value
-        qs.endDate = endDate.value
+        qs.startDate = dateValue.value
+        qs.endDate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/trade/goods/history/index.vue

@@ -4,9 +4,8 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYY-MM-DD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
@@ -33,10 +32,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate, tmMatchAccountID } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeDetail } from '@/services/api/order'
 import { getBuildTypeName, getBuyOrSellName } from '@/constants/order'
@@ -44,20 +42,19 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeDetailReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const dataList = ref<Model.HisTradeDetailRsp[]>([])
-
-const startDate = computed(() => dateValue.value[0])
-const endDate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeDetail, {
+    manual: true,
     params: {
         pagesize: 30,
         pageflag: 1,
         tradeMode: '50,16',
         buildType: 1,
-        startDate: startDate.value,
-        endDate: endDate.value
+        startDate: dateValue.value,
+        endDate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -110,8 +107,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.startDate = startDate.value
-        qs.endDate = endDate.value
+        qs.startDate = dateValue.value
+        qs.endDate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/trade/presell/history/index.vue

@@ -4,15 +4,14 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYYMMDD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
         <!-- 状态 -->
         <template #goodsname="{ row }">
-            {{ row.goodscode }}/{{ row.goodsname }}
+            {{ row.goodsnamedisplay }}
         </template>
         <!-- 方向 -->
         <template #buyorsell="{ value }">
@@ -29,10 +28,9 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeTradeDetails } from '@/services/api/transfer'
 import { getBuyOrSellName } from '@/constants/order'
@@ -40,18 +38,17 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeTradeDetailsReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const dataList = ref<Model.MineTradeTradeDetailsRsp[]>([])
-
-const begindate = computed(() => dateValue.value[0])
-const enddate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeTradeDetails, {
+    manual: true,
     params: {
         pagesize: 30,
         ishis: true,
-        begindate: begindate.value,
-        enddate: enddate.value
+        begindate: dateValue.value,
+        enddate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -91,8 +88,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.begindate = begindate.value
-        qs.enddate = enddate.value
+        qs.begindate = dateValue.value
+        qs.enddate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/trade/presell/list/index.vue

@@ -3,7 +3,7 @@
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
         <!-- 状态 -->
         <template #goodsname="{ row }">
-            {{ row.goodscode }}/{{ row.goodsname }}
+            {{ row.goodsnamedisplay }}
         </template>
         <!-- 方向 -->
         <template #buyorsell="{ value }">
@@ -24,7 +24,7 @@ import { queryMineTradeTradeDetails } from '@/services/api/transfer'
 import { getBuyOrSellName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
-const { loading, dataList } = useRequest(queryMineTradeTradeDetails, {})
+const { loading, dataList } = useRequest(queryMineTradeTradeDetails)
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'goodsname', label: '商品代码/名称' },

src/packages/pc/views/query/trade/spot/history/index.vue

@@ -4,9 +4,8 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange" :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYYMMDD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
@@ -25,11 +24,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { queryWrTradeDetail } from '@/services/api/order'
 import { getBuildTypeName } from '@/constants/order'
 import { useTableColumnsStore } from '@/stores'
@@ -38,20 +36,19 @@ import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { getTableColumns } = useTableColumnsStore()
 const { filterOptons, getQueryParams } = useDataFilter<Model.WrTradeDetailRsp>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.WrTradeDetailRsp[]>([])
-
-const begindate = computed(() => dateValue.value[0])
-const enddate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryWrTradeDetail, {
+    manual: true,
     params: {
         pagesize: 30,
         marketid: 17201,
         haswr: 1,
-        begindate: begindate.value,
-        enddate: enddate.value
+        begindate: dateValue.value,
+        enddate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -79,8 +76,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.begindate = begindate.value
-        qs.enddate = enddate.value
+        qs.begindate = dateValue.value
+        qs.enddate = dateValue.value
         run(qs)
     })
 }

src/packages/pc/views/query/trade/swap/history/index.vue

@@ -4,10 +4,8 @@
         <template #headerLeft>
             <app-filter :options="filterOptons">
                 <template #before>
-                    <el-date-picker type="daterange" effect="dark" :editable="false" :clearable="false"
-                        start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueformat" v-model="dateValue"
-                        @visible-change="visibleChange" @calendar-change="calendarChange"
-                        :disabled-date="disabledDate" />
+                    <el-date-picker effect="dark" :editable="false" :clearable="false" placeholder="请选择"
+                        value-format="YYYY-MM-DD" v-model="dateValue" />
                 </template>
             </app-filter>
         </template>
@@ -38,11 +36,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { formatDate, tmMatchAccountID } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
-import { useDateRange } from '@/hooks/date-picker'
 import { queryHisTradeDetail, } from '@/services/api/order'
 import { getBuildTypeName, getBuyOrSellName, getBuildTypeList } from '@/constants/order'
 import { useTableColumnsStore } from '@/stores'
@@ -51,21 +48,20 @@ import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { getTableColumns } = useTableColumnsStore()
 const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeDetailReq>()
-const { dateValue, valueformat, visibleChange, calendarChange, disabledDate } = useDateRange()
+const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.HisTradeDetailRsp[]>([])
-
-const startDate = computed(() => dateValue.value[0])
-const endDate = computed(() => dateValue.value[1])
+const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeDetail, {
+    manual: true,
     params: {
         pagesize: 30,
         pageflag: 1,
         tradeMode: '46',
         buildType: 1,
-        startDate: startDate.value,
-        endDate: endDate.value
+        startDate: dateValue.value,
+        endDate: dateValue.value
     },
     onSuccess: (res) => {
         if (pageIndex.value === 1) {
@@ -75,7 +71,6 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeDetail, {
     }
 })
 
-
 filterOptons.selectList = [
     {
         key: 'buildType',
@@ -103,8 +98,8 @@ const loadMore = () => {
 
 const onSearch = () => {
     getQueryParams((qs) => {
-        qs.startDate = startDate.value
-        qs.endDate = endDate.value
+        qs.startDate = dateValue.value
+        qs.endDate = dateValue.value
         run(qs)
     })
 }