Merge commit '4cc1e6853f1d2cf48548e53bbe237b70d7ee2c3f' into dev-wdb

no message
fix: 问题修复
2026-02-06 09:50:53 +08:00 · 2026-02-06 09:50:44 +08:00 · 2026-02-05 17:11:17 +08:00 · 2026-02-05 11:28:48 +08:00 · 2026-02-05 11:22:52 +08:00 · 2026-02-05 11:17:23 +08:00
3 changed files with 186 additions and 185 deletions
--- a/pages.json
+++ b/pages.json
@ -1,184 +1,182 @@
 {
-  "pages": [
-    {
-      "path": "pages/home/home",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/article/article-list",
-      "style": {
-        "navigationBarTitleText": "我的宣教"
-      }
-    },
-    {
-      "path": "pages/article/article-cate-list",
-      "style": {
-        "navigationBarTitleText": "健康宣教"
-      }
-    },
-    {
-      "path": "pages/survey/survey-list",
-      "style": {
-        "navigationBarTitleText": "我的问卷"
-      }
-    },
-    {
-      "path": "pages/message/message",
-      "style": {
-        "navigationBarTitleText": "消息"
-      }
-    },
-    {
-      "path": "pages/message/index",
-      "style": {
-        "navigationBarTitleText": "聊天",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/login/login",
-      "style": {
-        "navigationBarTitleText": "健康柚",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/login/redirect-page",
-      "style": {
-        "navigationBarTitleText": "健康柚"
-      }
-    },
-    {
-      "path": "pages/archive/archive-manage",
-      "style": {
-        "navigationBarTitleText": "档案管理"
-      }
-    },
-    {
-      "path": "pages/archive/edit-archive",
-      "style": {
-        "navigationBarTitleText": "新增档案"
-      }
-    },
-    {
-      "path": "pages/archive/archive-result",
-      "style": {
-        "navigationBarTitleText": "团队服务"
-      }
-    },
-    {
-      "path": "pages/health/list",
-      "style": {
-        "navigationBarTitleText": "健康信息"
-      }
-    },
-    {
-      "path": "pages/health/record",
-      "style": {
-        "navigationBarTitleText": "健康信息"
-      }
-    },
-    {
-      "path": "pages/library/diagnosis-list",
-      "style": {
-        "navigationBarTitleText": "选择诊断"
-      }
-    },
-    {
-      "path": "pages/team/team-detail",
-      "style": {
-        "navigationBarTitleText": "团队介绍"
-      }
-    },
-    {
-      "path": "pages/team/homepage",
-      "style": {
-        "navigationBarTitleText": "个人主页"
-      }
-    },
-    {
-      "path": "pages/team/friend",
-      "style": {
-        "navigationBarTitleText": "添加好友"
-      }
-    },
-    {
-      "path": "pages/web-view/web-view",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/mine/mine",
-      "style": {
-        "navigationBarTitleText": "我的"
-      }
-    },
-    {
-      "path": "pages/mine/contact",
-      "style": {
-        "navigationBarTitleText": "联系客服"
-      }
-    },
-    {
-      "path": "pages/common/privacy",
-      "style": {
-        "navigationBarTitleText": "隐私政策"
-      }
-    },
-    {
-      "path": "pages/common/agreement",
-      "style": {
-        "navigationBarTitleText": "用户协议"
-      }
-    },
-    {
-      "path": "pages/article/article-detail",
-      "style": {
-        "navigationBarTitleText": "宣教文章"
-      }
-    },
-    {
-      "path": "pages/article/send-article",
-      "style": {
-        "navigationBarTitleText": "选择宣教文章"
-      }
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#065bd6",
-    "backgroundColor": "#065bd6"
-  },
-  "tabBar": {
-    "color": "#666666",
-    "selectedColor": "#007aff",
-    "backgroundColor": "#ffffff",
-    "borderStyle": "white",
-    "list": [
-      {
-        "pagePath": "pages/home/home",
-        "iconPath": "static/tabbar/home.png",
-        "selectedIconPath": "static/tabbar/home_selected.png",
-        "text": "消息"
-      },
-      {
-        "pagePath": "pages/message/message",
-        "iconPath": "static/tabbar/consult.png",
-        "selectedIconPath": "static/tabbar/consult_selected.png",
-        "text": "咨询"
-      },
-      {
-        "pagePath": "pages/mine/mine",
-        "iconPath": "static/tabbar/mine.png",
-        "selectedIconPath": "static/tabbar/mine_selected.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "uniIdRouter": {}
+	"pages": [{
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/article/article-list",
+			"style": {
+				"navigationBarTitleText": "我的宣教"
+			}
+		},
+		{
+			"path": "pages/article/article-cate-list",
+			"style": {
+				"navigationBarTitleText": "健康宣教"
+			}
+		},
+		{
+			"path": "pages/survey/survey-list",
+			"style": {
+				"navigationBarTitleText": "我的问卷"
+			}
+		},
+		{
+			"path": "pages/message/message",
+			"style": {
+				"navigationBarTitleText": "消息"
+			}
+		},
+		{
+			"path": "pages/message/index",
+			"style": {
+				"navigationBarTitleText": "聊天",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "健康柚",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/redirect-page",
+			"style": {
+				"navigationBarTitleText": "健康柚"
+			}
+		},
+		{
+			"path": "pages/archive/archive-manage",
+			"style": {
+				"navigationBarTitleText": "档案管理"
+			}
+		},
+		{
+			"path": "pages/archive/edit-archive",
+			"style": {
+				"navigationBarTitleText": "新增档案"
+			}
+		},
+		{
+			"path": "pages/archive/archive-result",
+			"style": {
+				"navigationBarTitleText": "团队服务"
+			}
+		},
+		{
+			"path": "pages/health/list",
+			"style": {
+				"navigationBarTitleText": "健康信息"
+			}
+		},
+		{
+			"path": "pages/health/record",
+			"style": {
+				"navigationBarTitleText": "健康信息"
+			}
+		},
+		{
+			"path": "pages/library/diagnosis-list",
+			"style": {
+				"navigationBarTitleText": "选择诊断"
+			}
+		},
+		{
+			"path": "pages/team/team-detail",
+			"style": {
+				"navigationBarTitleText": "团队介绍"
+			}
+		},
+		{
+			"path": "pages/team/homepage",
+			"style": {
+				"navigationBarTitleText": "个人主页"
+			}
+		},
+		{
+			"path": "pages/team/friend",
+			"style": {
+				"navigationBarTitleText": "添加好友"
+			}
+		},
+		{
+			"path": "pages/web-view/web-view",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/mine/mine",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "pages/mine/contact",
+			"style": {
+				"navigationBarTitleText": "联系客服"
+			}
+		},
+		{
+			"path": "pages/common/privacy",
+			"style": {
+				"navigationBarTitleText": "隐私政策"
+			}
+		},
+		{
+			"path": "pages/common/agreement",
+			"style": {
+				"navigationBarTitleText": "用户协议"
+			}
+		},
+		{
+			"path": "pages/article/article-detail",
+			"style": {
+				"navigationBarTitleText": "宣教文章"
+			}
+		},
+		{
+			"path": "pages/article/send-article",
+			"style": {
+				"navigationBarTitleText": "选择宣教文章"
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#065bd6",
+		"backgroundColor": "#065bd6"
+	},
+	"tabBar": {
+		"color": "#666666",
+		"selectedColor": "#007aff",
+		"backgroundColor": "#ffffff",
+		"borderStyle": "white",
+		"list": [{
+				"pagePath": "pages/home/home",
+				"iconPath": "static/tabbar/home.png",
+				"selectedIconPath": "static/tabbar/home_selected.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"iconPath": "static/tabbar/consult.png",
+				"selectedIconPath": "static/tabbar/consult_selected.png",
+				"text": "咨询"
+			},
+			{
+				"pagePath": "pages/mine/mine",
+				"iconPath": "static/tabbar/mine.png",
+				"selectedIconPath": "static/tabbar/mine_selected.png",
+				"text": "我的"
+			}
+		]
+	},
+	"uniIdRouter": {}
 }
--- a/pages/archive/bind-popup.vue
+++ b/pages/archive/bind-popup.vue
@ -95,4 +95,7 @@ watch(() => props.visible, n => {
  width: 48rpx;
  height: 48rpx;
 }
+.popup-content-scroll{
+  max-height: 65vh;
+}
 </style>
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -118,7 +118,7 @@ async function getPhoneNumber(e) {
    bindTeam(account.value)
  } else if (redirectUrl.value) {
    await attempToPage(redirectUrl.value);
-  } else if (res) {
+  } else {
    toHome();
  }
 }
Author	SHA1	Message	Date
wangdongbo	110639725f	Merge commit '4cc1e6853f1d2cf48548e53bbe237b70d7ee2c3f' into dev-wdb	2026-02-06 09:50:53 +08:00
wangdongbo	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