889 Commits

Author SHA1 Message Date
3ed9809afe 7.15 时间搜索 2022-07-15 14:47:29 +08:00
6b69a32b9e 7.15 右侧数据线限定数据格式 2022-07-15 14:04:31 +08:00
04b9f73d3d 7.15 取消富文本组件路由 2022-07-15 11:00:36 +08:00
8006d32d57 7.15 增加中讯院 2022-07-15 10:04:44 +08:00
9ab4413e88 7.15 党建攻坚管理端 2022-07-15 08:58:51 +08:00
c98f3d1a71 Merge branch '20220705-wangeditor' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220712-topic-management 2022-07-13 15:15:59 +08:00
8276d04729 7.13 富文本改造 2022-07-13 10:04:01 +08:00
26b7130352 7.11 富文本增加本地图片上传 2022-07-12 16:37:11 +08:00
20f092d6b1 7.12 2022-07-12 15:10:29 +08:00
f2c3408fc8 参数修改 2022-07-11 16:30:32 +08:00
503e8ed03f 部署供货商客服入口 2022-07-11 16:01:49 +08:00
aa571b8c14 Merge branch 'release_20220708' into 'master'
【生产】7.8版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!171
2022-07-11 08:27:44 +08:00
e91466b3af 去掉首页客服 2022-07-08 18:32:59 +08:00
65f5d5ae85 去掉客服代码 2022-07-08 18:30:26 +08:00
ec06e3ff8f 去掉客服代码 2022-07-08 18:29:39 +08:00
b7239a8838 Merge branch '20220707-内拍出价校验错误' into 'release_20220708'
7.8 内拍出价校验错误

See merge request eshop/fe_service_ebtp_frontend!170
2022-07-08 16:51:43 +08:00
c24fc9984e Merge branch '20220707-negotiation_single_simple' into 'release_20220708'
7.8 单一来源简化版评审结果保存报错

See merge request eshop/fe_service_ebtp_frontend!169
2022-07-08 16:51:18 +08:00
96640f366a Merge branch '20220704-topic-0704需求' into 'release_20220708'
7.8 党建攻坚7.4需求

See merge request eshop/fe_service_ebtp_frontend!168
2022-07-08 16:50:33 +08:00
8106cf9cea 7.8 bug修改 2022-07-08 14:58:02 +08:00
59e99b5a38 7.8 党建攻坚修改标签页名称 2022-07-08 11:10:28 +08:00
494a621230 单一来源简化版评审结果保存报错 2022-07-07 17:14:49 +08:00
65e2cd0001 7.7 党建专题7.4需求 2022-07-07 15:46:34 +08:00
1e21cbe512 7.7 取消内拍出价价格校验 2022-07-07 09:51:25 +08:00
93fc1e3e44 7.5 wangeditor 2022-07-05 21:57:38 +08:00
fc9e58fd1e Merge branch '20220704-tpo' into 'master'
7.4 党建临时发版内容

See merge request eshop/fe_service_ebtp_frontend!160
2022-07-05 08:33:17 +08:00
b310a0c165 7.4 党建临时发版内容 2022-07-04 22:23:39 +08:00
ce9f1f04ed Merge branch 'release_20220701' into 'master'
【生产】7.1版本同步到master

See merge request eshop/fe_service_ebtp_frontend!159
2022-07-04 08:24:09 +08:00
771ffa84bf Merge branch '20220701-topic' into 'release_20220701'
7.1 党建攻坚部分需求

See merge request eshop/fe_service_ebtp_frontend!158
2022-07-01 21:51:39 +08:00
eb497aa999 7.1 列表搜索重置分页为1 2022-07-01 20:56:02 +08:00
cf64e757dc 7.1 活动风采列表和攻坚克难列表增加上一页和下一页 2022-07-01 20:53:37 +08:00
30c8e19498 7.1 修改 2022-07-01 11:09:36 +08:00
d01758fe88 7.1 党建攻坚修改 2022-07-01 10:43:11 +08:00
1dcf4c84fc Merge branch 'release_20220629' into 'master'
【生产】6.29版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!153
2022-06-30 08:32:12 +08:00
a8476c1908 Merge branch '20220621-PartyMemberTopic' into 'release_20220629'
6.29 bug修改

See merge request eshop/fe_service_ebtp_frontend!152
2022-06-29 22:36:37 +08:00
98159093c0 6.29 bug修改 2022-06-29 22:36:03 +08:00
aaea609833 Merge branch '20220621-PartyMemberTopic' into 'release_20220629'
6.29 党员专题 党建攻坚

See merge request eshop/fe_service_ebtp_frontend!151
2022-06-29 21:31:10 +08:00
23a4551b29 6.29 活动风采详情 2022-06-29 16:22:40 +08:00
ce913ae0f5 6.29 活动联系人样式修改 2022-06-29 11:21:02 +08:00
918c790b06 6.28 党建攻坚第二版 2022-06-28 16:48:36 +08:00
39fc4276ec 6.27 修改 2022-06-27 15:22:15 +08:00
ab70c76464 Merge branch 'release_20220624' into 'master'
【生产】6.24版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!144
2022-06-27 09:14:54 +08:00
f17ebf9c5d 6.27 集成 2022-06-27 09:12:56 +08:00
66fbfb9269 6.26 首页接口联调 2022-06-26 10:42:10 +08:00
66d144fefe 6.24 修改weboffice针对ie11兼容问题 2022-06-24 23:26:55 +08:00
383322546b Merge branch '20220620-富文本编辑器去掉不必要的功能' into 'release_20220624'
6.24 富文本编辑器去掉不必要的功能

See merge request eshop/fe_service_ebtp_frontend!143
2022-06-24 21:28:44 +08:00
3c13a8a88e Merge branch '20220608-提示改成‘组织机构代码’' into 'release_20220624'
6.24 第二个图标记处括号中提示改成【供应商营业执照编号、组织机构代码、税务登记号】

See merge request eshop/fe_service_ebtp_frontend!142
2022-06-24 21:27:48 +08:00
7c535bc526 Merge branch '20220608-评审室应答文件查看,点击查看之后应答文件下载后命名乱码' into 'release_20220624'
6.24 评审室应答文件查看,点击查看之后应答文件下载后命名乱码

See merge request eshop/fe_service_ebtp_frontend!141
2022-06-24 21:26:33 +08:00
2b6da9833c Merge branch '20220608-供应商可以在确认报价前查看到其他人的分项报价' into 'release_20220624'
6.24 供应商可以在确认报价前查看到其他人的分项报价

See merge request eshop/fe_service_ebtp_frontend!140
2022-06-24 21:26:01 +08:00
f3e549c8d7 Merge branch '20220620-详审打分无最低分校验' into 'release_20220624'
6.24 详审打分无最低分校验

See merge request eshop/fe_service_ebtp_frontend!139
2022-06-24 21:25:14 +08:00
bc091f9543 Merge branch '20220609-详审打分可以设置负分但提示有误' into 'release_20220624'
6.24 详审打分可以设置负分但提示有误

See merge request eshop/fe_service_ebtp_frontend!138
2022-06-24 21:24:36 +08:00