Commit Graph

2951 Commits

Author SHA1 Message Date
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
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
zhangds 00228f4718 1)修改商品js文件 2022-06-30 15:22:43 +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
zhangds e0779faaa9 1) 修复对话图片上传 2022-06-24 16:09:12 +08:00
zhangds 5d76ccdf7a 1) 增加图片name 2022-06-24 16:00:31 +08:00
zhangds bea8c996ff Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 15:51:32 +08:00
wangsongsole a086ca2180 修改营销计划 商品新增 2022-06-24 15:49:17 +08:00
wangsongsole ab0c153fc6 修改兑换码管理 2022-06-24 15:46:10 +08:00
zhangds 752f5ef5d3 1) 修复新增图片默认图片 2022-06-24 15:43:38 +08:00
zhangds c4e6477f17 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 14:33:34 +08:00
zhangds 21cd29d152 修改测试 2022-06-24 14:33:26 +08:00
wangsongsole 81236ab66b 修改兑换码 2022-06-24 14:33:09 +08:00
wangsongsole afdb690a45 提交 2022-06-23 17:21:29 +08:00
wangsongsole 5fdfea77ef 提交 2022-06-23 17:20:13 +08:00