Compare commits

...
66 Commits
Author SHA1 Message Date
zoujiandong 750bbb7ea2 merge dev 2026-07-22 15:09:08 +08:00
zoujiandong 42d2e7e1e8 Merge branch 'dev'1.7bugxiufu 2026-01-07 11:39:16 +08:00
zoujiandong 5d6a029d50 Merge branch 'dev'1.7 2026-01-07 10:23:16 +08:00
zoujiandong 65ca44071a Merge branch 'dev' 1.6 2026-01-06 17:29:59 +08:00
zoujiandong 2fe48ab6d4 Merge branch 'dev' 2025-12-23 13:04:21 +08:00
zoujiandong 43581e1358 Merge branch 'dev' 2025-09-10 11:14:39 +08:00
zoujiandong 83a02fe6e6 Merge branch 'dev' 2025-09-09 10:27:17 +08:00
zoujiandong c4d2340dfb Merge branch 'dev' 2025-09-08 16:50:07 +08:00
zoujiandong 7143000064 Merge branch 'dev' 2025-09-08 14:07:16 +08:00
zoujiandong 9bdb47fb11 Merge branch 'dev' 2024-12-30 09:47:19 +08:00
zoujiandong f75355f2a1 Merge branch 'dev' 2024-12-30 09:28:08 +08:00
zoujiandong 28beba347c Merge branch 'dev' 2024-12-03 09:28:14 +08:00
zoujiandong 6c90d2ee24 Merge branch 'dev' 2024-11-08 14:21:29 +08:00
zoujiandong 0528dd9022 Merge branch 'dev' 2024-11-08 09:10:07 +08:00
zoujiandong e5469cc066 Merge branch 'dev' 2024-10-25 15:13:42 +08:00
zoujiandong e465d7337a Merge branch 'dev' 2024-10-25 14:51:49 +08:00
zoujiandong 892ee13d1f Merge branch 'dev' 2024-10-25 14:08:53 +08:00
zoujiandong f3be8f3a2a Merge branch 'dev' 2024-10-23 09:01:19 +08:00
zoujiandong 082afd4df5 禁用 2024-10-17 16:28:16 +08:00
zoujiandong a4375e062f 更改医院接口 2024-09-10 09:37:14 +08:00
zoujiandong 5a93cf0122 Merge branch 'dev' 2024-07-25 09:45:18 +08:00
zoujiandong 7d2ac8caef Merge branch 'dev' 2024-07-05 09:06:19 +08:00
zoujiandong 09e0175ce3 Merge branch 'dev' 2024-07-05 09:00:31 +08:00
zoujiandong 77f96eec4f Merge branch 'dev' 2024-06-21 14:18:10 +08:00
zoujiandong d8f2620b95 Merge branch 'dev' 2024-06-21 13:55:04 +08:00
zoujiandong 5e10206d3a Merge branch 'dev' 2024-06-21 11:49:24 +08:00
zoujiandong d180a4fe41 Merge branch 'dev' 2024-06-19 16:21:26 +08:00
zoujiandong bee2c92db1 Merge branch 'dev' 2024-04-07 14:46:12 +08:00
zoujiandong 41e17edc60 Merge branch 'dev' 2024-04-02 09:01:03 +08:00
zoujiandong 11536e64a4 Merge branch 'dev' 2024-03-29 17:57:07 +08:00
zoujiandong c9c82f7687 Merge branch 'dev' 2024-03-29 17:34:31 +08:00
zoujiandong 5d8865bab1 Merge branch 'dev' 2023-12-29 09:18:22 +08:00
zoujiandong b6cf1834a5 Merge branch 'dev' 2023-12-20 10:34:04 +08:00
zoujiandong 30a6949235 Merge branch 'dev' 2023-12-07 09:49:15 +08:00
zoujiandong 644b1aabcc merge 2023-12-07 09:22:23 +08:00
zoujiandong 47fbd1525d 测试 2023-12-05 09:40:18 +08:00
zoujiandong 9bb514e370 Merge branch 'dev' 2023-11-21 11:28:02 +08:00
zoujiandong a7ee90d191 Merge branch 'dev' 2023-11-21 10:17:41 +08:00
zoujiandong a12c042b08 Merge branch 'dev' 2023-11-17 13:46:39 +08:00
zoujiandong b9abe8bbb5 导出数字为字符串 2023-11-17 13:37:30 +08:00
zoujiandong 67e1d60d60 Merge branch 'dev' 2023-11-16 17:17:43 +08:00
zoujiandong fd07f34775 Merge branch 'dev' 2023-11-10 13:58:41 +08:00
zoujiandong 5dc42ab6b6 Merge branch 'dev' 2023-11-09 17:26:17 +08:00
zoujiandong 372eaba087 Merge branch 'dev' 2023-10-18 14:47:23 +08:00
zoujiandong 07acbb843d Merge branch 'dev' 2023-10-18 11:10:57 +08:00
zoujiandong 8ff4f707e4 Merge branch 'dev' 2023-09-28 09:53:28 +08:00
zoujiandong 26598d7c63 Merge branch 'dev' 2023-09-27 09:00:28 +08:00
zoujiandong 2b99a4b6f2 Merge branch 'dev' 2023-09-26 09:36:40 +08:00
zoujiandong ae5260d6ce Merge branch 'dev' 2023-09-18 10:45:09 +08:00
zoujiandong cdc93dcd6f Merge branch 'dev' 2023-09-18 10:25:37 +08:00
zoujiandong 82c6b9a1ce Merge branch 'dev' 2023-09-18 08:55:40 +08:00
zoujiandong 0e308d8d78 Merge branch 'dev' 2023-07-27 09:43:32 +08:00
zoujiandong 554d120892 Merge branch 'dev' 2023-07-21 14:38:03 +08:00
zoujiandong d816923eb6 银行id 2023-07-21 14:08:23 +08:00
zoujiandong 0c843d09b0 搜索页重置为1 2023-07-21 13:22:03 +08:00
zoujiandong d7db3c234f 路由修改 2023-07-21 13:06:16 +08:00
zoujiandong e0766092b8 去掉名字 2023-07-21 12:07:09 +08:00
zoujiandong c81aaf1d52 Merge branch 'dev' 2023-07-21 12:00:48 +08:00
zoujiandong 5f71490be6 ceshi 2023-07-21 10:19:24 +08:00
zoujiandong a5c18b9a71 Merge branch 'dev' 2023-07-21 09:50:40 +08:00
zoujiandong 1f74f05a5c 冲突 2023-07-21 09:22:30 +08:00
zoujiandong 24d8afbc67 bank 2023-07-21 08:50:26 +08:00
zoujiandong 5e3f3227c2 Merge branch 'dev' 2023-07-20 17:38:33 +08:00
zoujiandong f57648268d 银行卡号信息更新 2023-07-20 17:00:32 +08:00
zoujiandong 9ca92dd2a8 Merge branch 'dev' 2023-07-20 16:53:08 +08:00
zoujiandong 6f2d6e79c9 master 更新 2023-07-20 16:33:43 +08:00
2 changed files with 13 additions and 14 deletions
+1 -3
View File
@@ -209,14 +209,12 @@ const HandleGetIm = async (params = {}) => {
console.log(chatlist.value) console.log(chatlist.value)
if(!firstIn.value){ if(!firstIn.value){
nextTick(() => { nextTick(() => {
try {
// 要放在对响应式数据修改之后 // 要放在对响应式数据修改之后
try {
let ele = document.querySelector('.phonecont'); let ele = document.querySelector('.phonecont');
ele.scrollTop = ele.scrollHeight; ele.scrollTop = ele.scrollHeight;
} catch (error) { } catch (error) {
} }
}); });
} }
+1
View File
@@ -97,6 +97,7 @@ router.beforeEach(async(to, from, next) => {
}else{ }else{
next(); next();
} }
} }
} }