Commit Graph

356 Commits

Author SHA1 Message Date
wangsongsole 4bef0cde47 🔖 version: 镜像包 2024-04-11 15:12:35 +08:00
wangsongsole 643bdf9252 🦀️ fix: 修复bug 2024-04-11 14:58:47 +08:00
wangsongsole 27ba1f8e64 🔖 version: 镜像包 2024-04-11 14:41:23 +08:00
wangsongsole 15a564a978 🔖 version: 测试包 2024-04-10 23:18:44 +08:00
wangsongsole 9c545d7b7b 🔖 version: 镜像包 2024-04-10 17:38:40 +08:00
zhouxinyu1029 a0cf61838c 提交 2024-04-10 17:04:31 +08:00
zhouxinyu1029 0d2efef5e2 提交 2024-04-10 17:02:27 +08:00
zhouxinyu1029 d5961bb0a9 提交 2024-04-10 16:57:49 +08:00
wangsongsole 87f1a4d2e0 🔀 merge: 合并冲突 2024-04-09 13:54:09 +08:00
wangsongsole 227494c89b 🔖 version: 测试包 2024-04-09 09:44:29 +08:00
wangsongsole 6fc02940fb 🔖 version: 测试包 2024-04-09 09:36:09 +08:00
wangsongsole f04d85ff91 feat: 合并分支 2024-04-08 15:27:27 +08:00
wangsongsole 39ae73ca2a 🔖 version: 测试包 2024-04-08 11:47:02 +08:00
wangsongsole 9b90c8c4cb 🔖 version: 镜像包 2024-04-08 10:09:41 +08:00
wangsongsole 94eb2849a7 🔀 merge: 合并分支 2024-04-08 09:58:30 +08:00
zhangds 01806e0aa4 fix: 镜像包 2024-04-06 18:11:16 +08:00
zhangds 8af8772065 fix: 镜像包 2024-04-06 16:48:12 +08:00
zhangds da48d9cb93 fix: 修复测试包 2024-04-06 14:09:41 +08:00
zhangds 09ee657b52 fix: 测试包 2024-04-04 14:16:08 +08:00
zhangds 1da4962d93 fix: 测试包 2024-04-04 10:44:37 +08:00
wangsongsole 9a1219c5e7 🔖 version: 镜像包 2024-04-02 17:59:54 +08:00
wangsongsole 57edf48a90 🔖 version: 镜像包 2024-04-02 17:53:57 +08:00
wangsongsole 125697ddb1 🔖 version: 镜像包 2024-04-02 14:30:23 +08:00
wangsongsole 00abfb8ef4 🔀 merge: 合并分支 2024-04-02 14:27:35 +08:00
wangsongsole 84dc560107 🦀️ fix: 修复bug 2024-04-02 10:48:06 +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 78de8cd2f2 🔖 version: 测试包 2024-04-01 15:30:14 +08:00
wangsongsole c94e99264d 🔀 merge: 合并分支 2024-04-01 15:29:27 +08:00
wangsongsole f3c7d1d27d 🔖 version: 镜像包 2024-04-01 14:52:56 +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 263aca4d9e 🔖 version: 测试包 2024-03-28 13:58:23 +08:00
wangsongsole a71e2fda43 🔀 merge: 合并分支 2024-03-28 13:56:42 +08:00
zhouxinyu1029 559d2d3341 提交 2024-03-28 11:26:59 +08:00
zhouxinyu1029 7de79b4612 merge 2024-03-26 15:57:13 +08:00
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