Commit Graph

6308 Commits

Author SHA1 Message Date
mengxiaolong
7e298f3968 Merge branch 'feature/商品商城优化' into dev 2020-09-08 18:31:57 +08:00
mengxiaolong
de2d98b779 返回无需刷新 2020-09-08 18:30:53 +08:00
mengxiaolong
a7939dbcda Merge branch 'feature/商品商城优化' into dev 2020-09-08 18:17:58 +08:00
mengxiaolong
2718dddbd4 返回无需刷新 2020-09-08 18:17:34 +08:00
mengxiaolong
933f3eb6ac Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-08 17:15:11 +08:00
mengxiaolong
19d6946df2 转账不成功问题件逻辑修改 2020-09-08 17:14:55 +08:00
mengxiaolong
b3252e1667 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-08 15:49:44 +08:00
mengxiaolong
be27497c98 图片上传修改 2020-09-08 15:49:25 +08:00
mengxiaolong
4082e7e49c Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-08 15:44:25 +08:00
mengxiaolong
3c273979d8 图片上传修改 2020-09-08 15:44:11 +08:00
mengxiaolong
b26ae469ab Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-08 15:41:14 +08:00
mengxiaolong
9bb1c11005 图片上传时机修改 2020-09-08 15:40:44 +08:00
mengxiaolong
126f16a234 Merge branch 'feature/商品商城优化' into dev 2020-09-08 15:25:05 +08:00
mengxiaolong
8b43b886d1 微信端样式修改 2020-09-08 15:24:44 +08:00
mengxiaolong
6afa8cc112 Merge branch 'feature/商品商城优化' into dev 2020-09-08 15:18:00 +08:00
mengxiaolong
22aaaae608 跳转链接修改 2020-09-08 15:17:31 +08:00
mengxiaolong
cc55595fd4 Merge branch 'feature/商品商城优化' into dev 2020-09-08 14:24:58 +08:00
mengxiaolong
e6252fcfcf 一键转发修改 2020-09-08 14:24:30 +08:00
mengxiaolong
f0e7d917e6 Merge branch 'feature/商品商城优化' into dev 2020-09-08 14:15:10 +08:00
mengxiaolong
35a49b2461 商品商城优化 2020-09-08 14:13:09 +08:00
mengxiaolong
93e2fa15f9 Merge branch 'feature/商品商城优化' into dev 2020-09-08 13:33:10 +08:00
mengxiaolong
158d477385 菜单名称居中显示 2020-09-08 13:32:45 +08:00
mengxiaolong
f4000cac3c Merge branch 'feature/商品商城优化' into dev
# Conflicts:
#	src/store/index.js
#	src/views/app/Home.vue
2020-09-08 11:00:15 +08:00
mengxiaolong
abcbbe939d 商品商城优化 2020-09-08 10:57:28 +08:00
mengxiaolong
6090c0c4f8 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-07 14:58:27 +08:00
mengxiaolong
8863a888b7 样式,保单状态显示修改 2020-09-07 14:53:49 +08:00
yang.huaxiang
80dd4f37a4 入司职级文字描述处理。 --提交人:阳华祥
(cherry picked from commit 2de1e1650d8b54d9cc68eef53b8744758e00c916)
2020-09-07 14:34:03 +08:00
mengxiaolong
2208abb17b Merge branch 'feature/双主险' into dev 2020-09-07 10:44:17 +08:00
mengxiaolong
ef51baf7e6 改用循环判断双主险是否可以转投保 2020-09-07 10:43:52 +08:00
mengxiaolong
96e0350fc1 Merge branch 'feature/双主险' into dev 2020-09-07 10:28:13 +08:00
mengxiaolong
251e5ecfdd 修改双主险转投保判断 2020-09-07 10:25:43 +08:00
mengxiaolong
271627f9a0 Merge branch 'feature/GFRS-453【】贺报功能' into dev 2020-09-04 12:13:21 +08:00
mengxiaolong
b136f84523 去除字体阴影,字段名称修改 2020-09-04 12:12:36 +08:00
mengxiaolong
94cef53a09 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-03 17:13:57 +08:00
na.guo
7ba32c3243 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-222【0423】续期管理-续期列表 2020-09-03 17:12:20 +08:00
na.guo
63b745a27f 样式修改 2020-09-03 17:11:58 +08:00
mengxiaolong
50a74abc55 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-03 17:09:49 +08:00
mengxiaolong
d433a1fcb0 文本对齐 2020-09-03 17:09:17 +08:00
mengxiaolong
28939af93f Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-03 16:59:41 +08:00
mengxiaolong
70aefc7e2c Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-222【0423】续期管理-续期列表 2020-09-03 16:59:03 +08:00
mengxiaolong
64723e6240 文本对齐处理 2020-09-03 16:58:38 +08:00
na.guo
18cc482558 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-222【0423】续期管理-续期列表 2020-09-03 16:51:20 +08:00
na.guo
4f596a5210 添加分割线 2020-09-03 16:51:08 +08:00
mengxiaolong
4fae8c61ef 文本对齐 2020-09-03 16:48:25 +08:00
mengxiaolong
1aa3a10a25 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-03 16:11:46 +08:00
mengxiaolong
59f08a4f68 日期选择器修改 2020-09-03 16:11:11 +08:00
mengxiaolong
95a208af86 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-03 11:32:35 +08:00
mengxiaolong
10680ed038 续期保单前端搜索 2020-09-03 11:31:41 +08:00
mengxiaolong
c6d6371032 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-09-03 10:15:01 +08:00
mengxiaolong
55891a0987 删除续期保单详情内分享按钮 2020-09-03 10:14:04 +08:00