Merge branch 'https' into stable/wap

@@ -396,6 +396,12 @@ server
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header   Accept-Encoding "gzip";
     }
+
+    location ^~ /dist/ {
+        proxy_redirect off;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_pass http://cdn.yoho.cn/;
+    }
    
     location ~* \.(ico|woff|svg|eot|ttf|otf)$ {
         expires    30d;

-{{> layout/header}}
+{{> layout/header_passport}}
 <div class="reg-password-page passport-page yoho-page">
     {{> passport/header}}
     <div class="content">
@@ -20,4 +20,4 @@ var r=b.getElementsByTagName('script')[0];r.parentNode.insertBefore(s,r);
 _agtjs('init','AG_052186_PHCW','yohobuy.com');
 _agtjs('loadEvent',{atsev:101,'atsrmv':""});
 </script>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_passport}}
\ No newline at end of file