Commit cf9af5f1 authored by clone's avatar clone

Merge branch 'test'

parents 0f523e08 a6aafb76
File added
...@@ -26,7 +26,7 @@ class Member extends Basic ...@@ -26,7 +26,7 @@ class Member extends Basic
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function login() { public function login() {
return $this->response(101, '版本升级,请去官网或应用商店下载更新APP!');
$data['data'] = array(); $data['data'] = array();
$data['status'] = 101; $data['status'] = 101;
...@@ -172,6 +172,7 @@ class Member extends Basic ...@@ -172,6 +172,7 @@ class Member extends Basic
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function register() { public function register() {
return $this->response(101, '版本升级,请去官网或应用商店下载更新APP!');
$type = $this->request->param('type'); $type = $this->request->param('type');
$phone = $this->request->param('phone'); $phone = $this->request->param('phone');
$pwd = $this->request->param('pwd'); $pwd = $this->request->param('pwd');
......
...@@ -15,6 +15,7 @@ use app\model\GLabels; ...@@ -15,6 +15,7 @@ use app\model\GLabels;
use app\model\HouseImgs; use app\model\HouseImgs;
use app\model\HouseInfos; use app\model\HouseInfos;
use app\model\Labels; use app\model\Labels;
use app\model\OMarchInModel;
use app\model\Regions; use app\model\Regions;
class Shop extends Basic class Shop extends Basic
...@@ -232,7 +233,7 @@ class Shop extends Basic ...@@ -232,7 +233,7 @@ class Shop extends Basic
} }
$result['yetai'] = array( '全部', '餐饮美食', '百货零售', '休闲娱乐', '其他' ); $result['yetai'] = array( '全部', '餐饮美食', '百货零售', '服装', '亲子教育', '休闲娱乐', '办公', '其他' );
//租金租金(0:租金-大于三万; 1:租金一万到三万之间; 2:租金-小于一万) //租金租金(0:租金-大于三万; 1:租金一万到三万之间; 2:租金-小于一万)
$result['money'] = array( array( 'id' => '-1', 'value' => '全部' ), array( 'id' => '0', 'value' => '3万以上' ), $result['money'] = array( array( 'id' => '-1', 'value' => '全部' ), array( 'id' => '0', 'value' => '3万以上' ),
...@@ -240,7 +241,8 @@ class Shop extends Basic ...@@ -240,7 +241,8 @@ class Shop extends Basic
//面积 //面积
$result['acreage'] = array( array( 'id' => '-1', 'value' => '全部' ), array( 'id' => '0', 'value' => '30m²以内' ), $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²以上' ) ); array( 'id' => '1', 'value' => '30-60m²' ), array( 'id' => '2', 'value' => '60-100m²' ), array( 'id' => '3', 'value' => '100-300m²' )
, array( 'id' => '4', 'value' => '300-500m²' ), array( 'id' => '5', 'value' => '500m²以上' ) );
$result['more'][] = "全部"; $result['more'][] = "全部";
$labelsResult = $this->labels->getLabels(); $labelsResult = $this->labels->getLabels();
...@@ -254,4 +256,55 @@ class Shop extends Basic ...@@ -254,4 +256,55 @@ class Shop extends Basic
} }
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} }
/**
* 商铺列表进场统计
* @return \think\Response
*/
public function getMarchInList()
{
$params = $this->params;
/* $params = array(
"house_id" => 7277,
"is_return_list" => 2,//1只返回统计2,返回列表
"page_no" => 1,
"page_size" => 15
);*/
$checkResult = $this->validate($params, "ShopValidate.getMarchInList");
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
$page_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$marchInModel = new OMarchInModel();
$attentionModel = new AttentionModel();
$week_time = date("Y-m-d", strtotime("-7 day"));
$month_time = date("Y-m-d", strtotime("-30 day"));
$week_params['house_id'] = $params['house_id'];
$week_params['create_time'] = array( 'gt', $week_time );
$month_params['house_id'] = $params['house_id'];
$month_params['create_time'] = array( 'gt', $month_time );
$result_week = $marchInModel->getMarchInNum($week_params);
$result_month = $marchInModel->getMarchInNum($month_params);
$attention = $attentionModel->getAttentionNumByHouseId($week_params);
$result["week"] = $result_week[0]["num"];
$result["month"] = $result_month[0]["num"];
$result["last_march_in"] = empty($result_month[0]["create_time"]) ? "" : $result_month[0]["create_time"];
$result["attention"] = $attention + 50;//todo 产品定义
if ($params["is_return_list"] == 2) {
$field = "a.create_time,c.name,c.img";
$marchInList = $marchInModel->getMarchInList($field, $month_params, $page_no, $page_size);
$result["list"] = $marchInList;
$result["img_path"] = AGENTHEADERIMGURL;
}
return $this->response("200", "success", $result);
}
} }
\ No newline at end of file
...@@ -44,4 +44,18 @@ class Version extends Basic ...@@ -44,4 +44,18 @@ class Version extends Basic
$versionResult = $this->appVersion->getVersion($type); $versionResult = $this->appVersion->getVersion($type);
return $this->response("200", "request success", $versionResult); return $this->response("200", "request success", $versionResult);
} }
/**
* 获取最近版本号
* @return \think\Response
*/
public function getVersionNoV2()
{
$type = $this->params["type"]; //0 c端安卓 1c端苹果 2b端安卓 3b端苹果
if(isset($type)){
$this->response("101","请求的设备类型不能为空");
}
$versionResult = $this->appVersion->getVersion($type);
return $this->response("200", "request success", $versionResult);
}
} }
\ No newline at end of file
...@@ -58,6 +58,8 @@ class Basic extends Controller ...@@ -58,6 +58,8 @@ class Basic extends Controller
"api/convertMarchIn", "api/convertMarchIn",
"api/convertCollectingBill", "api/convertCollectingBill",
"api/getVersionNo", "api/getVersionNo",
"api/getVersionNoV2",
"api/getMarchInList",
); );
/** /**
......
<?php
namespace app\api\validate;
use think\Validate;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/7/27
* Time : 10:01
* Intro:
*/
class ShopValidate extends Validate
{
protected $rule = [
'house_id' => 'require|number|gt:0',
'is_return_list' => 'require|in:1,2'
];
protected $message = [
'house_id.require' => '楼盘id为必填字段',
'house_id.number' => '楼盘id只能为数字',
'house_id.gt' => '楼盘id必须大于0',
'is_return_list.require' => "必填参数缺失",
'is_return_list.in' => "请求参数值错误"
];
protected $scene = [
'getMarchInList' => [ 'house_id', 'is_return_list' ],
];
}
\ No newline at end of file
...@@ -141,10 +141,12 @@ class Broker extends Basic ...@@ -141,10 +141,12 @@ class Broker extends Basic
return $this->response(101, '密码错误'); return $this->response(101, '密码错误');
} }
//判断设备id是否存在 //判断设备id是否存在
if ($params["phone"] != "13918937742") {
$is_login = $this->brokerService->judgeBand($params["device_id"], $agents_data['id'], $params["model"], 0, $params["push_id"], 0); $is_login = $this->brokerService->judgeBand($params["device_id"], $agents_data['id'], $params["model"], 0, $params["push_id"], 0);
if (!$is_login) { if (!$is_login) {
return $this->response("102", "该账号没有绑定该手机,请致电人事进行绑定。"); return $this->response("102", "该账号没有绑定该手机,请致电人事进行绑定。");
} }
}
$agents_data['last_login_ip'] = ip2long($this->request->ip()); $agents_data['last_login_ip'] = ip2long($this->request->ip());
$agents_data['last_login_time'] = date('Y-m-d H:i:s'); $agents_data['last_login_time'] = date('Y-m-d H:i:s');
...@@ -269,38 +271,31 @@ class Broker extends Basic ...@@ -269,38 +271,31 @@ class Broker extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/*$params['content']='跟进内容';//跟进内容 /*
$params['content']='跟进内容';//跟进内容
$params['labels_id']=1;//g_labels表主键 $params['labels_id']=1;//g_labels表主键
$params['user_id']=1;//u_users ID用户表id $params['user_id']=1;//u_users ID用户表id
$params['agent_id']=1;//agent表id-当前登录用户id $params['agent_id']=1;//agent表id-当前登录用户id
$params['type']='1';//B端agent表*/ $params['type']='1';//0电话跟进 1普通跟进
*/
if (!isset($params['content']) || !isset($params['user_id'])) { $checkResult = $this->validate($params, "BrokerValidate.verifyStatus");
return $this->response("300", "参数不全", [ 'remote_groupid' => '' ]); if (true !== $checkResult) {
return $this->response("300", $checkResult);
} }
$content = $params['content'];
$labels_id = empty($params['labels_id']) ? 0 : $params['labels_id'];
$user_id = $params['user_id']; $user_id = $params['user_id'];
$agent_id = $params['agent_id'];
$user_status = $params['user_status']; $user_status = $params['user_status'];
$type = $params['type'];//0电话跟进 1普通跟进
//主表查询商铺详细信息 //主表查询商铺详细信息
$UPhoneFollowPp = new UPhoneFollowPp(); $UPhoneFollowPp = new UPhoneFollowPp();
$UPhoneFollowPp->content = $content; $result = $UPhoneFollowPp->savePhoneFollow($params);
$UPhoneFollowPp->labels_id = $labels_id;
$UPhoneFollowPp->user_id = $user_id;
$UPhoneFollowPp->agent_id = $agent_id;
$UPhoneFollowPp->type = $type;
$UPhoneFollowPp->user_status = $user_status;
$UPhoneFollowPp->save();
//dump($UPhoneFollowPp->id);exit;
//跟进,对客户状态进行更新 0:求租;1:已租;-1:无效 //跟进,对客户状态进行更新 0:求租;1:已租;-1:无效
$Users = new Users(); $Users = new Users();
$Users->update_user_status([ 'id' => $user_id, 'user_status' => $user_status ]); $Users->update_user_status([ 'id' => $user_id, 'user_status' => $user_status ]);
if ($UPhoneFollowPp->id) { if ($result == 1) {
return $this->response("200", "success!", $UPhoneFollowPp->id); return $this->response("200", "success!", $result);
} else { } else {
return $this->response("101", "失败!"); return $this->response("101", "失败!");
} }
......
<?php <?php
/** /**
* Created by PhpStorm. * Created by PhpStorm.
* User: fuju * User: hu jun
* Date: 2018/6/12 * Date: 2018/6/12
* Time: 17:21 * Time: 17:21
*/ */
...@@ -80,11 +80,11 @@ class News extends Basic ...@@ -80,11 +80,11 @@ class News extends Basic
} }
$comment = new SNewsComment(); $comment = new SNewsComment();
$field_news = 'id,title,s_label_id,cover_plan,content,create_time'; $field_news = 'id,title,s_label_id,cover_plan,content,create_time,annex_file_name';
$where_news['status'] = 0; $where_news['status'] = 0;
$where_news['id'] = $this->params['id']; $where_news['id'] = $this->params['id'];
$data['news'] = $this->m_news->getNewsInfo($field_news, $where_news); $data['news'] = $this->m_news->getNewsInfo($field_news, $where_news);
$data['news']['label_name'] = $this->m_news->getNewsLable($data['news']['s_label_id']);
$field = 'a.id,a.comment_content,a.create_time,b.name,b.img'; $field = 'a.id,a.comment_content,a.create_time,b.name,b.img';
$where['a.s_news_id'] = $this->params['id']; $where['a.s_news_id'] = $this->params['id'];
$where['a.status'] = 0; $where['a.status'] = 0;
......
...@@ -11,6 +11,7 @@ use app\extra\RedisExt; ...@@ -11,6 +11,7 @@ use app\extra\RedisExt;
use app\model\AAgents; use app\model\AAgents;
use app\model\OBargainModel; use app\model\OBargainModel;
use app\model\OMarchInModel; use app\model\OMarchInModel;
use app\model\OrderModel;
use app\model\ORefundModel; use app\model\ORefundModel;
use think\Exception; use think\Exception;
use Think\Log; use Think\Log;
...@@ -738,4 +739,49 @@ class OrderLog extends Basic ...@@ -738,4 +739,49 @@ class OrderLog extends Basic
return $this->response("200", "request null"); return $this->response("200", "request null");
} }
} }
/**
* 商铺详情-带看记录
* User: 朱伟
* Date: 2018-07-24
* Time: 16:01:27
*/
public function getLook()
{
$params = $this->params;
//$params['house_id']=260;
if (!isset($params['house_id'])) {
return $this->response("101", "参数不全");
}
//todo 该商铺7日带看次数
$model = new OrderModel();
$params["house_id"] = $params['house_id'];
$start_time = date("Y-m-d", strtotime("-7 day"));
$end_time = date("Y-m-d", time());
$params['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$res_7 = $model->getCountByHouseId($params);
//dump($params);
$return['week']=$res_7;
//todo 该商铺30日带看次数
$start_time = date("Y-m-d", strtotime("-30 day"));
$end_time = date("Y-m-d", time());
$params['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$res_30 = $model->getCountByHouseId($params);
//dump($params);
$return['month']=$res_30;
return $this->response("200", "success!", $return);
}
} }
\ No newline at end of file
...@@ -52,6 +52,7 @@ class Performance extends Basic ...@@ -52,6 +52,7 @@ class Performance extends Basic
$start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time()); $start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time());
$list = $this->service_->totalAgent($params["agent_id"], $params["type"], $end_day, $start_day); $list = $this->service_->totalAgent($params["agent_id"], $params["type"], $end_day, $start_day);
//dump($list); //dump($list);
if (count($list) > 0) { if (count($list) > 0) {
......
...@@ -5,11 +5,13 @@ namespace app\api_broker\controller; ...@@ -5,11 +5,13 @@ namespace app\api_broker\controller;
use app\api_broker\extend\Basic; use app\api_broker\extend\Basic;
use app\api_broker\service\LookShopService; use app\api_broker\service\LookShopService;
use app\api_broker\service\VerifyService; use app\api_broker\service\VerifyService;
use app\model\AAgents;
use app\model\ACollectHouse; use app\model\ACollectHouse;
use app\model\AttentionModel; use app\model\AttentionModel;
use app\model\GHouses; use app\model\GHouses;
use app\model\GHousesFollowUp; use app\model\GHousesFollowUp;
use app\model\GHousesImgs; use app\model\GHousesImgs;
use app\model\GHousesToAgents;
use app\model\OBargainModel; use app\model\OBargainModel;
use app\model\Regions; use app\model\Regions;
use think\Log; use think\Log;
...@@ -185,7 +187,7 @@ class Shop extends Basic ...@@ -185,7 +187,7 @@ class Shop extends Basic
if ($params['site_area'] == 1 || $params['site_area'] == 2) { if ($params['site_area'] == 1 || $params['site_area'] == 2) {
$conditions['is_show'] = array( 'eq', 0 ); //c端只显示可显示的楼盘 $conditions['is_show'] = array( 'eq', 0 ); //c端只显示可显示的楼盘
} elseif ($params["site_area"] == 4) { } elseif ($params["site_area"] == 4) {
$conditions['status'] = array( 'in', "1,2" ); //b端搜索显示上架下架的 $conditions['status'] = !empty($params['status']) ? $params['status'] : array( 'in', "1,2" ); //b端搜索显示上架下架的
} }
} }
//如果有传经纪人id则代表我的商铺不区分状态 //如果有传经纪人id则代表我的商铺不区分状态
...@@ -257,8 +259,8 @@ class Shop extends Basic ...@@ -257,8 +259,8 @@ 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.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, 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.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.landlord_remark,a.create_time,b.landlord_phone b.auditorium,b.tiny_brochure_url,b.start_business_date,a.upload_id,b.fee_rule,b.landlord_remark,a.create_time,b.landlord_phone,
"; a.is_show,a.is_exclusive_type,a.update_time,a.external_title,a.external_address,b.external_item_advantage,b.agent_start_time,b.agent_end_time";
$conditions['a.status'] = array( "neq", 3 ); $conditions['a.status'] = array( "neq", 3 );
} else { } else {
$field = "a.id,a.internal_title,a.internal_address,a.external_title,a.external_address, $field = "a.id,a.internal_title,a.internal_address,a.external_title,a.external_address,
...@@ -273,7 +275,7 @@ class Shop extends Basic ...@@ -273,7 +275,7 @@ class Shop extends Basic
$conditions['a.id'] = array( "eq", $params["id"] ); $conditions['a.id'] = array( "eq", $params["id"] );
$field .= ',b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee';
$result = $this->gHousesModel->getHouseDetailById($field, $conditions); $result = $this->gHousesModel->getHouseDetailById($field, $conditions);
if (count($result) <= 0) { if (count($result) <= 0) {
return $this->response("101", '此楼盘不存在'); return $this->response("101", '此楼盘不存在');
...@@ -292,6 +294,9 @@ class Shop extends Basic ...@@ -292,6 +294,9 @@ class Shop extends Basic
$result["rent_price"] = $result["rent_price"] * 0.01; $result["rent_price"] = $result["rent_price"] * 0.01;
$result["management_fee"] = $result["management_fee"] * 0.01; $result["management_fee"] = $result["management_fee"] * 0.01;
$result["slotting_fee"] = $result["slotting_fee"] * 0.01; $result["slotting_fee"] = $result["slotting_fee"] * 0.01;
if ($result["external_slotting_fee"] != '-1') {
$result["external_slotting_fee"] = $result["external_slotting_fee"] * 0.01;
}
$result["api_path"] = CK_IMG_URL . 'images/'; $result["api_path"] = CK_IMG_URL . 'images/';
$param["house_id"] = $params['id']; $param["house_id"] = $params['id'];
//todo 这里的是否要更改成b端后台上传的类型 //todo 这里的是否要更改成b端后台上传的类型
...@@ -299,12 +304,18 @@ class Shop extends Basic ...@@ -299,12 +304,18 @@ class Shop extends Basic
$result["images"] = $this->gHousesImgModel->getHouseImages($param, 15); $result["images"] = $this->gHousesImgModel->getHouseImages($param, 15);
$param["img_type"] = 3;//图片类型:1效果图,2实景图,3样板图,4户型图,5交通图 $param["img_type"] = 3;//图片类型:1效果图,2实景图,3样板图,4户型图,5交通图
$result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1); $result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1);
$result["plan_images"] = [];
if ($params['site_area'] == 3 || $params["site_area"] == 4) { if ($params['site_area'] == 3 || $params["site_area"] == 4) {
$result['landlord_phone'] = json_decode($result['landlord_phone'], true); $result['landlord_phone'] = json_decode($result['landlord_phone'], true);
$result['create_time'] = date('Y-m-d', strtotime($result['create_time'])); $result['create_time'] = date('Y-m-d', strtotime($result['create_time']));
} }
if ($params['site_area'] == 4) {
//封面图
$param["img_type"] = 1;
$cover_plan = $this->gHousesImgModel->getHouseImages($param, 15);
$result["cover_plan"] = $cover_plan[0];
}
if ($result['status'] == 0) { if ($result['status'] == 0) {
return $this->response("101", '此楼盘已下架'); return $this->response("101", '此楼盘已下架');
} }
...@@ -341,6 +352,20 @@ class Shop extends Basic ...@@ -341,6 +352,20 @@ class Shop extends Basic
$result["lookShopArr"] = $lookShopArr; $result["lookShopArr"] = $lookShopArr;
} }
//上传人
$m_agent = new AAgents();
$upload_data = $m_agent->getAgentById('name,phone',['agent_id'=>$result['upload_id']]);
$result['upload_user'] = $upload_data[0]['name'] .'-'. $upload_data[0]['phone'];
//独家方
if ($result['is_exclusive_type'] == 1) {
$m_house_agent = new GHousesToAgents();
$where_house['is_del'] = 0;
$where_house['type'] = 3;
$where_house['houses_id'] = $result['id'];
$house_agent_data = $m_house_agent->getAgentsByHouseId('name,phone', $where_house);
$result['exclusive_user'] = $house_agent_data[0]['name'] .'-'. $house_agent_data[0]['phone'];
}
} }
//是否被收藏 //是否被收藏
...@@ -356,6 +381,8 @@ class Shop extends Basic ...@@ -356,6 +381,8 @@ class Shop extends Basic
$result["is_collect"] = 1; $result["is_collect"] = 1;
} }
} }
$result['new_sign_rule'] = "付{$result['payment_month']}{$result['deposit_month']},签订{$result['age_limit']}年";
return $this->response("200", 'request success', $result); return $this->response("200", 'request success', $result);
} }
...@@ -363,11 +390,9 @@ class Shop extends Basic ...@@ -363,11 +390,9 @@ class Shop extends Basic
* 新增和编辑商铺 * 新增和编辑商铺
* *
* @return \think\Response * @return \think\Response
* @throws \Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/ */
public function edit() public function edit()
{ {
...@@ -397,6 +422,42 @@ class Shop extends Basic ...@@ -397,6 +422,42 @@ class Shop extends Basic
return $this->response($result['code'], $result['msg'], $result['data']); return $this->response($result['code'], $result['msg'], $result['data']);
} }
/**
* 新增和编辑商铺
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function editV2()
{
$result['code'] = 200;
$result['msg'] = '';
$result['data'] = [];
if ($this->request->isPost()) {
$house_id = $this->gHousesModel->app_addV2($this->params, $this->agentId); //添加或编辑商铺
if ($house_id) {
$result['data']['house_id'] = $house_id['house_id'];
$result['data']['internal_title'] = empty($this->params['internal_title']) ? "" : $this->params['internal_title'];
} else {
$data['code'] = 101;
$data['msg'] = 'Add houses failure';
}
} else {
if (empty($this->params['id'])) {
$result['code'] = 101;
$result['msg'] = 'Id is null';
} else {
//获取商铺详情
$result['data'] = $this->gHousesModel->getHouseById($this->params['id'], 1);
}
}
return $this->response($result['code'], $result['msg'], $result['data']);
}
/** /**
* 上传商铺图片 * 上传商铺图片
* *
......
...@@ -36,7 +36,7 @@ class Statement extends Basic ...@@ -36,7 +36,7 @@ class Statement extends Basic
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/*$params = array( /*$params = array(
"agent_id" => 5739,//5739 总监 5740店长 "agent_id" => 3742,//5739 总监 5740店长
"time_start" => date("Y-m-d", time()), "time_start" => date("Y-m-d", time()),
"time_end" => date("Y-m-d", time()), "time_end" => date("Y-m-d", time()),
);*/ );*/
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace app\api_broker\controller; namespace app\api_broker\controller;
use app\api_broker\extend\Basic; use app\api_broker\extend\Basic;
use app\api_broker\service\ClientService;
use app\api_broker\service\VipService; use app\api_broker\service\VipService;
use app\model\Users; use app\model\Users;
use think\Request; use think\Request;
...@@ -82,7 +83,7 @@ class User extends Basic ...@@ -82,7 +83,7 @@ class User extends Basic
if (isset($params['user_status'])) { if (isset($params['user_status'])) {
$conditions['user_status'] = $params['user_status']; $conditions['user_status'] = $params['user_status'];
}else{ } else {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
...@@ -108,23 +109,32 @@ class User extends Basic ...@@ -108,23 +109,32 @@ class User extends Basic
} }
if (isset($params['start_time']) && isset($params['end_time'])) { if (isset($params['start_time']) && isset($params['end_time'])) {
$start_time = date('Y-m-d H:i:s',$params['start_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']); $end_time = date('Y-m-d H:i:s', $params['end_time']);
$conditions['create_time'] = array( 'between', array( $start_time, $end_time ) ); $conditions['create_time'] = array( 'between', array( $start_time, $end_time ) );
} else {
$time_ = date('Y-m-d H:i:s', strtotime("-1 day"));
$conditions['create_time'] = array( 'lt', $time_ );
} }
if (isset($params['status'])) { if (isset($params['status'])) {
$conditions['status'] = $params['status'] ; $conditions['status'] = $params['status'];
} }
$userList = $this->userModel->selectUserList($field, $conditions, $pageNo, $pageSize, "id desc");
$userList = $this->userModel->selectUserList($field, $conditions,$pageNo, $pageSize, "id desc");
if (empty($userList)) { if (empty($userList)) {
return $this->response("200", "此条件没有找到数据"); return $this->response("200", "此条件没有找到数据");
} }
$clientService = new ClientService();
$list = [];
foreach ($userList as $k => $v) {
$is_show = $clientService->dialTotal($v["user_id"]);
if ($is_show) {
array_push($list, $v);
}
}
$vip_services = new VipService(); $vip_services = new VipService();
$data['examine_vip'] = $vip_services->vip($params['user_id']); $data['examine_vip'] = $vip_services->vip($this->agentId);
$data['user_date'] = $userList; $data['user_date'] = $list;
return $this->response("200", 'request success', $data); return $this->response("200", 'request success', $data);
} }
......
...@@ -52,7 +52,9 @@ class Basic extends Controller ...@@ -52,7 +52,9 @@ class Basic extends Controller
'broker/feedList', 'broker/feedList',
'broker/editFeedClick', 'broker/editFeedClick',
'broker/editDecFeedClick', 'broker/editDecFeedClick',
'broker/sendSms' 'broker/sendSms',
'broker/getNewsInfo',
'broker/getComment'
); );
/** /**
......
<?php
namespace app\api_broker\service;
use app\extra\RedisExt;
use app\model\UPhoneFollowPp;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/8/1
* Time : 13:50
* Intro:
*/
class ClientService
{
private $uPhoneFollowUpModel;
private $redis;
public function __construct()
{
$this->uPhoneFollowUpModel = new UPhoneFollowPp();
$this->redis = RedisExt::getRedis();
}
public function dialTotal($user_id)
{
$day = 1;
$num = 5;
if ($this->redis) {
$day = $this->redis->get("s_agent_call_day");
$num = $this->redis->get("s_agent_call_number");
}
$start_time = date("Y-m-d H:i:s", strtotime("-$day day"));
$end_time = date("Y-m-d H:i:s", time());
$params["create_time"] = array( "between", array( $start_time, $end_time ) );
$params["user_id"] = $user_id;
$total = $this->uPhoneFollowUpModel->getCount( $params);
if ($total >= $num) {
return false;
} else {
return true;
}
}
}
\ No newline at end of file
...@@ -53,7 +53,7 @@ class LookShopService ...@@ -53,7 +53,7 @@ class LookShopService
// todo 4.判断是否到达上限,if 上限 return false else return true // todo 4.判断是否到达上限,if 上限 return false else return true
//redis服务挂掉,都可以看 //redis服务挂掉,都可以看
if(!$this->redis){ if (!$this->redis) {
return []; return [];
} }
//todo 过滤掉店长以上的经纪人 //todo 过滤掉店长以上的经纪人
...@@ -76,6 +76,7 @@ class LookShopService ...@@ -76,6 +76,7 @@ class LookShopService
$lookShopNum = $this->isLookShop($agent_id); $lookShopNum = $this->isLookShop($agent_id);
if ($lookShopNum > 0 && !$isExist && !$isPanParty) { if ($lookShopNum > 0 && !$isExist && !$isPanParty) {
$this->redis->sAdd(self::LOOK_SHOP . $this->nowTime . $agent_id, $house_id);//存入楼盘信息 $this->redis->sAdd(self::LOOK_SHOP . $this->nowTime . $agent_id, $house_id);//存入楼盘信息
$this->redis->set(self::LOOK_SHOP . $this->nowTime . $agent_id . "_" . $house_id, time());//存入看铺时间
$this->incrementLookNum($agent_id); $this->incrementLookNum($agent_id);
} }
$totalNum = $this->redis->hGet(self::LOOK_UP_NUM . $this->nowTime, $agent_id) * $this->redis->get("lookNum"); $totalNum = $this->redis->hGet(self::LOOK_UP_NUM . $this->nowTime, $agent_id) * $this->redis->get("lookNum");
...@@ -92,7 +93,7 @@ class LookShopService ...@@ -92,7 +93,7 @@ class LookShopService
public function isLooked(int $agent_id, int $house_id): bool public function isLooked(int $agent_id, int $house_id): bool
{ {
//redis服务挂掉,都可以看 //redis服务挂掉,都可以看
if(!$this->redis){ if (!$this->redis) {
return false; return false;
} }
$isExist = $this->redis->sIsMember(self::LOOK_SHOP . $this->nowTime . $agent_id, $house_id); $isExist = $this->redis->sIsMember(self::LOOK_SHOP . $this->nowTime . $agent_id, $house_id);
...@@ -128,7 +129,7 @@ class LookShopService ...@@ -128,7 +129,7 @@ class LookShopService
public function isLookShop(int $agent_id): int public function isLookShop(int $agent_id): int
{ {
//redis服务挂掉,不显示升级按钮 数量不能为0 //redis服务挂掉,不显示升级按钮 数量不能为0
if(!$this->redis){ if (!$this->redis) {
return 1; return 1;
} }
$lookNum = 50;//默认50看铺数量 $lookNum = 50;//默认50看铺数量
...@@ -164,7 +165,7 @@ class LookShopService ...@@ -164,7 +165,7 @@ class LookShopService
*/ */
public function setLookNum(int $num): bool public function setLookNum(int $num): bool
{ {
if(!$this->redis){ if (!$this->redis) {
return false; return false;
} }
$this->redis->set("lookNum", $num); $this->redis->set("lookNum", $num);
...@@ -178,7 +179,7 @@ class LookShopService ...@@ -178,7 +179,7 @@ class LookShopService
*/ */
public function setAgentLookNum(int $agent_id): bool public function setAgentLookNum(int $agent_id): bool
{ {
if(!$this->redis){ if (!$this->redis) {
return false; return false;
} }
$agentUpNum = $this->redis->hGet(self::LOOK_UP_NUM . $this->nowTime, $agent_id); $agentUpNum = $this->redis->hGet(self::LOOK_UP_NUM . $this->nowTime, $agent_id);
......
...@@ -1158,6 +1158,7 @@ class OrderLogService ...@@ -1158,6 +1158,7 @@ class OrderLogService
$cent_commission["name"] = $item["name"]; $cent_commission["name"] = $item["name"];
$cent_commission["phone"] = $item["phone"]; $cent_commission["phone"] = $item["phone"];
$cent_commission["should_commission"] = $item["should_commission"]; $cent_commission["should_commission"] = $item["should_commission"];
$cent_commission["scale_fee"] = $item["scale_fee"];
$key = 0; $key = 0;
$length = count($params); $length = count($params);
...@@ -1220,7 +1221,7 @@ class OrderLogService ...@@ -1220,7 +1221,7 @@ class OrderLogService
//分佣提成 o_partial_commission //分佣提成 o_partial_commission
$field_commission = "a.id,a.agent_id,a.role as roles,a.scale as scales,b.role,c.name,c.phone,b.scale,b.should_commission,b.confirm_date,b.create_time,b.real_fee,b.charity_fund, $field_commission = "a.id,a.agent_id,a.role as roles,a.scale as scales,a.scale_fee,b.role,c.name,c.phone,b.scale,b.should_commission,b.confirm_date,b.create_time,b.real_fee,b.charity_fund,
b.cash,b.practical_fee,b.service_charge"; b.cash,b.practical_fee,b.service_charge";
$cent_commission_arr = $bargainModel->selectBargainCommission($field_commission, [ "bargain_id" => $bargain_id ]); $cent_commission_arr = $bargainModel->selectBargainCommission($field_commission, [ "bargain_id" => $bargain_id ]);
......
...@@ -68,7 +68,6 @@ class PerformanceService ...@@ -68,7 +68,6 @@ class PerformanceService
$agent_info = $this->getStoreAndDistrict($agent_id); $agent_info = $this->getStoreAndDistrict($agent_id);
$where_ = []; $where_ = [];
$where_['total_time'] = array( 'between', array( $end_day, $yesterday ) ); $where_['total_time'] = array( 'between', array( $end_day, $yesterday ) );
$field = "agent_id,store_id,district_id,sum(performance) as performance_total"; $field = "agent_id,store_id,district_id,sum(performance) as performance_total";
......
...@@ -20,7 +20,7 @@ class UploadFileService ...@@ -20,7 +20,7 @@ class UploadFileService
* @param array $ext * @param array $ext
* @return array * @return array
*/ */
public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg','png','jpeg' ]) public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg','png','jpeg','xlsx','doc','pdf'])
{ {
/** /**
* *
...@@ -74,6 +74,10 @@ class UploadFileService ...@@ -74,6 +74,10 @@ class UploadFileService
$path .= 'static/business_school/'; $path .= 'static/business_school/';
$internet_path = ''; $internet_path = '';
break; break;
case 'business_school_file' :
$path .= 'static/business_school_file/';
$internet_path = '';
break;
default : default :
$data['code'] = 101; $data['code'] = 101;
$data['msg'] = "上传图片类型错误"; $data['msg'] = "上传图片类型错误";
......
<?php
namespace app\api_broker\validate;
use think\Validate;
/**
* Created by PhpStorm.
* User: zhuwei
* Date: 2018/8/3
* Time: 上午10:11
*/
class BrokerValidate extends Validate{
protected $rule = [
'type' => 'require|in:0,1,2',
'agent_id' => 'require|number|gt:0',
'labels_id' => 'number',
'user_id' => 'require|number|gt:0',
'user_status' => 'require|in:-1,0,1'
];
protected $message = [
'type.require' => 'type为必填字段',
'type.number' => 'type只能为数字',
'agent_id.require' => 'agent_id为必填字段',
'agent_id.number' => 'agent_id只能为数字',
'labels_id.number' => 'labels_id只能为数字',
'user_id.require' => 'user_id为必填字段',
'user_id.number' => 'user_id只能为数字',
'user_status.require' => 'user_status为必填字段',
'user_status.number' => 'user_status只能为数字'
];
protected $scene = [
'add_phone_follow_up_verify' => [ 'labels_id', 'user_id', 'agent_id', 'user_status', 'type' ],
];
}
...@@ -27,18 +27,18 @@ ...@@ -27,18 +27,18 @@
<!--line 1--> <!--line 1-->
<div class="line_a"> <div class="line_a">
<p class="a_fonta"> <!--<p class="a_fonta">
<!--恒大国际广场--> 恒大国际广场
</p> </p>-->
<p class="a_fontb"> <!--<p class="a_fontb">
<!--20000-25000元/月(月租金)--> 20000-25000元/月(月租金)
</p> </p>
<span class="a_fontc"> <span class="a_fontc">
<!--物业管理费:2000元/月--> 物业管理费:2000元/月
</span> </span>
<span class="a_fontd"> <span class="a_fontd">
<!--进场费:200000元--> 进场费:200000元
</span> </span>-->
</div> </div>
<div class="line_a_ul"> <div class="line_a_ul">
<ul class="line_a_ulul"> <ul class="line_a_ulul">
...@@ -53,32 +53,38 @@ ...@@ -53,32 +53,38 @@
</li>--> </li>-->
</ul> </ul>
</div> </div>
<p class="b3_font1" id="font_24">
编号:
<span class="b3_spanhao"></span>
</p>
<p class="line_hr"></p> <p class="line_hr"></p>
<!--line 2--> <!--line 2-->
<div class="line_b"> <div class="line_b">
<ul> <ul>
<li class="ul_b1"> <li class="ul_b1">
<span class="b1_span"> <span class="b1_span_ pu_area_type">
剩余铺数 商铺面积
</span> </span>
<span class="b1_span_totl pu_num"> <span class="b1_span_totl pu_area">
</span> </span>
</li> </li>
<li class="ul_b2"> <li class="ul_b2">
<span class="b1_span"> <span class="b1_span_ pu_price_type">
商铺面积 租金
</span> </span>
<span class="b1_span_totl pu_area"> <span class="b1_span_totl pu_price">
</span> </span>
</li> </li>
<li class="ul_b3"> <li class="ul_b3">
<span class="b1_span"> <span class="b1_span_ slotting_fee_type">
商业面积 转让费
</span> </span>
<span class="b1_span_totl shy_area"> <span class="b1_span_totl slotting_fee">
</span> </span>
</li> </li>
...@@ -87,21 +93,33 @@ ...@@ -87,21 +93,33 @@
<p class="line_hr"></p> <p class="line_hr"></p>
<!--line 3--> <!--line 3-->
<p class="b3_font1"> <p class="b3_font1">
商铺类型: 物业管理费:
<span class="b3_span gw"></span> <span class="b3_span0 gw"></span>
<span class="right b3_span_shop_num">
<span>剩余铺数:</span>
<span class="b3_span_build_num gw"></span>
</span>
</p> </p>
<p class="b3_font1"> <p class="b3_font1">
商铺编号: 商铺类型:
<span class="b3_spanhao gw"></span> <span class="b3_span gw"></span>
<span class="right">
<span class="b3_span_build_type">建筑面积:</span>
<span class="b3_span_build gw"></span>
</span>
</p> </p>
<p class="b3_font2"> <p class="b3_font2">
适合经营: 业态:
<span class="b3_span2 gw"></span> <span class="b3_span2 gw"></span>
</p> </p>
<span class="b3_font3 dt"> <p class="b3_font1">
已入驻:
<span class="b3_span3 gw"></span>
</p>
<!--<span class="b3_font3 dt">
已入驻: 已入驻:
</span> </span>
<span class="b3_span3 gw dt"></span> <span class="b3_span3 gw dt"></span>-->
<p class="line_hr"></p> <p class="line_hr"></p>
<!--line 4--> <!--line 4-->
<div class="b4_font"> <div class="b4_font">
...@@ -127,39 +145,39 @@ ...@@ -127,39 +145,39 @@
</p> </p>
<p class="b4_font2"> <p class="b4_font2">
营业时间: 营业时间:
<span class="b4_span1 gw"> <span class="b4_span1 gw yingye-time">
</span> </span>
</p> <span class="zhaoshang-time-p right">
<p class="b4_font2 zhaoshang-time-p">
招商时间: 招商时间:
<span class="b4_span1 gw"> <span class="b4_span1 gw zhaoshang-time">
</span> </span>
</p>
<p class="b4_font2 kaiye-time-p">
开业时间:
<span class="b4_span1 gw">
</span> </span>
</p> </p>
<p class="b4_font2"> <p class="b4_font2">
是否有煤气: 是否有燃气:
<span class="b4_span1 gw"> <span class="b4_span1 gw meiqi">
</span>
<span class="kaiye-time-p right">
开业时间:
<span class="b4_span1 gw kaiye-time">
</span>
</span> </span>
</p> </p>
<p class="b4_font2"> <p class="b4_font2">
地址: 对内地址:
<span class="b4_span1 gw"> <span class="b4_span1 gw duinei">
</span> </span>
</p> </p>
<span class="b4_font3"> <p class="b4_font2">
交通: 交通:
<span class="b4_span1 gw jiaotong">
</span> </span>
<span class="b3_span3 gw"> </p>
</span>
</div> </div>
<!--<div class="img_url" id="allmap">--> <!--<div class="img_url" id="allmap">-->
<!--</div>--> <!--</div>-->
<p class="line_hr"></p> <!--<p class="line_hr"></p>-->
<!--line 7--> <!--line 7-->
<div class="b4_font"> <div class="b4_font">
<p class="b4_font_p" id="planter"> <p class="b4_font_p" id="planter">
...@@ -170,7 +188,43 @@ ...@@ -170,7 +188,43 @@
<div class="slider3"> <div class="slider3">
</div> </div>
<p class="line_hr"></p>
<!--房源动态-->
<div class="b4_font">
<p class="b4_font_p">
房源动态
</p>
</div>
<div class="line_b">
<ul>
<li class="ul_b1">
<span class="b1_span ">
近7日带看(次)
</span>
<span class="b1_span_totl_ take_look_7">
</span>
</li>
<li class="ul_b2">
<span class="b1_span ">
近30日带看(次)
</span>
<span class="b1_span_totl_ take_look_30">
</span>
</li>
<li class="ul_b3">
<span class="b1_span ">
关注房源(人)
</span>
<span class="b1_span_totl_ take_look_focus">
</span>
</li>
</ul>
</div>
<p class="line_hr"></p>
<!--下载app部分--> <!--下载app部分-->
<div class="public fix_area_top" style=" z-index: 9999999;top: 0;display: none;"> <div class="public fix_area_top" style=" z-index: 9999999;top: 0;display: none;">
<img src="/app/images/pbl_cha.png" class="pbl_cha" /> <img src="/app/images/pbl_cha.png" class="pbl_cha" />
......
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
<div class="genjin-mark-area-zhuangtai"> <div class="genjin-mark-area-zhuangtai">
<div class="genjin-mark-area-title">状态标签:(必选)</div> <div class="genjin-mark-area-title">状态标签:(必选)</div>
<div class="genjin-mark-area-alink"> <div class="genjin-mark-area-alink">
<a data-markid="0">求租</a>
<a data-markid="1">已租</a>
<a data-markid="-1">无效</a> <a data-markid="-1">无效</a>
<a data-markid="1">已租</a>
<a data-markid="0">求租</a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -53,6 +53,23 @@ ...@@ -53,6 +53,23 @@
<td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td> <td>{{chae(chengjiao_yue_mubiao, chengjiao_yue_wancheng)}}</td>
<td>{{renjun(chengjiao_yue_wancheng)}}</td> <td>{{renjun(chengjiao_yue_wancheng)}}</td>
</tr> </tr>
<tr class="table-tr-single">
<td colspan="5">当月商场和街铺成交情况</td>
</tr>
<tr>
<td>商场</td>
<td>成交单数</td>
<td><input type="number" placeholder="填写" /></td>
<td>业绩(元)</td>
<td><input type="number" placeholder="填写" /></td>
</tr>
<tr>
<td>街铺</td>
<td>成交单数</td>
<td><input type="number" placeholder="填写" /></td>
<td>业绩(元)</td>
<td><input type="number" placeholder="填写" /></td>
</tr>
<tr class="table-tr-textarea tr-padding20"> <tr class="table-tr-textarea tr-padding20">
<td>业绩方面<br />的当前工<br />作重点</td> <td>业绩方面<br />的当前工<br />作重点</td>
<td colspan="4"> <td colspan="4">
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
</tr> </tr>
<tr> <tr>
<td>{{dealPrice}}</td> <td>{{dealPrice}}</td>
<td>{{d.shop_type?'转让费':'进场费'}}:{{d.slotting_fee}}元</td> <td>{{d.shop_type?'对内转让费':'进场费'}}:{{d.slotting_fee}}元</td>
<td>物业管理费:{{d.management_fee}}元/月</td> <td>物业管理费:{{d.management_fee}}元/月</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>商铺面积:{{dealArea}}</td> <td>{{d.shop_type?'使用面积':'商铺面积'}}:{{dealArea}}</td>
<td>项目总面积:{{d.market_area}}</td> <td>{{d.shop_type?'建筑面积':'项目总面积'}}:{{d.market_area}}m²</td>
<td>剩余铺数:{{d.residue_num}}</td> <td>剩余铺数:{{d.residue_num}}</td>
<td>总铺数:{{d.total}}</td> <td>总铺数:{{d.total}}</td>
</tr> </tr>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="2">交通:{{d.traffic}}</td> <td colspan="2">交通:{{d.traffic}}</td>
<td colspan="2">签约规则:{{d.sign_rule}}</td> <td colspan="2">签约规则:{{signRule()}}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">对内项目优势:{{d.internal_item_advantage}}</td> <td colspan="2">对内项目优势:{{d.internal_item_advantage}}</td>
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
</tr> </tr>
<tr> <tr>
<td>营业时间:{{d.do_business_date}}</td> <td>营业时间:{{d.do_business_date}}</td>
<td>招商时间:{{d.opening_date}}</td> <td v-if="!d.shop_type">招商时间:{{d.opening_date}}</td>
<td>开业时间:{{d.start_business_date}}</td> <td v-if="!d.shop_type">开业时间:{{d.start_business_date}}</td>
<td>煤气:{{d.is_has_gas?'没有':'有'}}</td> <td>煤气:{{d.is_has_gas?'没有':'有'}}</td>
</tr> </tr>
<tr class="tr-seat"> <tr class="tr-seat">
...@@ -80,7 +80,18 @@ ...@@ -80,7 +80,18 @@
</tr> </tr>
<tr v-if="!d.is_show"> <tr v-if="!d.is_show">
<td colspan="2">对外项目优势:{{d.external_item_advantage}}</td> <td colspan="2">对外项目优势:{{d.external_item_advantage}}</td>
<td colspan="2"></td> <td v-if="d.shop_type" colspan="2">对外转让费:{{(d.external_slotting_fee == '-1')?'面议':(d.external_slotting_fee+'元')}}</td>
<td v-else colspan="2"></td>
</tr>
<tr v-if="!d.is_show && d.cover_plan">
<td colspan="4" class="oh">
<div class="fl">对外封面图:</div>
<div class="fl">
<ul class="oh img-list">
<li class="fl oh"><img class="fl" :src="d.api_path+d.cover_plan.img_name" /></li>
</ul>
</div>
</td>
</tr> </tr>
<tr class="tr-seat"> <tr class="tr-seat">
<td colspan="4"></td> <td colspan="4"></td>
......
...@@ -39,7 +39,7 @@ class CellPhone extends Basic ...@@ -39,7 +39,7 @@ class CellPhone extends Basic
$pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
$report = new SecretReport(); $report = new SecretReport();
$field = 'agents_id,users_id,call_type,call_time,time,voice_file,user_status,a.id,a.create_time,type'; $field = 'agents_id,users_id,call_type,call_time,time,voice_file,user_status,a.id,a.create_time,type,secret_no';
$where = []; $where = [];
if (!empty($this->params['start_date'])) { if (!empty($this->params['start_date'])) {
...@@ -54,25 +54,26 @@ class CellPhone extends Basic ...@@ -54,25 +54,26 @@ class CellPhone extends Basic
$where['a.call_time'] = [ 'between', [ $this->params['start_date'] . ' 00:00:00', $this->params['end_date'] . ' 23:59:59' ] ]; $where['a.call_time'] = [ 'between', [ $this->params['start_date'] . ' 00:00:00', $this->params['end_date'] . ' 23:59:59' ] ];
} }
if (!empty($this->params['call_type'])) {
$where['a.type'] = $this->params['call_type'];
}
if (!empty($this->params['call_name'])) { if (!empty($this->params['call_name'])) {
$where['name'] = [ 'LIKE', $this->params['call_name'] . '%' ]; $where[] = ['EXP', "b.name like '%{$this->params['call_name']}%' or c.user_name like '%{$this->params['call_name']}%' "];
} }
if (!empty($this->params['call_phone'])) { if (!empty($this->params['call_phone'])) {
$where['phone_no'] = [ 'LIKE', $this->params['call_phone'] . '%' ]; $where[] = ['EXP', "a.phone_no like '%{$this->params['call_phone']}%' or a.peer_no like '%{$this->params['call_phone']}%' "];
} }
if (!empty($this->params['client_phone'])) { if (!empty($this->params['call_style'])) {
$where['c.user_phone'] = [ 'LIKE', $this->params['client_phone'] . '%' ]; if ($this->params['call_style'] == 1) {
$where['a.call_type'] = 0;
} else {
$where['a.call_type'] = 1;
} }
if (!empty($this->params['user_nick'])) {
$where['c.user_nick'] = [ 'LIKE', '%' . $this->params['user_nick'] . '%' ];
} }
if (!empty($this->params['call_type'])) {
$where['a.type'] = $this->params['call_type'];
}
$data['list'] = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where); $data['list'] = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);
$data['total'] = $report->getCallListTotal($where); $data['total'] = $report->getCallListTotal($where);
return $this->response($result['code'], $result['msg'], $data); return $this->response($result['code'], $result['msg'], $data);
......
...@@ -468,7 +468,6 @@ class Finance extends Basic ...@@ -468,7 +468,6 @@ class Finance extends Basic
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/ */
public function overRule() public function overRule()
{ {
...@@ -1038,7 +1037,7 @@ class Finance extends Basic ...@@ -1038,7 +1037,7 @@ class Finance extends Basic
$data['code'] = 200; $data['code'] = 200;
$data['msg'] = ""; $data['msg'] = "";
$whereOr = $data['data'] = $excel_data = []; $data['data'] = $excel_data = [];
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
...@@ -1209,7 +1208,6 @@ class Finance extends Basic ...@@ -1209,7 +1208,6 @@ class Finance extends Basic
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/ */
public function checkOver() public function checkOver()
{ {
...@@ -1218,6 +1216,13 @@ class Finance extends Basic ...@@ -1218,6 +1216,13 @@ class Finance extends Basic
} }
$m_bargain = new OBargainModel(); $m_bargain = new OBargainModel();
$m_partial_commission = new OPartialCommission();
$confirm_status = $m_partial_commission->checkConfirmStatus($this->params['bargain_id']);
if ($confirm_status) {
return $this->response(101, '请确认分佣');
}
$insert_data['audit_id'] = $this->userId; $insert_data['audit_id'] = $this->userId;
$insert_data['audit_name'] = $this->userName; $insert_data['audit_name'] = $this->userName;
...@@ -1342,8 +1347,8 @@ class Finance extends Basic ...@@ -1342,8 +1347,8 @@ class Finance extends Basic
$insert_data[0]['create_time'] = date('Y-m-d H:i:s'); $insert_data[0]['create_time'] = date('Y-m-d H:i:s');
} }
$m_bargain = new OBargainLogModel(); $m_bargain_log = new OBargainLogModel();
return $m_bargain->addLog($insert_data); return $m_bargain_log->addLog($insert_data);
} }
/** /**
...@@ -1353,9 +1358,9 @@ class Finance extends Basic ...@@ -1353,9 +1358,9 @@ class Finance extends Basic
*/ */
public function delPartialCommission() public function delPartialCommission()
{ {
if (empty($this->params['partial_id'])) if (empty($this->params['partial_id']))
return $this->response(101, '参数错误'); return $this->response(101, '参数错误');
$partial_id = $this->params['partial_id']; $partial_id = $this->params['partial_id'];
$m_partial = new OBargainModel(); $m_partial = new OBargainModel();
$data['status'] = 30; $data['status'] = 30;
...@@ -1371,4 +1376,84 @@ class Finance extends Basic ...@@ -1371,4 +1376,84 @@ class Finance extends Basic
return $this->response($result['code'], $result['msg']); return $this->response($result['code'], $result['msg']);
} }
/**
* 删除开票税费
*
* @return \think\Response
*/
public function delTaxes()
{
if (empty($this->params['taxes_id']))
return $this->response(101, '参数错误');
$m_taxes = new OTaxes();
$num = $m_taxes->updateTaxesById(['id_or_father_id'=>$this->params['taxes_id']],['is_del'=>1]);
if ($num > 0) {
$result['code'] = 200;
$result['msg'] = '删除成功';
} else {
$result['code'] = 101;
$result['msg'] = '删除失败';
}
return $this->response($result['code'], $result['msg']);
}
/**
* 成交报告分佣方详情
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getBargainCommission() {
if (empty($this->params['bargain_id'])) {
return $this->response(101, '成交报告id为空');
}
$m_bargain = new OBargainModel();
if ($this->request->isGet()) {
$field = 'a.id,a.scale,a.agent_id,a.role,a.scale_fee';
$data = $m_bargain->getBargainPartialDetail($field, ['id'=>$this->params['bargain_id']]);
return $this->response(200, '', $data);
}
if (empty($this->params['agent_id'])) {
return $this->response(101, '经纪人id为空');
}
if (empty($this->params['scale'])) {
return $this->response(101, '分佣比例为空');
}
$update['agent_id'] = $this->params['agent_id'];
$update['scale'] = $this->params['scale'];
$update['role'] = $this->params['role'];
$update['scale_fee'] = $this->params['scale_fee'];
$data = $m_bargain->updateBargainById($this->params['bargain_id'], $update);
/*记录日志 start*/
$bargain_data = $m_bargain->selectBargainByOrderNo('agent_id,father_id', ['id'=>$this->params['bargain_id']]);
$father_id = $this->params['bargain_id'];
if ($bargain_data[0]['father_id'] != 0) {
$father_id = $bargain_data[0]['father_id'];
}
$agent_id[0] = $bargain_data[0]['agent_id'];
$agent_id[1] = $this->params['agent_id'];
$m_agent = new AAgents();
$agent_data = $m_agent->getAgentById('id,name,phone', ['in_id'=>$agent_id]);
$content = '修改成交报告【编号:'.$father_id.'】【分佣方:'.$agent_data[0]['name'].'-'.$agent_data[0]['phone']
.'修改为:'.$agent_data[1]['name'].'-'.$agent_data[1]['phone'].'】';
$this->editRecordLog($this->params['bargain_id'], $content);
/*记录日志 end*/
return $this->response(200, '修改成功', $data);
}
} }
...@@ -15,6 +15,7 @@ use app\model\AAgents; ...@@ -15,6 +15,7 @@ use app\model\AAgents;
use app\model\GHouses; use app\model\GHouses;
use app\model\GHousesImgs; use app\model\GHousesImgs;
use app\model\GHousesToAgents; use app\model\GHousesToAgents;
use app\model\GOperatingRecords;
use app\model\SubletModel; use app\model\SubletModel;
use think\Request; use think\Request;
...@@ -172,6 +173,11 @@ class Houses extends Basic ...@@ -172,6 +173,11 @@ class Houses extends Basic
$where['a.internal_title'] = [ 'LIKE', '%' . $this->params['internal_title'] . '%' ]; $where['a.internal_title'] = [ 'LIKE', '%' . $this->params['internal_title'] . '%' ];
} }
/*对外楼盘名*/
if ($this->params['external_title'] != NULL) {
$where['a.external_title'] = [ 'LIKE', '%' . $this->params['external_title'] . '%' ];
}
/*楼盘地址搜索*/ /*楼盘地址搜索*/
if ($this->params['internal_address'] != NULL) { if ($this->params['internal_address'] != NULL) {
$where['a.internal_address'] = [ 'LIKE', '%' . $this->params['internal_address'] . '%' ]; $where['a.internal_address'] = [ 'LIKE', '%' . $this->params['internal_address'] . '%' ];
...@@ -236,6 +242,25 @@ class Houses extends Basic ...@@ -236,6 +242,25 @@ class Houses extends Basic
$where['d.landlord_phone'] = [ 'LIKE', '%' . $this->params['landlord_phone'] . '%' ]; $where['d.landlord_phone'] = [ 'LIKE', '%' . $this->params['landlord_phone'] . '%' ];
} }
if (!empty($this->params['area'])) {
switch ($this->params['area']) {
case 1:
$where['a.shop_area_start'] = ['between', [0, 30]];break;
case 2:
$where['a.shop_area_start'] = ['between', [30, 60]];break;
case 3:
$where['a.shop_area_start'] = ['between', [60, 100]];break;
case 4:
$where['a.shop_area_start'] = ['between', [100, 300]];break;
case 5:
$where['a.shop_area_start'] = ['between', [300, 500]];break;
case 6:
$where['a.shop_area_start'] = [ '>', 500];break;
default :
$where['a.shop_area_start'] = ['>', 0];
}
}
$data['data']['list'] = $this->house->getHouseListDish($pageNo, $pageSize, 'a.id DESC', $fields, $where, $this->userId); $data['data']['list'] = $this->house->getHouseListDish($pageNo, $pageSize, 'a.id DESC', $fields, $where, $this->userId);
$data['data']['total'] = $this->house->getHouseListDishTotal($where); $data['data']['total'] = $this->house->getHouseListDishTotal($where);
...@@ -380,7 +405,7 @@ class Houses extends Basic ...@@ -380,7 +405,7 @@ class Houses extends Basic
$agent->lock(true); $agent->lock(true);
$where['type'] = 2; $where['type'] = 2;
$where['b.id'] = $this->params['old_agents_id']; $where['b.id'] = $this->params['old_agents_id'];
$agent_house = $agent->getHouseAgent('a.id', $where); $agent_house = $agent->getHouseAgent('a.id,a.houses_id', $where);
$agent_data_arr = []; $agent_data_arr = [];
...@@ -393,6 +418,15 @@ class Houses extends Basic ...@@ -393,6 +418,15 @@ class Houses extends Basic
} }
$total = $agent->updateUserAll($agent_data_arr); $total = $agent->updateUserAll($agent_data_arr);
$records = new GOperatingRecords();
$agent = new AAgents();
foreach ($agent_house as $k=>$v) {
$agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
$remark = '批量修改客方为'.$agent_data['name'].'-'.$agent_data['phone'];
$records->record($this->userId, 2, $remark, $v['houses_id'], $v['id']);
}
$agent->commit(); $agent->commit();
return $this->response(200, '', [ 'total' => count($total) ]); return $this->response(200, '', [ 'total' => count($total) ]);
} }
......
...@@ -52,6 +52,7 @@ class Login extends Basic ...@@ -52,6 +52,7 @@ class Login extends Basic
$name = $this->params["username"]; $name = $this->params["username"];
$password = $this->params["password"]; $password = $this->params["password"];
$model = $this->params["model"]; $model = $this->params["model"];
$only_id = $this->params["only_id"];
if (empty($name) || empty($password)) { if (empty($name) || empty($password)) {
return $this->response(101, '用户名或密码不能为空'); return $this->response(101, '用户名或密码不能为空');
...@@ -79,13 +80,13 @@ class Login extends Basic ...@@ -79,13 +80,13 @@ class Login extends Basic
} }
$last_login_ip = ip2long($this->request->ip()); $last_login_ip = ip2long($this->request->ip());
/*if ($user_data['id'] != 1) { if ($user_data['id'] != 1) {
//判断设备id是否存在 //判断设备id是否存在
$is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0, $user_data['phone'], 1); $is_login = $this->brokerService->judgeBand($only_id, $user_data['id'], $model, 0, $user_data['phone'], 1);
if (!$is_login) { if (!$is_login) {
return $this->response("102", "该账号没有绑定该设备,请致电人事进行绑定。"); return $this->response("102", "该账号没有绑定该设备,请致电人事进行绑定。");
} }
}*/ }
$where_rule['status'] = 0; $where_rule['status'] = 0;
if ($user_data['id'] == 1) { if ($user_data['id'] == 1) {
......
<?php
namespace app\index\controller;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/7/30
* Time : 14:37
* Intro:
*/
use app\index\extend\Basic;
use app\model\TLookShopModel;
class LookShop extends Basic
{
protected $tLookShopModel;
public function __construct($request = null)
{
parent::__construct($request);
$this->tLookShopModel = new TLookShopModel();
}
public function lookShopIndex()
{
$params = $this->params;
/*$params = array(
"start_time" => '2018-07-30',
"end_time" => '2018-07-31',
"house_id" => 3084,
"house_name" => "",
"agent_name" => "",
"agent_phone" => "",
"page_no" => 1,
"page_size" => 15
);*/
$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
$condition = [];
if (!empty($params["start_time"]) && !empty($params["end_time"])) {
$condition["a.look_time"] = array( "between", array( $params["start_time"], $params["end_time"] ) );
}
if (!empty($params["house_id"])) {
$condition["a.house_id"] = $params["house_id"];
}
if (!empty($params["house_name"])) {
$condition["b.internal_title"] = array( "like", "%" . trim($params["house_name"]) . "%" );
}
if (!empty($params["agent_name"])) {
$condition["a.agent_name"] = array( "like", "%" . trim($params["agent_name"]) . "%" );
}
if (!empty($params["agent_phone"])) {
$condition["a.agent_phone"] = array( "like", "%" . trim($params["agent_phone"]) . "%" );
}
$field = "a.id,a.look_time,a.house_id,b.internal_title,a.agent_name,a.agent_phone";
$result = $this->tLookShopModel->getList($condition, $field, $pageNo, $pageSize);
$total = $this->tLookShopModel->getListCount($condition, $field);
$list["list"] = $result;
$list["total"] = $total;
return $this->response("200", "success", $list);
}
}
\ No newline at end of file
...@@ -128,7 +128,7 @@ class Member extends Basic{ ...@@ -128,7 +128,7 @@ class Member extends Basic{
//是否登录过 //是否登录过
if (!empty($params['login_status']) && $params['login_status'] != -1) { if (!empty($params['login_status']) && $params['login_status'] != -1) {
if ($params['login_status'] == 1) { if ($params['login_status'] == 1) {
$where['a.first_login_time'] = ['NOT NULL']; $where[] = ['EXP', 'a.first_login_time IS NOT NULL OR a.last_login_time IS NOT NULL'];
} else { } else {
$where['a.first_login_time'] = ['NULL']; $where['a.first_login_time'] = ['NULL'];
} }
......
...@@ -97,6 +97,7 @@ class News extends Basic ...@@ -97,6 +97,7 @@ class News extends Basic
$data['publisher_id'] = $this->userId; $data['publisher_id'] = $this->userId;
$data['cover_plan'] = $this->params['file_img']; $data['cover_plan'] = $this->params['file_img'];
$data['s_label_id'] = $this->params['s_label_id']; $data['s_label_id'] = $this->params['s_label_id'];
$data['annex_file_name'] = $this->params['annex_file_name'];
try { try {
$this->m_news->editData($data, $this->params['id']); $this->m_news->editData($data, $this->params['id']);
...@@ -120,7 +121,7 @@ class News extends Basic ...@@ -120,7 +121,7 @@ class News extends Basic
if (empty($this->params['id'])) { if (empty($this->params['id'])) {
return $this->response(101, "Id is null."); return $this->response(101, "Id is null.");
} }
$field = 'id,title,s_label_id,cover_plan,content'; $field = 'id,title,s_label_id,cover_plan,content,annex_file_name';
$where['status'] = 0; $where['status'] = 0;
$where['id'] = $this->params['id']; $where['id'] = $this->params['id'];
$data = $this->m_news->getNewsInfo($field, $where); $data = $this->m_news->getNewsInfo($field, $where);
......
...@@ -56,11 +56,15 @@ class Notice extends Basic ...@@ -56,11 +56,15 @@ class Notice extends Basic
$where['a.title'] = ['LIKE', '%' . $this->params['title'] . '%']; $where['a.title'] = ['LIKE', '%' . $this->params['title'] . '%'];
} }
$field = 'a.id,a.title,a.content,a.create_time,b.name'; $field = 'a.id,a.title,a.content,a.create_time,a.create_time,annex_file_name,b.name';
$where['a.status'] = 0; $where['a.status'] = 0;
$where['a.type'] = 1; $where['a.type'] = 1;
$data['list'] = $this->m_push->getListAgent($pageNo, $pageSize, 'id DESC', $field, $where); $data['list'] = $this->m_push->getListAgent($pageNo, $pageSize, 'id DESC', $field, $where);
foreach ($data['list'] as $k => $v){
//dump($v);
$data['list'][$k]['annex_file_path'] = CURRENT_URL . 'static/business_school_file/' . $v['annex_file_name'];;
}
$data['total'] = $this->m_push->getListAgentTotal($where); $data['total'] = $this->m_push->getListAgentTotal($where);
return $this->response(200, "", $data); return $this->response(200, "", $data);
} }
...@@ -85,6 +89,7 @@ class Notice extends Basic ...@@ -85,6 +89,7 @@ class Notice extends Basic
$data['agent_id'] = -1; $data['agent_id'] = -1;
$data['steel_phone'] = 0; $data['steel_phone'] = 0;
$data['type'] = 1; $data['type'] = 1;
$data['annex_file_name'] = $this->params['annex_file_name'];
$num = $this->m_push->editData($data); $num = $this->m_push->editData($data);
if ($num < 1) { if ($num < 1) {
return $this->response(101, '新增公告失败!'); return $this->response(101, '新增公告失败!');
......
<?php
namespace app\index\controller;
/**
* Created by PhpStorm.
* User: zhuwei
* Date: 2018/7/31
* Time: 上午10:18
*/
use app\index\extend\Basic;
use app\index\service\PerformanceService;
use think\Request;
class Performance extends Basic
{
private $service_;
function __construct(Request $request = null)
{
parent::__construct($request);
$this->service_ = new PerformanceService();
}
//TODO 区域业绩排行 District
/**
* 区域业绩排行
*/
public function selectDistrictPerformance()
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
// $params = array(
// "type" => 3, //1表示个人业绩排行 2门店 3区域
//// "end_day" => "",
//// "start_day" =>"",
// );
$params["type"] = 3;
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
//默认排序一周 2018-07-18改为本月
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
$start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time());
$father_id = !empty($params["father_id"]) ? $params["father_id"] : '' ;
$is_today = !empty($params["is_today"]) ? $params["is_today"] : 0 ;
$list = $this->service_->totalAgent($params["type"], $end_day, $start_day,$pageNo,$pageSize,$father_id,$is_today);
//dump($list);
if (count($list) > 0) {
$result["list"] = $list['list'];
$result["total"] = $list['total'];
$result["start_time"] = $start_day;
$result["end_time"] = $end_day;
return $this->response("200", "request success", $result);
}
return $this->response("200", "request null");
}
//TODO 门店排行 Store
/**
* 门店排行
*/
public function selectStorePerformance()
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
// $params = array(
// "type" => 2, //1表示个人业绩排行 2门店 3区域
// "father_id" => 4,
// // "start_day" =>"",
// );
$params["type"] = 2;
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
//默认排序一周 2018-07-18改为本月
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
$start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time());
$father_id = !empty($params["father_id"]) ? $params["father_id"] : '' ;
$is_today = !empty($params["is_today"]) ? $params["is_today"] : 0 ;
$list = $this->service_->totalAgent($params["type"], $end_day, $start_day,$pageNo,$pageSize,$father_id,$is_today);
//dump($list);
if (count($list) > 0) {
$result["list"] = $list['list'];
$result["total"] = $list['total'];
$result["start_time"] = $start_day;
$result["end_time"] = $end_day;
return $this->response("200", "request success", $result);
}
return $this->response("200", "request null");
}
//TODO 个人业绩排行 Individual
/**
* 个人业绩排行
*/
public function selectIndividualPerformance()
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
// $params = array(
// "type" => 1, //1表示个人业绩排行 2门店 3区域
// // "end_day" => "",
// // "start_day" =>"",
// );
$params["type"] = 1;
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
//默认排序一周 2018-07-18改为本月
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
$start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time());
$father_id = !empty($params["father_id"]) ? $params["father_id"] : '' ;
$is_today = !empty($params["is_today"]) ? $params["is_today"] : 0 ;
$list = $this->service_->totalAgent($params["type"], $end_day, $start_day,$pageNo,$pageSize,$father_id,$is_today);
//dump($list);
if (count($list) > 0) {
$result["list"] = $list['list'];
$result["total"] = $list['total'];
$result["start_time"] = $start_day;
$result["end_time"] = $end_day;
return $this->response("200", "request success", $result);
}
return $this->response("200", "request null");
}
}
\ No newline at end of file
<?php
namespace app\index\controller;
/**
* Created by PhpStorm.
* User: liu yin ping
* Date: 2018/3/13
* Time: 15:48
*/
use app\index\extend\Basic;
class RealTimePerformance extends Basic
{
public function realtimePerformanceList()
{
if (!$this->request->isAjax()) {
return view('realtime/realtimePerformance');
}
}
}
\ No newline at end of file
...@@ -40,6 +40,8 @@ class Setting extends Basic ...@@ -40,6 +40,8 @@ class Setting extends Basic
$data['day_num'] = (int)$this->params['day_num']; $data['day_num'] = (int)$this->params['day_num'];
$data['down_time'] = $this->params['down_time']; $data['down_time'] = $this->params['down_time'];
$data['landlord_phone_day'] = (int)$this->params['landlord_phone_day']; $data['landlord_phone_day'] = (int)$this->params['landlord_phone_day'];
$data['agent_call_day'] = (int)$this->params['agent_call_day'];
$data['agent_call_number'] = (int)$this->params['agent_call_number'];
$config_data = []; $config_data = [];
$config_data[0]['id'] = 1; $config_data[0]['id'] = 1;
...@@ -54,7 +56,9 @@ class Setting extends Basic ...@@ -54,7 +56,9 @@ class Setting extends Basic
$config_data[1]['rule'] = json_encode([ $config_data[1]['rule'] = json_encode([
'is_privacy'=>$data['is_privacy'], 'is_privacy'=>$data['is_privacy'],
'day_num'=>$data['day_num'], 'day_num'=>$data['day_num'],
'landlord_phone_day'=>$data['landlord_phone_day'] 'landlord_phone_day'=>$data['landlord_phone_day'],
'agent_call_day'=>$data['agent_call_day'],
'agent_call_number'=>$data['agent_call_number']
]); ]);
$config_data[1]['agent_id'] = $this->userId; $config_data[1]['agent_id'] = $this->userId;
...@@ -83,6 +87,8 @@ class Setting extends Basic ...@@ -83,6 +87,8 @@ class Setting extends Basic
$redis->set('s_landlord_phone_day', $data['landlord_phone_day']); //房东隐号绑定有效期(天数): $redis->set('s_landlord_phone_day', $data['landlord_phone_day']); //房东隐号绑定有效期(天数):
$redis->set('s_new_client_hours', $new_client_hours); //新客户保护期有效小时数 $redis->set('s_new_client_hours', $new_client_hours); //新客户保护期有效小时数
$redis->set('s_lookNum', $agent_shop_num); //业务员最多可查看的商铺数量 $redis->set('s_lookNum', $agent_shop_num); //业务员最多可查看的商铺数量
$redis->set('s_agent_call_day', $data['agent_call_day']); //业务员多少天可以打多少电话
$redis->set('s_agent_call_number', $data['agent_call_number']); //业务员多少天可以打多少电话
} }
return $this->response(200, '', $data); return $this->response(200, '', $data);
......
<?php
namespace app\index\controller;
/**
* Created by PhpStorm.
* User: liu yin ping
* Date: 2018/3/13
* Time: 15:48
*/
use app\index\extend\Basic;
class ShopInspectionLog extends Basic
{
public function shopinspectionLogList()
{
if (!$this->request->isAjax()) {
return view('shopinspection/shopinspectionLogList');
}
}
}
...@@ -48,15 +48,15 @@ class Transfer extends Basic ...@@ -48,15 +48,15 @@ class Transfer extends Basic
$where = array(); $where = array();
if (!empty($params['start_date']) && empty($params['end_date'])) { if (!empty($params['start_date']) && empty($params['end_date'])) {
$where['a.create_time'] = ['> time', $params['start_date']]; $where['a.create_time'] = ['> time', $params['start_date'] . '00:00:00'];
} }
if (!empty($params['end_date']) && empty($params['start_date'])) { if (!empty($params['end_date']) && empty($params['start_date'])) {
$where['a.create_time'] = ['< time', $params['end_date']]; $where['a.create_time'] = ['< time', $params['end_date']. '23:59:59'];
} }
if (!empty($params['start_date']) && !empty($params['end_date'])) { if (!empty($params['start_date']) && !empty($params['end_date'])) {
$where['a.create_time'] = ['between time', [$params['start_date'],$params['end_date']]]; $where['a.create_time'] = ['between time', [$params['start_date'] . '00:00:00',$params['end_date'] . '23:59:59']];
} }
if (!empty($params['name'])) { if (!empty($params['name'])) {
......
...@@ -36,7 +36,7 @@ class UploadImg extends Basic ...@@ -36,7 +36,7 @@ class UploadImg extends Basic
$uploadResult = $this->uFService->upload($file, $type); $uploadResult = $this->uFService->upload($file, $type);
if ($uploadResult["code"] == 200) { if ($uploadResult["code"] == 200) {
return $this->response("200", "图片上传成功", $uploadResult["msg"]); return $this->response("200", "上传成功", $uploadResult["msg"]);
} else { } else {
return $this->response("101", $uploadResult["msg"]); return $this->response("101", $uploadResult["msg"]);
} }
......
...@@ -54,13 +54,17 @@ class Version extends Basic ...@@ -54,13 +54,17 @@ class Version extends Basic
$param["intro"] = $_POST["intro"]; $param["intro"] = $_POST["intro"];
$param["type"] = $_POST["type"]; $param["type"] = $_POST["type"];
$param["app_path"] = $_POST["app_path"]; $param["app_path"] = $_POST["app_path"];
$param["is_update"] = $_POST["is_update"];
if (!isset($param["version_no"]) || !isset($param["type"])) { if (empty($param["version_no"]) || empty($param["type"])) {
$this->response("101", "版本号或app类型不能为空"); $this->response("101", "版本号或app类型不能为空");
} }
if ($param["type"] == 0 || $param["type"] == 2 && isset($param["app_path"])) { if ($param["type"] == 0 || $param["type"] == 2 && isset($param["app_path"])) {
$this->response("101", "安卓请上传安装包"); $this->response("101", "安卓请上传安装包");
} }
if (empty($param["is_update"])) {
$this->response("101", "是否强制更新为必填");
}
$param["create_time"] = date("Y-m-d H:i:s", time()); $param["create_time"] = date("Y-m-d H:i:s", time());
$param["update_time"] = date("Y-m-d H:i:s", time()); $param["update_time"] = date("Y-m-d H:i:s", time());
$result = $this->appVersion->addVersion($param); $result = $this->appVersion->addVersion($param);
......
...@@ -9,23 +9,26 @@ ...@@ -9,23 +9,26 @@
namespace app\index\controller; namespace app\index\controller;
use app\api\untils\GeTuiUntils;
use app\api_broker\service\PushMessageService; use app\api_broker\service\PushMessageService;
use app\api_broker\service\ReportService; use app\api_broker\service\ReportService;
use app\index\extend\Basic; use app\index\extend\Basic;
use app\model\AAgents; use app\model\AAgents;
use app\model\Agents;
use app\model\AppointWatchShop; use app\model\AppointWatchShop;
use app\model\AStore;
class WatchShop extends Basic class WatchShop extends Basic
{ {
public function index(){ /**
* 预约看铺列表
*
* @return \think\Response|\think\response\View
*/
public function getList() {
if (!$this->request->isAjax()) {
return view('watch_shop/watch_list'); return view('watch_shop/watch_list');
} }
public function getList() {
$data['status'] = 200; $data['status'] = 200;
$data['msg'] = ''; $data['msg'] = '';
...@@ -59,10 +62,33 @@ class WatchShop extends Basic ...@@ -59,10 +62,33 @@ class WatchShop extends Basic
$where['house_title'] = ['like', $params['house_title'].'%']; $where['house_title'] = ['like', $params['house_title'].'%'];
} }
if (!empty($params['house_id'])) {
$where['house_id'] = $params['house_id'];
}
try {
$applies = new AppointWatchShop(); $applies = new AppointWatchShop();
$data['list'] = [];
$data['total'] = 0;
if ($params['check_status'] == 1) {
$data['list'] = $applies->getAppointWatchShopList($pageNo, $pageSize, 'id DESC', '*', $where); $data['list'] = $applies->getAppointWatchShopList($pageNo, $pageSize, 'id DESC', '*', $where);
$data['total'] = $applies->getAppointWatchShopListTotal($where); $data['total'] = $applies->getAppointWatchShopListTotal($where);
}
if ($params['check_status'] == 2) {
$where['b.agent_id'] = $this->userId;
$data['list'] = $applies->getAppointWatchOurList($pageNo, $pageSize, 'id DESC', 'a.*', $where);
$data['total'] = $applies->getAppointWatchOurTotal($where);
}
} catch (\Exception $e) {
$data['status'] = 101;
$data['msg'] = '内部错误,请联系运营!' . $e->getMessage();
$data = [];
}
return $this->response($data['status'], $data['msg'], $data); return $this->response($data['status'], $data['msg'], $data);
} }
......
This diff is collapsed.
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!--<input type="hidden" class="page-load" id="access" />&lt;!&ndash;关联js文件&ndash;&gt;--> <!--<input type="hidden" class="page-load" id="access" />&lt;!&ndash;关联js文件&ndash;&gt;-->
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="builder-tabs builder-form-tabs"> <div class="builder-tabs builder-form-tabs">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class=""><a id="href1" href="">角色信息</a></li> <li class=""><a id="href1" href="">角色信息</a></li>
......
{layout name="global/frame_tpl" /} {layout name="global/frame_tpl" /}
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="builder-tabs builder-form-tabs"> <div class="builder-tabs builder-form-tabs">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class=""><a href="/admin.php/index/roleedit/1.html">角色信息</a></li> <li class=""><a href="/admin.php/index/roleedit/1.html">角色信息</a></li>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">权限管理</a></li> <li><a href="#">权限管理</a></li>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">角色管理</a></li> <li><a href="#">角色管理</a></li>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<input type="hidden" name="id" value="" /> <input type="hidden" name="id" value="" />
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="builder-tabs builder-form-tabs"> <div class="builder-tabs builder-form-tabs">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="/admin.php/index/roleedit/1.html">角色信息</a></li> <li class="active"><a href="/admin.php/index/roleedit/1.html">角色信息</a></li>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">首页弹框广告</a></li> <li><a href="#">首页弹框广告</a></li>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">首页轮播图</a></li> <li><a href="#">首页轮播图</a></li>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">商圈列表</a></li> <li><a href="#">商圈列表</a></li>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">通话统计</a></li> <li><a href="#">通话统计</a></li>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">通话记录</a></li> <li><a href="#">通话记录</a></li>
...@@ -27,11 +27,16 @@ ...@@ -27,11 +27,16 @@
<option value="1">阿里云</option> <option value="1">阿里云</option>
<option value="2">容联云</option> <option value="2">容联云</option>
</select> </select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="拨打人姓名" type="text" value=""> <span class="fore-span ld-Marheight">呼叫方式:</span>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="拨打人手机号" type="phone" value=""> <select class="form-control btn2 ld-Marheight" id="call_style">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="被拨打人姓名" type="text" value=""> <option value="0">请选择</option>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish-phone" placeholder="拨打人手机号" type="phone" value=""> <option value="1">经纪人拨打</option>
<div class="clear"></div> <option value="2">客户回拨</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="手机号" type="phone" value="">
<div class="clear">
</div>
<span class="fore-span ld-Marheight">拨打时间:</span> <span class="fore-span ld-Marheight">拨打时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
<span class="fore-span ld-Marheight">-</span> <span class="fore-span ld-Marheight">-</span>
...@@ -44,12 +49,13 @@ ...@@ -44,12 +49,13 @@
</tr> </tr>
<tr> <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>-->
<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> </tr>
</thead> </thead>
......
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<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="store_name" placeholder="门店" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_phone" placeholder="报备手机号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_phone" placeholder="报备手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_name" placeholder="报备人姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_name" placeholder="报备人姓名" type="text" value="">
<span class=" btn btn-info btn3 ld-Marheight" style="visibility: hidden;">搜索</span> <!--<span class=" btn btn-info btn3 ld-Marheight" style="visibility: hidden;">搜索</span>-->
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span> <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
<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="money_total_two fore-span ld-Marheight ">总额:</span><span id="money_total" class="money_total_two fore-span ld-Marheight"></span>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">部门列表</a></li> <li><a href="#">部门列表</a></li>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
...@@ -41,10 +41,10 @@ ...@@ -41,10 +41,10 @@
<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_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_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=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_phone" placeholder="客户电话" type="text" value="">
<select name="district_id" class="form-control btn2"> <select name="district_id" class="form-control btn4">
<option value="">约带看人所在部门</option> <option value="">约带看人所在部门</option>
</select> </select>
<select name="store_id" class="form-control btn2"> <select name="store_id" class="form-control btn4">
<option value="">约带看人所在门店</option> <option value="">约带看人所在门店</option>
</select> </select>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="agent_name" placeholder="约带看人姓名" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="agent_name" placeholder="约带看人姓名" type="text" value="">
...@@ -163,8 +163,8 @@ ...@@ -163,8 +163,8 @@
</div> </div>
<div class="detail-modal-body-sec"> <div class="detail-modal-body-sec">
<div class="detail-modal-maid-top-btn-area oh"> <div class="detail-modal-maid-top-btn-area oh">
<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a> <a class="btn btn-success" id="maid_new_btn" href="#modal_new_maid" data-toggle="modal">新增</a>
<a id="maid_new_btn" class="btn btn-primary" data-toggle="modal">增加实收</a> <a id="maid_add_btn" class="btn btn-primary" data-toggle="modal">增加实收</a>
<a id="maid_count_btn" class="btn btn-primary" title="可自动计算实收佣金和合计">计算</a> <a id="maid_count_btn" class="btn btn-primary" title="可自动计算实收佣金和合计">计算</a>
</div> </div>
<p class="text-right" id="maid_count_tips_p"><span>提示:</span>点击<span>计算</span>按钮可自动计算<span>实收佣金</span><span>合计</span>的内容</p> <p class="text-right" id="maid_count_tips_p"><span>提示:</span>点击<span>计算</span>按钮可自动计算<span>实收佣金</span><span>合计</span>的内容</p>
......
...@@ -48,11 +48,14 @@ ...@@ -48,11 +48,14 @@
height: 500px; height: 500px;
overflow-y: scroll; overflow-y: scroll;
} }
.clear{
clear: both;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">分佣提成明细表</a></li> <li><a href="#">分佣提成明细表</a></li>
...@@ -72,8 +75,11 @@ ...@@ -72,8 +75,11 @@
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" 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" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value="">
<div class="clear">
</div>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" 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="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span> <span class="btn btn-info btn3" id="reset">重置</span>
<span class="btn btn-info btn3" id="export">导出excel</span> <span class="btn btn-info btn3" id="export">导出excel</span>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">退款审核</a></li> <li><a href="#">退款审核</a></li>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">已退款</a></li> <li><a href="#">已退款</a></li>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">分佣提成明细表</a></li> <li><a href="#">分佣提成明细表</a></li>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">成交报告-已撤销</a></li> <li><a href="#">成交报告-已撤销</a></li>
......
...@@ -48,11 +48,14 @@ ...@@ -48,11 +48,14 @@
height: 500px; height: 500px;
overflow-y: scroll; overflow-y: scroll;
} }
.clear{
clear: both;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">税费承担明细表</a></li> <li><a href="#">税费承担明细表</a></li>
...@@ -72,8 +75,11 @@ ...@@ -72,8 +75,11 @@
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" 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" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value="">
<div class="clear">
</div>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" 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="search">搜索</span>
<span class="btn btn-info btn3" id="reset">重置</span> <span class="btn btn-info btn3" id="reset">重置</span>
<!--<span class="btn btn-info btn3" id="export">导出excel</span>--> <!--<span class="btn btn-info btn3" id="export">导出excel</span>-->
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">成交报告-待撤销</a></li> <li><a href="#">成交报告-待撤销</a></li>
......
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
</ul> </ul>
</div> </div>
</div> </div>
<!--添加隐藏按钮-->
<div id="hide_menu">
<span class="width-136-hide">
隐藏<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>
</span>
</div>
<div id="wrapper"> <div id="wrapper">
{include file="global/navigation" /} {include file="global/navigation" /}
......
...@@ -42,11 +42,15 @@ ...@@ -42,11 +42,15 @@
.clear{ .clear{
clear: both; clear: both;
} }
.btn-top-house{
margin-top: 20px;
text-align: center;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
...@@ -88,7 +92,7 @@ ...@@ -88,7 +92,7 @@
<th class="text-center">跟进人</th> <th class="text-center">跟进人</th>
<th class="text-center">商铺ID</th> <th class="text-center">商铺ID</th>
<th class="text-center">商铺名称</th> <th class="text-center">商铺名称</th>
<!--<th class="text-center">操作</th>--> <th class="text-center">操作</th>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id="follow_list"> <tbody class="text-center" id="follow_list">
...@@ -105,4 +109,52 @@ ...@@ -105,4 +109,52 @@
</div> </div>
</div> </div>
</div> </div>
<!--时间轴--> <!-- #查看-->
<div class="modal fade modal_followup" id="modal_shop_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-one">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title detail-modal-header-tab" >
<a href="javascript:;" class="btn btn-default">商铺跟进</a>
<a href="javascript:;" class="btn btn-info">查看商铺</a>
</h4>
</div>
<div class="modal-body modal-body-one">
<div class="detail-modal-body-sec">
<div class="followup-modal-list-area">
<table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="" id="modal_followup_table_list">
<tr>
<td>电话跟进:测试测试测试测试测试测试测试测试测试测试测试测试</td>
<td>刘丹丹</td>
<td>2017-09-05 15:22:33</td>
</tr>
<tr>
<td colspan="3">2017-09-05 15:22:33</td>
</tr>
</tbody>
</table>
</div>
<div class="followup-modal-comment-area">
<textarea></textarea>
</div>
<div class="btn-top-house">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="modal_followup_submit_btn">提交</button>
</div>
</div>
<div class="detail-modal-body-sec">
<iframe class="iframe-shop-detail"></iframe>
</div>
</div>
</div>
</div>
</div>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div id="page-content-wrapper" style="display: none;"> <div id="page-content-wrapper" style="display: none;">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">新增商铺</div> <div class="panel-heading">新增商铺</div>
<div class="panel-body"> <div class="panel-body">
...@@ -74,16 +74,25 @@ ...@@ -74,16 +74,25 @@
<li class="list-group-item"> <li class="list-group-item">
<label for="">业态(可多选)</label> <label for="">业态(可多选)</label>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" class="yetai" id="" value="餐饮美食">餐饮美食 <input type="checkbox" class="yetai" value="餐饮美食">餐饮美食
</label> </label>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" class="yetai" id="" value="百货零售">百货零售 <input type="checkbox" class="yetai" value="百货零售">百货零售
</label> </label>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" class="yetai" id="" value="休闲娱乐">休闲娱乐 <input type="checkbox" class="yetai" value="服装">服装
</label> </label>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" class="yetai" id="" value="其他">其他 <input type="checkbox" class="yetai" value="亲子教育">亲子教育
</label>
<label class="checkbox-inline">
<input type="checkbox" class="yetai" value="休闲娱乐">休闲娱乐
</label>
<label class="checkbox-inline">
<input type="checkbox" class="yetai" value="办公">办公
</label>
<label class="checkbox-inline">
<input type="checkbox" class="yetai" value="其他">其他
</label> </label>
</li> </li>
<li class="list-group-item" id="shangpu_tags_area"> <li class="list-group-item" id="shangpu_tags_area">
...@@ -184,6 +193,8 @@ ...@@ -184,6 +193,8 @@
<div class="input-group-addon">元/月</div> <div class="input-group-addon">元/月</div>
</div> </div>
</div> </div>
</li>
<li class="list-group-item">
<div class="form-group"> <div class="form-group">
<label for="management_fee">物业管理费</label> <label for="management_fee">物业管理费</label>
<div class="input-group"> <div class="input-group">
...@@ -198,6 +209,17 @@ ...@@ -198,6 +209,17 @@
<div class="input-group-addon"></div> <div class="input-group-addon"></div>
</div> </div>
</div> </div>
<div class="form-group">
<label for="">对商户显示的转让费</label>
<label class="checkbox-inline">
<input type="checkbox" id="foreignZhuanrangFace" value="面议">面议
</label>
<div class="input-group">
<input type="number" class="form-control input-100-width" id="foreignZhuanrangPrice" placeholder="请输入" data-alert="请填写对商户显示的转让费!">
<div class="input-group-addon"></div>
</div>
<span>(选择面议,则不要填写金额)</span>
</div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<div class="form-group"> <div class="form-group">
...@@ -218,9 +240,9 @@ ...@@ -218,9 +240,9 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="">商业面积</label> <label for="">项目总面积</label>
<div class="input-group"> <div class="input-group">
<input type="number" class="form-control input-100-width" id="businessArea" placeholder="请输入" data-alert="请填写商业面积!"> <input type="number" class="form-control input-100-width" id="businessArea" placeholder="请输入" data-alert="请填写项目总面积!">
<div class="input-group-addon"></div> <div class="input-group-addon"></div>
</div> </div>
</div> </div>
...@@ -301,9 +323,54 @@ ...@@ -301,9 +323,54 @@
<label for=""> 对商户显示的项目优势</label> <label for=""> 对商户显示的项目优势</label>
<textarea class="form-control textarea-500-width" rows="3" id="foreignYoushi" data-alert="请填写对外项目优势!"></textarea> <textarea class="form-control textarea-500-width" rows="3" id="foreignYoushi" data-alert="请填写对外项目优势!"></textarea>
</div> </div>
<div class="form-group full-width-100"> </li>
<li class="list-group-item">
<!--<div class="form-group full-width-100">
<label for="">签约规则</label> <label for="">签约规则</label>
<textarea class="form-control textarea-500-width" rows="3" id="qianyueRule" data-alert="请填写签约规则!"></textarea> <textarea class="form-control textarea-500-width" rows="3" id="qianyueRule" data-alert="请填写签约规则!"></textarea>
</div>-->
<div class="form-group">
<label for="shangpuType">付款规则</label>
<span></span>
<select class="form-control" name="guizeFu" id="guizeFu" data-alert="请选择付款规则付多少">
<option value="">请选择</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
<span></span>
<select class="form-control" name="guizeYa" id="guizeYa" data-alert="请选择付款规则压多少">
<option value="">请选择</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
</div>
<div class="form-group">
<label for="">签约年限</label>
<div class="input-group">
<input type="number" class="form-control input-100-width" id="qianyueNianxian" placeholder="请填写" data-alert="请填写签约年限!">
<div class="input-group-addon"></div>
</div>
</div> </div>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
......
...@@ -51,11 +51,15 @@ ...@@ -51,11 +51,15 @@
.main_table_th_tr>th:nth-of-type(8){ .main_table_th_tr>th:nth-of-type(8){
width: 50px; width: 50px;
} }
.btn-top-house{
margin-top: 20px;
text-align: center;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">商铺列表</a></li> <li><a href="#">商铺列表</a></li>
...@@ -111,21 +115,27 @@ ...@@ -111,21 +115,27 @@
<br style="clear: both;" /> <br style="clear: both;" />
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="商铺名称" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="对内商铺名称" type="text" value="">
<!--新加筛选-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title_open" placeholder="对外商铺名称" type="text" value="">
<select class="form-control btn2 ld-Marheight" id="district_id">
<option value="" selected="selected">区域筛选</option>
</select>
<select class="form-control btn2 ld-Marheight" id="area_id">
<option value="" selected="selected">面积筛选</option>
</select>
<select class="form-control btn2 ld-Marheight" id="yetai_id">
<option value="" selected="selected">业态筛选</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="业态" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_name" placeholder="盘方姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_name" placeholder="盘方姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_phone" placeholder="盘方手机号" type="tel" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_phone" placeholder="盘方手机号" type="tel" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="landlord_phone" placeholder="房东手机号" type="tel" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="landlord_phone" placeholder="房东手机号" type="tel" value="">
<div class="row">
</div>
<span class="fore-span ld-Marheight">上传时间:</span> <span class="fore-span ld-Marheight">上传时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
<span class="fore-span ld-Marheight">-</span> <span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
<br style="clear: both;" />
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span> <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
<!-- 批量修改客方 --> <!-- 批量修改客方 -->
...@@ -346,36 +356,22 @@ ...@@ -346,36 +356,22 @@
</div> </div>
<!-- #查看--> <!-- #查看-->
<div class="modal fade" id="modal_shop_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade modal_followup" id="modal_shop_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-one"> <div class="modal-dialog modal-dialog-one">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times; &times;
</button> </button>
<h4 class="modal-title" > <h4 class="modal-title detail-modal-header-tab" >
商铺详情 <a href="javascript:;" class="btn btn-default">商铺跟进</a>
</h4> <a href="javascript:;" class="btn btn-info">查看商铺</a>
</div>
<div class="modal-body modal-body-one">
<iframe class="iframe-shop-detail"></iframe>
</div>
</div>
</div>
</div>
<div class="modal fade" id="modal_followup" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-one">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title" >
跟进
</h4> </h4>
</div> </div>
<div class="modal-body modal-body-one"> <div class="modal-body modal-body-one">
<div class="detail-modal-body-sec">
<div class="followup-modal-list-area"> <div class="followup-modal-list-area">
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="" id="modal_followup_table_list"> <tbody class="" id="modal_followup_table_list">
...@@ -393,13 +389,16 @@ ...@@ -393,13 +389,16 @@
<div class="followup-modal-comment-area"> <div class="followup-modal-comment-area">
<textarea></textarea> <textarea></textarea>
</div> </div>
<div class="btn-top-house">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" id="modal_followup_submit_btn">提交</button>
</div> </div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭 </div>
</button> <div class="detail-modal-body-sec">
<button type="button" class="btn btn-primary" id="modal_followup_submit_btn"> <iframe class="iframe-shop-detail"></iframe>
提交 </div>
</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">商铺标签</a></li> <li><a href="#">商铺标签</a></li>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">客户标签</a></li> <li><a href="#">客户标签</a></li>
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
</footer> </footer>
<script src="/resource/lib/js/jquery-2.0.3.min.js"></script> <script src="/resource/lib/js/jquery-2.0.3.min.js"></script>
<script src="https://wx.gtimg.com/wxpay_h5/fingerprint2.min.1.5.1.js"></script>
<script src="/resource/js/login.js"></script> <script src="/resource/js/login.js"></script>
</body> </body>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">首页轮播图</a></li> <li><a href="#">首页轮播图</a></li>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
</div> </div>
</div> </div>
<nav class="navbar navbar-inverse" id="sidebar-wrapper" role="navigation"> <nav class="navbar navbar-inverse" id="sidebar-wrapper" role="navigation">
<ul class="nav sidebar-nav"> <ul class="nav sidebar-nav">
......
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
...@@ -306,6 +306,21 @@ ...@@ -306,6 +306,21 @@
</div> </div>
</div> </div>
<!--附件-->
<div class="form-group">
<label class="col-sm-2 control-label">附件(格式为pdf/doc,选填,上限为1个):</label>
<div class="col-sm-9">
<div class="file-upload-area">
<div class="btn-area">
<input type="file" id="file_input" class="" data-limittop="1" />
<button class="btn btn-default">选择附件</button>
</div>
<ul class="img-pre-ul" id="fujian_ul"></ul>
</div>
</div>
</div>
</form> </form>
<button type="button" class="btn btn-primary" id="add_news"> <button type="button" class="btn btn-primary" id="add_news">
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
...@@ -277,6 +277,21 @@ ...@@ -277,6 +277,21 @@
</div> </div>
</div> </div>
<!--附件-->
<div class="form-group">
<label class="col-sm-2 control-label">附件(格式为pdf/doc,选填,上限为1个):</label>
<div class="col-sm-9">
<div class="file-upload-area">
<div class="btn-area">
<input type="file" id="file_input" class="" data-limittop="1" />
<button class="btn btn-default">选择附件</button>
</div>
<ul class="img-pre-ul" id="fujian_ul"></ul>
</div>
</div>
</div>
</form> </form>
<button type="button" class="btn btn-primary" id="add_announcement"> <button type="button" class="btn btn-primary" id="add_announcement">
保存 保存
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li> <li>
...@@ -261,6 +261,9 @@ ...@@ -261,6 +261,9 @@
<div class="notice-time text-right">2018-12-12 12:00:00</div> <div class="notice-time text-right">2018-12-12 12:00:00</div>
<div class="clear"></div> <div class="clear"></div>
<div class="notice-text"></div> <div class="notice-text"></div>
<div class="notice-fujian-area">
<span>附件(点击可下载):</span>
</div>
</div> </div>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">号码管理</a></li> <li><a href="#">号码管理</a></li>
......
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="realtimePerformance" />
<style type="text/css">
.left{
float: left;
}
.modal-body-width{
width: 900px;
height: 800px;
overflow-y: scroll;
}
/*二级弹窗*/
.modal-body-width-two{
width: 800px;
height: 700px;
overflow-y: scroll;
}
#rank_start_day,#rank_end_day,#performance_ranking{
font-size: 16px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="#"><span id="performance_ranking">业绩排行</span>&nbsp;&nbsp;&nbsp;&nbsp;<span id="rank_start_day"></span>&nbsp;&nbsp;<span id="rank_end_day"></span></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="11" 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>
</td>
</tr>
<!--部门业绩 门店业绩 个人业绩的搜索功能-->
<tr>
<td colspan="11">
<form id="maintable_form_search">
<!--<span class="btn btn-primary btn3 left" id="maintable_month">本月</span>-->
<span class="btn btn-primary btn3 left" id="maintable_today">今天</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_create_time" name="start_date" type="date">
<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">
<span class="btn btn-primary btn3 search" id="maintable_search">搜索</span>
<span class="btn btn-primary btn3" id="maintable_reset">重置</span>
<!--<span class="btn btn-info btn3" id="maintable_export">导出excel</span>-->
</form>
</td>
</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-store" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content modal-body-width">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
<a href="#"><span id="performance_ranking">时间:</span>&nbsp;&nbsp;&nbsp;&nbsp;<span id="rank_start_day_store"></span>&nbsp;&nbsp;<span id="rank_end_day_store"></span></a>
</h4>
</div>
<div class="modal-body">
<table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="text-center" id="store_details_list">
</tbody>
</table>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 经纪人业绩排行 详情 -->
<div class="modal fade" id="modal-agent" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content modal-body-width">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
<a href="#"><span id="performance_ranking_agent">时间:</span>&nbsp;&nbsp;&nbsp;&nbsp;<span id="rank_start_day_agent"></span>&nbsp;&nbsp;<span id="rank_end_day_agent"></span></a>
</h4>
</div>
<div class="modal-body">
<table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="text-center" id="agent_details_list">
</tbody>
</table>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- (点击门店名字)弹出框 经纪人业绩(二级)排行 详情 -->
<div class="modal fade" id="modal-agent-two" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content modal-body-width-two">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
<a href="#"><span id="performance_ranking_agent_two">时间:</span>&nbsp;&nbsp;&nbsp;&nbsp;<span id="rank_start_day_agent_two"></span>&nbsp;&nbsp;<span id="rank_end_day_agent_two"></span></a>
</h4>
</div>
<div class="modal-body">
<table class="table table-striped table-bordered table-hover table-condensed">
<tbody class="text-center" id="agent_details_list_two">
</tbody>
</table>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
\ No newline at end of file
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="javascript:;">参数管理</a></li> <li><a href="javascript:;">参数管理</a></li>
......
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="shopInspectionLog" />
<style>
.modal-body{
/*height: 600px;*/
overflow-y: auto;
padding-bottom: 60px;
}
.user-ul2{
width: 100%;
height: auto;
padding-bottom: 15px;
float: left;
}
.user-ul2 li{
list-style: none;
line-height: 30px;
}
.money_total_two{
font-weight: bold;
font-size: 15px;
}
#search{
float: left;
}
#reset{
float: left;
}
.clear{
clear: both;
}
</style>
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li>
<a href="javascript:;">商铺查看日志</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="start_date" name="start_date1" 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_date" name="end_date1" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_id" placeholder="商铺ID" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_name" placeholder="商铺名称" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="looker_name" placeholder="查看人姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="looker_phone" placeholder="查看人手机号" type="text" value="">
<div class="clear"></div>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
</form>
</td>
</tr>
<tr>
<th class="text-center">查看时间</th>
<th class="text-center">商铺ID</th>
<th class="text-center">商铺名称</th>
<th class="text-center">查看人</th>
</tr>
</thead>
<tbody class="text-center" id="shop_log_list">
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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