Browse Source

Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

杨凯旋 5 years ago
parent
commit
8e68063441
2 changed files with 6 additions and 1 deletions
  1. 2 1
      package.json
  2. 4 0
      src/nutui.js

+ 2 - 1
package.json

@@ -63,6 +63,7 @@
         "vue": "^2.6.10"
     },
     "devDependencies": {
+        "vue-qr": "^2.2.1",
         "@babel/cli": "7.1.2",
         "@babel/core": "7.1.2",
         "@babel/plugin-syntax-dynamic-import": "7.0.0",
@@ -164,4 +165,4 @@
         "instrument": false,
         "sourceMap": false
     }
-}
+}

+ 4 - 0
src/nutui.js

@@ -120,6 +120,8 @@ import SideNavBarItem from "./packages/sidenavbaritem/index.js";
 import "./packages/sidenavbaritem/sidenavbaritem.scss";
 import Drag from "./packages/drag/index.js";
 import "./packages/drag/drag.scss";
+import VueQr from "./packages/qart/index.js";
+import "./packages/qart/qart.scss";
 import Address from "./packages/address/index.js";
 import "./packages/address/address.scss";
 
@@ -262,6 +264,8 @@ export default {
   locale,
   install,
   Lazyload,
+  VueQr,
+
   ...components,
   ...filters,
   ...directives,