HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,586 Commits 12 Branches 0 Tags 171 MiB
Commit Graph

1543 Commits

Author SHA1 Message Date
wangsongsole 855218556e 提交 2022-08-17 21:28:35 +08:00
wangsongsole d4bab7a8ab Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-17 21:26:47 +08:00
wangsongsole 0e7456b049 修复时间立减金生效时间报错 2022-08-17 21:26:45 +08:00
Apple ca7d3dc8d2 立减金微信券模板编号默认为空 2022-08-17 21:15:57 +08:00
Apple 34d546459c 营销系统计划为生成中，不允许操作编辑/复制/预览/作废/发送 2022-08-17 20:49:05 +08:00
wangsongsole 1d992c42ec 删除 错误代码 2022-08-17 18:39:23 +08:00
wangsongsole f630a8c639 提交 2022-08-17 18:18:57 +08:00
wangsongsole 41719e0a85 修复bug 2022-08-17 18:18:32 +08:00
wangsongsole cd0be062da Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-17 18:04:54 +08:00
wangsongsole ff02de0c98 修复 商品列表数据 丢失问题以及优化代码 2022-08-17 18:04:52 +08:00
Apple 2eeec7fe3e 优化表格组件，禁用行，点击全选控件不勾选 2022-08-17 18:03:45 +08:00
wangsongsole e8d9b6312e 修复商品bug 2022-08-17 17:45:50 +08:00
wangsongsole 34911c5d66 修复 面包屑报错 2022-08-17 16:11:47 +08:00
wangsongsole c8c47c6674 删除无用引用 2022-08-17 15:59:21 +08:00
wangsongsole 22f2aeedf9 解决报错 2022-08-17 15:58:39 +08:00
wangsongsole 70228f96fb 添加路由懒加载 2022-08-17 15:48:25 +08:00
Apple 2dc0c664f1 订单状态限制兑换码，状态为0，充值中展示作废按钮 2022-08-17 14:23:24 +08:00
zhangds 3405ba0312 1） 增加重置后table 为空 2022-08-17 09:58:50 +08:00
zhangds d5aba67616 1) 删除无用代码 2022-08-16 15:56:43 +08:00
zhangds fa60290ba8 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-16 15:50:24 +08:00
zhangds 26927cbe6d 1) 优化key列表 2） 刷新列表 2022-08-16 15:50:15 +08:00
wangsongsole 930ea9c20f Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-16 15:44:06 +08:00
wangsongsole 52a1450b35 修复 立减金生效时间限制范围 2022-08-16 15:44:03 +08:00
zhangds a5dc4e1a6f update 2022-08-16 15:18:04 +08:00
Apple e323ebf7b6 订单充值中（即生成订单未向上游投递的状态），可以作废 2022-08-16 14:41:17 +08:00
wangsongsole 30bd46c9d5 优化代码 2022-08-16 13:56:13 +08:00
wangsongsole e784e7df49 修正 兑换码复制，审核驳回的兑换码不应该被复制。 2022-08-16 11:26:36 +08:00
wangsongsole 6dd00c149c 删除多余代码 2022-08-16 11:09:36 +08:00
wangsongsole 7a80493748 更改兑换码 立减金 生效时间以营销计划时间为限制 。原：批次时间 2022-08-16 11:02:58 +08:00
zhangds 496047276b 1) 暂存 2022-08-16 10:48:14 +08:00
zhangds 93e9cd5379 1) 修复营销计划审核中编辑，时间空白问题 2022-08-16 10:41:32 +08:00
wangsongsole c9860ac6a4 新增 key批次状态为生成中时，操作按钮全部置灰，生成状态的key批次放在进行中tab页中展示 2022-08-16 09:47:05 +08:00
Apple 2c855f9f64 解决导航重复渲染bug 2022-08-15 18:10:24 +08:00
wangsongsole 50c676d83e 修复【追加key批次】追加key批次，撤销审批，在编辑页面，兑换码批次的商品范围会将之前的商品展示在最新的兑换码批次中 2022-08-15 17:25:18 +08:00
wangsongsole bfb5f30916 禁止立减金 使用规则 富文本全屏 2022-08-15 16:49:14 +08:00
wangsongsole be7942ae0b 优化代码 2022-08-15 15:51:59 +08:00
zhangds b7f5960fa4 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 15:23:10 +08:00
zhangds 6fb3c6af20 1）修复复制计划后，表单验证 2022-08-15 15:23:02 +08:00
wangsongsole 727e5d3c9f Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 15:14:12 +08:00
wangsongsole 232feed09b 修正文件夹错误 2022-08-15 15:14:10 +08:00
zhangds 56f13879aa Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 14:33:12 +08:00
zhangds a93a67e3be 1) 修复时间空白 2022-08-15 14:33:05 +08:00
wangsongsole c55dc2affe 删除无用代码 2022-08-15 14:18:51 +08:00
wangsongsole cf6a4b6350 修改样式 2022-08-15 14:18:17 +08:00
wangsongsole c84501d5bf x修复 key创建中 置灰更多按钮 2022-08-15 14:09:16 +08:00
zhangds 91607146ad 删除page 2022-08-15 11:56:51 +08:00
zhangds a86dd06885 1) 修改page 2022-08-15 11:56:34 +08:00
zhangds 979a862672 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 11:28:14 +08:00
zhangds 42a8e419a8 1) 修复立减金复制不能编辑 2）修复列表状态操作 2022-08-15 11:28:08 +08:00
wangsongsole d7831705a9 提交 2022-08-15 11:08:16 +08:00
wangsongsole c8e183d658 修复 【兑换码-复制】复制已完结兑换码，兑换码生效时间无法修改。 2022-08-15 10:43:56 +08:00
wangsongsole 8bb93a7308 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 10:25:43 +08:00
wangsongsole 925f149a1e 修复可用时间段中，选择“有效期内，不规则日期可用”在预览图中未展示可用时间 2022-08-15 10:25:41 +08:00
Apple bd5c9f5952 解决【追加key批次】提交审核时，后端提示“还有进行中的审批单”，创建/编辑成功后不需要请求审批接口 2022-08-15 10:25:28 +08:00
wangsongsole 272b9dd921 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-12 18:34:47 +08:00
wangsongsole c0d4cf3bfb 提交 2022-08-12 18:34:45 +08:00
zhangds 305d9263be Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-12 18:18:37 +08:00
zhangds 140d6720c2 1） 修复导出带hash值 2） 修复订单复制回显数据 2022-08-12 18:18:28 +08:00
wangsongsole 1ade133568 修正 【订单列表】选择查询日期后，前端的page应该传1 2022-08-12 18:01:05 +08:00
wangsongsole a25166197f 立减金可用时间 动态样式 2022-08-12 17:50:39 +08:00
zhangds e729725d52 1) 修复营销系统上传查询hash 值 2022-08-12 16:00:52 +08:00
zhangds fac9dc2937 1) 增加file 重新选择文件功能 2022-08-11 18:12:36 +08:00
zhangds e4057c7cfa 1） 修改复制接口 2022-08-11 17:37:07 +08:00
zhangds 65e45dfa41 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 17:21:44 +08:00
zhangds efbf16ebe2 1) 修改复制请求详情接口 2022-08-11 17:21:37 +08:00
Apple e016b4502a 菜单营销系统管理显示 2022-08-11 16:38:47 +08:00
Apple bf34d67690 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 16:34:45 +08:00
Apple 167cd279e9 解决登录不进 2022-08-11 16:34:36 +08:00
wangsongsole 54166bb504 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 16:00:06 +08:00
wangsongsole de262ad4ae 优化keys 列表重置效果 2022-08-11 16:00:04 +08:00
zhangds ed4b2266e0 update 2022-08-11 15:55:41 +08:00
zhangds d389d10365 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 15:52:09 +08:00
zhangds 470bc6e6ba 1) 增加table 操作带bash值 2022-08-11 15:51:59 +08:00
wangsongsole 74ff14c3c1 删除无用代码 2022-08-11 15:37:53 +08:00
wangsongsole 34ddc85715 key批次审核未通过，其下进行中的兑换码不可进行复制。 2022-08-11 15:33:00 +08:00
zhangds afed5b5129 1) 修复批量删除带被删除的条件 2022-08-11 15:26:43 +08:00
zhangds a33128fe82 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 15:06:25 +08:00
zhangds fd178f3b64 1) 营销系统增加导出 2022-08-11 15:06:16 +08:00
wangsongsole 27cb9e8518 修正 复制兑换码后，被复制的兑换码数据没有回显。 2022-08-11 14:55:57 +08:00
wangsongsole a56e94825c key批次列表创建中状态的key批次，把更多按钮置灰掉 2022-08-11 14:03:49 +08:00
wangsongsole 343a5a9763 提交 2022-08-11 10:43:04 +08:00
wangsongsole 06b62673d5 修复立减金组件字段兼容 2022-08-11 10:39:14 +08:00
wangsongsole 114c40ae16 修复keys查询字段错误 2022-08-11 10:19:36 +08:00
wangsongsole 8f98e59bcb 修改动态提示 2022-08-10 17:46:53 +08:00
wangsongsole 2e50dcdbad 合并冲突 2022-08-10 17:41:19 +08:00
zhangds d2e5eed984 update 2022-08-10 17:37:06 +08:00
wangsongsole 713d07c828 提交 2022-08-10 17:35:33 +08:00
zhangds facec5e5b4 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-10 17:27:25 +08:00
zhangds cd35c6fa8a 1) 增加计划导出功能 2022-08-10 17:21:51 +08:00
wangsongsole 0a69eb9ff3 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-10 17:02:42 +08:00
wangsongsole abf7420f23 修复 bug 2022-08-10 17:02:40 +08:00
Apple 52727f0047 【账号管理】新建账号，在请求角色接口时，长度限制1000,增加页码查询 2022-08-10 16:50:55 +08:00
wangsongsole 8ba912366b 修复bug 2022-08-10 16:24:39 +08:00
wangsongsole b4a28a252f 修复 【key批次列表】创建中、审核中、审核驳回、已作废状态的key批次，不允许批量发送key批次 2022-08-10 15:42:28 +08:00
wangsongsole abf371b86c key码列表默认填充状态 2022-08-10 15:14:33 +08:00
wangsongsole 8229476356 修正 【key码列表管理】页面文字未对齐 2022-08-10 15:03:32 +08:00
wangsongsole 3a9399390b 修正 【key批次列表】未勾选，批量发送按钮应该置灰 2022-08-10 14:26:26 +08:00
wangsongsole 62bd09d6b8 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-10 14:20:09 +08:00
wangsongsole 5da50bfb20 修复 【key码列表管理】分销商和计划名称查询框，应该为预测性输入框 2022-08-10 14:20:06 +08:00
Apple e19e5ac576 解决【营销计划-复制】key批次复制后，编辑兑换码，点击新增商品和新建立减金，提示“请添加映射分销商” 2022-08-10 14:07:18 +08:00
wangsongsole 3ce6eb0a3d 修改 待使用为可使用 2022-08-10 12:00:16 +08:00
wangsongsole 510ee43702 修改 立减金组件删除样式 2022-08-10 11:34:33 +08:00
wangsongsole 478505ed98 修改立减金组件样式 2022-08-10 11:16:40 +08:00
wangsongsole 2fe21b4b78 修改 基本信息中，券模板编号的券字前端写错了 2022-08-10 10:41:07 +08:00
Apple 4315561afd 调整兑换码复制名称 2022-08-09 15:07:58 +08:00
Apple 04c8bf80a1 兑换码复制面包屑调整 2022-08-09 15:07:02 +08:00
zhangds 3991829fb0 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-09 14:51:43 +08:00
zhangds ca839ca6f0 1） 修改菜单 2022-08-09 14:51:35 +08:00
wangsongsole bcdd504161 Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-09 14:04:07 +08:00
wangsongsole 5c9f9067ba key列表条件查询 优化 2022-08-09 14:04:04 +08:00
Apple 2371b8d3eb key批次复制增加copy_key_batch_id，计算复制次数 2022-08-09 11:50:51 +08:00
wangsongsole 78cc74e746 合并冲突 2022-08-09 11:26:28 +08:00
wangsongsole d1f7ad65c7 删除无用代码 2022-08-09 11:17:17 +08:00
wangsongsole 4f58d9322c 删除 无用文件 2022-08-09 11:10:11 +08:00
wangsongsole 5b705ee327 修改 add 2022-08-09 11:00:55 +08:00
wangsongsole 12126a64b5 删除 无用文件 2022-08-09 10:59:40 +08:00
zhangds bc1d38d195 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-09 09:58:24 +08:00
zhangds bbf3444e2a 1) 删除无用文件 2022-08-09 09:58:17 +08:00
Apple 6545da20dd 处理Ipt组件计算 2022-08-09 09:57:44 +08:00
wangsongsole 0fbe515adf Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 18:30:16 +08:00
wangsongsole 2842610ebf 测试兑换码 2022-08-08 18:30:14 +08:00
zhangds 86800a06ab Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 17:10:04 +08:00
zhangds d8f674b7db 1) 删除无用文件 2022-08-08 17:09:53 +08:00
wangsongsole df442e145b 修复 字段报错 2022-08-08 16:01:30 +08:00
zhangds 177c3d26ce Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 14:51:57 +08:00
zhangds 7d3af028b2 1) 修复一键复制接口 2022-08-08 14:51:51 +08:00
wangsongsole 0b7d3ca40f 静态数据分离 2022-08-08 14:29:37 +08:00
wangsongsole dd143f5c70 Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 14:08:50 +08:00
wangsongsole f6d3326674 修复字段错误 2022-08-08 14:08:48 +08:00
zhangds 459a484e9b Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 13:44:29 +08:00
zhangds d72d36e952 1) 完成营销计划 预览功能 2022-08-08 13:43:15 +08:00
wangsongsole af3ff49cee Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 11:45:19 +08:00
wangsongsole 97f7cdc6d9 修改一键复制兑换码 2022-08-08 11:45:16 +08:00
Apple 55072a56a1 解决key批次复制冲突 2022-08-08 11:34:25 +08:00
Apple bf356f3c17 key批次管理一键复制 2022-08-08 11:32:26 +08:00
Apple 4b79bd8db3 Merge branch 'master' into addMenu-v1.4 2022-08-08 11:31:02 +08:00
Apple 83d73eaee1 商品名称16->20位 2022-08-08 10:30:51 +08:00
wangsongsole 3e5ccf5abd 暂存 防删 2022-08-05 18:57:29 +08:00
wangsongsole 93c7e9d0d1 修改兑换码一键复制 2022-08-05 11:26:12 +08:00
wangsongsole 86830177f8 提交 2022-08-04 18:31:43 +08:00
wangsongsole 898efb27cd copy新增key 重写复制兑换码逻辑 2022-08-04 18:30:16 +08:00
zhangds b756ef8075 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-04 15:19:31 +08:00
zhangds 0d30d79c86 1) 增加营销系统一键复制功能 2022-08-04 15:19:24 +08:00
wangsongsole 1ebf47ebd7 修复 立减金字段内容错误 2022-08-04 10:15:36 +08:00
wangsongsole f36a7fe56d Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-03 18:29:46 +08:00
wangsongsole 0e014c0a1e 对接字段 2022-08-03 18:29:42 +08:00
zhangds e131dbcda0 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-03 18:28:23 +08:00
zhangds 5fe01962e6 1) 更新兑换代码 2022-08-03 18:28:13 +08:00
wangsongsole d1b04bbe8a 新增copy_code_batch_id字段 2022-08-03 17:07:54 +08:00
wangsongsole d0b6e583a2 配合后端调整兑换码 新增逻辑 确认复制标识符以及复制次数字段 2022-08-03 16:51:02 +08:00
wangsongsole 5fc7ddc49f 重写 兑换码复制逻辑 2022-08-03 15:30:37 +08:00
zhangds 6bcce4a42a 1) 更新 2022-08-03 14:06:07 +08:00
wangsongsole 188fe12a0b 修复 一键复制兑换码 时间范围限制错误 2022-08-03 12:04:57 +08:00
wangsongsole ac8ad4f8b1 兑换码列表 根据状态是否一键复制 2022-08-03 11:46:33 +08:00
wangsongsole b006e45446 修复 商品组件 编辑商品权重为0时不能提交 验证问题 2022-08-03 11:28:12 +08:00
wangsongsole 2b41a4b9cd 立减金组件修复 2022-08-03 11:22:37 +08:00
zhangds ac026ca21e 1) 删除api 接口线上接口 2022-08-02 17:46:04 +08:00
zhangds e74c909e44 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-02 17:16:11 +08:00
zhangds 865805b4fc 1) 增加已完成可复制 2022-08-02 17:15:58 +08:00
zhangds a8fd4dc716 1) 增加图片 2022-08-02 17:10:38 +08:00
wangsongsole d5d3ce3c43 对接可用时间字段 2022-08-02 16:53:26 +08:00
wangsongsole f91249159d 修复 营销计划列表展示不完整错误 2022-08-01 16:35:54 +08:00
zhangds 995c0deef0 1） 增加复制key 2022-08-01 16:35:51 +08:00
zhangds 57f6332dbe 1) 增加复制计划列表 2022-08-01 13:56:14 +08:00
wangsongsole f1269eb72e 修复编辑 KEY报错问题 2022-08-01 10:32:46 +08:00
zhangds 99dde0615f Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-29 18:25:08 +08:00
zhangds ee0647d821 1) 增加复制key 2022-07-29 18:24:59 +08:00
zhangds 25f60dfecd 1） 增加复制计划 2022-07-29 18:02:47 +08:00
wangsongsole 1d4675f87f 修改 key列表管理样式 2022-07-29 17:38:57 +08:00
wangsongsole 9097e7775c 修改sha1字段为hash 2022-07-29 17:34:04 +08:00
wangsongsole fce9d9898a 删除 key列表管理多余数据 2022-07-29 17:05:22 +08:00
wangsongsole 6aa0c00521 恢复代码 2022-07-29 17:02:13 +08:00
wangsongsole 93b43374dd 修改 兑换码列表 样式 2022-07-29 16:45:08 +08:00
wangsongsole 00d84202bf 完善兑换码复制操作 等待对接接口 2022-07-29 16:24:39 +08:00
wangsongsole db4a7f8160 新增兑换码复制按钮和相关操作 2022-07-29 16:22:45 +08:00
wangsongsole 18000eba59 完成批量发送key 接口对接 2022-07-29 16:20:09 +08:00
zhangds a04373396b 1) 增加批量上传作废和已使用功能 2022-07-28 17:37:48 +08:00
zhangds 39d0c903a0 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 16:13:47 +08:00
zhangds ceee9c8235 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 16:12:18 +08:00
wangsongsole 33e5a49f9f 1、修复 key列表管理条件查询组件 输入框清除报错问题 
2、与后端对接 key列表管理条件查询组件 静态字段
3、调试完成key列表展示以及相关操作
4、优化代码
 2022-07-28 15:44:33 +08:00
zhangds 5986a7e753 1) 删除key 2022-07-28 15:28:13 +08:00
wangsongsole f29bd59fc0 修改代码 2022-07-28 14:55:37 +08:00
wangsongsole 231fba2694 合并冲突 2022-07-28 14:50:52 +08:00
wangsongsole 6f5defa911 对接字段 2022-07-28 14:50:02 +08:00
zhangds f35fbe3d93 1) 删除key管理 2022-07-28 13:54:23 +08:00
zhangds 47b042d639 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 13:46:13 +08:00
zhangds 7ecec8ffde update 2022-07-28 13:45:58 +08:00
wangsongsole ef95bf21fc 修改 key表格样式 2022-07-28 11:34:13 +08:00
wangsongsole 43adddd11f 修改 key列表查询组件 2022-07-28 11:27:25 +08:00
wangsongsole 634b7ad29e 修改key列表文件 2022-07-28 11:15:06 +08:00
wangsongsole 2da88498aa 配key列表路由 2022-07-28 11:02:19 +08:00
wangsongsole f6da7c08cf 修改key列表文件名称 2022-07-28 10:52:23 +08:00
wangsongsole c72c357f61 新增keylist 2022-07-28 10:47:07 +08:00
wangsongsole e66daf8b65 恢复代码 2022-07-28 10:46:57 +08:00
zhangds 46c2c20629 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 10:37:03 +08:00
wangsongsole 7b22810deb 修改key查询组件 2022-07-28 10:14:34 +08:00
zhangds 2adac54895 update 2022-07-28 10:12:00 +08:00
wangsongsole d6de2e2731 新增 使用规则说明 2022-07-27 11:49:29 +08:00
wangsongsole 0bc09a158f 修改立减租价样式 2022-07-27 10:21:38 +08:00
wangsongsole 4a09c9a5bb 修复 模板编号输入框无响应bug 2022-07-27 10:13:25 +08:00
wangsongsole c331d95c92 配合后端确认 模板编号字段 2022-07-27 10:08:47 +08:00
wangsongsole 2716dbb51e Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-26 16:41:22 +08:00
wangsongsole 7517a3ca07 立减金组件 回显样式控制 2022-07-26 16:41:19 +08:00
zhangds 13128ae664 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-26 16:12:06 +08:00
zhangds b6c05cb183 1) 增加批量上传查询 2022-07-26 16:11:57 +08:00
wangsongsole 13e7aaa317 优化代码 2022-07-26 15:53:19 +08:00
wangsongsole ce023b0eac 1、立减金组件新增 可用时间段 规则字段 
2、新增模板编号字段
 2022-07-26 15:26:12 +08:00
wangsongsole 6779556cfa 新增属性 2022-07-25 17:44:14 +08:00
wangsongsole aa397e655b Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-25 17:34:54 +08:00
wangsongsole ac7222e983 修改keys查询组件 2022-07-25 17:34:52 +08:00
zhangds 232c9d7cf5 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-25 15:36:34 +08:00
zhangds a2a9374d81 1) 增加批量上传 弹窗 2022-07-25 15:36:22 +08:00
wangsongsole 62941ada28 1、新增keys条件查询组件静态数据 
2、营销计划key列表新增批量发送按钮
 2022-07-25 15:01:31 +08:00
wangsongsole 9e12956b15 修改立减金组件样式 2022-07-25 14:26:55 +08:00
wangsongsole 3664455790 合并 2022-07-25 14:18:05 +08:00
zhangds 24579f8604 1) 增加 keys 批量上传 2022-07-25 14:08:56 +08:00
wangsongsole d6cdd5a87f 修改key列表组件样式 2022-07-25 14:05:58 +08:00
wangsongsole d82d49fcf5 新增 key列表查询组件 2022-07-25 11:57:38 +08:00
wangsongsole d6d8178538 修复商品logo上传报错 2022-07-20 11:08:26 +08:00
wangsongsole 69aaec89e3 切换到测试环境 2022-07-20 10:08:53 +08:00
wangsongsole dc2344cd4a 测试商品 2022-07-20 09:59:07 +08:00
wangsongsole d4dc80c683 api回归 2022-07-19 16:01:36 +08:00
wangsongsole 9a4291c43f 单个api切换正式环境 2022-07-19 14:07:20 +08:00
wangsongsole 2ae91d724d 修复商品报错 2022-07-19 09:58:28 +08:00
wangsongsole 4cfe9ea44f 商品图片修改id 2022-07-18 10:21:44 +08:00
wangsongsole fa2af2981e 测试商品图片 2022-07-18 10:11:37 +08:00
wangsongsole 470f85e40d 修复商品图片编辑不能删除 2022-07-15 11:49:19 +08:00
Apple c81a0e4683 调整登录获取验证码样式 2022-07-15 11:24:45 +08:00
wangsongsole 6724462545 修复商品不能删除问题 2022-07-15 11:00:27 +08:00
wangsongsole 73ad399267 优化预警百分比 2022-07-13 06:19:24 +08:00
wangsongsole c99c10a60b 提交 2022-07-13 06:05:47 +08:00
wangsongsole 53cfdd2905 验证预警百分比 2022-07-13 05:52:55 +08:00
wangsongsole 85fee8080a 修复bug 2022-07-13 05:48:53 +08:00
Apple 118eb64510 立减金后台V1_3_0锁定版本 2022-07-13 05:27:21 +08:00
wangsongsole 80712660b5 根据权限禁用新增立减金按钮 2022-07-12 22:26:32 +08:00
Apple f4beb25607 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-07-12 22:22:14 +08:00
Apple b84a491aec 处理立减金添加者权限 2022-07-12 22:22:05 +08:00
wangsongsole bbf0f8829a 删除多余数据 2022-07-12 21:45:36 +08:00
Apple 14dafd4d67 调整模板中心预览页面样式 2022-07-12 15:11:00 +08:00
wangsongsole 123557e255 1、根据需求优化批次商品名称显示长短 
2、根据需求限制面额保留两位小数
 2022-07-12 11:14:16 +08:00
Apple 307178d1ce 镜像环境 2022-07-12 10:48:20 +08:00
wangsongsole 1c99827e94 修复bug 2022-07-05 13:42:10 +08:00
zhangds 44bc51bc96 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-30 15:23:00 +08:00
wangsongsole fc038e74da 商品图片Key修改为唯一 2022-06-30 14:39:55 +08:00
wangsongsole 155b18d3ae 修复 【营销计划-后台】兑换码编辑页面，商品范围列表没有展示立减金商品id 2022-06-29 16:38:56 +08:00
zhangds 6a8dfec703 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 18:27:15 +08:00
zhangds 7b0a4e9e3b update 2022-06-24 18:27:09 +08:00
wangsongsole f1f7e8b22d 修复 商品回显编辑报错问题 2022-06-24 17:10:24 +08:00
zhangds 8b19c1e484 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 16:10:36 +08:00
wangsongsole b6256fd0c7 合并代码 2022-06-24 16:09:37 +08:00