fe / YAS-jssdk · Commits

Go to a project

Authored by 郝肖肖
Commit b887ab0952b1c3b9e5044b7e180408e0bbe2ba69 1 parent b56f08f4

'miniapp'

Inline Side-by-side
Showing 3 changed files with 62 additions and 59 deletions
@@ -99,59 +99,3 @@ @@ -99,59 +99,3 @@
99 color: #fff; 99 color: #fff;
100 text-decoration: none; 100 text-decoration: none;
101 } 101 }
102 -  
103 -.mini-app-dialog-bg,  
104 -.mini-app-dialog {  
105 - display: none;  
106 -}  
107 -.mini-app-dialog-bg {  
108 - background-color: #000;  
109 - opacity: .3;  
110 - position: fixed;  
111 - width: 100%;  
112 - z-index: 30;  
113 - height: 100%;  
114 -}  
115 -  
116 -.mini-app-dialog {  
117 - text-align: center;  
118 - position: fixed;  
119 - z-index: 31;  
120 - left: 50%;  
121 - top: 50%;  
122 - width: 12.5rem;  
123 - border-radius: 0.2rem;  
124 - background-color: #fff;  
125 - margin-left: -6.25rem;  
126 - margin-top: -6rem;  
127 -}  
128 -  
129 -.mini-app-dialog .mini-app-header {  
130 - height: 2rem;  
131 - line-height: 2rem;  
132 -}  
133 -  
134 -.mini-app-dialog .mini-app-content {  
135 - padding: 0.625rem;  
136 -}  
137 -  
138 -.mini-app-dialog .mini-app-content img {  
139 - width: 6.45rem;  
140 - height: 6.45rem;  
141 -}  
142 -  
143 -.mini-app-dialog .mini-app-footer {  
144 - height: 3.65rem;  
145 - line-height: 3.65rem;  
146 - font-size: 0.7rem;  
147 -}  
148 -  
149 -.mini-app-dialog .mini-app-close {  
150 - width: 0.75rem;  
151 - height: 0.75rem;  
152 - position: absolute;  
153 - right: 0.25rem;  
154 - top: 0.25rem;  
155 - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmFJREFUeNrMl99OE0EUxrdL9bYYbWoEJajUP5ckXsM2IZJe0IQQqY9AGq0+QY0vUExs+gqQkCblAi0ktPckvUQoQoyihDbE6qWELN9pzjbr6O7MlK7xJB/Tdg/nN+fszOzZkG3bhszK5fIlDI+hKegRdAe6wpe/Q/vQFrQBradSqV+ymCE/MICDGF5AGeiaoWYnUAHKYwJtbTCgaQyLUMzozZpQFvAlJTCAAxjecJb9sCL0DBM48wQzlGY4Z/TXStATN9wUHBYDgJLNchX/zBjZznO2QdpT5553wLx6dy6wkFStBcVptTulzvpAJ3jfNhQCb0Mj0LTH9Sj0snOPke1lyQr+ihkeYExAexKoBd/P9D8+fhlimnwaRX0c38FxCAEpmOUBJ2gCPk34UsarPvGu0ilo8lHoZ2PQpgsuZv6BocfwuYXPVWhUErMDHle4d3GG3wDgkOEfGWq5oDUFKNm4yRkZPcCtHjLtVjGMPxGN7XCP4RbDaSveZOhtjTgRytjW3Iu24m++RuCfGv67XN4jZDoMXcfnL1z2A404P0zJ3hShlgPl8lZd8EkN+B6B67qZMvQudJ/vuS68TuCKxKnB0G8C1LEHDI9plL1icp/U8nFKuqCbAtQNrzKcjswZSWtUcZ5OOXx55eFI5aNM3ivseTo6k9BDaM3D5zUmlwvzF3pIL3g8oWoaq5WAnySPxXy3A+FuMGsEb8+dzrPb+uCHZQxvA4QW3B2n2HNRD70SALQkVvQ3MHeBaW7I+2VFscP8vxr6v7zCZLk1iv6TVxiFl7ZBvtwWXtoqAJ7KYp4LMACryxGMnWAbNgAAAABJRU5ErkJggg==");  
156 - background-size: cover;  
157 -}  
  1 +.mini-app-dialog-bg,
  2 +.mini-app-dialog {
  3 + display: none;
  4 +}
  5 +.mini-app-dialog-bg {
  6 + background-color: #000;
  7 + opacity: .3;
  8 + position: fixed;
  9 + width: 100%;
  10 + z-index: 30;
  11 + height: 100%;
  12 +}
  13 +
  14 +.mini-app-dialog {
  15 + text-align: center;
  16 + position: fixed;
  17 + z-index: 31;
  18 + left: 50%;
  19 + top: 50%;
  20 + width: 12.5rem;
  21 + border-radius: 0.2rem;
  22 + background-color: #fff;
  23 + margin-left: -6.25rem;
  24 + margin-top: -6rem;
  25 +}
  26 +
  27 +.mini-app-dialog .mini-app-header {
  28 + height: 2rem;
  29 + line-height: 2rem;
  30 +}
  31 +
  32 +.mini-app-dialog .mini-app-content {
  33 + padding: 0.625rem;
  34 +}
  35 +
  36 +.mini-app-dialog .mini-app-content img {
  37 + width: 6.45rem;
  38 + height: 6.45rem;
  39 +}
  40 +
  41 +.mini-app-dialog .mini-app-footer {
  42 + height: 3.65rem;
  43 + line-height: 3.65rem;
  44 + font-size: 0.7rem;
  45 +}
  46 +
  47 +.mini-app-dialog .mini-app-close {
  48 + width: 0.75rem;
  49 + height: 0.75rem;
  50 + position: absolute;
  51 + right: 0.25rem;
  52 + top: 0.25rem;
  53 + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAmFJREFUeNrMl99OE0EUxrdL9bYYbWoEJajUP5ckXsM2IZJe0IQQqY9AGq0+QY0vUExs+gqQkCblAi0ktPckvUQoQoyihDbE6qWELN9pzjbr6O7MlK7xJB/Tdg/nN+fszOzZkG3bhszK5fIlDI+hKegRdAe6wpe/Q/vQFrQBradSqV+ymCE/MICDGF5AGeiaoWYnUAHKYwJtbTCgaQyLUMzozZpQFvAlJTCAAxjecJb9sCL0DBM48wQzlGY4Z/TXStATN9wUHBYDgJLNchX/zBjZznO2QdpT5553wLx6dy6wkFStBcVptTulzvpAJ3jfNhQCb0Mj0LTH9Sj0snOPke1lyQr+ihkeYExAexKoBd/P9D8+fhlimnwaRX0c38FxCAEpmOUBJ2gCPk34UsarPvGu0ilo8lHoZ2PQpgsuZv6BocfwuYXPVWhUErMDHle4d3GG3wDgkOEfGWq5oDUFKNm4yRkZPcCtHjLtVjGMPxGN7XCP4RbDaSveZOhtjTgRytjW3Iu24m++RuCfGv67XN4jZDoMXcfnL1z2A404P0zJ3hShlgPl8lZd8EkN+B6B67qZMvQudJ/vuS68TuCKxKnB0G8C1LEHDI9plL1icp/U8nFKuqCbAtQNrzKcjswZSWtUcZ5OOXx55eFI5aNM3ivseTo6k9BDaM3D5zUmlwvzF3pIL3g8oWoaq5WAnySPxXy3A+FuMGsEb8+dzrPb+uCHZQxvA4QW3B2n2HNRD70SALQkVvQ3MHeBaW7I+2VFscP8vxr6v7zCZLk1iv6TVxiFl7ZBvtwWXtoqAJ7KYp4LMACryxGMnWAbNgAAAABJRU5ErkJggg==");
  54 + background-size: cover;
  55 +}
@@ -48,8 +48,7 @@ var appInfo = { @@ -48,8 +48,7 @@ var appInfo = {
48 48
49 var isApp = /yoho/i.test(navigator.userAgent) || /app_version=/i.test(window.location.search) || !!window.yohoInterface; 49 var isApp = /yoho/i.test(navigator.userAgent) || /app_version=/i.test(window.location.search) || !!window.yohoInterface;
50 var isMobile = /(iPhone|Android|iPad|iPod|iOS)/i.test(navigator.userAgent); 50 var isMobile = /(iPhone|Android|iPad|iPod|iOS)/i.test(navigator.userAgent);
51 -// var isWechat = /micromessenger/i.test(navigator.userAgent);  
52 -var isWechat = true; 51 +var isWechat = /micromessenger/i.test(navigator.userAgent);
53 var ismyhbuy = /m\.yohobuy\.com/i.test(document.domain); 52 var ismyhbuy = /m\.yohobuy\.com/i.test(document.domain);
54 var isfeature = /feature\.yoho\.cn/i.test(document.domain) || /activity\.yoho\.cn/i.test(document.domain); 53 var isfeature = /feature\.yoho\.cn/i.test(document.domain) || /activity\.yoho\.cn/i.test(document.domain);
55 var downloadBlackLst = ['m.yohobuy.com/brands', 'm.yohobuy.com/passport']; 54 var downloadBlackLst = ['m.yohobuy.com/brands', 'm.yohobuy.com/passport'];
@@ -448,7 +447,7 @@ function setMiniAppDialog() { @@ -448,7 +447,7 @@ function setMiniAppDialog() {
448 // 设定fontsize 447 // 设定fontsize
449 util.setFontSize(); 448 util.setFontSize();
450 449
451 - var css = require('../css/download.css') 450 + var css = require('../css/wechat-mini-app.css');
452 451
453 var miniDom = document.createElement('div'); 452 var miniDom = document.createElement('div');
454 miniDom.innerHTML = util.getMiniAppDialog(); 453 miniDom.innerHTML = util.getMiniAppDialog();
@@ -493,6 +492,11 @@ function setDownloadBar() { @@ -493,6 +492,11 @@ function setDownloadBar() {
493 return; 492 return;
494 } 493 }
495 494
  495 + // 设定fontsize
  496 + util.setFontSize();
  497 +
  498 + var css = require('../css/download.css');
  499 +
496 var downloadDom = document.createElement('div'); 500 var downloadDom = document.createElement('div');
497 downloadDom.innerHTML = util.getDownloadStr(isWechat); 501 downloadDom.innerHTML = util.getDownloadStr(isWechat);
498 yasDombar.appendChild(downloadDom); 502 yasDombar.appendChild(downloadDom);