zhangds
|
7130c5d136
|
fix: 修复组合商品为立减金，使用成功结算无法添加
|
2024-03-06 20:36:42 +08:00 |
wangsongsole
|
4b4ce49c3d
|
🔀 merge: 合并分支
|
2024-03-06 14:26:52 +08:00 |
|
wangsongsole
|
51f358a636
|
🦀️ fix: 解决组合商品模板报错问题
|
2024-03-06 14:15:58 +08:00 |
|
wangsongsole
|
a9906f78ea
|
🦀️ fix: 修复分销商商户bug
|
2024-03-06 13:52:12 +08:00 |
|
zhangds
|
0def09c38d
|
Merge branch 'merchant' into clearingForm
|
2024-03-06 13:33:02 +08:00 |
|
wangsongsole
|
932d8040fe
|
💪 optimize: 优化立减金使用说明引用
|
2024-03-06 10:40:13 +08:00 |
|
zhangds
|
9861444f34
|
fix: 修复组合商品
|
2024-03-05 20:07:56 +08:00 |
|
zhangds
|
482f1856ab
|
Merge branch 'flex' into clearingForm
|
2024-03-05 18:07:23 +08:00 |
|
zhangds
|
1ff519a60d
|
Merge branch 'master' into clearingForm
|
2024-03-05 17:38:46 +08:00 |
|
wangsongsole
|
8f46242cbc
|
🦀️ fix: 修复线上bug
|
2024-03-05 17:31:17 +08:00 |
|
wangsongsole
|
b0721b9717
|
🦀️ fix: 修复复制计划组合商品现在不正常问题
|
2024-03-05 17:28:15 +08:00 |
|
wangsongsole
|
71f969dcc2
|
Merge branch 'master' into openType
|
2024-03-05 16:59:29 +08:00 |
|
wangsongsole
|
1da55200bf
|
Merge branch 'master' into merchant
|
2024-03-05 16:58:51 +08:00 |
|
wangsongsole
|
73e69f2fc6
|
🦀️ fix: 修复bug
|
2024-03-05 16:57:36 +08:00 |
|
wangsongsole
|
89be51a37d
|
🦀️ fix: 修复bug
|
2024-03-05 16:38:12 +08:00 |
|
wangsongsole
|
6574631557
|
🦀️ fix: 修复bug
|
2024-03-05 15:47:32 +08:00 |
|
zhangds
|
f5ca1c6d91
|
fix: 修改白名单
|
2024-03-05 11:56:21 +08:00 |
|
zhangds
|
df6f9e3621
|
fix: 增加新增编辑复制，白名单判断
|
2024-03-05 11:52:20 +08:00 |
|
wangsongsole
|
97958076e1
|
💪 optimize: 优化微信立减金打开方式
|
2024-03-05 10:55:38 +08:00 |
|
zhangds
|
a7a5159d55
|
Merge branch 'master' into clearingForm
|
2024-03-05 10:28:29 +08:00 |
|
wangsongsole
|
b4c6cddad9
|
Merge branch 'master' into merchant
|
2024-03-05 10:00:06 +08:00 |
|
wangsongsole
|
805a1cc2b4
|
Merge branch 'master' into openType
|
2024-03-05 09:59:50 +08:00 |
|
zhangds
|
e17c715a2b
|
feat: 增加组合商品 包码兼容
|
2024-03-04 18:29:30 +08:00 |
|
wangsongsole
|
b0738baff5
|
🎨 style: 优化组合商品模板组件样式
|
2024-03-04 17:26:03 +08:00 |
|
zhangds
|
73a47ab310
|
fix: 增加计划id
|
2024-03-04 16:33:47 +08:00 |
|
zhangds
|
b685cd8ca5
|
fix: 增加key批次plan id
|
2024-03-04 16:16:52 +08:00 |
|
zhangds
|
84eed85e11
|
fix: 增加复制的id
|
2024-03-04 16:10:15 +08:00 |
|
wangsongsole
|
3ad11ac05c
|
🦀️ fix: 修正兑换码管理-组合商品-发放总量校验问题
|
2024-03-04 15:45:10 +08:00 |
|
zhangds
|
c91eeb39a4
|
Merge branch 'master' into clearingForm
|
2024-03-04 15:44:26 +08:00 |
|
zhangds
|
782dac1c5c
|
fix: 兼容 组合商品
|
2024-03-04 15:39:26 +08:00 |
|
wangsongsole
|
a981c4378f
|
🦀️ fix: 修复bug
|
2024-03-04 15:30:34 +08:00 |
|
wangsongsole
|
2b6f5a2e5f
|
🦀️ fix: 修复bug
|
2024-03-04 15:13:13 +08:00 |
|
zhangds
|
afdaf75932
|
fix: 修复包码列表
|
2024-03-04 15:06:30 +08:00 |
|
wangsongsole
|
d9112d0ee4
|
🗑️ delete: 删除log
|
2024-03-04 14:47:21 +08:00 |
|
wangsongsole
|
c8662fbd9b
|
✨ feat: 组合商品新增微信立减金打开方式
|
2024-03-04 14:40:18 +08:00 |
|
zhangds
|
d1c9bacb95
|
fix: 修复 兑换码包码
|
2024-03-04 14:28:13 +08:00 |
|
wangsongsole
|
5cf00128ea
|
🎨 style: 优化组合商品模板样式
|
2024-03-04 11:53:27 +08:00 |
|
wangsongsole
|
462843304e
|
✨ feat: 对接动态商户加密类型
|
2024-03-04 11:28:07 +08:00 |
|
wangsongsole
|
7e89178ff0
|
🦀️ fix: 修复bug
|
2024-03-04 10:50:13 +08:00 |
|
wangsongsole
|
04ab296f0a
|
🎨 style: 优化组合商品模板样式
|
2024-03-04 10:23:41 +08:00 |
|
wangsongsole
|
c6ff21aa06
|
🎨 style: 优化样式
|
2024-03-04 10:21:46 +08:00 |
|
wangsongsole
|
f2db850fe4
|
🔀 merge: 合并分支
|
2024-03-04 10:14:59 +08:00 |
|
zhangds
|
bd401463de
|
fix: 修改编辑
|
2024-03-03 17:37:06 +08:00 |
|
zhangds
|
cfe12e4d4c
|
fix: 修复白名单 包码结算
|
2024-03-03 17:19:46 +08:00 |
|
zhangds
|
000f6de836
|
fix: 修改兑换码管理，复制和编辑包码不可操作
|
2024-03-03 16:04:36 +08:00 |
|
wangsongsole
|
6d625181b8
|
🔖 version: 发布
|
2024-03-02 03:24:51 +08:00 |
|
wangsongsole
|
6deeaacf0a
|
🦀️ fix: 修复bug
|
2024-03-02 03:17:27 +08:00 |
|
wangsongsole
|
e77db22db1
|
🔖 version: 镜像包
|
2024-03-02 03:12:36 +08:00 |
|
wangsongsole
|
1599254ae8
|
🔖 version: 测试
|
2024-03-02 01:31:12 +08:00 |
|
wangsongsole
|
70f676218b
|
🦀️ fix: 修复bug
|
2024-03-02 01:29:16 +08:00 |
|
wangsongsole
|
42cdc06100
|
🔖 version: 发布
|
2024-03-02 01:17:44 +08:00 |
|
wangsongsole
|
466246ae9f
|
🔖 version: 发布
|
2024-03-02 01:07:29 +08:00 |
|
wangsongsole
|
c56cb505eb
|
🔖 version: 发布
|
2024-03-02 01:03:07 +08:00 |
|
wangsongsole
|
babc59a26f
|
🦀️ fix: 修复bug
|
2024-03-02 00:54:41 +08:00 |
|
wangsongsole
|
242235d1cf
|
🔖 version: 发布样式
|
2024-03-02 00:32:25 +08:00 |
|
wangsongsole
|
f61e2c38f1
|
✨ feat: 新增商品描述选项
|
2024-03-01 22:37:14 +08:00 |
|
wangsongsole
|
25e85e484a
|
🎨 style: 批量是上传查询新增文案
|
2024-03-01 14:42:32 +08:00 |
|
wangsongsole
|
2f614e9edf
|
🎨 style: 有组合商品移动端组件
|
2024-03-01 10:40:02 +08:00 |
|
wangsongsole
|
1b2705fa2c
|
🦀️ fix: 修复bug
|
2024-02-29 17:57:09 +08:00 |
|
wangsongsole
|
6eef39e7b8
|
✨ feat: 京东E卡默认图片
|
2024-02-29 17:39:47 +08:00 |
|
wangsongsole
|
f92b2297ea
|
✨ feat: 新增云闪付立减金默认提示
|
2024-02-29 17:00:57 +08:00 |
|
wangsongsole
|
933937036d
|
🦀️ fix: 修复bug
|
2024-02-29 16:24:38 +08:00 |
|
wangsongsole
|
99c117d34b
|
🦀️ fix: 修复bug
|
2024-02-29 15:02:27 +08:00 |
|
wangsongsole
|
d2914a606f
|
🦀️ fix: 修复bug
|
2024-02-29 14:41:14 +08:00 |
|
wangsongsole
|
649bb0ed24
|
🦀️ fix: 修复bug
|
2024-02-29 10:44:53 +08:00 |
|
zhangds
|
aaeda4ecfb
|
fix:修复包码只能创建一个商品
|
2024-02-29 09:57:47 +08:00 |
|
wangsongsole
|
5760a9ea09
|
✨ feat: 订单列表新增字段
|
2024-02-29 09:42:07 +08:00 |
|
wangsongsole
|
2a1f4344a4
|
♻️ refactor:回退代码
|
2024-02-29 09:41:25 +08:00 |
|
wangsongsole
|
9ebbd77b22
|
✨ feat: 订单列表新增字段
|
2024-02-29 09:39:52 +08:00 |
|
wangsongsole
|
f69fa17cfa
|
✨ feat: 新增微信小程序打开方式
|
2024-02-28 16:55:37 +08:00 |
|
zhangds
|
bcfe3f92e1
|
fix: 修改key批次
|
2024-02-28 16:39:23 +08:00 |
|
wangsongsole
|
4e5641d5e9
|
🦀️ fix: 修复bug
|
2024-02-28 15:43:44 +08:00 |
|
wangsongsole
|
6fe991c4dd
|
✨ feat: 组合商品默认说明
|
2024-02-28 15:33:30 +08:00 |
|
wangsongsole
|
bebe5597e0
|
🎨 style: 优化样式
|
2024-02-28 15:14:28 +08:00 |
|
zhangds
|
8500a68357
|
Merge branch 'master' into clearingForm
|
2024-02-28 14:47:47 +08:00 |
|
wangsongsole
|
ca9c35ac1e
|
🔀 merge: 合并分支
|
2024-02-28 09:40:49 +08:00 |
|
zhangds
|
347dd75d99
|
fix: 修复-复制计划没有包码
|
2024-02-27 19:57:53 +08:00 |
|
wangsongsole
|
1b2a0da91c
|
🦀️ fix: 修复bug
|
2024-02-27 18:09:36 +08:00 |
|
wangsongsole
|
676d301129
|
🦀️ fix: 修复bug
|
2024-02-27 16:40:47 +08:00 |
|
wangsongsole
|
5e03572e51
|
🦀️ fix: 修复时间bug
|
2024-02-27 10:53:49 +08:00 |
|
wangsongsole
|
4cb4ceb98a
|
🦀️ fix: 修复【组合商品--新建】商品范围中，数量修改为“单次到账”
|
2024-02-27 10:17:21 +08:00 |
|
wangsongsole
|
ac2fad21c6
|
🦀️ fix: 修复组合商品管理模块bug
|
2024-02-27 10:07:15 +08:00 |
|
wangsongsole
|
8789083edb
|
🦀️ fix: 修复复制key批次，组合立减金领取方式没有回显
|
2024-02-27 09:25:55 +08:00 |
|
zhangds
|
d1898a1917
|
feat: 增加后台管理系统包码结算列表导出
|
2024-02-26 11:02:40 +08:00 |
|
zhangds
|
88fd85761e
|
fix: 增加包码订单 nav 选择动画
|
2024-02-26 10:27:35 +08:00 |
|
wangsongsole
|
5e80c71cd4
|
💪 optimize: 优化代码
|
2024-02-24 19:17:08 +08:00 |
|
wangsongsole
|
4e4c334f8e
|
💪 optimize: 优化代码
|
2024-02-24 18:00:42 +08:00 |
|
wangsongsole
|
76e9b86c75
|
🔖 version: 测试包
|
2024-02-24 15:20:06 +08:00 |
|
wangsongsole
|
7b91693b9c
|
🦀️ fix: 修复bug
|
2024-02-24 15:17:56 +08:00 |
|
wangsongsole
|
fd2bc7c4b7
|
✨ feat: 新增combining 立减金分组相关组件
|
2024-02-22 15:57:17 +08:00 |
|
wangsongsole
|
01ec08b50e
|
🎨 style: 修改isECard字段为is_e_card
|
2024-02-22 09:49:30 +08:00 |
|
wangsongsole
|
64b3c9ed55
|
🦀️ fix: 修复京东E卡bug
|
2024-02-21 16:21:54 +08:00 |
|
wangsongsole
|
6d00157dcb
|
🦀️ fix: 修复isECard传值
|
2024-02-21 14:35:18 +08:00 |
|
wangsongsole
|
e8d05aab9c
|
Merge branch 'master' into ECard
|
2024-02-21 14:33:09 +08:00 |
|
wangsongsole
|
ee217f3915
|
💪 optimize: 商户路由 偏移量字段更改为SM4秘钥
|
2024-02-21 13:52:41 +08:00 |
|
zhangds
|
05e8f6356c
|
Merge branch 'master' into clearingForm
|
2024-02-21 10:10:49 +08:00 |
|
zhangds
|
f0d12dacd9
|
feat: 修改包码列表详情
|
2024-02-21 09:47:10 +08:00 |
|
zhangds
|
ed1fa18055
|
feat: 完成兑换列表过滤
|
2024-02-20 18:23:44 +08:00 |
|
zhangds
|
60383b44ac
|
feat: 完成营销系统包码结算
|
2024-02-20 18:14:15 +08:00 |
|
zhangds
|
e2baf44891
|
feat: 包码编辑
|
2024-02-20 17:09:47 +08:00 |