 perry
|
82692fecaf
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 19:01:23 +08:00 |
|
perry
|
5af1206445
|
下单
|
2023-05-24 18:57:56 +08:00 |
 TianYu
|
4aed73b1d5
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 18:34:46 +08:00 |
|
TianYu
|
66e4d6ee54
|
fix: 调整充值页面生命周期
|
2023-05-24 18:34:43 +08:00 |
 小小张
|
51d1392919
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 18:14:37 +08:00 |
|
小小张
|
c8b41aa45e
|
后台--运费模板：配送区域修改
|
2023-05-24 18:14:14 +08:00 |
|
perry
|
328864388b
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 18:11:23 +08:00 |
|
perry
|
6d81160d30
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 18:10:21 +08:00 |
|
perry
|
ac7a9d9c4c
|
访问地址
|
2023-05-24 18:10:09 +08:00 |
 Jruome
|
cd68bf0be8
|
uniapp 会员权益
|
2023-05-24 17:51:37 +08:00 |
 js199000126
|
fee16f8471
|
商城-购物车
|
2023-05-24 17:11:30 +08:00 |
|
js199000126
|
4f1d28feac
|
商城-购物车
|
2023-05-24 17:08:06 +08:00 |
|
perry
|
cbed37d4f0
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 17:04:28 +08:00 |
|
perry
|
fcb1713e03
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 17:04:14 +08:00 |
|
perry
|
8a23fc1dc9
|
访问地址
|
2023-05-24 17:04:06 +08:00 |
|
Jruome
|
b18ed2551c
|
uniapp 会员权益
|
2023-05-24 17:00:39 +08:00 |
|
TianYu
|
9ccba3d554
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 16:54:18 +08:00 |
|
TianYu
|
989fec4ebc
|
fix: 修复IOS无法生成海报的问题
|
2023-05-24 16:54:06 +08:00 |
|
perry
|
7370c9467f
|
Merge remote-tracking branch 'origin/master'
|
2023-05-24 16:36:54 +08:00 |
|
perry
|
9e28c0b616
|
Merge branch 'feature/mall_product_new'
|
2023-05-24 16:36:38 +08:00 |
tangqian
|
e44f1addb5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 16:34:37 +08:00 |
|
tangqian
|
a1de97950c
|
fix: 商城相关
|
2023-05-24 16:34:28 +08:00 |
|
perry
|
3c94af6408
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-24 16:27:16 +08:00 |
|
perry
|
e9da423776
|
提报记录
|
2023-05-24 16:25:43 +08:00 |
|
TianYu
|
87b0d7353a
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 16:04:19 +08:00 |
|
TianYu
|
51e3506baf
|
fix: 海报文案修改
|
2023-05-24 16:03:59 +08:00 |
|
perry
|
b87a5d35a7
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-24 16:03:33 +08:00 |
|
perry
|
749e4b7459
|
提报记录
|
2023-05-24 16:02:21 +08:00 |
|
TianYu
|
be58048ce7
|
fix: 海报文案修改
|
2023-05-24 16:00:06 +08:00 |
|
TianYu
|
2987f82352
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 15:56:50 +08:00 |
|
TianYu
|
e5ea2d52f7
|
feat: 分销海报生成
|
2023-05-24 15:56:32 +08:00 |
|
tangqian
|
479f0c1079
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 15:41:05 +08:00 |
|
tangqian
|
8a595cbef0
|
fix: 商城相关
|
2023-05-24 15:41:00 +08:00 |
|
小小张
|
a9d146cba1
|
后台--运费模板：配送区域修改
|
2023-05-24 15:40:15 +08:00 |
|
小小张
|
d76f9950a1
|
后台--运费模板：配送区域修改
|
2023-05-24 15:27:08 +08:00 |
|
tangqian
|
c82b495ca5
|
fix: 修改判断用户是否被禁用
|
2023-05-24 14:12:43 +08:00 |
|
perry
|
f1fbbcf36d
|
微信支付
|
2023-05-24 14:10:41 +08:00 |
 js199000131
|
13e8e64726
|
修改商品属性值响应对象
|
2023-05-24 11:34:13 +08:00 |
|
js199000131
|
bb5ef9be1c
|
修改商品规格属性添加对象
|
2023-05-24 11:09:19 +08:00 |
|
tangqian
|
3582bdd395
|
fix: 修改判断用户是否被禁用
|
2023-05-24 11:02:32 +08:00 |
|
TianYu
|
9c1415e411
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-24 10:52:29 +08:00 |
|
tangqian
|
9c626bcbbc
|
fix: 添加支付截至时间
|
2023-05-24 10:35:54 +08:00 |
|
TianYu
|
4afe43b327
|
fix: 修改bug
|
2023-05-24 10:34:35 +08:00 |
|
tangqian
|
fc9922c264
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 10:23:27 +08:00 |
|
tangqian
|
02a33fbf08
|
fix: 添加支付截至时间
|
2023-05-24 10:23:04 +08:00 |
|
js199000126
|
a1295f5943
|
商城
|
2023-05-24 09:46:03 +08:00 |
|
TianYu
|
1c4fb81f08
|
fix: git排除mainifest.json文件
|
2023-05-23 18:09:58 +08:00 |
|
Jruome
|
f9c4d2b102
|
uniapp 会员权益判断
|
2023-05-23 18:08:01 +08:00 |
|
js199000126
|
2e99714330
|
zhy
|
2023-05-23 17:37:49 +08:00 |
|
tangqian
|
9a6e45053c
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-23 17:21:37 +08:00 |