Commits · 1e252eca490bcd4751207baf5ea2f6b73d874b5c · felix / DoorLock

24 Jan, 2018 3 commits
- Merge branch 'zjx' into 'test/96' · 1e252eca
```
Zjx

See merge request iot-project-js/doorlock!21
```
  wjd committed Jan 24, 2018
  1e252eca 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 5 commits
- Merge branch 'debug' into 'zjx' · 01567d70
```
# Conflicts:
#   dev/src/public/defaultConfig.js
```
  wjd committed Jan 23, 2018
  01567d70 Browse Files
- 修改appid · b03b8277
  wjd committed Jan 23, 2018
  
  b03b8277 Browse Files
- 修改config地址 model · 879e1c37
  wjd committed Jan 23, 2018
  
  879e1c37 Browse Files
- Merge branch 'zjx' into 'test/96' · 824c0d85
```
Zjx

See merge request iot-project-js/doorlock!18
```
  wjd committed Jan 23, 2018
  824c0d85 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
17 Jan, 2018 1 commit
- Merge branch 'zjx' into 'test/96' · 341e1778
```
Zjx

See merge request iot-project-js/doorlock!17
```
  wjd committed Jan 17, 2018
  341e1778 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 4 commits

Merge branch 'zjx' into 'test/96' · 5e336aa2
```
2018/01/11 16:26

See merge request iot-project-js/doorlock!14
```
wjd committed Jan 11, 2018
5e336aa2 Browse Files
2018/01/11 16:26 · 37ec32c1
```
#11首页三条记录顺序优化【已完成】
```
朱建香 committed Jan 11, 2018
37ec32c1 Browse Files
Merge branch 'zjx' into 'test/96' · e84390ee
```
Zjx

See merge request iot-project-js/doorlock!13
```
wjd committed Jan 11, 2018
e84390ee Browse Files

2018/01/11 15:29 · c15aa5e7

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

committed Jan 11, 2018

c15aa5e7 Browse Files

10 Jan, 2018 1 commit

2018/01/10 20:27 · 6c368916

1.首页字符拼接【已完成】
2.远程开门有效时间更改【已完成】
3.门铃间隔时间缩短【已完成】
4.通知页面返回刷新页面【已完成】
5.邀请绑定优化【完成度：50%】

committed Jan 10, 2018

6c368916 Browse Files

09 Jan, 2018 2 commits
- Merge branch 'zjx' into test/96 · 8b366b1d
  felix committed Jan 09, 2018
  
  8b366b1d Browse Files
- 2018/01/09 12:10 · 6ff2e897
```
UIOT.js更新
```
  朱建香 committed Jan 09, 2018
  6ff2e897 Browse Files
08 Jan, 2018 7 commits
- Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into zjx · 7ac0e290
  朱建香 committed Jan 08, 2018
  
  7ac0e290 Browse Files
- #10 修改邀请绑定页面 · a67d4328
  wangying committed Jan 08, 2018
  
  a67d4328 Browse Files
- 2018/01/08 20:46 · 39b263e0
```
1.结合版本更新
2.修改门锁管理推送设置bug修改
```
  朱建香 committed Jan 08, 2018
  39b263e0 Browse Files
- Update defaultConfig.js · 10c67794
  jenny committed Jan 08, 2018
  
  10c67794 Browse Files
- Merge branch 'zjx' into 'test/96' · b39ea29e
```
Zjx

See merge request iot-project-js/doorlock!12
```
  jenny committed Jan 08, 2018
  b39ea29e Browse Files
- Merge branch 'test/96' into 'zjx' · 1e49b89f
```
# Conflicts:
#   dev/src/public/defaultConfig.js
```
  jenny committed Jan 08, 2018
  1e49b89f Browse Files
- 2018/01/08 18:43 · c931d845
```
结合通知组件
```
  朱建香 committed Jan 08, 2018
  c931d845 Browse Files
05 Jan, 2018 2 commits
- 2018/01/05 20:50 · 8637eb82
```
1.检验是否开启通知
```
  朱建香 committed Jan 05, 2018
  8637eb82 Browse Files
- Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into wangying · b09d38d7
```
# Conflicts:
#	web/lib/less/device/device.less
#	web/lib/less/myInfo/help.less
#	web/view/myInfo/help.css
```
  wangying committed Jan 05, 2018
  b09d38d7 Browse Files
03 Jan, 2018 4 commits
- Merge branch 'zhu_url' into 'debug' · 27b41355
```
Zhu url

See merge request iot-project-js/doorlock!11
```
  felix committed Jan 03, 2018
  27b41355 Browse Files
- Merge branch 'debug' into 'zhu_url' · bf5695a5
```
# Conflicts:
#   dev/src/public/defaultConfig.js
```
  felix committed Jan 03, 2018
  bf5695a5 Browse Files
- Merge branch 'zhu_model' into 'master' · 02ea3415
```
Zhu model

See merge request iot-project-js/doorlock!10
```
  felix committed Jan 03, 2018
  02ea3415 Browse Files
- 2018/01/03 20:00 · 46952de4
```
1.defaultConfig路径更改
```
  朱建香 committed Jan 03, 2018
  46952de4 Browse Files