c

Angie (22):
      atj
      add test an
      add test an
      add an
      add dev test an
      主题追踪及详情页
      Merge branch 'master' of https://github.com/bear-shchan/news-fid3.0
      add toFixed filter & SubjectTrackDetail
      update SubjectTrack
      Merge branch 'dev' of https://github.com/bear-shchan/news-fid3.0 into dev
      test
      update newbieFinanceListFist & detail
      Merge branch 'dev' of https://github.com/bear-shchan/news-fid3.0 into dev
      add todayKnow
      add todayKnow
      add hotstock热门股票详情 & update todayknow今日必知
      Merge branch 'dev' of https://github.com/bear-shchan/news-fid3.0 into dev
      update SubjectTrackDetail & add dropdown-load
      complete NewbieFinance
      merge conflicts
      更新今日必知，主题追踪接口调通数据
      Merge branch 'dev' of https://github.com/bear-shchan/news-fid3.0 into dev

bear-shchan (66):
      first commit
      commit
      add dev
      change title
      merge2
      预知未来样式更改
      readme
      Merge pull request #1 from bear-shchan/dev
      readme
      update
      Merge branch 'master' of https://github.com/bear-shchan/news-fid3.0
      update 预知未来
      test dev push
      test
      update readme
      Merge branch 'dev'
      7x24小时
      Merge branch 'master' of https://github.com/bear-shchan/news-fid3.0
      添加.babelrc .eslint等文件
      7x24小时
      7x24小时接口更新前
      7x24小时接口更新完毕
      两融页面，列表组件，moment过滤器，全局返回上级按钮
      7*24小时聚合页
      subjectTrackList router-link add key
      test
      [view] 定点播报
      [component] goHome.vue
      [view] 定点播报详情页（css未写）
      [view] 定点播报详情页
      [view] 个股行情搜索页html,css
      添加页面切换效果；返回主页按钮逻辑更改
      [view] 个股行情 ajax热门搜索
      add min-height
      Merge branch 'dev' of github.com:bear-shchan/news-fid3.0 into dev
      [view] 财经日历主页
      [view] 财经日历-大事件done
      [view] 财经日历-股东会done
      [view] 财经日历-停复牌done
      [view] 财经日历-数据done
      [view] 财经日历-数据详情页done
      [view] 个股行情-相关浏览器本地存储逻辑完成
      [view] 7*24小时 样式修改
      [view] 个股详情页头部done
      [view] 7*24小时资讯列表-利多利空标签点击跳转
      [view] 个股详情页-资讯页done
      [component] add IconRouterLink 简单详情页
      [view] 个股详情页-主题页，公告页，公告详情页done
      [component] List.vue => SimpleList.vue
      [view] 个股详情页-f10页
      [view] 预知未来列表页布局样式更新版本
      [view] 主题选基-历史净值添加下拉刷新，上拉加载
      [view] 预知未来详情页添加表格更改ajax请求路径
      合并前
      Merge branch 'dev' of github.com:bear-shchan/news-fid3.0 into dev
      [view] 登录接口更改，添加完成逻辑
      [main&app.vue] 添加，加载进度条
      [views] 求一票，基外部跳转逻辑，异步点评列表页及详情页
      [view] 港股资讯列表，详情页（所用接口无https）
      [global css] 取消a标签默认点击效果，登录输入框样式兼容
      [update&&component] 升级vue版本，添加ImgsList.vue(三种图片布局的列表组件)
      [view] 个股和大盘的详情页公用detail.vue页面，围观大盘页面done
      [view] 围观大盘详情页done
      [view] 登录页面样式优化
      [component] 添加加载更多组件，具体运用查看singleStock/Tape/onlookersTape.vue
      [component] 修改加载更多组件逻辑，添加done布尔值和doneText