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,184 +1,182 @@
{ {
"pages": [ "pages": [{
{ "path": "pages/home/home",
"path": "pages/home/home", "style": {
"style": { "navigationBarTitleText": "首页",
"navigationBarTitleText": "首页", "navigationStyle": "custom"
"navigationStyle": "custom" }
} },
}, {
{ "path": "pages/article/article-list",
"path": "pages/article/article-list", "style": {
"style": { "navigationBarTitleText": "我的宣教"
"navigationBarTitleText": "我的宣教" }
} },
}, {
{ "path": "pages/article/article-cate-list",
"path": "pages/article/article-cate-list", "style": {
"style": { "navigationBarTitleText": "健康宣教"
"navigationBarTitleText": "健康宣教" }
} },
}, {
{ "path": "pages/survey/survey-list",
"path": "pages/survey/survey-list", "style": {
"style": { "navigationBarTitleText": "我的问卷"
"navigationBarTitleText": "我的问卷" }
} },
}, {
{ "path": "pages/message/message",
"path": "pages/message/message", "style": {
"style": { "navigationBarTitleText": "消息"
"navigationBarTitleText": "消息" }
} },
}, {
{ "path": "pages/message/index",
"path": "pages/message/index", "style": {
"style": { "navigationBarTitleText": "聊天",
"navigationBarTitleText": "聊天", "enablePullDownRefresh": false
"enablePullDownRefresh": false }
} },
}, {
{ "path": "pages/login/login",
"path": "pages/login/login", "style": {
"style": { "navigationBarTitleText": "健康柚",
"navigationBarTitleText": "健康柚", "navigationStyle": "custom"
"navigationStyle": "custom" }
} },
}, {
{ "path": "pages/login/redirect-page",
"path": "pages/login/redirect-page", "style": {
"style": { "navigationBarTitleText": "健康柚"
"navigationBarTitleText": "健康柚" }
} },
}, {
{ "path": "pages/archive/archive-manage",
"path": "pages/archive/archive-manage", "style": {
"style": { "navigationBarTitleText": "档案管理"
"navigationBarTitleText": "档案管理" }
} },
}, {
{ "path": "pages/archive/edit-archive",
"path": "pages/archive/edit-archive", "style": {
"style": { "navigationBarTitleText": "新增档案"
"navigationBarTitleText": "新增档案" }
} },
}, {
{ "path": "pages/archive/archive-result",
"path": "pages/archive/archive-result", "style": {
"style": { "navigationBarTitleText": "团队服务"
"navigationBarTitleText": "团队服务" }
} },
}, {
{ "path": "pages/health/list",
"path": "pages/health/list", "style": {
"style": { "navigationBarTitleText": "健康信息"
"navigationBarTitleText": "健康信息" }
} },
}, {
{ "path": "pages/health/record",
"path": "pages/health/record", "style": {
"style": { "navigationBarTitleText": "健康信息"
"navigationBarTitleText": "健康信息" }
} },
}, {
{ "path": "pages/library/diagnosis-list",
"path": "pages/library/diagnosis-list", "style": {
"style": { "navigationBarTitleText": "选择诊断"
"navigationBarTitleText": "选择诊断" }
} },
}, {
{ "path": "pages/team/team-detail",
"path": "pages/team/team-detail", "style": {
"style": { "navigationBarTitleText": "团队介绍"
"navigationBarTitleText": "团队介绍" }
} },
}, {
{ "path": "pages/team/homepage",
"path": "pages/team/homepage", "style": {
"style": { "navigationBarTitleText": "个人主页"
"navigationBarTitleText": "个人主页" }
} },
}, {
{ "path": "pages/team/friend",
"path": "pages/team/friend", "style": {
"style": { "navigationBarTitleText": "添加好友"
"navigationBarTitleText": "添加好友" }
} },
}, {
{ "path": "pages/web-view/web-view",
"path": "pages/web-view/web-view", "style": {
"style": { "navigationBarTitleText": ""
"navigationBarTitleText": "" }
} },
}, {
{ "path": "pages/mine/mine",
"path": "pages/mine/mine", "style": {
"style": { "navigationBarTitleText": "我的"
"navigationBarTitleText": "我的" }
} },
}, {
{ "path": "pages/mine/contact",
"path": "pages/mine/contact", "style": {
"style": { "navigationBarTitleText": "联系客服"
"navigationBarTitleText": "联系客服" }
} },
}, {
{ "path": "pages/common/privacy",
"path": "pages/common/privacy", "style": {
"style": { "navigationBarTitleText": "隐私政策"
"navigationBarTitleText": "隐私政策" }
} },
}, {
{ "path": "pages/common/agreement",
"path": "pages/common/agreement", "style": {
"style": { "navigationBarTitleText": "用户协议"
"navigationBarTitleText": "用户协议" }
} },
}, {
{ "path": "pages/article/article-detail",
"path": "pages/article/article-detail", "style": {
"style": { "navigationBarTitleText": "宣教文章"
"navigationBarTitleText": "宣教文章" }
} },
}, {
{ "path": "pages/article/send-article",
"path": "pages/article/send-article", "style": {
"style": { "navigationBarTitleText": "选择宣教文章"
"navigationBarTitleText": "选择宣教文章" }
} }
} ],
], "globalStyle": {
"globalStyle": { "navigationBarTextStyle": "white",
"navigationBarTextStyle": "white", "navigationBarTitleText": "uni-app",
"navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#065bd6",
"navigationBarBackgroundColor": "#065bd6", "backgroundColor": "#065bd6"
"backgroundColor": "#065bd6" },
}, "tabBar": {
"tabBar": { "color": "#666666",
"color": "#666666", "selectedColor": "#007aff",
"selectedColor": "#007aff", "backgroundColor": "#ffffff",
"backgroundColor": "#ffffff", "borderStyle": "white",
"borderStyle": "white", "list": [{
"list": [ "pagePath": "pages/home/home",
{ "iconPath": "static/tabbar/home.png",
"pagePath": "pages/home/home", "selectedIconPath": "static/tabbar/home_selected.png",
"iconPath": "static/tabbar/home.png", "text": "消息"
"selectedIconPath": "static/tabbar/home_selected.png", },
"text": "消息" {
}, "pagePath": "pages/message/message",
{ "iconPath": "static/tabbar/consult.png",
"pagePath": "pages/message/message", "selectedIconPath": "static/tabbar/consult_selected.png",
"iconPath": "static/tabbar/consult.png", "text": "咨询"
"selectedIconPath": "static/tabbar/consult_selected.png", },
"text": "咨询" {
}, "pagePath": "pages/mine/mine",
{ "iconPath": "static/tabbar/mine.png",
"pagePath": "pages/mine/mine", "selectedIconPath": "static/tabbar/mine_selected.png",
"iconPath": "static/tabbar/mine.png", "text": "我的"
"selectedIconPath": "static/tabbar/mine_selected.png", }
"text": "我的" ]
} },
] "uniIdRouter": {}
}, }
"uniIdRouter": {}
}

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();
} }
} }