Commit Graph

954 Commits

Author SHA1 Message Date
aixianling
30c83de28c Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 17:23:53 +08:00
aixianling
9f12e9ba78 特殊调整 2021-12-31 17:23:43 +08:00
liuye
f67270ae45 uni.hideLoading 2021-12-31 17:16:11 +08:00
liuye
4b0a7a64ae icon 2021-12-31 17:09:53 +08:00
aixianling
477705690c BUG 26223 2021-12-31 17:04:31 +08:00
aixianling
984ce203b1 BUG 25154 2021-12-31 17:02:19 +08:00
aixianling
77f52fd8d4 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 16:59:21 +08:00
aixianling
45f6112774 处理异常空白 2021-12-31 16:59:05 +08:00
花有清香月有阴
45f795814c Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev 2021-12-31 16:50:12 +08:00
花有清香月有阴
134e8eeb80 25942 2021-12-31 16:49:59 +08:00
liuye
0e81b4e86a bug 2021-12-31 16:41:01 +08:00
liuye
462b7fd1f9 bug 2021-12-31 16:39:35 +08:00
liuye
5ff431e3c7 问卷表单 2021-12-31 16:28:50 +08:00
aixianling
d10281defd BUG 26288 2021-12-31 16:25:32 +08:00
aixianling
1f24e979de Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 15:48:42 +08:00
aixianling
97c9b83a3d BUG 26286 2021-12-31 15:48:31 +08:00
liuye
c09f92baf8 ct 2021-12-31 15:45:13 +08:00
liuye
787c412fae icon大小 2021-12-31 15:44:46 +08:00
花有清香月有阴
821d78433b 26240 26214 2021-12-31 15:00:32 +08:00
花有清香月有阴
357ffcb793 26280 2021-12-31 14:53:09 +08:00
花有清香月有阴
f0ae82eceb 数据加载 2021-12-31 14:43:20 +08:00
花有清香月有阴
88eefe7c05 26270 2021-12-31 14:30:43 +08:00
花有清香月有阴
26e1d9e6ea Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev 2021-12-31 14:18:52 +08:00
花有清香月有阴
09a7c47480 26269 2021-12-31 14:18:43 +08:00
aixianling
c3a865fa0a Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/apps/AppWalkask/AppWalkask.vue
2021-12-31 14:13:38 +08:00
aixianling
6392826608 BUG 26212 2021-12-31 14:13:00 +08:00
花有清香月有阴
adeb6f3062 26122 2021-12-31 14:07:32 +08:00
花有清香月有阴
7429e255a5 26206 2021-12-31 11:53:11 +08:00
花有清香月有阴
c97b6515f0 26261 2021-12-31 11:48:12 +08:00
花有清香月有阴
b7261fd838 26262 2021-12-31 11:44:34 +08:00
花有清香月有阴
aa9cc87b52 26211 2021-12-31 11:28:45 +08:00
花有清香月有阴
c1e3fbd7b5 26209 2021-12-31 11:11:56 +08:00
花有清香月有阴
6a62d6fbaf 26209 2021-12-31 11:10:29 +08:00
aixianling
88a1e7fddf 同步问卷表单 2021-12-31 11:05:00 +08:00
aixianling
9c75da02dd BUG 26212 2021-12-31 11:03:45 +08:00
aixianling
becae6f41c BUG 26225 2021-12-31 11:00:16 +08:00
aixianling
3805678f60 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 11:00:04 +08:00
aixianling
6a81d36beb BUG 26225 2021-12-31 11:00:00 +08:00
aixianling
5ac5516c84 BUG 26225 2021-12-31 10:59:51 +08:00
花有清香月有阴
7e935bc4c6 人员选择 2021-12-31 10:59:00 +08:00
liuye
1e12c3e3e6 ct 2021-12-31 10:42:04 +08:00
liuye
e809d92adc 问卷表单 2021-12-31 10:41:48 +08:00
aixianling
99f84a7ff2 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 10:28:49 +08:00
aixianling
f395c5afd0 BUG 26119 2021-12-31 10:28:36 +08:00
liuye
c6b145c12f bug 2021-12-31 10:24:08 +08:00
aixianling
41b4957440 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 10:23:02 +08:00
aixianling
8b7c7694c9 BUG 26241 2021-12-31 10:22:47 +08:00
花有清香月有阴
9375544f6c 走访慰问人员选择 2021-12-31 10:19:09 +08:00
aixianling
f191726408 BUG 26233 2021-12-31 10:16:43 +08:00
aixianling
969b64ff97 同步3.0 2021-12-31 09:38:08 +08:00