code review by fei.hong: modify nginx config

@@ -446,11 +446,8 @@ server
     }
 
     location ^~ /dist/ {
-<<<<<<< HEAD
         #root /Data/code/git/yohobuy/static;
         #expires 30d;
-=======
->>>>>>> stable/wap
         proxy_redirect off;
         proxy_set_header   X-Real-IP  $remote_addr;
         proxy_pass http://cdn.yoho.cn/;

@@ -458,6 +458,14 @@ server
         proxy_set_header   Accept-Encoding "gzip";
     }
 
+    location ^~ /dist/ {
+        #root /Data/PE/yohobuy_H5/static;
+        #expires 30d;
+        proxy_redirect off;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_pass http://cdn.yoho.cn/;
+    }
+
     location / {
         proxy_redirect off;
         proxy_pass http://119.254.81.245;