Commit Graph

6420 Commits

Author SHA1 Message Date
yang.huaxiang
1fcd2575db Merge remote-tracking branch 'origin/dev' into dev 2021-02-20 17:09:54 +08:00
yang.huaxiang
abc7f94b60 Merge branch 'feature/GFRS-2220【待确定】国富鑫享年年保险产品需求' into dev 2021-02-20 17:08:43 +08:00
mengxiaolong
741389f71b Merge branch 'feature/【20210220】替换产品图片' into dev 2021-02-20 17:08:14 +08:00
yang.huaxiang
fbf6c7ea26 国富鑫享年年保险产品需求: 一次交清问题处理 --提交人:阳华祥 2021-02-20 17:08:10 +08:00
mengxiaolong
d2bb084097 修改产品编码 2021-02-20 17:08:05 +08:00
mengxiaolong
85f26d5ec6 Merge branch 'feature/【20210220】替换产品图片' into dev 2021-02-20 16:57:30 +08:00
mengxiaolong
bce53754bc 修改产品编码 2021-02-20 16:57:21 +08:00
mengxiaolong
df4f11ce1f Merge branch 'feature/【20210220】替换产品图片' into dev 2021-02-20 13:16:20 +08:00
mengxiaolong
d7d2810841 替换产品图片 2021-02-20 13:16:07 +08:00
mengxiaolong
2a80e7f40a Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 14:46:49 +08:00
mengxiaolong
22fabbcfa7 样式调整 2021-02-19 14:46:31 +08:00
mengxiaolong
a162f6b0b1 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 14:40:36 +08:00
mengxiaolong
e33b63567e 样式调整 2021-02-19 14:40:23 +08:00
mengxiaolong
3732bd9e0e Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 14:13:42 +08:00
mengxiaolong
0d410d4a9d 调整弹窗样式 2021-02-19 14:12:51 +08:00
mengxiaolong
9ef7e2e24c Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 14:03:31 +08:00
mengxiaolong
a8854b9463 样式调整 2021-02-19 14:03:11 +08:00
mengxiaolong
af14a32121 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 11:55:39 +08:00
mengxiaolong
36976e165b 点击弹出选项 2021-02-19 11:54:56 +08:00
mengxiaolong
b4e8ed8ade Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 11:49:57 +08:00
mengxiaolong
635413ce36 样式调整 2021-02-19 11:49:43 +08:00
mengxiaolong
c72947a423 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 10:44:55 +08:00
mengxiaolong
fca59f3fe2 修改文案 2021-02-19 10:44:36 +08:00
mengxiaolong
848c0e4024 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 10:31:34 +08:00
mengxiaolong
55de20bbe3 分页大小调整 2021-02-19 10:30:39 +08:00
mengxiaolong
dc5be49d29 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-19 09:56:34 +08:00
mengxiaolong
14a421b08a fix: 修改从不同入口进入排行榜查询数据不一致问题 2021-02-19 09:56:21 +08:00
mengxiaolong
9a93ad6cd9 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-18 13:55:36 +08:00
mengxiaolong
a39719fa2e 细节优化 2021-02-18 13:55:06 +08:00
mengxiaolong
464ca7dfcb Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-18 11:01:54 +08:00
mengxiaolong
9bcbf4be57 页面调整 2021-02-18 11:01:43 +08:00
mengxiaolong
6f040521c5 Merge branch 'feature/【GFRS-2145】e起陪访' into dev 2021-02-18 09:27:01 +08:00
mengxiaolong
3c76ef76f9 拦截原生按钮 2021-02-18 09:26:51 +08:00
mengxiaolong
fcc04a6634 Merge branch 'feature/【GFRS-2145】e起陪访' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/main.js
#	src/router/ebiz/index.js
2021-02-18 09:14:18 +08:00
mengxiaolong
c99fee37c2 调用接口时机修改 2021-02-08 16:31:32 +08:00
mengxiaolong
50595fd0c1 Merge branch 'feature/【20210208】nsb文本修改' into dev 2021-02-08 15:39:31 +08:00
mengxiaolong
b81153b05d 文字修改 2021-02-08 15:39:22 +08:00
mengxiaolong
ae7f63f2cf 接口调试 2021-02-08 15:36:58 +08:00
yang.huaxiang
c6b6df8f60 八桂无忧C款调整:代码调试 --提交人:阳华祥 2021-02-08 10:30:44 +08:00
yang.huaxiang
53d900fb83 Merge branch 'hotfix/【20210208】八桂C框补充处理' into dev 2021-02-08 10:00:53 +08:00
yang.huaxiang
602ede3984 八桂无忧C款调整:八桂无忧投保规则调整 --提交人:阳华祥 2021-02-08 10:00:32 +08:00
mengxiaolong
743b0c270c 调试接口 2021-02-05 15:53:36 +08:00
mengxiaolong
2d2fc8ab9a 删除多余变量 2021-02-04 11:40:02 +08:00
mengxiaolong
3ca1b326fe Merge branch 'feature/【20210204】vip商城调整' into dev
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/assets/js/utils/request.js
2021-02-04 11:36:49 +08:00
mengxiaolong
9c2bd15b16 增加多图片显示 2021-02-04 11:34:08 +08:00
mengxiaolong
cfe677bc8a 添加路由跳转, 页面样式调整 2021-02-02 10:12:47 +08:00
mengxiaolong
1dec6fcd1e 添加校验 2021-02-01 18:03:53 +08:00
mengxiaolong
9f2f2c3f1a 添加e起陪访页面 2021-01-29 16:27:29 +08:00
mengxiaolong
cf8ca6e143 Merge branch 'feature/GFRS-2117【待确定】国富人寿附加豁免重大疾病保险(B款)' into release/20210129
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2021-01-29 11:19:34 +08:00
mengxiaolong
61f968779a Merge branch 'feature/【20210122】收入查询隐藏工资为零收入项' into release/20210129 2021-01-29 11:05:43 +08:00