1.0.0 / 2017-09-13

================== * 1.上传项目开发环境

1.0.0 / 2017-09-13
================== * 1.上传项目开发环境
94b63896 · wangying · a9c76c76 · 94b63896 · 94b63896 · 94b63896
Commit 94b63896 authored Sep 13, 2017 by wangying
103 changed files
--- a/doorlockApp/.gitignore
+++ b/doorlockApp/.gitignore
--- a/doorlockApp/History.md
+++ b/doorlockApp/History.md
--- a/doorlockApp/dev/.babelrc
+++ b/doorlockApp/dev/.babelrc
--- a/doorlockApp/dev/config/lang.js
+++ b/doorlockApp/dev/config/lang.js
--- a/doorlockApp/dev/core/I18NPackage.js
+++ b/doorlockApp/dev/core/I18NPackage.js
--- a/doorlockApp/dev/lib.config.js
+++ b/doorlockApp/dev/lib.config.js
--- a/doorlockApp/dev/package.json
+++ b/doorlockApp/dev/package.json
--- a/doorlockApp/dev/src/lang/en.json
+++ b/doorlockApp/dev/src/lang/en.json
--- a/doorlockApp/dev/src/lang/zh.json
+++ b/doorlockApp/dev/src/lang/zh.json
--- a/doorlockApp/dev/src/public/config.js
+++ b/doorlockApp/dev/src/public/config.js
--- a/doorlockApp/dev/src/public/manage.js
+++ b/doorlockApp/dev/src/public/manage.js
--- a/doorlockApp/dev/src/public/public.js
+++ b/doorlockApp/dev/src/public/public.js
--- a/doorlockApp/dev/src/view/addDevice/v_index.js
+++ b/doorlockApp/dev/src/view/addDevice/v_index.js
--- a/doorlockApp/dev/src/view/addDevice/v_scanCodeAdd.js
+++ b/doorlockApp/dev/src/view/addDevice/v_scanCodeAdd.js
--- a/doorlockApp/dev/src/view/addDevice/v_wifiAdd.js
+++ b/doorlockApp/dev/src/view/addDevice/v_wifiAdd.js
--- a/doorlockApp/dev/src/view/addDevice/v_wifiAddHelp.js
+++ b/doorlockApp/dev/src/view/addDevice/v_wifiAddHelp.js
--- a/doorlockApp/dev/src/view/bindUser/r_bindUser.vue
+++ b/doorlockApp/dev/src/view/bindUser/r_bindUser.vue
--- a/doorlockApp/dev/src/view/bindUser/r_bindUserHelp.vue
+++ b/doorlockApp/dev/src/view/bindUser/r_bindUserHelp.vue
--- a/doorlockApp/dev/src/view/bindUser/r_userList.vue
+++ b/doorlockApp/dev/src/view/bindUser/r_userList.vue
--- a/doorlockApp/dev/src/view/bindUser/v_index.js
+++ b/doorlockApp/dev/src/view/bindUser/v_index.js
--- a/doorlockApp/dev/src/view/c_grid-list.vue
+++ b/doorlockApp/dev/src/view/c_grid-list.vue
--- a/doorlockApp/dev/src/view/c_timeline.vue
+++ b/doorlockApp/dev/src/view/c_timeline.vue
--- a/doorlockApp/dev/src/view/device/v_alarmInfo.js
+++ b/doorlockApp/dev/src/view/device/v_alarmInfo.js
--- a/doorlockApp/dev/src/view/device/v_hijackRecord.js
+++ b/doorlockApp/dev/src/view/device/v_hijackRecord.js
--- a/doorlockApp/dev/src/view/device/v_index.js
+++ b/doorlockApp/dev/src/view/device/v_index.js
--- a/doorlockApp/dev/src/view/device/v_opendoorRecord.js
+++ b/doorlockApp/dev/src/view/device/v_opendoorRecord.js
--- a/doorlockApp/dev/src/view/device/v_remoteOpendoor.js
+++ b/doorlockApp/dev/src/view/device/v_remoteOpendoor.js
--- a/doorlockApp/dev/src/view/doorlockManage/v_editName.js
+++ b/doorlockApp/dev/src/view/doorlockManage/v_editName.js
--- a/doorlockApp/dev/src/view/doorlockManage/v_index.js
+++ b/doorlockApp/dev/src/view/doorlockManage/v_index.js
--- a/doorlockApp/dev/src/view/doorlockManage/v_qrcode.js
+++ b/doorlockApp/dev/src/view/doorlockManage/v_qrcode.js
--- a/doorlockApp/dev/src/view/login/v_forgetPassword.js
+++ b/doorlockApp/dev/src/view/login/v_forgetPassword.js
--- a/doorlockApp/dev/src/view/login/v_index.js
+++ b/doorlockApp/dev/src/view/login/v_index.js
--- a/doorlockApp/dev/src/view/login/v_login.js
+++ b/doorlockApp/dev/src/view/login/v_login.js
--- a/doorlockApp/dev/src/view/login/v_register.js
+++ b/doorlockApp/dev/src/view/login/v_register.js
--- a/doorlockApp/dev/webpack.config.js
+++ b/doorlockApp/dev/webpack.config.js
--- a/web/debug.log
+++ b/web/debug.log
+[0912/183235.881:ERROR:process_info.cc(631)] range at 0xfffde000, size 0x230 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfffdd000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfffd7000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff99000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff93000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff8f000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff8c000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff89000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff7d000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff7a000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff77000, size 0xf84 fully unreadable
+[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff74000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff71000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff6e000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff6b000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff68000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff65000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff62000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff5f000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff59000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff56000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff53000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff38000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff35000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff32000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff2f000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff2c000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff29000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff26000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff23000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff1a000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff0e000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff86000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff3e000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff20000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff1d000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff47000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff14000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff3b000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff4d000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff08000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff9c000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff83000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff9f000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff80000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff5c000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff4a000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff41000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff17000, size 0xf84 fully unreadable
+[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff11000, size 0xf84 fully unreadable
--- a/doorlockApp/web/lib/css/bootstrap.min.css
+++ b/doorlockApp/web/lib/css/bootstrap.min.css
--- a/doorlockApp/web/lib/js/UIOT.js
+++ b/doorlockApp/web/lib/js/UIOT.js
--- a/doorlockApp/web/lib/js/p.js
+++ b/doorlockApp/web/lib/js/p.js
--- a/doorlockApp/web/lib/less/addDevice/addDevice.less
+++ b/doorlockApp/web/lib/less/addDevice/addDevice.less
--- a/doorlockApp/web/lib/less/bindUser/bindUser.less
+++ b/doorlockApp/web/lib/less/bindUser/bindUser.less
--- a/doorlockApp/web/lib/less/device/device.less
+++ b/doorlockApp/web/lib/less/device/device.less
--- a/doorlockApp/web/lib/less/device/recordList.less
+++ b/doorlockApp/web/lib/less/device/recordList.less
--- a/doorlockApp/web/lib/less/doorlockManage/doorlockManage.less
+++ b/doorlockApp/web/lib/less/doorlockManage/doorlockManage.less
--- a/doorlockApp/web/lib/less/login/login.less
+++ b/doorlockApp/web/lib/less/login/login.less
--- a/doorlockApp/web/lib/less/public/animation.less
+++ b/doorlockApp/web/lib/less/public/animation.less
--- a/doorlockApp/web/lib/less/public/core.less
+++ b/doorlockApp/web/lib/less/public/core.less
--- a/doorlockApp/web/lib/less/public/header.less
+++ b/doorlockApp/web/lib/less/public/header.less
--- a/doorlockApp/web/lib/less/public/mixins.less
+++ b/doorlockApp/web/lib/less/public/mixins.less
--- a/doorlockApp/web/lib/less/public/public.less
+++ b/doorlockApp/web/lib/less/public/public.less
--- a/doorlockApp/web/lib/less/public/variables.less
+++ b/doorlockApp/web/lib/less/public/variables.less
--- a/doorlockApp/web/resources/font/defaultIconfont.ttf
+++ b/doorlockApp/web/resources/font/defaultIconfont.ttf
--- a/doorlockApp/web/resources/font/iconfont.ttf
+++ b/doorlockApp/web/resources/font/iconfont.ttf
--- a/doorlockApp/web/resources/image/connectWifi.png
+++ b/doorlockApp/web/resources/image/connectWifi.png
--- a/doorlockApp/web/resources/image/device.png
+++ b/doorlockApp/web/resources/image/device.png
--- a/doorlockApp/web/resources/image/gray_head_icon.png
+++ b/doorlockApp/web/resources/image/gray_head_icon.png
--- a/doorlockApp/web/resources/image/green_alarmInfo0_icon.png
+++ b/doorlockApp/web/resources/image/green_alarmInfo0_icon.png
--- a/doorlockApp/web/resources/image/green_alarmInfo1_icon.png
+++ b/doorlockApp/web/resources/image/green_alarmInfo1_icon.png
--- a/doorlockApp/web/resources/image/green_alarmInfo2_icon.png
+++ b/doorlockApp/web/resources/image/green_alarmInfo2_icon.png
--- a/doorlockApp/web/resources/image/green_alarmInfo3_icon.png
+++ b/doorlockApp/web/resources/image/green_alarmInfo3_icon.png
--- a/doorlockApp/web/resources/image/green_opendoor0_icon.png
+++ b/doorlockApp/web/resources/image/green_opendoor0_icon.png
--- a/doorlockApp/web/resources/image/green_opendoor1_icon.png
+++ b/doorlockApp/web/resources/image/green_opendoor1_icon.png
--- a/doorlockApp/web/resources/image/green_opendoor2_icon.png
+++ b/doorlockApp/web/resources/image/green_opendoor2_icon.png
--- a/doorlockApp/web/resources/image/green_opendoor3_icon.png
+++ b/doorlockApp/web/resources/image/green_opendoor3_icon.png
--- a/doorlockApp/web/resources/image/guideBg.png
+++ b/doorlockApp/web/resources/image/guideBg.png
--- a/doorlockApp/web/resources/image/hijackAlarm.png
+++ b/doorlockApp/web/resources/image/hijackAlarm.png
--- a/doorlockApp/web/resources/image/image1.png
+++ b/doorlockApp/web/resources/image/image1.png
--- a/doorlockApp/web/resources/image/image2.png
+++ b/doorlockApp/web/resources/image/image2.png
--- a/doorlockApp/web/resources/image/image3.png
+++ b/doorlockApp/web/resources/image/image3.png
--- a/doorlockApp/web/resources/image/logo.png
+++ b/doorlockApp/web/resources/image/logo.png
--- a/doorlockApp/web/resources/image/noCont.png
+++ b/doorlockApp/web/resources/image/noCont.png
--- a/doorlockApp/web/resources/image/opendoorRecord.png
+++ b/doorlockApp/web/resources/image/opendoorRecord.png
--- a/doorlockApp/web/resources/image/remoteOpendoor.png
+++ b/doorlockApp/web/resources/image/remoteOpendoor.png
--- a/doorlockApp/web/resources/image/scanCodeAdd.png
+++ b/doorlockApp/web/resources/image/scanCodeAdd.png
--- a/doorlockApp/web/resources/image/securityAlarm.png
+++ b/doorlockApp/web/resources/image/securityAlarm.png
--- a/doorlockApp/web/resources/image/white_head_icon.png
+++ b/doorlockApp/web/resources/image/white_head_icon.png
--- a/doorlockApp/web/resources/image/white_loading_icon.png
+++ b/doorlockApp/web/resources/image/white_loading_icon.png
--- a/doorlockApp/web/resources/image/wifiAdd.png
+++ b/doorlockApp/web/resources/image/wifiAdd.png
--- a/doorlockApp/web/resources/lang/en.json
+++ b/doorlockApp/web/resources/lang/en.json
--- a/doorlockApp/web/resources/lang/zh.json
+++ b/doorlockApp/web/resources/lang/zh.json
--- a/doorlockApp/web/view/addDevice/addDevice.css
+++ b/doorlockApp/web/view/addDevice/addDevice.css
--- a/doorlockApp/web/view/addDevice/index.html
+++ b/doorlockApp/web/view/addDevice/index.html
--- a/doorlockApp/web/view/addDevice/scanCodeAdd.html
+++ b/doorlockApp/web/view/addDevice/scanCodeAdd.html
--- a/doorlockApp/web/view/addDevice/wifiAdd.html
+++ b/doorlockApp/web/view/addDevice/wifiAdd.html
--- a/doorlockApp/web/view/addDevice/wifiAddHelp.html
+++ b/doorlockApp/web/view/addDevice/wifiAddHelp.html
--- a/doorlockApp/web/view/bindUser/bindUser.css
+++ b/doorlockApp/web/view/bindUser/bindUser.css
--- a/doorlockApp/web/view/bindUser/index.html
+++ b/doorlockApp/web/view/bindUser/index.html
--- a/doorlockApp/web/view/device/alarmInfo.html
+++ b/doorlockApp/web/view/device/alarmInfo.html
--- a/doorlockApp/web/view/device/device.css
+++ b/doorlockApp/web/view/device/device.css
--- a/doorlockApp/web/view/device/hijackRecord.html
+++ b/doorlockApp/web/view/device/hijackRecord.html
--- a/doorlockApp/web/view/device/index.html
+++ b/doorlockApp/web/view/device/index.html
--- a/doorlockApp/web/view/device/opendoorRecord.html
+++ b/doorlockApp/web/view/device/opendoorRecord.html
--- a/doorlockApp/web/view/device/recordList.css
+++ b/doorlockApp/web/view/device/recordList.css
--- a/doorlockApp/web/view/device/remoteOpendoor.html
+++ b/doorlockApp/web/view/device/remoteOpendoor.html
--- a/doorlockApp/web/view/doorlockManage/doorlockManage.css
+++ b/doorlockApp/web/view/doorlockManage/doorlockManage.css
--- a/doorlockApp/web/view/doorlockManage/editName.html
+++ b/doorlockApp/web/view/doorlockManage/editName.html
--- a/doorlockApp/web/view/doorlockManage/index.html
+++ b/doorlockApp/web/view/doorlockManage/index.html
--- a/doorlockApp/web/view/doorlockManage/qrcode.html
+++ b/doorlockApp/web/view/doorlockManage/qrcode.html
--- a/doorlockApp/web/view/login/forgetPassword.html
+++ b/doorlockApp/web/view/login/forgetPassword.html
--- a/doorlockApp/web/view/login/index.html
+++ b/doorlockApp/web/view/login/index.html
--- a/doorlockApp/web/view/login/login.css
+++ b/doorlockApp/web/view/login/login.css
--- a/doorlockApp/web/view/login/login.html
+++ b/doorlockApp/web/view/login/login.html
--- a/doorlockApp/web/view/login/register.html
+++ b/doorlockApp/web/view/login/register.html