Compare commits

..

7 Commits

Author SHA1 Message Date
110639725f Merge commit '4cc1e6853f1d2cf48548e53bbe237b70d7ee2c3f' into dev-wdb 2026-02-06 09:50:53 +08:00
f7db9058b2 no message 2026-02-06 09:50:44 +08:00
huxuejian
4cc1e6853f fix: 问题修复 2026-02-05 17:11:17 +08:00
huxuejian
744b1ee76b Merge remote-tracking branch 'origin/dev-wdb' 2026-02-05 11:28:48 +08:00
huxuejian
5ddc8fa9f2 Update login.vue 2026-02-05 11:22:52 +08:00
huxuejian
037edd7855 Merge remote-tracking branch 'origin/dev-wdb' 2026-02-05 11:17:23 +08:00
huxuejian
54194ea63a Merge remote-tracking branch 'origin/dev-hjf' 2026-02-05 11:17:02 +08:00
3 changed files with 186 additions and 185 deletions

View File

@ -1,6 +1,5 @@
{ {
"pages": [ "pages": [{
{
"path": "pages/home/home", "path": "pages/home/home",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
@ -159,8 +158,7 @@
"selectedColor": "#007aff", "selectedColor": "#007aff",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"borderStyle": "white", "borderStyle": "white",
"list": [ "list": [{
{
"pagePath": "pages/home/home", "pagePath": "pages/home/home",
"iconPath": "static/tabbar/home.png", "iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home_selected.png", "selectedIconPath": "static/tabbar/home_selected.png",

View File

@ -95,4 +95,7 @@ watch(() => props.visible, n => {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
} }
.popup-content-scroll{
max-height: 65vh;
}
</style> </style>

View File

@ -118,7 +118,7 @@ async function getPhoneNumber(e) {
bindTeam(account.value) bindTeam(account.value)
} else if (redirectUrl.value) { } else if (redirectUrl.value) {
await attempToPage(redirectUrl.value); await attempToPage(redirectUrl.value);
} else if (res) { } else {
toHome(); toHome();
} }
} }