Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/package.json

@@ -80,4 +80,4 @@
   "uni-app": {
     "scripts": {}
   }
-}
+}

jdApp/package.json

@@ -31,7 +31,7 @@
     "@dcloudio/uni-mp-baidu": "^2.0.0-25120200103006",
     "@dcloudio/uni-mp-qq": "^2.0.0-25120200103006",
     "@dcloudio/uni-mp-toutiao": "^2.0.0-25120200103006",
-    "@dcloudio/uni-mp-weixin": "^2.0.0-25120200103006",
+    "@dcloudio/uni-mp-weixin": "^2.0.2-3071120230427001",
     "@dcloudio/uni-stat": "^2.0.0-25120200103006",
     "echarts": "4.2.1",
     "flyio": "^0.6.2",
@@ -46,27 +46,31 @@
     "vuex": "^3.0.1"
   },
   "devDependencies": {
-    "@dcloudio/uni-cli-shared": "^2.0.0-25120200103006",
-    "@dcloudio/uni-migration": "^2.0.0-25120200103006",
-    "@dcloudio/uni-template-compiler": "^2.0.0-25120200103006",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.0-25120200103006",
-    "@dcloudio/vue-cli-plugin-uni": "^2.0.0-25120200103006",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.0-25120200103006",
-    "@dcloudio/webpack-uni-mp-loader": "^2.0.0-25120200103006",
-    "@dcloudio/webpack-uni-pages-loader": "^2.0.0-25120200103006",
+    "@dcloudio/uni-automator": "^2.0.1-33920220121003",
+    "@dcloudio/uni-cli-i18n": "^2.0.1-33920220121003",
+    "@dcloudio/uni-cli-shared": "^2.0.1-33920220121003",
+    "@dcloudio/uni-i18n": "^2.0.1-32920211122003",
+    "@dcloudio/uni-migration": "^2.0.1-33920220121003",
+    "@dcloudio/uni-template-compiler": "^2.0.1-33920220121003",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-33920220121003",
+    "@dcloudio/vue-cli-plugin-uni": "^2.0.1-33920220121003",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-33920220121003",
+    "@dcloudio/webpack-uni-mp-loader": "^2.0.1-33920220121003",
+    "@dcloudio/webpack-uni-pages-loader": "^2.0.1-33920220121003",
     "@types/html5plus": "*",
     "@types/uni-app": "*",
     "@vue/cli-plugin-babel": "3.5.1",
     "@vue/cli-service": "^4.1.0",
-    "babel-plugin-import": "^1.11.0",
-    "cross-env": "^7.0.0",
+    "babel-plugin-import": "^1.13.3",
+    "cross-env": "^7.0.3",
+    "jest": "^25.5.4",
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
     "moment": "^2.24.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.0",
     "postcss-comment": "^2.0.0",
     "qs": "^6.8.0",
-    "sass-loader": "^8.0.2",
+    "sass-loader": "^11.1.0",
     "vue-template-compiler": "^2.6.10"
   },
   "browserslist": [