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,513 Commits 12 Branches 0 Tags 188 MiB
Commit Graph

1472 Commits

Author SHA1 Message Date
wangsongsole 2c6707d618 优化兑换码模块代码 2022-08-31 10:45:55 +08:00
wangsongsole d90f8b6dc4 优化公用Form报错 2022-08-31 10:05:37 +08:00
wangsongsole b884dc68eb 优化兑换码编辑title展示字段，新增兑换码新增发放总量验证 2022-08-31 09:55:38 +08:00
zhangds 3afd84ad17 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-31 09:45:26 +08:00
Apple eb79a228f2 优化落地页编辑多余引入css样式 2022-08-30 16:44:06 +08:00
Apple d141c1a2dc 编码实现落地页编辑模块功能，完成优惠券落地页数据处理，配置与预览功能模块 2022-08-30 15:12:05 +08:00
zhangds 2a695254d3 1) 增加表格动态改变Column 2022-08-29 18:02:22 +08:00
wangsongsole dc2aa9e2f2 修复app.css代码错误 2022-08-29 11:37:33 +08:00
wangsongsole 685ad20e3a 优化登录界面代码 2022-08-29 10:54:56 +08:00
wangsongsole 8cc7012a18 根据原型调整兑换码页面 2022-08-29 10:21:28 +08:00
zhangds 394890ae37 1) 增加优惠券新增列表 2022-08-29 10:10:48 +08:00
zhangds 86708c2688 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-26 18:33:22 +08:00
zhangds dd2181293b 1） 增加优惠券页面 2022-08-26 18:33:00 +08:00
wangsongsole f14e72c486 修复订单列表 切换table条件时 page未重置 优化app.css代码 2022-08-26 15:17:02 +08:00
wangsongsole 708ed6f42d 修改兑换码新增样式 2022-08-26 14:46:44 +08:00
wangsongsole fb81e2e16c 修改product组件样式 2022-08-26 14:39:58 +08:00
wangsongsole 95e1fc97a1 修复app.css样式覆盖问题 2022-08-26 14:23:44 +08:00
wangsongsole ed908b1d97 更改公共样式 统一select和datepicker样式 2022-08-26 14:16:28 +08:00
wangsongsole 8ab5cfb506 新增兑换码复制逻辑 2022-08-26 13:35:02 +08:00
Apple e36f8c6f3f 优化表格组件checkbox样式，订单管理列表宽度调整 2022-08-26 11:53:15 +08:00
wangsongsole 06097d73eb 修复 grid 合并丢失数据 禁用兑换码编辑、复制、新增相关表单 2022-08-26 09:47:28 +08:00
Apple dad624a1bc Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  1) 增加优惠券增加
  1) 增加消费卷table
 2022-08-25 18:07:16 +08:00
Apple 17c2a620bd 解决优惠券导航选中，路由与一级菜单高亮不匹配 2022-08-25 18:07:05 +08:00
zhangds ae512f3eb2 1) 增加优惠券增加 2022-08-25 18:06:41 +08:00
zhangds 4706289d02 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 16:29:24 +08:00
zhangds aa2b41e0e1 1) 增加消费卷table 2022-08-25 16:29:18 +08:00
Apple fb97d83dcb 删减模版中心CSS样式多余引入，订单模块入口调整 2022-08-25 16:16:52 +08:00
zhangds 867e8a13cd Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 15:32:37 +08:00
zhangds 1e8bc9b06c 1）修改样式 2022-08-25 15:32:22 +08:00
wangsongsole 67dace7e1c Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 15:18:57 +08:00
wangsongsole 3fd4a8a33c 新增兑换码 静态数据分离 2022-08-25 15:18:54 +08:00
zhangds 0f87400e64 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 15:18:36 +08:00
zhangds 9dbcd50af7 1) 增加优惠券 2022-08-25 15:18:29 +08:00
wangsongsole 2978f01f3b 提交优化代码 2022-08-25 14:58:49 +08:00
Apple ac7c618762 删减落地页编辑模块多余引入 2022-08-25 14:46:13 +08:00
Apple f01f22a563 优化落地页预览动态尺寸计算 2022-08-25 14:36:03 +08:00
wangsongsole 9e7cb54f82 Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 14:24:35 +08:00
wangsongsole 701d3ac0ec 优化代码 新增字段 2022-08-25 14:24:32 +08:00
Apple c3adcf62f1 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  融合 兑换码编辑、新增、复制为一个页面 以及相关配置和代码优化
  配置新建兑换码路由以及新建兑换码相关文件
 2022-08-25 14:23:26 +08:00
Apple 2241437012 优化落地页编辑模块代码 2022-08-25 14:22:08 +08:00
wangsongsole c0e14bcb99 融合 兑换码编辑、新增、复制为一个页面 以及相关配置和代码优化 2022-08-25 13:46:30 +08:00
wangsongsole 2f2c7b746b 配置新建兑换码路由以及新建兑换码相关文件 2022-08-25 11:00:28 +08:00
wangsongsole 3d733e2205 Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-24 18:10:08 +08:00
wangsongsole a90dfa654f 提交 2022-08-24 18:10:02 +08:00
Apple 97c98bb22c keys查询新增加载效果 2022-08-24 18:01:10 +08:00
Apple 08120a9c2b 回退keyList 2022-08-24 17:51:53 +08:00
wangsongsole 5ea9708d11 提交 2022-08-24 17:48:04 +08:00
wangsongsole 1510ce8664 修复keys查询bug以及grid 2022-08-24 16:44:20 +08:00
Apple f72ee90688 封装table表格组件加载效果 2022-08-24 14:07:51 +08:00
wangsongsole abca49beae 优化loading 2022-08-24 11:27:03 +08:00
wangsongsole 4d4812e29b 重置 grid滚动条 2022-08-24 10:57:37 +08:00
wangsongsole 811223c738 修改订单类型 2022-08-24 09:50:51 +08:00
wangsongsole a40fe057a0 优化gird代码 loading时间延长 2022-08-24 09:38:43 +08:00
wangsongsole 24d8c1e754 优化gird代码 loading时间延长 2022-08-24 09:37:53 +08:00
wangsongsole a0d124b525 Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-23 18:25:50 +08:00
wangsongsole bfcff50495 修改 组件grid样式 2022-08-23 18:25:36 +08:00
wangsongsole 6ed530163d Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-23 18:22:03 +08:00
wangsongsole e42f6034de 修改gird组件 loading效果 2022-08-23 18:21:38 +08:00
wangsongsole 2769cd98c2 优化代码 2022-08-19 17:36:16 +08:00
wangsongsole c8b1ccc1da 优化立减金组件 规则日期方法代码 2022-08-19 17:32:13 +08:00
wangsongsole 180bd5953b Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-19 15:58:04 +08:00
wangsongsole 3de1c2fd75 修复bug 2022-08-19 15:37:00 +08:00
wangsongsole 0c77acfc2a Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-19 15:29:09 +08:00
wangsongsole c5a13b5bc8 修复 立减金固定时间不能大于生效时间 2022-08-19 15:28:53 +08:00
wangsongsole 52b0549ac5 Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-19 15:20:38 +08:00
wangsongsole 2264e57920 提交 2022-08-19 15:14:06 +08:00
wangsongsole b825fa2ed9 修复bug 2022-08-19 15:05:40 +08:00
wangsongsole b487a569cf 解决立减金固定时间不能选择 2022-08-19 14:46:00 +08:00
wangsongsole c527ff09e7 修复 代码书写错误 2022-08-19 10:25:12 +08:00
wangsongsole 4bf0af36e4 删除注释 2022-08-18 16:03:59 +08:00
wangsongsole 93bfb654ab 修复 兑换码列表 复制状态错误展示 2022-08-18 15:24:34 +08:00
wangsongsole 9c1d31c640 修复 复制兑换码时间 不能选择问题 2022-08-18 15:23:20 +08:00
wangsongsole 1c197bb685 1、修复 兑换码复制状态判断错误 
2、修复 兑换码复制 时间不能选座错误
 2022-08-18 15:17:03 +08:00
wangsongsole 4483b324c7 删除注释 2022-08-18 13:58:18 +08:00
wangsongsole 57f46ad4ea 优化代码 2022-08-18 11:01:16 +08:00
zhangds ec4c63fa46 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-18 11:00:00 +08:00
zhangds 1fb4c8e050 1) 修复营销计划时间不改变文件 2022-08-18 10:59:49 +08:00
wangsongsole a583b23e03 优化路由 2022-08-18 09:51:52 +08:00
Apple d7bc189aaa 营销系统V1_4版本锁版，取消版本号 2022-08-17 21:46:45 +08:00
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