wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 18:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
合并master

See merge request jianweie/coreshoppro!68
This commit is contained in:
bob bob
2024-11-02 09:04:47 +00:00
parent 74c6adad19 c91157925f
commit 9e12302684
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
View File

@@ -46,9 +46,14 @@
const hanlderBack = () => { const hanlderBack = () => {
if (props.handleCustomRouteJump) { if (props.handleCustomRouteJump) {
props.handleCustomRouteJump(); props.handleCustomRouteJump();
} else { return;
uni.navigateBack();
} }
const pages = getCurrentPages()
if (pages.length === 1) {
handleRouteSwitchTab(RouteSwitchTabEnum.home);
return
}
uni.navigateBack();
} }
</script> </script>

4
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/commission-detail/index.vue
View File

@@ -81,7 +81,7 @@
const { statusBarHeight } = useSystemInfo(); const { statusBarHeight } = useSystemInfo();
const calendarsRef = ref(); const calendarsRef = ref();
const nowTimeStamp = new Date().getTime()
const state = reactive<{ const state = reactive<{
selectedDate : string; selectedDate : string;
arrowUp : boolean; arrowUp : boolean;
@@ -93,7 +93,7 @@
totalMoney : number; totalMoney : number;
userInfo : UserInfoType, userInfo : UserInfoType,
}>({ }>({
selectedDate: new Date().toLocaleDateString().replaceAll('/', '-') + '至' + new Date().toLocaleDateString().replaceAll('/', '-'), selectedDate: timeFormat(nowTimeStamp) + '至' + timeFormat(nowTimeStamp),
arrowUp: false, arrowUp: false,
showMoney: false, showMoney: false,
info: {}, info: {},

3
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/commission-detail/index.vue
View File

@@ -81,6 +81,7 @@
const { statusBarHeight } = useSystemInfo(); const { statusBarHeight } = useSystemInfo();
const calendarsRef = ref(); const calendarsRef = ref();
const nowTimeStamp = new Date().getTime()
const state = reactive<{ const state = reactive<{
selectedDate : string; selectedDate : string;
@@ -93,7 +94,7 @@
totalMoney : number; totalMoney : number;
userInfo : UserInfoType, userInfo : UserInfoType,
}>({ }>({
selectedDate: new Date().toLocaleDateString().replaceAll('/', '-') + '至' + new Date().toLocaleDateString().replaceAll('/', '-'), selectedDate: timeFormat(nowTimeStamp) + '至' + timeFormat(nowTimeStamp),
arrowUp: false, arrowUp: false,
showMoney: false, showMoney: false,
info: {}, info: {},