 曹磊
|
9a1bd8bcc7
|
订单页面调整
|
2024-07-23 17:12:25 +08:00 |
 kbing1981
|
b7143fe5b1
|
修改
|
2024-07-23 17:04:31 +08:00 |
|
曹磊
|
7746831e7c
|
订单页面调整
|
2024-07-23 16:55:52 +08:00 |
|
kbing1981
|
ebd411d0a6
|
Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
# Conflicts:
# my/order/payModifyTcMyDaiB.vue
|
2024-07-23 14:08:39 +08:00 |
|
kbing1981
|
27136897ed
|
修改
|
2024-07-23 13:58:27 +08:00 |
|
曹磊
|
fd95ca0fca
|
订单页面调整
|
2024-07-22 23:50:15 +08:00 |
|
kbing1981
|
7ebbc70841
|
订单按钮修改
|
2024-07-22 21:04:01 +08:00 |
 Mr.jiang
|
f6d0ee6aa2
|
拼团
|
2024-07-22 20:19:18 +08:00 |
|
Mr.jiang
|
2cc11e0328
|
Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
|
2024-07-22 19:42:06 +08:00 |
|
Mr.jiang
|
af5303d758
|
秒杀 团购
|
2024-07-22 19:41:55 +08:00 |
|
曹磊
|
91201e5cd4
|
订单页面调整，技师名称粗体
|
2024-07-22 17:50:17 +08:00 |
|
kbing1981
|
69a7c9b7ac
|
修改
|
2024-07-22 17:38:48 +08:00 |
|
曹磊
|
de1be498b7
|
订单页面调整
|
2024-07-22 16:51:13 +08:00 |
|
曹磊
|
d4cb7a9b62
|
订单页面调整
|
2024-07-22 15:36:15 +08:00 |
|
Mr.jiang
|
72c6cd95cc
|
秒杀
|
2024-07-22 13:58:35 +08:00 |
|
曹磊
|
8e29934b65
|
订单页面调整
|
2024-07-22 11:34:43 +08:00 |
|
Mr.jiang
|
3b925b58f2
|
秒杀 视频
|
2024-07-22 10:05:30 +08:00 |
|
曹磊
|
d07e3905e2
|
订单页面调整
|
2024-07-20 18:17:16 +08:00 |
|
kbing1981
|
d1fbcd6579
|
修改
|
2024-07-20 16:32:00 +08:00 |
|
kbing1981
|
843bee8b7b
|
修改
|
2024-07-20 16:11:07 +08:00 |
|
曹磊
|
478003cfc1
|
订单页面调整
|
2024-07-20 09:55:13 +08:00 |
|
kbing1981
|
6d2f0dcd61
|
修改
|
2024-07-19 18:08:22 +08:00 |
|
kbing1981
|
7fd2148d95
|
修改
|
2024-07-19 17:35:02 +08:00 |
|
kbing1981
|
31befdcf2c
|
修改
|
2024-07-19 16:36:11 +08:00 |
|
kbing1981
|
770cd340a4
|
Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
|
2024-07-19 16:18:08 +08:00 |
|
kbing1981
|
662a3ff701
|
修改
|
2024-07-19 16:18:02 +08:00 |
|
曹磊
|
d66d79147d
|
页面调整
|
2024-07-19 15:19:52 +08:00 |
|
Mr.jiang
|
b85e305ade
|
秒杀
|
2024-07-19 15:13:22 +08:00 |
|
Mr.jiang
|
34b4201785
|
订单
|
2024-07-19 10:49:29 +08:00 |
|
kbing1981
|
f1945b04f8
|
修改
|
2024-07-18 18:34:01 +08:00 |
|
kbing1981
|
87963141b7
|
修改
|
2024-07-18 17:28:03 +08:00 |
|
kbing1981
|
fd543d3608
|
修改
|
2024-07-18 16:33:28 +08:00 |
|
kbing1981
|
d16d97fa74
|
修改
|
2024-07-18 15:13:06 +08:00 |
|
kbing1981
|
af5d650a01
|
修改
|
2024-07-18 14:18:02 +08:00 |
|
kbing1981
|
a3fa35c240
|
修改
|
2024-07-18 11:43:32 +08:00 |
|
kbing1981
|
74e6de2c10
|
修改
|
2024-07-18 11:28:49 +08:00 |
|
kbing1981
|
03be2bc145
|
修改
|
2024-07-18 11:00:59 +08:00 |
|
kbing1981
|
6c0c47c5c5
|
修改
|
2024-07-18 10:25:00 +08:00 |
|
kbing1981
|
96717e279c
|
修改
|
2024-07-18 09:54:07 +08:00 |
|
Mr.jiang
|
c818c2c8be
|
修改订单
|
2024-07-17 17:18:58 +08:00 |
|
kbing1981
|
e3d17cef9c
|
Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
|
2024-07-17 16:26:58 +08:00 |
|
kbing1981
|
0d3a343443
|
修改
|
2024-07-17 16:26:47 +08:00 |
|
Mr.jiang
|
dd2206bc17
|
订单
|
2024-07-17 16:25:34 +08:00 |
|
Mr.jiang
|
32a6160cb2
|
解决冲突
|
2024-07-17 16:22:22 +08:00 |
|
Mr.jiang
|
cf97759eff
|
订单
|
2024-07-17 16:15:29 +08:00 |
|
kbing1981
|
2bf4ca08d9
|
修改
|
2024-07-17 16:14:22 +08:00 |
|
kbing1981
|
66b1012301
|
修改
|
2024-07-17 16:12:44 +08:00 |
|
kbing1981
|
41dc6a562f
|
修改
|
2024-07-17 15:49:56 +08:00 |
|
kbing1981
|
ff81695eb6
|
修改
|
2024-07-17 11:35:45 +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
|
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
|
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 |
|
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
|
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
|
40dc0762a2
|
修改
|
2024-07-04 22:10:38 +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
|
ffff0b135c
|
修改
|
2024-07-04 18:17:19 +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 |