Skip to content

T
tl_estate
Commit 153abb9d authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents d6c58599 ebb4d714
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 297 additions and 11 deletions
application/api_broker/service/StatementService.php
View file @ 153abb9d
...@@ -96,10 +96,9 @@ class StatementService ...@@ -96,10 +96,9 @@ class StatementService
$result = $params = []; $result = $params = [];
switch ($user_type) { switch ($user_type) {
case 0: case 0:
//todo
break; break;
case 1: case 1:
//todo 统计门店下的所有经纪人 // 统计门店下的所有经纪人
$params["store_id"] = $store_id; $params["store_id"] = $store_id;
//$params["level"] = array( "neq", "30" ); //$params["level"] = array( "neq", "30" );
$params["status"] = array('in','0,1');//只查询正常状态的经纪人 $params["status"] = array('in','0,1');//只查询正常状态的经纪人
...@@ -118,7 +117,8 @@ class StatementService ...@@ -118,7 +117,8 @@ class StatementService
$agentIds = ""; $agentIds = "";
foreach ($agentsArr as $key => $value) { foreach ($agentsArr as $key => $value) {
$agentIds .= $value["id"] . ","; $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"])); array_push($store_list, $this->getStoreList($conditions, $value["id"], $value["name"]));
} }
} }
......
application/app/view/index/baidusend.html 0 → 100644
View file @ 153abb9d
<!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 @ 153abb9d
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</p> </p>
<a id="jump_link" href="javascript:;"> <a id="jump_link" href="javascript:;">
<!--<img src="/app/images/img_btn@2x.png" class="pbl_xz">--> <!--<img src="/app/images/img_btn@2x.png" class="pbl_xz">-->
<span class="pbl_xz">立即打开</span> <span class="pbl_xz">立即下载</span>
</a> </a>
</div> </div>
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<script src="/app/js/swiper.js"></script> <script src="/app/js/swiper.js"></script>
<script src="/app/js/app_jump.js"></script> <script src="/app/js/app_jump.js"></script>
<script src="/app/js/common.js" charset="utf-8"></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/jquery.cookie.js"></script>
<script src="/app/js/Tab_min.js" charset="utf-8"></script> <script src="/app/js/Tab_min.js" charset="utf-8"></script>
</body> </body>
......
application/index/controller/ShareShop.php
View file @ 153abb9d
...@@ -43,6 +43,7 @@ class ShareShop extends Basic ...@@ -43,6 +43,7 @@ class ShareShop extends Basic
$this->_wxApi->getWxCode($this->url.'?'.http_build_query($params)); $this->_wxApi->getWxCode($this->url.'?'.http_build_query($params));
} else { } else {
$userInfo = $this->_wxApi->getUserInfoByAccessToken($code); $userInfo = $this->_wxApi->getUserInfoByAccessToken($code);
Log::write($userInfo, 'WxCallbackUntils'); //记录日志
//dump($userInfo);exit; //dump($userInfo);exit;
if (!$userInfo['wx_open_id']) { if (!$userInfo['wx_open_id']) {
$this->_wxApi->getWxCode($this->url.'?'.http_build_query($params)); $this->_wxApi->getWxCode($this->url.'?'.http_build_query($params));
...@@ -72,8 +73,8 @@ class ShareShop extends Basic ...@@ -72,8 +73,8 @@ class ShareShop extends Basic
} }
} }
Log::write($params, 'WxCallbackUntils'); //记录日志
Log::record("zhuweizhuwei----".json_encode($params),"info");
$this->assign('data',json_encode($params)); $this->assign('data',json_encode($params));
return view("share_detail"); return view("share_detail");
......
application/index/view/performance_ranking/performance_ranking.html
View file @ 153abb9d
...@@ -163,6 +163,19 @@ ...@@ -163,6 +163,19 @@
background-color: #D3D8EF; background-color: #D3D8EF;
}/* 滑块颜色 */ }/* 滑块颜色 */
.table-choose {
color:#999999;
}
.active {
color:#1A1A1A !important;
}
.left-padding{
margin-left:0.2rem;
}
</style> </style>
<div class="backer"></div> <div class="backer"></div>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
...@@ -276,8 +289,9 @@ ...@@ -276,8 +289,9 @@
<div class="col-xs-4 p-a-10 p-t-0"> <div class="col-xs-4 p-a-10 p-t-0">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="area-title p-a-15 p-b-10"> <div class="area-title p-a-15 p-b-10">
<span id="table-title"></span> <a><span id="table-title" class="active table-choose"></span></a>
<span class="title-time" id="table-time"></span> <a><span id="group-title" class="table-choose left-padding ">团队Q档</span></a>
<a><span class="title-time" id="table-time"></span></a>
</div> </div>
<div class="table-scro" style="height:6.97rem;;overflow-y:scroll"> <div class="table-scro" style="height:6.97rem;;overflow-y:scroll">
......
application/model/AAgents.php
View file @ 153abb9d
...@@ -497,7 +497,7 @@ class AAgents extends BaseModel ...@@ -497,7 +497,7 @@ class AAgents extends BaseModel
public function getAgentsByStoreId($params) public function getAgentsByStoreId($params)
{ {
$result = Db::table($this->table) $result = Db::table($this->table)
->field("id,name") ->field("id,name,status")
->where($params) ->where($params)
->select(); ->select();
//echo Db::table($this->table)->getLastSql(); //echo Db::table($this->table)->getLastSql();
......
public/app/dist/index.html
View file @ 153abb9d
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', 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> })(document, window);</script><link href=./static/css/app.833363af4d62880ae624240b114d2374.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.119f7e1cde3f430a89fa.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/js/baidusend.js 0 → 100644
View file @ 153abb9d
This diff is collapsed.
public/app/js/detaila_tuiguang.js 0 → 100644
View file @ 153abb9d
This diff is collapsed.
public/resource/js/performance_ranking.js
View file @ 153abb9d
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