Merge branch 'master' of http://192.168.0.27:8090/xuxu/yongxinda-h5

Dockerfile

@@ -14,6 +14,7 @@ RUN echo "\
 					  client_max_body_size   20m; \
                       fastcgi_buffers 256 128k; \
                       chunked_transfer_encoding off; \
+                      charset utf-8; \
                       #listen       443 ssl; \
 					  #ssl on;\
 					  #ssl_certificate /etc/nginx/ssl/7278703_blueelephant.es-erp.com.pem;\
@@ -30,6 +31,7 @@ RUN echo "\
                             proxy_set_header        Host yongxingda; \
                             proxy_set_header        X-Real-IP \$remote_addr; \
                             proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
+                            charset                 utf-8; \
                        } \
                        #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
                        location / { \