Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

frontend/wechat-web/package.json

@@ -40,7 +40,7 @@
     "not ie <= 11",
     "not op_mini all"
   ],
-  "homepage": "/smart-school",
+  "homepage": "",
   "devDependencies": {
     "babel-plugin-import": "^1.10.0",
     "circular-json": "^0.5.9",

frontend/wechat-web/runtime/nginx/default.conf

@@ -4,12 +4,12 @@ server {
 
     charset utf-8;
 
-    location /smart-school {
+    location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
     }
 
-    #error_page  404              /404.html;
+    error_page  404              /index.html;
 
     # redirect server error pages to the static page /50x.html
     #

frontend/wechat-web/src/configs/router.config.js

@@ -68,7 +68,7 @@ export default class RouteConfig extends Component {
 
     render() {
         return (
-            <Router basename="/smart-school">
+            <Router>
                 <div>
                     <Route exact path='/' render={() => (
                         <Redirect to='/bindMenu/app/'/>