wangsongsole
|
87f1a4d2e0
|
🔀 merge: 合并冲突
|
2024-04-09 13:54:09 +08:00 |
|
wangsongsole
|
227494c89b
|
🔖 version: 测试包
|
2024-04-09 09:44:29 +08:00 |
|
wangsongsole
|
0a9e0302f6
|
⏪ fallback: 回退订单列表代码
|
2024-04-09 09:33:01 +08:00 |
|
wangsongsole
|
f04d85ff91
|
✨ feat: 合并分支
|
2024-04-08 15:27:27 +08:00 |
|
wangsongsole
|
7cce4aae69
|
✨ feat: 订单列表新增持久化
|
2024-04-08 11:45:22 +08:00 |
|
wangsongsole
|
94eb2849a7
|
🔀 merge: 合并分支
|
2024-04-08 09:58:30 +08:00 |
zhangds
|
cf80340955
|
fix: 隐藏 分页
|
2024-04-06 18:10:08 +08:00 |
|
zhangds
|
d84989626d
|
fix: 修改表头
|
2024-04-06 14:07:55 +08:00 |
|
zhangds
|
62c6b161c4
|
fix: 增加订单列表 支付宝查询
|
2024-04-04 14:14:40 +08:00 |
|
zhangds
|
e132468336
|
feat: 增加订单支付宝查询
|
2024-04-04 14:13:31 +08:00 |
|
wangsongsole
|
80bcaf6057
|
⏪ fallback: 回退红包代码
|
2024-04-02 18:01:23 +08:00 |
|
wangsongsole
|
b35807b416
|
⏪ fallback: 回退代码
|
2024-04-02 17:58:49 +08:00 |
|
wangsongsole
|
57edf48a90
|
🔖 version: 镜像包
|
2024-04-02 17:53:57 +08:00 |
|
wangsongsole
|
00abfb8ef4
|
🔀 merge: 合并分支
|
2024-04-02 14:27:35 +08:00 |
zhouxinyu1029
|
8d57c2beff
|
提交
|
2024-04-02 11:17:20 +08:00 |
|
wangsongsole
|
7dfcf21e81
|
🦀️ fix: 修复bug
|
2024-04-02 10:47:56 +08:00 |
|
wangsongsole
|
9d46adea15
|
🦀️ fix: 修复bug
|
2024-04-02 10:40:35 +08:00 |
|
wangsongsole
|
b52ac18f4a
|
🦀️ fix: 修复bug
|
2024-04-02 10:25:12 +08:00 |
|
wangsongsole
|
6550861073
|
🔖 version: 修改规则
|
2024-04-02 10:19:19 +08:00 |
|
wangsongsole
|
1008a473e0
|
🔖 version: 微信红包面额改为500
|
2024-04-02 09:20:57 +08:00 |
|
wangsongsole
|
4ae3568d54
|
🔀 merge: 合并分支
|
2024-04-01 18:05:21 +08:00 |
|
wangsongsole
|
823a1c76ad
|
🎨 style: 优化样式
|
2024-04-01 17:38:20 +08:00 |
|
wangsongsole
|
c94e99264d
|
🔀 merge: 合并分支
|
2024-04-01 15:29:27 +08:00 |
|
wangsongsole
|
0e4c4dcadc
|
✨ feat: 合同单价保留4位小数
|
2024-04-01 14:35:07 +08:00 |
|
wangsongsole
|
b275c93961
|
♻️ refactor: 合同单价保留4位数
|
2024-04-01 14:26:21 +08:00 |
|
wangsongsole
|
abe8c15dd7
|
🔖 version: 更改红包合同价校验规则
|
2024-04-01 14:14:16 +08:00 |
|
wangsongsole
|
95e6b16df5
|
💪 optimize: 优化代码
|
2024-03-29 16:52:19 +08:00 |
|
wangsongsole
|
baa060821b
|
💪 optimize: 优化代码
|
2024-03-29 15:53:12 +08:00 |
|
wangsongsole
|
a71e2fda43
|
🔀 merge: 合并分支
|
2024-03-28 13:56:42 +08:00 |
|
zhouxinyu1029
|
3589696b3a
|
merge
|
2024-03-26 15:53:43 +08:00 |
|
zhouxinyu1029
|
15e0bc6061
|
merge
|
2024-03-26 15:48:29 +08:00 |
|
wangsongsole
|
2d8503a205
|
🦀️ fix: 修复组合商品bug
|
2024-03-26 14:49:34 +08:00 |
|
wangsongsole
|
f12619e75a
|
合并分支
|
2024-03-26 13:56:31 +08:00 |
|
wangsongsole
|
bae3d39c1d
|
🦀️ fix: 修复组合商品模板属性异常问题
|
2024-03-26 13:45:20 +08:00 |
|
wangsongsole
|
b37016cc7b
|
🗑️ delete: 优化代码
|
2024-03-26 11:49:17 +08:00 |
|
wangsongsole
|
413cb56c70
|
🔖 version: 测试包
|
2024-03-25 20:44:07 +08:00 |
|
wangsongsole
|
031ac6e9e5
|
🔖 version: 镜像包
|
2024-03-25 18:59:08 +08:00 |
|
wangsongsole
|
584b767f48
|
💪 optimize: 优化字段
|
2024-03-25 16:59:53 +08:00 |
|
wangsongsole
|
74363cb442
|
🦀️ fix: 修复bug
|
2024-03-25 15:16:07 +08:00 |
|
wangsongsole
|
1acdefc890
|
✨ feat: 新增立减金隐藏
|
2024-03-25 14:29:31 +08:00 |
|
wangsongsole
|
c165db371f
|
✨ feat: 新增生效时间控制展示按钮
|
2024-03-25 14:17:06 +08:00 |
|
wangsongsole
|
1c4ba60d8b
|
🦀️ fix: 修复bug
|
2024-03-25 09:40:21 +08:00 |
|
wangsongsole
|
323efb5e3d
|
🔀 merge: 合并分支
|
2024-03-25 09:38:34 +08:00 |
|
zhangds
|
4950ccd56a
|
fix: 禁止key码编辑
|
2024-03-25 09:25:09 +08:00 |
|
zhangds
|
8cd09e0490
|
fix: 增加key过期时间
|
2024-03-23 16:44:04 +08:00 |
|
zhangds
|
529e2db0b2
|
fix: 修改 过期结构
|
2024-03-23 15:24:41 +08:00 |
|
zhangds
|
7e27d61cd6
|
fix: 增加key批次结束时间
|
2024-03-23 14:50:09 +08:00 |
|
wangsongsole
|
68bc84cc02
|
🔖 version: 测试包
|
2024-03-22 17:11:52 +08:00 |
|
zhangds
|
a949aeafb2
|
fix: 增加邮政绑定号 限制绑定对象绑定数
|
2024-03-22 17:01:59 +08:00 |
|
wangsongsole
|
4f12f59295
|
🗑️ delete: 优化代码
|
2024-03-21 13:51:24 +08:00 |
|
wangsongsole
|
fe72189c83
|
🎨 style: 修复模板问题
|
2024-03-21 11:37:24 +08:00 |
|
wangsongsole
|
1e5df28eb4
|
🎨 style: 组合商品模板样式问题
|
2024-03-21 10:32:35 +08:00 |
|
wangsongsole
|
0d0e8262be
|
🔀 merge: 合并分支
|
2024-03-20 17:51:20 +08:00 |
|
zhangds
|
b0701c297c
|
Merge branch 'master' into card-pwd
|
2024-03-20 17:49:20 +08:00 |
|
zhangds
|
24426b7cec
|
fix: 修复订单列表
|
2024-03-20 17:40:01 +08:00 |
|
zhouxinyu1029
|
8a1dc4b400
|
增加分销商禁用
|
2024-03-20 17:34:28 +08:00 |
|
wangsongsole
|
de2339b890
|
🔖 version: 测试包
|
2024-03-20 17:03:11 +08:00 |
|
wangsongsole
|
e5f12e34b8
|
✨ feat: 限制自定义通知
|
2024-03-20 16:01:06 +08:00 |
|
zhangds
|
53f47e1ca3
|
fix: 修复计划编辑的时候，包码切换报错问题
|
2024-03-20 15:39:12 +08:00 |
|
wangsongsole
|
5fabc5d453
|
🎨 style: 优化组合商品模板样式
|
2024-03-20 14:35:05 +08:00 |
|
zhouxinyu1029
|
4a7a4e66f4
|
调整弹框样式
|
2024-03-20 14:21:35 +08:00 |
|
zhouxinyu1029
|
50c1d23c07
|
隐藏定制提示按钮
|
2024-03-20 11:54:00 +08:00 |
|
wangsongsole
|
56fcec89cb
|
🦀️ fix: 修复自定义消息模块抛错问题
|
2024-03-20 11:35:50 +08:00 |
|
zhouxinyu1029
|
71c273ff89
|
bug
|
2024-03-20 11:09:53 +08:00 |
|
zhouxinyu1029
|
160a8d473d
|
修改bug
|
2024-03-20 10:47:51 +08:00 |
|
zhouxinyu1029
|
f3519431b8
|
编辑回填
|
2024-03-20 10:40:57 +08:00 |
|
wangsongsole
|
60f6f9a72d
|
🎨 style: 优化样式
|
2024-03-20 10:36:11 +08:00 |
|
zhouxinyu1029
|
6d9a9b0748
|
bug修改
|
2024-03-20 09:06:52 +08:00 |
|
zhouxinyu1029
|
28b47f8306
|
修改
|
2024-03-19 19:57:29 +08:00 |
|
zhouxinyu1029
|
2ba7ccb02a
|
分销商增加邮箱和手机号
|
2024-03-19 18:05:58 +08:00 |
|
wangsongsole
|
ef4cbc8733
|
🎨 style: 优化样式
|
2024-03-19 15:14:40 +08:00 |
|
zhangds
|
7ad8c0a3bb
|
fix: 解锁卡密
|
2024-03-19 10:57:50 +08:00 |
|
wangsongsole
|
3951bba31b
|
✨ feat: 新增特性
|
2024-03-19 10:48:12 +08:00 |
|
zhouxinyu1029
|
0594777ee2
|
分销商修改
|
2024-03-18 16:39:15 +08:00 |
|
zhouxinyu1029
|
4890ae6ba1
|
分销商修改
|
2024-03-18 16:25:27 +08:00 |
|
wangsongsole
|
15ef16c6d8
|
Merge remote-tracking branch 'origin/master' into dynamicPrompt
|
2024-03-18 10:20:37 +08:00 |
|
wangsongsole
|
80161cd4df
|
🦀️ fix: 修复bug
|
2024-03-16 02:23:28 +08:00 |
|
wangsongsole
|
0fe39b9cdf
|
✨ feat: 新建计划增加防暴击
|
2024-03-16 01:27:46 +08:00 |
|
zhangds
|
e2f8f8648c
|
Merge branch 'openType'
|
2024-03-15 23:21:55 +08:00 |
|
zhangds
|
59088e3d22
|
fix: 修改兑换码管理
|
2024-03-15 22:40:11 +08:00 |
|
zhangds
|
5ef3d48c85
|
fix: 修复立减金 公众号
|
2024-03-15 22:22:19 +08:00 |
|
zhangds
|
c94943d8de
|
fix: 禁止优惠券公众号
|
2024-03-15 22:03:36 +08:00 |
|
wangsongsole
|
0acafdca20
|
♻️ refactor: 重构样式
|
2024-03-15 20:41:47 +08:00 |
|
wangsongsole
|
c61b2e42ba
|
🦀️ fix: 修复bug
|
2024-03-15 15:25:57 +08:00 |
|
wangsongsole
|
8780dac0c5
|
🔖 version: 测试包
|
2024-03-15 11:30:58 +08:00 |
|
wangsongsole
|
f4facb8b6f
|
✨ feat: 调整代码
|
2024-03-15 11:26:42 +08:00 |
|
wangsongsole
|
9400717476
|
🔀 merge: 合并分支
|
2024-03-14 15:45:54 +08:00 |
|
wangsongsole
|
9d353b58a5
|
🎨 style: 关闭商户私钥复制、增加提示
|
2024-03-13 16:21:37 +08:00 |
|
wangsongsole
|
b030df5963
|
🔀 merge: 合并master
|
2024-03-13 14:14:17 +08:00 |
|
wangsongsole
|
9b38c6b1e1
|
🔖 version: 测试包
|
2024-03-12 17:34:23 +08:00 |
|
wangsongsole
|
a267962699
|
🔖 version: 镜像包
|
2024-03-12 16:58:55 +08:00 |
|
wangsongsole
|
cbb348dc20
|
🔖 version: 镜像包
|
2024-03-12 16:52:14 +08:00 |
|
wangsongsole
|
dae0726d28
|
🔖 version: 镜像包
|
2024-03-12 16:26:15 +08:00 |
|
wangsongsole
|
c5ebe21c80
|
🔖 version: 测试包
|
2024-03-12 15:58:08 +08:00 |
|
wangsongsole
|
0878a204a8
|
🦀️ fix: 修复bug
|
2024-03-12 15:45:27 +08:00 |
|
wangsongsole
|
df986b0465
|
♻️ refactor: 营销计划编号限制为16位
|
2024-03-11 16:35:52 +08:00 |
|
wangsongsole
|
62a33c2bb3
|
🎨 style: 修复样式bug
|
2024-03-11 16:20:51 +08:00 |
|
wangsongsole
|
2d44528b3f
|
🎨 style: 修改文案
|
2024-03-11 16:13:12 +08:00 |
|
wangsongsole
|
8314bcd6a8
|
♻️ refactor: 调整更新日志、帮助中心地址
|
2024-03-11 14:47:48 +08:00 |
|
wangsongsole
|
c8d0d55745
|
♻️ refactor: 修改更新日志、帮助中心 文档地址
|
2024-03-11 14:27:59 +08:00 |
|
wangsongsole
|
c6879f8018
|
🔀 merge: 合并分支
|
2024-03-11 11:08:58 +08:00 |
|
wangsongsole
|
8fc049c1eb
|
✨ feat: 新增自定义计划id、立减金核销通知功能
|
2024-03-11 09:20:14 +08:00 |
|
zhangds
|
97e37c3752
|
fix: 修改图片
|
2024-03-08 04:24:55 +08:00 |
|
zhangds
|
9700a6acd2
|
fix: 更新包码
|
2024-03-07 21:17:55 +08:00 |
|
zhangds
|
765cb5a792
|
fix: 禁止 卡密 包码
|
2024-03-07 20:54:00 +08:00 |
|
zhangds
|
1cd766cdd0
|
fix: 增加订单列表 包码列表
|
2024-03-07 19:34:49 +08:00 |
|
zhangds
|
0171abe4f6
|
fix: 修复商品logo label
|
2024-03-07 15:20:46 +08:00 |
|
zhangds
|
17f3ea9489
|
fix: 如果是包码，隐藏logo
|
2024-03-07 15:00:50 +08:00 |
|
wangsongsole
|
3d35591a57
|
✨ feat: 新增自定义计划编号
|
2024-03-07 14:14:04 +08:00 |
|
zhangds
|
be321f8ff5
|
fix: 修复maxLength 100
|
2024-03-07 11:41:09 +08:00 |
|
wangsongsole
|
f5965b4a0a
|
🦀️ fix: 修复微信立减金打开方式回显问题
|
2024-03-07 09:59:00 +08:00 |
|
zhangds
|
e7e880e2d5
|
fix: 修复新建兑换码 禁用
|
2024-03-07 09:30:55 +08:00 |
|
zhangds
|
2cfc473d23
|
fix: 修复兑换码
|
2024-03-06 22:21:34 +08:00 |
|
zhangds
|
89f2d1742d
|
fix: 修复组合商品为立减金，禁用
|
2024-03-06 21:12:54 +08:00 |
|
zhangds
|
02c54c9812
|
fix: 锁定库存
|
2024-03-06 20:48:25 +08:00 |
|
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 |