Commits · 4ba9f97d79f66a0186652a7c265d4cbc6816ddd9 · 朱建香 / DoorLock

31 Jan, 2018 4 commits
- Merge branch 'jianxiang' into 'debug' · 4ba9f97d
```
app更新方法更改

See merge request iot-project-js/doorlock!36
```
  wjd committed Jan 31, 2018
  4ba9f97d Browse Files
- app更新方法更改 · 9b947d6b
```
钥匙开门和app远程开门不显示id
未更改名称保存成功
```
  朱建香 committed Jan 31, 2018
  9b947d6b Browse Files
- Merge branch 'jianxiang' into 'debug' · 94f6b325
```
Jianxiang

See merge request iot-project-js/doorlock!34
```
  wjd committed Jan 31, 2018
  94f6b325 Browse Files
- #31绑定成功之后取消按钮消失 · ef8c3132
  朱建香 committed Jan 31, 2018
  
  ef8c3132 Browse Files
30 Jan, 2018 9 commits
- wifi错误提示修改 · 9c657e81
  朱建香 committed Jan 30, 2018
  
  9c657e81 Browse Files
- Merge branch 'jianxiang' into 'debug' · 3d363a7c
```
绑定页面样式修改

See merge request iot-project-js/doorlock!32
```
  wjd committed Jan 30, 2018
  3d363a7c Browse Files
- 绑定页面样式修改 · 8958fdc9
  朱建香 committed Jan 30, 2018
  
  8958fdc9 Browse Files
- Merge branch 'jianxiang' into 'debug' · 269e738e
```
1.多语言更改

See merge request iot-project-js/doorlock!31
```
  wjd committed Jan 30, 2018
  269e738e Browse Files
- 1.多语言更改 · eacd00d5
```
#24远程开门优化
#30普通用户无法查看绑定信息，绑定icon更改
```
  朱建香 committed Jan 30, 2018
  eacd00d5 Browse Files
- Merge branch 'jianxiang' into 'debug' · 6188e2df
```
关联门锁页面多语言更改

See merge request iot-project-js/doorlock!29
```
  wjd committed Jan 30, 2018
  6188e2df Browse Files
- 关联门锁页面多语言更改 · c1cf6496
  朱建香 committed Jan 30, 2018
  
  c1cf6496 Browse Files
- Merge branch 'jianxiang' into 'debug' · e12bc37a
```
Jianxiang

See merge request iot-project-js/doorlock!27
```
  wjd committed Jan 30, 2018
  e12bc37a Browse Files
- #30 · 45cda6b5
```
关联和未关联页面修改
```
  朱建香 committed Jan 30, 2018
  45cda6b5 Browse Files
29 Jan, 2018 2 commits

#29 · 8e3435ae

1.取消按钮样式修改
2.取消按钮点击后超时失败没有关闭
#30
关联和未关联页面修改【未完成】

committed Jan 29, 2018

8e3435ae Browse Files

Merge branch 'jianxiang' into 'debug' · b995f060

1.普通用户进入门锁用户时不应该出现引导页面，且用户详情页面中编辑用户昵称菜单不显示

See merge request iot-project-js/doorlock!26

committed Jan 29, 2018

b995f060 Browse Files

26 Jan, 2018 1 commit

1.普通用户进入门锁用户时不应该出现引导页面，且用户详情页面中编辑用户昵称菜单不显示 · 9a7ff923

2. 编辑个人信息，输入符号时有提示，点击后仍可以保存
3.门锁用户详情页面中，不可点样式不够明显
4. 解绑用户页面，解绑成功提示需要增加按钮
5. 阴影蒙层颜色太淡
6.添加用户引导动画效果太慢
7.点击门铃通知进入首页，门铃需要响起配网倒计时统一为90秒，并增加取消按钮
8.用户详情页面，在绑定前，历史开门记录/编辑用户昵称无法点击进入

committed Jan 26, 2018

9a7ff923 Browse Files

25 Jan, 2018 2 commits
- Merge branch 'jianxiang' into 'debug' · 39e8e8fc
```
Jianxiang

See merge request iot-project-js/doorlock!24
```
  wjd committed Jan 25, 2018
  39e8e8fc Browse Files
- #19前端传默认昵称 · df8e14b1
```
#22首次进入不可点
远程开门超时判断
#28ios下发激活指令
```
  朱建香 committed Jan 25, 2018
  df8e14b1 Browse Files
24 Jan, 2018 6 commits
- #21特殊字符判断 · 6f160b2d
```
#22用户添加跳转到用户详情页面修改
#19用户默认名称更改
```
  朱建香 committed Jan 24, 2018
  6f160b2d Browse Files
- appid · d3e0c0fb
  wjd committed Jan 24, 2018
  
  d3e0c0fb Browse Files
- 修改appid · cfaa7d33
  wjd committed Jan 24, 2018
  
  cfaa7d33 Browse Files
- Merge branch 'zjx' into 'debug' · 0c68b7bd
```
Zjx

See merge request iot-project-js/doorlock!20
```
  wjd committed Jan 24, 2018
  0c68b7bd Browse Files
- Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into zjx · 88e2d434
  朱建香 committed Jan 24, 2018
  
  88e2d434 Browse Files
- #24 · 77b94829
```
远程开门如果提示'设备已离线'点击'确认'按钮后远程开门按钮变为不可控
远程开门如果提示'设备已离线'点击'确认'按钮后关闭远程开门页面，返回首页
```
  朱建香 committed Jan 24, 2018
  77b94829 Browse Files
23 Jan, 2018 3 commits
- Merge branch 'zjx' into 'debug' · b1749b58
```
Zjx

See merge request iot-project-js/doorlock!19
```
  wjd committed Jan 23, 2018
  b1749b58 Browse Files
- Merge branch 'debug' into 'zjx' · 01567d70
```
# Conflicts:
#   dev/src/public/defaultConfig.js
```
  wjd committed Jan 23, 2018
  01567d70 Browse Files
- #28wifi绑定设备激活成功后下发激活成功指令 · 51b2aef1
```
#27在线离线
#24远程开门前获取休眠状态
```
  朱建香 committed Jan 23, 2018
  51b2aef1 Browse Files
22 Jan, 2018 1 commit
- #25 铃声效果优化 · 76db91b9
```
#26 wifi配网添加超时倒计时
```
  朱建香 committed Jan 22, 2018
  76db91b9 Browse Files
16 Jan, 2018 7 commits
- Merge branch 'zjx' into 'debug' · 30090028
```
Zjx

See merge request iot-project-js/doorlock!16
```
  wjd committed Jan 16, 2018
  30090028 Browse Files
- Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into zjx · d9b7aa95
  朱建香 committed Jan 16, 2018
  
  d9b7aa95 Browse Files
- 二维码大小更改 · 3fd0930c
  朱建香 committed Jan 16, 2018
  
  3fd0930c Browse Files
- 修改appId · 7a090786
  wjd committed Jan 16, 2018
  
  7a090786 Browse Files
- 修改sdsmodel以及请求地址 · 6400de30
  wjd committed Jan 16, 2018
  
  6400de30 Browse Files
- Merge branch 'zjx' into 'debug' · 9069c103
```
Zjx

See merge request iot-project-js/doorlock!15
```
  wjd committed Jan 16, 2018
  9069c103 Browse Files
- Merge branch 'debug' into 'zjx' · 08fc04d6
```
# Conflicts:
#   dev/src/public/defaultConfig.js
#   dev/src/public/public.js
#   dev/src/view/doorlockManage/v_index.js
```
  wjd committed Jan 16, 2018
  08fc04d6 Browse Files
12 Jan, 2018 3 commits
- Merge remote-tracking branch 'remotes/origin/wangying' into zjx · 15b516a2
```
# Conflicts:
#	dev/src/lang/zh.json
#	web/lib/less/device/notify.less
#	web/lib/less/doorlockUsers/doorlockUser.less
#	web/view/device/index.html
#	web/view/device/notify.css
#	web/view/device/notify.html
#	web/view/doorlockUsers/doorlockUser.css
#	web/view/doorlockUsers/inviteBind.html
```
  朱建香 committed Jan 12, 2018
  15b516a2 Browse Files
- 2018/01/12 19:14 · c6e15c32
```
1.notify组件优化
2.关联开锁ID也页面html添加
```
  朱建香 committed Jan 12, 2018
  c6e15c32 Browse Files
- #17 优化邀请绑定、关联开锁ID页面按钮覆盖文字的样式问题 · 9aa6832b
  wangying committed Jan 12, 2018
  
  9aa6832b Browse Files
11 Jan, 2018 2 commits

2018/01/11 16:26 · 37ec32c1
```
#11首页三条记录顺序优化【已完成】
```
朱建香 committed Jan 11, 2018
37ec32c1 Browse Files

2018/01/11 15:29 · c15aa5e7

#11首页三条记录样式修改【已完成】
#12邀请绑定通知提示【已完成】
#13远程开门有效时间改为2分钟【已完成】
#14门铃时间更改【已完成】
#15通知页面返回上一页刷新页面【已完成】
#16门锁管理解绑成功提示框样式更改【已完成】

committed Jan 11, 2018

c15aa5e7 Browse Files