Skip to content

T
tl_estate
Commit 8c303780 authored by zw's avatar zw
Browse files
Options

Merge branch 'test' into 1120-v2.9.9

# Conflicts: # application/api_broker/controller/SpreadUser.php # application/app/controller/Index.php # application/index/controller/ShareShop.php # application/index/view/broker/agent.html # application/index/view/performance_ranking/performance_ranking.html # application/model/USpreadUser.php # application/route.php # public/app/js/app_jump.js # public/resource/js/main.js # public/resource/js/performance_ranking.js
parents 0b603be6 7b226ea5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 121 deletions
application/api/untils/WxCallbackUntils.php
View file @ 8c303780
......@@ -21,16 +21,8 @@ class WxCallbackUntils
public function __construct()
{
if (strpos($this->http_host(), 'api') !== false) {
Log::write('正式服', 'WxCallbackUntils'); //记录日志
$this->appId = "wxbbeb8cd2f4b72aea";
$this->appSecret = "9ac6d1680553f4b554f3b46d263fbfb3";
} else {
Log::write('测试服', 'WxCallbackUntils'); //记录日志
$this->appId = "wxd30d74d1126d3278";//测试
$this->appSecret = "f29c8c502549020d2193a464be9632dc";//测试
}
$this->appId = "wxbbeb8cd2f4b72aea";
$this->appSecret = "9ac6d1680553f4b554f3b46d263fbfb3";
}
public function http_host()
......
application/api_broker/controller/OrderLog.php
View file @ 8c303780
......@@ -66,7 +66,12 @@ class OrderLog extends Basic
"march_in_area" => "上海市虹口区中山公园", //进场地址
);*/
// $params["reception_id"] = $this->agentName;
//todo 兼容2.9.9bug ios
if(isset($params["transfer_img"])){
$transfer_img = json_decode($params["transfer_img"] ,true);
$params["march_in_img"] = $transfer_img[0];
unset($params["transfer_img"]);
}
$is_execute = $this->verifyService_->verifyStart(1, $params["reception_id"], $params["order_id"]);
if (!$is_execute) {
return $this->response("101", "请不要重复提交");
......
application/api_broker/service/PerformanceService.php
View file @ 8c303780
......@@ -374,7 +374,7 @@ class PerformanceService
}
$verify = new VerifyService();
$agent_ids = $verify->getAgentsByAgentId($agent_id);
$agent_ids = $verify->getAgentsByWhere($agent_id);
$params["a.agent_id"] = array( "in", $agent_ids );
if (!empty($site_id)) {
$where['a.disc'] = $site_id;
......
application/api_broker/service/StatementService.php
View file @ 8c303780
......@@ -99,10 +99,9 @@ class StatementService
$result = $params = [];
switch ($user_type) {
case 0:
//todo
break;
case 1:
//todo 统计门店下的所有经纪人
// 统计门店下的所有经纪人
$params["store_id"] = $store_id;
//$params["level"] = array( "neq", "30" );
$params["status"] = array('in','0,1');//只查询正常状态的经纪人
......@@ -121,7 +120,8 @@ class StatementService
$agentIds = "";
foreach ($agentsArr as $key => $value) {
$agentIds .= $value["id"] . ",";
if ($user_type == 1) {
#列表排除长假经纪人
if ($user_type == 1 and ($value['status'] != 1)) {//1店长
array_push($store_list, $this->getStoreList($conditions, $value["id"], $value["name"]));
}
}
......
application/api_broker/service/VerifyService.php
View file @ 8c303780
......@@ -61,7 +61,7 @@ class VerifyService
/**
* 经纪人身份验证 获取经纪人
* 经纪人身份验证 获取经纪人 不区分状态
* @param $agent_id
* @return null|string
* @throws \think\db\exception\DataNotFoundException
......@@ -71,20 +71,18 @@ class VerifyService
public function getAgentsByWhere($agent_id)
{
$params["id"] = $agent_id;
$result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", $params);
$result = $this->agentModel->getAgentsByKeyword("id,store_id,district_id,level", $params);
if (count($result) > 0) {
$arr_list = [];
switch ($result[0]["level"]) {
case 10:
return $result[0]["id"];
case 20:
$arr_list = $this->agentModel->searchAgentsByKeyword("id", [ "store_id" => $result[0]["store_id"],
"status" => "-1" ]);
$arr_list = $this->agentModel->getAgentsByKeyword("id", [ "store_id" => $result[0]["store_id"]]);
break;
case 30:
case 40:
$arr_list = $this->agentModel->searchAgentsByKeyword("id", [ "district_id" => $result[0]["district_id"],
"status" => "-1" ]);
$arr_list = $this->agentModel->getAgentsByKeyword("id", [ "district_id" => $result[0]["district_id"]]);
break;
default:
return $agent_id;
......
application/app/controller/Index.php
View file @ 8c303780
......@@ -4,6 +4,7 @@ namespace app\app\controller;
use app\model\AppVersion;
use app\model\HouseImgs;
use app\model\HouseInfos;
use think\Response;
class Index
......@@ -16,6 +17,7 @@ class Index
public function __construct()
{
$this->db = new HouseInfos();
$this->dbImg = new HouseImgs();
$this->appVersion = new AppVersion();
}
......@@ -77,15 +79,12 @@ class Index
{
return view('index/baidu_send');
}
/**
* 楼盘详情
* @return \think\Response
*/
public function getShopDetail()
{
return $this->response("200", 'request null');
$id = $_POST["id"] ? $_POST["id"] : $_GET["id"];
$field = "a.id,a.management_fee,a.title,a.address,a.city,a.room_area,a.room_area2,a.business_area,a.disc,a.disccircles,
......
application/app/view/index/baidusend.html 0 → 100644
View file @ 8c303780
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<title>同联商业</title>
<meta http-equiv="X-UA-Compatible" content="IE=10" />
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
<meta name="Keywords" content="" />
<meta name="Description" content="" />
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/details.css">
<link rel="stylesheet" href="/app/css/lunbo.css">
<link rel="stylesheet" href="/app/css/details_tl.css">
<link>
</head>
<body style="background: #FFFFFF">
<header class="m_part1_w">
<div class="u_btn1b" onclick="window.history.go(-1)" style="margin-top:0.1rem"><span style=""><i class="icon-angle-left" style="font-size:0.65rem"></i></span></div>
<div class="lp-bunner">
<ul class="swiper-wrapper" id="img_item_ul">
</ul>
<span class="lp-bunner-page"> <span class="lp-index"> 1 </span> / <span class="lp-sum"> 50 </span> </span>
</div>
</header>
<!--line 1-->
<div class="line_a">
</div>
<p class="b3_spanhao_font" id="font_24">
<span class="b3_spanhao_left">
编88号：
<span class="b3_spanhao"></span>
</span>
</p>
<p class="line_hr"></p>
<!--line 2-->
<div class="line_b">
<ul>
<li class="ul_b1">
<span class="b1_span_ pu_area_type">商铺面积</span>
<span class="b1_span_totl pu_area"></span>
</li>
<li class="ul_b2">
<span class="b1_span_ pu_price_type">租金</span>
<span class="b1_span_totl pu_price"></span>
</li>
<li class="ul_b3">
<span class="b1_span_ slotting_fee_type">转让费</span>
<span class="b1_span_totl slotting_fee"></span>
</li>
</ul>
</div>
<p class="line_hr"></p>
<div class="line_a_ul">
<ul class="line_a_ulul">
</ul>
</div>
<!--line 3-->
<p class="b3_font1 b3_span_shop_num">
<span>剩余铺数：</span>
<span class="b3_span_build_num gw"></span>
</p>
<p class="b3_font1 b3_span_shop_mianji">
<span class="b3_span_build_type">建筑面积：</span>
<span class="b3_span_build gw"></span>
</p>
<p class="b3_font1">
物业管理费：
<span class="b3_span0 gw"></span>
</p>
<!--付款方式 签约年限-->
<p class="b3_font1">
付款方式：
<span class="gw terms-payment">付三押二</span>
</p>
<p class="b3_font1">
签约年限：
<span class="gw signing-year">3-5年</span>
</p>
<p class="b3_font2">
适合经营：
<span class="b3_span2 gw"></span>
</p>
<p class="line_hr"></p>
<!--line 6-->
<div class="b4_font">
<p class="b4_font_p">
位置信息
</p>
<p class="b4_font2">
地址：<span class="b4_span1 gw duinei"></span>
</p>
<p class="b4_font2">
交通：<span class="b4_span1 gw jiaotong"></span>
</p>
</div>
<p class="line_hr"></p>
<div class="b4_font" id="b4_font">
<p class="b4_font_p">
详细信息
</p>
<p class="b4_font2">
商铺类型：
<span class="b3_span gw"></span>
</p>
<p class="b4_font2">
交付装修：
<span class="b4_span1 gw decoration-details"></span>
</p>
<p class="b4_font2">
目前证照经营范围：
<span class="b4_span1 gw business-scope-details"></span>
</p>
<p class="b4_font2">
<span class="has-housed">已入驻：</span>
<span class="b3_span3 gw"></span>
</p>
<p class="b4_font2">
营业时间：
<span class="b4_span1 gw yingye-time"></span>
</p>
<p class="b4_font2 zhaoshang-time-p">
招商时间：
<span class="b4_span1 gw zhaoshang-time"></span>
</p>
<p class="kaiye-time-p b4_font2">
开业时间：
<span class="b4_span1 gw kaiye-time"></span>
</p>
<p class="b4_font2">
面宽：
<span class="b4_span1 gw area-width-details"></span>
</p>
<p class="b4_font2">
进深：
<span class="b4_span1 gw depth-details"></span>
</p>
</div>
<p class="line_hr"></p>
<!--line 4-->
<div class="b4_font">
<p class="b4_font_p">
经纪人对本铺评价
</p>
<p class="b4_font_p_evaluation_first b4_font2">
周边配套：<span class="b4_font_evaluation surrounding-complete">附近有沃尔玛超市、世纪联华超市、眼镜百货店等商场，杨泰公寓、杨泰二村等小区。</span>
</p>
<p class="b4_font_p_evaluation b4_font2">
所处地段：<span class="b4_font_evaluation in-section">店铺位于商圈中心，地段繁华，交通便利。商铺在商场一楼，便于顾客进店。</span>
</p>
<p class="b4_font_p_evaluation b4_font2">
附近人流：<span class="b4_font_evaluation near-stream">店铺周围客流量大，人群消费意愿强。</span>
</p>
<p class="b4_font_p_evaluation b4_font2">
其他补充：<span class="b4_font_evaluation other-supplementary">有证照，省去开店前置手续。有380V动力电，满足设备用电需要。</span>
</p>
</div>
<p class="line_hr"></p>
<!--设施配套-->
<div class="b4_font">
<p class="b4_font_p">
配套设施
</p>
<ul class="b4_font2 supporting-facilities">
<li><span class="icon-bg-facilities"><img src="/app/images/icon_200w@2x.png" class="supporting-facilities-img"/></span><span class="electric-quantity-details">200W</span></li>
<li><span class="icon-bg-facilities"><img src="/app/images/icon380v@2x.png" class="supporting-facilities-img"/></span><span class="voltage-details">380V</span></li>
<li class="meiqi-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_gas@2x.png" class="supporting-facilities-img"/></span><span class="meiqi">燃气</span></li>
<li class="exhaust-fume-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_piping@2x.png" class="supporting-facilities-img"/></span><span class="exhaust-fume-details">烟管道</span></li>
<li class="running-water-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_upper@2x.png" class="supporting-facilities-img"/></span><span class="running-water-details">上水</span></li>
<li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li>
</ul>
</div>
<div style="height: 2rem;">
</div>
<!--line 5-->
<!--<div class="b4_font">
<p class="b4_font_p" id="planter">
楼盘平面
</p>
</div>
<div class="slider3">
</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部分-->
<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/img_logo@2x.png" class="pbl_logo" />
<p>
<span style="font-size: 0.24rem;margin-top: 0.33rem;">海量真实旺铺，就在同联商业 </span>
<!--<span style="font-size: 0.22rem; margin-top: 0.06rem;">请下载同联商业APP</span>-->
</p>
<a id="jump_link" href="javascript:;">
<!--<img src="/app/images/img_btn@2x.png" class="pbl_xz">-->
<span class="pbl_xz">立即打开</span>
</a>
</div>
<!--底部联系人浮窗部分-->
<div class="fix_area_bottom_new">
<div>
<div>
<p>
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="head-img-agent"/>
<span class="head-agent">&nbsp;经纪人：<span id="fix_name"></span></span>
</p>
</div>
<div>
<p>
<a id="fix_tel" href="javascript:;">
<img src="/app/images/icon_telephone@2x.png" class="tel-agent"/><br/>
<span>拨打电话</span>
</a>
</p>
</div>
</div>
<a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
</div>
<div class="shop-list">
<img src="/app/images/img_more@2x.png" alt="" />
</div>
<!--<script src="/app/js/jquery.js"></script>-->
<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
<!--<script src="/app/js/swiper.js"></script>-->
<script src="/app/js/common.js" charset="utf-8"></script>
<script src="/app/js/baidusend.js"></script>
<script src="/app/js/jquery.cookie.js"></script>
<script src="/app/js/Tab_min.js" charset="utf-8"></script>
</body>
</html>
\ No newline at end of file
application/app/view/index/share_detail.html
View file @ 8c303780
......@@ -10,7 +10,7 @@
<link rel="stylesheet" href="/app/css/common.css">
<link rel="stylesheet" href="/app/css/details.css">
<link rel="stylesheet" href="/app/css/lunbo.css">
<link rel="stylesheet" href="/app/css/details_tl.css">
<link rel="stylesheet" href="/app/css/details_tl.css?new01">
<link>
</head>
......@@ -28,7 +28,7 @@
</div>
<p class="b3_spanhao_font" id="font_24">
<span class="b3_spanhao_left">
编88号：
编号：
<span class="b3_spanhao"></span>
</span>
......@@ -171,6 +171,35 @@
<li class="downriver-details-li"><span class="icon-bg-facilities"><img src="/app/images/icon_sewer@2x.png" class="supporting-facilities-img"/></span><span class="downriver-details">下水</span></li>
</ul>
</div>
<p class="line_hr"></p>
<!--pc官网 经纪人 拨打电话-->
<div class="pc-contact-agent b4_font">
<p class="b4_font_p">
咨询经纪人
</p>
<ul class="b4_font2 ul-agent-content-pc" style="margin-bottom: 3.6rem;">
<!--<li>
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="head-img-agent-pc"/>
<div class="agent-content-pc">
<p class="agent-name-pc">507张添</p>
<p class="agent-grade-pc">评分：<span>2</span>/<span>50</span>人评价</p>
</div>
<a id="fix_tel_pc" href="javascript:;">
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="tel-img-agent-pc"/>
</a>
</li>
<li>
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="head-img-agent-pc"/>
<div class="agent-content-pc">
<p class="agent-name-pc">507张添</p>
<p class="agent-grade-pc">评分：<span>2</span>/<span>50</span>人评价</p>
</div>
<a id="fix_tel_pc" href="javascript:;">
<img src="" onerror="javascript:this.src='/app/images/ic_default_headpic.png'" class="tel-img-agent-pc"/>
</a>
</li>-->
</ul>
</div>
<div style="height: 2rem;">
</div>
......@@ -230,7 +259,7 @@
</p>
<a id="jump_link" href="javascript:;">
<!--<img src="/app/images/img_btn@2x.png" class="pbl_xz">-->
<span class="pbl_xz">立即打开</span>
<span class="pbl_xz">立即下载</span>
</a>
</div>
......@@ -255,7 +284,8 @@
<a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
</div>
<div class="shop-list">
<img src="/app/images/img_more@2x.png" alt="" />
<!--<img src="/app/images/img_more@2x.png" alt="" />-->
<img src="/app/images/clik_shop_icon2.png" />
</div>
<!--<script src="/app/js/jquery.js"></script>-->
......@@ -263,9 +293,10 @@
<script src="/app/js/swiper.js"></script>
<script src="/app/js/app_jump.js"></script>
<script src="/app/js/common.js" charset="utf-8"></script>
<script src="/app/js/detaila_tl.js?new1"></script>
<script src="/app/js/detaila_tuiguang.js?new1"></script>
<script src="/app/js/jquery.cookie.js"></script>
<script src="/app/js/Tab_min.js" charset="utf-8"></script>
<script src="https://s96.cnzz.com/z_stat.php?id=1275427652&web_id=1275427652" language="JavaScript"></script>
</body>
</html>
\ No newline at end of file
application/index/service/RankingListService.php
View file @ 8c303780
......@@ -237,7 +237,7 @@ class RankingListService
foreach ($store_sort as $key => $value) {
$store_arr = $this->agentModel->getStoreOrDistrict(["store_id" => $value["store_id"], "level" => ["in", "20"]]);
if (count($store_arr) > 0) {
$value["name"] = count($store_arr) > 0 ? $store_arr[0]["name"] : "---";
//$value["name"] = count($store_arr) > 0 ? $store_arr[0]["name"] : "---";
$value["img"] = $store_arr[0]["img"];
}
}
......
application/index/service/UserService.php
View file @ 8c303780
......@@ -450,7 +450,7 @@ class UserService
return false;
}
$param['wx_open_id'] = $open_id;
$param['wx_union_id'] = $open_id;
$fields='a.user_phone';
$result = $this->user->getUserInfoByOpenId($param, $fields);
......
application/index/view/broker/agent.html
View file @ 8c303780
......@@ -255,7 +255,7 @@
</div>
<div class="modal-footer">
<a href="#modal-turncity" data-toggle="modal" class="btn btn-primary agent_business">
同城转门店
同城调配
</a>
<a href="#modal-business" data-toggle="modal" class="btn btn-primary agent_business">
跨城市转勤
......@@ -395,7 +395,7 @@
×
</button>
<h4 class="modal-title">
跨城市转勤
同城调配
</h4>
</div>
<div class="modal-body">
......@@ -408,13 +408,13 @@
</div>
<div class="form-group">
<label class="col-sm-4 control-label">所属门店：</label>
<select name="store_id_city" class="form-control btn6">
<select name="store_id_business" class="form-control btn6">
</select>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">业绩调整开始时间：</label>
<input id="same_city_Start_time" class="form-control btn6" type="text" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd'})">
<input id="same_city_Start_time" class="form-control btn6" type="text" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
</div>
</form>
</div>
......@@ -457,10 +457,6 @@
</select>
</div>
<!--<div class="form-group">
<label class="col-sm-4 control-label">业绩调整开始时间：</label>
<input id="city_Start_time" class="form-control btn6" type="text" onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
</div>-->
</form>
</div>
<div class="modal-footer">
......@@ -519,42 +515,3 @@
</div>
<!-- /.modal -->
</div>
<!--状态记录-->
<div class="modal fade" id="modal-stateRecord" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
状态记录
</h4>
</div>
<div class="modal-body">
<form class="form-horizontal">
<div class="form-group">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">状态</th>
<th class="text-center">操作人</th>
<th class="text-center">操作时间</th>
</tr>
</thead>
<tbody id='state_record_pc'>
</tbody>
</table>
</div>
</form>
</div>
<div class="modal-footer">
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
application/index/view/collection/getCollection.html
View file @ 8c303780
......@@ -281,7 +281,7 @@
<div class="text-right">
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
<span class="money_total_two ld-Marheight ">收款总额：</span><span id="money_total" class="money_total_two fore-span ld-Marheight"></span>
<span class="money_total_two ld-Marheight ">收款总额：</span><span id="money_total" class="money_total_two"></span>
<!--<span class="money_total_two fore-span ld-Marheight ">实付总额：</span><span id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268</span>元-->
<span class="btn btn-info btn3 ld-Marheight" id="export">导出报表</span>
</div>
......
application/index/view/share_shop/share_detail.html
View file @ 8c303780
......@@ -257,7 +257,9 @@
<a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
</div>
<div class="shop-list">
<img src="/app/images/img_more@2x.png" alt="" />
<!--<img src="/app/images/img_more@2x.png" alt="" />-->
<img src="/app/images/clik_shop_icon2.png" />
</div>
<!--<script src="/app/js/jquery.js"></script>-->
......
application/model/AAgents.php
View file @ 8c303780
......@@ -485,7 +485,7 @@ class AAgents extends BaseModel
public function getAgentsByStoreId($params)
{
$result = Db::table($this->table)
->field("id,name")
->field("id,name,status")
->where($params)
->select();
//echo Db::table($this->table)->getLastSql();
......@@ -652,11 +652,24 @@ class AAgents extends BaseModel
*/
public function searchAgentsByKeyword($field, $params)
{
if(isset($params["status"]) && $params["status"] == "-1"){
unset($params["status"]);
}else{
$params["status"] = array("in","0,3");
}
$params["status"] = array("in","0,3");
$result = Db::table($this->table)
->field($field)
->where($params)
->select();
return $result;
}
/**
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getAgentsByKeyword($field, $params)
{
$result = Db::table($this->table)
->field($field)
->where($params)
......
application/model/Users.php
View file @ 8c303780
......@@ -973,8 +973,8 @@ class Users extends Model
public function getUserInfoByOpenId($param, $fields)
{
$where_ = [];
if (isset($param["wx_open_id"])) {
$where_["b.wx_open_id"] = $param["wx_open_id"];
if (isset($param["wx_union_id"])) {
$where_["b.wx_union_id"] = $param["wx_union_id"];
}
$data = $this
->field($fields)
......@@ -982,6 +982,7 @@ class Users extends Model
->join("u_wx_info b", "a.buyer_id=b.id", "left")
->where($where_)
->select();
//dump($this->getLastSql());
return $data;
}
}
......
application/route.php
View file @ 8c303780
......@@ -25,7 +25,7 @@ Route::group('app', [
'getShopDetails' => ['app/index/getShopDetail', ['method' => 'get | post']],
'getVersionNo' => ['app/index/getVersionNo', ['method' => 'get | post']],
'feed' => ['app/index/feed', ['method' => 'get']],
'baidu_send' => ['app/index/baidu_send', ['method' => 'get']]
'baidu_send' => ['app/index/baidu_send', ['method' => 'get']]
]);
Route::group('app_broker', [
......@@ -116,7 +116,6 @@ Route::group('index', [
'settingCity' => ['index/broker/settingCity', ['method' => 'POST']], //设置所属城市
'getAgentGroupSite' => ['index/broker/getAgentGroupSite', ['method' => 'GET']], //获得经纪人站点
'agentPositionList' => ['index/broker/agentPositionList', ['method' => 'GET']], //经纪人职称列表
'getPerformanceRecordList' => ['index/broker/getPerformanceRecordList', ['method' => 'GET']], //转门店记录
'batchChangDish' => ['index/houses/batchChangDish', ['method' => 'post']],//批量修改盘方
'transformLandlord' => ['index/houses/transformLandlord', ['method' => 'post']],//转换房东手机号
'lockHouse' => ['index/houses/lockHouse', ['method' => 'post']],//锁盘
......@@ -360,15 +359,10 @@ Route::group('index', [
'setSite' => ['index/auth/setSite', ['method' => 'GET|POST']], //设置角色站点
'getRandKingList' => ['index/RankingList/getRandKingList', ['method' => 'GET|POST']], //设置角色站点
'getStoreRandKingList' => ['index/RankingList/getStoreRandKingList', ['method' => 'GET|POST']],
'exportReport' => ['index/RankingList/exportReport', ['method' => 'GET|POST']],
'exportReportStore' => ['index/RankingList/exportReportStore', ['method' => 'GET|POST']],
'selectPkSortByTime' => ['index/RankingList/selectPkSortByTime', ['method' => 'GET|POST']],
'getRandKingListByAgentId' => ['index/RankingList/getRandKingListByAgentId', ['method' => 'GET|POST']],
'getStoreRandKingListByAgentId' => [ 'index/RankingList/getStoreRandKingListByAgentId', [ 'method' => 'GET|POST' ] ],
'getRecordsList' => [ 'index/broker/getRecordsList', [ 'method' => 'GET|POST' ] ],
'getRandKingList' => ['index/RankingList/getRandKingList', ['method' => 'GET|POST']], //设置角色站点
'exportReport' => ['index/RankingList/exportReport', ['method' => 'GET|POST']],
'selectPkSortByTime' => ['index/RankingList/selectPkSortByTime', ['method' => 'GET|POST']],
'getRandKingListByAgentId' => ['index/RankingList/getRandKingListByAgentId', ['method' => 'GET|POST']],
]);
......@@ -476,12 +470,11 @@ Route::group('chat', [
'delGroupManage' => ['chat/Group/delGroupManage', ['method' => 'post|get']],
'pushMsg_gethouseinfo' => ['chat/AppChat/getHouseInfoByFrom', ['method' => 'post|get']],
'getUserInfoByFrom' => ['chat/AppChat/getUserInfoByFrom', ['method' => 'post|get']],
'getChatRelation' => [ 'chat/AppChat/getChatRelation', [ 'method' => 'post|get' ] ],
'getSystemMessageByShop' => [ 'chat/AppChat/getSystemMessageByShop', [ 'method' => 'post|get' ] ],
'getSystemMessageByUser' => [ 'chat/AppChat/getSystemMessageByUser', [ 'method' => 'post|get' ] ],
'getSystemMessageByReport' => [ 'chat/AppChat/getSystemMessageByReport', [ 'method' => 'post|get' ] ],
'updateSystemMessageIsRead' => [ 'chat/AppChat/updateSystemMessageIsRead', [ 'method' => 'post|get' ] ],
'getMessageIsRead' => [ 'chat/AppChat/getMessageIsRead', [ 'method' => 'post|get' ] ],
'getChatRelation' => ['chat/AppChat/getChatRelation', ['method' => 'post|get']],
'getSystemMessageByShop' => ['chat/AppChat/getSystemMessageByShop', ['method' => 'post|get']],
'getSystemMessageByUser' => ['chat/AppChat/getSystemMessageByUser', ['method' => 'post|get']],
'updateSystemMessageIsRead' => ['chat/AppChat/updateSystemMessageIsRead', ['method' => 'post|get']],
'getMessageIsRead' => ['chat/AppChat/getMessageIsRead', ['method' => 'post|get']],
]);
......@@ -529,7 +522,6 @@ Route::group('broker', [
'addFollowUp' => ['api_broker/Report/addFollowUp', ['method' => 'get|post']], //新增跟进
'getFollowUpList' => ['api_broker/Report/getFollowUpList', ['method' => 'get|post']],
'marchIn' => ['api_broker/OrderLog/marchIn', ['method' => 'get|post']],
'marchInV2' => ['api_broker/OrderLog/marchInV2', ['method' => 'get|post']],
'getBeforeBillInfo' => ['api_broker/OrderLog/getBeforeBillInfo', ['method' => 'get|post']],
'savePosBillMessage' => ['api_broker/OrderLog/savePosBillMessage', ['method' => 'get|post']],
'collectingBill' => ['api_broker/OrderLog/collectingBill', ['method' => 'get|post']],
......@@ -570,12 +562,11 @@ Route::group('broker', [
'all_user' => ['api_broker/Client/all_user', ['method' => 'post|get']],//全部客户 朱伟
'inviteList' => ['api_broker/Client/inviteList', ['method' => 'get']], //邀请记录
//商铺
'getShopList' => ['api_broker/Shop/getShopList', ['method' => 'get|post']],
'getShopListByReport' => ['api_broker/Shop/getShopListByReport', ['method' => 'get|post']],
'getShopListByMap' => ['api_broker/MapFindHouse/getShopListByMap', ['method' => 'get|post']],
'getCityInfoByMap' => ['api_broker/MapFindHouse/getCityInfoByMap', ['method' => 'get|post']],
'getShopDetail' => ['api_broker/Shop/getShopDetail', ['method' => 'get']],
'addShopFollowUp' => ['api_broker/Shop/addShopFollowUp', ['method' => 'post']], //新增商铺跟进记录
'getShopList' => ['api_broker/Shop/getShopList', ['method' => 'get|post']],
'getShopListByMap' => ['api_broker/MapFindHouse/getShopListByMap', ['method' => 'get|post']],
'getCityInfoByMap' => ['api_broker/MapFindHouse/getCityInfoByMap', ['method' => 'get|post']],
'getShopDetail' => ['api_broker/Shop/getShopDetail', ['method' => 'get']],
'addShopFollowUp' => ['api_broker/Shop/addShopFollowUp', ['method' => 'post']], //新增商铺跟进记录
'reportList' => ['api_broker/Report/reportList', ['method' => 'get']],
......@@ -700,11 +691,11 @@ Route::group('broker', [
'getAgentSiteList' => [ 'api_broker/Site/getAgentSiteList', [ 'method' => 'POST|GET' ] ], //获取经纪人站点列表
'getPhoneBook' => [ 'api_broker/Agent/getPhoneBook', [ 'method' => 'POST|GET' ] ], //消息页面--通讯录
'commentAndDeal' => [ 'api_broker/broker/commentAndDeal', [ 'method' => 'get' ] ],//获取当前经纪人的评价和交易列表
'addSpreadUser' => [ 'api_broker/SpreadUser/addSpreadUser', [ 'method' => 'POST|GET' ] ],
'getVolume' => [ 'api_broker/SpreadUser/getVolume', [ 'method' => 'POST|GET' ] ],
'getOurAppointment' => [ 'api_broker/AppointmentShop/getOurAppointment', [ 'method' => 'get' ] ],//我的客户预约
'addApplies' => [ 'api_broker/AppointmentShop/addApplies', [ 'method' => 'POST' ] ],//我的客户预约转为
'addFollow' => [ 'api_broker/AppointmentShop/addFollow', [ 'method' => 'POST' ] ],//我的客户跟进
'addSpreadUser' => [ 'api_broker/SpreadUser/addSpreadUser', [ 'method' => 'get' ] ],
'getVolume' => [ 'api_broker/SpreadUser/getVolume', [ 'method' => 'get' ] ],
'getHouseAddress' => [ 'api_broker/shop/getHouseAddress', [ 'method' => 'get' ] ], //搜索商铺地址
......
public/app/css/details_tl.css
View file @ 8c303780
......@@ -439,17 +439,90 @@ body{
text-overflow: ellipsis;
margin-top: 0.16rem;
}
/*商铺详情 动画*/
.shop-list{
position: fixed;
right: .2rem;
bottom: 2rem;
height: 1.6rem;
width: 1.6rem;
height: 2rem;
width: 1.64rem;
display: none;
background: url(/app/images/clik_shop_icon1.png) no-repeat 0 0/1.64rem 1.78rem;
}
.shop-list img{
width: 1.6rem;
.shop-list>img{
width: .8rem;
height: .88rem;
position: absolute;
animation: fly 1.5s infinite;
-webkit-animation: fly 1.5s infinite;
}
@keyframes fly {
0% {
bottom: 0;
right: -.1rem;
}
70% {
bottom: .3rem;
right: .14rem;
}
100% {
bottom: 0;
right: -.1rem;
}
}
@-webkit-keyframes fly {
0% {
bottom: 0;
right: -.1rem;
}
70% {
bottom: .3rem;
right: .14rem;
}
100% {
bottom: 0;
right: -.1rem;
}
}
/*.shop-list img{
width: 1.6rem;
}*/
.b3_span_shop_mianji{
display: none;
}
/*pc 官网css*/
.head-img-agent-pc {
height: .64rem;
width: .64rem;
border-radius: .32rem;
vertical-align: middle;
float: left;
}
.tel-img-agent-pc{
height: .5rem;
width: .5rem;
vertical-align: middle;
}
.agent-content-pc{
float: left;
margin-left: .16rem;
}
.agent-name-pc{
color: #333;
font-size: .28rem;
}
.agent-grade-pc{
color: #999;
font-size: .24rem;
}
#fix_tel_pc{
float: right;
margin-right: .3rem;
}
.ul-agent-content-pc li{
overflow: hidden;
margin-bottom: .3rem;
}
public/app/dist/index.html
View file @ 8c303780
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.3e3d1cf8f1e7102ed3f9e0a87c7e2479.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.561b182690cb8ed73774.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.7ee3b57e69b432b0911a83c779e43db0.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.b6b55d4b5452c168829d.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.561b182690cb8ed73774.js deleted 100644 → 0
View file @ 0b603be6
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.b6b55d4b5452c168829d.js 0 → 100644
View file @ 8c303780
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/images/Artboard@1x.png 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/images/agent-tel-pc.png 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/images/clik_shop_icon1.png 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/images/clik_shop_icon2.png 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/images/sprite.png 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/js/app_jump.js
View file @ 8c303780
This diff is collapsed.
public/app/js/baidusend.js 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/js/detaila_tl.js
View file @ 8c303780
This diff is collapsed.
public/app/js/detaila_tuiguang.js 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/app/js/timeline_pc.js
View file @ 8c303780
This diff is collapsed.
public/appnew/src/components/shop/images/gif.gif 0 → 100644
View file @ 8c303780
This diff is collapsed.
public/resource/js/main.js
View file @ 8c303780
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