Merge branch 'dev1.4' of http://192.168.3.207:10080/jianyu/page_datareport into dev1.4

ch2version.version.json

@@ -85,20 +85,20 @@
         "name": "index.html",
         "hash": "",
         "version": "8000",
-        "md5": "d287f761248726914c9aa5e57228009e"
+        "md5": "0ecce9d107d23fa2efbd02fa7c1c6b84"
     },
     "js": {
         "404.js": {
             "name": "404.js",
-            "hash": "2dc3a414b3",
+            "hash": "33a997a540",
             "version": "8000",
             "md5": "f13f4d91ec7ab0aa542dff5d639131e0"
         },
         "app.js": {
             "name": "app.js",
-            "hash": "03eeef705d",
+            "hash": "b33452fdca",
             "version": "8000",
-            "md5": "c1c9037579e6672a571d72c01998b2ff"
+            "md5": "4204d0877defd3e64bc27f4b15354566"
         },
         "chunk-vendors.js": {
             "name": "chunk-vendors.js",
@@ -114,31 +114,31 @@
         },
         "home.js": {
             "name": "home.js",
-            "hash": "e32f7c7dee",
+            "hash": "7810532a50",
             "version": "8000",
             "md5": "59cb88f7997cf1668c4add68c92a6f33"
         },
         "index.js": {
             "name": "index.js",
-            "hash": "1342579672",
+            "hash": "cd8f063844",
             "version": "8000",
             "md5": "b33da905bed42e9b738c43b244cbd284"
         },
         "order.js": {
             "name": "order.js",
-            "hash": "0718c71a40",
+            "hash": "543b9951c5",
             "version": "8000",
             "md5": "3df63675c30ac907a6077ae6437bbcdb"
         },
         "pay.js": {
             "name": "pay.js",
-            "hash": "e325d914ee",
+            "hash": "d620d27dc7",
             "version": "8000",
             "md5": "8898b0b1feab70d9ab6b20d6706b5436"
         },
         "test.js": {
             "name": "test.js",
-            "hash": "66b264b508",
+            "hash": "67e810996a",
             "version": "8000",
             "md5": "33e586cd85bd65100c61c5adbb542578"
         }

package.json

@@ -59,6 +59,7 @@
     "ts-import-plugin": "^1.6.5",
     "typescript": "~3.7.5",
     "vue-template-compiler": "^2.6.11",
-    "webpack-bundle-analyzer": "^3.6.1"
+    "webpack-bundle-analyzer": "^3.6.1",
+    "yarn": "^1.22.4"
   }
 }

yarn.lock

@@ -9431,6 +9431,11 @@ yargs@^15.0.0:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yarn@^1.22.4:
+  version "1.22.4"
+  resolved "https://registry.npm.taobao.org/yarn/download/yarn-1.22.4.tgz#01c1197ca5b27f21edc8bc472cd4c8ce0e5a470e"
+  integrity sha1-AcEZfKWyfyHtyLxHLNTIzg5aRw4=
+
 yorkie@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/yorkie/download/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9"