wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 5e8516859e18001c74663742b816f2969e93490c 2 parents daef3103 2399d3c9

Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order

Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 47
48 48
49 49
50 - <script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>  
51 -<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script> 50 + <script src="//cdn.yoho.cn/myohobuy/1.3.15/lib.js"></script>
  51 +<script src="//cdn.yoho.cn/myohobuy/1.3.15/index.js"></script>
52 <script> 52 <script>
53 seajs.use('js/common'); 53 seajs.use('js/common');
54 </script> 54 </script>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
30 <link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -65,8 +65,8 @@ @@ -65,8 +65,8 @@
65 65
66 66
67 67
68 - <script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>  
69 -<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script> 68 + <script src="//cdn.yoho.cn/myohobuy/1.3.15/lib.js"></script>
  69 +<script src="//cdn.yoho.cn/myohobuy/1.3.15/index.js"></script>
70 <script> 70 <script>
71 seajs.use('js/common'); 71 seajs.use('js/common');
72 </script> 72 </script>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
30 <link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">