Authored by hf

do merge develop code to version 1.0.0

... ... @@ -22,7 +22,7 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.0.1/index.css">
</head>
<body class=passport-body>
<div class="back-email-page passport-page yoho-page">
... ... @@ -36,11 +36,8 @@
<span id="btn-sure" class="btn btn-sure disable row">确定</span>
</div>
</div>
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
<script src="http://cdn.yoho.cn/myohobuy/1.0.1/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/1.0.1/index.js"></script>
<script type="text/javascript">
(function(w,d,s,j,f){
... ... @@ -53,28 +50,12 @@
m.parentNode.insertBefore(a,m);
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
</script>
<script>
seajs.use('js/common');
</script>
<script>
seajs.use('js/passport/back/email');
</script>
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
... ... @@ -85,7 +66,6 @@
})(window,document,'script','dataLayer','GTM-W958MG');
</script>
<!-- End Google Tag Manager -->
<script type="text/javascript">
var _hmt = _hmt || [];
(function() {
... ... @@ -105,8 +85,6 @@
s.parentNode.insertBefore(hm, s);
})();
</script>
<script src="http://static.yohobuy.com/js/analytics/analysis.js"></script>
<script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -22,7 +22,7 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.0.1/index.css">
</head>
<body class=passport-body>
<div class="back-mobile-page passport-page yoho-page">
... ... @@ -55,10 +55,8 @@
</div>
</div>
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
<script src="http://cdn.yoho.cn/myohobuy/1.0.1/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/1.0.1/index.js"></script>
<script type="text/javascript">
(function(w,d,s,j,f){
... ... @@ -71,14 +69,9 @@
m.parentNode.insertBefore(a,m);
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
</script>
<script>
seajs.use('js/common');
</script>
<script>
seajs.use('js/passport/back/mobile');
</script>
... ...
... ... @@ -22,7 +22,7 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.0.1/index.css">
</head>
<body class=passport-body>
<div class="reg-page passport-page yoho-page">
... ... @@ -55,11 +55,8 @@
<p class="register-tip">YOHO!Family账号可登录YOHO!有货、YOHO!Boys、YOHO!Girls及SHOW</p>
</div>
</div>
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
<script src="http://cdn.yoho.cn/myohobuy/1.0.1/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/1.0.1/index.js"></script>
<script type="text/javascript">
(function(w,d,s,j,f){
... ...