Commit Graph

100 Commits

Author SHA1 Message Date
Mr.jiang 08623767b9 解决冲突 服务项目 2024-07-02 20:58:59 +08:00
Mr.jiang d35d73df91 订单 优惠卷 2024-07-02 20:57:04 +08:00
kbing1981 9783b9cbfc 修改 2024-07-02 20:56:06 +08:00
kbing1981 5a279054d4 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-02 20:42:04 +08:00
kbing1981 cff73a5beb 修改 2024-07-02 20:38:31 +08:00
Mr.jiang 5e0d1ea2ef 新添加 技师下订单页面 2024-07-02 16:28:26 +08:00
Mr.jiang c398ba23c0 技师详情 2024-07-02 16:18:39 +08:00
Mr.jiang da050a7ee9 地图找人 2024-07-02 16:14:46 +08:00
Mr.jiang f0bf436fee 首页 隐藏最下边 2024-07-02 15:31:05 +08:00
Mr.jiang d4dc0eb777 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-02 15:25:52 +08:00
Mr.jiang 79e51ea04d 订单 2024-07-02 15:25:43 +08:00
kbing1981 f99dcd8226 修改 2024-07-02 11:55:14 +08:00
yangjun bc19d0c4ae 修改文字 2024-07-02 11:49:34 +08:00
Mr.jiang 06f813662a 套餐 次卡 疗程 2024-07-01 23:13:43 +08:00
yangjun e2b6df7640 修改请他上线功能 2024-07-01 21:22:52 +08:00
Mr.jiang c3349ee8ec 次卡 疗程 2024-07-01 19:01:13 +08:00
kbing1981 aab9a8f17c 修改 2024-07-01 18:13:42 +08:00
Mr.jiang bfef0bacd8 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-01 15:59:42 +08:00
Mr.jiang 80330c34cd 套餐订单 修改理疗师更改叫加上 2024-07-01 15:59:33 +08:00
kbing1981 0a212e5fd4 修改 2024-07-01 15:49:08 +08:00
kbing1981 2652079d95 修改 2024-07-01 15:11:07 +08:00
Mr.jiang d8a70bf86d 订单 2024-07-01 11:59:06 +08:00
Mr.jiang 5b0c1a6166 订单 2024-06-30 19:11:56 +08:00
Mr.jiang e00f688ee8 修改 2024-06-30 09:49:59 +08:00
Mr.jiang 66eb03315f Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-29 19:29:59 +08:00
Mr.jiang 10d1eeeaac 订单 2024-06-29 19:29:51 +08:00
kbing1981 2641553045 修改 2024-06-29 19:23:48 +08:00
kbing1981 4c4b85bda4 修改 2024-06-29 17:15:30 +08:00
kbing1981 4211b2d824 修改 2024-06-29 16:47:17 +08:00
Mr.jiang f6717bbb44 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-29 16:45:09 +08:00
Mr.jiang 8766bdd69a 提交已删除 2024-06-29 16:45:01 +08:00
Mr.jiang 533fbf75aa 订单 忙时时间 2024-06-29 16:44:08 +08:00
kbing1981 0deef595d6 修改 2024-06-29 14:51:39 +08:00
kbing1981 7dea68720c 修改 2024-06-29 11:51:07 +08:00
kbing1981 a16b84f785 修改 2024-06-29 10:23:28 +08:00
Mr.jiang 91fec310e1 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-28 23:11:08 +08:00
Mr.jiang 8f56b4484c 订单升级 2024-06-28 23:10:59 +08:00
kbing1981 bba0f25f5f 修改 2024-06-28 17:43:02 +08:00
kbing1981 f491cc6b9b 修改 2024-06-28 17:27:48 +08:00
kbing1981 b2167da8bf 修改 2024-06-28 16:10:50 +08:00
kbing1981 ebd20833b8 修改 2024-06-28 15:55:10 +08:00
kbing1981 50756556dd 修改样式 2024-06-28 15:30:12 +08:00
kbing1981 cfc6abe25c 修改 2024-06-28 14:29:22 +08:00
Mr.jiang 593eb697fe Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-27 23:22:36 +08:00
Mr.jiang 6c9c3a9cd2 订单 2024-06-27 23:22:28 +08:00
kbing1981 e9b9a0e650 搜索框修改 2024-06-27 22:17:57 +08:00
kbing1981 9f72079bae 样式修改 2024-06-27 21:53:03 +08:00
Mr.jiang e710aef4d2 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-27 21:51:29 +08:00
Mr.jiang f58be261bf 订单 2024-06-27 21:51:20 +08:00
bai dc4010dab9 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
# Conflicts:
#	index.html
#	pages/index/index.vue
2024-06-27 21:44:17 +08:00