Commit Graph

364 Commits

Author SHA1 Message Date
zhouxinyu1029 0dff955cc5 merge 2024-03-26 15:54:40 +08:00
zhouxinyu1029 15e0bc6061 merge 2024-03-26 15:48:29 +08:00
zhouxinyu1029 6c78e065ec 提交 2024-03-26 15:34:34 +08:00
wangsongsole f12619e75a 合并分支 2024-03-26 13:56:31 +08:00
zhangds 255302705c fix: 镜像包 2024-03-25 21:57:59 +08:00
zhangds b52b555359 Merge branch 'yz-outtime' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into yz-outtime 2024-03-25 21:56:59 +08:00
zhangds c2d239bc77 fix: 镜像包 2024-03-25 21:56:40 +08:00
wangsongsole 413cb56c70 🔖 version: 测试包 2024-03-25 20:44:07 +08:00
zhangds 7f21165deb fix: 测试包 2024-03-25 19:07:44 +08:00
zhangds d6ed79e2da Merge branch 'yz-outtime' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into yz-outtime 2024-03-25 19:06:41 +08:00
zhangds 7a4265d93f fix: 测试环境 2024-03-25 19:06:01 +08:00
wangsongsole 031ac6e9e5 🔖 version: 镜像包 2024-03-25 18:59:08 +08:00
wangsongsole 959915f913 🔖 version: 镜像包 2024-03-25 18:04:56 +08:00
zhangds d44ca3fb1b fix: 镜像打包 2024-03-25 17:27:55 +08:00
zhangds d89e65d72d fix: 镜像环境 2024-03-25 17:26:37 +08:00
zhangds 8869dde4f3 fix: 镜像包 2024-03-25 14:41:06 +08:00
zhangds b9b26df5c6 fix: 镜像黄金 2024-03-25 14:39:07 +08:00
wangsongsole a874c0bd87 🔖 version: 测试包 2024-03-25 11:20:18 +08:00
zhouxinyu1029 6b029db363 提交 2024-03-25 11:09:25 +08:00
zhangds dfe0310779 fix: 禁止key编辑 过期时间 2024-03-25 09:59:47 +08:00
wangsongsole 323efb5e3d 🔀 merge: 合并分支 2024-03-25 09:38:34 +08:00
zhangds 61444f162f fix: 测试版本 2024-03-23 16:45:33 +08:00
zhangds ad1a66bd35 fix: 测试地址 2024-03-23 15:25:57 +08:00
zhangds 87f79145a5 fix: 测试代码 2024-03-23 14:51:31 +08:00
wangsongsole 68bc84cc02 🔖 version: 测试包 2024-03-22 17:11:52 +08:00
zhangds 22765d178d fix: 镜像包 2024-03-22 17:04:33 +08:00
wangsongsole 3cde7dbb6a 🔖 version: 测试包 2024-03-22 10:31:50 +08:00
zhangds 76338d91de fix: 卡密包 2024-03-20 17:56: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 e78fdebb5c fix: 修复包码切换,报错 2024-03-20 15:40:54 +08:00
zhouxinyu1029 4a7a4e66f4 调整弹框样式 2024-03-20 14:21:35 +08:00
zhouxinyu1029 50c1d23c07 隐藏定制提示按钮 2024-03-20 11:54:00 +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
zhouxinyu1029 6d9a9b0748 bug修改 2024-03-20 09:06:52 +08:00
zhouxinyu1029 28b47f8306 修改 2024-03-19 19:57:29 +08:00
zhouxinyu1029 1cfa9fb517 分销商增加邮箱和手机号填写 2024-03-19 18:15:34 +08:00
zhouxinyu1029 2ba7ccb02a 分销商增加邮箱和手机号 2024-03-19 18:05:58 +08:00
zhangds 242c743d62 fix: 增加卡密 2024-03-19 10:59:41 +08:00
wangsongsole 3951bba31b feat: 新增特性 2024-03-19 10:48:12 +08:00
zhouxinyu1029 5e8f7dba8f 分销商修改 2024-03-18 16:39:55 +08:00
zhouxinyu1029 2299bad217 分销商修改 2024-03-18 16:29:37 +08:00
wangsongsole 8ffd09c0ca 🔖 version: 镜像包 2024-03-15 23:30:51 +08:00
wangsongsole d94b77495d 🔀 merge: 合并分支 2024-03-15 23:24:56 +08:00
zhangds 43296363b6 fix: 修改 2024-03-15 22:47:46 +08:00
zhangds 9166e2fa13 fix: 镜像环境 2024-03-15 22:41:14 +08:00
zhangds 42def81e79 fix: 镜像环境 2024-03-15 22:23:23 +08:00
zhangds c94943d8de fix: 禁止优惠券公众号 2024-03-15 22:03:36 +08:00
wangsongsole 96b5e06366 🔖 version: 测试包 2024-03-15 20:46:12 +08:00
zhangds de705f05f3 fix: 增加镜像环境包 2024-03-15 16:38:50 +08:00
wangsongsole dfab750fec 🦀️ fix: 修复bug 2024-03-15 15:28:22 +08:00
wangsongsole 8780dac0c5 🔖 version: 测试包 2024-03-15 11:30:58 +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 bcc1b35650 🔖 version: 镜像包 2024-03-12 16:28:13 +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 b693da5ae7 🔖 version: 测试包 2024-03-12 15:48:10 +08:00
wangsongsole 12bf7406b2 🔖 version: 测试包 2024-03-12 14:03:52 +08:00
wangsongsole e278e5801d 🔖 version: 镜像包 2024-03-12 09:59:03 +08:00
wangsongsole 4aca426cd6 🔖 version: 测试包 2024-03-11 16:36:33 +08:00
wangsongsole 9113631658 🔖 version: 测试包 2024-03-11 16:21:41 +08:00
wangsongsole 0a0402ac90 🔖 version: 发布测试包 2024-03-11 16:15:16 +08:00
wangsongsole c6879f8018 🔀 merge: 合并分支 2024-03-11 11:08:58 +08:00
zhangds 1f2a70ec63 fix: 修改图片 2024-03-08 04:27:12 +08:00
zhangds f1180fc702 fix: 正式服 2024-03-08 02:41:55 +08:00
zhangds dea6ddabb5 fix: 修改 订单 2024-03-07 21:23:33 +08:00
zhangds 2ba4793f57 fix: 包码修改 2024-03-07 20:55:14 +08:00
zhangds 2c6ee7b353 fix: 镜像环境打包 2024-03-07 19:36:25 +08:00
zhangds e37025ff7d fix: 镜像环境 2024-03-07 15:23:51 +08:00
zhangds 8b284a5c23 fix: 包码结算,隐藏logo 2024-03-07 15:04:02 +08:00
zhangds 63029f1cf5 fix: 修复包码 maxlength 2024-03-07 11:42:30 +08:00
zhangds a13d05464d fix: 增加镜像环境包 2024-03-07 10:51:00 +08:00
zhangds 08f322dd95 fix: 打包 测试环境 2024-03-07 10:04:37 +08:00
zhangds 70d4d74ef3 fix: 镜像环境打包 2024-03-07 09:32:08 +08:00
zhangds 2cfc473d23 fix: 修复兑换码 2024-03-06 22:21:34 +08:00
zhangds 02c54c9812 fix: 锁定库存 2024-03-06 20:48:25 +08:00
wangsongsole fde486776b 🔖 version: 测试包 2024-03-06 17:13:14 +08:00
wangsongsole 612c23c16a 🔖 version: 镜像包 2024-03-06 14:28:30 +08:00
wangsongsole a36e7eb767 🔖 version: 镜像包 2024-03-06 14:24:02 +08:00
wangsongsole e10680712c 🔖 version: 测试包 2024-03-06 13:55:40 +08:00
wangsongsole 5be69c51cc 🔖 version: 发布测试包 2024-03-06 13:53:02 +08:00
zhangds b8638e8587 fix: 镜像环境 2024-03-06 13:47:37 +08:00
zhangds c5f2680dba fix: 打包 2024-03-06 13:34:48 +08:00
zhangds 0def09c38d Merge branch 'merchant' into clearingForm 2024-03-06 13:33:02 +08:00
zhangds 4dbb6acb12 fix: 修复组合商品 2024-03-05 20:09:45 +08:00
zhangds f4bfd1f1f4 fix: 修复 bug 2024-03-05 18:15:05 +08:00
zhangds 912ae44099 fix: 合并master 2024-03-05 17:46:24 +08:00
wangsongsole b60266e5a3 🔖 version: 发布镜像包 2024-03-05 17:02:13 +08:00
wangsongsole 6574631557 🦀️ fix: 修复bug 2024-03-05 15:47:32 +08:00
wangsongsole 84be11b14a 🔖 version: 镜像包 2024-03-05 14:13:18 +08:00
zhangds f5ca1c6d91 fix: 修改白名单 2024-03-05 11:56:21 +08:00
zhangds a7a5159d55 Merge branch 'master' into clearingForm 2024-03-05 10:28:29 +08:00
wangsongsole b0738baff5 🎨 style: 优化组合商品模板组件样式 2024-03-04 17:26:03 +08:00
zhangds 0cc54eedff fix: 更新planid 2024-03-04 16:41:01 +08:00
zhangds b2dc758703 fix: 增加计划 plan id 2024-03-04 16:22:21 +08:00
zhangds 85b2711cbc fix: 增加合并后的代码 2024-03-04 15:46:39 +08:00
wangsongsole 3ad11ac05c 🦀️ fix: 修正兑换码管理-组合商品-发放总量校验问题 2024-03-04 15:45:10 +08:00
wangsongsole a981c4378f 🦀️ fix: 修复bug 2024-03-04 15:30:34 +08:00
zhangds 0b9e2e6c24 fix: 删除build 2024-03-04 15:11:08 +08:00
zhangds eb63062fb9 fix: 修复营销系统 bug 2024-03-04 14:41:36 +08:00
zhangds 5c7547f2ce fix: 修复兑换码 包码 2024-03-03 17:38:30 +08:00
zhangds 3c38a9fa99 fix: 修复兑换码列表 复制和编辑 2024-03-03 16:13:02 +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 ceea15288b 🔖 version: 发布 2024-03-02 01:32:10 +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 e59b1d04f6 🔖 version: 发布测试包 2024-03-01 22:38:38 +08:00
wangsongsole a41847037a 🔖 version: 发布镜像包 2024-03-01 14:47:03 +08:00
zhangds aaa0f091dd fix: 修改环境 2024-03-01 13:47:35 +08:00
wangsongsole f39be7f561 🔖 version: 发布镜像包 2024-03-01 11:59:18 +08:00
wangsongsole 1b2705fa2c 🦀️ fix: 修复bug 2024-02-29 17:57:09 +08:00
wangsongsole 652cff745c 🔖 version: 发布测试包 2024-02-29 17:02:12 +08:00
wangsongsole 81b8baf040 🔖 version: 测试包 2024-02-29 16:25:40 +08:00
wangsongsole 25769fa66d 🔖 version: 测试包 2024-02-29 15:03:37 +08:00
wangsongsole 3731e79f1b 🦀️ fix: 修复bug 2024-02-29 14:43:20 +08:00
wangsongsole a5d3ddceb0 🔖 version: 发布测试包 2024-02-29 10:46:23 +08:00
zhangds c0768bb672 fix: 修复包码结算 2024-02-29 09:59:17 +08:00
wangsongsole cfd2a23d2c 🔖 version: 发布版本 2024-02-29 09:46:39 +08:00
zhangds d11b15edcd fix: 上传 2024-02-29 09:13:39 +08:00
wangsongsole 348240f071 🔖 version: 测试包 2024-02-28 15:44:21 +08:00
wangsongsole f2355e099f 🔖 version: 默认使用说明 2024-02-28 15:36:24 +08:00
wangsongsole 7dcdb1ed82 🔖 version: 测试包 2024-02-28 15:08:32 +08:00
zhangds 8500a68357 Merge branch 'master' into clearingForm 2024-02-28 14:47:47 +08:00
zhangds a615fa753a fix: 修复复制 2024-02-27 20:01:37 +08:00
wangsongsole aa85712625 🔖 version: 发布测试包 2024-02-27 18:11:17 +08:00
wangsongsole db9ad194c1 🔖 version: 测试包 2024-02-27 16:46:09 +08:00
zhangds 8a5d1b4d25 feat: 修改镜像地址 2024-02-27 13:55:23 +08:00
wangsongsole 9797ea0f6e 🔖 version: 测试包 2024-02-27 10:55:21 +08:00
wangsongsole 8567d1c46e 🔖 version: 发布测试包 2024-02-27 10:08:29 +08:00
zhangds 9af27a635b feat 包码结算测试代码提交 2024-02-26 11:04:59 +08:00
wangsongsole 500890cbf8 🔖 version: 发布测试包 2024-02-24 19:23:12 +08:00
wangsongsole e60e189ac6 🔖 version: 发布测试包 2024-02-24 18:02:20 +08:00
wangsongsole 76e9b86c75 🔖 version: 测试包 2024-02-24 15:20:06 +08:00
wangsongsole 64610dc242 🔖 version: 测试包 2024-02-24 15:18:37 +08:00
wangsongsole 65d024d1a4 🔖 version: 发布测试包 2024-02-24 14:12:41 +08:00
wangsongsole 2d8ce61044 🔖 version: 发布京东E卡镜像包 2024-02-23 17:25:45 +08:00
zhangds 87c530aee9 feat: 增加包码 2024-02-22 14:55:19 +08:00
zhangds c04b0af642 feat: 增加包码结算 2024-02-22 13:59:48 +08:00
wangsongsole d980e05eae 🔖 version: 发布京东E卡测试包 2024-02-22 09:51:52 +08:00
wangsongsole b79794dc2f 🔖 version: 京东E卡测试包 2024-02-21 17:58:46 +08:00
wangsongsole 9a10c030ac 🔖 version: 镜像包 2024-02-19 17:09:06 +08:00
wangsongsole 16257b6b8c 🔖 version: 测试包 2024-02-19 16:51:10 +08:00
wangsongsole 0ffc5da097 💪 optimize: 优化代码 2024-02-19 11:22:09 +08:00
wangsongsole 524dab6bb8 🔖 version: 2024-02-19 10:38:21 +08:00
wangsongsole 96a87f27fe 🔖 version: 发布测试包 2024-02-19 09:21:16 +08:00
wangsongsole c58c1c4f79 🔖 version: 镜像包 2024-02-02 16:37:18 +08:00
wangsongsole 593b3923c4 feat: 订单日志增加序号 2024-02-02 15:20:47 +08:00
wangsongsole d3c70bf0dd 🔖 version: 测试包 2024-02-02 15:14:18 +08:00
wangsongsole 54d2e783ff 🔖 version: 测试包 2024-02-02 09:44:38 +08:00
wangsongsole baef871d99 🔖 version: 发测试包 2024-02-01 17:25:13 +08:00
wangsongsole f69e4b9dd1 🔖 version: 发布测试包 2024-02-01 14:08:00 +08:00
wangsongsole 32e3876293 🔖 version: 发布测试包 2024-01-30 15:56:43 +08:00
wangsongsole 28f74d49ed 🔖 version: 发布测试包 2024-01-30 15:05:43 +08:00
wangsongsole a8917209f9 🔖 version: 发布测试包 2024-01-30 14:56:23 +08:00
wangsongsole 5144493135 🔖 version: 发布测试包 2024-01-30 11:56:13 +08:00
wangsongsole f219a927dc 🔖 version: 发布镜像包 2024-01-29 17:44:17 +08:00
wangsongsole 493ba8e661 🔖 version: 发布测试包 2024-01-29 17:33:11 +08:00
wangsongsole f0004fa7c8 🔖 version: 发布包 2024-01-29 17:16:14 +08:00
wangsongsole fcb1742af6 🔖 version: 发布测试包 2024-01-29 17:10:37 +08:00
wangsongsole 3080a686cd 🔖 version: 发布测试环境包 2024-01-29 16:30:03 +08:00
wangsongsole 0178ea5aaa 🔖 version: 发布测试包 2024-01-26 16:57:18 +08:00
wangsongsole 4701409bc9 🔖 version: 发布测试包 2024-01-26 16:26:26 +08:00
wangsongsole 2034bb4525 🔖 version: 发布测试环境包 2024-01-26 15:49:02 +08:00
wangsongsole f266212d2e 🔖 version: 发布测试包 2024-01-24 11:44:47 +08:00
wangsongsole bedae61eaa 🔖 version: 发布测试包 2024-01-19 11:27:54 +08:00
wangsongsole ea621d6348 🔖 version: 发布测试环境包 2024-01-19 11:24:32 +08:00
wangsongsole b4584cffb4 🔖 version: 测试环境打包 2024-01-19 11:12:35 +08:00
wangsongsole 5e5fc985dc feat: 红包祝福语不允许有空格 2024-01-19 10:51:38 +08:00
wangsongsole 6618965745 🔖 version: 镜像包 2024-01-16 15:02:46 +08:00
wangsongsole 518a69debb 🔖 version: 打测试包 2024-01-16 14:43:32 +08:00
wangsongsole ede24a6c30 🔖 version: 镜像环境打包 2024-01-11 16:28:58 +08:00
wangsongsole c544910f2a feat: 优惠券新增筛选条件 2024-01-11 16:10:07 +08:00
wangsongsole aed318242c 🔖 version: 打包测试环境 2024-01-11 15:35:40 +08:00
wangsongsole cd77ace139 🔖 version: 打包 2024-01-11 13:35:13 +08:00
wangsongsole 76a9e0bd2f 🔖 version: 测试包 2024-01-02 14:08:34 +08:00
wangsongsole 31b4ca4086 🔖 version: 镜像环境 2024-01-02 13:58:45 +08:00
wangsongsole 13b10ec52a 🔖 version: build 2023-12-28 15:58:59 +08:00
wangsongsole c969adcfd6 🔖 version: build 2023-12-27 16:43:52 +08:00
zhangds 053bcd3540 fix: 修改路径 2023-12-25 17:11:47 +08:00
zhangds d1afde7e55 fix: 修改使用说明 文字(build) 2023-12-25 17:04:39 +08:00
wangsongsole cf0f0014ff 🔖 version: build 2023-12-23 17:09:55 +08:00
wangsongsole 07013253df build 2023-12-21 17:39:22 +08:00
wangsongsole 6f925ac008 🔖 version: build 2023-12-21 09:40:22 +08:00
wangsongsole e3105bd922 🔖 version: build 2023-12-20 18:30:43 +08:00
wangsongsole 79d2c515fd 🔖 version: build 2023-12-20 15:56:12 +08:00