app修改
diff --git a/www/js/mainmenu.js b/www/js/mainmenu.js
index a0e4fca..eacec44 100644
--- a/www/js/mainmenu.js
+++ b/www/js/mainmenu.js
@@ -74,12 +74,17 @@
})
})
});
+ var userid = window.localStorage.getItem("userid");
$('#qrcodeBtn1').click(function() {
- app.checkBefore(function() {
- app.checkOther(function() {
- window.location = "qrcode.html";
- })
- })
+ showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappvisitor?custid="+userid);
+ });
+
+ $('#qingjiaBtn').click(function() {
+
+ //window.location = "https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid;
+ });
+ $('#accessBtn').click(function() {
+ //window.location = "https://yy.dlsmk.cn/wisdompolice/app/doorappvisitor?custid="+userid;
});
/*$('#cardBtn').click(function() {
app.checkBefore(function() {
@@ -114,6 +119,7 @@
})*/
$("#moreFuncBtn").click(function(){
window.location = "more.html";
+ //showRet("https://yy.dlsmk.cn/wisdompolice/app/doorappindex?custid="+userid);
})
$('#usersec').click(function() {
app.checkBefore(function() {
@@ -191,7 +197,7 @@
"pageShow":true,
"autoPlay":3000,
"pageStyle":'dot',
- "loop":false,
+ "loop":true,
'dotPosition':'center',
currentPage:currentFun
});
@@ -207,12 +213,16 @@
//$("#nodata").hide();
var param = {
"pageno": 1,
+ "type":"police",
"platform":device.platform
}
V1Bills(param, function(ok, ret) {
if (ok) {
- console.log(ret)
if (ret.code == 200) {
+ console.log(ret)
+ //ret.version='1.3.9';
+ //ret.versionmsg='新版本';
+ //ret.versionurl='https://yy.dlsmk.cn/app/download/wisdompolice.apk';
app.checkVersion(ret.version,ret.minversion,ret.versionmsg,ret.versionurl);
//app.checkVersion("1.3.9","1","new func","https://shouji.baidu.com/software/26706357.html");
//$("#maingt").text(ret.t + "！")
@@ -256,6 +266,7 @@
//alert(version);
//alert(version);
if(ver>version){
+ $("#versioncheck").html('<div class="aui-dot" style="position:relative;top:0; right:0;display:inline-block;"></div>新版本'+ver);
var cum = new auiDialog({});
var confirm = cum.alert({
title: "有新的版本",
@@ -263,9 +274,12 @@
buttons: ['取消', '去更新']
}, function(ret) {
if (ret.buttonIndex == 2) {
- cordova.InAppBrowser.open(url, '_system', 'location=no,toolbar=yes,toolbarposition=top,closebuttoncaption=关闭');
+ //cordova.InAppBrowser.open(url, '_system', 'location=no,toolbar=yes,toolbarposition=top,closebuttoncaption=关闭');
+ window.open(url,"_system",'');
}
})
+ }else{
+ $("#versioncheck").html('已是最新版'+version);
}
});
},
@@ -396,6 +410,26 @@
logout:function(){
window.localStorage.removeItem("token");
window.location = "login.html";
+ },
+ verisonCheck:function(){
+ var param = {
+ "pageno": 1,
+ "type":"police",
+ "platform":device.platform
+ }
+ V1Bills(param, function(ok, ret) {
+ if (ok) {
+ if (ret.code == 200) {
+ console.log(ret)
+ //ret.version='1.3.9';
+ //ret.versionmsg='新版本';
+ //ret.versionurl='https://yy.dlsmk.cn/app/download/wisdompolice.apk';
+ app.checkVersion(ret.version,ret.minversion,ret.versionmsg,ret.versionurl);
+ } else {
+ }
+ } else {
+ }
+ })
}
};
app.initialize();
@@ -426,20 +460,17 @@
showPageTitle: true
},
backButton: {
- image: 'back.png',
- imagePressed: 'back.png',
+ wwwImage: 'img/back.png',
+ wwwImagePressed: 'img/back.png',
align: 'left',
event: 'backPressed'
},
- closeButton: {
- image: 'close.png',
- imagePressed: 'close.png',
- align: 'left',
- event: 'closePressed'
- },
backButtonCanClose: true
- }).addEventListener('closePressed', function(params){
+ }).addEventListener('backPressed', function(e) {
+ //alert('back pressed');
+ }).addEventListener('closePressed', function(e) {
+ //alert('closePressed pressed');
inAppBrowserRef.close();
- //window.location = "main.html"
- });
+ window.location = "main.html"
+ });
}