Commit Graph

400 Commits

Author SHA1 Message Date
闫晓茹
588b2f5646 修改问诊平台和退出登录 2023-11-07 17:04:46 +08:00
闫晓茹
a1144a768f 修改问诊平台 2023-11-07 13:54:06 +08:00
闫晓茹
0714e8b900 订单详情返回上一页 2023-11-03 15:33:55 +08:00
shidongli
c97f1d825a 修改 2023-11-03 14:22:40 +08:00
shidongli
55eff3013f 护理服务项目详情 2023-11-03 10:23:53 +08:00
shidongli
0a18d1b8d3 修改专家咨询 2023-11-02 17:24:47 +08:00
闫晓茹
2e62e6fa6a 专家咨询返回和详情 2023-11-02 16:54:17 +08:00
闫晓茹
cec8246940 专家咨询返回 2023-11-02 16:27:41 +08:00
shidongli
db4d6f3b78 console.log 2023-11-02 16:13:49 +08:00
闫晓茹
b71916fe93 Merge remote-tracking branch 'origin/dev' into dev 2023-11-02 15:28:40 +08:00
闫晓茹
832a4a403c 专家咨询订单详情 2023-11-02 15:27:36 +08:00
shidongli
902974c06b 商品 2023-11-02 15:23:17 +08:00
shidongli
2cb735a0b3 专家咨询订单 按钮 2023-11-02 14:49:10 +08:00
闫晓茹
c6d7438789 搜索 2023-11-02 14:44:32 +08:00
shidongli
35b4893cf6 我的 2023-11-02 14:39:14 +08:00
shidongli
13ae5ab43d 订单详情 2023-11-02 14:14:43 +08:00
闫晓茹
ee3f40a8e9 搜索 2023-11-02 11:40:28 +08:00
shidongli
1ed614c588 筛查预约 2023-11-02 10:46:35 +08:00
闫晓茹
4fbfa52008 Merge remote-tracking branch 'origin/dev' into dev 2023-11-01 17:34:10 +08:00
闫晓茹
f74bbff796 专家咨询 2023-11-01 17:33:57 +08:00
shidongli
b3b997736a 服务评价 2023-11-01 15:53:38 +08:00
shidongli
21e7835c7a 订单详情 2023-11-01 11:38:00 +08:00
shidongli
a8f86d6ac0 我的订单 2023-11-01 10:53:12 +08:00
shidongli
c405783f3e 管理家庭成员 2023-11-01 10:43:02 +08:00
shidongli
2ce58756ee Merge remote-tracking branch 'origin/dev' into dev 2023-11-01 10:23:29 +08:00
shidongli
ebcf143a65 商品订单 2023-11-01 10:23:12 +08:00
闫晓茹
c8f8a9812c 专家咨询 2023-11-01 10:00:47 +08:00
shidongli
51abc350f8 护理机构服务订单 2023-11-01 09:24:33 +08:00
shidongli
c85efcac09 问诊平台 2023-10-31 17:15:54 +08:00
闫晓茹
7528aeba63 支付 2023-10-31 15:49:29 +08:00
闫晓茹
e7be819cf3 修改citycode 2023-10-31 10:37:09 +08:00
shidongli
a0c54b7d99 管理家庭成员 2023-10-30 14:56:03 +08:00
a18767dfe7 修改 2023-10-30 10:36:26 +08:00
bb04a4221d 修改 2023-10-27 17:08:20 +08:00
b1d250b542 Merge remote-tracking branch 'origin/dev' into dev 2023-10-27 17:02:45 +08:00
92cf161a9d 修改 2023-10-27 17:02:33 +08:00
闫晓茹
d62ff50422 专家咨询订单 2023-10-27 16:55:35 +08:00
闫晓茹
ee2eeca204 商品订单搜索 2023-10-27 16:52:25 +08:00
f95a8d1d6f 修改 2023-10-27 16:47:12 +08:00
闫晓茹
3c2586e921 商品订单搜索 2023-10-27 16:43:40 +08:00
闫晓茹
2a478673db Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pagesB/ExpertlookOrder/ExpertlookOrder.vue
2023-10-27 16:38:38 +08:00
2a68a6f2b8 修改 2023-10-27 16:37:28 +08:00
闫晓茹
f1db92d910 专家咨询订单 2023-10-27 16:37:14 +08:00
shidongli
469a9cc6b0 预约时间 2023-10-27 16:27:52 +08:00
闫晓茹
e99a608d8c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	api/pagesB/CommodityOrder/index.js
2023-10-27 16:15:54 +08:00
闫晓茹
8fa5ee73fb 商品订单 2023-10-27 16:15:23 +08:00
59c11c781d 修改 2023-10-27 15:37:24 +08:00
37ea3648d9 修改 2023-10-27 15:08:27 +08:00
52cd660c26 修改 2023-10-27 09:36:30 +08:00
b6cb956527 修改 2023-10-24 11:29:49 +08:00
闫晓茹
7b451c3516 Merge remote-tracking branch 'origin/dev' into dev 2023-10-24 10:57:05 +08:00
闫晓茹
295875d015 搜索 2023-10-24 10:56:49 +08:00
df45115551 修改 2023-10-24 10:46:21 +08:00
a0564657ee 修改 2023-10-24 09:47:58 +08:00
3951bffdfe 修改 2023-10-24 09:35:49 +08:00
b9b8914474 修改 2023-10-23 16:32:39 +08:00
shidongli
c4dd3cbb42 评价 2023-10-20 17:06:31 +08:00
shidongli
8a4509c6a5 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages.json
2023-10-20 15:49:49 +08:00
shidongli
1e12e5efe5 服务评价 2023-10-20 15:47:52 +08:00
闫晓茹
7a1212355b Merge remote-tracking branch 'origin/dev' into dev 2023-10-19 17:22:14 +08:00
闫晓茹
4a9a87c7b4 筛查预约 2023-10-19 17:17:20 +08:00
shidongli
6ad402ac00 家庭成员 2023-10-19 15:54:17 +08:00
闫晓茹
66241d94f6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-19 13:51:29 +08:00
闫晓茹
69dfc0dfda 完善筛查预约 2023-10-19 13:51:15 +08:00
shidongli
dc2c2368ba 首页-筛查记录 2023-10-19 13:26:38 +08:00
shidongli
ca5d324636 筛查结果 2023-10-19 11:51:15 +08:00
闫晓茹
9da8c95d2e 完善筛查预约 2023-10-19 09:36:47 +08:00
shidongli
732f11e3f4 退出登录+解绑家庭成员 2023-10-18 10:56:01 +08:00
shidongli
7e62289957 管理家庭成员 2023-10-17 17:26:09 +08:00
shidongli
817214fae8 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:20:17 +08:00
shidongli
31f4717f78 添加成员+切换账号+注册 2023-10-17 16:20:03 +08:00
72f0f832f2 修改 2023-10-17 14:52:27 +08:00
7d37353fe0 修改 2023-10-17 14:13:17 +08:00
3789016108 修改 2023-10-17 11:42:24 +08:00
bb428bdcf5 修改 2023-10-17 11:02:14 +08:00
shidongli
162a2866c6 服务评价 2023-10-16 16:03:32 +08:00
闫晓茹
5b614668e7 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 15:18:52 +08:00
闫晓茹
aae97adee4 修改个人信息 2023-10-16 15:18:40 +08:00
0159f37fb5 修改 2023-10-16 15:11:26 +08:00
闫晓茹
1408a11a3f 修改信息 2023-10-16 14:19:19 +08:00
38117c873c Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 11:28:42 +08:00
dff68c1684 修改 2023-10-16 11:28:16 +08:00
闫晓茹
c5ff394203 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 11:24:13 +08:00
闫晓茹
b248de305a 修改信息 2023-10-16 11:23:57 +08:00
619abedc69 修改 2023-10-16 11:21:27 +08:00
40d88dbc4d 修改 2023-10-16 10:08:17 +08:00
116b83557b 修改 2023-10-16 09:25:38 +08:00
4fde91ade5 修改 2023-10-16 09:19:16 +08:00
shidongli
df7fef1a3a 筛查结果 2023-10-13 18:13:31 +08:00
闫晓茹
96e25a3944 修改信息 2023-10-13 17:32:38 +08:00
闫晓茹
549ef3474c Merge remote-tracking branch 'origin/dev' into dev 2023-10-13 15:41:21 +08:00
闫晓茹
efb0bd7cde 修改预约筛查 2023-10-13 15:41:07 +08:00
shidongli
89fe9b3184 管理成员 添加成员 2023-10-13 15:34:14 +08:00
闫晓茹
fad8140fcc Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages.json
2023-10-13 15:18:23 +08:00
闫晓茹
74ffed31b9 护理服务+登录注册 2023-10-13 15:17:41 +08:00
82a151ff81 修改 2023-10-13 13:39:29 +08:00
shidongli
5859b4a6ef 筛查结果 2023-10-13 10:40:42 +08:00
shidongli
408ca425bf 筛查记录 2023-10-13 10:17:42 +08:00
415a58fedf 修改 2023-10-12 15:54:10 +08:00
8e8da1c446 修改 2023-10-12 14:31:36 +08:00
闫晓茹
d11b8b6c07 添加token 2023-10-12 13:39:34 +08:00
0b7b6fe9f7 修改 2023-10-12 13:23:07 +08:00
de6c8b4c43 修改 2023-10-12 11:24:37 +08:00
9e5f2b1aa4 修改 2023-10-12 10:46:44 +08:00
09247c0698 修改 2023-10-12 09:47:40 +08:00
闫晓茹
13c4cc9c24 服务预约 2023-10-11 17:38:22 +08:00
shidongli
5c9c7901c5 筛查结果 2023-10-11 15:13:02 +08:00
shidongli
a719e9d2c9 Merge remote-tracking branch 'origin/dev' into dev 2023-10-10 17:35:51 +08:00
shidongli
43194a0be4 筛查结果 筛查记录 选择项目 2023-10-10 17:35:36 +08:00
闫晓茹
c92a6c546d 预约筛查 2023-10-10 17:15:30 +08:00
闫晓茹
d26dd99fb2 预约筛查+护理服务 2023-10-10 14:01:25 +08:00
31887d0eee 修改 2023-10-10 10:24:50 +08:00
07e186c794 修改 2023-10-09 15:19:17 +08:00
190bdc1370 修改 2023-10-09 13:47:07 +08:00
cb37429c4f 修改 2023-10-09 11:20:25 +08:00
8dba57fd68 修改 2023-10-09 11:01:56 +08:00
0dd52f0fb2 修改 2023-10-09 10:58:52 +08:00
闫晓茹
4e171bb456 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages.json
2023-10-09 09:32:51 +08:00
闫晓茹
41bdde4884 在线签约 2023-10-09 09:31:42 +08:00
fe894299fe 修改 2023-10-08 17:03:35 +08:00
a700032b12 修改 2023-10-08 16:18:56 +08:00
闫晓茹
08d79d5f68 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages.json
#	pages/medicalservice/medicalservice.vue
2023-10-08 16:17:45 +08:00
闫晓茹
f6dceabdb2 在线签约 2023-10-08 16:16:18 +08:00
shidongli
09e2d07e02 筛查结果 筛查记录 2023-10-08 15:54:14 +08:00
3d5b6c998e 修改 2023-10-08 14:51:36 +08:00
shidongli
51e37c57b6 筛查结果 2023-10-08 14:48:39 +08:00
shidongli
75edc50c1f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages.json
2023-10-07 11:11:17 +08:00
shidongli
4c008f3002 我的预约 服务记录 2023-10-07 11:08:50 +08:00
10fd12076b 修改 2023-09-28 17:06:51 +08:00
shidongli
72af36765e Merge remote-tracking branch 'origin/dev' into dev 2023-09-28 14:34:54 +08:00
shidongli
013ba04c41 服务记录 2023-09-28 14:34:36 +08:00
3eeeb98982 修改 2023-09-28 10:35:07 +08:00
shidongli
0203e5e3e3 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages.json
2023-09-27 16:21:15 +08:00
shidongli
bc3f255e5f 专家咨询订单 2023-09-27 16:20:09 +08:00
闫晓茹
b8b5f0cd2f 首页+兑换记录 2023-09-27 13:50:42 +08:00
d25a8e21b8 修改 2023-09-27 08:54:20 +08:00
656a9abe99 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 08:49:00 +08:00
db9fc9ed66 修改 2023-09-27 08:47:36 +08:00
闫晓茹
bdeafb272c 积分商城+兑换记录 2023-09-26 17:59:59 +08:00
shidongli
3b57655f6d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pagesB/medicine/medicine.scss
2023-09-26 17:13:54 +08:00
shidongli
f0433b588c 修改样式 2023-09-26 17:12:59 +08:00
1139a0c4d8 修改 2023-09-26 17:06:57 +08:00
cbeeea455f 修改 2023-09-26 16:42:18 +08:00
5078dda627 修改 2023-09-26 15:39:25 +08:00
68a856d500 修改 2023-09-26 15:27:19 +08:00
e5a6a0758e 修改 2023-09-26 14:56:42 +08:00
013682286d 修改 2023-09-26 14:30:59 +08:00
005536128c 修改 2023-09-26 09:59:01 +08:00
6389cbc7e8 修改 2023-09-26 09:08:56 +08:00
96d6796579 修改 2023-09-25 11:04:44 +08:00
27b5b10b86 修改 2023-09-22 16:41:08 +08:00
9f35420410 修改 2023-09-22 16:39:41 +08:00
edcccac0be 修改 2023-09-22 16:23:01 +08:00
aec385bc3c 修改 2023-09-22 16:01:48 +08:00
56aaa816e9 修改 2023-09-22 15:55:00 +08:00
ea547f8b09 修改 2023-09-22 15:50:24 +08:00
e37f51f2bd 修改 2023-09-22 15:39:13 +08:00
1bb6bde497 Merge remote-tracking branch 'origin/dev' into dev 2023-09-22 15:29:57 +08:00
54ce712307 修改 2023-09-22 15:29:53 +08:00
shidongli
65694347aa Merge remote-tracking branch 'origin/dev' into dev 2023-09-22 15:26:52 +08:00
shidongli
004e8fa615 护理机构图片 2023-09-22 15:26:39 +08:00
闫晓茹
c16ba58558 修改 2023-09-22 15:19:20 +08:00
4873fd6192 修改 2023-09-22 15:07:32 +08:00
9c912b1b9c 修改 2023-09-22 15:07:20 +08:00
96023542d9 Merge remote-tracking branch 'origin/dev' into dev 2023-09-22 14:50:59 +08:00
2ec9370a36 修改 2023-09-22 14:50:49 +08:00
闫晓茹
ffedb634a8 Merge remote-tracking branch 'origin/dev' into dev 2023-09-22 14:07:29 +08:00
e2fc505a3a 新医路健康服务平台 2023-09-22 14:07:12 +08:00
闫晓茹
c01543f18c 修改 2023-09-22 14:07:12 +08:00
ad4a54b529 新医路健康服务平台 2023-09-22 11:49:36 +08:00
shidongli
13825f6afc Merge remote-tracking branch 'origin/dev' into dev 2023-09-22 11:45:44 +08:00
shidongli
03c3bde132 修改 2023-09-22 11:45:25 +08:00
e16d8235c7 新医路健康服务平台 2023-09-22 11:45:09 +08:00
闫晓茹
a5e712afd2 修改 2023-09-22 11:40:37 +08:00
66e5244764 修改 2023-09-22 11:34:53 +08:00
c45269efff 修改 2023-09-22 11:30:57 +08:00
c36e398b05 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pagesB/modify/modify.scss
#	pagesB/modify/modify.vue
2023-09-22 11:10:37 +08:00
145acb7c62 引入泉医到家 2023-09-22 11:08:14 +08:00
shidongli
81fb2e3ac3 修改信息 选中颜色 2023-09-21 09:48:58 +08:00
shidongli
9cfe7cd9f4 修改信息 性别 2023-09-21 09:45:33 +08:00
shidongli
ea8e90c710 修改 2023-09-20 17:59:34 +08:00
闫晓茹
33e7acf934 行为积分页面 2023-09-20 17:44:17 +08:00
shidongli
dfc24ec1fe 修改信息 2023-09-20 17:43:13 +08:00
闫晓茹
b834b8fafd 行为积分页面 2023-09-20 15:30:34 +08:00
shidongli
857894c932 修改信息 2023-09-20 15:25:08 +08:00
shidongli
897df02fb4 修改信息 2023-09-20 15:17:43 +08:00
shidongli
978b8228a7 修改信息 2023-09-20 15:05:04 +08:00
8768dcdc5b 修改 2023-09-20 14:32:33 +08:00
闫晓茹
8ab7c44ba5 行为积分页面 2023-09-20 14:26:05 +08:00
闫晓茹
02405cf3f6 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	pages/myinformation/myinformation.vue
2023-09-20 14:22:42 +08:00
闫晓茹
c639a37ade 行为积分页面 2023-09-20 14:21:34 +08:00
2dc0b9dbee 健康豆页面 2023-09-20 14:07:06 +08:00
a51ae013af 优惠券页面 2023-09-20 13:52:33 +08:00
00128f8670 优惠券页面 2023-09-20 13:52:08 +08:00
5c0da7f439 优惠券页面 2023-09-20 12:09:09 +08:00
dba1c889ce 新增管理家庭成员页面 2023-09-20 12:06:32 +08:00
3cb9bdcf14 修改 2023-09-20 11:43:06 +08:00
d3aa0aab83 修改所有页面标头的背景颜色和字体颜色 2023-09-20 11:42:34 +08:00
eab0466291 首次提交 2023-09-19 15:00:02 +08:00
e5c5ef2982 首次提交 2023-09-19 14:58:40 +08:00