Skip to content

S
sunac-quanmin
Commit 7d169742 by html5-李恒逸
Options

Fix bugs

parent 6c721391
Showing with 69 additions and 80 deletions
html/application/views/admin/channel/customerExport.php
...@@ -45,13 +45,9 @@ ...@@ -45,13 +45,9 @@
<option <?php if(isset($status) && $status == 0):?> selected ="selected" <?php endif;?> value="0">已推荐</option> <option <?php if(isset($status) && $status == 0):?> selected ="selected" <?php endif;?> value="0">已推荐</option>
<option <?php if(isset($status) && $status == 1):?> selected ="selected" <?php endif;?> value="1">已分配</option> <option <?php if(isset($status) && $status == 1):?> selected ="selected" <?php endif;?> value="1">已分配</option>
<option <?php if(isset($status) && $status == 2):?> selected ="selected" <?php endif;?> value="2">到访看房</option> <option <?php if(isset($status) && $status == 2):?> selected ="selected" <?php endif;?> value="2">到访看房</option>
<option <?php if(isset($status) && $status == 3):?> selected ="selected" <?php endif;?> value="3">签订合同</option> <option <?php if(isset($status) && $status == 3):?> selected ="selected" <?php endif;?> value="3">认购</option>
<option <?php if(isset($status) && $status == 4):?> selected ="selected" <?php endif;?> value="4">支付房款</option> <option <?php if(isset($status) && $status == 4):?> selected ="selected" <?php endif;?> value="4">签约</option>
<option <?php if(isset($status) && $status == 5):?> selected ="selected" <?php endif;?> value="5">支付佣金</option>
<option <?php if(isset($status) && $status == 6):?> selected ="selected" <?php endif;?> value="6">完成</option>
<option <?php if(isset($status) && $status == 7):?> selected ="selected" <?php endif;?> value="7">认购</option>
<option <?php if(isset($status) && $status == 8):?> selected ="selected" <?php endif;?> value="8">已过期</option> <option <?php if(isset($status) && $status == 8):?> selected ="selected" <?php endif;?> value="8">已过期</option>
<option <?php if(isset($status) && $status == 9):?> selected ="selected" <?php endif;?> value="9">可结俑</option>
</select> </select>
渠道： 渠道：
<select class="form-control input-inline" name="channel_id" id="channel_id"> <select class="form-control input-inline" name="channel_id" id="channel_id">
......
html/application/views/admin/channel/customerSearch.php
...@@ -2,33 +2,33 @@ ...@@ -2,33 +2,33 @@
<div class="clearfix"> </div> <div class="clearfix"> </div>
<!-- BEGIN CONTAINER --> <!-- BEGIN CONTAINER -->
<div class="page-container"> <div class="page-container">
<!-- BEGIN SIDEBAR --> <!-- BEGIN SIDEBAR -->
<?php $this->load->view('admin/leftbar');?> <?php $this->load->view('admin/leftbar');?>
<!-- END SIDEBAR --> <!-- END SIDEBAR -->
<!-- BEGIN CONTENT --> <!-- BEGIN CONTENT -->
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="page-content"> <div class="page-content">
<!-- BEGIN PAGE HEADER--> <!-- BEGIN PAGE HEADER-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PAGE TITLE & BREADCRUMB--> <!-- BEGIN PAGE TITLE & BREADCRUMB-->
<ul class="page-breadcrumb breadcrumb"> <ul class="page-breadcrumb breadcrumb">
<li> <i class="fa fa-home"></i> <a href="<?php site_url('admin/index')?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li> <li> <i class="fa fa-home"></i> <a href="<?php site_url('admin/index')?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li>
<li> 渠道管理 <i class="fa fa-angle-right"></i> </li> <li> 渠道管理 <i class="fa fa-angle-right"></i> </li>
<li> 客户查看 </li> <li> 客户查看 </li>
</ul> </ul>
<!-- END PAGE TITLE & BREADCRUMB--> <!-- END PAGE TITLE & BREADCRUMB-->
</div> </div>
</div> </div>
<!-- END PAGE HEADER--> <!-- END PAGE HEADER-->
<!-- BEGIN PAGE CONTENT--> <!-- BEGIN PAGE CONTENT-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN EXAMPLE TABLE PORTLET--> <!-- BEGIN EXAMPLE TABLE PORTLET-->
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <i class="fa fa-globe"></i>客户明细列表 </div> <div class="caption"> <i class="fa fa-globe"></i>客户明细列表 </div>
...@@ -42,16 +42,12 @@ ...@@ -42,16 +42,12 @@
状态： 状态：
<select class="form-control input-inline" name="status" id="status"> <select class="form-control input-inline" name="status" id="status">
<option value="">--请选择</option> <option value="">--请选择</option>
<option <?php if(isset($status) && $status == 0):?> selected ="selected" <?php endif;?> value="0">已推荐</option> <option <?php if(isset($status) && $status == 0):?> selected ="selected" <?php endif;?> value="0">已推荐</option>
<option <?php if(isset($status) && $status == 1):?> selected ="selected" <?php endif;?> value="1">已分配</option> <option <?php if(isset($status) && $status == 1):?> selected ="selected" <?php endif;?> value="1">已分配</option>
<option <?php if(isset($status) && $status == 2):?> selected ="selected" <?php endif;?> value="2">到访看房</option> <option <?php if(isset($status) && $status == 2):?> selected ="selected" <?php endif;?> value="2">到访看房</option>
<option <?php if(isset($status) && $status == 3):?> selected ="selected" <?php endif;?> value="3">签订合同</option> <option <?php if(isset($status) && $status == 3):?> selected ="selected" <?php endif;?> value="3">认购</option>
<option <?php if(isset($status) && $status == 4):?> selected ="selected" <?php endif;?> value="4">支付房款</option> <option <?php if(isset($status) && $status == 4):?> selected ="selected" <?php endif;?> value="4">签约</option>
<option <?php if(isset($status) && $status == 5):?> selected ="selected" <?php endif;?> value="5">支付佣金</option>
<option <?php if(isset($status) && $status == 6):?> selected ="selected" <?php endif;?> value="6">完成</option>
<option <?php if(isset($status) && $status == 7):?> selected ="selected" <?php endif;?> value="7">认购</option>
<option <?php if(isset($status) && $status == 8):?> selected ="selected" <?php endif;?> value="8">已过期</option> <option <?php if(isset($status) && $status == 8):?> selected ="selected" <?php endif;?> value="8">已过期</option>
<option <?php if(isset($status) && $status == 9):?> selected ="selected" <?php endif;?> value="9">可结俑</option>
</select> </select>
渠道： 渠道：
<select class="form-control input-inline" name="channel_id" id="channel_id"> <select class="form-control input-inline" name="channel_id" id="channel_id">
...@@ -70,7 +66,7 @@ ...@@ -70,7 +66,7 @@
?> ?>
</select> </select>
项目： 项目：
<input type="text" class="form-control input-inline input-small" name="building_title" id="building_title" <?php if(isset($building_title) && !empty($building_title)):?>value="<?php echo $building_title;?>"<?php endif;?>> <input type="text" class="form-control input-inline input-small" name="building_title" id="building_title" <?php if(isset($building_title) && !empty($building_title)):?>value="<?php echo $building_title;?>"<?php endif;?>>
时间： 时间：
<select class="form-control input-inline" name="time" id="time"> <select class="form-control input-inline" name="time" id="time">
<option value="">全部</option> <option value="">全部</option>
...@@ -78,9 +74,9 @@ ...@@ -78,9 +74,9 @@
<option <?php if(isset($saixuan) && $saixuan == '月度'):?> selected ="selected" <?php endif;?> value="月度">月度</option> <option <?php if(isset($saixuan) && $saixuan == '月度'):?> selected ="selected" <?php endif;?> value="月度">月度</option>
<option <?php if(isset($saixuan) && $saixuan == '季度'):?> selected ="selected" <?php endif;?> value="季度">季度</option> <option <?php if(isset($saixuan) && $saixuan == '季度'):?> selected ="selected" <?php endif;?> value="季度">季度</option>
<option <?php if(isset($saixuan) && $saixuan == '年度'):?> selected ="selected" <?php endif;?> value="年度">年度</option> <option <?php if(isset($saixuan) && $saixuan == '年度'):?> selected ="selected" <?php endif;?> value="年度">年度</option>
</select> </select>
<button type="submit" class="btn blue" id="search">搜索</button> <button type="submit" class="btn blue" id="search">搜索</button>
<input type="reset" class="btn red" name="button2" id="emptyvalue" value="清空"> <input type="reset" class="btn red" name="button2" id="emptyvalue" value="清空">
...@@ -114,7 +110,7 @@ ...@@ -114,7 +110,7 @@
<td><?php echo $customer['id'];?></td> <td><?php echo $customer['id'];?></td>
<td><?php echo $customer['customer_user'];?></td> <td><?php echo $customer['customer_user'];?></td>
<td><?php echo $customer['customer_mobile']?></td> <td><?php echo $customer['customer_mobile']?></td>
<td><?php <td><?php
if($customer['customer_type']==0){ if($customer['customer_type']==0){
echo '新客户'; echo '新客户';
}else if($customer['customer_type']==1){ }else if($customer['customer_type']==1){
...@@ -126,7 +122,7 @@ ...@@ -126,7 +122,7 @@
} }
?></td> ?></td>
<td><?php echo date('Y-m-d h:i',$customer['create_time']);?></td> <td><?php echo date('Y-m-d h:i',$customer['create_time']);?></td>
<td><?php <td><?php
if($customer['recommend_status']==0){ if($customer['recommend_status']==0){
echo '已推荐'; echo '已推荐';
}else if($customer['recommend_status']==1){ }else if($customer['recommend_status']==1){
...@@ -188,38 +184,38 @@ ...@@ -188,38 +184,38 @@
<?php endif;?> <?php endif;?>
</div> </div>
</div> </div>
<!-- END EXAMPLE TABLE PORTLET--> <!-- END EXAMPLE TABLE PORTLET-->
</div> </div>
</div> </div>
<!-- END PAGE CONTENT--> <!-- END PAGE CONTENT-->
</div> </div>
</div> </div>
<!-- END CONTENT --> <!-- END CONTENT -->
</div> </div>
<!-- END CONTAINER --> <!-- END CONTAINER -->
<!-- BEGIN FOOTER --> <!-- BEGIN FOOTER -->
<?php $this->load->view('admin/footer');?> <?php $this->load->view('admin/footer');?>
<!-- BEGIN PAGE LEVEL PLUGINS --> <!-- BEGIN PAGE LEVEL PLUGINS -->
<link rel="stylesheet" href="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.css"/> <link rel="stylesheet" href="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/css/datepicker.css"/> <link rel="stylesheet" type="text/css" href="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/css/datepicker.css"/>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS --> <!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS --> <!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script> <script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
App.init(); App.init();
}); });
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
$(function (){ $(function (){
$("#export").click(function(){ $("#export").click(function(){
var channel_name = $("#channel_name").val(); var channel_name = $("#channel_name").val();
var building_id = $("#building_id").val(); var building_id = $("#building_id").val();
location.href = "<?php echo site_url('admin/statistics/export_actions')?>?tag_name=customer_info&city_code=" location.href = "<?php echo site_url('admin/statistics/export_actions')?>?tag_name=customer_info&city_code="
+ city_code + "&building_id=" + city_code + "&building_id="
+ building_id; + building_id;
}); });
...@@ -234,7 +230,7 @@ ...@@ -234,7 +230,7 @@
}); });
</script> </script>
</body><!-- END BODY --> </body><!-- END BODY -->
</html> </html>
\ No newline at end of file
html/application/views/admin/index.php
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
楼盘 楼盘
</div> </div>
</div> </div>
<a class="more" href="<?php echo site_url('admin/buildingadmin');?>"> <!-- <a class="more" href="<?php echo site_url('admin/buildingadmin');?>">
更多 <i class="m-icon-swapright m-icon-white"></i> 更多 <i class="m-icon-swapright m-icon-white"></i>
</a> </a> -->
</div> </div>
</div> </div>
<div class="col-lg-4 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
已签约客户 已签约客户
</div> </div>
</div> </div>
<a class="more" href="<?php echo site_url('admin/report/index');?>"> <!-- <a class="more" href="<?php echo site_url('admin/report/index');?>">
更多<i class="m-icon-swapright m-icon-white"></i> 更多<i class="m-icon-swapright m-icon-white"></i>
</a> </a> -->
</div> </div>
</div> </div>
</div> </div>
......
html/application/views/channel/index.php
...@@ -787,7 +787,7 @@ ...@@ -787,7 +787,7 @@
postdata.channel_id=choose_channel; postdata.channel_id=choose_channel;
} }
postdata.num=1; postdata.num=1;
resetSelector(); //resetSelector();
_loading = true; _loading = true;
postdata.is_search = 1; //是否搜索，后台使用 postdata.is_search = 1; //是否搜索，后台使用
async_getlist_pullup(); async_getlist_pullup();
......
html/application/views/distributor/customer/list.php
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<body> <body>
<style> <style>
#pullDown .pullDownIcon, #pullUp .pullUpIcon { #pullDown .pullDownIcon, #pullUp .pullUpIcon {
display:block; display:block;
width:30px; height:30px; width:30px; height:30px;
background:url(<?php echo APPLICATION_PATH ?>/assets/css/images/rc_loading.jpg) 0 0 no-repeat; background:url(<?php echo APPLICATION_PATH ?>/assets/css/images/rc_loading.jpg) 0 0 no-repeat;
-webkit-background-size:30px 60px; -webkit-background-size:30px 60px;
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
-webkit-transition-property:-webkit-transform; -webkit-transition-property:-webkit-transform;
-webkit-transition-duration:250ms; -webkit-transition-duration:250ms;
margin:0 auto; margin:0 auto;
} }
#pullDown .pullDownIcon { #pullDown .pullDownIcon {
-webkit-transform:rotate(0deg) translateZ(0); -webkit-transform:rotate(0deg) translateZ(0);
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<div class="rc-search-box"> <div class="rc-search-box">
<div class="search-back"></div> <div class="search-back"></div>
<div class="left box-left"> <div class="left box-left">
<div class="left search-input"> <div class="left search-input">
<input type="text" name="search_field" class="search_field" placeholder="请输入手机号或姓名"> <input type="text" name="search_field" class="search_field" placeholder="请输入手机号或姓名">
</div> </div>
<div class="clearf"></div> <div class="clearf"></div>
...@@ -120,9 +120,9 @@ ...@@ -120,9 +120,9 @@
</ul> </ul>
<div class="clearf"></div> <div class="clearf"></div>
</div> </div>
</div> </div>
<!--客户--> <!--客户-->
<div class="rc-keeping-client" id="wrapper" style="position:absolute;left:0;top:40px;bottom:0;width:100%;background:#fff;"> <div class="rc-keeping-client" id="wrapper" style="position:absolute;left:0;top:40px;bottom:0;width:100%;background:#fff;">
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<span class="client-site"><?php echo $val['building_title'] ?></span> <span class="client-site"><?php echo $val['building_title'] ?></span>
<?php if($val['tips']) { <?php if($val['tips']) {
echo '<span class="tips">即将过期</span>'; echo '<span class="tips">即将过期</span>';
} ?> } ?>
</div> </div>
<div class="client-ren">推荐人：<?php echo $val['user_name'] ?></div> <div class="client-ren">推荐人：<?php echo $val['user_name'] ?></div>
<!--添加 curr 为选中状态--> <!--添加 curr 为选中状态-->
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</div> </div>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/js/rc.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/js/rc.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//获取当前选中的状态栏 //获取当前选中的状态栏
$('.curr').removeClass('curr'); $('.curr').removeClass('curr');
...@@ -215,9 +215,9 @@ ...@@ -215,9 +215,9 @@
var history_list=JSON.parse(localStorage.getItem('history_list')); var history_list=JSON.parse(localStorage.getItem('history_list'));
if(scontent==''){ if(scontent==''){
return false; return false;
} }
if(!history_list) history_list=new Array(); if(!history_list) history_list=new Array();
//解决搜索客户的历史记录重复问题，edit by lihengyi //解决搜索客户的历史记录重复问题，edit by lihengyi
var is_exist=false; var is_exist=false;
for(var i=0;i<history_list.length;i++){ for(var i=0;i<history_list.length;i++){
if(history_list[i].content==scontent){ if(history_list[i].content==scontent){
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
if(!is_exist){ if(!is_exist){
history_list.push({ history_list.push({
'content':scontent 'content':scontent
}); });
} }
if(history_list.length>5){ if(history_list.length>5){
history_list.splice(0,1); history_list.splice(0,1);
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
for(var i=history_list.length-1;i>-1;i--){ for(var i=history_list.length-1;i>-1;i--){
var htmls="<li class='list-his'>"+history_list[i].content+"</li>"; var htmls="<li class='list-his'>"+history_list[i].content+"</li>";
$('.history-list').append(htmls); $('.history-list').append(htmls);
} }
$('.list-his').on('click',function(){ $('.list-his').on('click',function(){
var scontent=$(this).html(); var scontent=$(this).html();
console.log(scontent); console.log(scontent);
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
$('.customer_li').on('click',function(){ $('.customer_li').on('click',function(){
var ids=$(this).attr('id'); var ids=$(this).attr('id');
window.location.href="<?php echo site_url('distributor/customer/follow/"+ids+"')?>" window.location.href="<?php echo site_url('distributor/customer/follow/"+ids+"')?>"
}); });
} }
bindClick(); bindClick();
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
dataType:'json', dataType:'json',
data:postdata, data:postdata,
success:function(data){ success:function(data){
//console.log(num); //console.log(num);
setTimeout(function () { setTimeout(function () {
myScroll.refresh(); myScroll.refresh();
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
}, 1000); }, 1000);
console.log("CHANDU"+data.data.length); console.log("CHANDU"+data.data.length);
var html=''; var html='';
for(var i=data.data.length-1;i>-1;i--){ for(var i=0;i<data.data.length;i++){
html+='<li class="customer_li" id='+data.data[i].cbid+'><div>'+data.data[i].customer_user+'</div><div class="client-mid"><span class="client-phone">'+data.data[i].customer_mobile+'</span><span class="client-site">'+data.data[i].building_title+'</span>'+(data.data[i].tips == 1 ? '<span class="tips">即将过期</span>' : '') +'</div><div class="client-ren">推荐人：'+data.data[i].user_name+'</div><!--添加 curr 为选中状态--><div class="cli-check curr" style="display: none;"></div> </li>'; html+='<li class="customer_li" id='+data.data[i].cbid+'><div>'+data.data[i].customer_user+'</div><div class="client-mid"><span class="client-phone">'+data.data[i].customer_mobile+'</span><span class="client-site">'+data.data[i].building_title+'</span>'+(data.data[i].tips == 1 ? '<span class="tips">即将过期</span>' : '') +'</div><div class="client-ren">推荐人：'+data.data[i].user_name+'</div><!--添加 curr 为选中状态--><div class="cli-check curr" style="display: none;"></div> </li>';
} }
console.log(html); console.log(html);
...@@ -355,18 +355,18 @@ ...@@ -355,18 +355,18 @@
if(data.data==false){ if(data.data==false){
num--; num--;
// setTimeout(function () { // setTimeout(function () {
// //
// $("#pullUp").css("display","none"); // $("#pullUp").css("display","none");
// }, 600); // }, 600);
//$("#pullUp").css("display","none"); //$("#pullUp").css("display","none");
return false return false
} }
setTimeout(function () { setTimeout(function () {
myScroll.refresh(); myScroll.refresh();
$("#pullUp").css("display","none"); $("#pullUp").css("display","none");
}, 600); }, 600);
var html=''; var html='';
for(var i=0;i<data.data.length;i++){ for(var i=0;i<data.data.length;i++){
html+='<li class="customer_li" id='+data.data[i].cbid+'><div>'+data.data[i].customer_user+'</div><div class="client-mid"><span class="client-phone">'+data.data[i].customer_mobile+'</span><span class="client-site">'+data.data[i].building_title+'</span>'+(data.data[i].tips == 1 ? '<span class="tips">即将过期</span>' : '') +'</div><div class="client-ren">推荐人：'+data.data[i].user_name+'</div><!--添加 curr 为选中状态--><div class="cli-check curr" style="display: none;"></div> </li>' html+='<li class="customer_li" id='+data.data[i].cbid+'><div>'+data.data[i].customer_user+'</div><div class="client-mid"><span class="client-phone">'+data.data[i].customer_mobile+'</span><span class="client-site">'+data.data[i].building_title+'</span>'+(data.data[i].tips == 1 ? '<span class="tips">即将过期</span>' : '') +'</div><div class="client-ren">推荐人：'+data.data[i].user_name+'</div><!--添加 curr 为选中状态--><div class="cli-check curr" style="display: none;"></div> </li>'
...@@ -378,16 +378,16 @@ ...@@ -378,16 +378,16 @@
}); });
} }
//初始化绑定iScroll控件 //初始化绑定iScroll控件
document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false); document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
document.addEventListener('DOMContentLoaded', loaded, false); document.addEventListener('DOMContentLoaded', loaded, false);
function loaded() { function loaded() {
pullDownEl = document.getElementById('pullDown'); pullDownEl = document.getElementById('pullDown');
pullDownOffset = pullDownEl.offsetHeight; pullDownOffset = pullDownEl.offsetHeight;
pullUpEl = document.getElementById('pullUp'); pullUpEl = document.getElementById('pullUp');
pullUpOffset = pullUpEl.offsetHeight; pullUpOffset = pullUpEl.offsetHeight;
/** /**
* 初始化iScroll控件 * 初始化iScroll控件
*/ */
...@@ -397,11 +397,11 @@ ...@@ -397,11 +397,11 @@
onRefresh : function () { onRefresh : function () {
if (pullDownEl.className.match('loading')) { if (pullDownEl.className.match('loading')) {
pullDownEl.className = ''; pullDownEl.className = '';
//pullDownEl.querySelector('.pullDownLabel').innerHTML = '下拉刷新...'; //pullDownEl.querySelector('.pullDownLabel').innerHTML = '下拉刷新...';
} else if (pullUpEl.className.match('loading')) { } else if (pullUpEl.className.match('loading')) {
pullUpEl.className = ''; pullUpEl.className = '';
//pullUpEl.querySelector('.pullUpLabel').innerHTML = '上拉加载更多...'; //pullUpEl.querySelector('.pullUpLabel').innerHTML = '上拉加载更多...';
} }
}, },
...@@ -421,15 +421,15 @@ ...@@ -421,15 +421,15 @@
onScrollEnd: function () { onScrollEnd: function () {
if (pullDownEl.className.match('flip')) { if (pullDownEl.className.match('flip')) {
pullDownEl.className = 'loading'; pullDownEl.className = 'loading';
//pullDownEl.querySelector('.pullDownLabel').innerHTML = '加载中...'; //pullDownEl.querySelector('.pullDownLabel').innerHTML = '加载中...';
pullDownAction(); pullDownAction();
} else if (pullUpEl.className.match('flip')) { } else if (pullUpEl.className.match('flip')) {
pullUpEl.className = 'loading'; pullUpEl.className = 'loading';
//pullUpEl.querySelector('.pullUpLabel').innerHTML = '加载中...'; //pullUpEl.querySelector('.pullUpLabel').innerHTML = '加载中...';
pullUpAction(); pullUpAction();
} }
} }
}); });
} }
</script> </script>
<?php $this->load->view('distributor/footer') ?> <?php $this->load->view('distributor/footer') ?>
\ No newline at end of file
html/system/database/DB_driver.php
...@@ -298,7 +298,7 @@ class CI_DB_driver { ...@@ -298,7 +298,7 @@ class CI_DB_driver {
fwrite($f, "\r\n" . date('Y-m-d H:i:s') . "\r\n" . $sql . "\r\n"); fwrite($f, "\r\n" . date('Y-m-d H:i:s') . "\r\n" . $sql . "\r\n");
fclose($f); fclose($f);
} }
// Start the Query Timer // Start the Query Timer
$time_start = list($sm, $ss) = explode(' ', microtime()); $time_start = list($sm, $ss) = explode(' ', microtime());
...@@ -1414,4 +1414,4 @@ class CI_DB_driver { ...@@ -1414,4 +1414,4 @@ class CI_DB_driver {
} }
/* End of file DB_driver.php */ /* End of file DB_driver.php */
/* Location: ./system/database/DB_driver.php */ /* Location: ./system/database/DB_driver.php */
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment