Bug fix

html/application/controllers/admin/manageradmin.php

@@ -46,7 +46,7 @@ class Manageradmin extends CI_Controller
 			$con[1] = $mobile;
 		}
 		$where = rtrim($where, ' and');
-		// echo $where;//exit;
+		// echo $where;die;
 		$this->data['con_arr'] = $con;
 
 		$count = $this->manager->get_count($where);

html/application/views/admin/channel/customerExport.php

@@ -84,8 +84,9 @@
                                     <button type="submit" class="btn blue" id="search">搜索</button>
 
 									 <input type="reset" class="btn red" name="button2" value="清空">
+                   <input type="reset" class="btn green" name="export" id="export" value="导出">
 								</form>
-								<button type="submit" class="btn green" id="export">导出</button>
+
                                 </div>
                             </div>
                             <div class="girdScroller" style="overflow:auto;">

html/application/views/admin/index.php

@@ -26,7 +26,7 @@
 					<!-- BEGIN PAGE CONTENT-->
 					<!-- BEGIN DASHBOARD STATS -->
 					<div class="row">
-						<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">
 							<div class="dashboard-stat green">
 								<div class="visual">
 									<i class="fa fa-group"></i>
@@ -43,7 +43,7 @@
 									更多<i class="m-icon-swapright m-icon-white"></i>
 								</a>
 							</div>
-						</div>
+						</div> -->
 						<div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
 							<div class="dashboard-stat yellow">
 								<div class="visual">
@@ -171,4 +171,3 @@
 	</body>
 	<!-- END BODY -->
 </html>
-		
\ No newline at end of file

html/application/views/admin/manager/index.php

@@ -69,7 +69,7 @@
 								    ?>
                                     <tr>
                                         <td><?php echo $num_start++; ?></td>
-                                        <td><?php echo $admin['id'];?></td>
+                                        <td class="s_id"><?php echo $admin['id'];?></td>
                                         <td><?php echo $admin['manager_name'];?></td>
                                         <td><?php echo $admin['manager_phone'];?></td>
                                         <td><?php echo isset($type[$admin['role_id']]['role_title']) ? $type[$admin['role_id']]['role_title'] : '';?></td>
@@ -89,7 +89,7 @@
                                     else:
                                     ?>
                                     <tr>
-                                        <td colspan="7" align="center">还没有添加管理员.</td>
+                                        <td colspan="8" align="center">还没有添加管理员.</td>
                                     </tr>
                                     <?php
                                         endif;
@@ -140,7 +140,7 @@
 				if(is_true)
 				{
 					_this = $(this);
-					var a_id = _this.parents("tr").find("td:first").text();
+					var a_id = _this.parents("tr").find(".s_id").text();
 					$.ajax({
     					type: "POST",
     					url: '<?php echo site_url("admin/manageradmin/update");?>',
@@ -148,7 +148,7 @@
     					dataType: "json",
     					success: function(res){
 							if(res.errcode == 0){
-								window.location.reload();	
+								window.location.href='<?php echo site_url("admin/manageradmin/index");?>';
 							}else{
 								alert(res.errmsg);
 							}

html/application/views/channel/index.php

@@ -78,7 +78,7 @@
         <!--添加curr为字变橙色的样式-->
         <li class="curr"><a><?php echo $username ?></a></li>
         <li><a id="reset-pwd" href="<?php echo site_url('channel/index/resetpassword') ?>">修改密码</a></li>
-        <li><a id="log-out" href="<?php echo site_url('channel/login/logout') ?>">退出登录</a></li>
+        <li><a id="log-out" >退出登录</a></li>
       </ul>
     </div>
     <header>
@@ -870,7 +870,9 @@
       $('#wrap_select').siblings('.rc-wrap').hide();
     });
     $('#log-out').on('click',function(){
+      if(confirm('确定要退出登录吗?')){
             window.location.href='<?php echo site_url('channel/login/logout')?>';
+      }
     });
     $('.mask-top').on('click',function(){
       $('.settings').hide();