update；合并

2021-09-10 15:10:05 +08:00
parent ae4a02fed6
commit 5089cde8bc
47 changed files with 748 additions and 224 deletions
--- a/FrontCode2/sunshine_levy/package.json
+++ b/FrontCode2/sunshine_levy/package.json
@@ -11,7 +11,13 @@
  },
  "dependencies": {
    "axios": "^0.21.4",
+<<<<<<< Updated upstream
    "js-md5": "^0.7.3",
+=======
+    "element-ui": "^2.15.6",
+    "less": "^4.1.1",
+    "less-loader": "^4.1.0",
+>>>>>>> Stashed changes
    "lib-flexible": "^0.3.2",
    "px2rem-loader": "^0.1.9",
    "vant": "^2.12.27",