合并冲突

README.md

@@ -7,7 +7,7 @@ npm install
 
 ### Compiles and hot-reloads for development
 ```
-npm run serve
+npm run dev
 ```
 
 ### Compiles and minifies for production

package.json

@@ -1,12 +1,12 @@
 {
   "name": "myErpElement",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "lib": "vue-cli-service build --target lib packages/index.js"
+    "lib": "vue-cli-service build --target lib --dest lib packages/index.js"
   },
   "main": "./lib/myErpElement.umd.min.js",
   "dependencies": {

packages/index.js

@@ -22,6 +22,9 @@ if (typeof window !== 'undefined' && window.Vue) {
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
+}
+export {
+  install,
   // 以下是具体的组件列表
   pedestal,
-}
+}