Commit Graph

810 Commits

Author SHA1 Message Date
wangsongsole a71e2fda43 🔀 merge: 合并分支 2024-03-28 13:56:42 +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 323efb5e3d 🔀 merge: 合并分支 2024-03-25 09:38:34 +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 5fabc5d453 🎨 style: 优化组合商品模板样式 2024-03-20 14:35:05 +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 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
zhangds e2f8f8648c Merge branch 'openType' 2024-03-15 23:21:55 +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 8780dac0c5 🔖 version: 测试包 2024-03-15 11:30:58 +08:00
wangsongsole 9400717476 🔀 merge: 合并分支 2024-03-14 15:45:54 +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 c6879f8018 🔀 merge: 合并分支 2024-03-11 11:08:58 +08:00
zhangds 97e37c3752 fix: 修改图片 2024-03-08 04:24:55 +08:00
zhangds 765cb5a792 fix: 禁止 卡密 包码 2024-03-07 20:54:00 +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 f5965b4a0a 🦀️ fix: 修复微信立减金打开方式回显问题 2024-03-07 09:59:00 +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 932d8040fe 💪 optimize: 优化立减金使用说明引用 2024-03-06 10:40:13 +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 71f969dcc2 Merge branch 'master' into openType 2024-03-05 16:59:29 +08:00
wangsongsole 73e69f2fc6 🦀️ fix: 修复bug 2024-03-05 16:57:36 +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 805a1cc2b4 Merge branch 'master' into openType 2024-03-05 09:59:50 +08:00
wangsongsole b0738baff5 🎨 style: 优化组合商品模板组件样式 2024-03-04 17:26:03 +08:00
zhangds c91eeb39a4 Merge branch 'master' into clearingForm 2024-03-04 15:44:26 +08:00
wangsongsole a981c4378f 🦀️ fix: 修复bug 2024-03-04 15:30:34 +08:00
wangsongsole c8662fbd9b feat: 组合商品新增微信立减金打开方式 2024-03-04 14:40:18 +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
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 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
wangsongsole f69fa17cfa feat: 新增微信小程序打开方式 2024-02-28 16:55:37 +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
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 8789083edb 🦀️ fix: 修复复制key批次,组合立减金领取方式没有回显 2024-02-27 09:25:55 +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
zhangds 05e8f6356c Merge branch 'master' into clearingForm 2024-02-21 10:10:49 +08:00
wangsongsole 581b487c3a feat: 编写代码 2024-02-20 16:49:25 +08:00
zhangds 74bda83b3d feat: 增加key批次包码 2024-02-20 15:51:22 +08:00
zhangds 8548013e11 feat: 完成包吗限制 2024-02-20 11:52:40 +08:00
zhangds bedb5c6ede feat: 修改营销系统包码 2024-02-20 11:24:42 +08:00
wangsongsole 8fb9a7213d ♻️ refactor: 重构京东E卡 2024-02-19 17:07:16 +08:00
wangsongsole c4d585e765 feat: 新增京东E卡 2024-02-19 11:17:57 +08:00
wangsongsole b90454812b feat: 新增京东E卡 2024-02-19 10:37:33 +08:00
wangsongsole 21227a5514 🗑️ delete: 删除京东E卡 2024-02-19 10:35:47 +08:00
wangsongsole 43bc911854 🎨 style: 优化样式 2024-02-06 16:54:53 +08:00