Code

Merge from fork origin develop#2

Code

Merged

XuYanci merged 20 commits intoXuYanci:developXuYanci/tap_water:developfrom iteatimeteam:developiteatimeteam/tap_water:developCopy head branch name to clipboardAug 3, 2019

+310-374

Commits

Commits on Jul 23, 2019

• Merge pull request #4 from iteatimeteam/master

  Show description for 1af9d95
  JsouLiang

  authored
  1af9d95

  Copy full SHA for 1af9d95

• Merge pull request #21 from X-Liang/master

  Show description for ebe9b71
  JsouLiang

  authored
  ebe9b71

  Copy full SHA for ebe9b71

• Merge pull request #5 from iteatimeteam/master

  Show description for ae7695d
  JsouLiang

  authored
  ae7695d

  Copy full SHA for ae7695d

Commits on Jul 24, 2019

• no message

  JsouLiang

  committed
  9df9833

  Copy full SHA for 9df9833

• Merge pull request #22 from X-Liang/feature/TabBar-Selected-Event

  Show description for 2207ff4
  XuYanci

  authored
  2207ff4

  Copy full SHA for 2207ff4

• [!] 底部单击添加颜色变化，暴露tab单击事件，封装AppBar，底部tab通过传参数配置

  wjun94

  committed
  111e8fa

  Copy full SHA for 111e8fa

• 解决冲突，废弃TapWaterTabbar.dart

  wjun94

  committed
  86c8972

  Copy full SHA for 86c8972

• btmNavbar map修改为item

  wjun94

  committed
  ab26899

  Copy full SHA for ab26899

• 添加Function类型，完善代码规范

  wjun94

  committed
  945ffc8

  Copy full SHA for 945ffc8

Commits on Jul 25, 2019

• button居中，修改单击返回数据

  wjun94

  committed
  23a04f7

  Copy full SHA for 23a04f7

• Merge pull request #23 from wjun94/master

  Show description for ef54730
  ChenYilong

  authored
  ef54730

  Copy full SHA for ef54730

• [update][dev]update pr template

  ChenYilong

  committed
  fdd6156

  Copy full SHA for fdd6156

• [update][dev]update pr template

  ChenYilong

  committed
  5a30221

  Copy full SHA for 5a30221

• Merge branch 'dev_ChenYilong' of github.com:iteatimeteam/tap_water into dev_ChenYilong

  ChenYilong

  committed
  ff860f2

  Copy full SHA for ff860f2

• [update][dev]update pr template.

  ChenYilong

  committed
  d3642ce

  Copy full SHA for d3642ce

• [update][dev]update pr template

  ChenYilong

  committed
  8bcbfda

  Copy full SHA for 8bcbfda

• Merge pull request #24 from iteatimeteam/dev_ChenYilong

  Show description for 1c36334
  ChenYilong

  authored
  1c36334

  Copy full SHA for 1c36334

Commits on Aug 1, 2019

• [!] 删除无用文件，添加iphonex适配

  wjun94

  committed
  fa4e8f9

  Copy full SHA for fa4e8f9

• [!] 添加底部选中颜色和buttom颜色属性

  wjun94

  committed
  c8b7dfa

  Copy full SHA for c8b7dfa

• [!] 添加注释

  wjun94

  committed
  1f825e2

  Copy full SHA for 1f825e2