Commit Graph

73 Commits

Author SHA1 Message Date
wuhongjian da20700414 更换默认图片 2022-07-13 11:44:10 +08:00
wuhongjian 38bc627486 merge change修改 2022-07-13 11:18:02 +08:00
wuhongjian 432f8fef23 测试环境配置 2022-07-12 15:11:38 +08:00
wuhongjian becacd1599 合并版本,测试环境配置 2022-07-12 15:11:23 +08:00
wuhongjian b7b0a14b86 文本类算法试用+单点登录bug修复 2022-07-11 19:12:53 +08:00
wuhongjian 46558e465e 西海岸bug修复 2022-07-11 11:38:54 +08:00
guoyue c4a99bf8de 合并冲突 2022-07-11 10:29:34 +08:00
a0049873 23324f50ad BUG修改 后台上架开发 2022-07-09 15:22:20 +08:00
wuhongjian ab21f7de11 合并版本v0.8.1.6 2022-07-09 10:37:17 +08:00
wuhongjian a839c90a1e 单点登录bug修复 2022-07-08 19:02:20 +08:00
a0049873 e8485a86f9 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/static/config/location.js
2022-07-08 08:53:52 +08:00
a0049873 2aa05ee719 解决冲突 2022-07-08 08:53:19 +08:00
wuhongjian d95a2eeb9f bug修复 2022-07-07 20:37:34 +08:00
wuhongjian 6f7d059eca Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 18:23:20 +08:00
wuhongjian dfa6c6a67b 单点登录bug修复 2022-07-07 18:22:54 +08:00
a0049873 c271f3d988 BUG修改 2022-07-07 17:54:41 +08:00
guoyue 4aef24c734 门户:融合服务列表+详情+我的收藏 2022-07-07 13:34:29 +08:00
wuhongjian 6cb8142534 favio替换,与后台同步更新版本 2022-07-06 22:17:22 +08:00
wuhongjian 695aa6867d Merge branch 'hi-ucs-dev' into release 2022-07-06 18:45:20 +08:00
wuhongjian 9cc8accbde 不显示问题修复 2022-07-06 18:42:23 +08:00
a0049873 adfc44cc7f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/assignCase/components/queryPage.vue
2022-07-05 20:52:02 +08:00
a0049873 35653daae4 BUg 2022-07-05 20:51:11 +08:00
wuhongjian 48aa9dffa1 bug修复 2022-07-05 20:46:50 +08:00
wuhongjian cedb88a2b6 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-05 20:07:29 +08:00
a0049873 e65a8765fb 数字能力超市 2022-07-05 20:05:53 +08:00
wuhongjian d71dc876f5 西海岸bug修复 2022-07-05 17:35:48 +08:00
wuhongjian 8a5b0a6370 bug修复 2022-07-05 12:52:32 +08:00
wuhongjian 2d5be4eb52 bug修复 2022-07-04 17:34:14 +08:00
a0049873 c35d5789fc BUG修改 2022-07-04 17:02:00 +08:00
wuhongjian f8588795c4 合并版本 2022-07-04 11:57:44 +08:00
wuhongjian d87bf2ded9 bug修复 2022-07-04 11:27:21 +08:00
a0049873 2fdfa22266 BUG修改 2022-07-01 18:23:43 +08:00
wuhongjian c8e1881fae bug修复 2022-07-01 11:10:23 +08:00
wuhongjian 2663665321 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-30 19:06:55 +08:00
wuhongjian 8fcdff051b bug修复 2022-06-30 19:04:35 +08:00
a0049873 9bf47e3223 BUG修改 2022-06-30 18:48:59 +08:00
a0049873 ecd5c76998 BUG修改 2022-06-30 18:18:10 +08:00
a0049873 0f6b37e52e 摄像头申请流程 2022-06-30 15:27:16 +08:00
wuhongjian 976e588372 购物车 2022-06-30 09:34:16 +08:00
wuhongjian ab7e377dea Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-29 18:37:29 +08:00
wuhongjian ffaabe340a 视频资源 2022-06-29 18:36:50 +08:00
a0049873 ccbcab8dfa 新能力申请 2022-06-29 17:28:49 +08:00
wuhongjian 4c77a55ae7 基础设施联调 2022-06-28 22:24:05 +08:00
a0049873 3738985ade 后台能力申请页面开发 前台申购车 重构 新增市局数据资源跳转 2022-06-27 14:27:50 +08:00
wuhongjian d99b983961 测试分支 2022-06-27 11:20:58 +08:00
a0049873 5cab30d2cc Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/DetailsPageconetent.vue
2022-06-24 19:50:41 +08:00
wuhongjian 068c5dfb1e bug修复 2022-06-24 19:38:27 +08:00
wuhongjian c97201645b 修改死数据配置,token失效问题 2022-06-23 17:56:40 +08:00
wuhongjian f7e1556ed7 修改token失效问题 2022-06-23 14:52:50 +08:00
a0049873 cd42aa29af Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/static/config/location.js
2022-06-23 14:19:26 +08:00