vuex

2020-07-15 16:46:33 +08:00
parent 1918062639 76a0e7e8bd
commit 46da0894b4
11 changed files with 195 additions and 30 deletions
--- a/package.json
+++ b/package.json
@@ -13,7 +13,11 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
+<<<<<<< HEAD
    "uview-ui": "^1.5.0",
    "vuex": "^3.5.1"
+=======
+	"uview-ui": "^1.5.0"
+>>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
  }
 }