do merge develop code to version 1.0.0
Showing
3 changed files
with
9 additions
and
41 deletions
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | }()); | 22 | }()); |
23 | })(document, window); | 23 | })(document, window); |
24 | </script> | 24 | </script> |
25 | -<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> | 25 | +<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.0.1/index.css"> |
26 | </head> | 26 | </head> |
27 | <body class=passport-body> | 27 | <body class=passport-body> |
28 | <div class="back-email-page passport-page yoho-page"> | 28 | <div class="back-email-page passport-page yoho-page"> |
@@ -36,11 +36,8 @@ | @@ -36,11 +36,8 @@ | ||
36 | <span id="btn-sure" class="btn btn-sure disable row">确定</span> | 36 | <span id="btn-sure" class="btn btn-sure disable row">确定</span> |
37 | </div> | 37 | </div> |
38 | </div> | 38 | </div> |
39 | - | ||
40 | - | ||
41 | - | ||
42 | - <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> | ||
43 | -<script>seajs.config({base: 'http://localhost:8000/'});</script> | 39 | +<script src="http://cdn.yoho.cn/myohobuy/1.0.1/lib.js"></script> |
40 | +<script src="http://cdn.yoho.cn/myohobuy/1.0.1/index.js"></script> | ||
44 | 41 | ||
45 | <script type="text/javascript"> | 42 | <script type="text/javascript"> |
46 | (function(w,d,s,j,f){ | 43 | (function(w,d,s,j,f){ |
@@ -53,28 +50,12 @@ | @@ -53,28 +50,12 @@ | ||
53 | m.parentNode.insertBefore(a,m); | 50 | m.parentNode.insertBefore(a,m); |
54 | })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas'); | 51 | })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas'); |
55 | </script> | 52 | </script> |
56 | - | ||
57 | <script> | 53 | <script> |
58 | seajs.use('js/common'); | 54 | seajs.use('js/common'); |
59 | </script> | 55 | </script> |
60 | - | ||
61 | - | ||
62 | - | ||
63 | - | ||
64 | <script> | 56 | <script> |
65 | seajs.use('js/passport/back/email'); | 57 | seajs.use('js/passport/back/email'); |
66 | </script> | 58 | </script> |
67 | - | ||
68 | - | ||
69 | - | ||
70 | - | ||
71 | - | ||
72 | - | ||
73 | - | ||
74 | - | ||
75 | - | ||
76 | - | ||
77 | - | ||
78 | <!-- Google Tag Manager --> | 59 | <!-- Google Tag Manager --> |
79 | <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> | 60 | <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> |
80 | <script> | 61 | <script> |
@@ -85,7 +66,6 @@ | @@ -85,7 +66,6 @@ | ||
85 | })(window,document,'script','dataLayer','GTM-W958MG'); | 66 | })(window,document,'script','dataLayer','GTM-W958MG'); |
86 | </script> | 67 | </script> |
87 | <!-- End Google Tag Manager --> | 68 | <!-- End Google Tag Manager --> |
88 | - | ||
89 | <script type="text/javascript"> | 69 | <script type="text/javascript"> |
90 | var _hmt = _hmt || []; | 70 | var _hmt = _hmt || []; |
91 | (function() { | 71 | (function() { |
@@ -105,8 +85,6 @@ | @@ -105,8 +85,6 @@ | ||
105 | s.parentNode.insertBefore(hm, s); | 85 | s.parentNode.insertBefore(hm, s); |
106 | })(); | 86 | })(); |
107 | </script> | 87 | </script> |
108 | - | ||
109 | <script src="http://static.yohobuy.com/js/analytics/analysis.js"></script> | 88 | <script src="http://static.yohobuy.com/js/analytics/analysis.js"></script> |
110 | - | ||
111 | <script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script></body> | 89 | <script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script></body> |
112 | </html> | 90 | </html> |
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | }()); | 22 | }()); |
23 | })(document, window); | 23 | })(document, window); |
24 | </script> | 24 | </script> |
25 | -<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> | 25 | +<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.0.1/index.css"> |
26 | </head> | 26 | </head> |
27 | <body class=passport-body> | 27 | <body class=passport-body> |
28 | <div class="back-mobile-page passport-page yoho-page"> | 28 | <div class="back-mobile-page passport-page yoho-page"> |
@@ -55,10 +55,8 @@ | @@ -55,10 +55,8 @@ | ||
55 | </div> | 55 | </div> |
56 | </div> | 56 | </div> |
57 | 57 | ||
58 | - | ||
59 | - | ||
60 | - <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> | ||
61 | -<script>seajs.config({base: 'http://localhost:8000/'});</script> | 58 | +<script src="http://cdn.yoho.cn/myohobuy/1.0.1/lib.js"></script> |
59 | +<script src="http://cdn.yoho.cn/myohobuy/1.0.1/index.js"></script> | ||
62 | 60 | ||
63 | <script type="text/javascript"> | 61 | <script type="text/javascript"> |
64 | (function(w,d,s,j,f){ | 62 | (function(w,d,s,j,f){ |
@@ -71,14 +69,9 @@ | @@ -71,14 +69,9 @@ | ||
71 | m.parentNode.insertBefore(a,m); | 69 | m.parentNode.insertBefore(a,m); |
72 | })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas'); | 70 | })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas'); |
73 | </script> | 71 | </script> |
74 | - | ||
75 | <script> | 72 | <script> |
76 | seajs.use('js/common'); | 73 | seajs.use('js/common'); |
77 | </script> | 74 | </script> |
78 | - | ||
79 | - | ||
80 | - | ||
81 | - | ||
82 | <script> | 75 | <script> |
83 | seajs.use('js/passport/back/mobile'); | 76 | seajs.use('js/passport/back/mobile'); |
84 | </script> | 77 | </script> |
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | }()); | 22 | }()); |
23 | })(document, window); | 23 | })(document, window); |
24 | </script> | 24 | </script> |
25 | -<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> | 25 | +<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.0.1/index.css"> |
26 | </head> | 26 | </head> |
27 | <body class=passport-body> | 27 | <body class=passport-body> |
28 | <div class="reg-page passport-page yoho-page"> | 28 | <div class="reg-page passport-page yoho-page"> |
@@ -55,11 +55,8 @@ | @@ -55,11 +55,8 @@ | ||
55 | <p class="register-tip">YOHO!Family账号可登录YOHO!有货、YOHO!Boys、YOHO!Girls及SHOW</p> | 55 | <p class="register-tip">YOHO!Family账号可登录YOHO!有货、YOHO!Boys、YOHO!Girls及SHOW</p> |
56 | </div> | 56 | </div> |
57 | </div> | 57 | </div> |
58 | - | ||
59 | - | ||
60 | - | ||
61 | - <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> | ||
62 | -<script>seajs.config({base: 'http://localhost:8000/'});</script> | 58 | +<script src="http://cdn.yoho.cn/myohobuy/1.0.1/lib.js"></script> |
59 | +<script src="http://cdn.yoho.cn/myohobuy/1.0.1/index.js"></script> | ||
63 | 60 | ||
64 | <script type="text/javascript"> | 61 | <script type="text/javascript"> |
65 | (function(w,d,s,j,f){ | 62 | (function(w,d,s,j,f){ |
-
Please register or login to post a comment