Skip to content

T
tl_estate
Commit 0254dfb6 authored by clone's avatar clone
Browse files
Options

Merge branch 'test' into wx0604

# Conflicts: # application/route.php
parents af75f958 7cc2e59c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1523 additions and 496 deletions
application/api/controller/AppointmentTime.php
View file @ 0254dfb6
......@@ -9,6 +9,7 @@ use app\model\Evaluate;
use app\model\GHouses;
use app\model\GHousesImgs;
use app\model\HouseInfos;
use app\model\OReportModel;
use think\helper\Time;
use app\model\HouseImgs;
......@@ -28,6 +29,7 @@ class AppointmentTime extends Basic
protected $dbImg;
protected $appliesModel;
protected $evaluateMode;
protected $reportModel;
function __construct($request = null)
{
......@@ -38,6 +40,7 @@ class AppointmentTime extends Basic
$this->dbImg = new GHousesImgs();
$this->appliesModel = new Applies();
$this->evaluateMode = new Evaluate();
$this->reportModel = new OReportModel();
}
/**
......@@ -102,10 +105,10 @@ class AppointmentTime extends Basic
*/
public function getAppointmentSeeShopList()
{
/* $params = array(
/* $params = array(
"status" => 2, //看铺状态 0待经纪人确认（确认后存agents_id） 1:待看 2：已看' 如果是待看 0,1 已看是2
"user_id" => "122",//对应u_users表
"phone" => "17717536290",//phone
"user_id" => "11142",//对应u_users表
"phone" => "13661753534",//phone
"pageNo" => "1",
"pageSize" => 15
);*/
......@@ -126,7 +129,7 @@ class AppointmentTime extends Basic
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$result = [];
if ($params["status"] == 1) {
$result = $this->getWaitList($pageNo, $pageSize, $params);
$result = $this->getWaitListV2($pageNo, $pageSize, $params);
} elseif ($params["status"] == 2) {
$result = $this->getYetListV2($pageNo, $pageSize, $params);
}
......@@ -151,8 +154,8 @@ class AppointmentTime extends Basic
{
$field = "id,agents_id,house_id,house_title,phone,expect_time,is_evaluate";
$where_["status"] = array( "in", array( "0,1" ) );
$where_["user_id"] = array( "eq", $params["user_id"] );
$where_["status"] = array( "in", array( "0,1" ) );
$where_["user_id"] = array( "eq", $params["user_id"] );
$where_["applies_id"] = 0;
$result = $this->appointmentTimeModel->getAppointWatchShopList($pageNo, $pageSize, "id desc", $field, $where_);
......@@ -173,7 +176,7 @@ class AppointmentTime extends Basic
}
/**
* 已看列表
* 已看列表 废弃
* @param $pageNo
* @param $pageSize
* @param $params
......@@ -209,11 +212,40 @@ class AppointmentTime extends Basic
*/
public function getYetListV2($pageNo, $pageSize, $params)
{
$field = "a.id,a.phone,c.reception_id as agents_id,c.create_time as expect_time,a.house_id,
$field = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
d.external_title as house_title,d.residue_num as room_num_left";
$where_["a.user_id"] = $params["user_id"];
// $result = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
$result = $this->reportModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
//获取图片信息
foreach ($result as $key => $val) {
$result[$key]["api_path"] = IMG_PATH;
$param["house_id"] = $val["house_id"];
$param["img_type"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
//todo 是否评价
$evaluateResult = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
$result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
}
return $result;
}
/**
* @param $pageNo
* @param $pageSize
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function getWaitListV2($pageNo, $pageSize, $params)
{
$field = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
d.external_title as house_title,d.residue_num as room_num_left";
$where_["a.user_id"] = $params["user_id"];
$result = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
$where_["c.id"] = array('EXP','IS NULL');
$result = $this->reportModel->getWaitToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
//获取图片信息
foreach ($result as $key => $val) {
......@@ -226,6 +258,7 @@ class AppointmentTime extends Basic
$result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
}
return $result;
}
......
application/api/controller/AttentionShop.php
View file @ 0254dfb6
......@@ -64,12 +64,12 @@ class AttentionShop extends Basic
*/
public function attentionList()
{
$params = $this->params;
/* $params = array(
"user_id" => 816,
"pageNo" => 1,
"pageSize" => 15,
);*/
$params = $this->params;
/* $params = array(
"user_id" => 816,
"pageNo" => 1,
"pageSize" => 15,
);*/
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
......@@ -89,6 +89,7 @@ class AttentionShop extends Basic
return $this->response("200", "请求数据为空");
}
foreach ($result as $key => $val) {
$result[$key]["price"] = $val["price"] * 0.01;
$result[$key]["api_path"] = IMG_PATH;
$imgParam["house_id"] = $val["house_id"];
$imgParam["img_type"] = 1; //默认主图
......
application/api/controller/Broker.php
View file @ 0254dfb6
......@@ -7,6 +7,7 @@ use app\model\AAgents;
use app\model\Agents;
use app\model\Evaluate;
use app\model\EvaluateSign;
use app\model\OBargainModel;
use app\model\Remarks;
/**
......@@ -168,30 +169,31 @@ class Broker extends Basic{
if ($params['agent_id']) {
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? PAGESIZE : $params['pageSize'];
$evalutate = new Evaluate();
$remarks = new Remarks();
$fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign,a.create_time,record_id,a.source';
$fields_journal = 'house_id,apply_id,created';
$where['shopuser_id'] = $params['agent_id'];
$where['transaction_status'] = 3;
$bargain = new OBargainModel();
$evaluate = new Evaluate();
$fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,';
$fields_evaluate .= 'evaluate_sign,a.create_time,record_id,a.source,a.house_id,c.external_address';
$bargain_fields = 'a.id,a.price,a.create_time as singntime,d.external_title as title,d.rent_type,d.shop_sign,shop_area_start as room_area,c.house_id';
switch ($params['type']) {
case 0:
//评价列表信息
$result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
$result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
//成交记录
$result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'id desc', $fields_journal, $where, $params['agent_id']);
$result['journalAccounts'] = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
$data['data'] = $result;
break;
case 1:
//评价列表信息
$result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
$result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
$data['data'] = $result;
break;
case 2:
//成交记录
$result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'id desc', $fields_journal, $where, $params['agent_id']);
$result['journalAccounts'] = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
$data['data'] = $result;
break;
default:
......@@ -221,7 +223,7 @@ class Broker extends Basic{
$data['msg'] = '';
if ($this->params['agent_id']) {
$agents = new Agents();
$agents = new AAgents();
$data['data'] = $agents->agentsDetail($this->params['agent_id']);
} else {
$data['status'] = 101;
......
application/api/controller/Index.php
View file @ 0254dfb6
<?php
namespace app\api\controller;
/**
* Created by PhpStorm.
* User : zw
......@@ -14,35 +16,41 @@ use app\model\GHouses;
use app\model\HouseInfos;
use app\model\JournalAccounts;
use app\model\OrderModel;
use app\model\Users;
class Index extends Basic
{
public function banner(){
public function banner()
{
}
/**
* 月均价 上周成交量 ==>修改为日均价了==》改成求租人
*/
public function averagePriceAndTurnover()
{
/* $houseInfos = new GHouses();
$averagePrice = $houseInfos->getAveragePrice();*/
$userModel = new Users();
$user_count = $userModel->countUser();
// $journalAccounts = new JournalAccounts();
$journalAccounts = new OrderModel();
$turnover = $journalAccounts->getTurnover();
$result['averagePrice'] = $user_count;
$result['turnover'] = $turnover * 9;//不要问为什么乘以9，产品说怎么搞就怎么搞
return $this->response("request success", "200", $result);
}
}
/**
* 月均价 上周成交量 ==>修改为日均价了
* 处理错误的url
*
* @return type
*/
public function averagePriceAndTurnover(){
$houseInfos = new GHouses();
$averagePrice = $houseInfos->getAveragePrice();
// $journalAccounts = new JournalAccounts();
$journalAccounts = new OrderModel();
$turnover = $journalAccounts ->getTurnover();
$result['averagePrice'] = $averagePrice;
$result['turnover'] = $turnover;
return $this->response("request success","200",$result);
}
/**
* 处理错误的url
*
* @return type
*/
public function miss() {
return $this->response('101','URL is error');
}
public function miss()
{
return $this->response('101', 'URL is error');
}
}
application/api/controller/Shop.php
View file @ 0254dfb6
......@@ -15,6 +15,7 @@ use app\model\GLabels;
use app\model\HouseImgs;
use app\model\HouseInfos;
use app\model\Labels;
use app\model\Regions;
class Shop extends Basic
{
......@@ -211,32 +212,26 @@ class Shop extends Basic
*/
public function filtrateCondition()
{
$field = "city,disc";
$param['id'] = array( '<>', 16 );
$param['room_num_left'] = array( '<>', 0 );
$group_ = "disc";
$cityList = $this->db->getCityList($field, $param, $group_);
foreach ($cityList as $k => $v) {
if (!empty($v["city"])) {
$cityArr[] = $v["city"];
}
}
$cityArr = array_unique($cityArr);
$regions = new Regions();
$cityList = $regions->getRegionsCitySH();
$i = 0;
$result["area"][$i]["city"] = "全部";
$result["area"][$i]["disc"][] = "全部";
foreach ($cityArr as $key => $val) {
foreach ($cityList as $k => $v) {
$i++;
$result["area"][$i]["city"] = $val;
$result["area"][$i]["disc"][] = "全" . $val;
foreach ($cityList as $k => $v) {
if ($val == $v["city"]) {
$result["area"][$i]["disc"][] = $v["disc"];
if (!empty($v["name"])) {
$result["area"][$i]["city"] = $v["name"];
$result["area"][$i]["disc"][] = "全" . $v["name"];
}
foreach ($v["city"] as $item) {
if (!empty($item)) {
$result["area"][$i]["disc"][] = $item;
}
}
}
$result['yetai'] = array( '全部', '餐饮美食', '百货零售', '休闲娱乐', '其他' );
//租金租金(0:租金-大于三万; 1:租金一万到三万之间; 2:租金-小于一万)
......
application/api/controller/TransferHouseInfo.php
View file @ 0254dfb6
......@@ -8,7 +8,9 @@
namespace app\api\controller;
use app\model\GHousesExt;
use app\model\Regions;
use app\model\Users;
use think\Controller;
use think\Db;
......@@ -249,4 +251,92 @@ class TransferHouseInfo extends Controller
$result = Db::table('g_houses_to_agents')->insertAll($agent_house_data);
dump($result);
}
/**
* user_nick同步到user_name
*
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function userNickToUserName() {
set_time_limit(0);
$m_user = new Users();
$user_data = $m_user->field('id,user_nick')->where('user_nick','NOT NULL')->select();
dump(count($user_data));
foreach ($user_data as $k=>$v) {
$insert_data['id'] = $v['id'];
$insert_data['user_name'] = $v['user_nick'];
$m_user->update($insert_data);
}
return ;
}
/**
* 房东手机号转换
*
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function landlordPhoneToJson() {
$this->landlordPhoneStar();//去除号码中带*号的
$m_house_ext = new GHousesExt();
$house_data = $m_house_ext->field('id,landlord_phone')->where('landlord_phone','NOT NULL')->select();
foreach ($house_data as $k => $v) {
$phone = explode(',', $v['landlord_phone']);
if (count($phone) == 1) {
if (!empty($phone[0])) {
$insert_data['id'] = $v['id'];
$landlord_phone[0]['name'] = '房东';
$landlord_phone[0]['phone'] = str_replace(' ', '',$phone[0]);
$insert_data['landlord_phone'] = json_encode($landlord_phone);
$m_house_ext->update($insert_data);
}
} else {
foreach ($phone as $key => $val) {
if (!empty($val)) {
$landlord_phone[$key]['name'] = '房东';
$landlord_phone[$key]['phone'] = $val;
}
}
if (!empty($landlord_phone[0]['phone'])) {
$insert_data['id'] = $v['id'];
$insert_data['landlord_phone'] = json_encode($landlord_phone);
$m_house_ext->update($insert_data);
}
}
}
}
/**
* 去除号码中带*号的
*
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function landlordPhoneStar() {
$m_house_ext = new GHousesExt();
$house_data = $m_house_ext->field('id,landlord_phone')->where('landlord_phone','NOT NULL')->select();
foreach ($house_data as $k => $v) {
$phone = explode(',', $v['landlord_phone']);
if (count($phone) == 1) {
if (stripos($phone[0],'*') > 0) {
$insert_data['id'] = $v['id'];
$insert_data['landlord_phone'] = NULL;
$m_house_ext->update($insert_data);
}
} else {
if (count($phone) > 4) {
$insert_data['id'] = $v['id'];
$insert_data['landlord_phone'] = NULL;
$m_house_ext->update($insert_data);
}
}
}
}
}
\ No newline at end of file
application/api_broker/controller/CellPhone.php
View file @ 0254dfb6
......@@ -190,10 +190,10 @@ class CellPhone extends Basic
$phone->UnBind($phone_x, $phone_a, $phone_b);
} else {
$this->code = 101;
$this->msg = 'remove binding error';
$this->msg = '解绑失败，请等一会再重试！';
}
} else {
$this->code = 101;
$this->code = 200;
$this->msg = 'dont\'t have about phone_x info';
}
}else{
......
application/api_broker/controller/Client.php
View file @ 0254dfb6
......@@ -44,27 +44,33 @@ class Client extends Basic
public function editClient() {
header('Access-Control-Allow-Origin:*');
if (!empty($this->params['user_nick']) || !empty($this->params['id'])) {
if (empty($this->params['user_name'])) {
$this->params['user_name'] = $this->params['user_nick'];
}
if (!empty($this->params['user_name']) || !empty($this->params['id'])) {
$data = [];
if ($this->request->isPost()) {
if (!empty($this->params['id'])) {
$user_agent_id = $this->user->getUserById('id,user_name,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']);
//Ａ修改了刘小姐（Ｉｄ：０８２２）的客方
$ccr_agent_data = $agent->getAgentInfo('name,phone', $this->params['ccr_id']);
$content = "【{$ccr_agent_data['name']}-{$ccr_agent_data['phone']}修改了{$user_agent_id['user_name']}(id:{$user_agent_id['id']})客方】";
// $content = "【你的客户客方被修改为{$agent_data['name']}-{$agent_data['phone']}】";
$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();
......@@ -86,7 +92,7 @@ class Client extends Basic
}
} else {
$this->code = 101;
$this->msg = 'user_nick or user_phone or id is null';
$this->msg = 'user_name or id is null';
}
return $this->response($this->code, $this->msg,$data);
......@@ -154,7 +160,7 @@ class Client extends Basic
//条件
//time_minute_diff 时间差（分）48小时内增加的【拥有经纪人】的客户为--受保护客户
$field = ['id as user_id','user_nick','user_phone','agent_id','referrer_id','create_time',"TIMESTAMPDIFF(MINUTE,create_time,'{$time}')as time_minute_diff"];
$field = ['id as user_id','user_name','user_phone','agent_id','referrer_id','create_time',"TIMESTAMPDIFF(MINUTE,create_time,'{$time}')as time_minute_diff"];
$where = " agent_id in({$params['agent_id']}) and user_status={$type}";
if(!empty($params['search'])){
......@@ -162,7 +168,7 @@ class Client extends Basic
// $where = " (agent_id in(0,{$params['agent_id']}) or agent_id is null or TIMESTAMPDIFF(MINUTE,create_time,'{$time}') > 2880 )
// and ( user_nick like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) ";
$where = "agent_id in({$params['agent_id']} )
and ( user_nick like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) ";
and ( user_name like '%{$params['search']}%' or user_phone like '%{$params['search']}%' ) ";
$data['search'] = $params['search'];
}
......@@ -266,14 +272,17 @@ class Client extends Basic
$pagesize = 15;
$user_id = $params['user_id'];
$type = $params['type'];
$search_type = $params['search_type'];#无：''；客户电话：0；客户姓名：1；跟进：2；
$search_type = $params['search_type'];#无：''；客户电话：0；客户姓名：1；跟进：2 ; 编号：3；
if($search_type == '0')
{
//客户电话
$conditions['user_phone'] = ['LIKE', $phone_or_name.'%'];
}elseif ($search_type == '1'){//客户
$conditions['user_nick'] = ['LIKE', $phone_or_name.'%'];
$conditions['user_name'] = ['LIKE', $phone_or_name.'%'];
}
elseif ($search_type == '3'){//客户
$conditions['id'] = $phone_or_name;
}
if ($search_type != '2')
......@@ -303,7 +312,7 @@ class Client extends Basic
foreach($user_res as $k=>$v)
{
$label = [];
$user_res[$k]['user_nick'] = $v['user_nick']?$v['user_nick']:'未知';
$user_res[$k]['user_name'] = $v['user_name']?$v['user_name']:'未知';
if($user_id == $v['agent_id'])
{
$label[] = '我的';
......
application/api_broker/controller/OrderLog.php
View file @ 0254dfb6
......@@ -6,6 +6,8 @@ use app\api_broker\extend\Basic;
use app\api_broker\service\HouseNumUpdateService;
use app\api_broker\service\OrderLogService;
use app\api_broker\service\PushMessageService;
use app\api_broker\service\VerifyRepetitionService;
use app\extra\RedisExt;
use app\model\AAgents;
use app\model\OBargainModel;
use app\model\OMarchInModel;
......@@ -25,6 +27,7 @@ class OrderLog extends Basic
private $o_march_in_model;
private $o_refund_model;
private $service_;
private $verifyService_;
function __construct($request = null)
{
......@@ -32,6 +35,7 @@ class OrderLog extends Basic
$this->o_march_in_model = new OMarchInModel();
$this->o_refund_model = new ORefundModel();
$this->service_ = new OrderLogService();
$this->verifyService_ = new VerifyRepetitionService();
}
......@@ -60,7 +64,10 @@ class OrderLog extends Basic
);*/
// $params["reception_id"] = $this->agentName;
$is_execute = $this->verifyService_->verifyStart(1, $params["reception_id"], $params["order_id"]);
if (!$is_execute) {
return $this->response("101", "请不要重复提交");
}
$is_ok = $this->o_march_in_model->addMarchIn($params);
if ($is_ok > 0) {
$pushMarchIn = new PushMessageService();
......@@ -69,6 +76,8 @@ class OrderLog extends Basic
} else {
return $this->response("101", "request faild");
}
}
/**
......@@ -210,7 +219,7 @@ class OrderLog extends Basic
if (!isset($params["submit_agent_id"]) || !isset($params["submit_agent_name"]) || !isset($params["report_id"]) ||
!isset($params["order_id"]) || !isset($params["order_no"]) || !isset($params["trade_type"]) ||
//!isset($params["house_number"]) || !isset($params["is_open"]) ||
//!isset($params["house_number"]) || !isset($params["is_open"]) || !isset($params["industry_type"]) ||
!isset($params["price"]) || !isset($params["commission"]) || !isset($params["commission_arr"])) {
return $this->response("101", "请求参数错误");
}
......@@ -235,14 +244,15 @@ class OrderLog extends Basic
{ "role": 11, "agent_id" : 12, "scale": 13, "scale_fee" : 1112 }]',
);*/
$house_number = !isset($params["house_number"]) ? null : $params["house_number"];
$is_open = !isset($params["is_open"]) ? 0 : $params["is_open"];
$house_number = !isset($params["house_number"]) ? null : $params["house_number"];
$is_open = !isset($params["is_open"]) ? 0 : $params["is_open"];
$industry_type = !isset($params["industry_type"]) ? null : $params["industry_type"];
$params["commission_arr"] = json_decode($params["commission_arr"], true);
$is_ok = $this->service_->addBargain($params["submit_agent_id"], $params["submit_agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],
$params["trade_type"], $params["price"], $params["commission"], $params["commission_arr"], $house_number, $is_open);
$params["trade_type"], $params["price"], $params["commission"], $params["commission_arr"], $house_number, $is_open, $industry_type);
if ($is_ok > 0) {
//todo 更改用户信息 求租->已租
......@@ -425,9 +435,9 @@ class OrderLog extends Basic
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
/* $params = array(
"bargain_id" => 469,
);*/
/* $params = array(
"bargain_id" => 469,
);*/
if (!isset($params["bargain_id"])) {
return $this->response("101", "请求参数错误");
}
......@@ -523,20 +533,20 @@ class OrderLog extends Basic
$data['msg'] = "";
$data['data'] = [];
if (empty($this->params['id']) || empty($this->params['agent_id']) ) {
if (empty($this->params['id']) || empty($this->params['agent_id'])) {
return $this->response(101, 'Id or agent_id or source is null.');
}
$source = empty($this->params['source']) ? 0 : $this->params['source'];
$source = empty($this->params['source']) ? 0 : $this->params['source'];
$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'],$source);
$this->params['role'], $this->params['scale_fee'], $this->params['scale'], $source);
if ($data['data'] == 0) {
$data['code'] = 101;
$data['msg'] = 'Add the failure.';
}
return $this->response($data['code'], $data['msg'], ["id"=>$data['data']]);
return $this->response($data['code'], $data['msg'], [ "id" => $data['data'] ]);
}
/**
......@@ -614,17 +624,18 @@ class OrderLog extends Basic
if (!isset($params["order_id"])) {
return $this->response("101", "请求参数错误");
}
$field = "id,order_id,account_statement,commission,house_number,is_open";
$field = "id,order_id,account_statement,commission,house_number,is_open,industry_type";
$where_["order_id"] = $params["order_id"];
$where_["father_id"] = 0;
$where_["account_statement"] = 0;
$oBargainModel = new OBargainModel();
$data = $oBargainModel->selectBargainByOrderNo($field, $where_, "id desc");
if (count($data) > 0) {
$list["bargain_id"] = $data[0]["id"];
$list["house_number"] = $data[0]["house_number"];
$list["commission"] = $data[0]["commission"];
$list["is_open"] = $data[0]["is_open"];
$list["bargain_id"] = $data[0]["id"];
$list["house_number"] = $data[0]["house_number"];
$list["commission"] = $data[0]["commission"];
$list["is_open"] = $data[0]["is_open"];
$list["industry_type"] = $data[0]["industry_type"];
return $this->response("200", "request success", $list);
} else {
return $this->response("200", "request null");
......
application/api_broker/controller/Performance.php
View file @ 0254dfb6
......@@ -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", time());
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d",strtotime("-1 day"));
$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/controller/Shop.php
View file @ 0254dfb6
......@@ -9,6 +9,7 @@ use app\model\AttentionModel;
use app\model\GHouses;
use app\model\GHousesFollowUp;
use app\model\GHousesImgs;
use app\model\OBargainModel;
use app\model\Regions;
use think\Log;
......@@ -50,6 +51,7 @@ class Shop extends Basic
"house_id" => 4,
"is_carefully_chosen" => 0, //精选商铺--0否1是
"shop_type" => 0, //商铺类型（0商场，1街铺）
"address" => "111",
"disc" => "黄浦区",
"industry_type" => "休闲娱乐",
"shop_area_start" => 45,//面积起始范围 街铺start和end面积一样
......@@ -58,6 +60,8 @@ class Shop extends Basic
"rent_price_end" => 10000,//租金
"shop_sign" => "临近地铁,临近地铁2",
"agent_id" => 630, //添加经纪人id
"start_time" => "2018-05-25",
"end_time" => "2018-05-30",
"pageNo" => 1,
"pageSize" => 15
);*/
......@@ -88,9 +92,24 @@ class Shop extends Basic
} else if (isset($params['title'])) {
$conditions['internal_title'] = array( "like", "%" . trim($params['title']) . "%" );
}
//c端查对外的名字 b端查对内的名字
if (isset($params['address']) && $params['site_area'] == 1 || $params['site_area'] == 2) {
$conditions['external_address'] = array( "like", "%" . trim($params['address']) . "%" );
} else if (isset($params['title'])) {
$conditions['internal_address'] = array( "like", "%" . trim($params['address']) . "%" );
}
if (isset($params['house_id'])) {
$conditions['id'] = array( "eq", $params['house_id'] );
}
if (isset($params['start_time']) && isset($params['end_time'])) {
$start_time = date('Y-m-d H:i:s',$params['start_time']);
$end_time = date('Y-m-d H:i:s',$params['end_time']);
$conditions['create_time'] = array( 'between', array( $start_time, $end_time ) );
}
$order_ = "";
$spTagArr = array();
switch ($params['site_area']) {
......@@ -200,7 +219,7 @@ class Shop extends Basic
public function getShopDetail()
{
header('Access-Control-Allow-Origin:*');
/* $params = array(
/* $params = array(
"id" => 4,
"site_area" => 3, //1.c端 3.b端
//"user_id" => 2 //if c端 用户登录后传入user_id
......@@ -229,7 +248,7 @@ class Shop extends Basic
a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type,
a.rent_price,a.management_fee,a.slotting_fee,a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude,
b.enter_num,b.internal_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
b.auditorium,b.tiny_brochure_url,b.start_business_date,a.upload_id,b.fee_rule";
b.auditorium,b.tiny_brochure_url,b.start_business_date,a.upload_id,b.fee_rule,b.landlord_remark,b.landlord_phone,a.create_time";
}
$conditions['a.id'] = array( "eq", $params["id"] );
......@@ -262,6 +281,8 @@ class Shop extends Basic
$param["img_type"] = 3;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
$result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1);
$result['landlord_phone'] = json_decode ($result['landlord_phone'], true);
$result['create_time'] = date('Y-m-d', strtotime($result['create_time']));
if ($result['status'] == 0) {
return $this->response("101", '此楼盘已下架');
}
......@@ -274,6 +295,12 @@ class Shop extends Basic
if (count($attResult) > 0)
$result ["attention"] = $attResult[0]["id"];
}
//todo 查询成交报告中的提交的业态拼接到已入驻中
$bargaomModel = new OBargainModel();
$str = $bargaomModel->selectBargainListByHouseId($params["id"]);
$result["enter_num"] .= $str;
$verify = new VerifyService();
$agentId = $verify->getPanpartyAgentsByHouseId($params["id"]);
$result["panParty"] = $agentId;
......
application/api_broker/controller/User.php 0 → 100644
View file @ 0254dfb6
<?php
namespace app\api_broker\controller;
use app\api_broker\extend\Basic;
use app\model\Users;
use think\Request;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/5/30
* Time : 16:49
* Intro:
*/
class User extends Basic
{
private $userModel;
public function __construct($request = null)
{
parent::__construct($request);
$this->userModel = new Users();
}
/**
* 客户搜索条件
* @return \think\Response
*/
public function returnSearchCondition()
{
$result['yetai'] = array( '全部', '轻餐饮', '重餐饮', '百货零售', '服装', '亲子教育', '休闲娱乐' );
//价格需求
$result['money'] = array(
array( 'id' => '-1', 'value' => '全部' ),
array( 'id' => '0', 'value' => '3万以上' ),
array( 'id' => '1', 'value' => '1万-3万' ),
array( 'id' => '2', 'value' => '1万以下' )
);
//面积
$result['acreage'] = array(
array( 'id' => '-1', 'value' => '全部' ),
array( 'id' => '0', 'value' => '30m²以内' ),
array( 'id' => '1', 'value' => '30-60m²' ),
array( 'id' => '2', 'value' => '60-100m²' ),
array( 'id' => '3', 'value' => '100m²以上' )
);
return $this->response("200", "request success", $result);
}
/**
* 客户条件搜索
* @return \think\Response
*/
public function searchUser()
{
$params = $this->params;
/* $params = array(
"user_status" => 1,//客户状态（0：求租；1：已租；-1：无效）
"yetai" => "休闲娱乐",
"area_start" => 45,//面积起始范围 room_area2
"area_end" => 65,//面积结束范围
"money_start" => 1000,//租金 price2
"money_end" => 10000,//租金
"start_time" => "2018-05-25",
"end_time" => "2018-05-30",
"pageNo" => 1,
"pageSize" => 15
);*/
$field = "id as user_id,sex,user_name,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand";
$conditions = [];
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
if (isset($params['user_status'])) {
$conditions['user_status'] = $params['user_status'];
}else{
return $this->response("101", "请求参数错误");
}
if (isset($params['yetai'])) {
$conditions['industry_type'] = array( "like", "%" . trim($params['yetai']) . "%" );
}
$area_start = isset($params['area_start']) ? $params['area_start'] : -1;
$area_end = isset($params['area_end']) ? $params['area_end'] : -1;
if ($area_start >= 0 && $area_end >= 0) { //面积
$conditions['area_demand'] = array( 'between', array( $area_start, $area_end ) );
$conditions['area_demand'] = array( 'between', array( $area_start, $area_end ) );
} else if ($area_start >= 0 && $area_end < 0) { //100米以上不用传结束面积
$conditions['area_demand'] = array( 'egt', $area_start );
$conditions['area_demand'] = array( 'egt', $area_start );
}
$price_start = isset($params['money_start']) ? $params['money_start'] : -1;
$price_end = isset($params['money_end']) ? $params['money_end'] : -1;
if ($price_start >= 0 && $price_end >= 0) { //金额
$conditions['price_demand'] = array( 'between', array( $price_start, $price_end ) );
} else if ($price_start >= 0 && $price_end < 0) {
$conditions['price_demand'] = array( 'egt', $price_start );
}
if (isset($params['start_time']) && isset($params['end_time'])) {
$start_time = date('Y-m-d H:i:s',$params['start_time']);
$end_time = date('Y-m-d H:i:s',$params['end_time']);
$conditions['create_time'] = array( 'between', array( $start_time, $end_time ) );
}
$userList = $this->userModel->selectUserList($field, $conditions,$pageNo, $pageSize, "id desc");
if (empty($userList)) {
return $this->response("200", "此条件没有找到数据");
}
return $this->response("200", 'request success', ["user_date"=>$userList]);
}
}
\ No newline at end of file
application/api_broker/service/LookShopService.php
View file @ 0254dfb6
......@@ -30,12 +30,7 @@ class LookShopService
public function __construct()
{
try {
$this->redis = RedisExt::getRedis();
} catch (RedisException $exception) {
$this->redis = false;
}
$this->redis = RedisExt::getRedis();
$this->nowTime = date("Y-m-d", time());
$this->gHousesToAgentsModel = new GHousesToAgents();
$this->agentsModel = new AAgents();
......
application/api_broker/service/OrderLogService.php
View file @ 0254dfb6
......@@ -123,13 +123,14 @@ class OrderLogService
* @param $commission_arr
* @param $house_number
* @param $is_open
* @param $industry_type
* @return int|string
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function addBargain($submit_agent_id, $submit_agent_name, $report_id, $order_id, $order_no, $trade_type, $price,
$commission, $commission_arr, $house_number, $is_open)
$commission, $commission_arr, $house_number, $is_open,$industry_type)
{
$bargain_arr = [];
$father_id = 0;
......@@ -139,11 +140,11 @@ class OrderLogService
&& isset($commission_val["scale_fee"])) {
if ($father_id == 0) {
$params = $this->bargainBin($father_id, $commission_val, $submit_agent_id, $submit_agent_name, $report_id, $order_id,
$order_no, $trade_type, $price, $commission, $house_number, $is_open);
$order_no, $trade_type, $price, $commission, $house_number, $is_open,$industry_type);
$father_id = $this->bargainModel->insertBargain($params);
} else {
array_push($bargain_arr, $this->bargainBin($father_id, $commission_val, $submit_agent_id, $submit_agent_name, $report_id,
$order_id, $order_no, $trade_type, $price, $commission, $house_number, $is_open));
$order_id, $order_no, $trade_type, $price, $commission, $house_number, $is_open,$industry_type));
}
}
array_push($agent_arr, [ $commission_val["agent_id"] ]);
......@@ -165,7 +166,7 @@ class OrderLogService
}
private function bargainBin($father_id, $commission_val, $submit_agent_id, $submit_agent_name, $report_id, $order_id,
$order_no, $trade_type, $price, $commission, $house_number, $is_open)
$order_no, $trade_type, $price, $commission, $house_number, $is_open,$industry_type)
{
$arr["report_id"] = $report_id;
$arr["father_id"] = $father_id;
......@@ -184,6 +185,7 @@ class OrderLogService
$arr["is_open"] = $is_open;
$arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time());
$arr["industry_type"] = $industry_type;
return $arr;
}
......@@ -298,8 +300,8 @@ class OrderLogService
}
//成交报告
$field_bargain = "a.id,a.house_number,a.is_open,a.report_id,a.order_id,a.trade_type,a.submit_agent_id,a.submit_agent_name,a.price,a.commission,a.role,a.agent_id,a.scale,
a.scale_fee,a.create_time,b.name,b.phone";
$field_bargain = "a.id,a.house_number,a.is_open,a.report_id,a.order_id,a.trade_type,a.submit_agent_id,a.industry_type,
a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone";
$bargainData = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]);
if (count($bargainData) > 0) {
foreach ($bargainData as $k => $v) {
......@@ -816,8 +818,8 @@ class OrderLogService
{
$bargainModel = new OBargainModel();
$bargain_info_filed = "a.id,a.house_number,a.account_time,a.account_statement,a.is_open,a.trade_type,a.price,a.commission,c.id,c.internal_title,
c.internal_address,d.user_id,d.user_phone,d.user_name";
$bargain_info_filed = "a.id,a.house_number,a.account_time,a.account_statement,a.is_open,a.trade_type,a.price,a.industry_type,
a.commission,c.id,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name";
$result = [];
$bargainInfo = $bargainModel->selectBargainDetail($bargain_info_filed, $params);
......
application/api_broker/service/VerifyRepetitionService.php 0 → 100644
View file @ 0254dfb6
<?php
namespace app\api_broker\service;
use app\extra\RedisExt;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/6/6
* Time : 10:28
* Intro:
*/
class VerifyRepetitionService {
private $redis_;
const MARCH_IN_KEY = "_march_in_";
const TIME_OUT = 60; // 超时时间1分钟
public function __construct()
{
$this->redis_ = RedisExt::getRedis();
}
public function verifyStart(int $type,int $agent_id,int $order_id) : bool {
if(!$this->redis_){
return true;
}
$key = "";
switch ($type){
case 1: //进场
$key = self::MARCH_IN_KEY;
break;
case 2:
break;
case 3:
break;
default:
}
if($this->redis_->get($agent_id.$key.$order_id)){
return false;
}else{
$this->redis_->set($agent_id.$key.$order_id,1,self::TIME_OUT);
return true;
}
}
}
\ No newline at end of file
application/app/controller/Index.php
View file @ 0254dfb6
......@@ -52,9 +52,9 @@ class Index
{
return view('index/agreement_app');
}
public function download()
public function download_c()
{
return view('index/download');
return view('index/download_c');
}
public function more_pingjia()
{
......
application/app/view/index/agent_detail.html
View file @ 0254dfb6
......@@ -9,6 +9,12 @@
<meta name="Description" content="" />
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/agent_detail.css">
<style>
/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
display: none;
}
</style>
</head>
<body>
<header id="header">
......@@ -135,6 +141,6 @@
<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
<script src="/app/js/common.js" charset="UTF-8"></script>
<script src="/app/js/agent_detail.js" charset="UTF-8"></script>
<script src="/app/js/agent_detail.js?new1" charset="UTF-8"></script>
</body>
</html>
application/app/view/index/download.html → application/app/view/index/download_c.html 100755 → 100644
View file @ 0254dfb6
......@@ -41,11 +41,15 @@
$('#app_ban').attr('src','/app/images/bg_download.png');
$('title').html('下载');
$('.xiazai-p-fuju').show();
//0是c端，2是b端
$.ajax({
type: "post",
url: "/app/getVersionNo",
type: "get",
url: ServerHostTempC+"/api/getVersionNo",
timeout: 10000,
dataType: "json",
data: {
'type': 0
},
beforeSend: function() {},
success: function(data) {
$('#android_link').attr('href',data.data.app_path);
......
application/app/view/index/more_chengjiao.html
View file @ 0254dfb6
......@@ -9,6 +9,12 @@
<meta name="Description" content="" />
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/agent_detail.css">
<style>
/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
display: none;
}
</style>
</head>
<body>
<header id="header">
......
application/app/view/index/more_pingjia.html
View file @ 0254dfb6
......@@ -9,6 +9,12 @@
<meta name="Description" content="" />
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/agent_detail.css">
<style>
/*因为一些新页面用了vue实现，所以很多这样的元素默认是隐藏的，在common.css里。但原来的文件是需要默认隐藏的*/
.loading_pic_new,.no_more,.zanwu_data,.loading_pic_samll_new{
display: none;
}
</style>
</head>
<body>
<header id="header">
......
application/app_broker/controller/Index.php
View file @ 0254dfb6
......@@ -90,6 +90,11 @@ class Index
return view('index/timeline_pc');
}
public function bargaininfo_detail_pc()
{
return view('index/bargaininfo_detail_pc');
}
public function customerinfo_details_new()
{
return view('index/customerinfo_details_new');
......@@ -105,9 +110,9 @@ class Index
return view('index/imagebody');
}
public function xiazai()
public function download_b()
{
return view('index/xiazai');
return view('index/download_b');
}
public function __construct()
......
application/app_broker/view/index/bargaininfo_detail_pc.html 0 → 100644
View file @ 0254dfb6
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>同联商业</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
<meta name="Keywords" content="" />
<meta name="Description" content="" />
</head>
<body style="display: none;">
<div>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title detail-modal-header-tab">
<a href="javascript:;" class="btn btn-info">成交信息</a>
<a href="javascript:;" class="btn btn-default">分佣提成</a>
<a href="javascript:;" class="btn btn-default">开票税费</a>
</h4>
</div>
<div class="div-seat"></div>
<div class="modal-body detail-modal-body">
<div>
<div class="detail-modal-body-sec">
<form class="detail-modal-bargaininfo-form">
<div class="detail-modal-bargaininfo-main-left">
<span>商铺类型：</span>
<span id="bargaininfo_shop_type"></span>
<br />
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span>
<select class="form-control" id="bargaininfo_type">
<option value="10">出租</option>
<option value="20">增佣</option>
<option value="30">代理</option>
<option value="40">好处费</option>
</select>
<br />
<span>应收总佣金：</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number">元<br>
</div>
<div class="detail-modal-bargaininfo-main-right">
<span>是否开业：</span>
<select class="form-control" id="bargaininfo_is_open">
<option value="0">否</option>
<option value="1">是</option>
</select> <br />
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
</div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
<div class="form-group detail-modal-bargaininfo-commission-sec">
<label class="">实收佣金：</label>
<div class="input-group">
<input type="number" class="form-control" placeholder="请输入">
<div class="input-group-addon">元</div>
</div>
<label class="">收佣日期：</label>
<div class="input-group">
<input type="date" class="form-control" placeholder="请输入">
</div>
<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>-->
</div>
</div>
<div id="bargaininfo_commission_add_btn">
<img src="/resource/image/jia2@2x.png" />
</div>
</div>
<div>
<span class="detail-modal-bargaininfo-span-beizhu">备注：</span>
<textarea id="bargaininfo_beizhu"></textarea>
</div>
</form>
<div class="tc">
<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>
</div>
</div>
<div class="detail-modal-body-sec">
<div class="detail-modal-maid-top-btn-area oh">
<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
<a id="maid_new_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
</div>
<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
<thead>
<tr>
<th class="text-center">分佣方</th>
<th class="text-center">业务员</th>
<th class="text-center">所属部门/门店</th>
<th class="text-center">分佣比例</th>
<th class="text-center">应分佣金(元)</th>
<th class="text-center">实分佣金(元)</th>
<th class="text-center">手续费(元)</th>
<th class="text-center">慈善基金(元)</th>
<th class="text-center">现金奖(元)</th>
<th class="text-center">实收佣金(元)</th>
<th class="text-center">确认时间</th>
</tr>
</thead>
<tbody class="text-center" id="maid_new_table_list">
<!--<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td contenteditable>30%</td>
<td contenteditable>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
</td>
</tr>
<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td contenteditable>30%</td>
<td contenteditable>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
</td>
</tr>-->
</tbody>
</table>
<div class="detail-modal-maid-bottom-btn-area text-right">
<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
</div>
<!--分佣提成-->
</div>
<div class="detail-modal-body-sec">
<div>
<div class="tc">
<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>
</div>
<div id="tax_main_box">
<!--内容为模板生成-->
</div>
</div>
</div>
</div>
</div>
<!-- /.modal-content -->
</div>
<script src="/app/js/libs/require.min.js" data-js="/app/js/bargaininfo_detail_pc.js" data-main="/app/js/main" data-norem="yes" defer async="true"></script>
</body>
</html>
\ No newline at end of file
application/app_broker/view/index/customerinfo_details_new.html
View file @ 0254dfb6
......@@ -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"><img src="/app/images/boy_ic@2x.png" class="sex-icon" /></span></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?new45"></script>
<script src="/app/js/common.js?new40" charset="utf-8"></script>
<script src="/app/js/customerinfo_details_new.js?new47"></script>
</body>
......
application/app_broker/view/index/xiazai.html → application/app_broker/view/index/download_b.html
View file @ 0254dfb6
......@@ -39,14 +39,18 @@
$('#app_ban').attr('src','/app/images/bg_download.png');
$('title').html('下载');
$('.xiazai-p-fuju').show();
//0是c端，2是b端
$.ajax({
type: "post",
url: ServerHostTempC+"/AppTab5/versions",
type: "get",
url: ServerHostTempC+"/api/getVersionNo",
timeout: 10000,
dataType: "json",
data: {
'type': 2
},
beforeSend: function() {},
success: function(data) {
$('#android_link').attr('href',data.apk_url);
$('#android_link').attr('href',data.data.app_path);
},
error: function() {
......
application/chat/controller/AppChat.php
View file @ 0254dfb6
......@@ -254,8 +254,8 @@ class AppChat extends Basic
}
$conditions['id'] = array( "eq", $params["id"] );
$gHousesModel = new GHouses();
//internal_title c端
if ($params["from"] == "b") {
//external_title c端
if ($params["from"] == "C") {
$field = "id,external_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type";
} else {
$field = "id,internal_title as title,shop_area_start,shop_area_end,rent_type,rent_price,shop_type";
......
application/extra/RedisExt.php
View file @ 0254dfb6
......@@ -44,8 +44,12 @@ class RedisExt
public static function getRedis()
{
if (!self::$_instance) {
new self;
try {
if (!self::$_instance) {
new self;
}
} catch (RedisException $exception) {
return false;
}
return self::$_instance;
......
application/index/controller/Collection.php
View file @ 0254dfb6
......@@ -10,6 +10,7 @@ namespace app\index\controller;
use app\index\extend\Basic;
use app\index\untils\ExportExcelUntil;
use app\model\OPayLogModel;
class Collection extends Basic
......@@ -24,7 +25,7 @@ class Collection extends Basic
*/
public function getCollection() {
if ($this->request->isAjax()) {
if ($this->request->isAjax() || $this->params['excel'] == 1) {
$order = new OPayLogModel();
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
......@@ -32,16 +33,16 @@ class Collection extends Basic
$where = [];
if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
$where['a.create_time'] = ['> time',$this->params['start_time']];
$where['a.create_time'] = ['> time',$this->params['start_time'] . ' 00:00:00'];
}
if (!empty($this->params['end_time']) && empty($this->params['start_time'])) {
$where['a.create_time'] = ['< time',$this->params['start_time']];
$where['a.create_time'] = ['< time',$this->params['end_time'] . ' 23:59:59'];
}
if (!empty($this->params['end_time']) && !empty($this->params['start_time'])) {
$where['a.create_time'] = ['between time', [
$this->params['end_time'],$this->params['start_time']
$this->params['end_time']. ' 00:00:00',$this->params['start_time']. ' 23:59:59'
]];
}
......@@ -74,14 +75,87 @@ class Collection extends Basic
$where['e.name'] = ['like','%'.$this->params['report_name'].'%'];
}
$field = 'a.id,a.create_time,c.user_name,c.user_phone,a.money,a.pay_type,a.type,d.internal_title,d.internal_address';
$data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
$data['data']['money_total'] = $order->getMoneyTotal(); //总额
return $this->response(200, "", $data['data']);
if (empty($this->params['excel'])) {
$field = 'a.id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address';
$data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
$data['data']['money_total'] = $order->getMoneyTotal(); //总额
return $this->response(200, "", $data['data']);
} else {
$pageNo = 1;
$pageSize = 50000; //最多5万条数据
$field = 'a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.type,d.internal_address,a.house_number';
$data = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
//付款类型 10意向金 20定金 30保管金 40押金 50 租金 60 进场费 70转让费 80其他
//支付方式 10支付宝 20 微信 30pos机器 40转账 50现金 60其他
foreach ($data as $k => $v) {
switch ($v['pay_type']) {
case 10 :
$data[$k]['pay_type'] = '意向金';break;
case 20 :
$data[$k]['pay_type'] = '定金';break;
case 30 :
$data[$k]['pay_type'] = '保管金';break;
case 40 :
$data[$k]['pay_type'] = '押金';break;
case 50 :
$data[$k]['pay_type'] = '租金';break;
case 60 :
$data[$k]['pay_type'] = '进场费';break;
case 70 :
$data[$k]['pay_type'] = '转让费';break;
default :
$data[$k]['pay_type'] = '其他';
}
switch ($v['type']) {
case 10 :
$data[$k]['type'] = '支付宝';break;
case 20 :
$data[$k]['type'] = '微信';break;
case 30 :
$data[$k]['type'] = 'POS机器';break;
case 40 :
$data[$k]['type'] = '转账';break;
case 50 :
$data[$k]['type'] = '现金';break;
default :
$data[$k]['type'] = '其他';
}
}
$export = new ExportExcelUntil();
$title = [ '收款时间', '客户姓名', '客户手机号', '收款金额（元）', '实付金额（元）', '入账类型','入账方式','商铺地址','商铺号' ];
$export->exportTable('收款记录', $data, 9, '收款记录', $title);
}
} elseif ($this->request->isGet()) {
return view('getCollection');
}
}
public function addRealMoney(){
$params = $this->params;
/* $params = array(
"collection_id" => 1,
"real_money" => 123,
);*/
if(!isset($params["collection_id"]) || $params["collection_id"] <= 0){
return $this->response("101","请求参数错误");
}
if(!isset($params["real_money"]) || $params["real_money"] <= 0){
return $this->response("101","请求参数错误");
}
$where_["id"] = $params["collection_id"];
$where_["real_money"] = $params["real_money"];
$order = new OPayLogModel();
$id = $order->updatePayLog($where_);
if($id > 0 ){
return $this->response("200","编辑成功");
}else{
return $this->response("101","编辑失败");
}
}
}
\ No newline at end of file
application/index/controller/Finance.php
View file @ 0254dfb6
This diff is collapsed.
application/index/controller/Houses.php
View file @ 0254dfb6
......@@ -13,6 +13,7 @@ use app\api\controller\Sublet;
use app\index\extend\Basic;
use app\model\AAgents;
use app\model\GHouses;
use app\model\GHousesImgs;
use app\model\GHousesToAgents;
use app\model\SubletModel;
use think\Request;
......@@ -58,7 +59,7 @@ class Houses extends Basic
if ($this->request->isAjax()) {
//获取商铺详情
$house = new GHouses();
$result['data'] = $house->getHouseById($this->params['id']);
$result['data'] = $house->getHouseById($this->params['id'], 0);
$return = $this->response($result['code'], $result['msg'], $result['data']);
} else {
//商铺添加页面
......@@ -351,4 +352,43 @@ class Houses extends Basic
$agent->commit();
return $this->response(200, '', ['total'=>count($total)]);
}
/**
* 删除图片
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function delHouseFile()
{
$data['status'] = 101;
$data['msg'] = '';
$data['data'] = '';
if (empty($this->params['id'])) {
return $this->response($data['status'], '参数错误', $data['data']);
}
if (empty($this->params['house_id'])) {
return $this->response($data['status'], '参数错误', $data['data']);
}
$img = new GHousesImgs();
$id = $img->getHouseImagesInfo('id', [
'id' => $this->params['id'],
'house_id' => $this->params['house_id'],
'img_status' => 0
]);
if (empty($id['id'])) {
$data['msg'] = '没有该文件';
} else {
$img->editData([ 'img_status' => 1 ], $id['id'], 'id');
$data['status'] = 200;
}
return $this->response($data['status'], $data['msg'], $data['data']);
}
}
\ No newline at end of file
application/index/controller/Member.php
View file @ 0254dfb6
......@@ -3,8 +3,8 @@
namespace app\index\controller;
use app\index\extend\Basic;
use app\model\AAgents;
use app\model\ADistrict;
use app\model\AStore;
use app\model\GOperatingRecords;
use app\model\Users;
use app\model\UPhoneFollowPp;
use think\Request;
......@@ -150,6 +150,43 @@ class Member extends Basic{
$type = 2;
}
//业态
if (!empty($params['industry_type'])) {
$where['a.industry_type'] = $params['industry_type'];
}
//面积需求
if (!empty($params['area_type'])) {
switch ($params['area_type']) {
case 1 :
$where['a.area_demand'] = ['<=', 30];break;
case 2 :
$where['a.area_demand'] = ['between', [30,60]];break;
case 4 :
$where['a.area_demand'] = ['between', [60,100]];break;
default :
$where['a.area_demand'] = ['>', 100];
}
}
//价格需求
if (!empty($params['price_type'])) {
switch ($params['price_type']) {
case 1 :
$where['a.price_demand'] = ['<=', 10000];break;
case 2 :
$where['a.price_demand'] = ['between', [10000,30000]];break;
default :
$where['a.price_demand'] = ['>', 30000];
}
}
if (!empty($params['invite_agent_phone'])) {
$type = 4;
$where['b.phone'] = $params['invite_agent_phone'];
}
/* //最后登录开始时间
if (!empty($params['login_time_start']) && empty($params['login_time_end'])) {
$where['a.last_login_time'] = ['> time',$params['last_login_time']. ' 00:00:00'];
......@@ -165,18 +202,33 @@ class Member extends Basic{
$where['a.last_login_time'] = ['between time', [$params['login_time_start']. ' 00:00:00', $params['login_time_end']. ' 23:59:59']];
}*/
if (!empty($params['store_name'])) {
//客方门店
if (!empty($params['store_name']) && empty($params['referrer_store_name'])) {
$store = new AStore();
$where['b.store_id'] = $store->getStoreKeyById('id', ['store_name'=>$params['store_name']]);
$type = 3;
}
if (!empty($params['district_id']) && $params['district_id'] != -1) {
//邀请人门店
if (!empty($params['referrer_store_name']) && empty($params['store_name'])) {
$store = new AStore();
$where['b.store_id'] = $store->getStoreKeyById('id', ['store_name'=>$params['referrer_store_name']]);
$type = 4;
}
//客方部门
if (!empty($params['district_id']) && $params['district_id'] != -1 && empty($params['referrer_district_id'])) {
$where['b.district_id'] = $params['district_id'];
$type = 3;
}
$fields = 'a.id,a.user_nick,a.user_phone,a.user_pic,a.create_time,a.user_pswd,a.referrer_id,a.registration_time,a.user_name,a.last_login_ip,a.status';
//邀请人部门
if (!empty($params['referrer_district_id']) && empty($params['district_id'])) {
$where['b.district_id'] = $params['referrer_district_id'];
$type = 4;
}
$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.registration_time,a.user_name,a.last_login_ip,a.status';
$data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);
$data['total'] = $this->user->getUserAgentTotal($where, $type);
$return = $this->response($data['status'], $data['msg'], $data);
......@@ -212,13 +264,17 @@ class Member extends Basic{
}
if (empty($user_data) && $params['type'] == 'add') {
$insert_data['user_nick'] = $params['realname'];
$insert_data['sex'] = $params['sex'];
$insert_data['user_name'] = $params['user_name'];
$insert_data['user_phone'] = $params['user_phone'];
$insert_data['user_pswd'] = md5(md5($params['pwd']).'+123');
$insert_data['status'] = 0;
$insert_data['status'] = -1;
$insert_data['create_time'] = $date;
$insert_data['update_time'] = $date;
$insert_data['source'] = $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;
......@@ -229,6 +285,7 @@ class Member extends Basic{
}
} else {
if (!empty($user_data) && $params['type'] == 'edit'){
$insert_data['sex'] = $params['sex'];
$user_data->user_nick = $params['realname'] ? $params['realname'] : $user_data->user_nick;
$user_data->user_phone = $params['user_phone'] ? $params['user_phone'] : $user_data->user_phone;
$user_data->user_pswd = $params['pwd'] != $user_data->user_pswd ? md5(md5($params['pwd']).'+123') : $user_data->user_pswd;
......@@ -291,10 +348,6 @@ class Member extends Basic{
public function pcEditClient() {
$data = [];
if (empty($this->params['user_nick']) || empty($this->params['user_phone'])) {
return $this->response(101, 'user_nick or user_phone or id is null');
}
if ($this->request->isPost()) {
//编辑用户
......@@ -328,7 +381,7 @@ class Member extends Basic{
if ($result == -1) {
return $this->response(101, '该用户已经存在！');
}
$this->params['id'] = $result;
}
......@@ -381,9 +434,16 @@ class Member extends Basic{
$user_data = $user->getUserByWhere(['agent_id' => $this->params['old_agents_id']], 'id');
$user_data_arr = [];
$records = new GOperatingRecords();
$agent = new AAgents();
foreach ($user_data as $k=>$v) {
$user_data_arr[$k]['id'] = $v['id'];
$user_data_arr[$k]['agent_id'] = $this->params['agents_id'];
$agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
$remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone'];
$records->record($this->userId, 3, $remark, 0, $v['id']);
}
$total = $user->updateUserAll($user_data_arr);
......
application/index/controller/Remark.php
View file @ 0254dfb6
......@@ -156,8 +156,9 @@ class Remark extends Basic
}
$user = new Users();
$user_res = $user->useraction_search_user_res($user_id);
$user_res = $user->useraction_search_user_res($user_id, 1);
$user_res['user_pic'] = HEADERIMGURL.$user_res['user_pic'];
$table = new AAgents();
$Agents_res = $table->Agents_res($user_res['agent_id']);
......
application/index/untils/ExportExcelUntil.php
View file @ 0254dfb6
......@@ -12,11 +12,15 @@ namespace app\index\untils;
class ExportExcelUntil
{
/**
* @param $file_name
* @param $data
* @param $row
* 导出Excel
*
* @param string $file_name 文件名
* @param array $data 数据
* @param int $field_num 字段数量
* @param string $table_title 表格title
* @param array $title 表格字段
*/
public function exportTable(string $file_name, array $data, int $row, $table_title = "", array $title = []) {
public function exportTable(string $file_name, array $data, int $field_num, $table_title = "", array $title = []) {
$filename = $file_name. '-' .date('YmdHis').".xlsx";
//设置 header，用于浏览器下载
header('Content-disposition: attachment; filename="'.$filename.'"');
......@@ -36,7 +40,7 @@ class ExportExcelUntil
$class_xls->writeSheetRow('Sheet1', $row_data);
}
$class_xls->markMergedCell('Sheet1', $start_row = 0, $start_col = 0, $end_row = 0, $end_col = $row);
$class_xls->markMergedCell('Sheet1', $start_row = 0, $start_col = 0, $end_row = 0, $end_col = $field_num);
$class_xls->writeToStdOut();
return ;
}
......
application/index/view/auth/auth_rule_index.html
View file @ 0254dfb6
......@@ -8,7 +8,7 @@
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li><a href="#">权限管理</a></li>
<li class="active">新增66</li>
<li class="active">新增</li>
<div class="pull-right">
<ul class="bread_btn">
<li>
......@@ -88,7 +88,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">上级菜单：</label>
<select class="form-control btn6" name="pid" id="pid">
<select class="form-control btn6" name="pid2" id="pid">
</select>
</div>
......
application/index/view/collection/getCollection.html
View file @ 0254dfb6
......@@ -2,7 +2,7 @@
<input type="hidden" class="page-load" id="getCollection" />
<style>
.modal-body{
height: 600px;
/*height: 600px;*/
overflow-y: auto;
padding-bottom: 60px;
}
......@@ -43,7 +43,7 @@
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<td colspan="9">
<td colspan="10">
<form id="form_search">
<span class="fore-span ld-Marheight">收款时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date">
......@@ -60,7 +60,7 @@
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
<span class="money_total_two fore-span ld-Marheight ">总额：</span><span id="money_total" class="money_total_two fore-span ld-Marheight"></span>
<span class="btn btn-info btn3 ld-Marheight" id="exporting_report">导出报表</span>
<span class="btn btn-info btn3 ld-Marheight" id="export">导出报表</span>
</form>
</form>
</td>
......@@ -70,10 +70,12 @@
<th class="text-center">客户姓名</th>
<th class="text-center">客户手机号</th>
<th class="text-center">收款金额（元）</th>
<th class="text-center">实付金额（元）</th>
<th class="text-center">入账类型</th>
<th class="text-center">入账方式</th>
<th class="text-center">商铺地址</th>
<th class="text-center">商铺名称</th>
<th class="text-center">商铺号</th>
<th class="text-center">操作</th>
</tr>
</thead>
......@@ -91,6 +93,52 @@
</div>
</div>
</div>
<!--时间轴-->
<div class="modal fade" id="modal-time" 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" class="iframe-div-parent">
<iframe class="iframe-time-line"></iframe>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<div class="modal fade" id="modal-linetime" 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">
<div class="modal-body" id="del_msg">
实付金额：<input type="number" id='real_money'/>元
</div>
</div>
<div class="modal-footer">
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>-->
<button type="button" class="btn btn-primary submit_edit" id=" " data-dismiss="modal">
保存
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
......
application/index/view/finance/account_statement.html
View file @ 0254dfb6
......@@ -28,9 +28,15 @@
<tr>
<td colspan="9">
<form id="maintable_form_search">
<span class="fore-span">提交时间:</span>
<span class="fore-span">商铺类型:</span>
<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type">
<option value="-1">请选择</option>
<option value="0">商场</option>
<option value="1">街铺</option>
</select>
<span class="fore-span margin-left-10">提交时间:</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>
<span class="fore-span margin-left-10">至</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="">
......@@ -92,6 +98,7 @@
<br />
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>业态：</span>&nbsp;<input class="form-control" id="bargaininfo_yetai" type="text"><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span>
<select class="form-control" id="bargaininfo_type">
......@@ -113,6 +120,7 @@
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" type="number">元
</div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
......
application/index/view/finance/account_statement_newtri.html 0 → 100644
View file @ 0254dfb6
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="reportList" />
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="#">成交报告</a>
</li>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<td colspan="9" class="maintable-top-sub-tr">
<a class="btn btn-info liudan_pic_btn">第一级审核</a>
<a class="btn btn-default liudan_pic_btn">第二级审核</a>
<a class="btn btn-default liudan_pic_btn">第三级审核</a>
<a class="btn btn-default liudan_pic_btn">已结单</a>
</td>
</tr>
<!--三级审核的搜索功能-->
<tr>
<td colspan="9">
<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="">
<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_export">导出excel</span>-->
</form>
</td>
</tr>
<tr class="maintable-tr-bar">
<th class="text-center">提交时间</th>
<th class="text-center">商铺地址</th>
<th class="text-center">商铺号</th>
<th class="text-center">成交客户</th>
<th class="text-center">客户电话</th>
<th class="text-center">成交类型</th>
<th class="text-center">应收佣金（元）</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody class="text-center" id="maintable_list">
</tbody>
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 弹出框 详情 -->
<div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<!--<div class="modal-content">
</div>-->
<iframe class="modal-content"></iframe>
<!-- /.modal -->
</div>
</div>
<!-- 弹出框 通过 -->
<div class="modal fade" id="modal-pass" 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_beizhu"></textarea>
<!-- <span class="use-span text-danger">(必填)</span> -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-info" data-dismiss="modal" class="pass-modal-btn-pass" id="pass_ok_btn">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 时间轴 -->
<div class="modal fade" id="modal-time" 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" class="iframe-div-parent">
<iframe class="iframe-time-line"></iframe>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 分佣提成新增 -->
<div class="modal fade" id="modal_new_maid" 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">
<div class="modal-body" id="addmaid_input_area">
<div>
<span>分佣方：</span>
<select class="form-control" id="addmaid_input_servant">
<option value="">请选择</option>
<option value="1">盘方</option>
<option value="2">客方</option>
<option value="3">反签</option>
<option value="4">独家</option>
<option value="5">合作方</option>
</select>
</div>
<div class="po-relative">
<span>业务员：</span><input class="form-control" type="text" id="addmaid_input_ywy" />
<ul>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
<li data-id="5755">5755-测试-小杨业务员-17621975554</li>
</ul>
</div>
<div>
<span>所属门店：</span><input class="form-control" type="text" id="addmaid_input_shop" />
</div>
<div>
<span>分佣比例：</span><input class="form-control" type="number" id="addmaid_input_ratio" /><span>%</span>
</div>
<div>
<span>应分佣金：</span><input class="form-control" type="number" id="addmaid_input_cash" /><span>元</span>
</div>
</div>
</div>
<div class="modal-footer">
<div href="#modal_new_maid_select" data-toggle="modal">打开盘方业务员选择框</div>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="addmaid_ok_btn">确定</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 分佣提成新增,选择盘方,多个的时候选择一业务员 -->
<div class="modal fade" id="modal_new_maid_select" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop='static'>
<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">
<ul id="addmaid_select_ul">
</ul>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 开票税费新增 -->
<div class="modal fade" id="modal_new_tax" 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">
<div>
<div>
<div class="form-group addtax-modal-tax-commission-sec">
<label class="">开票金额：</label>
<div class="input-group"><input type="number" class="form-control" placeholder="请输入" id="addtax_commission_input">
<div class="input-group-addon">元</div>
</div>
<label class="">开票日期：</label>
<div class="input-group"><input type="date" class="form-control" placeholder="请输入" id="addtax_date"></div>
</div>
<div>
<table class="table-haveborder addtax-modal-tax-table">
<!--<tr>
<td>分佣方</td>
<td>业务员</td>
<td>分佣比例</td>
<td>税费</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>-->
</table>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="addtax_commission_addok">确定</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
application/index/view/finance/commission.html
View file @ 0254dfb6
......@@ -129,6 +129,7 @@
<br />
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>业态：</span>&nbsp;<input class="form-control" id="bargaininfo_yetai" disabled="disabled" type="text"><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span>
<select class="form-control" id="bargaininfo_type" disabled="disabled">
......@@ -150,6 +151,7 @@
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元
</div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
......
application/index/view/finance/finance_update_log.html 0 → 100644
View file @ 0254dfb6
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="finance_update_log" />
<style>
#note_text {
width: 80%;
margin-left: 48px;
margin-top: -20px;
}
#note_text_re {
width: 80%;
margin-left: 48px;
margin-top: -20px;
}
.Tswitch_one {
display: none;
}
.Tswitch_two {
display: none;
}
.left {
float: left;
width: 340px;
line-height: 36px;
}
.right {
line-height: 36px;
}
.btn_2 {
width: 60px;
display: inline-block;
height: 26px;
padding: 3px 6px
}
.edit_new {
float: right;
margin-bottom: 5px;
margin-top: -10px;
}
.form-control-one {
display: inline-block;
width: 40%;
}
#form_search {
line-height: 48px;
}
.modal-body-two {
height: 500px;
overflow-y: scroll;
}
.btn2-2{
width: 9%!important;
}
</style>
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="#">财务修改日志</a>
</li>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<td colspan="10">
<form id="form_search">
<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" 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_time" name="end_date" type="date">
<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="">-->
<input class="form-control btn2 ld-Marheight btn2-2" data-rule-phoneus="false" data-rule-required="false" id="store_num" placeholder="商铺号" type="text" value="">
<input class="form-control btn2 ld-Marheight btn2-2" 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_phone" placeholder="修改人手机号" type="text" value="">
<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>
<tr>
<th class="text-center">修改时间</th>
<th class="text-center">修改内容</th>
<th class="text-center">修改人</th>
</tr>
</thead>
<tbody class="text-center" id="business_list">
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 弹出框 编辑 -->
<div class="modal fade" id="modal-details" 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">
<span class="btn btn-info" id="information">成交信息</span>
<span class="btn btn-default caozuo" id="fees">分佣提成</span>
<span class="btn btn-default" id="records">收款记录</span>
</h4>
</div>
<div class="modal-body modal-body-two">
<div class="Tswitch">
<div class="left">
<span>商铺地址：</span><span class="internal_address"></span><br>
<span>客户姓名：</span><span class="user_name"></span><br>
<span>应收总佣金：</span>&nbsp;<input class="form-control btn_2 commission" type="text">元<br>
<span>实收佣金：</span>&nbsp;<input class="form-control btn_2 practical_fee" type="text">元<br>
</div>
<div class="right">
<span>商铺名称：</span><span class="internal_title"></span><br>
<span>客户电话：</span><span class="user_phone"></span><br>
<span>提交日期：</span><span class="create_time"></span><br>
</div>
<input type="hidden" class="page-pass" />
</div>
<div class="Tswitch Tswitch_one">
<!--分佣提成-->
<a class="btn btn-success edit_new" href="#modal-new" data-toggle="modal">新增</a>
<table class="table table-striped table-bordered table-hover table-condensed" id="caozuo_hide">
<thead>
<tr>
<th class="text-center">分佣方</th>
<th class="text-center">业务员</th>
<th class="text-center">所属门店</th>
<th class="text-center">分佣比例</th>
<th class="text-center">应分佣金（元）</th>
<th class="text-center">实分佣金</th>
<th class="text-center">备注</th>
</tr>
</thead>
<tbody class="text-center" id="caozuo_table">
</table>
<!--分佣提成-->
</div>
<div class="Tswitch Tswitch_two">
<table class="table table-striped table-bordered table-hover table-condensed" id="tcaozuo_hide">
<thead>
<tr>
<th class="text-center">入账时间</th>
<th class="text-center">入账金额（元）</th>
<th class="text-center">入账类型</th>
<th class="text-center">入账方式</th>
<th class="text-center">操作人</th>
</tr>
</thead>
<tbody class="text-center" id="tcaozuo_table">
</table>
</div>
<br><br><br><br>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="confirm_edit">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 弹出框 时间 -->
<div class="modal fade" id="modal-linetime" 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">
<div class="modal-body" id="del_msg">
时间轴
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id=" ">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 分佣提成新增 -->
<div class="modal fade" id="modal-new" 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">
<div class="modal-body" id="">
<!-- 新增分佣提成 -->
<form id="form_search">
分佣方：&nbsp;&nbsp;&nbsp;
<select class="form-control form-control-one" id="is_carefully_chosen">
<option value="0">请选择</option>
<option value="1">盘方</option>
<option value="2">客方</option>
<option value="3">反签</option>
<option value="4">独家</option>
<option value="5">合作方</option>
</select><br>
<span>业务员：&nbsp;&nbsp;&nbsp;</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id=" " placeholder="" type="text" value=""><br>
<span>所属门店：</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id=" " placeholder="" type="text" value=""><br>
<span>分佣比例：</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id="commission-rate" placeholder="" type="text" value=""><br>
<span>应分佣金：</span><input class="form-control form-control-one" data-rule-phoneus="false" data-rule-required="false" id="should-commission" placeholder="" type="text" value=""><br>
</form>
<!-- 新增分佣提成 -->
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="new-commission">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
application/index/view/finance/tax.html
View file @ 0254dfb6
......@@ -129,6 +129,7 @@
<br />
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>业态：</span>&nbsp;<input class="form-control" id="bargaininfo_yetai" disabled="disabled" type="text"><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span>
<select class="form-control" id="bargaininfo_type" disabled="disabled">
......@@ -150,6 +151,7 @@
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元
</div>
<div class="detail-modal-bargaininfo-commission-inputpar">
<div class="detail-modal-bargaininfo-commission-addarea">
......
application/index/view/houses/edit.html
View file @ 0254dfb6
{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">
<div class="panel panel-default">
<div class="panel-heading">新增商铺</div>
<div class="panel-body">
<form class="form-inline">
<form class="form-inline" id="main_form">
<ul class="list-group">
<li class="list-group-item">
<div class="form-group">
......@@ -444,13 +143,20 @@
</label>-->
</li>
<li class="list-group-item">
<div class="form-group" id="li_landlord_phone_input">
<label for="internalName">房东手机号</label>
<div class="form-group phone-list-container landlord-form-group">
<input type="tel" class="form-control phone_jia" placeholder="请输入" name="landlordPhone" id="landlordPhone" data-alert="请填写房东手机号！" data-addtype="landlord">
<label>房东称呼和手机号</label>
<div class="landlord-form-group">
<div class="form-group phone-list-container">
<input type="text" class="form-control landlord-name-input" placeholder="请输入房东称呼" />
<input type="tel" class="form-control landlord-phone-input" placeholder="请输入房东手机号" name="landlordPhone" id="landlordPhone" data-alert="请填写房东手机号！">
</div>
</div>
<img src="/resource/image/jia2@2x.png" class="input-add-tel input-add-tel-landlord" data-addtype="landlord" id="landlord_tel_jia" />
</div><br>
<img src="/resource/image/jia2@2x.png" class="input-add-tel-landlord" id="landlord_tel_jia" />
</div>
</li>
<li class="list-group-item">
<div class="form-group">
<label for="internalName">对内商铺名称</label>
<input type="text" class="form-control" placeholder="请输入" name="internalName" id="internalName" data-alert="请填写对内商铺名称！">
......@@ -564,11 +270,11 @@
<label for="">营业时间</label>
<input type="text" class="form-control" id="yingyeTime" data-alert="请填写营业时间！">
</div>
<div class="form-group">
<div class="form-group shangchang-show-part">
<label for="">招商时间</label>
<input type="date" class="form-control" id="kaipanTime" data-alert="请填写招商时间！">
</div>
<div class="form-group">
<div class="form-group shangchang-show-part">
<label for="">开业时间</label>
<input type="date" class="form-control" id="kaiyeTime" data-alert="请填写开业时间！">
</div>
......@@ -731,4 +437,12 @@
<div id="main_loading_pic">
<img src="/resource/image/jz2.gif" />
</div>
</div>
\ No newline at end of file
</div>
<script id="my_tpl_landlord_phone1" type="text/template">
<div class="form-group phone-list-container">
<input type="text" class="form-control landlord-name-input" value="{name}" placeholder="请输入房东称呼" />
<input type="tel" class="form-control landlord-phone-input" value="{phone}" placeholder="请输入房东手机号" name="landlordPhone" data-alert="请填写房东手机号！">
<img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>
</div>
</script>
\ No newline at end of file
application/model/AAgents.php
View file @ 0254dfb6
This diff is collapsed.
application/model/AppointWatchShop.php
View file @ 0254dfb6
This diff is collapsed.
application/model/Evaluate.php
View file @ 0254dfb6
This diff is collapsed.
application/model/GHouses.php
View file @ 0254dfb6
This diff is collapsed.
application/model/GHousesFollowUp.php
View file @ 0254dfb6
This diff is collapsed.
application/model/OBargainLogModel.php 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
application/model/OBargainModel.php
View file @ 0254dfb6
This diff is collapsed.
application/model/OReportModel.php
View file @ 0254dfb6
This diff is collapsed.
application/model/Regions.php
View file @ 0254dfb6
This diff is collapsed.
application/model/Users.php
View file @ 0254dfb6
This diff is collapsed.
application/route.php
View file @ 0254dfb6
This diff is collapsed.
public/app/css/bargaininfo_detail_pc.css 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/css/bootstrap-theme.min.css 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/css/bootstrap.css 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/css/common.css
View file @ 0254dfb6
This diff is collapsed.
public/app/css/customerinfo_details_new.css
View file @ 0254dfb6
This diff is collapsed.
public/app/css/details_tl.css
View file @ 0254dfb6
This diff is collapsed.
public/app/dist/index.html
View file @ 0254dfb6
This diff is collapsed.
public/app/dist/static/js/app.e816a78c0f46a71f5457.js 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/dist/static/js/app.e816a78c0f46a71f5457.js.map 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/images/icon_bianji@2x.png 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/js/agent_detail.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/app_jump.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/bargaininfo_detail_pc.js 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/js/customer_gj.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/customerinfo_details_new.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/detaila_tl.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/libs/bootstrap.min.js 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/js/main.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/more_pingjia.js
View file @ 0254dfb6
This diff is collapsed.
public/app/js/share_register.js
View file @ 0254dfb6
This diff is collapsed.
public/app/template/reportList_maid_sub1_template_tpl.html 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/template/reportList_maid_template_tpl.html 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/app/template/reportList_shuiFee_template_tpl.html 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/resource/css/report_list.css
View file @ 0254dfb6
This diff is collapsed.
public/resource/css/report_list_newtri.css 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/resource/css/shop_edit.css 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/auth_rule_index.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/commission.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/finance_update_log.js 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/getCollection.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/main.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/reportList.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/reportList_newtri.js 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/storeList.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/tax.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/js/user.js
View file @ 0254dfb6
This diff is collapsed.
public/resource/lib/js/jquery.validate.min.js 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/resource/template/financeUpdateLog_template_tpl.html 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/static/pay_img/icon_alipay.png 0 → 100644
View file @ 0254dfb6
This diff is collapsed.
public/static/pay_img/icon_weixin_pay.png 0 → 100644
View file @ 0254dfb6
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