- 13 Oct, 2017 1 commit
-
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # web/view/doorlockManage/index.html
朱建香 committed
-
- 12 Oct, 2017 14 commits
-
-
朱建香 committed
-
朱建香 committed
-
朱建香 committed
-
朱建香 committed
-
================== * 1.上传门锁管理、门锁用户、邀请绑定、绑定开锁信息页面样式
wangying committed -
朱建香 committed
-
朱建香 committed
-
朱建香 committed
-
朱建香 committed
-
朱建香 committed
-
朱建香 committed
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_wifiAddHelp.js # dev/src/view/device/v_index.js # dev/src/view/device/v_opendoorRecord.js # dev/src/view/device/v_remoteOpendoor.js # dev/src/view/doorlockManage/v_editName.js # dev/src/view/doorlockManage/v_index.js # dev/src/view/doorlockUsers/v_index.js # dev/src/view/login/v_index.js # web/lib/js/p.js # web/resources/lang/zh.json # web/view/device/index.html # web/view/doorlockUsers/index.html # web/view/myInfo/index.html
朱建香 committed -
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # dev/src/lang/zh.json # dev/src/view/doorlockUsers/v_doorlockUser.js # dev/src/view/doorlockUsers/v_index.js # web/lib/js/p.js # web/resources/lang/zh.json # web/view/device/index.html # web/view/doorlockManage/index.html # web/view/doorlockUsers/doorlockUser.html # web/view/doorlockUsers/index.html
朱建香 committed -
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_wifiAdd.js # dev/src/view/addDevice/v_wifiAddHelp.js # dev/src/view/device/v_index.js # dev/src/view/device/v_remoteOpendoor.js # web/lib/js/p.js # web/resources/lang/zh.json # web/view/device/index.html # web/view/myInfo/index.html
朱建香 committed
-
- 11 Oct, 2017 1 commit
-
-
================== * 1.上传主页绑定门锁样式 * 2.上传用户列表、添加用户、修改名称样式
wangying committed
-
- 10 Oct, 2017 4 commits
-
-
朱建香 committed
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_wifiAdd.js # dev/src/view/device/v_index.js # dev/src/view/device/v_remoteOpendoor.js # web/resources/lang/zh.json # web/view/device/index.html # web/view/myInfo/index.html
朱建香 committed -
朱建香 committed
-
================== * 1.上传门锁用户、门锁管理框架（标签、多语言、基本功能） * 2.主页添加绑定门锁
wangying committed
-
- 09 Oct, 2017 1 commit
-
-
wangying committed
-
- 30 Sep, 2017 2 commits
- 29 Sep, 2017 1 commit
-
-
朱建香 committed
-
- 28 Sep, 2017 1 commit
-
-
朱建香 committed
-
- 27 Sep, 2017 1 commit
-
-
朱建香 committed
-
- 26 Sep, 2017 4 commits
-
-
朱建香 committed
-
朱建香 committed
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # History.md # web/lib/js/p.js # web/lib/less/addDevice/addDevice.less # web/lib/less/device/device.less # web/lib/less/public/animation.less # web/lib/less/public/core.less # web/lib/less/public/public.less # web/resources/font/iconfont.ttf # web/resources/lang/zh.json # web/view/addDevice/addDevice.css # web/view/device/device.css
朱建香 committed -
朱建香 committed
-
- 25 Sep, 2017 1 commit
-
-
================== * 1.修改智能指纹锁页面样式
wangying committed
-
- 22 Sep, 2017 4 commits
-
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # dev/src/view/login/v_index.js # web/lib/less/doorlockManage/doorlockManage.less # web/lib/less/login/login.less # web/resources/lang/zh.json # web/view/doorlockManage/doorlockManage.css # web/view/login/index.html # web/view/login/login.css
朱建香 committed -
朱建香 committed
-
朱建香 committed
-
================== * 1.修改生成绑定二维码页面样式
wangying committed
-
- 21 Sep, 2017 5 commits
-
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # dev/src/lang/zh.json # dev/src/view/addDevice/v_scanCodeAdd.js # dev/src/view/doorlockManage/v_editName.js # dev/src/view/doorlockManage/v_index.js # dev/src/view/doorlockManage/v_qrcode.js
朱建香 committed -
朱建香 committed
-
wangying committed
-
朱建香 committed
-
朱建香 committed
-
