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 36 additions and 35 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
...@@ -12,7 +12,7 @@ class Myself extends CI_Controller{ ...@@ -12,7 +12,7 @@ class Myself extends CI_Controller{
parent::__construct(); parent::__construct();
//加载用户语言 //加载用户语言
$this->language = $this->input->cookie('lang') ? $this->input->cookie('lang') : $this->config->item('language'); $this->language = $this->input->cookie('lang') ? $this->input->cookie('lang') : $this->config->item('language');
//加载配置文件 //加载配置文件
$this->config->load('user_config',true); $this->config->load('user_config',true);
$this->lang->load('error',$this->language); $this->lang->load('error',$this->language);
...@@ -151,10 +151,10 @@ class Myself extends CI_Controller{ ...@@ -151,10 +151,10 @@ class Myself extends CI_Controller{
'user_mobile'=>$post['mobile'], 'user_mobile'=>$post['mobile'],
'user_type' => 6 'user_type' => 6
); );
$get_user = $this->user->get_use_mobile($use); $get_user = $this->user->get_use_mobile($use);
$where=array('id'=>$this->user_id); $where=array('id'=>$this->user_id);
if($get_user&&$get_user['check_status']!=4){ if($get_user&&$get_user['check_status']!=4){
$result=array('errcode'=>42123,'errmsg'=>'输入手机号码已存在'); $result=array('errcode'=>42123,'errmsg'=>'输入手机号码已存在');
...@@ -162,16 +162,18 @@ class Myself extends CI_Controller{ ...@@ -162,16 +162,18 @@ class Myself extends CI_Controller{
return ; return ;
} }
$check=$this->user->update($where,$cur_info); $check=$this->user->update($where,$cur_info);
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'=>'修改失败,请稍候再试');
echo json_encode($result); echo json_encode($result);
return ; return ;
} }
} }
\ No newline at end of file
html/application/controllers/distributor/sign.php
...@@ -17,18 +17,18 @@ class Sign extends CI_Controller{ ...@@ -17,18 +17,18 @@ class Sign extends CI_Controller{
parent::__construct(); parent::__construct();
//加载用户语言 //加载用户语言
$this->language = $this->input->cookie('lang') ? $this->input->cookie('lang') : $this->config->item('language'); $this->language = $this->input->cookie('lang') ? $this->input->cookie('lang') : $this->config->item('language');
//加载配置文件 //加载配置文件
$this->config->load('user_config',true); $this->config->load('user_config',true);
$this->lang->load('error',$this->language); $this->lang->load('error',$this->language);
$this->data['curchannel'] = ''; $this->data['curchannel'] = '';
//加载辅助函数 //加载辅助函数
$this->load->helper('util'); $this->load->helper('util');
} }
/** /**
* *
* 注册页面 * 注册页面
* @author wenhuijang * @author wenhuijang
* @version 2014-11-18 * @version 2014-11-18
...@@ -52,7 +52,7 @@ class Sign extends CI_Controller{ ...@@ -52,7 +52,7 @@ class Sign extends CI_Controller{
} }
//验证码 //验证码
//$captcha = generate_captcha($this); //$captcha = generate_captcha($this);
//seo优化 //seo优化
$this->data['params']['title'] = "合伙人_融创全民营销"; $this->data['params']['title'] = "合伙人_融创全民营销";
$this->data['params']['keywords'] = "合伙人，融创全民营销"; $this->data['params']['keywords'] = "合伙人，融创全民营销";
...@@ -62,11 +62,11 @@ class Sign extends CI_Controller{ ...@@ -62,11 +62,11 @@ class Sign extends CI_Controller{
$url = urldecode($this->input->get('back_url')); $url = urldecode($this->input->get('back_url'));
$this->data['back_url'] = $this->get_back_url($url); $this->data['back_url'] = $this->get_back_url($url);
$this->load->view('distributor/join',$this->data); $this->load->view('distributor/join',$this->data);
} }
/** /**
* *
* 用户登录 API * 用户登录 API
* @author wenhuijang * @author wenhuijang
* @version 2014-12-18 * @version 2014-12-18
...@@ -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))
...@@ -169,8 +169,8 @@ class Sign extends CI_Controller{ ...@@ -169,8 +169,8 @@ class Sign extends CI_Controller{
//加载model //加载model
$this->load->model('user_model', 'user'); $this->load->model('user_model', 'user');
$cur_user = $this->user->get_corresponding_bytype(array('user_mobile'=>$mobile,'user_type' => 6)); $cur_user = $this->user->get_corresponding_bytype(array('user_mobile'=>$mobile,'user_type' => 6));
if($cur_user['user_mobile']&&$cur_user['user_type']&&$cur_user['check_status']!=1){ if($cur_user['user_mobile']&&$cur_user['user_type']&&$cur_user['check_status']!=1){
$curr=$this->user->get(array('user_mobile' => $mobile,'user_type' => 6)); $curr=$this->user->get(array('user_mobile' => $mobile,'user_type' => 6));
if($curr['check_status']==3||$curr['check_status']==4||$curr['check_status']==2){ if($curr['check_status']==3||$curr['check_status']==4||$curr['check_status']==2){
$cur_info=array( $cur_info=array(
...@@ -185,10 +185,10 @@ class Sign extends CI_Controller{ ...@@ -185,10 +185,10 @@ class Sign extends CI_Controller{
); );
$where=array('user_mobile'=>$mobile); $where=array('user_mobile'=>$mobile);
$check=$this->user->update($where,$cur_info); $check=$this->user->update($where,$cur_info);
if($check){ if($check){
$result = array('errcode' => 0, 'errmsg' =>'注册成功', $result = array('errcode' => 0, 'errmsg' =>'注册成功',
'data' => array('redirect_url' => site_url('distributor/logindis'))); 'data' => array('redirect_url' => site_url('distributor/logindis')));
echo json_encode($result); echo json_encode($result);
return ; return ;
...@@ -224,15 +224,15 @@ class Sign extends CI_Controller{ ...@@ -224,15 +224,15 @@ class Sign extends CI_Controller{
//校验职员 //校验职员
$staff_data = rpc('get_staff_by_mobile', $param); $staff_data = rpc('get_staff_by_mobile', $param);
$is_staff_point = 0; $is_staff_point = 0;
if(!empty($staff_data) || $staff_data['head']['rspCode'] == 0) if(!empty($staff_data) || $staff_data['head']['rspCode'] == 0)
{ {
//是否为职员 //是否为职员
$staff_data['body'] = isset($staff_data['body'][0]) ? $staff_data['body'][0] : array(); $staff_data['body'] = isset($staff_data['body'][0]) ? $staff_data['body'][0] : array();
$is_staff = (isset($staff_data['body']['type']) && $staff_data['body']['type'] == '职员') $is_staff = (isset($staff_data['body']['type']) && $staff_data['body']['type'] == '职员')
&& (isset($staff_data['body']['is_leave']) && $staff_data['body']['is_leave'] == 0) && (isset($staff_data['body']['is_leave']) && $staff_data['body']['is_leave'] == 0)
&& (isset($staff_data['body']['is_seller']) && $staff_data['body']['is_seller'] != 1) ? 1 : -1; && (isset($staff_data['body']['is_seller']) && $staff_data['body']['is_seller'] != 1) ? 1 : -1;
if($is_staff == 1) if($is_staff == 1)
{ {
...@@ -244,7 +244,7 @@ class Sign extends CI_Controller{ ...@@ -244,7 +244,7 @@ class Sign extends CI_Controller{
//校验业主 //校验业主
$owner_data = rpc('get_owner_by_phone', $param); $owner_data = rpc('get_owner_by_phone', $param);
if(!empty($owner_data) || $owner_data['head']['rspCode'] == 0) if(!empty($owner_data) || $owner_data['head']['rspCode'] == 0)
{ {
$owner_data['body'] = isset($owner_data['body'][0]) ? $owner_data['body'][0] : array(); $owner_data['body'] = isset($owner_data['body'][0]) ? $owner_data['body'][0] : array();
...@@ -301,7 +301,7 @@ class Sign extends CI_Controller{ ...@@ -301,7 +301,7 @@ class Sign extends CI_Controller{
176,177,178, 176,177,178,
180,181,182,183,184,185,186,187,188,189, 180,181,182,183,184,185,186,187,188,189,
); );
$mobile = $arr[array_rand($arr)].mt_rand(1000,9999).mt_rand(1000,9999); $mobile = $arr[array_rand($arr)].mt_rand(1000,9999).mt_rand(1000,9999);
// $captcha = $this->input->post('captcha', true); // $captcha = $this->input->post('captcha', true);
$uniqueid='69814410'; $uniqueid='69814410';
...@@ -396,7 +396,7 @@ class Sign extends CI_Controller{ ...@@ -396,7 +396,7 @@ class Sign extends CI_Controller{
$where=array('user_mobile'=>$mobile); $where=array('user_mobile'=>$mobile);
$check=$this->user->update($where,$cur_info); $check=$this->user->update($where,$cur_info);
if($check){ if($check){
$result = array('errcode' => 0, 'errmsg' =>'注册成功', $result = array('errcode' => 0, 'errmsg' =>'注册成功',
'data' => array('redirect_url' => site_url('distributor/logindis'))); 'data' => array('redirect_url' => site_url('distributor/logindis')));
echo json_encode($result); echo json_encode($result);
return ; return ;
...@@ -437,8 +437,8 @@ class Sign extends CI_Controller{ ...@@ -437,8 +437,8 @@ class Sign extends CI_Controller{
{ {
//是否为职员 //是否为职员
$staff_data['body'] = isset($staff_data['body'][0]) ? $staff_data['body'][0] : array(); $staff_data['body'] = isset($staff_data['body'][0]) ? $staff_data['body'][0] : array();
$is_staff = (isset($staff_data['body']['type']) && $staff_data['body']['type'] == '职员') $is_staff = (isset($staff_data['body']['type']) && $staff_data['body']['type'] == '职员')
&& (isset($staff_data['body']['is_leave']) && $staff_data['body']['is_leave'] == 0) && (isset($staff_data['body']['is_leave']) && $staff_data['body']['is_leave'] == 0)
&& (isset($staff_data['body']['is_seller']) && $staff_data['body']['is_seller'] != 1) ? 1 : -1; && (isset($staff_data['body']['is_seller']) && $staff_data['body']['is_seller'] != 1) ? 1 : -1;
if($is_staff == 1) if($is_staff == 1)
{ {
......
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