Skip to content

D
DoorLock
Commit 50ac7284 by 朱建香
Options

Merge branch 'zjx' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx 

# Conflicts:
#	dev/src/lang/zh.json
#	dev/src/view/addDevice/v_wifiAddHelp.js
#	dev/src/view/device/v_index.js
#	dev/src/view/device/v_opendoorRecord.js
#	dev/src/view/device/v_remoteOpendoor.js
#	dev/src/view/doorlockManage/v_editName.js
#	dev/src/view/doorlockManage/v_index.js
#	dev/src/view/doorlockUsers/v_index.js
#	dev/src/view/login/v_index.js
#	web/lib/js/p.js
#	web/resources/lang/zh.json
#	web/view/device/index.html
#	web/view/doorlockUsers/index.html
#	web/view/myInfo/index.html
parents 56d95500 c75b8a24
Showing with 426 additions and 435 deletions
web/lib/js/p.js
......@@ -9468,12 +9468,69 @@ function getOuterHTML (el) {
Vue$3.compile = compileToFunctions;
/* harmony default export */ __webpack_exports__["default"] = (Vue$3);
/* unused harmony default export */ var _unused_webpack_default_export = (Vue$3);
/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(125), __webpack_require__(135), __webpack_require__(132)))
/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(8), __webpack_require__(129), __webpack_require__(128)))
/***/ }),
/* 2 */
/***/ (function(module, exports) {
// this module is a runtime utility for cleaner component module output and will
// be included in the final webpack user bundle
module.exports = function normalizeComponent (
rawScriptExports,
compiledTemplate,
scopeId,
cssModules
) {
var esModule
var scriptExports = rawScriptExports = rawScriptExports || {}
// ES6 modules interop
var type = typeof rawScriptExports.default
if (type === 'object' || type === 'function') {
esModule = rawScriptExports
scriptExports = rawScriptExports.default
}
// Vue.extend constructor export interop
var options = typeof scriptExports === 'function'
? scriptExports.options
: scriptExports
// render functions
if (compiledTemplate) {
options.render = compiledTemplate.render
options.staticRenderFns = compiledTemplate.staticRenderFns
}
// scopedId
if (scopeId) {
options._scopeId = scopeId
}
// inject cssModules
if (cssModules) {
var computed = Object.create(options.computed || null)
Object.keys(cssModules).forEach(function (key) {
var module = cssModules[key]
computed[key] = function () { return module }
})
options.computed = computed
}
return {
esModule: esModule,
exports: scriptExports,
options: options
}
}
/***/ }),
/* 3 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
......@@ -9486,25 +9543,25 @@ exports.uComponents = exports.uPublic = exports.iot = undefined;
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
var _config = __webpack_require__(124);
var _config = __webpack_require__(7);
var _config2 = _interopRequireDefault(_config);
var _vueI18n = __webpack_require__(208);
var _vueI18n = __webpack_require__(207);
var _vueI18n2 = _interopRequireDefault(_vueI18n);
var _ugenComponents = __webpack_require__(205);
var _ugenComponents = __webpack_require__(204);
var _ugenComponents2 = _interopRequireDefault(_ugenComponents);
var _manage = __webpack_require__(202);
var _manage = __webpack_require__(201);
var _manage2 = _interopRequireDefault(_manage);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var VueTouch = __webpack_require__(250);
var VueTouch = __webpack_require__(249);
Vue.use(VueTouch);
var uComponents = _ugenComponents2.default.uComponents;
......@@ -9716,184 +9773,10 @@ exports.uComponents = uComponents;
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }),
/* 3 */
/***/ (function(module, exports) {
// this module is a runtime utility for cleaner component module output and will
// be included in the final webpack user bundle
module.exports = function normalizeComponent (
rawScriptExports,
compiledTemplate,
scopeId,
cssModules
) {
var esModule
var scriptExports = rawScriptExports = rawScriptExports || {}
// ES6 modules interop
var type = typeof rawScriptExports.default
if (type === 'object' || type === 'function') {
esModule = rawScriptExports
scriptExports = rawScriptExports.default
}
// Vue.extend constructor export interop
var options = typeof scriptExports === 'function'
? scriptExports.options
: scriptExports
// render functions
if (compiledTemplate) {
options.render = compiledTemplate.render
options.staticRenderFns = compiledTemplate.staticRenderFns
}
// scopedId
if (scopeId) {
options._scopeId = scopeId
}
// inject cssModules
if (cssModules) {
var computed = Object.create(options.computed || null)
Object.keys(cssModules).forEach(function (key) {
var module = cssModules[key]
computed[key] = function () { return module }
})
options.computed = computed
}
return {
esModule: esModule,
exports: scriptExports,
options: options
}
}
/***/ }),
/* 4 */,
/* 5 */,
/* 6 */,
/* 7 */,
/* 8 */,
/* 9 */,
/* 10 */,
/* 11 */,
/* 12 */,
/* 13 */,
/* 14 */,
/* 15 */,
/* 16 */,
/* 17 */,
/* 18 */,
/* 19 */,
/* 20 */,
/* 21 */,
/* 22 */,
/* 23 */,
/* 24 */,
/* 25 */,
/* 26 */,
/* 27 */,
/* 28 */,
/* 29 */,
/* 30 */,
/* 31 */,
/* 32 */,
/* 33 */,
/* 34 */,
/* 35 */,
/* 36 */,
/* 37 */,
/* 38 */,
/* 39 */,
/* 40 */,
/* 41 */,
/* 42 */,
/* 43 */,
/* 44 */,
/* 45 */,
/* 46 */,
/* 47 */,
/* 48 */,
/* 49 */,
/* 50 */,
/* 51 */,
/* 52 */,
/* 53 */,
/* 54 */,
/* 55 */,
/* 56 */,
/* 57 */,
/* 58 */,
/* 59 */,
/* 60 */,
/* 61 */,
/* 62 */,
/* 63 */,
/* 64 */,
/* 65 */,
/* 66 */,
/* 67 */,
/* 68 */,
/* 69 */,
/* 70 */,
/* 71 */,
/* 72 */,
/* 73 */,
/* 74 */,
/* 75 */,
/* 76 */,
/* 77 */,
/* 78 */,
/* 79 */,
/* 80 */,
/* 81 */,
/* 82 */,
/* 83 */,
/* 84 */,
/* 85 */,
/* 86 */,
/* 87 */,
/* 88 */,
/* 89 */,
/* 90 */,
/* 91 */,
/* 92 */,
/* 93 */,
/* 94 */,
/* 95 */,
/* 96 */,
/* 97 */,
/* 98 */,
/* 99 */,
/* 100 */,
/* 101 */,
/* 102 */,
/* 103 */,
/* 104 */,
/* 105 */,
/* 106 */,
/* 107 */,
/* 108 */,
/* 109 */,
/* 110 */,
/* 111 */,
/* 112 */,
/* 113 */,
/* 114 */,
/* 115 */,
/* 116 */,
/* 117 */,
/* 118 */,
/* 119 */,
/* 120 */,
/* 121 */,
/* 122 */,
/* 123 */,
/* 124 */
/* 7 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
......@@ -9922,7 +9805,7 @@ exports.default = {
};
/***/ }),
/* 125 */
/* 8 */
/***/ (function(module, exports) {
// shim for using process in browser
......@@ -10112,13 +9995,126 @@ process.umask = function() { return 0; };
/***/ }),
/* 9 */,
/* 10 */,
/* 11 */,
/* 12 */,
/* 13 */,
/* 14 */,
/* 15 */,
/* 16 */,
/* 17 */,
/* 18 */,
/* 19 */,
/* 20 */,
/* 21 */,
/* 22 */,
/* 23 */,
/* 24 */,
/* 25 */,
/* 26 */,
/* 27 */,
/* 28 */,
/* 29 */,
/* 30 */,
/* 31 */,
/* 32 */,
/* 33 */,
/* 34 */,
/* 35 */,
/* 36 */,
/* 37 */,
/* 38 */,
/* 39 */,
/* 40 */,
/* 41 */,
/* 42 */,
/* 43 */,
/* 44 */,
/* 45 */,
/* 46 */,
/* 47 */,
/* 48 */,
/* 49 */,
/* 50 */,
/* 51 */,
/* 52 */,
/* 53 */,
/* 54 */,
/* 55 */,
/* 56 */,
/* 57 */,
/* 58 */,
/* 59 */,
/* 60 */,
/* 61 */,
/* 62 */,
/* 63 */,
/* 64 */,
/* 65 */,
/* 66 */,
/* 67 */,
/* 68 */,
/* 69 */,
/* 70 */,
/* 71 */,
/* 72 */,
/* 73 */,
/* 74 */,
/* 75 */,
/* 76 */,
/* 77 */,
/* 78 */,
/* 79 */,
/* 80 */,
/* 81 */,
/* 82 */,
/* 83 */,
/* 84 */,
/* 85 */,
/* 86 */,
/* 87 */,
/* 88 */,
/* 89 */,
/* 90 */,
/* 91 */,
/* 92 */,
/* 93 */,
/* 94 */,
/* 95 */,
/* 96 */,
/* 97 */,
/* 98 */,
/* 99 */,
/* 100 */,
/* 101 */,
/* 102 */,
/* 103 */,
/* 104 */,
/* 105 */,
/* 106 */,
/* 107 */,
/* 108 */,
/* 109 */,
/* 110 */,
/* 111 */,
/* 112 */,
/* 113 */,
/* 114 */,
/* 115 */,
/* 116 */,
/* 117 */,
/* 118 */,
/* 119 */,
/* 120 */,
/* 121 */,
/* 122 */,
/* 123 */,
/* 124 */,
/* 125 */,
/* 126 */,
/* 127 */,
/* 128 */,
/* 129 */,
/* 130 */,
/* 131 */,
/* 132 */
/* 128 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(process, Promise, global) {var require;/*!
......@@ -10257,7 +10253,7 @@ function flush() {
function attemptVertx() {
try {
var r = require;
var vertx = __webpack_require__(251);
var vertx = __webpack_require__(250);
vertxNext = vertx.runOnLoop || vertx.runOnContext;
return useVertxTimer();
} catch (e) {
......@@ -11280,10 +11276,41 @@ return Promise;
})));
//# sourceMappingURL=es6-promise.map
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(125), __webpack_require__(132), __webpack_require__(135)))
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8), __webpack_require__(128), __webpack_require__(129)))
/***/ }),
/* 133 */
/* 129 */
/***/ (function(module, exports) {
var g;
// This works in non-strict mode
g = (function() {
return this;
})();
try {
// This works if eval is allowed (see CSP)
g = g || Function("return this")() || (1,eval)("this");
} catch(e) {
// This works if the window reference is available
if(typeof window === "object")
g = window;
}
// g can still be undefined, but nothing to do about it...
// We return undefined, instead of nothing here, so it's
// easier to handle this case. if(!global) { ...}
module.exports = g;
/***/ }),
/* 130 */,
/* 131 */,
/* 132 */,
/* 133 */,
/* 134 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/*! iScroll v5.2.0 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */
......@@ -13381,7 +13408,7 @@ if ( typeof module != 'undefined' && module.exports ) {
/***/ }),
/* 134 */
/* 135 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscore.js 1.8.3
......@@ -14936,33 +14963,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Underscor
/***/ }),
/* 135 */
/***/ (function(module, exports) {
var g;
// This works in non-strict mode
g = (function() {
return this;
})();
try {
// This works if eval is allowed (see CSP)
g = g || Function("return this")() || (1,eval)("this");
} catch(e) {
// This works if the window reference is available
if(typeof window === "object")
g = window;
}
// g can still be undefined, but nothing to do about it...
// We return undefined, instead of nothing here, so it's
// easier to handle this case. if(!global) { ...}
module.exports = g;
/***/ }),
/* 136 */,
/* 137 */,
/* 138 */,
......@@ -15668,7 +15668,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
var _iscroll = __webpack_require__(133);
var _iscroll = __webpack_require__(134);
var _iscroll2 = _interopRequireDefault(_iscroll);
......@@ -16027,7 +16027,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
var _underscore = __webpack_require__(134);
var _underscore = __webpack_require__(135);
var _underscore2 = _interopRequireDefault(_underscore);
......@@ -16317,7 +16317,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
var _underscore = __webpack_require__(134);
var _underscore = __webpack_require__(135);
var _underscore2 = _interopRequireDefault(_underscore);
......@@ -16584,7 +16584,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
var _iscroll = __webpack_require__(133);
var _iscroll = __webpack_require__(134);
var _iscroll2 = _interopRequireDefault(_iscroll);
......@@ -17145,8 +17145,7 @@ function _changeList(self, list) {
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
/***/ }),
/* 201 */,
/* 202 */
/* 201 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
......@@ -17156,11 +17155,11 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
var _c_gridList = __webpack_require__(227);
var _c_gridList = __webpack_require__(226);
var _c_gridList2 = _interopRequireDefault(_c_gridList);
var _c_timeline = __webpack_require__(228);
var _c_timeline = __webpack_require__(227);
var _c_timeline2 = _interopRequireDefault(_c_timeline);
......@@ -17173,8 +17172,8 @@ var components = {
exports.default = components;
/***/ }),
/* 203 */,
/* 204 */
/* 202 */,
/* 203 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/*! Hammer.JS - v2.0.7 - 2016-04-22
......@@ -19824,13 +19823,13 @@ if (true) {
/***/ }),
/* 205 */
/* 204 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__src_manage__ = __webpack_require__(207);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__src_components__ = __webpack_require__(206);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__src_manage__ = __webpack_require__(206);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__src_components__ = __webpack_require__(205);
/**
* index.js
* Version: 0.1
......@@ -19841,14 +19840,14 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
*/
/* harmony default export */ __webpack_exports__["default"] = ({
manage: __WEBPACK_IMPORTED_MODULE_0__src_manage__["a" /* default */],
uComponents: __WEBPACK_IMPORTED_MODULE_1__src_components__["a" /* default */]
/* unused harmony default export */ var _unused_webpack_default_export = ({
manage: __WEBPACK_IMPORTED_MODULE_0__src_manage__[false /* default */],
uComponents: __WEBPACK_IMPORTED_MODULE_1__src_components__[false /* default */]
});
/***/ }),
/* 206 */
/* 205 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -19913,42 +19912,42 @@ uComponents.changeCommLoadingStatusAndText = function(vmObj, status, text){
vmObj.$refs.ucommloading.changeCommLoadingStatusAndText(status, text);
};
/* harmony default export */ __webpack_exports__["a"] = (uComponents);
/* unused harmony default export */ var _unused_webpack_default_export = (uComponents);
/***/ }),
/* 207 */
/* 206 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__components_button_vue__ = __webpack_require__(209);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__components_button_vue__ = __webpack_require__(208);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__components_button_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__components_button_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__components_carousel_vue__ = __webpack_require__(210);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__components_carousel_vue__ = __webpack_require__(209);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__components_carousel_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__components_carousel_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__components_comm_loading_vue__ = __webpack_require__(211);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__components_comm_loading_vue__ = __webpack_require__(210);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__components_comm_loading_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__components_comm_loading_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__components_dialog_vue__ = __webpack_require__(212);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__components_dialog_vue__ = __webpack_require__(211);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__components_dialog_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3__components_dialog_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_folding_list_vue__ = __webpack_require__(213);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_folding_list_vue__ = __webpack_require__(212);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_folding_list_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__components_folding_list_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_list_vue__ = __webpack_require__(214);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_list_vue__ = __webpack_require__(213);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_list_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__components_list_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__components_loading_vue__ = __webpack_require__(215);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__components_loading_vue__ = __webpack_require__(214);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__components_loading_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6__components_loading_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__components_marquee_vue__ = __webpack_require__(216);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__components_marquee_vue__ = __webpack_require__(215);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__components_marquee_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7__components_marquee_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__components_number_adjustment_vue__ = __webpack_require__(217);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__components_number_adjustment_vue__ = __webpack_require__(216);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__components_number_adjustment_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8__components_number_adjustment_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__components_picker_vue__ = __webpack_require__(218);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__components_picker_vue__ = __webpack_require__(217);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__components_picker_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_9__components_picker_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__components_select_vue__ = __webpack_require__(219);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__components_select_vue__ = __webpack_require__(218);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__components_select_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_10__components_select_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__components_slide_vue__ = __webpack_require__(220);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__components_slide_vue__ = __webpack_require__(219);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__components_slide_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_11__components_slide_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__components_swipe_list_vue__ = __webpack_require__(221);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__components_swipe_list_vue__ = __webpack_require__(220);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__components_swipe_list_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_12__components_swipe_list_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__components_switch_vue__ = __webpack_require__(222);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__components_switch_vue__ = __webpack_require__(221);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__components_switch_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_13__components_switch_vue__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__components_text_vue__ = __webpack_require__(223);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__components_text_vue__ = __webpack_require__(222);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__components_text_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_14__components_text_vue__);
......@@ -19984,10 +19983,10 @@ let manage = {
'u-text': __WEBPACK_IMPORTED_MODULE_14__components_text_vue___default.a
};
/* harmony default export */ __webpack_exports__["a"] = (manage);
/* unused harmony default export */ var _unused_webpack_default_export = (manage);
/***/ }),
/* 208 */
/* 207 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
......@@ -20999,17 +20998,17 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = plugin;
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(125)))
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
/***/ }),
/* 209 */
/* 208 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(181),
/* template */
__webpack_require__(235),
__webpack_require__(234),
/* scopeId */
null,
/* cssModules */
......@@ -21036,14 +21035,14 @@ module.exports = Component.exports
/***/ }),
/* 210 */
/* 209 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(182),
/* template */
__webpack_require__(245),
__webpack_require__(244),
/* scopeId */
null,
/* cssModules */
......@@ -21070,14 +21069,14 @@ module.exports = Component.exports
/***/ }),
/* 211 */
/* 210 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(183),
/* template */
__webpack_require__(234),
__webpack_require__(233),
/* scopeId */
null,
/* cssModules */
......@@ -21104,14 +21103,14 @@ module.exports = Component.exports
/***/ }),
/* 212 */
/* 211 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(184),
/* template */
__webpack_require__(237),
__webpack_require__(236),
/* scopeId */
null,
/* cssModules */
......@@ -21138,14 +21137,14 @@ module.exports = Component.exports
/***/ }),
/* 213 */
/* 212 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(185),
/* template */
__webpack_require__(232),
__webpack_require__(231),
/* scopeId */
null,
/* cssModules */
......@@ -21172,14 +21171,14 @@ module.exports = Component.exports
/***/ }),
/* 214 */
/* 213 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(186),
/* template */
__webpack_require__(231),
__webpack_require__(230),
/* scopeId */
null,
/* cssModules */
......@@ -21206,14 +21205,14 @@ module.exports = Component.exports
/***/ }),
/* 215 */
/* 214 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(187),
/* template */
__webpack_require__(247),
__webpack_require__(246),
/* scopeId */
null,
/* cssModules */
......@@ -21240,14 +21239,14 @@ module.exports = Component.exports
/***/ }),
/* 216 */
/* 215 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(188),
/* template */
__webpack_require__(241),
__webpack_require__(240),
/* scopeId */
null,
/* cssModules */
......@@ -21274,14 +21273,14 @@ module.exports = Component.exports
/***/ }),
/* 217 */
/* 216 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(189),
/* template */
__webpack_require__(242),
__webpack_require__(241),
/* scopeId */
null,
/* cssModules */
......@@ -21308,14 +21307,14 @@ module.exports = Component.exports
/***/ }),
/* 218 */
/* 217 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(190),
/* template */
__webpack_require__(239),
__webpack_require__(238),
/* scopeId */
null,
/* cssModules */
......@@ -21342,14 +21341,14 @@ module.exports = Component.exports
/***/ }),
/* 219 */
/* 218 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(191),
/* template */
__webpack_require__(243),
__webpack_require__(242),
/* scopeId */
null,
/* cssModules */
......@@ -21376,14 +21375,14 @@ module.exports = Component.exports
/***/ }),
/* 220 */
/* 219 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(192),
/* template */
__webpack_require__(240),
__webpack_require__(239),
/* scopeId */
null,
/* cssModules */
......@@ -21410,14 +21409,14 @@ module.exports = Component.exports
/***/ }),
/* 221 */
/* 220 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(193),
/* template */
__webpack_require__(233),
__webpack_require__(232),
/* scopeId */
null,
/* cssModules */
......@@ -21444,14 +21443,14 @@ module.exports = Component.exports
/***/ }),
/* 222 */
/* 221 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(194),
/* template */
__webpack_require__(230),
__webpack_require__(229),
/* scopeId */
null,
/* cssModules */
......@@ -21478,14 +21477,14 @@ module.exports = Component.exports
/***/ }),
/* 223 */
/* 222 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(195),
/* template */
__webpack_require__(248),
__webpack_require__(247),
/* scopeId */
null,
/* cssModules */
......@@ -21512,17 +21511,17 @@ module.exports = Component.exports
/***/ }),
/* 223 */,
/* 224 */,
/* 225 */,
/* 226 */,
/* 227 */
/* 226 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(199),
/* template */
__webpack_require__(236),
__webpack_require__(235),
/* scopeId */
null,
/* cssModules */
......@@ -21549,14 +21548,14 @@ module.exports = Component.exports
/***/ }),
/* 228 */
/* 227 */
/***/ (function(module, exports, __webpack_require__) {
var Component = __webpack_require__(3)(
var Component = __webpack_require__(2)(
/* script */
__webpack_require__(200),
/* template */
__webpack_require__(238),
__webpack_require__(237),
/* scopeId */
null,
/* cssModules */
......@@ -21583,8 +21582,8 @@ module.exports = Component.exports
/***/ }),
/* 229 */,
/* 230 */
/* 228 */,
/* 229 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -21614,7 +21613,7 @@ if (false) {
}
/***/ }),
/* 231 */
/* 230 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -21701,7 +21700,7 @@ if (false) {
}
/***/ }),
/* 232 */
/* 231 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -21802,7 +21801,7 @@ if (false) {
}
/***/ }),
/* 233 */
/* 232 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -21911,7 +21910,7 @@ if (false) {
}
/***/ }),
/* 234 */
/* 233 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -21949,7 +21948,7 @@ if (false) {
}
/***/ }),
/* 235 */
/* 234 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -21975,7 +21974,7 @@ if (false) {
}
/***/ }),
/* 236 */
/* 235 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22072,7 +22071,7 @@ if (false) {
}
/***/ }),
/* 237 */
/* 236 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22128,7 +22127,7 @@ if (false) {
}
/***/ }),
/* 238 */
/* 237 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22204,7 +22203,7 @@ if (false) {
}
/***/ }),
/* 239 */
/* 238 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22285,7 +22284,7 @@ if (false) {
}
/***/ }),
/* 240 */
/* 239 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22336,7 +22335,7 @@ if (false) {
}
/***/ }),
/* 241 */
/* 240 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22361,7 +22360,7 @@ if (false) {
}
/***/ }),
/* 242 */
/* 241 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22401,7 +22400,7 @@ if (false) {
}
/***/ }),
/* 243 */
/* 242 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22475,8 +22474,8 @@ if (false) {
}
/***/ }),
/* 244 */,
/* 245 */
/* 243 */,
/* 244 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22585,8 +22584,8 @@ if (false) {
}
/***/ }),
/* 246 */,
/* 247 */
/* 245 */,
/* 246 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22616,7 +22615,7 @@ if (false) {
}
/***/ }),
/* 248 */
/* 247 */
/***/ (function(module, exports, __webpack_require__) {
module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
......@@ -22693,12 +22692,12 @@ if (false) {
}
/***/ }),
/* 249 */,
/* 250 */
/* 248 */,
/* 249 */
/***/ (function(module, exports, __webpack_require__) {
(function (global, factory) {
true ? factory(__webpack_require__(204)) :
true ? factory(__webpack_require__(203)) :
typeof define === 'function' && define.amd ? define(['hammerjs'], factory) :
(factory(global.Hammer));
}(this, (function (Hammer) { 'use strict';
......@@ -22965,7 +22964,7 @@ if (true) {
/***/ }),
/* 251 */
/* 250 */
/***/ (function(module, exports) {
/* (ignored) */
......
web/view/doorlockUsers/doorlockUser.css~HEAD
......@@ -430,90 +430,126 @@ p {
padding-top: 1.173rem;
}
.u-text {
.user-list {
width: 100%;
display: table;
height: 100%;
overflow: auto;
position: absolute;
top: 1.173rem;
bottom: 0;
left: 0;
height: auto;
}
.user-list-scroll .user-list-row {
position: relative;
overflow: hidden;
}
.u-text input {
display: table-cell;
width: 100%;
border: 0;
outline: 0;
-webkit-appearance: none;
padding: 0.533rem 1.867rem 0.533rem 0.533rem;
background-color: transparent;
.user-list-scroll .user-list-row .user-list-handle {
position: relative;
-webkit-transition: left 0.4s ease;
transition: left 0.4s ease;
left: 0;
background-color: #242635;
padding: 0.4rem 0.533rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
z-index: 2;
}
.u-text input[type=text] ~ .u-text-see {
color: #007aff;
.user-list-scroll .user-list-row .user-list-handle .user-list-image {
width: 1.333rem;
height: 1.333rem;
margin-right: 0.267rem;
}
.u-text .u-text-icon {
.user-list-scroll .user-list-row .user-list-handle .user-list-icon {
margin-right: 0.267rem;
font-family: iconfont;
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
}
.u-text .u-text-icon ~ input {
padding-left: 0;
.user-list-scroll .user-list-row .user-list-handle div {
-webkit-box-flex: 1;
-webkit-flex: 1;
flex: 1;
min-width: 0;
}
.u-text .u-text-title {
width: 1.92rem;
padding-left: 0.533rem;
display: table-cell;
vertical-align: middle;
.user-list-scroll .user-list-row .user-list-handle .user-list-title {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.u-text .u-text-title ~ input {
padding-left: 0;
.user-list-scroll .user-list-row .user-list-handle .user-sub-image {
width: 0.453rem;
height: 0.453rem;
}
.u-text .u-text-clear,
.u-text .u-text-see {
position: absolute;
top: 0;
width: 0.8rem;
height: 100%;
.user-list-scroll .user-list-row .user-list-handle .user-list-subtitle {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
display: inline-block;
}
.u-text .u-text-clear:before,
.u-text .u-text-see:before {
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
font-family: defaultIconfont;
font-size: 0.667rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
.user-list-scroll .user-list-row .user-list-handle.user-list-selected {
left: -3.2rem;
}
.u-text .u-text-clear {
right: 0.8rem;
.user-list-scroll .user-list-row .user-list-handle:after {
content: "\e611";
display: block;
font-family: iconfont;
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
}
.u-text .u-text-clear:before {
content: '\e724';
.user-list-scroll .user-list-row .user-list-button {
position: absolute;
top: 0;
bottom: 0;
right: 0;
z-index: 1;
}
.u-text .u-text-see {
right: 0;
.user-list-scroll .user-list-row .user-list-button div {
width: 1.6rem;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
color: #fff;
float: left;
}
.u-text .u-text-see:before {
content: '\e73c';
.user-list-scroll .user-list-row .user-list-button div:nth-last-of-type(1) {
background-color: transparent;
font-family: iconfont;
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
color: #00FFFF;
}
.u-text:after {
.user-list-scroll .user-list-row:after {
content: '';
position: absolute;
bottom: 0;
......@@ -521,54 +557,7 @@ p {
right: 0;
height: 1px;
background: #bbb;
}
@media (max-height: 400px /*no*/) {
#app {
height: 17.253rem;
position: relative;
}
}
.u-button {
width: 6.4rem;
color: #fff;
font-size: inherit;
background-color: #007aff;
border-radius: 0.533rem;
text-align: center;
line-height: 1;
margin: 0 auto;
padding: 0.267rem 0;
-webkit-transition: all 0.2s linear;
transition: all 0.2s linear;
background-clip: padding-box;
}
.u-button:active {
background-color: #0065ff;
}
.u-button.disabled {
background-color: #bbb;
}
.unbindState-dialog {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
.guide-dialog {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
z-index: 2;
background: -webkit-linear-gradient(left, #242635, #fff, #242635);
background: linear-gradient(to right, #242635, #fff, #242635);
}
\ No newline at end of file
web/view/login/forgetPassword.html
......@@ -26,6 +26,7 @@
</div>
<div class="content">
<div class="inputBox">
<p class="logo"></p>
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<div class="code">
......
web/view/login/index.html
......@@ -21,7 +21,7 @@
<div id="app" v-cloak>
<div class="guideBg">
<u-button :init-param="componentsConfig.loginButton.initParam" v-on:u-button-tap="onLoginButtonTap"></u-button>
<u-button :init-param="componentsConfig.loginButton.initParam" v-on:u-button-tap="onLoginButtonTap"></u-button>
</div>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
......
web/view/login/login.html
......@@ -25,6 +25,7 @@
</div>
<div class="content">
<div class="inputBox">
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<u-text :init-param="componentsConfig.passwordInput.initParam" :text="textPassword"
......
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