Merge branch 'debug' into 'zjx'

# Conflicts:
#   dev/src/public/defaultConfig.js
#   dev/src/public/public.js
#   dev/src/view/doorlockManage/v_index.js

History.md

+1.1.5 / 2017-12-12
+
+==================
+ * 1.上传css样式
 1.1.4 / 2017-11-07
 
 ==================

dev/src/public/config.js

@@ -24,7 +24,7 @@ export default {
 	"hijackMode": {
 		20: "hijackingAlarm",
 	},
-	"model": "UGEN_SECURITY_SMARTDOOR_YJ2017",
+	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
 	"GET_MSG_INTERVAL": 5000,
 	"wifi_add_timeout": 150000,
 	//门铃晃动间隔时间

dev/src/view/doorlockManage/v_index.js

@@ -8,6 +8,7 @@
 */
 
 import config from '../../public/config.js';
+import defaultConfig from '../../public/defaultConfig.js';
 import {iot, uPublic, uComponents} from '../../public/public.js';
 import {projectMethods} from '../../public/components.js';