Merge branch 'tmp'
# Conflicts:
# .gitignore
# .roadhogrc.js
# src/models/domain.js
# src/models/login.js
# src/models/main/index.js
# src/router.js
正在显示
| ... | ... | @@ -14,14 +14,17 @@ |
| }, | ||
| "dependencies": { | ||
| "antd": "^2.13.0", | ||
| "axo": "0.0.2", | ||
| "babel-plugin-import": "^1.2.1", | ||
| "babel-runtime": "^6.9.2", | ||
| "bowser": "^1.8.1", | ||
| "bundle-loader": "^0.5.5", | ||
| "dva": "^1.2.1", | ||
| "dva-loading": "^0.2.1", | ||
| "fastjson_ref_resolver": "latest", | ||
| "fingerprintjs": "^0.5.3", | ||
| "lodash": "^4.17.4", | ||
| "lowdb": "^1.0.0", | ||
| "moment": "^2.18.1", | ||
| "prop-types": "^15.5.10", | ||
| "qrcode": "^1.0.0", | ||
| ... | ... |
src/components/uca/index.js
0 → 100644
src/routes/login/authInput.js
0 → 100644
src/routes/login/authInput.less
0 → 100644
src/services/interfaces.js
0 → 100644
src/services/login.js
deleted
100644 → 0
src/services/login/index.js
0 → 100644
src/services/login/password.js
0 → 100644
src/services/login/uca.js
0 → 100644
src/services/login/utils.js
0 → 100644
src/services/resource.js
0 → 100644
src/services/uca.js
0 → 100644
src/utils/db.js
0 → 100644
src/utils/device.js
0 → 100644
src/utils/math.js
0 → 100644
src/utils/uca.js
0 → 100644
请
注册
或者
登录
后发表评论