Commit Graph

337 Commits

Author SHA1 Message Date
kbing1981 ff81695eb6 修改 2024-07-17 11:35:45 +08:00
kbing1981 a7abc5551d 修改 2024-07-17 10:43:18 +08:00
kbing1981 8ece548b05 修改 2024-07-17 09:37:30 +08:00
kbing1981 3b2f8bea54 修改 2024-07-16 18:06:38 +08:00
Mr.jiang 15cb892cb6 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-16 17:40:49 +08:00
Mr.jiang 3aaacf98f0 支付 2024-07-16 17:40:41 +08:00
kbing1981 6b19df867c 修改 2024-07-16 17:40:09 +08:00
Mr.jiang 0237af3c38 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-16 17:20:59 +08:00
Mr.jiang 831b28b65e 支付 2024-07-16 17:20:51 +08:00
kbing1981 0e2a825b9d 修改 2024-07-16 16:54:54 +08:00
kbing1981 ac5fa0d82c Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-16 16:10:46 +08:00
kbing1981 957b6c3153 修改 2024-07-16 16:10:35 +08:00
Mr.jiang bfabf81bce 取消 2024-07-16 15:22:19 +08:00
Mr.jiang 17a0e6f9f3 定位 2024-07-16 15:17:09 +08:00
Mr.jiang a32ab9cbe3 定位 2024-07-15 16:30:27 +08:00
Mr.jiang 99752b5910 订单 2024-07-13 13:49:16 +08:00
Mr.jiang b412c01724 取消订单 2024-07-13 10:57:38 +08:00
Mr.jiang 5e35f9a20e 立即支付 2024-07-13 10:04:42 +08:00
Mr.jiang 01dc1704f0 订单 2024-07-12 15:19:57 +08:00
Mr.jiang d362777f0e Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-12 13:51:53 +08:00
Mr.jiang 0e1cca42ad 优惠卷 2024-07-12 13:51:45 +08:00
kbing1981 3382d4dad0 修改 2024-07-12 10:30:52 +08:00
Mr.jiang 1a904501f5 订单 2024-07-11 15:11:00 +08:00
Mr.jiang acff33e097 收缩 2024-07-10 17:58:14 +08:00
Mr.jiang 63b6b9808d 解决冲突 2024-07-10 15:36:52 +08:00
Mr.jiang 01a5b43457 订单 2024-07-10 15:32:28 +08:00
kbing1981 5ba8447c89 修改 2024-07-10 15:32:02 +08:00
kbing1981 f9585514e0 提交 2024-07-10 14:56:29 +08:00
kbing1981 6c3d3143af 修改 2024-07-10 14:33:26 +08:00
kbing1981 f78795134c 修改 2024-07-10 14:20:49 +08:00
kbing1981 50efcee57e 修改 2024-07-10 14:09:53 +08:00
Mr.jiang 5c14d7c09c 带补单 2024-07-09 16:22:55 +08:00
kbing1981 ceb37fe2d1 修改 2024-07-08 11:18:56 +08:00
kbing1981 1f3462231a 1 2024-07-08 10:13:31 +08:00
Mr.jiang f515da5c95 订单 2024-07-06 17:29:11 +08:00
Mr.jiang 2cf6f91820 订单 2024-07-05 23:39:28 +08:00
Mr.jiang cae3d6bc75 会员标识 2024-07-05 17:21:55 +08:00
Mr.jiang 7ba9de08bf Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-05 17:07:32 +08:00
Mr.jiang 016fd69d22 订单 2024-07-05 17:07:24 +08:00
kbing1981 52245742f1 修改 2024-07-05 17:00:11 +08:00
kbing1981 b1cdfa5bec Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-05 14:37:24 +08:00
kbing1981 8240c51b2e 修改按钮颜色 2024-07-05 14:37:18 +08:00
Mr.jiang e5915c1a40 升级 加钟 2024-07-05 14:19:36 +08:00
kbing1981 4a3285cacc 按钮修改 2024-07-05 13:51:11 +08:00
kbing1981 da57d83a24 修改 2024-07-05 11:20:27 +08:00
Mr.jiang ec12f6a390 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 23:06:20 +08:00
Mr.jiang 1061be42d4 提前结束 完成返回订单列表 2024-07-04 23:06:11 +08:00
kbing1981 273572c85f Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 22:53:34 +08:00
kbing1981 e3602cbf1d 修改 2024-07-04 22:53:30 +08:00
Mr.jiang 384e3d9fa3 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 22:45:13 +08:00
Mr.jiang eee5e792dc 订单 提前结束 加非空检验 2024-07-04 22:45:05 +08:00
kbing1981 d3bd4a1f2a 修改 2024-07-04 22:44:11 +08:00
kbing1981 ed210227df 修改 2024-07-04 22:12:33 +08:00
kbing1981 40dc0762a2 修改 2024-07-04 22:10:38 +08:00
kbing1981 e23d7bbd76 修改 2024-07-04 21:32:04 +08:00
kbing1981 cfcc8d3ef8 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 20:01:41 +08:00
kbing1981 5bd8d6ed5f 修改 2024-07-04 20:01:35 +08:00
Mr.jiang cb7342a2db Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 19:13:37 +08:00
Mr.jiang 4c3abc3612 订单 2024-07-04 19:13:27 +08:00
kbing1981 48c278c16b 修改 2024-07-04 18:48:51 +08:00
kbing1981 ffff0b135c 修改 2024-07-04 18:17:19 +08:00
Mr.jiang 29e226d00d 修改样式 首页 设置页 2024-07-04 16:29:53 +08:00
Mr.jiang 6a51eb9a55 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 16:25:30 +08:00
Mr.jiang 7fac5f7b7c 修改上啦 2024-07-04 16:25:22 +08:00
kbing1981 90d182aae7 修改 2024-07-04 15:49:12 +08:00
kbing1981 f5d82c71bc Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-04 15:19:21 +08:00
kbing1981 b797cb5b40 11 2024-07-04 15:19:16 +08:00
Mr.jiang c1054a2500 解决冲突 2024-07-04 15:18:49 +08:00
Mr.jiang c8544716f5 解决冲突 2024-07-04 15:17:22 +08:00
Mr.jiang dc94600414 订单 2024-07-04 15:15:53 +08:00
kbing1981 036ba91a52 修改 2024-07-04 15:05:23 +08:00
kbing1981 4e1e8a5648 修改 2024-07-04 14:16:43 +08:00
Mr.jiang 383de7bd25 充值 2024-07-04 14:13:09 +08:00
kbing1981 435f8b3180 修改 2024-07-04 11:27:25 +08:00
Mr.jiang bc451987c6 解决冲突 2024-07-04 11:25:14 +08:00
Mr.jiang 084024dc9a 优惠卷 2024-07-04 11:23:46 +08:00
kbing1981 1d057585ac 修改 2024-07-04 11:23:22 +08:00
Mr.jiang 09190c51ac 订单 2024-07-04 10:46:53 +08:00
Mr.jiang 7f89ece0e6 订单 2024-07-03 22:44:38 +08:00
kbing1981 e6f1fceb6a 修改 2024-07-03 22:31:18 +08:00
kbing1981 53e5be9ac0 修改 2024-07-03 22:22:32 +08:00
kbing1981 6cee0d1069 修改 2024-07-03 22:00:31 +08:00
kbing1981 6671923915 修改 2024-07-03 21:38:33 +08:00
kbing1981 c6bd469164 修改 2024-07-03 21:07:48 +08:00
Mr.jiang 1790ba749b Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-03 21:02:59 +08:00
Mr.jiang 47c981a528 新添加 待补单页面 2024-07-03 21:02:51 +08:00
kbing1981 81c3308c83 修改 2024-07-03 21:02:16 +08:00
kbing1981 9f8d8962d3 修改 2024-07-03 20:54:01 +08:00
kbing1981 d4dd473ff4 修改 2024-07-03 19:21:35 +08:00
kbing1981 86ae73e7ca 修改 2024-07-03 19:12:55 +08:00
kbing1981 d28d5ed41b 钱包 2024-07-03 19:06:14 +08:00
Mr.jiang 3c9750f84e 解决冲突 2024-07-03 18:07:10 +08:00
Mr.jiang f5c86a0d9a 解决冲突 2024-07-03 18:03:15 +08:00
Mr.jiang 17b76ee4d6 订单 2024-07-03 17:58:22 +08:00
kbing1981 d1e77bbcad 修改 2024-07-03 17:48:11 +08:00
kbing1981 6731e144e3 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-03 17:05:00 +08:00
kbing1981 d75f968020 11 2024-07-03 17:04:55 +08:00
Mr.jiang 3aafcc728a Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-03 16:45:11 +08:00
Mr.jiang 56484584b8 订单 2024-07-03 16:45:02 +08:00
kbing1981 43de99ab7b 修改 2024-07-03 16:44:55 +08:00
kbing1981 3b3353b99e 修改 2024-07-03 16:38:24 +08:00
kbing1981 8f6b41e777 修改 2024-07-03 16:10:27 +08:00
kbing1981 6ae425ad37 修改 2024-07-03 15:40:31 +08:00
kbing1981 54413ee587 修改 2024-07-03 15:26:53 +08:00
kbing1981 e07afc1a7a 修改 2024-07-03 14:39:09 +08:00
kbing1981 7f15027dfe 修改 2024-07-03 14:10:49 +08:00
Mr.jiang 83b25d3b04 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-03 12:23:28 +08:00
Mr.jiang 79dbb9be43 订单 2024-07-03 12:23:20 +08:00
kbing1981 bb4bc54ca8 修改 2024-07-03 12:15:39 +08:00
kbing1981 da081d9ff4 修改 2024-07-03 11:23:30 +08:00
Mr.jiang 37a1929817 样式 2024-07-03 09:57:08 +08:00
Mr.jiang 59bbf93062 钱包明细 2024-07-03 09:24:22 +08:00
Mr.jiang 91cf5ce400 样式 2024-07-03 09:21:00 +08:00
Mr.jiang 4068e297b3 订单 首页 加 新人红包 2024-07-02 22:23:55 +08:00
Mr.jiang 08623767b9 解决冲突 服务项目 2024-07-02 20:58:59 +08:00
Mr.jiang d35d73df91 订单 优惠卷 2024-07-02 20:57:04 +08:00
kbing1981 1a1c4de655 修改 2024-07-02 20:42:12 +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 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 792881a9f4 修改 2024-07-02 10:55:17 +08:00
kbing1981 e2bce12390 修改 2024-07-02 10:41:38 +08:00
Mr.jiang 06f813662a 套餐 次卡 疗程 2024-07-01 23:13:43 +08:00
kbing1981 37da7cc08f 修改 2024-07-01 23:12:45 +08:00
Mr.jiang c3349ee8ec 次卡 疗程 2024-07-01 19:01:13 +08:00
Mr.jiang 559d32672f 订单 2024-07-01 16:14:35 +08:00
kbing1981 6cf6f17e23 修改 2024-07-01 16:10:14 +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 8e095b7023 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-07-01 15:11:21 +08:00
kbing1981 2652079d95 修改 2024-07-01 15:11:07 +08:00
Mr.jiang d5b03511a5 优惠卷 订单 2024-07-01 13:55:22 +08:00
kbing1981 d37076d00c 充值修改 2024-07-01 12:10:23 +08:00
Mr.jiang d8a70bf86d 订单 2024-07-01 11:59:06 +08:00
kbing1981 560ba6fb24 充值样式修改 2024-07-01 11:50:18 +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 697161c995 修改 2024-06-29 19:25:59 +08:00
kbing1981 2641553045 修改 2024-06-29 19:23:48 +08:00
kbing1981 06c256cb55 修改 2024-06-29 17:55:34 +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 533fbf75aa 订单 忙时时间 2024-06-29 16:44:08 +08:00
kbing1981 0deef595d6 修改 2024-06-29 14:51:39 +08:00
Mr.jiang f821efbe3d 订单 2024-06-29 11:57:19 +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
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 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
kbing1981 a8bd46ccd5 样式修改 2024-06-27 21:38:00 +08:00
kbing1981 363a01f341 修改 2024-06-27 21:03:35 +08:00
Mr.jiang 174fe5ba0b 解决冲突 2024-06-27 20:15:10 +08:00
Mr.jiang 73572c083a 解决冲突 2024-06-27 20:11:12 +08:00
Mr.jiang 64a6295fda 添加页面 定位 2024-06-27 20:04:31 +08:00
kbing1981 4c25900e83 修改 2024-06-27 20:02:52 +08:00
kbing1981 4094c13124 修改 2024-06-27 17:29:31 +08:00
kbing1981 8f93e021c7 样式 2024-06-26 19:38:40 +08:00
Mr.jiang 9398520b87 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-26 17:29:34 +08:00
Mr.jiang 6f090681ff 项目支付订单 新加选择优惠劵页面 修改选择时间组件 2024-06-26 17:29:23 +08:00
kbing1981 590ca26020 样式修改 2024-06-26 15:46:40 +08:00
Mr.jiang b23e5ef90f Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 2024-06-26 14:26:44 +08:00
Mr.jiang 41fbd2c76d 修改技师项目 下单 2024-06-26 14:26:33 +08:00
kbing1981 a2e98b6867 样式修改 2024-06-26 14:25:42 +08:00
Mr.jiang f5ac5466a4 会员 2024-06-26 11:35:32 +08:00
Mr.jiang 3b69fa7ee1 套餐 2024-06-25 21:25:46 +08:00
Mr.jiang afb296cc5f 地图定位 充值 2024-06-25 15:20:37 +08:00
Mr.jiang b8b9e24eef 充值 2024-06-25 13:59:23 +08:00
Mr.jiang 43f2d0ed9d 充值 2024-06-25 10:50:05 +08:00
Mr.jiang 366746a765 确认拒单 2024-06-25 10:09:59 +08:00
Mr.jiang 8232c879e3 充值跳页 2024-06-25 10:00:22 +08:00
Mr.jiang 79f90a6807 为TA充值 2024-06-25 09:51:43 +08:00
Mr.jiang 05c4e9d23f 打包 2024-06-25 09:47:53 +08:00
Mr.jiang 0d5dc4dded 调试接口 2024-06-24 11:29:11 +08:00
Mr.jiang 6019afb30e 删除 没用页面 2024-06-15 20:59:02 +08:00
Mr.jiang fec021a9ea 接口联调 2024-06-15 09:08:10 +08:00
Mr.jiang 535830d7bc 测试 2024-06-12 15:52:21 +08:00
yangjun efc71d3e60 1 2024-06-05 19:16:02 +08:00