Skip to content

T
tl_estate
Commit 0030a956 authored by clone's avatar clone
Browse files
Options

Merge branch '0813-v2.7.0' into test

parents 1f8fb406 87bf8f58
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1077 additions and 212 deletions
application/api/controller/Location.php 0 → 100644
View file @ 0030a956
<?php
namespace app\api\controller;
use app\api\extend\Basic;
use app\extra\RedisExt;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/8/13
* Time : 11:31
* Intro:
*/
class Location extends Basic
{
private $redis_;
const CITY_USER = "user_city_";
public function __construct($request = null)
{
parent::__construct($request);
$this->redis_ = RedisExt::getRedis();
}
public function saveSiteCity()
{
$params = $this->params;
/* $params = array(
"user_id" => 1,
"city" => "上海市"
);*/
$checkResult = $this->validate($params, "RegisterValidate.saveSiteCityVerify");
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
$city = "上海市";
$user_id = $params["user_id"];
if ($params["city"] == "杭州市" || $params["city"] == "杭州") {
$city = "杭州市";
}
if ($this->redis_) {
$this->redis_->set(self::CITY_USER . $user_id, $city);
} else {
return $this->response("101", "redis service not found");
}
return $this->response("200", "success", []);
}
}
\ No newline at end of file
application/api/controller/Shop.php
View file @ 0030a956
...@@ -183,7 +183,7 @@ class Shop extends Basic ...@@ -183,7 +183,7 @@ class Shop extends Basic
foreach ($result as $key => $val) { foreach ($result as $key => $val) {
$result[$key]["api_path"] = CK_IMG_URL . 'images/'; $result[$key]["api_path"] = CK_IMG_URL . 'images/';
$result[$key]["rent_price"] = $val["rent_price"] * 0.01; $result[$key]["rent_price"] = $val["rent_price"] * 0.01;
$result[$key]["title"] = $val["city"] . $result[$key]["title"]; $result[$key]["title"] = $val["disc"] . $result[$key]["title"];
$param["house_id"] = $val["id"]; $param["house_id"] = $val["id"];
$param["img_type"] = 1; //默认主图 $param["img_type"] = 1; //默认主图
......
application/api/validate/RegisterValidate.php
View file @ 0030a956
...@@ -20,6 +20,7 @@ class RegisterValidate extends Validate ...@@ -20,6 +20,7 @@ class RegisterValidate extends Validate
'code' => 'require|number', 'code' => 'require|number',
'device_id' => 'require', 'device_id' => 'require',
'phone' => [ 'regex' => '/^((13[0-9])|(14[0-9])|(15[0-9])|(18[0-9])|(16[0-9])|(17[0-9])|(19[0-9]))\\d{8}$/i' ], 'phone' => [ 'regex' => '/^((13[0-9])|(14[0-9])|(15[0-9])|(18[0-9])|(16[0-9])|(17[0-9])|(19[0-9]))\\d{8}$/i' ],
'city' => 'require',
]; ];
protected $message = [ protected $message = [
...@@ -32,13 +33,15 @@ class RegisterValidate extends Validate ...@@ -32,13 +33,15 @@ class RegisterValidate extends Validate
'phone.regex' => '手机号格式不正确', 'phone.regex' => '手机号格式不正确',
'device_id.require' => '设备id不能为空', 'device_id.require' => '设备id不能为空',
'code.require' => 'code为必填字段', 'code.require' => 'code为必填字段',
'code.number' => 'code只能为数字' 'code.number' => 'code只能为数字',
'city.require' => 'city为必填字段',
]; ];
protected $scene = [ protected $scene = [
'verify' => [ 'phone', 'device_id' ], 'verify' => [ 'phone', 'device_id' ],
'register' => [ 'phone', 'device_id', 'code' ], 'register' => [ 'phone', 'device_id', 'code' ],
'removeBind' => [ 'user_id', 'buyer_id' ], 'removeBind' => [ 'user_id', 'buyer_id' ],
'bind' => [ 'wx_union_id','phone' ], 'bind' => [ 'wx_union_id', 'phone' ],
'saveSiteCityVerify' => [ 'user_id', 'city' ],
]; ];
} }
\ No newline at end of file
application/api_broker/controller/CollectHouse.php
View file @ 0030a956
...@@ -119,8 +119,8 @@ class CollectHouse extends Basic ...@@ -119,8 +119,8 @@ class CollectHouse extends Basic
$res = $this->aCollectHouse->getCollectList($pageNo,$pageSize,$field,$get_params); $res = $this->aCollectHouse->getCollectList($pageNo,$pageSize,$field,$get_params);
$res_total = $this->aCollectHouse->getCollectListTotal($field,$get_params); $res_total = $this->aCollectHouse->getCollectListTotal($field,$get_params);
$look_shop_service = new LookShopService(); $look_shop_service = new LookShopService();
foreach ($res as $key => $val) { foreach ($res as $key => $val) {
$isLook = $look_shop_service->isLooked($params["agents_id"], $val["id"]); $isLook = $look_shop_service->isLooked($params["agents_id"], $val["id"]);
$res[$key]["is_look"] = $isLook; $res[$key]["is_look"] = $isLook;
$res[$key]["rent_price"] = $val["rent_price"] * 0.01; $res[$key]["rent_price"] = $val["rent_price"] * 0.01;
......
application/api_broker/controller/Shop.php
View file @ 0030a956
...@@ -10,6 +10,7 @@ use app\model\AAgents; ...@@ -10,6 +10,7 @@ use app\model\AAgents;
use app\model\ACollectHouse; use app\model\ACollectHouse;
use app\model\AttentionModel; use app\model\AttentionModel;
use app\model\GHouses; use app\model\GHouses;
use app\model\GHousesExt;
use app\model\GHousesFollowUp; use app\model\GHousesFollowUp;
use app\model\GHousesImgs; use app\model\GHousesImgs;
use app\model\GHousesToAgents; use app\model\GHousesToAgents;
...@@ -53,7 +54,7 @@ class Shop extends Basic ...@@ -53,7 +54,7 @@ class Shop extends Basic
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/*$params = array( /* $params = array(
"site_area" => 4, //来源 1c首页 2c搜索 3b首页 4b搜索 5b报备 "site_area" => 4, //来源 1c首页 2c搜索 3b首页 4b搜索 5b报备
// "title" => "vv", //1，2 external_title ,3,4internal_title // "title" => "vv", //1，2 external_title ,3,4internal_title
"house_id" => 4, "house_id" => 4,
...@@ -71,6 +72,7 @@ class Shop extends Basic ...@@ -71,6 +72,7 @@ class Shop extends Basic
"status" => 1, //1上架or2下架 "status" => 1, //1上架or2下架
"start_time" => "2018-05-25", "start_time" => "2018-05-25",
"end_time" => "2018-05-30", "end_time" => "2018-05-30",
"landlord_phone" => "17621970093",
"pageNo" => 1, "pageNo" => 1,
"pageSize" => 15 "pageSize" => 15
);*/ );*/
...@@ -84,7 +86,7 @@ class Shop extends Basic ...@@ -84,7 +86,7 @@ class Shop extends Basic
,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price"; ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price";
} else { } else {
$field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price"; ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price";
$conditions["city"] = trim($this->city); $conditions["city"] = trim($this->city);
...@@ -108,8 +110,18 @@ class Shop extends Basic ...@@ -108,8 +110,18 @@ class Shop extends Basic
$conditions['internal_address'] = array( "like", "%" . trim($params['address']) . "%" ); $conditions['internal_address'] = array( "like", "%" . trim($params['address']) . "%" );
} }
$houseIds = "";
if (isset($params['landlord_phone'])) {
$houseIds = $this->returnHouseId($params['landlord_phone']);
if (empty($houseIds)) {
return $this->response("200", "此条件没有找到数据");
}
}
if (isset($params['house_id'])) { if (isset($params['house_id'])) {
$conditions['id'] = array( "eq", $params['house_id'] ); $houseIds = $params['house_id'];
}
if (!empty($houseIds)) {
$conditions['id'] = array( "in", $houseIds );
} }
if (isset($params['start_time']) && isset($params['end_time'])) { if (isset($params['start_time']) && isset($params['end_time'])) {
...@@ -204,6 +216,7 @@ class Shop extends Basic ...@@ -204,6 +216,7 @@ class Shop extends Basic
foreach ($result as $key => $val) { foreach ($result as $key => $val) {
$result[$key]["api_path"] = CK_IMG_URL . 'images/'; $result[$key]["api_path"] = CK_IMG_URL . 'images/';
$result[$key]["rent_price"] = $val["rent_price"] * 0.01; $result[$key]["rent_price"] = $val["rent_price"] * 0.01;
$result[$key]["title"] = $val["disc"] . $result[$key]["title"];
$param["house_id"] = $val["id"]; $param["house_id"] = $val["id"];
$param["img_type"] = 1; //默认主图 $param["img_type"] = 1; //默认主图
...@@ -222,6 +235,20 @@ class Shop extends Basic ...@@ -222,6 +235,20 @@ class Shop extends Basic
return $this->response("200", 'request success', $result); return $this->response("200", 'request success', $result);
} }
private function returnHouseId($landlord_phone)
{
$houseExtModel = new GHousesExt();
$houseIds = $houseExtModel->getHouseId($landlord_phone);
$ids = "";
if (count($houseIds) > 0) {
foreach ($houseIds as $item) {
$ids .= $item["house_id"] . ",";
}
$ids = rtrim($ids, ",");
}
return $ids;
}
/** /**
* 楼盘详情 * 楼盘详情
...@@ -426,7 +453,7 @@ class Shop extends Basic ...@@ -426,7 +453,7 @@ class Shop extends Basic
$check = $validate->check($this->params); $check = $validate->check($this->params);
} }
if(true !== $check){ if (true !== $check) {
return $this->response(101, $validate->getError()); return $this->response(101, $validate->getError());
} }
$house_id = $this->gHousesModel->app_addV2($this->params, $this->agentId); //添加或编辑商铺 $house_id = $this->gHousesModel->app_addV2($this->params, $this->agentId); //添加或编辑商铺
......
application/api_broker/controller/User.php
View file @ 0030a956
This diff is collapsed.
application/app_broker/view/index/customerinfo_details_new.html
View file @ 0030a956
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<div class="genjin-mark-area-zhuangtai"> <div class="genjin-mark-area-zhuangtai">
<div class="genjin-mark-area-title">状态标签：(必选)</div> <div class="genjin-mark-area-title">状态标签：(必选)</div>
<div class="genjin-mark-area-alink"> <div class="genjin-mark-area-alink">
<a data-markid="-1">无效</a> <!--<a data-markid="-1">无效</a>-->
<a data-markid="1">已租</a> <a data-markid="1">已租</a>
<a data-markid="0">求租</a> <a data-markid="0">求租</a>
</div> </div>
......
application/app_broker/view/index/shop_detail_pc.html
View file @ 0030a956
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<div class="fl">房东：</div> <div class="fl">房东：</div>
<div class="fl"> <div class="fl">
<ul class="oh phone-list"> <ul class="oh phone-list">
<li class="fl oh" v-for="(item, index) in d.landlord_phone" :key="index"><span>{{item.name+'-'+hidePhone(item.phone)}}</span><a href="javascript:;" class="call-tel-btn" @click="callHide(item.phone)">拨打</a></li> <li class="fl oh" v-for="(item, index) in d.landlord_phone" :key="index"><span>{{item.name+'-'+hidePhone(item.phone)}}</span><a href="javascript:;" class="call-tel-btn" @click="showModal1(item)">拨打</a></li>
</ul> </ul>
</div> </div>
</td> </td>
...@@ -141,15 +141,34 @@ ...@@ -141,15 +141,34 @@
<section v-show="dataCode==102">查看数量已达上限</section> <section v-show="dataCode==102">查看数量已达上限</section>
<section v-show="dataCode!=200"></section> <section v-show="dataCode!=200"></section>
</main> </main>
<div class="modal-area" v-show="maskShowFlag">
<div class="call-hide-area" v-show="callShowFlag"> <div id="call_modal" v-show="modalShow1">
<p>请使用{{user_info_obj.phone}}的手机拨打该虚拟号：</p> <div class="call-modal-main">
<p class="call-modal-main-title">选择本机手机号</p>
<ol id="call_modal_phone_list">
<li class="call-select"><input placeholder="请输入本机手机号" maxlength="11" type="tel" id="call_modal_phone_self" readonly="" />
<div class="call-edit-icon">完成</div>
<div class="call-submit-ing-icon">提交中ing</div>
<div class="call-select-icon"><img src="/app/images/ic_duigou_gre.png" /></div>
</li>
</ol>
<div id="add_phone_btn">增加手机号</div>
<p class="call-modal-main-tip">请确认选择的手机号和本机号码相同，否则提示为空号</p>
</div>
<div class="call-btn-area">
<div id="call_btn_cancel" @click="modalShow1=false">取消</div>
<div id="call_btn_ok" v-show="!isCallFlag" @click="showModal2">确认</div>
<div id="call_btn_ok_temp" v-show="isCallFlag">等待拨打 ing</div>
</div>
</div>
<div class="modal-area" v-show="modalShow2">
<div class="call-hide-area">
<p>请使用{{selectPhone}}的手机拨打该虚拟号：</p>
<p>（使用其他手机号拨打是打不通的）</p> <p>（使用其他手机号拨打是打不通的）</p>
<p>{{telHide}}</p> <p>{{telHide}}</p>
<p> <textarea v-model.trim="content" placeholder="请输入房源跟进信息（必填）"></textarea>
<a href="javascript:;" @click="releaseTel">没打通</a> <p><a href="javascript:;" @click="saveGenjin">保存</a></p>
<a href="javascript:;" @click="maskShowFlag=false">已拨打</a>
</p>
</div> </div>
</div> </div>
</div> </div>
......
application/index/controller/Finance.php
View file @ 0030a956
...@@ -48,7 +48,7 @@ class Finance extends Basic ...@@ -48,7 +48,7 @@ class Finance extends Basic
break; break;
case 5 : case 5 :
//待撤销 //待撤销
$result = view('finance/wait_backOut'); $result = view('finance/wait_back_out');
break; break;
case 6 : case 6 :
//已撤销 //已撤销
...@@ -69,9 +69,8 @@ class Finance extends Basic ...@@ -69,9 +69,8 @@ class Finance extends Basic
$fields = 'a.id,a.create_time,a.trade_type,b.user_phone,b.user_name,d.internal_title,d.internal_address, $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,a.is_open,a.agent_id'; a.commission,a.practical_fee,a.scale_fee,a.order_no,a.order_id,content,house_number,a.is_open,a.agent_id';
$where['a.father_id'] = 0; $where['a.father_id'] = 0;
// $where['c.is_del'] = 0; $where['a.status'] = 11;
$where['a.status'] = 11; $order = 'a.id desc';
$order = 'e.id desc';
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) { if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
$where['a.create_time'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ]; $where['a.create_time'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ];
...@@ -120,37 +119,53 @@ class Finance extends Basic ...@@ -120,37 +119,53 @@ class Finance extends Basic
//分佣方姓名 //分佣方姓名
if (!empty($this->params['partial_name'])) { if (!empty($this->params['partial_name'])) {
$where['e.name'] = ['LIKE', '%'.$this->params['partial_name'].'%']; $where['g.name'] = ['LIKE', '%'.$this->params['partial_name'].'%'];
} }
switch ($check_status) { switch ($check_status) {
case 2 : case 2 :
//成交报告列表-第二级审核 //成交报告列表-第二级审核
$audit_level = 0; $where['a.audit_level'] = 1;
break; break;
case 3 : case 3 :
//成交报告列表-第三级审核 //成交报告列表-第三级审核
$audit_level = 1; $where['a.audit_level'] = 2;
break; break;
case 4 : case 4 :
//成交报告列表-已结单 //成交报告列表-已结单
$where['a.account_statement'] = 1; $where['a.account_statement'] = 1;
$where['a.status'] = 13; $where['a.status'] = 13;
$audit_level = 2; $where['a.audit_level'] = 3;
break; break;
/* case 5 : case 5 :
//成交报告列表-待撤销 //成交报告列表-待撤销
$where['a.status'] = 20; $where['a.status'] = 20;
$where['a.audit_level'] = 0;
break; break;
case 6 : case 6 :
//成交报告列表-已撤销 //成交报告列表-已撤销
$where['a.status'] = 21; $where['a.status'] = 21;
break;*/ break;
case 7 :
//成交报告列表-待撤销-第一级审核
$where['a.status'] = 20;
$where['a.audit_level'] = 1;
break;
case 8 :
//成交报告列表-待撤销-第二级审核
$where['a.status'] = 20;
$where['a.audit_level'] = 2;
break;
case 9 :
//成交报告列表-待撤销-第三级审核
$where['a.status'] = 20;
$where['a.audit_level'] = 3;
break;
default : default :
//成交报告列表-第一级审核 //成交报告列表-第一级审核
$order = 'a.id DESC'; $order = 'a.id DESC';
$where['a.status'] = 10; $where['a.status'] = 10;
$audit_level = -1; $where['a.audit_level'] = 0;
} }
if (!empty($this->params['status'])) { if (!empty($this->params['status'])) {
...@@ -159,8 +174,8 @@ class Finance extends Basic ...@@ -159,8 +174,8 @@ class Finance extends Basic
$bargain = new OBargainModel(); $bargain = new OBargainModel();
try { try {
$data['data']['list'] = $bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where, $audit_level); $data['data']['list'] = $bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where);
$data['data']['total'] = $bargain->getBargainTotal($where, $audit_level); $data['data']['total'] = $bargain->getBargainTotal($where);
$data['data']['step'] = $check_status; $data['data']['step'] = $check_status;
} catch (\Exception $e) { } catch (\Exception $e) {
return $this->response(101, '内部错误，获取列表失败！请联系运营。'.$e->getMessage()); return $this->response(101, '内部错误，获取列表失败！请联系运营。'.$e->getMessage());
...@@ -1200,10 +1215,12 @@ class Finance extends Basic ...@@ -1200,10 +1215,12 @@ class Finance extends Basic
$m_financial = new OFinancialAudit(); $m_financial = new OFinancialAudit();
$data['status'] = 3; $data['status'] = 3;
$data['is_del'] = 1; $data['is_del'] = 1; //去除之前的审核记录
$data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id'); $data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id');
$m_bargain = new OBargainModel(); $m_bargain = new OBargainModel();
$update_data['status'] = 10;
$update_data['audit_level'] = 0;
$m_bargain->updateBargainById($this->params['bargain_id'], [ 'status' => 10 ]); $m_bargain->updateBargainById($this->params['bargain_id'], [ 'status' => 10 ]);
$msg = ''; $msg = '';
if ($data > 0) { if ($data > 0) {
...@@ -1241,9 +1258,8 @@ class Finance extends Basic ...@@ -1241,9 +1258,8 @@ class Finance extends Basic
$insert_data['audit_id'] = $this->userId; $insert_data['audit_id'] = $this->userId;
$insert_data['audit_name'] = $this->userName; $insert_data['audit_name'] = $this->userName;
$insert_data['audit_level'] = 2; $insert_data['audit_level'] = 3;
$insert_data['is_del'] = 1; $data = $m_bargain->addCheckBargain($this->params['bargain_id'], $insert_data, 1, 11);
$data = $m_bargain->addCheckBargain($this->params['bargain_id'], $insert_data, 1, 10);
$code = 200; $code = 200;
$msg = ""; $msg = "";
...@@ -1382,6 +1398,7 @@ class Finance extends Basic ...@@ -1382,6 +1398,7 @@ class Finance extends Basic
$num = $m_partial->updateBargainById($partial_id, $data); $num = $m_partial->updateBargainById($partial_id, $data);
if ($num > 0) { if ($num > 0) {
$this->updatePerformance($this->params['partial_id']);
$result['code'] = 200; $result['code'] = 200;
$result['msg'] = '删除成功'; $result['msg'] = '删除成功';
} else { } else {
...@@ -1445,9 +1462,9 @@ class Finance extends Basic ...@@ -1445,9 +1462,9 @@ class Finance extends Basic
} }
//检查成交报告是否存在 //检查成交报告是否存在
$data = $m_bargain->getBargainPartialDetail('a.id,a.agent_id,a.create_time', ['id'=>$this->params['bargain_id']]); $data_arr = $m_bargain->getBargainPartialDetail('a.id,a.agent_id,a.create_time', ['id'=>$this->params['bargain_id']]);
if (empty($data['id'])) { if (empty($data_arr['id'])) {
return $this->response(101, '没有成交报告信息'); return $this->response(101, '没有成交报告信息');
} }
...@@ -1458,15 +1475,8 @@ class Finance extends Basic ...@@ -1458,15 +1475,8 @@ class Finance extends Basic
$data = $m_bargain->updateBargainById($this->params['bargain_id'], $update); //更改分佣方 $data = $m_bargain->updateBargainById($this->params['bargain_id'], $update); //更改分佣方
//获取被修改人信息 $this->updatePerformance(0, $this->params['agent_id']);
$m_agent = new AAgents(); $this->updatePerformance(0, $data_arr['agent_id']);
$agent_data = $m_agent->verifyUser('id,store_id,district_id', '',['id'=>$this->params['agent_id']]);
//更新业绩统计
$sum = new ResultsSummaryNewTask();
$date = date('Y-m-d', strtotime($data['create_time']));
$sum->updateTotalByAgentId($agent_data['id'], $agent_data['store_id'], $agent_data['district_id'], $date); //被修改的人
$sum->updateTotalByAgentId($data['agent_id'], $data['store_id'], $data['district_id'], $date);//修改为最新的分佣方
/*记录日志 start*/ /*记录日志 start*/
$bargain_data = $m_bargain->selectBargainByOrderNo('agent_id,father_id', ['id'=>$this->params['bargain_id']]); $bargain_data = $m_bargain->selectBargainByOrderNo('agent_id,father_id', ['id'=>$this->params['bargain_id']]);
...@@ -1488,4 +1498,66 @@ class Finance extends Basic ...@@ -1488,4 +1498,66 @@ class Finance extends Basic
/*记录日志 end*/ /*记录日志 end*/
return $this->response(200, '修改成功', $data); return $this->response(200, '修改成功', $data);
} }
/**
* 撤销成交报告
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function backOutToOne() {
if (empty($this->params['bargain_id'])) {
return $this->response(101, '参数错误');
}
$params['content'] = trim($this->params['content']); //撤销原因
$m_financial = new OFinancialAudit();
$result = $m_financial->backOutUpdate($this->params['bargain_id'], $params);
if ($result) {
$code = 200;
$this->editRecordLog($this->params['bargain_id'], '[撤销成交报告]', 3); //日志记录
$this->updatePerformance($this->params['bargain_id']);
$msg = '撤销成功';
} else {
$code = 101;
$msg = '操作失败！';
}
return $this->response($code, $msg);
}
/**
* 更新个人业绩
*
* @param int $bargain_id
* @param int $agent_id
* @return bool
*/
private function updatePerformance(int $bargain_id = 0, int $agent_id = 0) : bool{
$where = [];
if ($bargain_id) {
$where['b.id'] = $bargain_id;
}
if ($agent_id) {
$where['a.id'] = $agent_id;
}
if (!empty($where)) {
//获取被修改人信息
$m_agent = new AAgents();
$agent_data = $m_agent->agentBragainDetail('a.id,a.store_id,a.district_id,b.create_time', ['b.id'=>$bargain_id]);
//更新业绩统计
$sum = new ResultsSummaryNewTask();
$date = date('Y-m-d', strtotime($agent_data['create_time']));
$sum->updateTotalByAgentId($agent_data['id'], $agent_data['store_id'], $agent_data['district_id'], $date); //被修改的人
}
return true;
}
} }
application/index/controller/HouseInfo.php deleted 100644 → 0
View file @ 1f8fb406
<?php
namespace app\index\controller;
use app\index\extend\Basic;
use app\model\HouseInfos;
use think\Request;
/**
* Description of HouseInfo
*
* @author : fuju
* @date : 2018-1-15 11:09:56
* @internal : description
*/
class HouseInfo extends Basic{
protected $house_infos;
public function __construct(Request $request) {
parent::__construct($request);
$this->house_infos = new HouseInfos();
}
public function index() {
return $this->house_infos->select();
}
}
application/index/controller/Houses.php
View file @ 0030a956
...@@ -18,6 +18,7 @@ use app\model\GHouses; ...@@ -18,6 +18,7 @@ use app\model\GHouses;
use app\model\GHousesExt; use app\model\GHousesExt;
use app\model\GHousesImgs; use app\model\GHousesImgs;
use app\model\GHousesToAgents; use app\model\GHousesToAgents;
use app\model\GLandlordPhone;
use app\model\GOperatingRecords; use app\model\GOperatingRecords;
use app\model\SubletModel; use app\model\SubletModel;
use think\Request; use think\Request;
...@@ -228,7 +229,7 @@ class Houses extends Basic ...@@ -228,7 +229,7 @@ class Houses extends Basic
} }
$fields = 'id,shop_type,internal_title,rent_price,is_show,create_time,residue_num,rent_type, $fields = 'id,shop_type,internal_title,rent_price,is_show,create_time,residue_num,rent_type,
shop_area_start,shop_area_end,industry_type,disc'; shop_area_start,shop_area_end,industry_type,disc,is_carefully_chosen';
/*楼盘编号*/ /*楼盘编号*/
if ($this->params['id'] != NULL) { if ($this->params['id'] != NULL) {
...@@ -537,4 +538,39 @@ class Houses extends Basic ...@@ -537,4 +538,39 @@ class Houses extends Basic
return $this->response($data['status'], $data['msg'], $data['data']); return $this->response($data['status'], $data['msg'], $data['data']);
} }
/**
* 转换房东手机号
*
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function transformLandlord() {
$time = time();
$m_landlord = new GLandlordPhone();
$m_house = new GHousesExt();
$total = $m_house->getTotal();
$page = ceil($total/5000);
$where[] = ['EXP','landlord_phone IS NOT NULL AND landlord_phone != ""'];
$kk = 0;
for ($i=1; $i<= $page; $i++) {
$data = $m_house->getList($i,5000,'id asc','house_id,landlord_phone', $where);
foreach ($data as $k=>$v) {
$landlord_data = json_decode($v['landlord_phone'], true);
foreach ($landlord_data as $k2=>$v2) {
$insert[$kk]['name'] = $v2['name'];
$insert[$kk]['phone'] = (int)$v2['phone'];
$insert[$kk]['house_id'] = $v['house_id'];
$kk++;
}
}
$m_landlord->saveAll($insert);
}
echo time() - $time .'秒';
}
} }
\ No newline at end of file
application/index/controller/Member.php
View file @ 0030a956
...@@ -273,7 +273,7 @@ class Member extends Basic{ ...@@ -273,7 +273,7 @@ class Member extends Basic{
$where['a.disc'] = $params['disc']; $where['a.disc'] = $params['disc'];
} }
$fields = 'a.id,a.user_nick,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.user_label, $fields = 'a.id,a.user_nick,a.create_time,a.user_name,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.user_label,
a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source'; a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source';
try { try {
...@@ -298,6 +298,14 @@ class Member extends Basic{ ...@@ -298,6 +298,14 @@ class Member extends Basic{
} }
} }
//判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
$is_outstrip_twenty_four_hours = 0;
if((time() - strtotime($v['create_time'])) > (60*60*24)){
$is_outstrip_twenty_four_hours = 1;
}
$data_list[$k]['is_outstrip_twenty_four_hours']=$is_outstrip_twenty_four_hours;
$is_show = true; $is_show = true;
if( $if_search_user == false){ if( $if_search_user == false){
$is_show = $clientService->dialTotal($v["id"]); $is_show = $clientService->dialTotal($v["id"]);
......
application/index/controller/Performance.php
View file @ 0030a956
...@@ -8,7 +8,9 @@ namespace app\index\controller; ...@@ -8,7 +8,9 @@ namespace app\index\controller;
*/ */
use app\index\extend\Basic; use app\index\extend\Basic;
use app\index\service\PerformanceService; use app\index\service\PerformanceService;
use app\index\untils\ExportExcelUntil;
use think\Request; use think\Request;
use \think\Session;
class Performance extends Basic class Performance extends Basic
{ {
...@@ -166,6 +168,52 @@ class Performance extends Basic ...@@ -166,6 +168,52 @@ class Performance extends Basic
} }
/**
* 导出分佣提成明细表
*
* @return string
*/
public function getPerformanceExcel()
{
$export = new ExportExcelUntil();
$data = Session::get('excelPerformance');
if(!$data){
return $this->response("101","Session读取失败");
}
foreach ($data['data'] as $key => $v) {
$e_data_old['index_'] = $v['index_'];
if($data['type'] == 3){
$e_data_old['name'] = $v['district_name'];
}elseif ($data['type'] == 2){
$e_data_old['name'] = $v['store_name'];
}else{
$e_data_old['name'] = $v['name'];
}
$e_data_old['performance_total'] = $v['performance_total'];
$e_data_old['paylog'] = $v['paylog_total'];
$e_data_old['bargain_sum'] = $v['bargain_sum_total'];
$e_data_old['march_in_num'] = $v['march_in_num_total'];
$e_data_old['look_at_num'] = $v['look_at_num_total'];
$e_data_old['add_house_num'] = $v['add_house_num_total'];
$e_data_old['add_user_num'] = $v['add_user_num_total'];
$e_data_old['team_num'] = $v['team_num'];
$e_data_new[]=$e_data_old;
}
if($data['type'] == 3){
$title = [ '排名', '部门', '业绩（元）', '成交单数', '收款数', '进场数', '报备数', '新增商铺', '新增客户', '团队人数' ];
}elseif ($data['type'] == 2){
$title = [ '排名', '门店', '业绩（元）', '成交单数', '收款数', '进场数', '报备数', '新增商铺', '新增客户', '团队人数' ];
}else{
$title = [ '排名', '经纪人', '业绩（元）', '成交单数', '收款数', '进场数', '报备数', '新增商铺', '新增客户', '团队人数' ];
}
$export->exportTable('业绩排行', $e_data_new, 10, '业绩排行表', $title);
return '';
}
......
application/index/controller/PerformanceInfo.php
View file @ 0030a956
...@@ -10,7 +10,9 @@ namespace app\index\controller; ...@@ -10,7 +10,9 @@ namespace app\index\controller;
use app\index\extend\Basic; use app\index\extend\Basic;
use app\index\untils\ExportExcelUntil;
use app\model\OBargainModel; use app\model\OBargainModel;
use think\Session;
class PerformanceInfo extends Basic class PerformanceInfo extends Basic
{ {
...@@ -98,6 +100,105 @@ class PerformanceInfo extends Basic ...@@ -98,6 +100,105 @@ class PerformanceInfo extends Basic
} }
/**
* 导出分佣提成明细表
*
* @return string
*/
public function getPerformanceInfoExcel()
{
$where['Obargain.status'] = ['neq',30];
/*开始结束时间*/
if (($this->params['create_time_start'] != NULL) && ($this->params['create_time_end'] != NULL)) {
$where['Obargain.create_time'] = ['between time', [$this->params['create_time_start']. ' 00:00:00', $this->params['create_time_end'] . ' 23:59:59']];
}
if ($this->params['shop_type'] != NULL) {
$where['Houses.shop_type'] = $this->params['shop_type'];
}
//todo 成交类型
if ($this->params['trade_type'] != NULL) {
$where['Obargain.trade_type'] = $this->params['trade_type'];
}
//todo 商铺地址
if ($this->params['landmark'] != NULL) {
$where['Houses.landmark'] = ['like', '%'.$this->params['landmark'].'%'];
}
//todo 商铺编号
if ($this->params['house_id'] != NULL) {
$where['Houses.id'] = $this->params['house_id'];
}
//todo 部门
if ($this->params['district_id'] != NULL) {
$where['District.id'] = $this->params['district_id'] ;
}
//todo 门店
if ($this->params['store_id'] != NULL) {
$where['Store.id'] = $this->params['store_id'] ;
}
//todo 姓名
if ($this->params['name'] != NULL) {
$where['Agent.name'] = ['like', '%'.$this->params['name'].'%'];
}
//todo 手机号
if ($this->params['phone'] != NULL) {
$where['Agent.phone'] = ['like', '%'.$this->params['phone'].'%'];
}
$field = 'Obargain.create_time,';
$field .= 'Obargain.trade_type,';
$field .= 'Houses.landmark,';
$field .= 'Oorder.house_id,';
$field .= 'Agent.name,';
$field .= 'Agent.phone,';
$field .= 'Store.store_name,';
$field .= 'District.district_name,';
$field .= 'Obargain.scale,';
$field .= 'Obargain.scale_fee,';
$field .= 'Obargain.practical_fee';
$return = $this->oBargainModel->performancelInfoExcel($where,$field);
if(!$return){
return $this->response("101","无数据");
}
$export = new ExportExcelUntil();
foreach ($return as $key => $v) {
$e_data_old['create_time'] = $v['performance_total'];//提交时间
switch ($v['trade_type']) {//成交类型;
case 10:
$e_data_old['trade_type'] = "出租";
case 20:
$e_data_old['trade_type'] = "增佣";
case 30:
$e_data_old['trade_type'] = "代理";
default:
$e_data_old['trade_type'] = "好处费";
}
$e_data_old['landmark'] = $v['landmark'];//商铺地址
$e_data_old['id'] = $v['id'];//商铺编号
$e_data_old['name_phone'] = $v['name'].'-'.$v['phone'];//分佣提成方
$e_data_old['district_name'] = $v['district_name'].'-'.$v['store_name'];//所属部门
$e_data_old['scale'] = $v['scale'];//分佣比例
$e_data_old['scale_fee'] = $v['scale_fee'];//应收佣金
$e_data_old['practical_fee'] = $v['practical_fee'];//实收佣金
$e_data_new[]=$e_data_old;
}
$title = [ '提交时间', '成交类型', '商铺地址', '商铺编号', '分佣提成方', '所属部门门店', '分佣比例', '应收佣金', '实收佣金' ];
$export->exportTable('业绩明细', $e_data_new, 10, '业绩明细表', $title);
return '';
}
} }
\ No newline at end of file
application/index/service/PerformanceService.php
View file @ 0030a956
...@@ -8,6 +8,8 @@ use app\model\OMarchInModel; ...@@ -8,6 +8,8 @@ use app\model\OMarchInModel;
use app\model\OReportModel; use app\model\OReportModel;
use app\model\TAgentTotalModel; use app\model\TAgentTotalModel;
use app\model\Users; use app\model\Users;
use \think\Session;
/** /**
* Created by PhpStorm. * Created by PhpStorm.
...@@ -296,6 +298,7 @@ class PerformanceService ...@@ -296,6 +298,7 @@ class PerformanceService
} }
} }
//dump($arr);exit; //dump($arr);exit;
Session::set('excelPerformance',['data'=>$arr,'type'=>$type]);
return ['list'=>$arr,'total'=>0]; return ['list'=>$arr,'total'=>0];
} }
......
application/index/view/cell_phone/index.html
View file @ 0030a956
...@@ -364,9 +364,9 @@ ...@@ -364,9 +364,9 @@
</div> </div>
<!--客户详情 客户跟进 不可编辑--> <!--客户详情 客户跟进 不可编辑-->
<div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-record" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-details">
<div class="modal-content modal-body-details"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
...@@ -376,8 +376,8 @@ ...@@ -376,8 +376,8 @@
<a href="javascript:;" class="btn btn-info caozuo-yue">约带看</a> <a href="javascript:;" class="btn btn-info caozuo-yue">约带看</a>
</h4> </h4>
<div class="user_up_con"> <div class="user_up_con">
<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span> <!--<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span> <span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>-->
</div> </div>
</div> </div>
<div class="modal-body modal-body1"> <div class="modal-body modal-body1">
...@@ -638,3 +638,56 @@ ...@@ -638,3 +638,56 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--拨打电话弹框相关-->
<div id="call_modal">
<div class="call-modal-main">
<p class="call-modal-main-title">选择本机手机号</p>
<ol id="call_modal_phone_list">
<li class="call-select"><input placeholder="请输入本机手机号" maxlength="11" type="tel" id="call_modal_phone_self" readonly="" />
<div class="call-edit-icon">完成</div>
<div class="call-submit-ing-icon">提交中ing</div>
<div class="call-select-icon"><img src="/app/images/ic_duigou_gre.png" /></div>
</li>
</ol>
<div id="add_phone_btn">增加手机号</div>
<p class="call-modal-main-tip">请确认选择的手机号和本机号码相同，否则提示为空号</p>
</div>
<div class="call-btn-area">
<div id="call_btn_cancel">取消</div>
<div id="call_btn_ok">确认</div>
<div id="call_btn_ok_temp">等待拨打 ing</div>
</div>
</div>
<!--/拨打电话弹框相关-->
<div id="genjin_modal">
<div class="genjin-modal-main">
<div class="call-hide-area">
<p>请使用<span></span>的手机拨打该虚拟号：</p>
<p>（使用其他手机号拨打是打不通的）</p>
<p></p>
</div>
<div class="genjin-content-area"><textarea placeholder="请输入跟进信息" id="content"></textarea></div>
<div class="genjin-mark-area">
<div class="genjin-mark-area-putong">
<div class="genjin-mark-area-title">普通标签：(必选)</div>
<div class="genjin-mark-area-alink"></div>
</div>
<div class="genjin-mark-area-zhuangtai">
<div class="genjin-mark-area-title">状态标签：(必选)</div>
<div class="genjin-mark-area-alink">
<!--<a data-markid="-1">无效</a>-->
<a data-markid="1">已租</a>
<a data-markid="0">求租</a>
</div>
</div>
</div>
<div class="genjin-submit-area">
<a href="javascript:;" id="btn_save">提交</a>
<a href="javascript:;" id="btn_save_temp">正在保存...</a>
</div>
</div>
<div id="close_btn"><img src="/app/images/ic_cha.png" /></div>
</div>
application/index/view/finance/account_statement.html
View file @ 0030a956
...@@ -4,6 +4,15 @@ ...@@ -4,6 +4,15 @@
.clear{ .clear{
clear: both; clear: both;
} }
.button-center-bargain{
width: 158px;
margin: 0 auto;
height: 136px;
line-height: 136px;
}
#pass_ok_btn{
margin-left: 12px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -283,15 +292,44 @@ ...@@ -283,15 +292,44 @@
通过 通过
</h4> </h4>
</div> </div>
<div class="modal-body"> <!--<div class="modal-body">
<label class="control-label">备注：</label> <label class="control-label">备注：</label>
<textarea class="form-control" rows="5" id="pass_beizhu"></textarea> <textarea class="form-control" rows="5" id="pass_beizhu"></textarea>
<span class="use-span text-danger">(必填)</span>
</div>-->
<div class="modal-footer text-center">
<div class="button-center-bargain">
<button type="button" class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-info btn-lg" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn">确定</button>
</div>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 撤销成交报告 -->
<div class="modal fade" id="modal-back-out" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
撤销成交报告
</h4>
</div>
<div class="modal-body">
<label class="control-label">撤销原因：</label>
<textarea class="form-control" rows="5" id="pass_cexiao"></textarea>
<!-- <span class="use-span text-danger">(必填)</span> --> <!-- <span class="use-span text-danger">(必填)</span> -->
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消 <button type="button" class="btn btn-default" data-dismiss="modal">取消
</button> </button>
<button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn"> <button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn_back">
确定 确定
</button> </button>
</div> </div>
...@@ -300,7 +338,6 @@ ...@@ -300,7 +338,6 @@
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!-- 弹出框 时间轴 --> <!-- 弹出框 时间轴 -->
<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
......
application/index/view/finance/wait_back_out.html 0 → 100644
View file @ 0030a956
This diff is collapsed.
application/index/view/finance/wait_backout.html deleted 100644 → 0
View file @ 1f8fb406
This diff is collapsed.
application/index/view/global/frame_tpl.html
View file @ 0030a956
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
<span class="hidden-phone">同联商业后台管理中心</span> <span class="hidden-phone">同联商业后台管理中心</span>
</a> </a>
</div> </div>
<select class="form-control btn2 ld-Marheight-city" id="user_city_choose">
<option value="310100" selected="selected">上海市</option>
<option value="330100">杭州市</option>
</select>
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="caret"></span> <span class="caret"></span>
......
application/index/view/houses/HouseFollowUp.html
View file @ 0030a956
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
margin-top: 20px; margin-top: 20px;
text-align: center; text-align: center;
} }
.ld-Marheight-city{
margin-top: 8px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -64,6 +68,9 @@ ...@@ -64,6 +68,9 @@
<tr> <tr>
<td colspan="10"> <td colspan="10">
<form id="form_search"> <form id="form_search">
<select class="form-control btn2 ld-Marheight" id="shop_area_id">
<option value="" selected="selected">区域筛选</option>
</select>
<span class="fore-span ld-Marheight">跟进时间:</span> <span class="fore-span ld-Marheight">跟进时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time_start" name="start_date1" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time_start" name="start_date1" type="date">
<span class="fore-span ld-Marheight">-</span> <span class="fore-span ld-Marheight">-</span>
...@@ -77,19 +84,17 @@ ...@@ -77,19 +84,17 @@
<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value=""> <select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
</select>--> </select>-->
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="跟进人姓名" type="text" value="">--> <!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="跟进人姓名" type="text" value="">-->
<input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="跟进人姓名或电话" type="text" value=""> <input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="跟进人姓名/电话" type="text" value="">
<div class="clear"></div> <!--<div class="clear"></div>-->
<select class="form-control btn2 ld-Marheight" id="shop_city_id"> <!--<select class="form-control btn2 ld-Marheight" id="shop_city_id">
<option value="" selected="selected">城市筛选</option> <option value="" selected="selected">城市筛选</option>
<option value="310100">上海市</option> <option value="310100">上海市</option>
<option value="330100">杭州市</option> <option value="330100">杭州市</option>
</select> </select>-->
<select class="form-control btn2 ld-Marheight" id="shop_area_id">
<option value="" selected="selected">区域筛选</option>
</select>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span> <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
</form> </form>
......
application/index/view/houses/houseList.html
View file @ 0030a956
...@@ -55,6 +55,18 @@ ...@@ -55,6 +55,18 @@
margin-top: 20px; margin-top: 20px;
text-align: center; text-align: center;
} }
.ld-Marheight-city{
margin-top: 8px;
}
/*控制放大镜的 收款图片显示*/
#preview{
z-index: 9999!important;
}
#preview img{
width: 600px;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -81,6 +93,9 @@ ...@@ -81,6 +93,9 @@
<tr> <tr>
<td colspan="10"> <td colspan="10">
<form id="form_search"> <form id="form_search">
<select class="form-control btn2" id="shop_area_id">
<option value="" selected="selected">区域</option>
</select>
<select class="form-control btn11" id="is_carefully_chosen"> <select class="form-control btn11" id="is_carefully_chosen">
<option value="-1"">是否显示在首页</option> <option value="-1"">是否显示在首页</option>
<option value="1">否</option> <option value="1">否</option>
...@@ -107,25 +122,25 @@ ...@@ -107,25 +122,25 @@
<option value="2" >10000-30000</option> <option value="2" >10000-30000</option>
<option value="3">30000以上</option> <option value="3">30000以上</option>
</select> </select>
<select class="form-control btn2" id="is_exclusive_type"> <br style="clear: both;" />
<select class="form-control btn2 ld-Marheight" id="is_exclusive_type">
<option value="-1">是否独家</option> <option value="-1">是否独家</option>
<option value="1">是</option> <option value="1">是</option>
<option value="0">否</option> <option value="0">否</option>
</select> </select>
<br style="clear: both;" />
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="对内商铺名称" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="对内商铺名称" type="text" value="">
<!--新加筛选--> <!--新加筛选-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title_open" placeholder="对外商铺名称" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title_open" placeholder="对外商铺名称" type="text" value="">
<select class="form-control btn2 ld-Marheight" id="shop_city_id"> <!--<select class="form-control btn2 ld-Marheight" id="shop_city_id">
<option value="" selected="selected">城市筛选</option> <option value="" selected="selected">城市筛选</option>
<option value="310100">上海市</option> <option value="310100">上海市</option>
<option value="330100">杭州市</option> <option value="330100">杭州市</option>
</select> </select>-->
<select class="form-control btn2 ld-Marheight" id="shop_area_id">
<option value="" selected="selected">区域筛选</option>
</select>
<select class="form-control btn2 ld-Marheight" id="area_id"> <select class="form-control btn2 ld-Marheight" id="area_id">
<option value="" selected="selected">面积筛选</option> <option value="" selected="selected">面积筛选</option>
......
application/index/view/mulu_jilu.txt 0 → 100644
View file @ 0030a956
客户列表
view-->member-->user_list.html
\ No newline at end of file
application/index/view/myCollectionUser/myCollectionUserList.html
View file @ 0030a956
...@@ -343,9 +343,9 @@ ...@@ -343,9 +343,9 @@
</div> </div>
</div> </div>
<!--客户详情 客户跟进 不可编辑--> <!--客户详情 客户跟进 不可编辑-->
<div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-record" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-details">
<div class="modal-content modal-body-details"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
...@@ -355,8 +355,8 @@ ...@@ -355,8 +355,8 @@
<a href="javascript:;" class="btn btn-info caozuo-yue">约带看</a> <a href="javascript:;" class="btn btn-info caozuo-yue">约带看</a>
</h4> </h4>
<div class="user_up_con"> <div class="user_up_con">
<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span> <!--<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span> <span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>-->
</div> </div>
</div> </div>
<div class="modal-body modal-body1"> <div class="modal-body modal-body1">
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
<td> <td>
<span class="fore-span ld-Marheight">电话:</span> <span class="fore-span ld-Marheight">电话:</span>
<span class="fore-span ld-Marheight cus_phone"></span> <span class="fore-span ld-Marheight cus_phone"></span>
<a class="fore-span btn-primary ld-Marheight user_call" href="#modal-call" data-toggle="modal">拨打</a> <a class="fore-span btn-primary ld-Marheight user_call" data-toggle="modal">拨打</a>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -796,10 +796,65 @@ ...@@ -796,10 +796,65 @@
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--拨打电话弹框相关-->
<div id="call_modal">
<div class="call-modal-main">
<p class="call-modal-main-title">选择本机手机号</p>
<ol id="call_modal_phone_list">
<li class="call-select"><input placeholder="请输入本机手机号" maxlength="11" type="tel" id="call_modal_phone_self" readonly="" />
<div class="call-edit-icon">完成</div>
<div class="call-submit-ing-icon">提交中ing</div>
<div class="call-select-icon"><img src="/app/images/ic_duigou_gre.png" /></div>
</li>
</ol>
<div id="add_phone_btn">增加手机号</div>
<p class="call-modal-main-tip">请确认选择的手机号和本机号码相同，否则提示为空号</p>
</div>
<div class="call-btn-area">
<div id="call_btn_cancel">取消</div>
<div id="call_btn_ok">确认</div>
<div id="call_btn_ok_temp">等待拨打 ing</div>
</div>
</div>
<!--/拨打电话弹框相关-->
<div id="genjin_modal">
<div class="genjin-modal-main">
<div class="call-hide-area">
<p>请使用<span></span>的手机拨打该虚拟号：</p>
<p>（使用其他手机号拨打是打不通的）</p>
<p></p>
</div>
<div class="genjin-content-area"><textarea placeholder="请输入跟进信息" id="content"></textarea></div>
<div class="genjin-mark-area">
<div class="genjin-mark-area-putong">
<div class="genjin-mark-area-title">普通标签：(必选)</div>
<div class="genjin-mark-area-alink"></div>
</div>
<div class="genjin-mark-area-zhuangtai">
<div class="genjin-mark-area-title">状态标签：(必选)</div>
<div class="genjin-mark-area-alink">
<!--<a data-markid="-1">无效</a>-->
<a data-markid="1">已租</a>
<a data-markid="0">求租</a>
</div>
</div>
</div>
<div class="genjin-submit-area">
<a href="javascript:;" id="btn_save">提交</a>
<a href="javascript:;" id="btn_save_temp">正在保存...</a>
</div>
</div>
<div id="close_btn"><img src="/app/images/ic_cha.png" /></div>
</div>
<!--客户编辑--> <!--客户编辑-->
<div class="modal fade" id="modal-record-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-record-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-details">
<div class="modal-content modal-body-details"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
...@@ -847,7 +902,7 @@ ...@@ -847,7 +902,7 @@
<td> <td>
<span class="fore-span ld-Marheight">电话:</span> <span class="fore-span ld-Marheight">电话:</span>
<span class="fore-span ld-Marheight cus_phone"></span> <span class="fore-span ld-Marheight cus_phone"></span>
<!--<a class="fore-span btn-primary ld-Marheight user_call" href="#modal-call" data-toggle="modal">拨打</a>--> <!--<a class="fore-span btn-primary ld-Marheight user_call" data-toggle="modal">拨打</a>-->
</td> </td>
</tr> </tr>
<tr> <tr>
......
application/index/view/performancesubsidiary/performancesubsidiaryList.html
View file @ 0030a956
...@@ -66,8 +66,7 @@ ...@@ -66,8 +66,7 @@
</div> </div>
<span class="btn btn-info btn3 search" id="maintable_search">搜索</span> <span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
<span class="btn btn-info btn3" id="maintable_reset">重置</span> <span class="btn btn-info btn3" id="maintable_reset">重置</span>
<span class="btn btn-info btn3" id="maintable_export">导出excel</span>
<!--<span class="btn btn-info btn3" id="maintable_export">导出excel</span>-->
</form> </form>
</td> </td>
</tr> </tr>
......
application/index/view/realtime/realtimePerformance.html
View file @ 0030a956
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
</div> </div>
<!-- 弹出框 门店业绩排行 详情 --> <!-- 弹出框 门店业绩排行 详情 -->
<div class="modal fade" id="modal-store" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-store" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-width-w">
<div class="modal-content modal-body-width"> <div class="modal-content modal-body-width-h">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<!-- 弹出框 经纪人业绩排行 详情 --> <!-- 弹出框 经纪人业绩排行 详情 -->
<div class="modal fade" id="modal-agent" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-agent" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-width-w">
<div class="modal-content modal-body-width"> <div class="modal-content modal-body-width-h">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
<!-- （点击门店名字）弹出框 经纪人业绩(二级)排行 详情 --> <!-- （点击门店名字）弹出框 经纪人业绩(二级)排行 详情 -->
<div class="modal fade" id="modal-agent-two" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-agent-two" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog modal-body-width-two-w">
<div class="modal-content modal-body-width-two"> <div class="modal-content modal-body-width-two-h">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
......
application/model/AAgents.php
View file @ 0030a956
...@@ -178,20 +178,20 @@ class AAgents extends BaseModel ...@@ -178,20 +178,20 @@ class AAgents extends BaseModel
* @param $join * @param $join
* @param $params * @param $params
* @return array|false|\PDOStatement|string|\think\Model * @return array|false|\PDOStatement|string|\think\Model
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/ */
public function verifyUser($field, $join, $params) public function verifyUser($field, $join, $params)
{ {
try {
$data = $this->field($field)
->alias('a')
->join($join)
->where($params)
->find();
} catch (\Exception $e) {
$data = [];
}
$r = $this->field($field) return $data;
->alias('a')
->join($join)
->where($params)
->find();
//echo $this->getLastSql();
return $r;
} }
/** /**
...@@ -1005,6 +1005,14 @@ class AAgents extends BaseModel ...@@ -1005,6 +1005,14 @@ class AAgents extends BaseModel
return $result; return $result;
} }
/**
* @param $field
* @param $params
* @return string
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getAgentsIdsArray($field, $params) public function getAgentsIdsArray($field, $params)
{ {
$params["status"] = 0; $params["status"] = 0;
...@@ -1023,6 +1031,14 @@ class AAgents extends BaseModel ...@@ -1023,6 +1031,14 @@ class AAgents extends BaseModel
} }
/**
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getAgentsInfo($field, $params) public function getAgentsInfo($field, $params)
{ {
$params["a.status"] = 0; $params["a.status"] = 0;
...@@ -1036,4 +1052,22 @@ class AAgents extends BaseModel ...@@ -1036,4 +1052,22 @@ class AAgents extends BaseModel
return $result; return $result;
} }
/**
* @param $field
* @param $where
* @return array|false|\PDOStatement|string|\think\Model
*/
public function agentBragainDetail($field, $where) {
try {
$data = $this->alias('a')
->field($field)
->join('o_bargain b', 'a.id = b.agent_id', 'left')
->where($where)
->find();
} catch (\Exception $e) {
$data = [];
}
return $data;
}
} }
\ No newline at end of file
application/model/ACollectHouse.php
View file @ 0030a956
...@@ -57,7 +57,7 @@ class ACollectHouse extends Model ...@@ -57,7 +57,7 @@ class ACollectHouse extends Model
$result = Db::table($this->table) $result = Db::table($this->table)
->field($field) ->field($field)
->alias('CollectUser') ->alias('CollectUser')
->join('g_houses Houses', 'CollectUser.house_id = Houses.id', 'left') ->join('g_houses Houses', 'CollectUser.house_id = Houses.id', 'right')
->where($params) ->where($params)
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
......
application/model/Evaluate.php
View file @ 0030a956
...@@ -22,7 +22,7 @@ class Evaluate extends Model ...@@ -22,7 +22,7 @@ class Evaluate extends Model
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getEvaluate($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $agent_id = '') public function getEvaluate($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $agent_id = '')
{ {
......
application/model/GHousesExt.php
View file @ 0030a956
...@@ -9,7 +9,25 @@ ...@@ -9,7 +9,25 @@
namespace app\model; namespace app\model;
use Think\Db;
class GHousesExt extends BaseModel class GHousesExt extends BaseModel
{ {
protected $table = 'g_houses_ext'; protected $table = 'g_houses_ext';
private $db_;
public function __construct($data = [])
{
parent::__construct($data);
$this->db_ = Db::table($this->table);
}
public function getHouseId($landlord_phone)
{
$params["landlord_phone"] = array( "like", '%' . $landlord_phone . '%' );
return $this->db_
->field("house_id")
->where($params)
->select();
}
} }
\ No newline at end of file
application/model/GLandlordPhone.php 0 → 100644
View file @ 0030a956
<?php
/**
* Created by PhpStorm.
* User: hu jun
* Date: 2018/8/13
* Time: 15:56
*/
namespace app\model;
class GLandlordPhone extends BaseModel
{
protected $table = 'g_landlord_phone';
}
\ No newline at end of file
application/model/OBargainModel.php
View file @ 0030a956
This diff is collapsed.
application/model/OFinancialAudit.php
View file @ 0030a956
...@@ -49,23 +49,57 @@ class OFinancialAudit extends BaseModel ...@@ -49,23 +49,57 @@ class OFinancialAudit extends BaseModel
} }
/** /**
* 修改信息
*
* @param $id * @param $id
* @param $params * @param $params
* @return int * @return int
* @throws \think\exception\PDOException
*/ */
public function updateBargainById($id, $params) public function updateBargainById($id, $params)
{ {
$params["update_time"] = date("Y-m-d H:i:s", time()); $params["update_time"] = date("Y-m-d H:i:s", time());
Db::startTrans(); $this->startTrans();
try { try {
$this->db_->where('id', $id)->update($params); $this->where('id', $id)->update($params);
Db::commit(); $this->commit();
return 1; return 1;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); $this->rollback();
return 0; return 0;
} }
} }
/**
* 撤销数据
*
* @param int $bargain_id
* @param array $params
* @return bool
* @throws \think\exception\PDOException
*/
public function backOutUpdate(int $bargain_id, array $params = []) : bool {
if (empty($bargain_id)) {
return false;
}
$this->startTrans();
$data['status'] = 4;
$data['is_del'] = 1; //去除之前的审核记录
$this->editData($data, $bargain_id, 'bargain_id');
$m_bargain = new OBargainModel();
$update_data['status'] = 20;
$update_data['audit_level'] = 0;
$update_data['content'] = $params['content']; //撤销原因
$result_bargain = $m_bargain->updateBargain($bargain_id, $update_data);
if ($result_bargain) {
$this->commit();
$result = true;
} else {
$this->rollback();
$result = false;
}
return $result;
}
} }
\ No newline at end of file
application/model/Users.php
View file @ 0030a956
...@@ -591,7 +591,7 @@ class Users extends Model ...@@ -591,7 +591,7 @@ class Users extends Model
->page($pageNo) ->page($pageNo)
->limit($pageSize) ->limit($pageSize)
->select(); ->select();
// echo $this->getLastSql(); //echo $this->getLastSql();
return $result; return $result;
} }
...@@ -775,17 +775,56 @@ class Users extends Model ...@@ -775,17 +775,56 @@ class Users extends Model
} }
public function getLastOrNextUserID($where, $field, $limit, $order) public function getLastOrNextUserID($where, $field, $limit, $order,$type)
{ {
$return = Db::name($this->table) if ($type == 1) {
$result = $this->field($field)
->alias('a')
->where($where)
->order($order)
->limit($limit)
->select();
} elseif ($type == 2) {
$result = $this->field($field)
->alias('a')
->join('u_phone_follow_up b', 'a.id = b.user_id', 'left')
->where($where)
->order($order)
->limit($limit)
->select();
} elseif ($type == 3) {
$result = $this->field($field)
->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->where($where)
->order($order)
->limit($limit)
->select();
} elseif ($type == 4) {
$result = $this->field($field)
->alias('a')
->join('a_agents b', 'a.referrer_id = b.id', 'left')
->where($where)
->where('a.referrer_source', 20)
->order($order)
->limit($limit)
->select();
} else {
$result = $this->field($field)->alias('a')
->where($where)
->order($order)
->select();
}
/*$return = Db::name($this->table)
->field($field) ->field($field)
->where($where) ->where($where)
->limit($limit) ->limit($limit)
->order($order) ->order($order)
->select(); ->select();*/
//dump($this->getLastSql()); //dump($this->getLastSql());
return $return; return $result;
} }
public function getUserCityInfo($id) public function getUserCityInfo($id)
......
application/route.php
View file @ 0030a956
This diff is collapsed.
application/task/controller/ResultsSummaryNewTask.php
View file @ 0030a956
...@@ -79,7 +79,7 @@ class ResultsSummaryNewTask ...@@ -79,7 +79,7 @@ class ResultsSummaryNewTask
* @param $agent_id * @param $agent_id
* @param $store_id * @param $store_id
* @param $district_id * @param $district_id
* @param $total_time 比如修改了数据如成交报告，成交报告提交时间是昨天那么这里的时间就是昨天 * @param $total_time string 比如修改了数据如成交报告，成交报告提交时间是昨天那么这里的时间就是昨天
*/ */
public function updateTotalByAgentId($agent_id,$store_id,$district_id,$total_time) public function updateTotalByAgentId($agent_id,$store_id,$district_id,$total_time)
{ {
......
public/app/css/customerinfo_details_new.css
View file @ 0030a956
...@@ -143,21 +143,43 @@ header .icon-link{ ...@@ -143,21 +143,43 @@ header .icon-link{
.sec-dynamic>ul>li.li-sp-active{ .sec-dynamic>ul>li.li-sp-active{
background-color: #fcba38; background-color: #fcba38;
} }
.sec-dynamic>ul>li.li-sp-active-top{
background-color: #fcba38;
}
.first-sec-active{
position: absolute;
top: .98rem;
left: 0;
width: 1.31rem;
height: .37rem;
background: url(/app/images/icon_dynamic@2x.png) no-repeat center center/1.31rem .37rem;
}
.sec-dynamic>ul>li{
position: relative;
}
.li-top{
overflow: hidden;
}
.sec-dynamic>ul>li>.li-top>div{ .sec-dynamic>ul>li>.li-top>div{
float: left; float: left;
} }
.sec-dynamic>ul>li>.li-top>div.li-top-right{ .sec-dynamic>ul>li>.li-top>div.li-top-right{
width: 6.05rem; /*width: 6.05rem;*/
width: 5.7rem;
} }
.li-top-left{ .li-top-left{
overflow: hidden; overflow: hidden;
padding-right: .2rem; padding-right: .2rem;
box-sizing: border-box; box-sizing: border-box;
position: relative;
} }
.li-top-left>img{ .li-top-left>img{
float: left; float: left;
width: .65rem; /*width: .65rem;
height: .65rem; height: .65rem;*/
width: 1rem;
height: 1rem;
border-radius: 50%; border-radius: 50%;
object-fit: cover; object-fit: cover;
} }
...@@ -165,7 +187,8 @@ header .icon-link{ ...@@ -165,7 +187,8 @@ header .icon-link{
color: #999; color: #999;
font-size: .32rem; font-size: .32rem;
overflow: hidden; overflow: hidden;
width: 6.05rem; /*width: 6.05rem;*/
width: 5.7rem;
} }
.li-top-right-header>div:nth-of-type(1){ .li-top-right-header>div:nth-of-type(1){
float: left; float: left;
......
public/app/css/shop_detail_pc.css
View file @ 0030a956
...@@ -65,7 +65,6 @@ tbody>tr:nth-of-type(16){ ...@@ -65,7 +65,6 @@ tbody>tr:nth-of-type(16){
} }
.call-hide-area{ .call-hide-area{
width: 400px; width: 400px;
height: 300px;
background-color: white; background-color: white;
padding: 20px; padding: 20px;
} }
...@@ -75,7 +74,7 @@ tbody>tr:nth-of-type(16){ ...@@ -75,7 +74,7 @@ tbody>tr:nth-of-type(16){
.call-hide-area>p:nth-of-type(3){ .call-hide-area>p:nth-of-type(3){
text-align: center; text-align: center;
font-size: 38px; font-size: 38px;
line-height: 180px; line-height: 80px;
} }
.call-hide-area>p:nth-of-type(4){ .call-hide-area>p:nth-of-type(4){
display: flex; display: flex;
...@@ -92,4 +91,143 @@ tbody>tr:nth-of-type(16){ ...@@ -92,4 +91,143 @@ tbody>tr:nth-of-type(16){
background-color: #286090; background-color: #286090;
color: white; color: white;
} }
.call-hide-area>textarea{
display: block;
width: 100%;
height: 200px;
border: 1px dotted #333;
margin-bottom: 30px;
}
/*拨打电话模态框*/
html{
font-size: 55.2px;
}
#call_modal{
position: fixed;
background-color: rgba(0,0,0,.7);
left: 0;
top: 0;
width: 100%;
height: 100%;
z-index: 102;
}
.call-modal-main{
width: 6.6rem;
height: 6.54rem;
padding: .4rem .3rem;
margin-top: 1.8rem;
margin-left: calc(50vw - 182px);
background-color: white;
font-size: .3rem;
box-sizing: border-box;
}
.call-modal-main>p.call-modal-main-title{
font-size: .3rem;
color: #333;
text-align: center;
padding-bottom: .3rem;
}
.call-modal-main>p.call-modal-main-tip{
font-size: .24rem;
color: #F13D2F;
text-align: center;
padding-top: .3rem;
}
.call-modal-main>ol{
padding-bottom: .3rem;
}
.call-modal-main>ol>li{
height: .8rem;
line-height: .8rem;
background-color: #f0f0f0;
margin-bottom: .3rem;
box-sizing: border-box;
padding: 0 .2rem;
cursor: pointer;
}
.call-modal-main>ol>li>input{
float: left;
line-height: .8rem;
height: .8rem;
width: 3.5rem;
font-size: .28rem;
color: #333;
}
.call-modal-main>ol>li>div{
float: right;
}
.call-modal-main>ol>li>.call-select-icon{
overflow: hidden;
padding-top: .23rem;
display: none;
}
.call-modal-main>ol>li>.call-select-icon>img{
float: left;
width: .34rem;
height: .34rem;
}
.call-modal-main>ol>li>.call-edit-icon,
.call-modal-main>ol>li>.call-submit-ing-icon{
width: .8rem;
height: .5rem;
line-height: .5rem;
border-radius: .14rem;
text-align: center;
font-size: .24rem;
color: white;
background-color: #F13D2F;
margin-top: .15rem;
display: none;
cursor: pointer;
}
.call-modal-main>ol>li>.call-submit-ing-icon{
width: 1.2rem;
background-color: #333;
}
.call-modal-main>ol>li.call-select>.call-select-icon,
.call-modal-main>ol>li.call-add>.call-edit-icon{
display: block;
}
.call-modal-main>ol>li.call-select>.call-edit-icon,
.call-modal-main>ol>li.call-add>.call-select-icon{
display: none!important;
}
.call-modal-main>div{
text-align: center;
color: #FF9419;
box-sizing: border-box;
border: 1px solid #FF9419;
line-height: .8rem;
height: .8rem;
}
.call-btn-area{
overflow: hidden;
margin-left: calc(50vw - 182px);
margin-top: .3rem;
}
.call-btn-area>div{
float: left;
width: 3.15rem;
height: .8rem;
line-height: .8rem;
border-radius: .08rem;
text-align: center;
font-size: .32rem;
}
.call-btn-area>div#call_btn_cancel{
background-color: white;
color: #FF9419;
}
.call-btn-area>div#call_btn_ok{
background-color: #FF9419;
color: white;
margin-left: .3rem;
}
.call-btn-area>div#call_btn_ok_temp{
background-color: #ccc;
color: white;
margin-left: .3rem;
}
public/app/js/customerinfo_details_new.js
View file @ 0030a956
...@@ -2,6 +2,17 @@ var _doc = $(document), ...@@ -2,6 +2,17 @@ var _doc = $(document),
_token = getUrlParam("token"), _token = getUrlParam("token"),
_customerId = getUrlParam('customerId'); _customerId = getUrlParam('customerId');
/******
*
report 报备
march_in 进场
follow_up_log 跟进
pay_log 收款
refund 退款
bargain 成交报告
*
*****/
$(function(){ $(function(){
$(document.body).show(); $(document.body).show();
...@@ -57,6 +68,7 @@ function loadMain(){ ...@@ -57,6 +68,7 @@ function loadMain(){
_selectPhone = '',//拨号列表里选择的号码,也是当前用户对应的手机号，可能和_userPhone是一样的 _selectPhone = '',//拨号列表里选择的号码,也是当前用户对应的手机号，可能和_userPhone是一样的
_customerPhone = '',//当前客户的手机号 _customerPhone = '',//当前客户的手机号
_backPhone = '';//绑定之后返回的号码 _backPhone = '';//绑定之后返回的号码
_user_status = '';//状态标签上次的值
if(_userId){ if(_userId){
...@@ -192,7 +204,35 @@ function loadMain(){ ...@@ -192,7 +204,35 @@ function loadMain(){
}); });
}; };
var _htmlTemp = ''; var _htmlTemp = '';
if(data['data']['user_date'] && data['data']['user_date'].length > 0){ if(data['data']['user_date'] && data['data']['user_date'].length > 0){
var _tempArr = data['data']['user_date'].filter(function(item, index, array){
/**********
*
report 报备
march_in 进场
follow_up_log 跟进
pay_log 收款
refund 退款
bargain 成交报告
*
* **********/
return (item['step_name']=='report' || item['step_name']=='march_in' || item['step_name']=='pay_log' || item['step_name']=='bargain');
});
console.log(_tempArr);
if(_tempArr.length>0){
_htmlTemp += '<li class="{7}"><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'/app/images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div><div class="first-sec-active"></div></li>'.stringFormatObj({
'0': data['data']['agent_path']+_tempArr[0]['img'],
'1': _tempArr[0]['name'],
'2': _tempArr[0]['step_name']=='phone_fllow_up'?'电话跟进:':(_tempArr[0]['step_name']=='fllow_up'?'跟进:':''),
'3': (_tempArr[0]['create_time']==null?null:_tempArr[0]['create_time']),
'5': _tempArr[0]['step'],
'6': _tempArr[0]['step_name']=='follow_up_log'?dealSp(_tempArr[0]):(_tempArr[0]['step_name']=='report'?dealSpYdk(_tempArr[0]):''),
'7': 'li-sp-active-top'
});
};
$.each(data['data']['user_date'], function(i, item) { $.each(data['data']['user_date'], function(i, item) {
_htmlTemp += '<li class="{7}"><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'/app/images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div></li>'.stringFormatObj({ _htmlTemp += '<li class="{7}"><div class="li-top"><div class="li-top-left"><img src="{0}" onerror="javascript:this.src=\'/app/images/ic_default_headpic.png\'" /></div><div class="li-top-right"><div class="li-top-right-header"><div>{1}</div><div>{3}</div></div><p>{2}{5}</p>{6}</div></div></li>'.stringFormatObj({
'0': data['data']['agent_path']+item['img'], '0': data['data']['agent_path']+item['img'],
...@@ -296,11 +336,12 @@ function loadMain(){ ...@@ -296,11 +336,12 @@ function loadMain(){
}); });
//标签没有默认状态了 //标签没有默认状态了
// if(data['data']['user_info']['user_status'] == 0 || data['data']['user_info']['user_status'] == 1 || data['data']['user_info']['user_status'] == -1 ){ var _data_user_status = data['data']['user_info']['user_status'];
// _markAreaObj.find('a[data-markid="'+data['data']['user_info']['user_status']+'"]').addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active'); if(_data_user_status == 0 || _data_user_status == 1 || _data_user_status == -1 ){
// }else{ _user_status = _data_user_status;
// layerTipsX('状态标签返回有误'); }else{
// } layerTipsX('状态标签返回有误');
}
}else { }else {
layerTipsX(data['msg']); layerTipsX(data['msg']);
...@@ -391,24 +432,27 @@ function loadMain(){ ...@@ -391,24 +432,27 @@ function loadMain(){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
var _this = $(this); var _this = $(this);
// if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
// //如果选择了未打通，或取消拨打，则直接关闭
// if(_this.parent().parent().index() === 0){
// //只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
// _genjinModal.hide();//跟进模态框关闭
// return false;
// }
// };
if(!_this.hasClass('genjin-mark-active')){ if(!_this.hasClass('genjin-mark-active')){
_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active'); _this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
}; };
if(_this.attr('data-markid') == '1'){
//如果选择了未打通，则直接关闭
if(_this.parent().parent().index() === 0){
//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
genjinSave('sp1');
return false;
}
};
}); });
//跟进的提交按钮点击事件 //跟进的提交按钮点击事件
_btnSave.click(function(e){ _btnSave.click(function(e){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
genjinSave();
});
function genjinSave(type){
var _genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'), var _genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'),
_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'), _genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
_beizhuObjVal = $.trim(_beizhuObj.val()), _beizhuObjVal = $.trim(_beizhuObj.val()),
...@@ -424,20 +468,14 @@ function loadMain(){ ...@@ -424,20 +468,14 @@ function loadMain(){
// return false; // return false;
// }; // };
// if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){ if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
//
// }else{ }else{
// if(_genjinMarkOBj.length == 0){ if(_genjinMarkOBj.length == 0){
// layerTipsX('请选择状态跟进标签'); layerTipsX('请选择状态跟进标签');
// return false; return false;
// }; };
// };
if(_genjinMarkOBj.length == 0){
layerTipsX('请选择状态跟进标签');
return false;
}; };
var _data = { var _data = {
'AuthToken': _token, 'AuthToken': _token,
'content': _beizhuObjVal, 'content': _beizhuObjVal,
...@@ -445,6 +483,17 @@ function loadMain(){ ...@@ -445,6 +483,17 @@ function loadMain(){
'agent_id': _userId, 'agent_id': _userId,
'user_status': _genjinMarkOBj.attr('data-markid') 'user_status': _genjinMarkOBj.attr('data-markid')
}; };
if(type === 'sp1'){
if(_beizhuObjVal){
}else{
_data['content'] = '未打通';
};
if(_genjinMarkOBj.length == 0){
_data['user_status'] = _user_status;
};
};
if(isCallFlag){ if(isCallFlag){
//电话跟进 //电话跟进
if(_genjinMarkOBj2.length == 0){ if(_genjinMarkOBj2.length == 0){
...@@ -510,8 +559,7 @@ function loadMain(){ ...@@ -510,8 +559,7 @@ function loadMain(){
}; };
} }
}); });
}
});
function freePhone(obj){ function freePhone(obj){
$.ajax({ $.ajax({
...@@ -788,4 +836,4 @@ function loadMain(){ ...@@ -788,4 +836,4 @@ function loadMain(){
}); });
}; };
}); });
}; };
\ No newline at end of file
public/app/js/customerinfo_details_new_081001.js → public/app/js/customerinfo_details_new_old.js
View file @ 0030a956
...@@ -391,27 +391,24 @@ function loadMain(){ ...@@ -391,27 +391,24 @@ function loadMain(){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
var _this = $(this); var _this = $(this);
// if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
// //如果选择了未打通，或取消拨打，则直接关闭
// if(_this.parent().parent().index() === 0){
// //只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
// _genjinModal.hide();//跟进模态框关闭
// return false;
// }
// };
if(!_this.hasClass('genjin-mark-active')){ if(!_this.hasClass('genjin-mark-active')){
_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active'); _this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
}; };
if(_this.attr('data-markid') == '1'){
//如果选择了未打通，则直接关闭
if(_this.parent().parent().index() === 0){
//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
genjinSave('sp1');
return false;
}
};
}); });
//跟进的提交按钮点击事件 //跟进的提交按钮点击事件
_btnSave.click(function(e){ _btnSave.click(function(e){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
genjinSave();
});
function genjinSave(type){
var _genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'), var _genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'),
_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'), _genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
_beizhuObjVal = $.trim(_beizhuObj.val()), _beizhuObjVal = $.trim(_beizhuObj.val()),
...@@ -427,14 +424,20 @@ function loadMain(){ ...@@ -427,14 +424,20 @@ function loadMain(){
// return false; // return false;
// }; // };
if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){ // if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
//
}else{ // }else{
if(_genjinMarkOBj.length == 0){ // if(_genjinMarkOBj.length == 0){
layerTipsX('请选择状态跟进标签'); // layerTipsX('请选择状态跟进标签');
return false; // return false;
}; // };
// };
if(_genjinMarkOBj.length == 0){
layerTipsX('请选择状态跟进标签');
return false;
}; };
var _data = { var _data = {
'AuthToken': _token, 'AuthToken': _token,
'content': _beizhuObjVal, 'content': _beizhuObjVal,
...@@ -442,17 +445,6 @@ function loadMain(){ ...@@ -442,17 +445,6 @@ function loadMain(){
'agent_id': _userId, 'agent_id': _userId,
'user_status': _genjinMarkOBj.attr('data-markid') 'user_status': _genjinMarkOBj.attr('data-markid')
}; };
if(type === 'sp1'){
if(_beizhuObjVal){
}else{
_data['content'] = '未打通';
};
if(_genjinMarkOBj.length == 0){
_data['user_status'] = '-1';
};
};
if(isCallFlag){ if(isCallFlag){
//电话跟进 //电话跟进
if(_genjinMarkOBj2.length == 0){ if(_genjinMarkOBj2.length == 0){
...@@ -518,7 +510,8 @@ function loadMain(){ ...@@ -518,7 +510,8 @@ function loadMain(){
}; };
} }
}); });
}
});
function freePhone(obj){ function freePhone(obj){
$.ajax({ $.ajax({
...@@ -795,4 +788,4 @@ function loadMain(){ ...@@ -795,4 +788,4 @@ function loadMain(){
}); });
}; };
}); });
}; };
\ No newline at end of file
public/app/js/shop_detail_pc.js
View file @ 0030a956
This diff is collapsed.
public/resource/css/call_genjin_modal.css 0 → 100644
View file @ 0030a956
This diff is collapsed.
public/resource/css/public.css
View file @ 0030a956
This diff is collapsed.
public/resource/js/RemarkFollowIndex.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/callPhoneIndex.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/houseFollowUp.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/houseList.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/myCollectionUserList.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/public.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/reportList.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/user.js
View file @ 0030a956
This diff is collapsed.
public/resource/js/waitBackout.js
View file @ 0030a956
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