Authored by hf

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -92,7 +92,7 @@ function callpay(orderCode) { @@ -92,7 +92,7 @@ function callpay(orderCode) {
92 function isWXOpen() { 92 function isWXOpen() {
93 var ua = window.navigator.userAgent.toLowerCase(); 93 var ua = window.navigator.userAgent.toLowerCase();
94 94
95 - if (ua.match(/MicroMessenger/i).toString() === 'micromessenger') { 95 + if (ua.indexOf('micromessenger') > 0) {
96 return true; 96 return true;
97 } else { 97 } else {
98 return false; 98 return false;
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 width: 23%; 51 width: 23%;
52 position: absolute; 52 position: absolute;
53 left: 0; 53 left: 0;
54 - top: 50%; 54 + top: 50%;
55 @include transform(translateY(-50%)) 55 @include transform(translateY(-50%))
56 } 56 }
57 .material-desc { 57 .material-desc {
@@ -109,6 +109,13 @@ @@ -109,6 +109,13 @@
109 width: pxToRem(581px); 109 width: pxToRem(581px);
110 height:auto; 110 height:auto;
111 } 111 }
  112 +
  113 + a {
  114 + color: #2f91f6;
  115 + text-decoration: underline;
  116 +
  117 + }
  118 +
112 } 119 }
113 margin-top: pxToRem(30px); 120 margin-top: pxToRem(30px);
114 margin-bottom: pxToRem(30px); 121 margin-bottom: pxToRem(30px);