Skip to content

Commit

Permalink
updata
Browse files Browse the repository at this point in the history
  • Loading branch information
[cai.bowen] committed Sep 25, 2018
1 parent 6319a57 commit 8e4474c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 26 deletions.
6 changes: 3 additions & 3 deletions js/fix.js
Expand Up @@ -14,7 +14,7 @@ var app_config = {
]
}

Array.prototype.distinct = function() {
Array.prototype._distinct = function() {
var arr = this,
result = [],
_result = [],
Expand All @@ -34,14 +34,14 @@ Array.prototype.distinct = function() {
};

function link(cssAr, type) {
var cssAr = type ? cssAr.distinct() : app_config.cssAr.concat(cssAr || []).distinct();
var cssAr = type ? cssAr._distinct() : app_config.cssAr.concat(cssAr || [])._distinct();
for(var i = 0; i < cssAr.length; i++) {
document.write('<link rel="stylesheet" href="' + cssAr[i] + '?version=' + app_config.version + '"/>');
}
}

function script(jsAr, type) {
var jsAr = type ? jsAr.distinct() : app_config.jsAr.concat(jsAr || []).distinct();
var jsAr = type ? jsAr._distinct() : app_config.jsAr.concat(jsAr || [])._distinct();
for(var i = 0; i < jsAr.length; i++) {
document.write('<script src="' + jsAr[i] + '?version=' + app_config.version + ' type="text/javascript" charset="utf-8"><\/script>');
}
Expand Down
21 changes: 0 additions & 21 deletions js/main.js
Expand Up @@ -14,19 +14,10 @@ var subPageStyle = {
var self, pkbtn_def, pkbtn_activity, defstyle, deftxt, activetxt, activestyle, activeTab, targetTab, firstPage, tabindex;
mui.plusReady(function() {
self = plus.webview.currentWebview();
// self.onloaded=function(e){
// alert('Loaded!');
// };
storage.init();
plus.navigator.setStatusBarBackground('#fff');
plus.navigator.setStatusBarStyle('dark');

//启动页关闭以后才有loading动画
// if(!closeLoad) {
// plus.nativeUI.showWaiting();
// closeLoad = true;
// }

for(var i = 0; i < subPages.length; i++) {
var sub = plus.webview.create(subPages[i], subPages[i], subPageStyle);
if(i == 0) {
Expand All @@ -36,12 +27,6 @@ mui.plusReady(function() {
}
plus.webview.show(subPages[0]);

// firstPage.addEventListener("loaded", function() {
// if(closeLoad) { //首页加载完毕,关闭等待
// plus.nativeUI.closeWaiting();
// }
// }, false);

//底部切換
activeTab = "index/home.html";
mui('.mui-bar-tab').on('tap', 'a', function(e) {
Expand Down Expand Up @@ -77,12 +62,6 @@ mui.plusReady(function() {
showPop = true
})

//1分钟刷新一次位置
setTimeout(function() {
storageLocation.timeRefresh(0);
}, 3000);
storageLocation.timeRefresh(1 * 60 * 1000);

//首页返回键处理 逻辑:1秒内,连续两次按返回键,则退出应用;
var first = null;
mui.back = function() {
Expand Down
2 changes: 1 addition & 1 deletion js/popShare.js
@@ -1,4 +1,4 @@
mui.init()
mui.init();

mui.plusReady(function() {
log('popshare mplusready');
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Expand Up @@ -4,7 +4,7 @@
"iPhone",
"iPad"
],
"id": "H519FB37C",/*应用的标识,创建应用时自动生成,勿手动修改*/
"id": "H59E518A2",/*应用的标识,创建应用时自动生成,勿手动修改*/
"name": "kidApp",/*应用名称,程序桌面图标名称*/
"version": {
"name": "1.0.0",/*应用版本名称*/
Expand Down

0 comments on commit 8e4474c

Please sign in to comment.