Commits · 8ddb3f40d309c2a1ed772c15d26a138cb43c52e9 · html / poolin_app

30 Jan, 2018 2 commits
- 解决冲突 · 8ddb3f40
  gaolei committed Jan 30, 2018
  
  8ddb3f40 Browse Files
- 链接接口 · c0eb1e77
  gaolei committed Jan 30, 2018
  
  c0eb1e77 Browse Files
29 Jan, 2018 2 commits
- Merge branch 'zhanghui' into 'develop' · 78b54381
```
Zhanghui



See merge request !13
```
  zhanghui committed Jan 29, 2018
  78b54381 Browse Files
- 代码重构优化 · 62483aa9
  zhanghui1 committed Jan 29, 2018
  
  62483aa9 Browse Files
28 Jan, 2018 1 commit
- 还是搞不明白 · 30024249
  zhanghui1 committed Jan 28, 2018
  
  30024249 Browse Files
27 Jan, 2018 1 commit
- 没搞明白vuex模块 · c71f3f79
  zhanghui1 committed Jan 28, 2018
  
  c71f3f79 Browse Files
26 Jan, 2018 1 commit
- dashboard相关修改未完 · acc12d13
  zhanghui1 committed Jan 26, 2018
  
  acc12d13 Browse Files
25 Jan, 2018 1 commit
- 设置密码 · c52f4ab4
  gaolei committed Jan 25, 2018
  
  c52f4ab4 Browse Files
24 Jan, 2018 2 commits
- 邮箱设置 · 54c8dafb
  gaolei committed Jan 24, 2018
  
  54c8dafb Browse Files
- develop完整版 · cdd10fb4
  zhanghui1 committed Jan 24, 2018
  
  cdd10fb4 Browse Files
23 Jan, 2018 6 commits
- Merge branch 'jingjie' into 'develop' · 9c5134c7
```
Jingjie



See merge request !12
```
  zhanghui committed Jan 23, 2018
  9c5134c7 Browse Files
- 11 · 051e329e
  zhanghui1 committed Jan 23, 2018
  
  051e329e Browse Files
- Merge branch 'gaolei' into 'develop' · 8491d062
```
Gaolei



See merge request !11
```
  zhanghui committed Jan 23, 2018
  8491d062 Browse Files
- jignjie · 7b70ee99
  jingjie committed Jan 23, 2018
  
  7b70ee99 Browse Files
- 下拉框选择 · 68085c69
  gaolei committed Jan 23, 2018
  
  68085c69 Browse Files
- jingjie · 73ad5db5
  jingjie committed Jan 23, 2018
  
  73ad5db5 Browse Files
19 Jan, 2018 1 commit
- 更改矿机页面，完善用户面板弹窗，增加子账户选择页面 · d8e5a8a2
  gaolei committed Jan 19, 2018
  
  d8e5a8a2 Browse Files
17 Jan, 2018 4 commits
- gaolei · 90786ed4
  gaolei committed Jan 17, 2018
  
  90786ed4 Browse Files
- gaolei · 793b5355
  gaolei committed Jan 17, 2018
  
  793b5355 Browse Files
- zhanghui · c0a2f909
  zhanghui1 committed Jan 17, 2018
  
  c0a2f909 Browse Files
- jingjie · bd7f157b
  jingjie committed Jan 17, 2018
  
  bd7f157b Browse Files
16 Jan, 2018 14 commits
- jingjie · 74cb2b39
  jingjie committed Jan 16, 2018
  
  74cb2b39 Browse Files
- Merge branch 'zhanghui' of gitlab.maxrocky.com:html/poolin_app into jingjie · 50239229
  jingjie committed Jan 16, 2018
  
  50239229 Browse Files
- jingjie · 64e73221
  jingjie committed Jan 16, 2018
  
  64e73221 Browse Files
- 1 · 5e242fa8
  zhanghui1 committed Jan 16, 2018
  
  5e242fa8 Browse Files
- Merge branch 'develop' of gitlab.maxrocky.com:html/poolin_app into jingjie · 85d73297
  jingjie committed Jan 16, 2018
  
  85d73297 Browse Files
- jingjie · af09e4e9
  jingjie committed Jan 16, 2018
  
  af09e4e9 Browse Files
- Merge branch 'develop' of gitlab.maxrocky.com:html/poolin_app into gaolei · 1882f2de
  gaolei committed Jan 16, 2018
  
  1882f2de Browse Files
- Merge branch 'zhanghui' into 'develop' · bd0e613f
```
整理结构优化多人协作样式



See merge request !9
```
  zhanghui committed Jan 16, 2018
  bd0e613f Browse Files
- 整理结构优化多人协作样式 · d2d3b656
  zhanghui1 committed Jan 16, 2018
  
  d2d3b656 Browse Files
- jingjie1 · e75a96ed
  jingjie committed Jan 16, 2018
  
  e75a96ed Browse Files
- 有冲突 · f4ed2cba
  gaolei committed Jan 16, 2018
  
  f4ed2cba Browse Files
- Merge branch 'jingjie' into 'develop' · ed4ddfe6
```
Jingjie



See merge request !7
```
  zhanghui committed Jan 16, 2018
  ed4ddfe6 Browse Files
- Merge branch 'zhanghui' into 'develop' · 3fae32a4
```
1



See merge request !8
```
  zhanghui committed Jan 16, 2018
  3fae32a4 Browse Files
- 1 · b6a807a7
  zhanghui1 committed Jan 16, 2018
  
  b6a807a7 Browse Files
15 Jan, 2018 5 commits
- Merge branch 'gaolei' into 'develop' · 91661234
```
收益页面



See merge request !4
```
  zhanghui committed Jan 15, 2018
  91661234 Browse Files
- jingjie · 3d6310c1
  jingjie committed Jan 15, 2018
  
  3d6310c1 Browse Files
- 收益页面 · 61e353e5
  gaolei committed Jan 15, 2018
  
  61e353e5 Browse Files
- Merge branch 'zhanghui' into 'develop' · 19fba810
```
fixbug



See merge request !3
```
  zhanghui committed Jan 15, 2018
  19fba810 Browse Files
- fixbug · 93f17d65
  zhanghui1 committed Jan 15, 2018
  
  93f17d65 Browse Files