Skip to content

D
DoorLock
Commit 169d28d1 by 朱建香
Options

资源包样式更新

parent 1cfee2a1
Showing with 188 additions and 43 deletions
.gitignore
dev/node_modules node_modules
custom/custom01/dev/node_modules custom/custom01/dev/node_modules
......
custom/custom1/webpack.config.js
...@@ -23,7 +23,7 @@ function getAllViewJS(dir) { ...@@ -23,7 +23,7 @@ function getAllViewJS(dir) {
if (fileName.match(regexp)) { if (fileName.match(regexp)) {
let fPath = filePath.replace(__dirname, ""); let fPath = filePath.replace(__dirname, "");
let name = filePath.replace(devViewDir + "/", "").replace('v_', '').replace('.js', ''); let name = filePath.replace(devViewDir + "/", "").replace('v_', '').replace('.js', '');
entry[name] = ["." + fPath]; entry[name] = ["./custom/custom1" + fPath];
} }
} }
} }
......
custom/custom2/src/view/device/v_index.js
...@@ -1454,7 +1454,7 @@ function logoutButtonTap(self){ ...@@ -1454,7 +1454,7 @@ function logoutButtonTap(self){
console.log("clearMap"+response); console.log("clearMap"+response);
//打开登录页面 //打开登录页面
iot.navigator.openWindow({ iot.navigator.openWindow({
url: '../login/index.html', url: '../../../../view/login/index.html',
id: 'login', id: 'login',
extras: { extras: {
needClose: true needClose: true
......
custom/custom2/webpack.config.js
...@@ -23,7 +23,7 @@ function getAllViewJS(dir) { ...@@ -23,7 +23,7 @@ function getAllViewJS(dir) {
if (fileName.match(regexp)) { if (fileName.match(regexp)) {
let fPath = filePath.replace(__dirname, ""); let fPath = filePath.replace(__dirname, "");
let name = filePath.replace(devViewDir + "/", "").replace('v_', '').replace('.js', ''); let name = filePath.replace(devViewDir + "/", "").replace('v_', '').replace('.js', '');
entry[name] = ["." + fPath]; entry[name] = ["./custom/custom2" + fPath];
} }
} }
} }
......
dev/src/lang/zh.json
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
"doorlockManage": "门锁管理", "doorlockManage": "门锁管理",
"editName": "修改名称", "editName": "修改名称",
"qrcode": "生成绑定二维码", "qrcode": "生成绑定二维码",
"addDevice": "添加设备", "addDevice": "绑定门锁",
"scanCodeAdd": "扫码添加设备", "scanCodeAdd": "扫码添加设备",
"wifiAddHelp": "配网添加设备", "wifiAddHelp": "配网添加设备",
"wifiAdd": "搜索设备", "wifiAdd": "搜索设备",
...@@ -183,8 +183,11 @@ ...@@ -183,8 +183,11 @@
"helpCont4": "4.绑定失败则需要重新生成二维码进行绑定" "helpCont4": "4.绑定失败则需要重新生成二维码进行绑定"
}, },
"addDevice": { "addDevice": {
"scanCodeAdd": "扫码添加", "scanCodeAdd": "扫描二维码绑定",
"wifiAdd": "配网添加", "wifiAdd": "配网添加",
"infoTitle": "绑定门锁说明：",
"infoCont1": "1.已经购买门锁的用户，可通过包装或说明书中的二维码，扫描绑定门锁。",
"infoCont2": "2.已绑定门锁的用户，可邀请其他用户扫描二维码。二维码可通过门锁用户-未绑定用户-邀请绑定获得。",
"scanCodeAddTip": "注：扫描门锁主人分享的邀请授权二维码，完成添加。", "scanCodeAddTip": "注：扫描门锁主人分享的邀请授权二维码，完成添加。",
"wifiAddTip": "注：门锁尚未联网时，配置门锁联网信息，完成添加。", "wifiAddTip": "注：门锁尚未联网时，配置门锁联网信息，完成添加。",
"loading": "loading", "loading": "loading",
......
dev/src/view/addDevice/v_scanCodeAdd.js
...@@ -9,11 +9,13 @@ ...@@ -9,11 +9,13 @@
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
import config from '../../public/config.js'; import config from '../../public/config.js';
import projectMethods from '../../public/components.js';
iot.ready(init); iot.ready(init);
function init() { function init() {
//通用 dialog、loading组件 //通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading','u-process']); uPublic.componentsInit(['u-dialog','u-loading','u-process']);
uPublic.componentsExtend(['checkwgtu']);
// uPublic.closeSlideBack(); // uPublic.closeSlideBack();
const app = new Vue({ const app = new Vue({
data:{ data:{
...@@ -60,6 +62,11 @@ function initComponentsConfig() { ...@@ -60,6 +62,11 @@ function initComponentsConfig() {
class: 'custom-process', class: 'custom-process',
status: 0 status: 0
} }
},
checkwgtu: {
initParam: {
class: 'custom-checkwgtu'
}
} }
} }
} }
...@@ -283,13 +290,14 @@ function scanCodeSuccess(self){ ...@@ -283,13 +290,14 @@ function scanCodeSuccess(self){
iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{ iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{
needClose: true needClose: true
}); });
iot.navigator.openWindow({ // iot.navigator.openWindow({
url: '../device/index.html', // url: '../device/index.html',
id: 'device', // id: 'device',
extras: { // extras: {
needClose: true // needClose: true
} // }
}); // });
projectMethods.checkUpdate(self);
} }
}]); }]);
}else{ }else{
...@@ -308,7 +316,7 @@ function scanCodeSuccess(self){ ...@@ -308,7 +316,7 @@ function scanCodeSuccess(self){
// needClose: true // needClose: true
// } // }
// }); // });
uPublic.cheackSdsDeviceExit(self); projectMethods.checkUpdate(self);
} }
}]); }]);
} }
......
dev/src/view/addDevice/v_wifiAdd.js
...@@ -10,11 +10,13 @@ ...@@ -10,11 +10,13 @@
import config from '../../public/config.js'; import config from '../../public/config.js';
import defaultConfig from '../../public/defaultConfig.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';
iot.ready(init); iot.ready(init);
function init() { function init() {
//通用 input、按钮、dialog、loading组件 //通用 input、按钮、dialog、loading组件
uPublic.componentsInit(['u-text','u-button','u-process','u-dialog','u-loading']); uPublic.componentsInit(['u-text','u-button','u-process','u-dialog','u-loading']);
uPublic.componentsExtend(['checkwgtu']);
uPublic.closeSlideBack(); uPublic.closeSlideBack();
const app = new Vue({ const app = new Vue({
data:{ data:{
...@@ -109,7 +111,12 @@ function initComponentsConfig() { ...@@ -109,7 +111,12 @@ function initComponentsConfig() {
class: 'custom-process', class: 'custom-process',
status: 0 status: 0
} }
} },
checkwgtu: {
initParam: {
class: 'custom-checkwgtu'
}
}
} }
} }
...@@ -467,7 +474,7 @@ function addSuccess(self){ ...@@ -467,7 +474,7 @@ function addSuccess(self){
// needClose: true // needClose: true
// } // }
// }); // });
uPublic.cheackSdsDeviceExit(self); projectMethods.checkUpdate(self);
} }
}]); }]);
}else{ }else{
...@@ -484,7 +491,7 @@ function addSuccess(self){ ...@@ -484,7 +491,7 @@ function addSuccess(self){
// needClose: true // needClose: true
// } // }
// }); // });
uPublic.cheackSdsDeviceExit(self); projectMethods.checkUpdate(self);
} }
}]); }]);
} }
......
dev/src/view/c_checkwgtu.vue
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
let data = uPublic.checkResponseData(response.data); let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
cheackSdsDevice(self, data); cheackSdsDevice(self, data);
}else{
openAddDevice();
} }
}, },
error: (error) => { error: (error) => {
...@@ -79,6 +81,8 @@ ...@@ -79,6 +81,8 @@
console.log(productId); console.log(productId);
if(productId){ if(productId){
getWgtuUpdateInfo(self, productId); getWgtuUpdateInfo(self, productId);
}else{
openAddDevice();
} }
}else{ }else{
//sds,关系不存在 //sds,关系不存在
......
dev/src/view/device/v_notify.js
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import {iot, uPublic, uComponents} from '../../public/public.js'; import {iot, uPublic, uComponents} from '../../public/public.js';
import config from '../../public/public.js'; import config from '../../public/public.js';
import projectMethods from '../../public/components.js';
iot.ready(init); iot.ready(init);
function init() { function init() {
...@@ -39,16 +39,17 @@ function init() { ...@@ -39,16 +39,17 @@ function init() {
iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{ iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{
needClose: true needClose: true
}); });
iot.navigator.openWindow({ // iot.navigator.openWindow({
url: './index.html', // url: './index.html',
id: 'device', // id: 'device',
styles: { // styles: {
popGesture: 'none' // popGesture: 'none'
}, // },
extras: { // extras: {
needClose: true // needClose: true
} // }
}); // });
projectMethods.checkUpdate(self);
} }
function tapButton(self){ function tapButton(self){
...@@ -77,8 +78,12 @@ function init() { ...@@ -77,8 +78,12 @@ function init() {
class: 'edit-name-button', class: 'edit-name-button',
text: "这是测试button" text: "这是测试button"
} }
} },
checkwgtu: {
initParam: {
class: 'custom-checkwgtu'
}
}
}; };
} }
} }
......
dev/src/view/doorlockManage/v_index.js
...@@ -293,8 +293,8 @@ function unbind(self){ ...@@ -293,8 +293,8 @@ function unbind(self){
// self.setShowMsg(Vue.t('doorlockManage.unbindSuccess')); // self.setShowMsg(Vue.t('doorlockManage.unbindSuccess'));
// self.setUnbindSucceess(true); // self.setUnbindSucceess(true);
iot.navigator.openWindow({ iot.navigator.openWindow({
url: '../login/loading.html', url: '../login/index.html',
id: 'loading', id: 'index',
extras: { extras: {
lockId: self.extras.lockInfo.lock_id, lockId: self.extras.lockInfo.lock_id,
nickname: self.getTextNickname() nickname: self.getTextNickname()
......
dev/webpack.config.js
...@@ -23,7 +23,7 @@ function getAllViewJS(dir) { ...@@ -23,7 +23,7 @@ function getAllViewJS(dir) {
if (fileName.match(regexp)) { if (fileName.match(regexp)) {
let fPath = filePath.replace(__dirname, ""); let fPath = filePath.replace(__dirname, "");
let name = filePath.replace(devViewDir + "/", "").replace('v_', '').replace('.js', ''); let name = filePath.replace(devViewDir + "/", "").replace('v_', '').replace('.js', '');
entry[name] = ["." + fPath]; entry[name] = ["./dev/" + fPath];
} }
} }
} }
......
lib.config.js 0 → 100644
var webpack = require('webpack');
var path = require('path');
const vendors = [
'whatwg-fetch',
'es6-promise',
'vue',
'vuex'
];
let libsDir = path.join(__dirname,"libs");
module.exports = {
output: {
path: libsDir,
filename: '[name].[chunkhash].js',
library: '[name]_[chunkhash]',
},
entry: {
vendor: vendors,
},
plugins: [
new webpack.DllPlugin({
path: path.join(libsDir,"manifest.json"),
name: '[name]_[chunkhash]',
context: __dirname,
}),
],
};
package.json 0 → 100644
{
"name": "vue-webpack",
"version": "1.0.0",
"description": "",
"main": "webpack.config.js",
"dependencies": {
"es6-promise": "4.1.0",
"es6-symbol": "3.1.1",
"hammerjs": "2.0.8",
"iscroll": "5.2.0",
"moment": "^2.18.1",
"qrcode": "^0.9.0",
"ugen-components": "^0.3.1",
"underscore": "1.8.3",
"vue": "2.2.6",
"vue-i18n": "5.0.3",
"vue-router": "2.1.1",
"vue-touch": "2.0.0-beta.4",
"vuex": "2.3.1"
},
"devDependencies": {
"babel-core": "6.24.1",
"babel-loader": "6.4.1",
"babel-plugin-transform-async-to-generator": "6.24.1",
"babel-plugin-transform-object-assign": "6.22.0",
"babel-plugin-transform-runtime": "6.23.0",
"babel-preset-es2015": "6.24.1",
"crypto-js": "^3.1.9-1",
"css-loader": "0.28.0",
"es6-promise": "4.1.0",
"md5": "^2.2.1",
"style-loader": "0.16.1",
"vue-loader": "11.3.4",
"vue-template-compiler": "2.2.6",
"watch": "1.0.2",
"webpack": "2.3.3"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC"
}
web/custom/custom1/lib/js/p.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom1/lib/js/p.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom1/view/device/index.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom1/view/device/notify.js.map
{"version":3,"sources":["webpack:///./src/view/device/v_notify.js"],"names":["ready","init","componentsExtend","form","Vue","el","data","initButtonText","componentsConfig","initComponentsConfig","dialogFlag","showFlags","onNotifyToIndex","notifyToIndex","mounted","methods","onTapButton","tapButton","onAddDeviceButtonTap","console","log","onToSetting","navigator","fire","plus","webview","getWebviewById","needClose","openWindow","url","id","styles","popGesture","extras","self","notifyDialog","initParam","addDeviceButton","class","text","mui","back","currentWebview","opener"],"mappings":";;;;;;;;AAEA;;;;;;AAIA,YAAIA,KAAJ,CAAUC,IAAV;AACA,SAASA,IAAT,GAAgB;AACf,oBAAQC,gBAAR,CAAyB,CAAC,gBAAD,CAAzB;AACA,QAAIC,OAAO,IAAIC,GAAJ,CAAQ;AACfC,YAAI,UADW;AAEfC,cAAK;AACJC,4BAAgB,MADZ;AAEJC,8BAAkBC,sBAFd,EAEqC;AACzCC,wBAAW,IAHP;AAIJC,uBAAU,KAJN;AAKJC,6BAAgBC,aALZ,CAK0B;AAL1B,SAFU;AASfC,iBAAQ,mBAAU,CAEnB,CAXgB;AAYfC,iBAAS;AACRC,uBADQ,yBACK;AACTC,0BAAU,IAAV;AACA,aAHI;AAKLC,gCALK,kCAKiB;AACrBC,wBAAQC,GAAR,CAAY,4BAAZ;AACA,aAPI;AASLC,uBATK,yBASQ;AACZF,wBAAQC,GAAR,CAAY,cAAZ;AACA;AAXI;;AAZM,KAAR,CAAX;;AA4BA,aAASP,aAAT,GAAwB;AACvB,oBAAIS,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaC,cAAb,CAA4B,QAA5B,CAAnB,EAAyD,YAAzD,EAAsE;AAClEC,uBAAW;AADuD,SAAtE;AAGA,oBAAIL,SAAJ,CAAcM,UAAd,CAAyB;AAClBC,iBAAK,cADa;AAElBC,gBAAI,QAFc;AAGlBC,oBAAQ;AACPC,4BAAY;AADL,aAHU;AAMlBC,oBAAQ;AACPN,2BAAW;AADJ;AANU,SAAzB;AAUA;;AAED,aAASV,SAAT,CAAmBiB,IAAnB,EAAwB;AACpBf,gBAAQC,GAAR,CAAY,kBAAZ;AACF;;AAED;AACE,aAASX,oBAAT,GAAgC;AAC5B,eAAO;AACH;AACA0B,0BAAc;AACV;AACAC,2BAAW;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AAPU;AAFD,aAFX;AAcHC,6BAAgB;AACZ;AACAD,2BAAW;AACPE,2BAAO,kBADA;AAEPC,0BAAM;AAFC;AAFC;;AAdb,SAAP;AAuBH;AACJ;;AAED;AACAC,IAAIC,IAAJ,GAAW,YAAU;AACjB,gBAAInB,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaiB,cAAb,GAA8BC,MAA9B,EAAnB,EAA0D,YAA1D,EAAuE,EAAvE;AACAxB,YAAQC,GAAR,CAAY,MAAZ;AACH,gBAAIE,SAAJ,CAAcmB,IAAd;AACA,CAJD,C","file":"device/notify.js","sourcesContent":["\n\nimport {iot, uPublic, uComponents} from '../../public/public.js';\nimport config from '../../public/public.js';\n\n\niot.ready(init);\nfunction init() {\n\tuPublic.componentsExtend(['android-notify']);\n\tvar form = new Vue({\n\t el: '#content',\n\t data:{\n\t \tinitButtonText: \"测试按钮\",\n\t \tcomponentsConfig: initComponentsConfig(),//初始化数据\n\t \tdialogFlag:true,\n\t \tshowFlags:false,\n\t \tonNotifyToIndex:notifyToIndex //改方法传入\n\t },\n\t mounted:function(){\n\n\t\t\t},\n\t methods: {\n \t\tonTapButton(){\n \t\ttapButton(this);\n \t},\n\n \tonAddDeviceButtonTap(){\n \t\tconsole.log(\"onAddDeviceButtonTap......\");\n \t},\n\n \tonToSetting(){\n \t\tconsole.log(\"点击了toSetting\");\n \t}\n\t }\n\t \n\t});\n\n\tfunction notifyToIndex(){\n\t\tiot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{\n\t \tneedClose: true\n\t\t});\n\t\tiot.navigator.openWindow({\n\t url: './index.html',\n\t id: 'device',\n\t styles: {\n\t \tpopGesture: 'none'\n\t },\n\t extras: {\n\t \tneedClose: true\n\t }\n\t });\n\t}\n\n\tfunction tapButton(self){\n\t console.log(\"tapButton.......\");\n\t }\n\n\t //初始化组件参数\n function initComponentsConfig() {\n return {\n // 设置通知弹出框参数\n notifyDialog: {\n // 默认参数\n initParam: {\n \t// appName:\"js.通用门锁\",\n \t// time:\"js.刚刚\",\n // title:'js.开启通知',\n // content1:'js.开启通知后您将可以及时获取门锁报警',\n // content2:'js.提醒、门锁开门消息通知',\n // accept:'js.我知道了！',\n // buttonTitle:'js.前往开启通知设置'\n }\n },\n addDeviceButton:{\n // 默认参数\n initParam: {\n class: 'edit-name-button',\n text: \"这是测试button\"\n }\n }\n \n };\n }\n}\n\n//重写mui.back\nmui.back = function(){\n iot.navigator.fire(plus.webview.currentWebview().opener(),'returnPage',{});\n console.log(\"fire\");\n\tiot.navigator.back();\n}\n\n\n\n\n\n\n// WEBPACK FOOTER //\n// ./src/view/device/v_notify.js"],"sourceRoot":""} {"version":3,"sources":["webpack:///./custom/custom1/src/view/device/v_notify.js"],"names":["ready","init","componentsExtend","form","Vue","el","data","initButtonText","componentsConfig","initComponentsConfig","dialogFlag","showFlags","onNotifyToIndex","notifyToIndex","mounted","methods","onTapButton","tapButton","onAddDeviceButtonTap","console","log","onToSetting","navigator","fire","plus","webview","getWebviewById","needClose","openWindow","url","id","styles","popGesture","extras","self","notifyDialog","initParam","addDeviceButton","class","text","mui","back","currentWebview","opener"],"mappings":";;;;;;;;AAEA;;;;;;AAIA,YAAIA,KAAJ,CAAUC,IAAV;AACA,SAASA,IAAT,GAAgB;AACf,oBAAQC,gBAAR,CAAyB,CAAC,gBAAD,CAAzB;AACA,QAAIC,OAAO,IAAIC,GAAJ,CAAQ;AACfC,YAAI,UADW;AAEfC,cAAK;AACJC,4BAAgB,MADZ;AAEJC,8BAAkBC,sBAFd,EAEqC;AACzCC,wBAAW,IAHP;AAIJC,uBAAU,KAJN;AAKJC,6BAAgBC,aALZ,CAK0B;AAL1B,SAFU;AASfC,iBAAQ,mBAAU,CAEnB,CAXgB;AAYfC,iBAAS;AACRC,uBADQ,yBACK;AACTC,0BAAU,IAAV;AACA,aAHI;AAKLC,gCALK,kCAKiB;AACrBC,wBAAQC,GAAR,CAAY,4BAAZ;AACA,aAPI;AASLC,uBATK,yBASQ;AACZF,wBAAQC,GAAR,CAAY,cAAZ;AACA;AAXI;;AAZM,KAAR,CAAX;;AA4BA,aAASP,aAAT,GAAwB;AACvB,oBAAIS,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaC,cAAb,CAA4B,QAA5B,CAAnB,EAAyD,YAAzD,EAAsE;AAClEC,uBAAW;AADuD,SAAtE;AAGA,oBAAIL,SAAJ,CAAcM,UAAd,CAAyB;AAClBC,iBAAK,cADa;AAElBC,gBAAI,QAFc;AAGlBC,oBAAQ;AACPC,4BAAY;AADL,aAHU;AAMlBC,oBAAQ;AACPN,2BAAW;AADJ;AANU,SAAzB;AAUA;;AAED,aAASV,SAAT,CAAmBiB,IAAnB,EAAwB;AACpBf,gBAAQC,GAAR,CAAY,kBAAZ;AACF;;AAED;AACE,aAASX,oBAAT,GAAgC;AAC5B,eAAO;AACH;AACA0B,0BAAc;AACV;AACAC,2BAAW;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AAPU;AAFD,aAFX;AAcHC,6BAAgB;AACZ;AACAD,2BAAW;AACPE,2BAAO,kBADA;AAEPC,0BAAM;AAFC;AAFC;;AAdb,SAAP;AAuBH;AACJ;;AAED;AACAC,IAAIC,IAAJ,GAAW,YAAU;AACjB,gBAAInB,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaiB,cAAb,GAA8BC,MAA9B,EAAnB,EAA0D,YAA1D,EAAuE,EAAvE;AACAxB,YAAQC,GAAR,CAAY,MAAZ;AACH,gBAAIE,SAAJ,CAAcmB,IAAd;AACA,CAJD,C","file":"device/notify.js","sourcesContent":["\n\nimport {iot, uPublic, uComponents} from '../../public/public.js';\nimport config from '../../public/public.js';\n\n\niot.ready(init);\nfunction init() {\n\tuPublic.componentsExtend(['android-notify']);\n\tvar form = new Vue({\n\t el: '#content',\n\t data:{\n\t \tinitButtonText: \"测试按钮\",\n\t \tcomponentsConfig: initComponentsConfig(),//初始化数据\n\t \tdialogFlag:true,\n\t \tshowFlags:false,\n\t \tonNotifyToIndex:notifyToIndex //改方法传入\n\t },\n\t mounted:function(){\n\n\t\t\t},\n\t methods: {\n \t\tonTapButton(){\n \t\ttapButton(this);\n \t},\n\n \tonAddDeviceButtonTap(){\n \t\tconsole.log(\"onAddDeviceButtonTap......\");\n \t},\n\n \tonToSetting(){\n \t\tconsole.log(\"点击了toSetting\");\n \t}\n\t }\n\t \n\t});\n\n\tfunction notifyToIndex(){\n\t\tiot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{\n\t \tneedClose: true\n\t\t});\n\t\tiot.navigator.openWindow({\n\t url: './index.html',\n\t id: 'device',\n\t styles: {\n\t \tpopGesture: 'none'\n\t },\n\t extras: {\n\t \tneedClose: true\n\t }\n\t });\n\t}\n\n\tfunction tapButton(self){\n\t console.log(\"tapButton.......\");\n\t }\n\n\t //初始化组件参数\n function initComponentsConfig() {\n return {\n // 设置通知弹出框参数\n notifyDialog: {\n // 默认参数\n initParam: {\n \t// appName:\"js.通用门锁\",\n \t// time:\"js.刚刚\",\n // title:'js.开启通知',\n // content1:'js.开启通知后您将可以及时获取门锁报警',\n // content2:'js.提醒、门锁开门消息通知',\n // accept:'js.我知道了！',\n // buttonTitle:'js.前往开启通知设置'\n }\n },\n addDeviceButton:{\n // 默认参数\n initParam: {\n class: 'edit-name-button',\n text: \"这是测试button\"\n }\n }\n \n };\n }\n}\n\n//重写mui.back\nmui.back = function(){\n iot.navigator.fire(plus.webview.currentWebview().opener(),'returnPage',{});\n console.log(\"fire\");\n\tiot.navigator.back();\n}\n\n\n\n\n\n\n// WEBPACK FOOTER //\n// ./custom/custom1/src/view/device/v_notify.js"],"sourceRoot":""}
\ No newline at end of file \ No newline at end of file
web/custom/custom1/view/device/remoteOpendoor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom1/view/doorlockUsers/inviteBind.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/lib/js/p.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/lib/js/p.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/view/device/alarmInfo.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/device/recordList.css"> <link rel="stylesheet" type="text/css" href="../../../../view/device/recordList.css">
<link rel="stylesheet" type="text/css" href="./recordList.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/device/hijackRecord.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/device/recordList.css"> <link rel="stylesheet" type="text/css" href="../../../../view/device/recordList.css">
<link rel="stylesheet" type="text/css" href="./recordList.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/device/index.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/device/device.css"> <link rel="stylesheet" type="text/css" href="../../../../view/device/device.css">
<link rel="stylesheet" type="text/css" href="./device.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/device/index.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/view/device/notify.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/device/notify.css"> <link rel="stylesheet" type="text/css" href="../../../../view/device/notify.css">
<link rel="stylesheet" type="text/css" href="./notify.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/device/notify.js.map
{"version":3,"sources":["webpack:///./src/view/device/v_notify.js"],"names":["ready","init","componentsExtend","form","Vue","el","data","initButtonText","componentsConfig","initComponentsConfig","dialogFlag","showFlags","onNotifyToIndex","notifyToIndex","mounted","methods","onTapButton","tapButton","onAddDeviceButtonTap","console","log","onToSetting","navigator","fire","plus","webview","getWebviewById","needClose","openWindow","url","id","styles","popGesture","extras","self","notifyDialog","initParam","addDeviceButton","class","text","mui","back","currentWebview","opener"],"mappings":";;;;;;;;AAEA;;;;;;AAIA,YAAIA,KAAJ,CAAUC,IAAV;AACA,SAASA,IAAT,GAAgB;AACf,oBAAQC,gBAAR,CAAyB,CAAC,gBAAD,CAAzB;AACA,QAAIC,OAAO,IAAIC,GAAJ,CAAQ;AACfC,YAAI,UADW;AAEfC,cAAK;AACJC,4BAAgB,MADZ;AAEJC,8BAAkBC,sBAFd,EAEqC;AACzCC,wBAAW,IAHP;AAIJC,uBAAU,KAJN;AAKJC,6BAAgBC,aALZ,CAK0B;AAL1B,SAFU;AASfC,iBAAQ,mBAAU,CAEnB,CAXgB;AAYfC,iBAAS;AACRC,uBADQ,yBACK;AACTC,0BAAU,IAAV;AACA,aAHI;AAKLC,gCALK,kCAKiB;AACrBC,wBAAQC,GAAR,CAAY,4BAAZ;AACA,aAPI;AASLC,uBATK,yBASQ;AACZF,wBAAQC,GAAR,CAAY,cAAZ;AACA;AAXI;;AAZM,KAAR,CAAX;;AA4BA,aAASP,aAAT,GAAwB;AACvB,oBAAIS,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaC,cAAb,CAA4B,QAA5B,CAAnB,EAAyD,YAAzD,EAAsE;AAClEC,uBAAW;AADuD,SAAtE;AAGA,oBAAIL,SAAJ,CAAcM,UAAd,CAAyB;AAClBC,iBAAK,cADa;AAElBC,gBAAI,QAFc;AAGlBC,oBAAQ;AACPC,4BAAY;AADL,aAHU;AAMlBC,oBAAQ;AACPN,2BAAW;AADJ;AANU,SAAzB;AAUA;;AAED,aAASV,SAAT,CAAmBiB,IAAnB,EAAwB;AACpBf,gBAAQC,GAAR,CAAY,kBAAZ;AACF;;AAED;AACE,aAASX,oBAAT,GAAgC;AAC5B,eAAO;AACH;AACA0B,0BAAc;AACV;AACAC,2BAAW;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AAPU;AAFD,aAFX;AAcHC,6BAAgB;AACZ;AACAD,2BAAW;AACPE,2BAAO,kBADA;AAEPC,0BAAM;AAFC;AAFC;;AAdb,SAAP;AAuBH;AACJ;;AAED;AACAC,IAAIC,IAAJ,GAAW,YAAU;AACjB,gBAAInB,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaiB,cAAb,GAA8BC,MAA9B,EAAnB,EAA0D,YAA1D,EAAuE,EAAvE;AACAxB,YAAQC,GAAR,CAAY,MAAZ;AACH,gBAAIE,SAAJ,CAAcmB,IAAd;AACA,CAJD,C","file":"device/notify.js","sourcesContent":["\n\nimport {iot, uPublic, uComponents} from '../../public/public.js';\nimport config from '../../public/public.js';\n\n\niot.ready(init);\nfunction init() {\n\tuPublic.componentsExtend(['android-notify']);\n\tvar form = new Vue({\n\t el: '#content',\n\t data:{\n\t \tinitButtonText: \"测试按钮\",\n\t \tcomponentsConfig: initComponentsConfig(),//初始化数据\n\t \tdialogFlag:true,\n\t \tshowFlags:false,\n\t \tonNotifyToIndex:notifyToIndex //改方法传入\n\t },\n\t mounted:function(){\n\n\t\t\t},\n\t methods: {\n \t\tonTapButton(){\n \t\ttapButton(this);\n \t},\n\n \tonAddDeviceButtonTap(){\n \t\tconsole.log(\"onAddDeviceButtonTap......\");\n \t},\n\n \tonToSetting(){\n \t\tconsole.log(\"点击了toSetting\");\n \t}\n\t }\n\t \n\t});\n\n\tfunction notifyToIndex(){\n\t\tiot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{\n\t \tneedClose: true\n\t\t});\n\t\tiot.navigator.openWindow({\n\t url: './index.html',\n\t id: 'device',\n\t styles: {\n\t \tpopGesture: 'none'\n\t },\n\t extras: {\n\t \tneedClose: true\n\t }\n\t });\n\t}\n\n\tfunction tapButton(self){\n\t console.log(\"tapButton.......\");\n\t }\n\n\t //初始化组件参数\n function initComponentsConfig() {\n return {\n // 设置通知弹出框参数\n notifyDialog: {\n // 默认参数\n initParam: {\n \t// appName:\"js.通用门锁\",\n \t// time:\"js.刚刚\",\n // title:'js.开启通知',\n // content1:'js.开启通知后您将可以及时获取门锁报警',\n // content2:'js.提醒、门锁开门消息通知',\n // accept:'js.我知道了！',\n // buttonTitle:'js.前往开启通知设置'\n }\n },\n addDeviceButton:{\n // 默认参数\n initParam: {\n class: 'edit-name-button',\n text: \"这是测试button\"\n }\n }\n \n };\n }\n}\n\n//重写mui.back\nmui.back = function(){\n iot.navigator.fire(plus.webview.currentWebview().opener(),'returnPage',{});\n console.log(\"fire\");\n\tiot.navigator.back();\n}\n\n\n\n\n\n\n// WEBPACK FOOTER //\n// ./src/view/device/v_notify.js"],"sourceRoot":""} {"version":3,"sources":["webpack:///./custom/custom2/src/view/device/v_notify.js"],"names":["ready","init","componentsExtend","form","Vue","el","data","initButtonText","componentsConfig","initComponentsConfig","dialogFlag","showFlags","onNotifyToIndex","notifyToIndex","mounted","methods","onTapButton","tapButton","onAddDeviceButtonTap","console","log","onToSetting","navigator","fire","plus","webview","getWebviewById","needClose","openWindow","url","id","styles","popGesture","extras","self","notifyDialog","initParam","addDeviceButton","class","text","mui","back","currentWebview","opener"],"mappings":";;;;;;;;AAEA;;;;;;AAIA,YAAIA,KAAJ,CAAUC,IAAV;AACA,SAASA,IAAT,GAAgB;AACf,oBAAQC,gBAAR,CAAyB,CAAC,gBAAD,CAAzB;AACA,QAAIC,OAAO,IAAIC,GAAJ,CAAQ;AACfC,YAAI,UADW;AAEfC,cAAK;AACJC,4BAAgB,MADZ;AAEJC,8BAAkBC,sBAFd,EAEqC;AACzCC,wBAAW,IAHP;AAIJC,uBAAU,KAJN;AAKJC,6BAAgBC,aALZ,CAK0B;AAL1B,SAFU;AASfC,iBAAQ,mBAAU,CAEnB,CAXgB;AAYfC,iBAAS;AACRC,uBADQ,yBACK;AACTC,0BAAU,IAAV;AACA,aAHI;AAKLC,gCALK,kCAKiB;AACrBC,wBAAQC,GAAR,CAAY,4BAAZ;AACA,aAPI;AASLC,uBATK,yBASQ;AACZF,wBAAQC,GAAR,CAAY,cAAZ;AACA;AAXI;;AAZM,KAAR,CAAX;;AA4BA,aAASP,aAAT,GAAwB;AACvB,oBAAIS,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaC,cAAb,CAA4B,QAA5B,CAAnB,EAAyD,YAAzD,EAAsE;AAClEC,uBAAW;AADuD,SAAtE;AAGA,oBAAIL,SAAJ,CAAcM,UAAd,CAAyB;AAClBC,iBAAK,cADa;AAElBC,gBAAI,QAFc;AAGlBC,oBAAQ;AACPC,4BAAY;AADL,aAHU;AAMlBC,oBAAQ;AACPN,2BAAW;AADJ;AANU,SAAzB;AAUA;;AAED,aAASV,SAAT,CAAmBiB,IAAnB,EAAwB;AACpBf,gBAAQC,GAAR,CAAY,kBAAZ;AACF;;AAED;AACE,aAASX,oBAAT,GAAgC;AAC5B,eAAO;AACH;AACA0B,0BAAc;AACV;AACAC,2BAAW;AACV;AACA;AACA;AACA;AACA;AACA;AACA;AAPU;AAFD,aAFX;AAcHC,6BAAgB;AACZ;AACAD,2BAAW;AACPE,2BAAO,kBADA;AAEPC,0BAAM;AAFC;AAFC;;AAdb,SAAP;AAuBH;AACJ;;AAED;AACAC,IAAIC,IAAJ,GAAW,YAAU;AACjB,gBAAInB,SAAJ,CAAcC,IAAd,CAAmBC,KAAKC,OAAL,CAAaiB,cAAb,GAA8BC,MAA9B,EAAnB,EAA0D,YAA1D,EAAuE,EAAvE;AACAxB,YAAQC,GAAR,CAAY,MAAZ;AACH,gBAAIE,SAAJ,CAAcmB,IAAd;AACA,CAJD,C","file":"device/notify.js","sourcesContent":["\n\nimport {iot, uPublic, uComponents} from '../../public/public.js';\nimport config from '../../public/public.js';\n\n\niot.ready(init);\nfunction init() {\n\tuPublic.componentsExtend(['android-notify']);\n\tvar form = new Vue({\n\t el: '#content',\n\t data:{\n\t \tinitButtonText: \"测试按钮\",\n\t \tcomponentsConfig: initComponentsConfig(),//初始化数据\n\t \tdialogFlag:true,\n\t \tshowFlags:false,\n\t \tonNotifyToIndex:notifyToIndex //改方法传入\n\t },\n\t mounted:function(){\n\n\t\t\t},\n\t methods: {\n \t\tonTapButton(){\n \t\ttapButton(this);\n \t},\n\n \tonAddDeviceButtonTap(){\n \t\tconsole.log(\"onAddDeviceButtonTap......\");\n \t},\n\n \tonToSetting(){\n \t\tconsole.log(\"点击了toSetting\");\n \t}\n\t }\n\t \n\t});\n\n\tfunction notifyToIndex(){\n\t\tiot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{\n\t \tneedClose: true\n\t\t});\n\t\tiot.navigator.openWindow({\n\t url: './index.html',\n\t id: 'device',\n\t styles: {\n\t \tpopGesture: 'none'\n\t },\n\t extras: {\n\t \tneedClose: true\n\t }\n\t });\n\t}\n\n\tfunction tapButton(self){\n\t console.log(\"tapButton.......\");\n\t }\n\n\t //初始化组件参数\n function initComponentsConfig() {\n return {\n // 设置通知弹出框参数\n notifyDialog: {\n // 默认参数\n initParam: {\n \t// appName:\"js.通用门锁\",\n \t// time:\"js.刚刚\",\n // title:'js.开启通知',\n // content1:'js.开启通知后您将可以及时获取门锁报警',\n // content2:'js.提醒、门锁开门消息通知',\n // accept:'js.我知道了！',\n // buttonTitle:'js.前往开启通知设置'\n }\n },\n addDeviceButton:{\n // 默认参数\n initParam: {\n class: 'edit-name-button',\n text: \"这是测试button\"\n }\n }\n \n };\n }\n}\n\n//重写mui.back\nmui.back = function(){\n iot.navigator.fire(plus.webview.currentWebview().opener(),'returnPage',{});\n console.log(\"fire\");\n\tiot.navigator.back();\n}\n\n\n\n\n\n\n// WEBPACK FOOTER //\n// ./custom/custom2/src/view/device/v_notify.js"],"sourceRoot":""}
\ No newline at end of file \ No newline at end of file
web/custom/custom2/view/device/remoteOpendoor.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/device/device.css"> <link rel="stylesheet" type="text/css" href="../../../../view/device/device.css">
<link rel="stylesheet" type="text/css" href="./device.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/device/remoteOpendoor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/view/doorlockUsers/addUnlockInfo.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/unlockInfo.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/unlockInfo.css">
<link rel="stylesheet" type="text/css" href="./unlockInfo.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/doorlockUsers/addUser.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/userList.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/userList.css">
<link rel="stylesheet" type="text/css" href="./userList.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/doorlockUsers/doorlockUser.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/doorlockUser.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/doorlockUser.css">
<link rel="stylesheet" type="text/css" href="./doorlockUser.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/doorlockUsers/editName.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/doorlockUser.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/doorlockUser.css">
<link rel="stylesheet" type="text/css" href="./doorlockUser.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/doorlockUsers/index.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/userList.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/userList.css">
<link rel="stylesheet" type="text/css" href="./userList.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/doorlockUsers/inviteBind.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/doorlockUser.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/doorlockUser.css">
<link rel="stylesheet" type="text/css" href="./doorlockUser.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/custom/custom2/view/doorlockUsers/inviteBind.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/view/doorlockUsers/unlockInfo.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="../../../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/unlockInfo.css"> <link rel="stylesheet" type="text/css" href="../../../../view/doorlockUsers/unlockInfo.css">
<link rel="stylesheet" type="text/css" href="./unlockInfo.css">
<style type="text/css"> <style type="text/css">
[v-cloak]{ [v-cloak]{
display: none; display: none;
......
web/lib/less/addDevice/addDevice.less
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
font-size: 16px; font-size: 16px;
img{ img{
margin-right: 25px; margin-right: 25px;
width: 100px; width: 60px;
height: 100px; height: 60px;
} }
} }
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
text-align: center; text-align: center;
} }
.info{
.help();
li{
text-indent: 0;
}
}
//产品型号 //产品型号
.u-list(); .u-list();
......
web/view/addDevice/addDevice.css
...@@ -464,8 +464,8 @@ p { ...@@ -464,8 +464,8 @@ p {
.addDevice li img { .addDevice li img {
margin-right: 0.667rem; margin-right: 0.667rem;
width: 2.667rem; width: 1.6rem;
height: 2.667rem; height: 1.6rem;
} }
.addDevice p { .addDevice p {
...@@ -476,6 +476,29 @@ p { ...@@ -476,6 +476,29 @@ p {
text-align: center; text-align: center;
} }
.info {
margin: 0.8rem 1.013rem 1.547rem;
}
.info li {
color: #91929a;
padding-left: 0.32rem;
text-indent: -0.32rem;
line-height: 0.427rem;
min-height: 1.6rem;
}
.info li:first-child {
color: inherit;
font-size: 0.48rem;
min-height: auto;
margin-bottom: 0.907rem;
}
.info li {
text-indent: 0;
}
.u-list { .u-list {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
web/view/addDevice/index.html
...@@ -29,11 +29,16 @@ ...@@ -29,11 +29,16 @@
<v-touch class="scanAdd" tag="li" v-on:tap="onScanAddTap"> <v-touch class="scanAdd" tag="li" v-on:tap="onScanAddTap">
<img src="../../resources/image/scanCodeAdd.png">{{ $t('addDevice.scanCodeAdd') }} <img src="../../resources/image/scanCodeAdd.png">{{ $t('addDevice.scanCodeAdd') }}
</v-touch> </v-touch>
<p>{{ $t('addDevice.scanCodeAddTip') }}</p> <!--<p>{{ $t('addDevice.scanCodeAddTip') }}</p>
<v-touch class="wifiAdd" tag="li" v-on:tap="onWifiAddTap"> <v-touch class="wifiAdd" tag="li" v-on:tap="onWifiAddTap">
<img src="../../resources/image/wifiAdd.png">{{ $t('addDevice.wifiAdd') }} <img src="../../resources/image/wifiAdd.png">{{ $t('addDevice.wifiAdd') }}
</v-touch> </v-touch>
<p>{{ $t('addDevice.wifiAddTip') }}</p> <p>{{ $t('addDevice.wifiAddTip') }}</p>-->
</ul>
<ul class="info">
<li class="info-title">{{ $t('addDevice.infoTitle') }}</li>
<li>{{ $t('addDevice.infoCont1') }}</li>
<li>{{ $t('addDevice.infoCont2') }}</li>
</ul> </ul>
</div> </div>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog> <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
......
web/view/addDevice/scanCodeAdd.html
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<span v-html="$t('wifiAdd.noticeTip')"></span> <span v-html="$t('wifiAdd.noticeTip')"></span>
</p> </p>
</u-process> </u-process>
<checkwgtu ref="checkwgtu" :init-param="componentsConfig.checkwgtu.initParam"></checkwgtu>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog> <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading> <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div> </div>
......
web/view/addDevice/wifiAdd.html
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<span v-html="$t('wifiAdd.noticeTip')"></span> <span v-html="$t('wifiAdd.noticeTip')"></span>
</p> </p>
</u-process> </u-process>
<checkwgtu ref="checkwgtu" :init-param="componentsConfig.checkwgtu.initParam"></checkwgtu>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog> <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading> <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div> </div>
......
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