Merge branch 'master' of https://git.okayapps.com/lihengyi/sunac-quanmin

* 'master' of https://git.okayapps.com/lihengyi/sunac-quanmin:
  验证码更新
  验证码修改

html/application/controllers/admin/index.php

@@ -130,6 +130,7 @@ class Index extends CI_Controller{
 		
 		$captcha_type = 'small';
 		$captcha = generate_captcha($captcha_type);
+		//var_dump($captcha);die;
 		//将校验码存到session中
 		$this->session->set_userdata('captcha',$captcha['word']);
 		$this->data['image'] = $captcha['image'];

html/application/views/admin/login.php

@@ -67,7 +67,8 @@
 			</div>
 			<div class="form-group">
 				<input type="text" name="captcha" id="captcha" class="input-sm input-small" onkeypress="EnterPress()">
-				<?php  echo isset($image)?$image:'';?>
+				
+				<?php  echo isset($image)?$image:'no';?>
 			</div>
 			<div class="form-actions text-center">
 				<input type="checkbox" checked="true" name="chkRememberUsername" class="text-left" id="rmbUser">记住用户名
@@ -148,7 +149,7 @@
 	    	saveUserInfo();
 	    	$('.login-form').submit();
 	    })
-	    getCaptcha();
+	   getCaptcha();
 		$("form img").click(function (){
 			getCaptcha();
 		});