- 10 Oct, 2017 3 commits
-
-
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
-
- 20 Sep, 2017 3 commits
-
-
http://192.168.2.91/gitlab/iot-project-js/doorlock
# Conflicts: # History.md # web/lib/less/addDevice/addDevice.less # web/lib/less/bindUser/bindUser.less # web/lib/less/device/device.less # web/lib/less/doorlockManage/doorlockManage.less # web/lib/less/public/core.less # web/lib/less/public/public.less # web/lib/less/public/variables.less # web/resources/lang/zh.json # web/view/addDevice/addDevice.css # web/view/bindUser/bindUser.css # web/view/doorlockManage/doorlockManage.css
朱建香 committed -
朱建香 committed
-
================== * 1.修改生成绑定二维码页面样式
wangying committed
-
- 18 Sep, 2017 2 commits
-
-
================== * 1.上传设备控制、记录列表、门锁管理、修改名称页面样式
wangying committed -
# Conflicts: # History.md # dev/src/view/device/v_hijackRecord.js # dev/src/view/device/v_opendoorRecord.js # doorlockApp/web/view/device/device.css # doorlockApp/web/view/device/recordList.css # doorlockApp/web/view/doorlockManage/doorlockManage.css # web/lib/less/addDevice/addDevice.less # web/lib/less/bindUser/bindUser.less # web/lib/less/device/device.less # web/lib/less/device/recordList.less # web/lib/less/doorlockManage/doorlockManage.less # web/lib/less/login/login.less # web/lib/less/public/animation.less # web/resources/lang/zh.json # web/view/device/device.css # web/view/device/recordList.css # web/view/doorlockManage/doorlockManage.css
朱建香 committed
-
- 15 Sep, 2017 2 commits
- 13 Sep, 2017 3 commits
