Commit d2083240 by 朱建香

2018/01/03 18:06

1.将config的配置放到defaultConfig里,,并修改配网和门锁管理页面
parent afc5bcad
export default { export default {
"url": "https://cloud.iot.u-gen.net/" "url": "https://cloud.iot.u-gen.net/",
"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
} }
\ No newline at end of file
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
import config from '../../public/config.js'; import config from '../../public/config.js';
import defaultConfig from '../../public/defaultConfig.js';
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init); iot.ready(init);
...@@ -157,7 +158,7 @@ function connectButtonTap(self){ ...@@ -157,7 +158,7 @@ function connectButtonTap(self){
uComponents.showCommLoading(self); uComponents.showCommLoading(self);
iot.business.sds.findWifi({ iot.business.sds.findWifi({
data: { data: {
model: config.model, model: defaultConfig.model,
ssid: self.getTextWiFiName(), ssid: self.getTextWiFiName(),
wifiPwd: self.getTextPassword(), wifiPwd: self.getTextPassword(),
timeout: 20000 timeout: 20000
...@@ -215,7 +216,7 @@ function connectButtonTap(self){ ...@@ -215,7 +216,7 @@ function connectButtonTap(self){
if (window.iotDebug) { if (window.iotDebug) {
iotDebug.upload(iot,'找设备'); iotDebug.upload(iot,'找设备');
} }
let productId = config.model; let productId = defaultConfig.model;
if(response.data == "onJoining"){ if(response.data == "onJoining"){
if(window.iotDebug){ if(window.iotDebug){
iotDebug.push('end: 激活中'+JSON.stringify(response)); iotDebug.push('end: 激活中'+JSON.stringify(response));
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
import config from '../../public/config.js'; import config from '../../public/config.js';
import defaultConfig from '../../public/defaultConfig.js';
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
import {projectMethods} from '../../public/components.js'; import {projectMethods} from '../../public/components.js';
...@@ -199,7 +200,7 @@ function initComponentsConfig() { ...@@ -199,7 +200,7 @@ function initComponentsConfig() {
function getDoorlockInfo(self){ function getDoorlockInfo(self){
uComponents.showLoading(self); uComponents.showLoading(self);
let productId = config.model; let productId = defaultConfig.model;
iot.business.device.getInfo({ iot.business.device.getInfo({
data: { data: {
device_id: self.extras.lockInfo.lock_id device_id: self.extras.lockInfo.lock_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment