Update jswe.js
Brightcells
4 arquivos alterados com 28 adições e 6 exclusões
+ 1
- 1
page/templates/page/clerk_info.html
@@ -51,7 +51,7 @@ |
||
| 51 | 51 |
|
| 52 | 52 |
<script src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
| 53 | 53 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 54 |
- <script type="text/javascript" src="{% static 'tamron/js/jswe-0.0.2.js' %}"></script>
|
|
| 54 |
+ <script type="text/javascript" src="{% static 'tamron/js/jswe-0.0.3.js' %}"></script>
|
|
| 55 | 55 |
<script> |
| 56 | 56 |
V.initWxData({
|
| 57 | 57 |
imgUrl: 'http://pai.ai/static/pai2/img/paiai_96_96.png', |
+ 1
- 1
page/templates/page/clerk_oauth.html
@@ -176,7 +176,7 @@ |
||
| 176 | 176 |
{% endif %}
|
| 177 | 177 |
</script> |
| 178 | 178 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 179 |
- <script type="text/javascript" src="{% static 'tamron/js/jswe-0.0.2.js' %}"></script>
|
|
| 179 |
+ <script type="text/javascript" src="{% static 'tamron/js/jswe-0.0.3.js' %}"></script>
|
|
| 180 | 180 |
<script> |
| 181 | 181 |
V.initWxData({
|
| 182 | 182 |
imgUrl: 'http://pai.ai/static/pai2/img/paiai_96_96.png', |
+ 1
- 1
page/templates/page/clerk_sale.html
@@ -340,7 +340,7 @@ |
||
| 340 | 340 |
}); |
| 341 | 341 |
</script> |
| 342 | 342 |
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> |
| 343 |
- <script type="text/javascript" src="{% static 'tamron/js/jswe-0.0.2.js' %}"></script>
|
|
| 343 |
+ <script type="text/javascript" src="{% static 'tamron/js/jswe-0.0.3.js' %}"></script>
|
|
| 344 | 344 |
<script> |
| 345 | 345 |
V.initWxData({
|
| 346 | 346 |
imgUrl: 'http://pai.ai/static/pai2/img/paiai_96_96.png', |
+ 25
- 3
tamron/static/tamron/js/jswe-0.0.2.js
@@ -11,6 +11,7 @@ |
||
| 11 | 11 |
timeLine: '' |
| 12 | 12 |
}, wxConfig = {
|
| 13 | 13 |
hide: false, |
| 14 |
+ baseFlag: false, |
|
| 14 | 15 |
baseHide: false, |
| 15 | 16 |
close: false, |
| 16 | 17 |
hideMenuItems: [], |
@@ -54,6 +55,20 @@ |
||
| 54 | 55 |
'openCard' |
| 55 | 56 |
], wxApiFun |
| 56 | 57 |
|
| 58 |
+ function isEmpty(obj) {
|
|
| 59 |
+ if (obj == null) return true; |
|
| 60 |
+ if (obj.length > 0) return false; |
|
| 61 |
+ if (obj.length === 0) return true; |
|
| 62 |
+ for (var key in obj) {
|
|
| 63 |
+ if (Object.prototype.hasOwnProperty.call(obj, key)) return false; |
|
| 64 |
+ } |
|
| 65 |
+ return true; |
|
| 66 |
+ } |
|
| 67 |
+ |
|
| 68 |
+ function isNotEmpty(obj) {
|
|
| 69 |
+ return !isEmpty(obj) |
|
| 70 |
+ } |
|
| 71 |
+ |
|
| 57 | 72 |
function isOpenOnPC() { // 判断当前网页是否在 PC 浏览器中打开
|
| 58 | 73 |
var ua = navigator.userAgent |
| 59 | 74 |
return /windows nt/i.test(ua) || /macintosh/i.test(ua) || /linux x86_64/i.test(ua) |
@@ -97,11 +112,13 @@ |
||
| 97 | 112 |
} |
| 98 | 113 |
|
| 99 | 114 |
function hideAllNonBaseMenuItem() {
|
| 115 |
+ wxConfig.baseFlag = true |
|
| 100 | 116 |
wxConfig.baseHide = true |
| 101 | 117 |
fixedWxData() |
| 102 | 118 |
} |
| 103 | 119 |
|
| 104 | 120 |
function showAllNonBaseMenuItem() {
|
| 121 |
+ wxConfig.baseFlag = true |
|
| 105 | 122 |
wxConfig.baseHide = false |
| 106 | 123 |
fixedWxData() |
| 107 | 124 |
} |
@@ -169,7 +186,7 @@ |
||
| 169 | 186 |
// 8.2 显示右上角菜单 |
| 170 | 187 |
if (wxConfig.hide) {wx.hideOptionMenu()} else {wx.showOptionMenu()}
|
| 171 | 188 |
// 8.3 批量隐藏菜单项 |
| 172 |
- if (wxConfig.hideMenuItems) {
|
|
| 189 |
+ if (isNotEmpty(wxConfig.hideMenuItems)) {
|
|
| 173 | 190 |
wx.hideMenuItems({
|
| 174 | 191 |
menuList: wxConfig.hideMenuItems, |
| 175 | 192 |
success: function (res) {
|
@@ -181,7 +198,7 @@ |
||
| 181 | 198 |
}); |
| 182 | 199 |
} |
| 183 | 200 |
// 8.4 批量显示菜单项 |
| 184 |
- if (wxConfig.showMenuItems) {
|
|
| 201 |
+ if (isNotEmpty(wxConfig.showMenuItems)) {
|
|
| 185 | 202 |
wx.showMenuItems({
|
| 186 | 203 |
menuList: wxConfig.showMenuItems, |
| 187 | 204 |
success: function (res) {
|
@@ -194,7 +211,9 @@ |
||
| 194 | 211 |
} |
| 195 | 212 |
// 8.5 隐藏所有非基本菜单项 |
| 196 | 213 |
// 8.6 显示所有被隐藏的非基本菜单项 |
| 197 |
- if (wxConfig.baseHide) {wx.hideAllNonBaseMenuItem()} else {wx.showAllNonBaseMenuItem()}
|
|
| 214 |
+ if (wxConfig.baseFlag) {
|
|
| 215 |
+ if (wxConfig.baseHide) {wx.hideAllNonBaseMenuItem()} else {wx.showAllNonBaseMenuItem()}
|
|
| 216 |
+ } |
|
| 198 | 217 |
// 8.7 关闭当前窗口 |
| 199 | 218 |
if (wxConfig.close) {wx.closeWindow()}
|
| 200 | 219 |
}, wxApi = function () {
|
@@ -348,6 +367,9 @@ |
||
| 348 | 367 |
wxData: wxData, |
| 349 | 368 |
jsApiList: jsApiList, |
| 350 | 369 |
|
| 370 |
+ isEmpty: isEmpty, |
|
| 371 |
+ isNotEmpty: isNotEmpty, |
|
| 372 |
+ |
|
| 351 | 373 |
// Weixin Function |
| 352 | 374 |
isOpenInWeixin: isOpenInWeixin, |
| 353 | 375 |
getWeixinVersion: getWeixinVersion, |