Commit Graph

1484 Commits

Author SHA1 Message Date
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
Apple 3ea63de86b Merge branch 'addMenu' 2022-07-25 10:36:33 +08:00
wangsongsole e6ddbfa168 改用HTTPS引用 2022-07-25 09:55:44 +08:00
zhangds cafa534bdd 1) 删除无用文件 2) 为最新的商品上线做准备 2022-07-21 10:35:52 +08:00
zhangds d4565c1920 1) 删除无用文件 2022-07-21 10:31:32 +08:00
wangsongsole fdb54d048a 删除log 2022-07-20 11:25:16 +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 b43f0cb015 提交 2022-07-20 09:57:34 +08:00
wangsongsole 4951a2f640 Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-07-19 18:33:01 +08:00
wangsongsole 803daef1d6 提交 2022-07-19 18:32:59 +08:00
zhangds c9aed904a0 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-07-19 17:38:39 +08:00
zhangds f9a81ba8b8 1) 增加所有商品数据 v3 2022-07-19 17:38:22 +08:00
wangsongsole d4dc80c683 api回归 2022-07-19 16:01:36 +08:00
wangsongsole e505588a89 提交 2022-07-19 15:23:10 +08:00
wangsongsole 9a4291c43f 单个api切换正式环境 2022-07-19 14:07:20 +08:00
wangsongsole bf7be9f658 本地调试 2022-07-19 13:47: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
zhangds 26caf46865 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-07-15 11:02:43 +08:00
zhangds 0784433b01 1) 增加本地模拟数据 2022-07-15 11:02:34 +08:00
wangsongsole 6724462545 修复商品不能删除问题 2022-07-15 11:00:27 +08:00
Apple e7baf6db85 oss引入,http->https 2022-07-14 16:28:34 +08:00