 dzc
|
6546f12fe2
|
Merge branch 'biz-mobile-react-cloud/master'
# Conflicts:
# package.json
# src/pages/merchant/components/product-row.vue
# src/sheep/api/shop.ts
# src/sheep/utils/request.ts
|
2025-01-13 20:55:19 +08:00 |
|
 ctw
|
e5049a2bbb
|
1
|
2025-01-13 20:44:58 +08:00 |
|
|
dzc
|
7b45cdfecd
|
feat:食堂库存校验
|
2025-01-13 20:41:25 +08:00 |
|
|
ctw
|
e47fbb4a02
|
商户修改
|
2025-01-13 10:55:35 +08:00 |
|
|
ctw
|
b06b6a0974
|
购物车规格回显；修改超市详情轮播图
|
2025-01-12 22:19:30 +08:00 |
|
|
dzc
|
44fbb4af25
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-11 18:09:20 +08:00 |
|
|
dzc
|
391d748ea6
|
fix:修改
|
2025-01-11 18:09:16 +08:00 |
|
|
ctw
|
d5a8a848be
|
样式微调
|
2025-01-11 12:11:27 +08:00 |
|
|
ctw
|
fd8f6aa1b1
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-10 15:51:20 +08:00 |
|
|
ctw
|
0dfa3d8d59
|
购物车商品数量增减
|
2025-01-10 15:51:15 +08:00 |
|
|
dzc
|
997e3c5c8e
|
feat:商户权限
|
2025-01-10 11:23:54 +08:00 |
|
|
dzc
|
a619a7c3fd
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-09 20:50:43 +08:00 |
|
|
dzc
|
24914f91b0
|
feat:退款，二维码
|
2025-01-09 20:50:39 +08:00 |
|
|
ctw
|
a2b66788a0
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-09 19:55:13 +08:00 |
|
|
ctw
|
1bf83c56c5
|
购物车
|
2025-01-09 19:55:09 +08:00 |
|
|
dzc
|
6033780ac2
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-09 19:47:34 +08:00 |
|
|
dzc
|
9da1737f0d
|
feat:订单、格式化
|
2025-01-09 19:47:31 +08:00 |
|
|
ctw
|
af59902a51
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-09 18:10:28 +08:00 |
|
|
ctw
|
a661245f91
|
1
|
2025-01-09 18:10:10 +08:00 |
|
|
ctw
|
e1902cbfae
|
购物车
|
2025-01-09 18:09:24 +08:00 |
|
|
dzc
|
67f5ca1ef8
|
11
|
2025-01-09 18:08:33 +08:00 |
|
 zjf
|
928652218f
|
Merge remote-tracking branch 'origin/master'
|
2025-01-09 14:17:10 +08:00 |
|
|
zjf
|
f9ae7dc194
|
prod
|
2025-01-09 14:16:23 +08:00 |
|
|
dzc
|
80dee791a2
|
fix：分页修改
|
2025-01-09 14:14:43 +08:00 |
|
|
dzc
|
7bec9e9314
|
H5退款
|
2025-01-09 13:02:35 +08:00 |
|
|
zjf
|
101dedd1bc
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
# Conflicts:
# .env
|
2025-01-09 12:02:22 +08:00 |
|
|
zjf
|
6114c260f5
|
env
|
2025-01-09 12:01:44 +08:00 |
|
|
dzc
|
4f75a10dbf
|
feat:下单页面
|
2025-01-09 09:21:52 +08:00 |
|
|
dzc
|
d5b4fcc18e
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
# Conflicts:
# .env
|
2025-01-08 14:03:59 +08:00 |
|
|
dzc
|
ce027925d4
|
feat:购物车订单
|
2025-01-08 14:03:43 +08:00 |
|
|
zjf
|
58ba7bd0c7
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-08 13:14:48 +08:00 |
|
|
ctw
|
0488f13df3
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-08 09:26:31 +08:00 |
|
|
ctw
|
3a9ad301d4
|
改代理url
|
2025-01-08 09:26:27 +08:00 |
|
|
dzc
|
f15d3dbe90
|
feat:售后订单代码生成
|
2025-01-07 17:41:03 +08:00 |
|
|
dzc
|
88bdcf696b
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-07 16:08:43 +08:00 |
|
|
dzc
|
2af8d5fd0b
|
feat:订单接口替换
|
2025-01-07 16:08:39 +08:00 |
|
|
ctw
|
f5a7b11b68
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-07 14:35:28 +08:00 |
|
|
ctw
|
295a0a0cee
|
1
|
2025-01-07 14:35:23 +08:00 |
|
|
dzc
|
bfbb15502e
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-07 14:34:50 +08:00 |
|
|
dzc
|
c5fb0bd087
|
11
|
2025-01-07 14:34:46 +08:00 |
|
|
ctw
|
ded0ed5093
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-07 14:09:26 +08:00 |
|
|
ctw
|
743fd28cd4
|
接口修改
|
2025-01-07 14:08:42 +08:00 |
|
|
ctw
|
3e8a172fa5
|
接口修改
|
2025-01-07 14:08:31 +08:00 |
|
|
dzc
|
c67dbb4651
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
# Conflicts:
# src/pages/human-face/list.vue
|
2025-01-07 14:08:07 +08:00 |
|
|
dzc
|
d902a85dd7
|
1
|
2025-01-07 14:07:43 +08:00 |
|
|
ctw
|
c966bc423f
|
超市页面修改
|
2025-01-07 13:58:57 +08:00 |
|
|
ctw
|
e39f412205
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
|
2025-01-07 13:07:50 +08:00 |
|
|
ctw
|
6f9d49f088
|
商店购物车页面
|
2025-01-07 13:07:46 +08:00 |
|
|
zjf
|
9c391ef255
|
Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-mobile-react-cloud
# Conflicts:
# .env
# src/sheep/api/user.ts
# vite.config.ts
|
2025-01-07 10:17:55 +08:00 |
|
|
dzc
|
3321d7aeb7
|
feat：商户、订单接口替换
|
2025-01-07 10:17:38 +08:00 |
|