Commit Graph

6308 Commits

Author SHA1 Message Date
na.guo
c791cfc3eb 入司隐藏输入框 2020-08-06 14:22:02 +08:00
mengxiaolong
40539b7cf4 Merge branch 'feature/GFRS-453【】贺报功能' into dev 2020-08-06 14:12:12 +08:00
mengxiaolong
49cdf80253 大单榜 2020-08-06 14:11:34 +08:00
na.guo
eaa792f3cc Merge remote-tracking branch 'remotes/origin/feature/【账户信息增加银行名称模糊查询】' into dev 2020-08-06 13:45:43 +08:00
na.guo
877336c4c2 组件传值修改 2020-08-06 13:44:51 +08:00
na.guo
778cef6f8a Merge remote-tracking branch 'remotes/origin/feature/【机构人力排名】' into dev 2020-08-06 12:57:59 +08:00
na.guo
7377b0e684 固定表头 2020-08-06 12:56:56 +08:00
na.guo
79225ffba8 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-06 10:34:10 +08:00
na.guo
bcdd0854bd Merge remote-tracking branch 'remotes/origin/feature/【账户信息增加银行名称模糊查询】' into dev 2020-08-06 10:33:53 +08:00
na.guo
22e6424048 传参修改 2020-08-06 10:32:45 +08:00
mengxiaolong
b8d2ef9626 Merge branch 'feature/GFRS-453【】贺报功能' into dev 2020-08-06 10:29:31 +08:00
mengxiaolong
af57205da7 贺报样式修改 2020-08-06 10:28:46 +08:00
mengxiaolong
c13b1121c4 Merge branch 'feature/GFRS-453【】贺报功能' into dev
# Conflicts:
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-08-06 09:59:27 +08:00
mengxiaolong
fe183c8499 贺报样式等优化 2020-08-06 09:57:01 +08:00
na.guo
3b32e11101 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-05 18:06:42 +08:00
na.guo
c4688e0b2b Merge remote-tracking branch 'remotes/origin/feature/【账户信息增加银行名称模糊查询】' into dev 2020-08-05 18:05:49 +08:00
na.guo
3e2014df05 添加选择银行卡弹窗 2020-08-05 18:04:41 +08:00
na.guo
9c84385427 选择银行名称弹窗组件 2020-08-05 18:04:15 +08:00
mengxiaolong
b6a28172a5 解决表格与标题间隙问题 2020-08-05 17:59:08 +08:00
mengxiaolong
c6ca511a2b Merge branch 'feature/业绩快报页面改造' into hotfix/电投受益人页面校验修改
# Conflicts:
#	src/views/ebiz/report/reportList.vue
2020-08-05 17:51:40 +08:00
mengxiaolong
4017c723c0 Merge branch 'feature/业绩快报页面改造' into dev
# Conflicts:
#	src/views/ebiz/report/reportList.vue
2020-08-05 17:41:05 +08:00
mengxiaolong
f47c0b2be4 贺报页面, 增加接口 2020-08-05 17:37:45 +08:00
mengxiaolong
010efddb7e 贺报入口和样式修改 2020-08-05 15:02:40 +08:00
mengxiaolong
2a6b453d30 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-05 14:42:40 +08:00
mengxiaolong
7b9915c12f 添加微信端签名需要的参数 2020-08-05 14:41:47 +08:00
mengxiaolong
ebdd94f49b Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-05 14:25:09 +08:00
mengxiaolong
2944cee9fe 修改微信签名后取值字段名称 2020-08-05 14:24:18 +08:00
mengxiaolong
167e4fc787 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-05 13:37:02 +08:00
mengxiaolong
14136958ce 测试微信签名 2020-08-05 13:36:31 +08:00
na.guo
f34cdd0c58 Merge remote-tracking branch 'remotes/origin/feature/【账户信息增加银行名称模糊查询】' into dev 2020-08-05 13:17:43 +08:00
na.guo
9c3be81639 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-05 11:57:23 +08:00
na.guo
b7fc1189d5 人力排名修改
* remotes/origin/feature/【机构人力排名】:
  传参修改
2020-08-05 11:44:47 +08:00
na.guo
873e4c88be 传参修改 2020-08-05 11:43:01 +08:00
mengxiaolong
e31c4549b3 Merge branch 'hotfix/电投受益人页面校验修改' into dev 2020-08-05 11:38:32 +08:00
mengxiaolong
a6686e60ae 删除年龄与婚姻状况校验 2020-08-05 11:38:07 +08:00
mengxiaolong
11bfe539f6 修改下一步按钮层级 2020-08-05 11:36:10 +08:00
mengxiaolong
492622ca92 Merge branch 'hotfix/电投受益人页面校验修改' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/main.js
#	src/router/ebiz/index.js
2020-08-05 11:09:51 +08:00
mengxiaolong
8af7ac0980 [FIX]电投受益人页面删除被保险人必须为已婚的校验 2020-08-05 10:59:18 +08:00
mengxiaolong
6b2bcd566c Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-05 10:03:26 +08:00
mengxiaolong
97b27763f0 修改问题件签名控制逻辑 2020-08-05 10:03:05 +08:00
na.guo
bcf24403d0 添加模糊查询功能 2020-08-05 09:27:52 +08:00
mengxiaolong
6234f6add5 Merge branch 'hotfix/机构业绩排序字段' into release/0803 2020-08-04 20:45:26 +08:00
mengxiaolong
7c04588a3d 修改转账不成功问题件校验逻辑 2020-08-04 20:37:19 +08:00
zhu.wenli@ebiz-digits.com
f0b97c2a95 Merge branch 'hotfix/机构业绩排序字段' into dev 2020-08-04 20:18:38 +08:00
zhu.wenli@ebiz-digits.com
34eb84c8fe 机构业绩排序字段更改 2020-08-04 20:17:32 +08:00
mengxiaolong
c2f3be8178 Merge branch 'hotfix/0803业绩快报BUG修改' into release/0803 2020-08-04 19:35:12 +08:00
mengxiaolong
f2e4f895b6 Merge branch 'hotfix/机构业绩排序字段' into release/0803 2020-08-04 19:32:32 +08:00
zhu.wenli@ebiz-digits.com
7a700a294a Merge branch 'hotfix/机构业绩排序字段' into dev 2020-08-04 19:23:06 +08:00
zhu.wenli@ebiz-digits.com
83f121f253 机构业绩默认排序方式 2020-08-04 19:21:47 +08:00
mengxiaolong
135502e98f Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 19:07:15 +08:00