From eeb0546f66c233f7e5d24c018fda7227a80c391b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 21 十二月 2018 10:38:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/ele-param2.html | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 70fe2da..69c72b5 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -69,7 +69,7 @@
.abs{
position: fixed;
width:100%;
- height:4.5em;
+ height:8em;
overflow: hidden;
z-index:999;
}
@@ -78,7 +78,7 @@
}
.mt7{
- margin-top:7em;
+ margin-top:8em;
}
</style>
</head>
@@ -127,7 +127,7 @@
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
- <li><a href="index.html" id="cancel" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">棣栭〉</a></li>
+ <li><a href="index.html" id="cancel" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-delete" data-position-to="window" data-icon="home" data-role="button">棣栭〉</a></li>
<li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">鏂板缓</a></li>
</ul>
</div>
@@ -241,8 +241,8 @@
- // 鏈烘埧瀹氫綅闈㈡澘
- $('#homeLocation').on('click', function() {
+ //
+ $('#homeLocation').off('click').on('click.cjj', function() {
var homeInfo = $(this).data('homeInfo');
console.warn(homeInfo);
searchBattLife();
@@ -295,11 +295,12 @@
function setcookieCreat(index){
var arrcookie = new Array();
for(var i=0;i<33;i++){//鍏�33椤�
- var value = Math.floor(33*index);
- console.info(value);
+ var value = Math.floor(arrTh.length*index);
+ //console.info(value)
+ console.warn(value);
value = Math.floor(value+i);
if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
- var groupid = Math.floor(arrTd[value]+1);
+ var groupid = Math.floor(arrTd[value]);
console.info(groupid);
arrcookie.push(groupid);
}else{
@@ -408,11 +409,11 @@
function setcookieedit(index){
var arrcookie = new Array();
for(var i=0;i<33;i++){//鍏�33椤�
- var value = Math.floor(33*index);
+ var value = Math.floor(arrTh.length*index);
console.info(value);
value = Math.floor(value+i);
if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
- var groupid = Math.floor(arrTd[value]+1);
+ var groupid = Math.floor(arrTd[value]);
console.info(groupid);
arrcookie.push(groupid);
}else{
--
Gitblit v1.9.1