Merge branch 'xiaxs' into 'master'

Xiaxs

See merge request vue-project/Frame/basic!4

.gitmodules

 [submodule "runner"]
 	path = runner
-	url = git@123.207.147.179:vue-project/runner.git
+	url = http://123.207.147.179:8888/vue-project/Frame/runner.git

package.json

@@ -8,10 +8,10 @@
     "start": "npm run dev",
     "build": "cross-env NODE_ENV=production node runner/build/build.prd.js",
     "lint": "eslint --ext .js --ext .jsx --ext .vue client/",
-    "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/",
+    "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/ widgets/",
     "precommit": "npm run lint-fix",
     "init": "git submodule update --init --recursive",
-    "update": "git submodule update --remote"
+    "update": "git submodule update --recursive --remote --merge --force"
   },
   "author": "",
   "license": "ISC",
@@ -29,7 +29,8 @@
     "chalk": "^2.3.0",
     "copy-webpack-plugin": "^4.3.1",
     "cross-env": "^5.1.3",
-    "css-loader": "^0.28.7",
+    "css-hot-loader": "^1.4.4",
+    "css-loader": "^3.6.0",
     "eslint": "^4.16.0",
     "eslint-config-standard": "^11.0.0-beta.0",
     "eslint-loader": "^2.2.1",
@@ -38,11 +39,11 @@
     "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
-    "file-loader": "^4.0.0",
+    "file-loader": "^6.2.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^4.5.2",
-    "less": "^2.7.3",
-    "less-loader": "^4.0.5",
+    "less": "^4.1.1",
+    "less-loader": "^7.3.0",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^0.5.0",
     "node-notifier": "^5.1.2",
@@ -51,21 +52,23 @@
     "ora": "^1.3.0",
     "postcss-loader": "^3.0.0",
     "rimraf": "^2.6.2",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^10.2.0",
     "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^0.6.2",
+    "url-loader": "^4.1.1",
     "vue-awesome-swiper": "^3.1.3",
     "vue-loader": "^15.9.6",
-    "vue-style-loader": "^3.0.3",
+    "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.6.14",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
+    "webpack-dev-middleware": "^5.0.0",
     "webpack-dev-server": "^3.11.2",
     "webpack-merge": "^4.1.1"
   },
   "dependencies": {
     "axios": "^0.17.1",
     "echarts": "^5.1.2",
+    "qs": "^6.10.1",
     "vue": "^2.6.14",
     "vue-awesome-swiper": "^3.1.3",
     "vue-count-to": "^1.0.13",

runner @ f4746173

-Subproject commit f44a5f253db29181361347cd79bfdc5a6fb94033
+Subproject commit f4746173cf454453e2895964ec3ed3d6a13d0e42