Skip to content

S
sunac-quanmin
Commit bc28e163 by HTML5-侯张振
Options

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

parents e496463d fc5f5624
Showing with 8 additions and 6 deletions
html/application/controllers/admin/report.php
...@@ -264,7 +264,7 @@ class Report extends CI_Controller ...@@ -264,7 +264,7 @@ class Report extends CI_Controller
} }
//查看用户的报备历史 //查看用户的报备历史
public function history($customer_id) public function index_history($customer_id)
{ {
if ($customer_id) { if ($customer_id) {
$this->data['logs'] = $this->customer_building_log->get_history("TC.id = " .$customer_id); $this->data['logs'] = $this->customer_building_log->get_history("TC.id = " .$customer_id);
......
html/application/controllers/distributor/myself.php
...@@ -167,7 +167,9 @@ class Myself extends CI_Controller{ ...@@ -167,7 +167,9 @@ class Myself extends CI_Controller{
if($check){ if($check){
$this->session->sess_destroy(); $this->session->sess_destroy();
//get 获取请求登录页 //get 获取请求登录页
alert_redirect(site_url('distributor/logindis'),'修改成功'); //alert_redirect(site_url('distributor/logindis'),'修改成功');
$result=array('errcode'=>0,'errmsg'=>'修改成功');
echo json_encode($result);
return; return;
} }
$result=array('errcode'=>42155,'errmsg'=>'修改失败,请稍候再试'); $result=array('errcode'=>42155,'errmsg'=>'修改失败,请稍候再试');
......
html/application/controllers/distributor/sign.php
...@@ -94,7 +94,7 @@ class Sign extends CI_Controller{ ...@@ -94,7 +94,7 @@ class Sign extends CI_Controller{
'user_name' => '', 'user_name' => '',
'uniqid_id' => '' 'uniqid_id' => ''
); );
$this->session->set_userdata($udata); //注册时，先清空原有 // $this->session->set_userdata($udata); //注册时，先清空原有
//验证码 //验证码
if(empty($captcha)) if(empty($captcha))
......
html/application/views/admin/report/index_info.php
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
<td><?php echo $customer['agent_name'];?></td> <td><?php echo $customer['agent_name'];?></td>
<td><?php echo $customer['channel_name']; ?></td> <td><?php echo $customer['channel_name']; ?></td>
<td class="zhehang"><?php echo $customer['remark']; ?></td> <td class="zhehang"><?php echo $customer['remark']; ?></td>
<td><a href="<?php echo site_url('admin/report/history/' . $customer['customer_id']) ?>">查看</a></td> <td><a href="<?php echo site_url('admin/report/index_history/' . $customer['customer_id']) ?>">查看</a></td>
<td> <td>
<?php if ($customer['is_valid'] == 0){ ?> <?php if ($customer['is_valid'] == 0){ ?>
<i>报备无效</i> <i>报备无效</i>
......
html/application/views/distributor/building/index.php
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
<ul> <ul>
<?php foreach($buildings as $val): ?> <?php foreach($buildings as $val): ?>
<li> <li>
<!-- <div class="lou-img left"> <div class="lou-img left">
<img src="<?php echo APPLICATION_PATH ?><?php echo (isset($val['building_img']) && $val['building_img']!='')? $val['building_img']:'/assets/css/images/lou-img.png'?>"> <img src="<?php echo APPLICATION_PATH ?><?php echo (isset($val['building_img']) && $val['building_img']!='')? $val['building_img']:'/assets/css/images/lou-img.png'?>">
</div>--> </div>
<div class="lou-detail right" data-key="<?php echo $val['bid']?>"> <div class="lou-detail right" data-key="<?php echo $val['bid']?>">
<div class='detail-title'><?php echo $val['building_title']?></div> <div class='detail-title'><?php echo $val['building_title']?></div>
<div class="detail-grey1"><?php echo $val['building_addr']?></div> <div class="detail-grey1"><?php echo $val['building_addr']?></div>
......
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