Merge remote-tracking branch 'origin/dev'

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

@@ -9,7 +9,7 @@ server {
         index  index.html index.htm;
     }
 
-    #error_page  404              /index.html;
+    error_page  404              /index.html;
 
     # redirect server error pages to the static page /50x.html
     #