Skip to content

T
tl_estate
Commit 441571ce authored by clone's avatar clone
Browse files
Options

Merge branch 'test-v2.0-0530' of https://gitee.com/zwyjjc/tl_estate into test-v2.0-0530

parents c29b811a 3a277c99
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 528 additions and 428 deletions
application/api/controller/Member.php
View file @ 441571ce
......@@ -250,31 +250,29 @@ class Member extends Basic
if (!empty($referrer_id)) {
if ($referrer_source == 20 && ($user_data['status'] != -1)){
$insert_data['agent_id'] = $referrer_id; //客方也是经纪人
} else {
} elseif ($referrer_source == 10) {
//统计经纪人id，目前保留两级，经纪人（id）→用户1（agent_id）→用户2（agent_id）
//邀请人是一级，被邀请人是二级
//查找邀请人的信息
$referrer_user = $this->user->field('id,agent_id,referrer_id,referrer_source,source')
->where('id', $referrer_id)
->where('referrer_source', 20)
->find();
if (!empty($referrer_user) && ($referrer_user['source'] == 10)) {
//统计经纪人id，目前保留两级，经纪人（id）→用户1（agent_id）→用户2（agent_id）
$referrer_user_agent_id = $this->user
->field('id,agent_id,referrer_id')
->where('referrer_id', $referrer_user['referrer_id'])
->where('agent_id', $referrer_user['agent_id'])
->find();
if (!empty($referrer_user['id'])) {
if (empty($referrer_user_agent_id['agent_id'])) {
$insert_data['agent_id'] = $referrer_user['agent_id']; //1 级
//经纪人邀请的客户，客户再去邀请客户客方为二级
if ($referrer_user['referrer_source'] == 20) {
$insert_data['agent_id'] = $referrer_user['agent_id']; //2 级
} else {
$is_three = $this->user
->where('id', $referrer_user_agent_id['referrer_id'])
->where('agent_id', $referrer_user_agent_id['agent_id'])
->count();
if (empty($is_three)) {
//客户邀请客户客方保留2级
$referrer_user_agent_id = $this->user
->field('id,agent_id,referrer_id')
->where('referrer_id', $referrer_id)
->where('agent_id', $referrer_user['agent_id'])
->find();
if (empty($referrer_user_agent_id)) {
$insert_data['agent_id'] = $referrer_user_agent_id['agent_id']; //2 级
}
}
......@@ -410,12 +408,13 @@ class Member extends Basic
$data['msg'] = '';
if ($id) {
$restult = $this->user->field('user_nick,user_phone,create_time')
$result = $this->user->field('id,user_nick,user_phone,create_time')
->where('referrer_id',$id)
->where('status',0)
->order('create_time desc')
->select();
foreach ($restult as $k=>$v) {
$data_arr = [];
foreach ($result as $k=>$v) {
$arr = $v->getData();
$data_arr[$k]['user_nick'] = $arr['user_nick'];
$data_arr[$k]['user_phone'] = hide_customer_phone($arr['user_phone']);
......
application/api/controller/Shop.php
View file @ 441571ce
......@@ -161,6 +161,7 @@ class Shop extends Basic
*/
public function getShopDetail()
{
return $this->response("101", "请更新到新版本");
$params = $this->params;
$field = "a.id,a.management_fee,a.title,a.address,a.city,a.room_area,a.room_area2,a.business_area,a.disc,a.disccircles,
a.sales,a.slotting_fee,a.transfer_fee, a.yetai,a.room_area2,a.shangpu_type,a.is_test,a.sellingpoint,a.singn_rule,
......
application/api_broker/controller/Client.php
View file @ 441571ce
......@@ -49,22 +49,21 @@ class Client extends Basic
if ($this->request->isPost()) {
if (!empty($this->params['id'])) {
$user_agent_id = $this->user->getUserById('agent_id', $this->params['id']); //查询原始客方
//编辑
$data['start'] = $this->user->edit($this->params, $this->params['id']);
//是否修改客方
if ($this->params['agents_id'] != $this->params['ccr_id']) {
if ($this->params['agents_id'] != $user_agent_id['agent_id']) {
$agent = new AAgents();
$agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
$remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone'];
$push = new PushMessageService();
$content = "【你的客户客方被修改为{$agent_data['name']}-{$agent_data['phone']}】";
$user_agent_id = $this->user->getUserById('agent_id', $this->params['id']);
$push->pushMessageById($user_agent_id['agent_id'], '客方修改', $content);
$this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$this->params['id']);
}
//编辑
$data['start'] = $this->user->edit($this->params, $this->params['id']);
} else {
$table = new AAgents();
......
application/api_broker/controller/OrderLog.php
View file @ 441571ce
......@@ -426,9 +426,9 @@ class OrderLog extends Basic
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
// $params = array(
// "bargain_id" => 169,
// );
/* $params = array(
"bargain_id" => 469,
);*/
if (!isset($params["bargain_id"])) {
return $this->response("101", "请求参数错误");
}
......
application/api_broker/controller/Performance.php
View file @ 441571ce
......@@ -37,9 +37,9 @@ class Performance extends Basic
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
/* $params = array(
"agent_id" => 10013,
"type" => 1, //1表示个人业绩排行 2门店 3区域
/* $params = array(
"agent_id" => 80,
"type" => 3, //1表示个人业绩排行 2门店 3区域
"end_day" => "",
"start_day" =>""
);*/
......@@ -47,7 +47,7 @@ class Performance extends Basic
return $this->response("101", "请求参数错误");
}
//默认排序一周
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", strtotime("-1 day"));
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
$start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-d", strtotime("-7 day"));
$list = $this->service_->totalAgent($params["agent_id"], $params["type"], $end_day, $start_day);
//dump($list);
......
application/api_broker/extend/Basic.php
View file @ 441571ce
......@@ -134,8 +134,10 @@ class Basic extends Controller
public function verifyAgentInfo()
{
$agentModel = new AAgents();
$agentArr = $agentModel->getAgentById("id,store_id,name,phone");
if (count($agentArr) > 0 && ($agentArr["id"] != $this->agentId || $agentArr["user_phone"] != $this->agentPhone)) {
$params["status"] = 0;
$params["id"] = $this->agentId;
$agentArr = $agentModel->getAgentById("id,store_id,name,phone",$params);
if (count($agentArr) > 0 && ($agentArr["id"] != $this->agentId )) {
echo json_encode(array( "code" => "300", "msg" => "用户验证失败，重新登录！", "data" => [], "type" => "json" ));
exit;
}
......
application/api_broker/service/OrderLogService.php
View file @ 441571ce
......@@ -838,7 +838,7 @@ class OrderLogService
//分佣提成 o_partial_commission
$partialCommissionModel = new OPartialCommission();
$field = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.create_time,a.real_fee,a.charity_fund,
$field = "a.agent_id,a.role,b.name,b.phone,a.scale,a.should_commission,a.confirm_date,a.create_time,a.real_fee,a.charity_fund,
a.cash,a.practical_fee,a.service_charge";
$commissionParams["bargain_id"] = $params["bargain_id"];
$cent_commission_arr = $partialCommissionModel->getCommissionListByBargainId($field, $commissionParams);
......@@ -861,6 +861,7 @@ class OrderLogService
foreach ($item as $i => $j) {
$cent_commission[$z]["info"][$key]["real_fee"] = $j["real_fee"];
$cent_commission[$z]["info"][$key]["create_time"] = $j["create_time"];
$cent_commission[$z]["info"][$key]["confirm_date"] = $j["confirm_date"];
$cent_commission[$z]["info"][$key]["charity_fund"] = $j["charity_fund"];
$cent_commission[$z]["info"][$key]["cash"] = $j["cash"];
$cent_commission[$z]["info"][$key]["practical_fee"] = $j["practical_fee"];
......
application/api_broker/service/PerformanceService.php
View file @ 441571ce
......@@ -91,10 +91,11 @@ class PerformanceService
if ($value["store_id"] == $agent_info["store_id"] || $key < 5) {
$value["index_"] = $key + 1;
$value["is_my"] = $agent_info["store_id"];
$info = $this->agentModel->getAgentsInfoByAgentId($field, [ "agent_id" => $value["agent_id"] ]);
if (count($info) > 0) {
$value["name"] = $info[0]["name"];
$value["img"] = AGENTHEADERIMGURL . $info[0]["img"];
$info = $this->agentModel->getAgentsInfoByAgentId($field, [ "agent_id" => $value["agent_id"] ,""]);
$store_name = $this->agentModel->getStoreOrDistrict(["store_id"=>$value["store_id"],"level"=>20]);
if (count($info) > 0 ) {
$value["name"] = count($store_name) > 0 ? $store_name[0]["name"] : "---";
$value["img"] = AGENTHEADERIMGURL . $store_name[0]["img"];
$value["store_name"] = $info[0]["store_name"];
$value["district_name"] = $info[0]["district_name"];
}
......@@ -105,9 +106,10 @@ class PerformanceService
$value["index_"] = $key + 1;
$value["is_my"] = $agent_info["district_id"];
$info = $this->agentModel->getAgentsInfoByAgentId($field, [ "agent_id" => $value["agent_id"] ]);
$district_name = $this->agentModel->getStoreOrDistrict(["district_id"=>$value["district_id"],"level"=>["in","30,40"]]);
if (count($info) > 0) {
$value["name"] = $info[0]["name"];
$value["img"] = AGENTHEADERIMGURL . $info[0]["img"];
$value["name"] = count($district_name) > 0 ? $district_name[0]["name"] : "---";
$value["img"] = AGENTHEADERIMGURL . $district_name[0]["img"];
$value["store_name"] = $info[0]["store_name"];
$value["district_name"] = $info[0]["district_name"];
}
......
application/api_broker/service/PushMessageService.php
View file @ 441571ce
......@@ -103,6 +103,12 @@ class PushMessageService
$report_data = $report->getReportOrder($field, [ 'a.id' => $report_id ]);
$house_arr = [1,4,3031,3032]; //剔除测试楼盘推送
if (in_array($report_data['house_id'], $house_arr)) {
return ;
}
//查询经纪人门店和部门信息
$agent_store = $agent->verifyUser('store_id', '', ['id'=>$report_data['report_agent_id']]);
$store = new AStore();
......
application/app/view/index/share_detail.html
View file @ 441571ce
......@@ -191,11 +191,12 @@
<a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
</div>
<script src="/app/js/jquery.js"></script>
<!--<script src="/app/js/jquery.js"></script>-->
<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
<script src="/app/js/swiper.js"></script>
<script src="/app/js/app_jump.js" ></script>
<script src="/app/js/common.js" charset="utf-8"></script>
<script src="/app/js/detaila_tl.js"></script>
<script src="/app/js/detaila_tl.js?new1"></script>
<script src="/app/js/Tab_min.js" charset="utf-8"></script>
</body>
</html>
application/app_broker/view/index/customerinfo_details_new.html
View file @ 441571ce
......@@ -24,16 +24,16 @@
<header id="header">
<a class="ps-back" href="javascript:(history.length>1?history.go(-1):window.location='/');" id="back_btn"></a>
<h2 id="title"></h2>
<a class="icon-link icon-link-edit" id="edit_btn"></a>
</header>
<div class="header_seat"></div>
<div class="info-area">
<div><img src="/app/images/ic_default_headpic.png" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" id="customer_pic" /></div>
<div class="flex-center"><img src="/app/images/ic_default_headpic.png" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" id="customer_pic" /></div>
<div>
<p>客户姓名：<span id="name"></span></p>
<p>客户电话：
<a href="javascript:;" id="call_list_open_btn"><span id="customer_phone"></span><img src="/app/images/ic_tel.png" /></a>
</p>
<p><span id="name"></span><span class="edit-btn"><span id="customer_sex"></span><img src="/app/images/boy_ic@2x.png" class="sex-icon" /></p>
<p><a href="javascript:;" id="call_list_open_btn" class="flex-center"><span id="customer_phone"></span><img src="/app/images/ic_tel.png" /></a></p>
<p><span class="flex-center" id="industry_type"></span><span class="flex-center" id="price_demand"></span><span class="flex-center" id="area_demand"></span></p>
</div>
</div>
......@@ -76,11 +76,9 @@
<section class="sec-info">
<div class="info-main">
<p>客源编号：<span id="customer_code"></span></p>
<p>客户姓名：<span class="edit-btn"><span id="customer_name"></span><img class="edit-icon" src="/app/images/ic_bianji.png" /></span>
</p>
<p>性别：<span class="edit-btn"><span id="customer_sex"></span><img src="/app/images/boy_ic@2x.png" class="sex-icon" /><img class="edit-icon" src="/app/images/ic_bianji.png" /></span>
</p>
<p>客方：<span class="edit-btn"><span id="kefang"></span><img class="edit-icon" src="/app/images/ic_bianji.png" /></span>
<!--<p>客户姓名：<span class="edit-btn"><span id="customer_name"></span><img class="edit-icon" src="/app/images/ic_bianji.png" /></span></p>
<p>性别：<span class="edit-btn"><span id="customer_sex"></span><img src="/app/images/boy_ic@2x.png" class="sex-icon" /><img class="edit-icon" src="/app/images/ic_bianji.png" /></span></p>-->
<p>客方：<span><span id="kefang"></span></span>
</p>
<p>新增时间：<span id="add_time"></span></p>
</div>
......@@ -154,8 +152,8 @@
</div>
<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
<script src="/app/js/common.js?new39" charset="utf-8"></script>
<script src="/app/js/customerinfo_details_new.js?new46"></script>
<script src="/app/js/common.js?new40" charset="utf-8"></script>
<script src="/app/js/customerinfo_details_new.js?new47"></script>
</body>
......
application/index/controller/Auth.php
View file @ 441571ce
......@@ -168,10 +168,9 @@ class Auth extends Basic
}
}
//权限表list
/**
* 权限表list
*
* @param int $type
* @return array|false|\PDOStatement|string|\think\Collection|\think\Response
* @throws \think\db\exception\DataNotFoundException
......@@ -179,12 +178,9 @@ class Auth extends Basic
* @throws \think\exception\DbException
*/
public function classList($type=1){
$table=new authRule;
$menus=db('auth_rule')->select();
// exit;
$table = new authRule;
$menus = db('auth_rule')->where('status',0)->select();
$menus =$table->toFormatTree($menus,'title');
// prt($menus);
if($type==1) {
return $this->response(200, '成功', $menus);
}else{
......
application/index/controller/Finance.php
View file @ 441571ce
......@@ -13,8 +13,6 @@ use app\api_broker\service\OrderLogService;
use app\index\extend\Basic;
use app\index\untils\ExportExcelUntil;
use app\model\AAgents;
use app\model\AStore;
use app\model\OBargainLogModel;
use app\model\OBargainModel;
use app\model\ORealIncome;
use app\model\OTaxes;
......@@ -68,11 +66,12 @@ class Finance extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$fields = 'a.id,a.create_time,a.trade_type,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.commission,a.practical_fee,a.scale_fee,a.order_no,content,house_number';
$check_status = $this->params['check_status'];
$fields = 'a.id,a.create_time,a.trade_type,b.user_phone,b.user_name,d.internal_title,d.internal_address,
a.commission,a.practical_fee,a.scale_fee,a.order_no,a.order_id,content,house_number';
$where['a.father_id'] = 0;
$where['c.is_del'] = 0;
$where['a.status'] = 10;
// $where['c.is_del'] = 0;
$where['a.status'] = 11;
$order = 'e.id desc';
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
......@@ -84,7 +83,7 @@ class Finance extends Basic
}
if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
$where['a.create_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59' ] ];
$where['a.create_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
if (!empty($this->params['internal_address'])) {
......@@ -99,25 +98,20 @@ class Finance extends Basic
$where['a.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
}
switch ($this->params['check_status']) {
switch ($check_status) {
case 2 :
//成交报告列表-第二级审核
$where['e.audit_level'] = 0;
$where[]= ['EXP','e.id in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 and `status`<>3 GROUP BY bargain_id)'];
$where['e.is_del'] = 0;
$audit_level = 0;
break;
case 3 :
//成交报告列表-第三级审核
$where['e.audit_level'] = 1;
$where['e.is_del'] = 0;
$where[]= ['EXP','e.id in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 and `status`<>3 GROUP BY bargain_id)'];
$audit_level = 1;
break;
case 4 :
//成交报告列表-已结单
$where['a.account_statement'] = 1;
$where['a.status'] = 11;
$where['e.audit_level'] = 2;
$where['a.status'] = 13;
$audit_level = 2;
break;
/* case 5 :
//成交报告列表-待撤销
......@@ -130,8 +124,8 @@ class Finance extends Basic
default :
//成交报告列表-第一级审核
$order = 'a.id DESC';
$where['e.audit_level'] = ['NULL'];
$where[]= ['EXP','e.audit_level IS NULL or e.id not in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 GROUP BY bargain_id)'];
$where['a.status'] = 10;
$audit_level = -1;
}
if (!empty($this->params['status'])) {
......@@ -139,9 +133,9 @@ class Finance extends Basic
}
$bargain = new OBargainModel();
$data['data']['list'] = $bargain->getBargain($pageNo, $pageSize, $order, $fields, $where);
$data['data']['total'] = $bargain->getBargainTotal($where);
$data['data']['step'] = $this->params['check_status'];
$data['data']['list'] = $bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where, $audit_level);
$data['data']['total'] = $bargain->getBargainTotal($where, $audit_level);
$data['data']['step'] = $check_status;
return $this->response($data['code'], $data['msg'], $data['data']);
}
......@@ -324,7 +318,7 @@ class Finance extends Basic
} else {
$bargain = new OBargainModel();
$data['data'] = $bargain->addBargainCommission($this->params['id'], $this->userId, $this->params['agent_id'],
$this->params['role'], $this->params['scale_fee'], $this->params['scale']);
$this->params['role'], $this->params['scale_fee'], $this->params['scale'], 1);
if ($data['data'] == 0) {
$data['code'] = 101;
......@@ -587,7 +581,7 @@ class Finance extends Basic
$where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
}
$field = 'a.id,b.id as bargain_id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number';
$field = 'a.id,b.id as bargain_id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number,b.father_id,b.order_id';
$m_commission = new OPartialCommission();
$data['data']['list'] = $m_commission->getCommissionBargainList($pageNo, $pageSize, 'a.id desc', $field, $where);
......@@ -921,7 +915,7 @@ class Finance extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,b.agent_id';
$fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,b.agent_id,b.father_id,b.order_id';
$where['c.is_del'] = 0;
$where['b.status'] = [ 'in', 10, 11 ]; //10已提交 11审核成功
......@@ -1147,6 +1141,8 @@ class Finance extends Basic
$data['is_del'] = 1;
$data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id');
$m_bargain = new OBargainModel();
$m_bargain->updateBargainById($this->params['bargain_id'], ['status'=>10]);
$msg = '';
if ($data > 0) {
$code = 200;
......
application/index/controller/Member.php
View file @ 441571ce
......@@ -247,13 +247,16 @@ class Member extends Basic{
}
if (empty($user_data) && $params['type'] == 'add') {
$insert_data['user_nick'] = $params['realname'];
$insert_data['user_name'] = $params['realname'];
$insert_data['user_phone'] = $params['user_phone'];
$insert_data['user_pswd'] = md5(md5($params['pwd']).'+123');
$insert_data['status'] = 0;
$insert_data['create_time'] = $date;
$insert_data['update_time'] = $date;
$insert_data['agent_id'] = $params['agent_id']; //客方
$insert_data['industry_type'] = $params['industry_type']; //业态
$insert_data['price_demand'] = $params['price_demand']; //价格需求 元
$insert_data['area_demand'] = $params['area_demand']; //价格需求 元面积要求
$this->user->save($insert_data);
if ($this->user->id) {
$status = 200;
......
application/index/view/finance/account_statement.html
View file @ 441571ce
......@@ -30,6 +30,8 @@
<form id="maintable_form_search">
<span class="fore-span">提交时间:</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
<span class="fore-span" id="maintable_form_span_zhi">至</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_end_time" name="end_date" type="date">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_internal_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_shop_num" placeholder="商铺号" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_phone" placeholder="客户电话" type="text" value="">
......
application/index/view/finance/commission_total.html
View file @ 441571ce
......@@ -26,6 +26,11 @@
width: 340px;
line-height: 36px;
}
.left-btn{
float: left;
}
.right {
line-height: 36px;
......@@ -57,6 +62,9 @@
height: 500px;
overflow-y: scroll;
}
.clear{
clear: both;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -86,11 +94,14 @@
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_dealtime" name="end_date" type="date">
<select class="form-control btn4 ld-Marheight" id="deal_status">
<!--<select class="form-control btn4 ld-Marheight" id="deal_status">
<option value="-1">请选择部门</option>
<option value="10">市场一部</option>
<option value="20">市场二部</option>
</select>
</select>-->
<select name="qx-store" class="form-control btn2 ld-Marheight" id="qx-store">
<option value="" selected="selected">选择部门</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">-->
......@@ -101,10 +112,11 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_ticketTime" name="start_date" type="date">
<span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_ticketTime" name="end_date" type="date">
<div class="clear"></div>
<span class="btn btn-info btn3" id="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span>
<span class="btn btn-info btn3" id="export">导出excel</span>
<span class="btn btn-info btn3 " id="search">搜索</span>
<span class="btn btn-info btn3 " id="reset">重置</span>
<span class="btn btn-info btn3 " id="export">导出excel</span>
</form>
</td>
</tr>
......
application/index/view/finance/tax.html
View file @ 441571ce
This diff is collapsed.
application/index/view/houses/edit.html
View file @ 441571ce
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="edit" />
<input type="hidden" class="page-load" id="shop_edit" />
<!--不会有异步加载时，样式错乱的问题-->
<style type="text/css">
.form-group {
margin: 10px;
}
.input-100-width {
width: 100px!important;
}
.input-360-width {
width: 360px!important;
}
.textarea-500-width {
width: 500px!important;
}
.list-group-item>.full-width-100+.full-width-100 {
padding-top: 10px;
}
.list-group-item>.full-width-100>label {
width: 60px;
}
.list-group-item>.full-pic-area>label {
width: 120px;
}
.input-add-tel {
margin-top: 16px;
height: 20px;
}
.phone-list-container {
overflow: hidden;
width: 196px;
vertical-align: top!important;
position: relative;
}
.phone-list-container>label {
line-height: 30px;
}
.phone-list-container>input {
float: left;
}
.phone-list-container>ul {
width: 196px;
list-style: none;
padding-left: 0;
float: right;
border: 1px solid #ccc;
border-top: none;
background-color: white;
display: none;
}
.phone-list-container>ul>li:hover {
background-color: #e0e0e0;
}
.phone-list-container>img {
position: absolute;
right: 5px;
top: 7px;
width: 20px;
}
.address-relate{
cursor: pointer;
}
.address-search-head-div{
height: 88px;
overflow: hidden;
padding-left: 12%;
}
/*获取百度经纬度样式*/
/*********************************************************百度定位页面iframe引入*************************************/
#position_box {
height: 750px;
background-color: #f0f0f0;
overflow: scroll;
position: relative;
}
div.address-header-bar {
overflow: hidden;
float: left;
}
#address_city_title {
float: left;
width: 150px;
line-height: 60px;
font-size: 30px;
color: #333;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: none;
}
.crile {
float: left;
width: 570px;
overflow: hidden;
position: relative;
}
.crile>input {
line-height: 60px;
box-sizing: border-box;
padding: 0;
border-width: 1px;
width: 100%;
display: block;
border-radius: 30px;
background: #f5f5f5 url('/resource/image/search_ic.png') no-repeat 30px center;
background-size: 28px;
text-indent: 60px;
font-size: 28px;
outline: none;
}
.crile>input::-webkit-search-cancel-button {
-webkit-appearance: none;
}
img.cancel-pic {
width: 28px;
height: 28px;
position: absolute;
right: 0;
top: 0;
box-sizing: content-box;
padding: 15px;
}
#main_ul {
padding: 0 30px;
background-color: white;
font-size: 30px;
}
#main_ul>ul {
padding-left: 0;
}
#main_ul>ul>li {
cursor: pointer;
list-style: none;
}
#main_ul>ul>li+li {
border-top: 1px solid #e0e0e0;
}
#main_ul>ul>li>p:nth-of-type(1) {
color: #333;
padding: 20px 0 10px;
margin: 0;
}
#main_ul>ul>li>p:nth-of-type(2) {
color: #999;
padding-bottom: 20px;
margin: 0;
}
.loading_pic {
font-size: 20px;
text-align: center;
width: 100%;
position: absolute;
top: 150px;
display: none;
}
.loading_pic>img {
width: 120px;
display: block;
margin: 0 auto;
}
.loading_pic>p {
font-size: 20px;
color: #333;
text-align: center;
margin-top: 10px;
color: rgb(51, 51, 51);
}
.no_more {
font-size: 30px;
height: 50px;
line-height: 50px;
text-align: center;
display: none;
}
/**/
#li_dujia_area {
display: none;
}
/*上传图片预览区域*/
.img-pre-ul {
padding-left: 0;
overflow: hidden;
/*width: 100%;*/
}
.img-pre-ul>li {
list-style: no;
float: left;
width: 210px;
height: 170px;
overflow: hidden;
margin-right: 10px;
margin-top: 10px;
}
.img-pre-ul>li.pdf-pre-li {
height: 70px;
}
.img-pre-ul>li>img {
float: left;
width: 210px;
height: 140px;
object-fit: contain;
cursor: pointer;
}
.img-pre-ul>li>a {
float: left;
width: 210px;
text-align: center;
line-height: 30px;
}
.img-pre-ul>li>a.pdf-pre-a {
line-height: 20px;
word-break: break-all;
}
/*图片点击放大预览区域的样式*/
#img_mask_area {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: hidden;
z-index: 1001;
background-color: rgba(0, 0, 0, .3);
display: none;
}
#img_mask_area>img {
width: 900px;
height: 700px;
object-fit: contain;
position: absolute;
left: 50%;
top: 50%;
margin-left: -450px;
margin-top: -350px;
}
/*整个页面加载图标区域*/
#main_loading_pic{
position: fixed;
top: 50%;
left: 50%;
width: 100px;
height: 100px;
margin-left: -50px;
margin-top: -50px;
overflow: hidden;
display: none;
}
#main_loading_pic>img{
float: left;
width: 100%;
height: 100%;
}
/*房东手机号样式调整*/
.landlord-form-group{
margin-top: 0!important;
}
.input-add-tel-landlord{
margin-top: 8px!important;
}
</style>
<div id="page-content-wrapper">
<!--默认#page-content-wrapper是隐藏的-->
<div id="page-content-wrapper" style="display: none;">
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
......
application/model/AAgents.php
View file @ 441571ce
......@@ -444,6 +444,15 @@ class AAgents extends BaseModel
}
public function getStoreOrDistrict($params){
$result = Db::table($this->table)
->field("id,name,img")
->where($params)
->select();
//echo Db::table($this->table)->getLastSql();
return $result;
}
public function searchAgentsByKeyword($field, $params)
{
......
application/model/GHouses.php
View file @ 441571ce
......@@ -367,6 +367,8 @@ class GHouses extends BaseModel
//剩余商铺为0下架
if (empty($params['residue_num'])) {
$params['status'] = 2;
} else {
$params['status'] = 1;
}
if (!empty($params['landlord_phone'])) {
......@@ -888,7 +890,7 @@ class GHouses extends BaseModel
if (!empty($house_data['id'])) {
//剩余商铺为0下架
if (empty($params['residue_num'])) {
if (empty($params['residue_num']) && isset($params['residue_num'])) {
$params['status'] = 2;
} else {
$params['status'] = 1;
......
application/model/OBargainModel.php
View file @ 441571ce
This diff is collapsed.
application/model/OPartialCommission.php
View file @ 441571ce
......@@ -197,8 +197,9 @@ class OPartialCommission extends BaseModel
* @throws \think\exception\PDOException
*/
public function getBragainScale(int $bargain_id) {
$sql = 'SELECT scale,agent_id,role,substring_index(group_concat(id ORDER BY id DESC),",",1) as id
FROM o_partial_commission WHERE bargain_id = '.$bargain_id.' GROUP BY role';
$sql = 'SELECT a.bargain_id,a.scale,b.scale_fee,a.agent_id,a.role,substring_index(group_concat(a.id ORDER BY a.id DESC),",",1) AS id
FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id WHERE a.bargain_id = '.$bargain_id.'
and b.id= '.$bargain_id.' OR b.father_id='.$bargain_id.' GROUP BY role';
return $this->query($sql);
}
}
\ No newline at end of file
application/model/OTaxes.php
View file @ 441571ce
......@@ -24,8 +24,10 @@ class OTaxes extends BaseModel
*/
public function getBargainTaxes(int $bargain_id, $field = 'id as fee_id,fee,operation_date')
{
$params["bargain_id"] = $bargain_id;
$params["father_id"] = array("neq",0);
return $this->field($field)
->where('bargain_id', $bargain_id)
->where($params)
->where('is_del', 0)
->select();
}
......@@ -100,7 +102,7 @@ class OTaxes extends BaseModel
foreach ($data as $k => $v) {
$result[$k] = $v;
if (isset($v['id']) && $v['bargain_id']) {
$result[$k]['fee_list'] = $this->field('a.id as feed_id,a.fee,b.phone,b.name,a.role,a.scale')
$result[$k]['fee_list'] = $this->field('a.id as fee_id,a.fee,b.phone,b.name,a.role,a.scale')
->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->where('a.father_id', $v['id'])
......@@ -112,12 +114,15 @@ class OTaxes extends BaseModel
return $result;
}
/**
* 根据id 查询详情 zw
*
* @param int $taxesId
* @param string $field
* @return false|\PDOStatement|string|\think\Collection
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getTaxesId(int $taxesId, string $field)
{
......
application/model/TAgentTotalModel.php
View file @ 441571ce
......@@ -87,7 +87,7 @@ class TAgentTotalModel extends Model
->group($group_)
->order($order)
->select();
//echo $this->db_->getLastSql();
// echo $this->db_->getLastSql();
return $result;
}
......
application/model/Users.php
View file @ 441571ce
......@@ -46,6 +46,7 @@ class Users extends Model
$data = $this
->field($fields)
->where($param)
->order('create_time desc')
->select();
return $data;
}
......@@ -324,7 +325,7 @@ class Users extends Model
public function useraction_search_user_res($user_id, int $referrer = 0)
{
$field = 'id as user_id,agent_id,sex,user_nick,user_name,user_pic,user_status,user_phone,create_time,
referrer_source,referrer_id,registration_time,industry_type,price_demand,area_demand';
referrer_source,referrer_id,registration_time,industry_type,price_demand,area_demand,source';
$data = db('u_users')
->where('id', $user_id)
->field($field)
......@@ -446,7 +447,7 @@ class Users extends Model
//->where('create_time','< time',$Two_days_ago)//小于两天前，即排除48小时内受保护的客户
->limit($pagesize)
->page($pagenum)
->field('id as user_id,sex,user_nick,user_phone,user_status,agent_id,create_time')
->field('id as user_id,sex,user_name,user_phone,user_status,agent_id,create_time')
->select();
}
......
public/app/css/common.css
View file @ 441571ce
......@@ -31,6 +31,13 @@ textarea {
text-overflow: ellipsis;
overflow: hidden;
}
.flex-center{
display: flex;
text-align: center;
align-items: center;
justify-content: center;
}
a,a:hover,a:active,a:visited,a:link,a:focus{
-webkit-tap-highlight-color:rgba(0,0,0,0);
-webkit-tap-highlight-color: transparent;
......@@ -104,6 +111,20 @@ header .word-link{
line-height: .88rem;
}
header .icon-link{
position: absolute;
top: 0;
bottom: 0;
right: 0;
display: block;
width: .88rem;
height: .88rem;
}
header .icon-link.icon-link-edit{
background: url('/app/images/icon_bianji@2x.png') no-repeat center center/.38rem .38rem;
}
header .share-tips{
position: absolute;
top: 0;
......
public/app/css/customerinfo_details_new.css
View file @ 441571ce
......@@ -4,19 +4,19 @@ body{
display: none;
}
.info-area{
overflow: hidden;
height: 2.2rem;
/*overflow: hidden;*/
display: flex;
height: 2.5rem;
box-sizing: border-box;
background-color: white;
padding: .5rem .3rem;
/*padding: .5rem .3rem;*/
border-bottom: 1px solid #e6e6e6;
}
.info-area>div{
float: left;
display: flex;
}
.info-area>div:nth-of-type(1){
overflow: hidden;
margin-right: .3rem;
flex: 1.8rem 0 0;
}
.info-area>div:nth-of-type(1)>img{
width: 1.2rem;
......@@ -26,16 +26,27 @@ body{
float: left;
}
.info-area>div:nth-of-type(2){
display: flex;
flex-wrap: wrap;
align-content: center;
}
.info-area>div:nth-of-type(2)>p{
display: flex;
font-size: .3rem;
color: #999;
padding-top: .13rem;
flex: 100%;
}
.info-area>div:nth-of-type(2)>p:nth-of-type(1){
font-size: .4rem;
line-height: .64rem;
}
.info-area>div:nth-of-type(2)>p:nth-of-type(2){
line-height: .52rem;
}
.info-area>div:nth-of-type(2)>p>span,
.info-area>div:nth-of-type(2)>p>a{
color: #333;
/*color: #333;*/
color: #1a1a1a;
}
.info-area>div:nth-of-type(2)>p:nth-of-type(2)>a>img{
width: .3rem;
......@@ -44,6 +55,32 @@ body{
position: relative;
top: -0.03rem;
}
.info-area>div:nth-of-type(2)>p:nth-of-type(3)>span{
display: flex;
font-size: .26rem;
}
.info-area>div:nth-of-type(2)>p:nth-of-type(3)>span:nth-of-type(1){
color: #FA903F;
border: 1px solid #FA903F;
border-radius: .17rem;
height: .34rem;
width: .8rem;
padding: 0 .12rem;
}
.info-area>div:nth-of-type(2)>p:nth-of-type(3)>span:nth-of-type(2){
flex: 1.8rem 0 0;
}
.edit-btn{
display: flex;
align-items: center;
justify-content: center;
padding-left: .1rem;
}
.edit-btn>img{
width: .2rem;
height: .3rem;
}
.tab-area{
height: .9rem;
......
public/app/js/customerinfo_details_new.js
View file @ 441571ce
......@@ -71,13 +71,15 @@ function loadMain(){
if(typeof data === 'object') {
if (data.code == 200) {
$('#customer_code').html(data['data']['user_info']['user_id']);
$('#customer_name, #name').html(data['data']['user_info']['user_nick']);
$('#customer_name, #name').html(data['data']['user_info']['user_name']+(data['data']['user_info']['user_nick']?('('+data['data']['user_info']['user_nick']+')'):''));
if(data['data']['user_info']['sex']==2){
$('#customer_sex').html('女').next().attr('src','/app/images/girl_ic@2x.png');
}else{
$('#customer_sex').html('男').next().attr('src','/app/images/boy_ic@2x.png');
$('.sex-icon').attr('src','/app/images/girl_ic@2x.png');
};
$('#industry_type').html(data['data']['user_info']['industry_type']);
$('#price_demand').html(data['data']['user_info']['price_demand']+'元/月');
$('#area_demand').html(data['data']['user_info']['area_demand']+'㎡');
$('#kefang').html(data['data']['user_info']['agentinfo']);
$('#add_time').html(data['data']['user_info']['create_time']);
$('#customer_pic').attr('src',data['data']['user_info']['user_pic']);
......@@ -87,7 +89,7 @@ function loadMain(){
if(data['data']['user_info']['agent_id'] == _userId || localStorage.getItem('userlevel') != '10'){
//客方和当前登录用户一致,或者当前登录用户为店长或者总监时，才能进行编辑客户
$('.edit-icon').show();
$('.edit-btn').click(function(e){
$('#edit_btn').click(function(e){
e.preventDefault();
e.stopPropagation();
//location.href = ServerHost+'/app_broker/customerinfo_customer_add?customerId='+_customerId;
......@@ -160,13 +162,13 @@ function loadMain(){
Compatible({
paraIos: {
'route': 'baobei',
'name': data['data']['user_info']['user_nick'],
'name': data['data']['user_info']['user_name'],
'phone': data['data']['user_info']['user_phone'],
'sex': data['data']['user_info']['sex'],
'userId': data['data']['user_info']['user_id']
},
fnAndroid: function() {
window.android.onProjectReport(data['data']['user_info']['user_nick'],data['data']['user_info']['user_phone'],data['data']['user_info']['sex'],parseInt(data['data']['user_info']['user_id']));
window.android.onProjectReport(data['data']['user_info']['user_name'],data['data']['user_info']['user_phone'],data['data']['user_info']['sex'],parseInt(data['data']['user_info']['user_id']));
},
fn: function() {
console.warn('error');
......
public/app/js/detaila_tl.js
View file @ 441571ce
......@@ -16,7 +16,8 @@
url: ServerHostTempC + '/broker/getShopDetail',
data: {
'id': _shangpuId,
'site_area': _isC=='1'?1:3
// 'site_area': _isC=='1'?1:3
'site_area': 1
},
type: "GET",
dataType: "json",
......
public/appnew/src/components/reportDetails/reportDetails.vue
View file @ 441571ce
......@@ -104,7 +104,7 @@
</li>
<li class="main-sec-li-26 color li-border-bottom">
<div class='clear'>
<div class="left">确认时间{{index+1}}：{{items.create_time}}</div>
<div class="left">确认时间{{index+1}}：{{items.confirm_date}}</div>
</div>
</li>
......
public/resource/css/report_list.css
View file @ 441571ce
......@@ -15,7 +15,10 @@ addtax_
*
*
* */
/*页面主要内容table区域*/
#maintable_form_span_zhi{
margin-left: 10px;
}
/*详情弹出框*/
.detail-modal-body {
......
public/resource/css/shop_edit.css 0 → 100644
View file @ 441571ce
@charset "utf-8";
.form-group {
margin: 10px;
}
.input-100-width {
width: 100px!important;
}
.input-360-width {
width: 360px!important;
}
.textarea-500-width {
width: 500px!important;
}
.list-group-item>.full-width-100+.full-width-100 {
padding-top: 10px;
}
.list-group-item>.full-width-100>label {
width: 60px;
}
.list-group-item>.full-pic-area>label {
width: 120px;
}
.input-add-tel {
margin-top: 16px;
height: 20px;
}
.phone-list-container {
overflow: hidden;
width: 196px;
vertical-align: top!important;
position: relative;
}
.phone-list-container>label {
line-height: 30px;
}
.phone-list-container>input {
float: left;
}
.phone-list-container>ul {
width: 196px;
list-style: none;
padding-left: 0;
float: right;
border: 1px solid #ccc;
border-top: none;
background-color: white;
display: none;
}
.phone-list-container>ul>li:hover {
background-color: #e0e0e0;
}
.phone-list-container>img {
position: absolute;
right: 5px;
top: 7px;
width: 20px;
}
.address-relate{
cursor: pointer;
}
.address-search-head-div{
height: 88px;
overflow: hidden;
padding-left: 12%;
}
/*获取百度经纬度样式*/
/*********************************************************百度定位页面iframe引入*************************************/
#position_box {
height: 750px;
background-color: #f0f0f0;
overflow: scroll;
position: relative;
}
div.address-header-bar {
overflow: hidden;
float: left;
}
#address_city_title {
float: left;
width: 150px;
line-height: 60px;
font-size: 30px;
color: #333;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: none;
}
.crile {
float: left;
width: 570px;
overflow: hidden;
position: relative;
}
.crile>input {
line-height: 60px;
box-sizing: border-box;
padding: 0;
border-width: 1px;
width: 100%;
display: block;
border-radius: 30px;
background: #f5f5f5 url('/resource/image/search_ic.png') no-repeat 30px center;
background-size: 28px;
text-indent: 60px;
font-size: 28px;
outline: none;
}
.crile>input::-webkit-search-cancel-button {
-webkit-appearance: none;
}
img.cancel-pic {
width: 28px;
height: 28px;
position: absolute;
right: 0;
top: 0;
box-sizing: content-box;
padding: 15px;
}
#main_ul {
padding: 0 30px;
background-color: white;
font-size: 30px;
}
#main_ul>ul {
padding-left: 0;
}
#main_ul>ul>li {
cursor: pointer;
list-style: none;
}
#main_ul>ul>li+li {
border-top: 1px solid #e0e0e0;
}
#main_ul>ul>li>p:nth-of-type(1) {
color: #333;
padding: 20px 0 10px;
margin: 0;
}
#main_ul>ul>li>p:nth-of-type(2) {
color: #999;
padding-bottom: 20px;
margin: 0;
}
.loading_pic {
font-size: 20px;
text-align: center;
width: 100%;
position: absolute;
top: 150px;
display: none;
}
.loading_pic>img {
width: 120px;
display: block;
margin: 0 auto;
}
.loading_pic>p {
font-size: 20px;
color: #333;
text-align: center;
margin-top: 10px;
color: rgb(51, 51, 51);
}
.no_more {
font-size: 30px;
height: 50px;
line-height: 50px;
text-align: center;
display: none;
}
/**/
#li_dujia_area {
display: none;
}
/*上传图片预览区域*/
.img-pre-ul {
padding-left: 0;
overflow: hidden;
/*width: 100%;*/
}
.img-pre-ul>li {
list-style: no;
float: left;
width: 210px;
height: 170px;
overflow: hidden;
margin-right: 10px;
margin-top: 10px;
}
.img-pre-ul>li.pdf-pre-li {
height: 70px;
}
.img-pre-ul>li>img {
float: left;
width: 210px;
height: 140px;
object-fit: contain;
cursor: pointer;
}
.img-pre-ul>li>a {
float: left;
width: 210px;
text-align: center;
line-height: 30px;
}
.img-pre-ul>li>a.pdf-pre-a {
line-height: 20px;
word-break: break-all;
}
/*图片点击放大预览区域的样式*/
#img_mask_area {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: hidden;
z-index: 1001;
background-color: rgba(0, 0, 0, .3);
display: none;
}
#img_mask_area>img {
width: 900px;
height: 700px;
object-fit: contain;
position: absolute;
left: 50%;
top: 50%;
margin-left: -450px;
margin-top: -350px;
}
/*整个页面加载图标区域*/
#main_loading_pic{
position: fixed;
top: 50%;
left: 50%;
width: 100px;
height: 100px;
margin-left: -50px;
margin-top: -50px;
overflow: hidden;
display: none;
}
#main_loading_pic>img{
float: left;
width: 100%;
height: 100%;
}
/*房东手机号样式调整*/
.landlord-form-group{
margin-top: 0!important;
}
.input-add-tel-landlord{
margin-top: 8px!important;
}
\ No newline at end of file
public/resource/js/commission.js
View file @ 441571ce
This diff is collapsed.
public/resource/js/commissionTotal.js
View file @ 441571ce
This diff is collapsed.
public/resource/js/public.js
View file @ 441571ce
This diff is collapsed.
public/resource/js/reportList.js
View file @ 441571ce
This diff is collapsed.
public/resource/js/tax.js
View file @ 441571ce
This diff is collapsed.
public/resource/js/user.js
View file @ 441571ce
This diff is collapsed.
public/resource/template/reportList_maidtwo_template_tpl.html 0 → 100644
View file @ 441571ce
This diff is collapsed.
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