diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue index fd51f069..c8e95ba0 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue @@ -46,9 +46,14 @@ const hanlderBack = () => { if (props.handleCustomRouteJump) { props.handleCustomRouteJump(); - } else { - uni.navigateBack(); + return; } + const pages = getCurrentPages() + if (pages.length === 1) { + handleRouteSwitchTab(RouteSwitchTabEnum.home); + return + } + uni.navigateBack(); } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/commission-detail/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/commission-detail/index.vue index 03c5549b..e0acec63 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/commission-detail/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/commission-detail/index.vue @@ -81,7 +81,7 @@ const { statusBarHeight } = useSystemInfo(); const calendarsRef = ref(); - + const nowTimeStamp = new Date().getTime() const state = reactive<{ selectedDate : string; arrowUp : boolean; @@ -93,7 +93,7 @@ totalMoney : number; userInfo : UserInfoType, }>({ - selectedDate: new Date().toLocaleDateString().replaceAll('/', '-') + '至' + new Date().toLocaleDateString().replaceAll('/', '-'), + selectedDate: timeFormat(nowTimeStamp) + '至' + timeFormat(nowTimeStamp), arrowUp: false, showMoney: false, info: {}, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/commission-detail/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/commission-detail/index.vue index f754a501..cbeaf26b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/commission-detail/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/commission-detail/index.vue @@ -81,6 +81,7 @@ const { statusBarHeight } = useSystemInfo(); const calendarsRef = ref(); + const nowTimeStamp = new Date().getTime() const state = reactive<{ selectedDate : string; @@ -93,7 +94,7 @@ totalMoney : number; userInfo : UserInfoType, }>({ - selectedDate: new Date().toLocaleDateString().replaceAll('/', '-') + '至' + new Date().toLocaleDateString().replaceAll('/', '-'), + selectedDate: timeFormat(nowTimeStamp) + '至' + timeFormat(nowTimeStamp), arrowUp: false, showMoney: false, info: {},