diff --git a/js/car_settlement/branch_settlement_list.js b/js/car_settlement/branch_settlement_list.js index 231c9e8..f8286f6 100644 --- a/js/car_settlement/branch_settlement_list.js +++ b/js/car_settlement/branch_settlement_list.js @@ -117,8 +117,8 @@ function reloadTable(pageNum) { }, where: { encryptedData: JSON.stringify({ - startTime: $('#supName').val(), - endTime: $('#planCode').val(), + startTime: startTime, + endTime: endTime, }), }, }); diff --git a/js/welcome/data_detail_list.js b/js/welcome/data_detail_list.js index 4c2d541..8f65a80 100644 --- a/js/welcome/data_detail_list.js +++ b/js/welcome/data_detail_list.js @@ -16,7 +16,7 @@ function setParams(obj) { setFilter(objParam.type); setFilterData(objParam.type); if(objParam.type === 1 || objParam.type === 2){ - let height = $('#demo').height(); + let height = $('.tag-box').eq(0).height(); if(height > 35){ $('#open').removeAttr('style'); $('#demo button').css('margin-bottom','5px');