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
Hide whitespace changes
Inline Side-by-side
Showing with 1392 additions and 172 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/js/app_jump.js
View file @ 8c303780
......@@ -103,7 +103,7 @@ function jumpEvent(){
}
} else if (device.isAndroid()) {
if ( navigator.userAgent.toLowerCase().match(/MicroMessenger/i)!='micromessenger' ) {
window.location.href = 'tlscheme://tlhost/tonglian/open' + params;
window.location.href = 'tlscheme://tlhost/tonglian/open' ;//+ params;
window.setTimeout(function(){
location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
},5000);
......@@ -121,7 +121,7 @@ function jumpEvent(){
location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
},5000);
} else if (device.isAndroid()) {
window.location.href = 'tlscheme://tlhost/tonglian/open' + params;
window.location.href = 'tlscheme://tlhost/tonglian/open' ;//+ params;
window.setTimeout(function(){
location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
},5000);
......
public/app/js/baidusend.js 0 → 100644
View file @ 8c303780
define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT) {
var performanceRanking = {
pageNo: 1, /*第几页*/
pageSize: 15, /*每页显示多少条*/
user_id : 0,
urls: '',
agent_id_two:'',
agent_id2 : 0,
modal_btn_id : '' ,
init: function () {
//初始化dot
performanceRanking.addDark();
performanceRanking.event ();
performanceRanking.loadTableData();
performanceRanking.loadBusinessSchool ();
performanceRanking.loadNotice();
performanceRanking.loadWinerData();
//时间控件初始化
},
event: function () {
var that = this ;
$(document).on('click','.business_more', function(e){
var id = $(this).attr("id");
console.log(id);
that.loadBusinessById(id);
});
$(document).on('click','.noticeMore', function(e){
var id = $(this).attr("id");
var content = $(this).parent().parent().find(".dataDetail").html();
var title = $(this).parent().parent().find(".title").text();
var time = $(this).parent().parent().find(".time").text();
var fujian = $(this).parent().parent().find(".dataFujian").html();
console.log(fujian)
var fujianArray = fujian.split(',')
$('.notice-title').html(title);
$('.notice-time').html(time);
$('.notice-text').html(content);
if(fujianArray){
for ( var i = 0 ; i < fujianArray.length ; i++ ){
var _tempArr = fujianArray[i].split('/');
fujianArray[i] && $('#fujian_ul').append('<li><a href="{0}" title="点击可下载">{1}</a></li>'.stringFormatObj({
'0': fujianArray[i],
'1': that.dealFileName(decodeURI(_tempArr[_tempArr.length-1]))
}));
};
}
});
$(document).on('click','.table-choose', function(e){
// $('.table-choose').click(function(){
console.log(e)
if ($(this).hasClass("active")){
console.log("true");
//nothing to change
} else {
console.log("false")
$(this).parent().parent().find(".active").removeClass("active");
$(this).addClass("active");
if ($(this).attr(id) == "table-title") {
$('#group').hide();
$('#person').show();
} else {
$('#person').hide();
$('#group').show();
}
}
});
},
addDark : function(){
var docHeight = '7.52rem' //获取窗口高度
$('#paihang').append('<div id="overlay" style="padding-top:25%;height:7.52rem;position:relative;top:0;left:0"><div style="position:relative;top:50%font-size:20px;color:red;transform: translate(-25%,-50%);">数据加载中，请稍后。。。</div></div>');
$('#overlay').css({
'opacity': .9, //透明度
// 'position': 'relative',
// 'top': 0,
// 'left': 0,
'background-color': 'black',
'width': '100%',
'z-index': 5000 //保证这个悬浮层位于其它内容之上
});
},
dealFileName : function(str) {
//如果文件超过30的长度，则用*代替
if(str.length > 26) {
return str.slice(0, 23) + '***' + str.slice(-4);
} else {
return str;
};
},
loadBusinessSchool : function(){
var that = $.performanceRanking;
var params = {
'pageNo' : 1,
'pageSize' : 4
}
$.get('/index/business_school' , params , function(data){
console.log(data.data.list);
var tag = '' ;
for ( var i = 0 ; i < data.data.list.length ; i++ ){
tag += '<div class="content" style="overflow:hidden;">';
tag += ' <div class="col-xs-9 p-a-0">';
tag += ' <div class="col-xs-12 p-a-0 ">';
tag += ' <span class="content-text">'+ data.data.list[i].title+'</span>';
tag += ' </div>';
tag += ' <div class="col-xs-12 p-a-0 ">';
tag += ' <span class="content-time">'+data.data.list[i].create_time+'</span>';
tag += ' </div>';
tag += ' </div>';
tag += ' <div class="col-xs-3 p-a-0" style="height:100%;">';
tag += ' <button id="'+data.data.list[i].id+'" href="#business_modal" data-toggle="modal" class="btn more-news business_more">详情</button>';
tag += ' </div>';
tag += '</div>';
}
$('#business_school').append(tag);
})
},
loadBusinessById : function(id) {
$.get('/index/getNewsInfo' , {'id' : id},function(data){
if(data.code == 200) {
$('#modal_detail_value').html(data.data.content);
$("#announcement_title").text(data.data.title);
} else {}
},'json');
},
loadNotice : function(){
var params = {
'pageNo' : 1,
'pageSize' : 4
}
$.get('/index/noticeIndex',params, function(data){
console.log(data.data.list);
var tag = '' ;
for ( var i = 0 ; i < data.data.list.length ; i++ ){
tag += '<div class="content" style="overflow:hidden;">';
tag += ' <div class="col-xs-9 p-a-0">';
tag += ' <div class="col-xs-12 p-a-0 ">';
tag += ' <span class="content-text title ">'+data.data.list[i].title+'</span>';
tag += ' </div>';
tag += ' <div class="col-xs-12 p-a-0 ">';
tag += ' <span class="content-time time ">'+data.data.list[i].create_time+'</span>';
tag += ' </div>';
tag += ' </div>';
tag += ' <div class="col-xs-3 p-a-0" style="height:100%;">';
tag += ' <button id="'+ data.data.list[i].id +'" href="#notice_modal" data-toggle="modal" class="btn more-news noticeMore">详情</button>';
tag += ' </div>';
var fujian = "" ;
for ( var j = 0 ; j < data.data.list[i].annex_file_path.length ; j++ ){
fujian += data.data.list[i].annex_file_path[j] + ","
}
fujian = fujian.substr(0,fujian.length-1)
tag += ' <div class="dataDetail" style="display:none">'+data.data.list[i].content+'</div>'
tag += ' <div class="dataFujian" style="display:none">'+fujian+'</div>'
tag += '</div>';
}
$('#noticeList').append(tag);
},'json')
},
loadWinerData : function(){
var that = performanceRanking ;
var params = {
'site_id' : 10001
}
$.get('/index/selectPkSortByTime',params , function(data){
console.log(data)
var url = data.data.api_path;
var agent_sort = data.data.agent_sort;
var store_sort = data.data.store_sort;
that.initStoreSort(store_sort,url);
that.initAgentSort(agent_sort,url);
})
} ,
initStoreSort : function(data,url){
console.log(data);
var that = this ;
var tag = '' ;
for ( var i = 0 ; i < data.length ; i++ ){
var imgUrl = '' ;
if (data[i].img == ""){
imgUrl = "/resource/image/build.png"
} else {
imgUrl = url+data[i].img;
}
tag += '<div class="harf-in-five">';
tag += ' <div style="height:.2rem;width:40%;margin-left:30%">';
if ( i < 3 ){
tag += ' <image src="/resource/image/no'+(i+1)+'.png" />';
}
tag += ' </div>';
tag += ' <div class="header-area">';
tag += ' <image src="'+ imgUrl +'"></image>';
tag += ' </div>';
tag += ' <div class="name-area">';
// if ( i == 0 ){
// tag += ' <image src="/resource/image/first.png" style="width:0.24rem;height:0.171rem"></image>';
// } else if ( i == 1){
// tag += ' <image src="/resource/image/second.png" style="width:0.24rem;height:0.171rem"></image>';
// } else if (i == 2){
// tag += ' <image src="/resource/image/third.png" style="width:0.24rem;height:0.171rem"></image>';
// } else {
//
// }
// tag += ' <image src="/resource/image/first.png" style="width:0.24rem;height:0.171rem"></image>';
tag += ' <span>'+data[i].store_name+'</span>';
tag += ' </div>';
tag += '</div>';
}
$('#teamList').append(tag);
},
initAgentSort : function(data,url){
console.log(data);
var that = this ;
var tag = '' ;
for ( var i = 0 ; i < data.length ; i++ ){
var imgUrl = '' ;
if (data[i].img == ""){
imgUrl = "/resource/image/build.png"
} else {
imgUrl = url+data[i].img;
}
tag += '<div class="harf-in-five">';
tag += ' <div style="height:.2rem;width:40%;margin-left:30%">';
if ( i < 3 ){
tag += ' <image src="/resource/image/no'+(i+1)+'.png" />';
}
tag += ' </div>';
tag += ' <div class="header-area">';
tag += ' <image src="'+ imgUrl +'"></image>';
tag += ' </div>';
tag += ' <div class="name-area">';
// if ( i == 0 ){
// tag += ' <image src="/resource/image/first.png" style="width:0.24rem;height:0.171rem"></image>';
// } else if ( i == 1){
// tag += ' <image src="/resource/image/second.png" style="width:0.24rem;height:0.171rem"></image>';
// } else if (i == 2){
// tag += ' <image src="/resource/image/third.png" style="width:0.24rem;height:0.171rem"></image>';
// } else {
//
// }
// tag += ' <image src="/resource/image/first.png" style="width:0.24rem;height:0.171rem"></image>';
tag += ' <span>'+data[i].store_name+'</span>';
tag += ' </div>';
tag += '</div>';
}
$('#personList').append(tag);
},
//
loadTableData : function(){
var that = performanceRanking ;
var date = new Date();
var time = "(" + date.getFullYear() + "." + ( date.getMonth() + 1 ) + ".1-" + ( date.getMonth() + 1 ) + "." + date.getDate() + ")";
$('#table-time').text(time);
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
var id = user_info_obj.id;
var params = {
'agent_id' : id
}
// $.get('/index/getRandKingListByAgentId',params,function(data){
// that.loadTable(data.data.list,data.data.grade);
// var grade = data.data.grade ;
// var index = data.data.grade ;
// var indexTimes = 0 ;
// if (grade < 27){
// index = data.data.grade
// } else {
// index = data.data.grade%26;
// indexTimes = parseInt(data.data.grade/26)
// }
// var str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
// var value = str[data.data.grade]+""+(indexTimes > 0 ? indexTimes+"" : "");
// var name = data.data.position;
// var text = "";
// if (name == 0 ){
// text = "新人职称" + value + "档"
// } else if (name == 1 ){
// text = "店长职称" + value + "档"
// } else if (name == 2 ){
// text = "经理职称" + value + "档"
// } else if (name == 3 ){
// text = "主任职称" + value + "档"
// } else if (name == 4 ){
// text = "顾问职称" + value + "档"
// } else if (name == 5 ){
// text = "无职称职称" + value + "档"
// }
// $('#table-title').text(text);
// },'json')
//
$.ajax({
url: '/index/getRandKingListByAgentId',
type: 'GET',
async: true,
data: params,
dataType: 'json',
success: function(data) {
if (data.code == 200 ){
$('#tbody').empty();
that.loadTable(data.data.list,data.data.grade);
var grade = data.data.grade ;
var index = data.data.grade ;
var indexTimes = 0 ;
if (grade < 27){
index = data.data.grade
} else {
index = data.data.grade%26;
indexTimes = parseInt(data.data.grade/26)
}
var str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var value = str[index]+""+(indexTimes > 0 ? indexTimes+"" : "");
var name = data.data.position;
var text = "";
if (name == 0 ){
text = "新人职称" + value + "档"
} else if (name == 1 ){
text = "店长职称" + value + "档"
} else if (name == 2 ){
text = "经理职称" + value + "档"
} else if (name == 3 ){
text = "主任职称" + value + "档"
} else if (name == 4 ){
text = "顾问职称" + value + "档"
} else if (name == 5 ){
text = "无职称职称" + value + "档"
}
$('#table-title').text(text);
} else {
$('#table-title').text('职称排行');
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody').append(tableDat);
$('#overlay').fadeOut('')
}
},
error : function(data){
$('#table-title').text('职称排行');
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody').append(tableDat);
$('#overlay').fadeOut('')
}
});
},
//
loadTable : function(data,gradge){
var tableData = [] ;
var tbody = '' ;
for ( var i = 0 ; i < data.length ; i++ ){
tbody += '<tr>' ;
tbody += ' <td>' + (i+1) ;
tbody += ' </td>' ;
tbody += ' <td>' +(data[i].store_name ? data[i].store_name : "-");
tbody += ' </td>' ;
tbody += ' <td>' +data[i].name;
tbody += ' </td>' ;
tbody += ' <td>' +data[i].performance;
tbody += ' </td>' ;
tbody += '</tr>' ;
}
$('#tbody').append(tbody);
$('#overlay').fadeOut('')
}
};
return performanceRanking;
});
public/app/js/detaila_tl.js
View file @ 8c303780
......@@ -274,7 +274,7 @@
// var _share = getUrlParam('share');
if(_share == "1") {
$('.m_part3_w').hide();
// $('.shop-list').show();
var _fix_top = $(".public");
_fix_top.show();
$(".pbl_cha").click(function() {
......
public/app/js/detaila_tuiguang.js 0 → 100644
View file @ 8c303780
/**
* Created by 刘丹 on 2017/10/16.
*/
(function() {
var line_a = "";
var line_a_ulul = "";
var b4_font = "";
var slider3 = "";
var _shangpuId = getUrlParam('id'); //从url获取的商铺id
var _panfang_name='';
var _panfang_img='';
var _panfang_tel='';
var generalize_id =getUrlParam('generalizeId');//分享链接的来源
var p_city = getUrlParam('city');
var p_type = getUrlParam('type');
var p_district_id = getUrlParam('p_district_id');
var p_store_id = getUrlParam('p_store_id');
var p_agent_id = getUrlParam('p_agent_id');
var pc_isOfficial = getUrlParam('isOfficial');
//site_area区分是c端还是b端
//来源 1.c端 3.b端
$.ajax({
url: ServerHostTempC + '/api/getShopDetail',
data: {
'id': _shangpuId,
'site_area': 1
},
type: "GET",
dataType: "json",
beforeSend: function() {},
success: function(response) {
if(typeof response === 'object') {
if(response['code'] == '200') {
_panfang_name=response.data.panParty[0].name;
_panfang_img="https://api.tonglianjituan.com/static/user_header/" + response.data.panParty[0].img;
_panfang_tel=response.data.panParty[0].phone;
isCity();
var shang = response.data.shop_type;
var shanpu = ' ';
if(shang == "0") {
//商场
$('.b3_span_shop_mianji').show();
// shanpu = '<span class="a_fontd">进场费：' + response.data.slotting_fee + '元</span>';
$('.slotting_fee_type').html('进场费');
$('.slotting_fee').html(response.data.slotting_fee+'元');
$(".pu_area").html(response.data.shop_area_start + '-' + response.data.shop_area_end + '㎡');
$(".b3_span").html("商场");
$('.pu_area_type').html('商铺面积');
$('.b3_span_build_type').html('项目总面积'+':');
$('has-housed').html('已入驻'+':');
} else if(shang == "1") {
//街铺
//隐藏 建筑面积
$('.b3_span_shop_mianji').hide();
// shanpu = '<span class="a_fontd">转让费：' + response.data.slotting_fee + '元</span>';
$('.slotting_fee_type').html('转让费');
//判断对外转让费
if(response.data.external_slotting_fee == -1){
$('.slotting_fee').html('面议');
}else{
$('.slotting_fee').html(response.data.external_slotting_fee+'元');
}
$(".pu_area").html(response.data.shop_area_start + '㎡');
$(".b3_span").html("街铺");
$('.pu_area_type').html('建筑面积');
$('.b3_span_build_type').html('建筑面积'+'：');
$('.has-housed').html('当前经营'+':');
}
var title = response.data.title ? response.data.title : "";
var _tempStr = '';
if(response.data.rent_type == '1') {
$(".pu_price_type").html("租金");
_tempStr =response.data.rent_price + '元/月';
$(".pu_price").html(_tempStr);
} else if(response.data.rent_type == '2') {
$(".pu_price_type").html("租金");
_tempStr ='营业额扣点'+response.data.rent_price + '%';
$(".pu_price").html(_tempStr);
} else if(response.data.rent_type == '3') {
$(".pu_price_type").html("租金");
_tempStr = response.data.rent_price + '元/天/m²';
$(".pu_price").html(_tempStr);
}else if(response.data.rent_type == '4') {
$(".pu_price_type").html("租金");
_tempStr = response.data.rent_price + '元/年';
$(".pu_price").html(_tempStr);
};
line_a = '<p class="a_fonta">' + title + '</p>';
$(".line_a").html(line_a);
//渲染,部分完毕
var shangpu_tag = response.data.shop_sign;
if(shangpu_tag) {
shangpu_tags = shangpu_tag.split(",");
for(var i = 0; i < shangpu_tags.length; i++) {
line_a_ulul += '<li>' + shangpu_tags[i] + '</li>';
$(".line_a_ulul").html(line_a_ulul);
}
}
$('.b3_span0').html(response.data.management_fee + '元/月');
$('.b3_span_build').html(response.data.market_area + '㎡');
$(".b3_span_build_num").html(response.data.residue_num + '/' + response.data.total);
$(".b3_span2").html(response.data.industry_type);
$(".b3_spanhao").html(response.data.id);
$(".b3_span3").html(response.data.enter_num);
$(".b4_font_p1").html(response.data.external_item_advantage);
$(".terms-payment").html(response.data.payment_deposit);
$(".signing-year").html(response.data.age_limit);
$(".surrounding-complete").html(response.data.rim_mating);
$(".in-section").html(response.data.section);
$(".near-stream").html(response.data.crowd);
$(".other-supplementary").html(response.data.other);
$(".yingye-time").html(response.data.do_business_date);
$(".zhaoshang-time").html(response.data.opening_date);
$(".kaiye-time").html(response.data.start_business_date);
// $(".duinei").html(response.data.city + response.data.disc + response.data.external_address);
$(".duinei").html(response.data.address);
$(".jiaotong").html(response.data.traffic);
/*配套设施 */
$(".electric-quantity-details").html(response.data.electric_quantity+'KW');
$(".voltage-details").html(response.data.voltage+'V');
if(response.data.is_has_gas == 1){
$('.meiqi-details-li').hide();
};
if(response.data.running_water == 0){
$('.running-water-details-li').hide();
};
if(response.data.downriver == 0){
$('.downriver-details-li').hide();
};
if(response.data.exhaust_fume == 0){
$('.exhaust-fume-details-li').hide();
};
//面宽 进深
function switchDecoration(t){
switch(Number(t)){
case 1:return"毛坯";
case 2:return"现状";
case 3:return"简单装修";
case 4:return"精装修";
};
};
var has_decoration = switchDecoration(response.data.decoration);
$('.area-width-details').html(response.data.area_width+'米');
$('.depth-details').html(response.data.depth+'米');
$('.business-scope-details').html(response.data.business_scope);
$('.decoration-details').html(has_decoration);
var lp_img = response.data.images; //轮播图
var lp_img1 = response.data.plan_images; //楼层平面图
var img_item_ul = "";
//平面图 去掉
// if(lp_img1.length == "0") {
// $("#planter").hide();
// }
// for(var n = 0; n < lp_img1.length; n++) {
// slider3 += '<div class="slide"><img src="' + response.data.api_path + response.data.plan_images[n].img_name + '"></div>'
// $(".slider3").html(slider3);
// }
for(var n = 0; n < lp_img.length; n++) {
img_item_ul += '<li class="swiper-slide swiper-slide-active" data-index="1" data-totalindex="1" data-class="101" data-sum="6" style="width: 414px;"><a><img src="' + response.data.api_path + response.data.images[n].img_name + '" onerror="src=\'/app/images/pzz_.jpg\'"/></a></li>'
$("#img_item_ul").html(img_item_ul);
};
//地图相关暂未启用
var longitude = response.data.longitude;
var latitude = response.data.latitude;
// 百度地图API功能
// var map = new BMap.Map("allmap"); // 创建Map实例
// map.centerAndZoom(new BMap.Point(longitude, latitude), 11); // 初始化地图,设置中心点坐标和地图级别
// map.addControl(new BMap.MapTypeControl()); //添加地图类型控件
// map.setCurrentCity("上海"); // 设置地图显示的城市 此项是必须设置的
// map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
var swiper = new Swiper('.lp-bunner', {
preloadImages: false,
lazyLoading: true,
lazyLoadingOnTransitionStart: true,
onTransitionEnd: function(swiper) {
$('.lp-index').text(swiper.activeIndex + 1);
},
onInit: function(swiper) {
$('.lp-index').text(swiper.activeIndex + 1);
$('.lp-sum').text(swiper.imagesToLoad.length || swiper.imagesLoaded || $('img', '.lp-bunner').size());
}
});
var liWidth = $('.showBigClass li').click(function() {
$(this).addClass('on').siblings().removeClass('on');
var albumType = $(this).attr('data-index');
var $li = $(".shopBigBox .swiper-wrapper").find("[data-class=" + albumType + "]:first");
bimgSwiper.slideTo(+$li.data("totalindex") - 1, 500, true);
}).width();
typeSwiper = new Swiper('.showBigClass', {
width: liWidth ? liWidth : 52.5
});
//隐藏时间
if(shang == "0") {
//商场
$('.zhaoshang-time-p, .kaiye-time-p, .b3_span_shop_num').show();
} else if(shang == "1") {
//街铺
}
} else {
layerTipsX(response['msg']);
}
} else {
layerTipsX('data type error');
};
},
error: function() {
}
});
//获取房源动态
$.ajax({
url: '/api/getMarchInList',
data: {
'house_id': _shangpuId,
'is_return_list': 1
},
type: "GET",
dataType: "json",
beforeSend: function() {},
success: function(response) {
if(typeof response === 'object') {
if(response['code'] == '200') {
$('.take_look_7').html(response.data.week);
$('.take_look_30').html(response.data.month);
$('.take_look_focus').html(response.data.attention);
} else {
layerTipsX(response['msg']);
}
} else {
layerTipsX('data type error');
};
},
error: function() {
}
});
//推荐经纪人 h5官网
if(pc_isOfficial){
$.ajax({
url: '/api/getBroker',
data: {
'house_id': _shangpuId,
'pageSize': 3
},
type: "GET",
dataType: "json",
beforeSend: function() {},
success: function(response) {
if(typeof response === 'object') {
if(response['code'] == '200') {
//咨询经纪人
console.log(response.data.list);
var pc_agent_length=response.data.list;
var agent_item_ul ='';
for(var n = 0; n < pc_agent_length.length; n++) {
agent_item_ul += '<li><img src="'+ response.data.list[n].head_portrait + '" onerror="src=\'/app/images/ic_default_headpic.png\'" class="head-img-agent-pc"/><div class="agent-content-pc"><p class="agent-name-pc">' + response.data.list[n].id + response.data.list[n].name + '</p><p class="agent-grade-pc">评分：<span>' + response.data.list[n].evaluate_grade+'</span>/<span>'+response.data.list[n].evaluate+'</span>人评价</p></div><a id="fix_tel_pc" href="tel:'+response.data.list[n].phone+'"><img src="" onerror="javascript:this.src=\'/app/images/agent-tel-pc.png\'" class="tel-img-agent-pc"/></a></li>'
$(".ul-agent-content-pc").html(agent_item_ul);
};
} else {
layerTipsX(response['msg']);
}
} else {
layerTipsX('data type error');
};
},
error: function() {
}
});
};
//添加下载app链接相关
var _share = getUrlParam('share');
if(_share == "1") {
$('.m_part3_w').hide();
var _fix_top = $(".public");
_fix_top.show();
$(".pbl_cha").click(function() {
_fix_top.hide();
});
var _name = getUrlParam('user_name');
var _name_img = getUrlParam('user_img');
var _tel = getUrlParam('user_tel');
// pc h5推广
//经纪人 商铺列表 微门店
if(_name || _tel) {
var _fix_bottom = $(".fix_area_bottom_new");
_fix_bottom.show();
$('.shop-list').show();
$("#fix_name").html(_name);
$("#fix_tel").attr("href", "tel:" + _tel);
if(_name_img){
$(".head-img-agent").attr("src", _name_img);
}else{
$(".head-img-agent").attr("src", "/app/images/ic_default_headpic.png");
}
//点击拨打 记录拨打次数 朱威
$("#fix_tel").click(function() {
var time = localStorage.getItem(_shangpuId+"_"+_tel);
var nowTime = (new Date()).getTime();
if(!time || nowTime-time > 24*3600*1000){
$.ajax({
url: '/api/addUserCallAgentV2',
type: 'POST',
async: true,
data: {
'phone': _tel
},
dataType: 'json',
success: function(data) {
localStorage.setItem(_shangpuId+"_"+_tel,(new Date()).getTime());
}
});
}
});
$("#fix_tel").click(function() {
var _time = localStorage.getItem(_tel+"_"+_shangpuId);
var _nowTime = (new Date()).getTime();
if(!_time || _nowTime-_time > 24*3600*1000){
$.ajax({
url: '/api/recordCallNumShare',
type: 'POST',
async: true,
data: {
'phone': _tel
},
dataType: 'json',
success: function(data) {
localStorage.setItem(_tel+"_"+_shangpuId,(new Date()).getTime());
}
});
}
});
$("#fix_area_bottom_btn").click(function() {
_fix_bottom.hide();
});
//点击 商铺详情的 更多商铺
$('.shop-list').click(function() {
localStorage.setItem('shop_list_b_user',_name);
localStorage.setItem('shop_list_b_user_tel',_tel);
localStorage.setItem('shop_list_b_user_img',_name_img);
location.href = ServerHost + '/app/dist/#/shopList';
});
};
function isCity(){//判断是 推广链接
if(p_city){
$('.pc-contact-agent').hide();
var _fix_bottom = $(".fix_area_bottom_new");
_fix_bottom.show();
$('.shop-list').show();
$("#fix_name").html(_panfang_name);
$("#fix_tel").attr("href", "tel:" + _panfang_tel);
if(_panfang_img){
$(".head-img-agent").attr("src", _panfang_img);
}else{
$(".head-img-agent").attr("src", "/app/images/ic_default_headpic.png");
}
//点击拨打 记录拨打次数 朱威
$("#fix_tel").click(function() {
var time = localStorage.getItem(_shangpuId+"_"+_tel);
var nowTime = (new Date()).getTime();
if(!time || nowTime-time > 24*3600*1000){
$.ajax({
url: '/api/addUserCallAgentV2',
type: 'POST',
async: true,
data: {
'phone': _panfang_tel,
'source':generalize_id
},
dataType: 'json',
success: function(data) {
localStorage.setItem(_shangpuId+"_"+_tel,(new Date()).getTime());
}
});
}
});
$("#fix_tel").click(function() {
var _time = localStorage.getItem(_tel+"_"+_shangpuId);
var _nowTime = (new Date()).getTime();
if(!_time || _nowTime-_time > 24*3600*1000){
$.ajax({
url: '/api/recordCallNumShare',
type: 'POST',
async: true,
data: {
'phone': _panfang_tel
},
dataType: 'json',
success: function(data) {
localStorage.setItem(_tel+"_"+_shangpuId,(new Date()).getTime());
}
});
}
});
$("#fix_area_bottom_btn").click(function() {
_fix_bottom.hide();
$('.shop-list').show();
});
//点击 商铺详情的 更多商铺
$('.shop-list').click(function() {
location.href = ServerHost + "/app/dist/#/shopList?city=" + p_city +'&type=' + p_type +'&p_district_id=' + p_district_id+'&p_store_id=' + p_store_id +'&p_agent_id=' + p_agent_id+'&generalizeId=' + generalize_id;
});
}else if(pc_isOfficial){
$('.pc-contact-agent').show();
$('.supporting-facilities').css("margin-bottom","0");
$(".fix_area_bottom_new").hide();
$('.shop-list').show();
$('.shop-list').click(function() {
location.href = ServerHost + "/app/dist/#/shopList?isOfficial=" + 1;
});
};
};
//跳下载页
$('#jump_link').click(function(){
location.href = ServerHost + '/app.php/app/download_c';
})
}
})();
public/app/js/timeline_pc.js
View file @ 8c303780
......@@ -46,7 +46,8 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
var _$this = $(this);
var _img = _$this.find('img').attr('src');
console.log(_img);
$('body', parent.document).append('<div id="preview_big_img_div"><img src="'+_img+'" /></div>');
$('body', parent.document).append('<img class="J_preview" id="preview_big_img_div" src="'+_img+'" />');
window.parent.document.getElementById('preview_big_img_div').click();//巧妙调用父页面的方法
})
},
methods: {
......
public/appnew/src/components/shop/shopList.vue
View file @ 8c303780
......@@ -2,7 +2,7 @@
<div class="min-height-list">
<nav>
<div class="top-city-select-area flex-center">
<select @change="changeCity" v-model="initSelectCity">
<select @change="changeCity" v-model="initSelectCity" :disabled="isSelectDisabled">
<option value="上海市">上海市</option>
<option value="杭州市">杭州市</option>
<option value="深圳市">深圳市</option>
......@@ -83,10 +83,15 @@
</div>
<div class="mark-shop-choose-gray" v-for="(item, index) in mainDataChoose" v-show="(initTabNumMainChoose == index) && item.isShow" @click="tabMainChoose(index)">
</div>
<div class="to-five-page" v-if='isGif' @click="tabFivePage()">
<img :src="gif_img" class="to-five-page-img"/>
</div>
</div>
</template>
<script>
// import content from 'https://s96.cnzz.com/z_stat.php?id=1275427652&web_id=1275427652';
import gif_img from '@/components/shop/images/gif.gif';
import icon_search from '@/components/shop/images/icon_search@2x.png';
import icon_address from '@/components/shop/images/icon_address@2x.png';
import icon_down from '@/components/shop/images/icon_down@2x.png';
......@@ -136,10 +141,13 @@
site_area:2,
generalizeId:1,
isShowSearch:1,
isGif:0,
isSelectDisabled:false,
initTabNumAreaCity:0,
initTabNumBusiness:0,
initMoreNum:0,
initMoreNumRent:0,
gif_img,
icon_address,
icon_down02,
icon_down,
......@@ -170,8 +178,11 @@
}),
created() {
let _this = this;
//h5 推广
if(_this.$route.query.city){
_this.isShowSearch = 0;
_this.isSelectDisabled = true;
_this.isGif=1;
_this.initSelectCity = decodeURIComponent(_this.$route.query.city);
_this.initTabNumMain = _this.$route.query.type*1 == 1?0:1;
_this.p_district_id = _this.$route.query.p_district_id;
......@@ -179,6 +190,12 @@
_this.p_agent_id = _this.$route.query.p_agent_id;
_this.generalizeId = _this.$route.query.generalizeId;
_this.site_area = 6;
};
//H5 官网
if(_this.$route.query.isOfficial){
_this.isShowSearch = 1;
_this.isSelectDisabled = false;
_this.site_area = 6;
}
_this.getChooseList();
_this.common.duringRequest({
......@@ -255,7 +272,7 @@
.then(function(response) {
_this.mainData[_index].isLoadOnce = true;
if(response.data.code == 200) {
if(_this.$route.query.city){
if(_this.$route.query.city || _this.$route.query.isOfficial){
if(response.data.data.list){
var _list = response.data.data.list;
}else{
......@@ -466,7 +483,9 @@
let _this = this;
//从推广链接 跳转
if(_this.$route.query.city){
var str = this.common.ServerHost + "/index/shareShop?id=" + id +'&share=1&isC=0&client=b&city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId;
var str = this.common.ServerHost + "/app.php/app/share_detail?id=" + id +'&share=1&isC=0&client=b&city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId;
}else if(_this.$route.query.isOfficial){
var str = this.common.ServerHost + "/app.php/app/share_detail?id=" + id +'&share=1&isC=0&client=b&isOfficial=' + _this.$route.query.isOfficial;
}else{
var user_img = localStorage.getItem('shop_list_b_user_img');
var user_name = localStorage.getItem('shop_list_b_user');
......@@ -481,6 +500,12 @@
localStorage.setItem('shop_list_b_user_city',this.initSelectCity);
localStorage.setItem('shop_list_b_user_shoptype',this.initTabNumMain);
},
//到500代金券
tabFivePage(){
let _this = this;
var str1 = this.common.ServerHost + "/app/baidu_send?" +'city=' + _this.$route.query.city +'&type=' + _this.$route.query.type +'&p_district_id=' + _this.$route.query.p_district_id+'&p_store_id=' + _this.$route.query.p_store_id +'&p_agent_id=' + _this.$route.query.p_agent_id+'&generalizeId=' + _this.$route.query.generalizeId;
location.href = str1;
},
delMore(){
let _this = this;
_this.initTabNumRent = 0;
......@@ -555,6 +580,18 @@
}
]
}
},
beforeCreate() {
window.scrollTo(0,0);
let new_element = document.createElement('script');
new_element.setAttribute('type', 'text/javascript');
new_element.setAttribute('src', 'https://s96.cnzz.com/z_stat.php?id=1275427652&web_id=1275427652');
document.body.appendChild(new_element);
},
beforeDestroy() {
//移除统计浏览量的js
let b = document.querySelector('script[src*="https://s96.cnzz.com/z_stat.php?id=1275427652&web_id=1275427652"]');
b && b.parentNode.removeChild(b);
}
}
</script>
......@@ -829,4 +866,13 @@
.icon-search-img{
width: .46rem;
}
/*gif 动画*/
.to-five-page{
position: fixed;
top: 4.6rem;
right: .18rem;
}
.to-five-page img{
width: 1.6rem;
}
</style>
public/resource/js/main.js
View file @ 8c303780
require.config({
'baseUrl': (location.origin || location.protocol + '//' + location.hostname + (location.port == 80 ? '' : ':' + location.port)) + '/resource',
require.config ({
'baseUrl': (location.origin || location.protocol + '//' + location.hostname + (location.port == 80 ? '' : ':' + location.port)) + '/resource',
'waitSeconds': 0,
'waitSeconds': 0,
'paths': {
'app': 'js',
......@@ -24,39 +24,39 @@ require.config({
'97datePicker': 'lib/js/my97datePicker/WdatePicker',
'photo-gallery': 'lib/js/jquery-photo-gallery/jquery.photo.gallery',
},
'shim': {
'jquery': {
'exports': 'jquery'
},
'doT': {
'exports': 'doT'
},
'ckfinder': {
'exports': 'ckfinder'
},
'ckfinderStart': {
'exports': 'ckfinderStart'
},
'bootstrapJs': {
'deps': ['jquery'],
'exports': 'bootstrapJs'
},
'datetimepicker': {
'exports': 'datetimepicker'
},
'pagination': {
'deps': ['jquery'],
'exports': 'Pagination'
},
'paginationStart': {
'exports': 'pagination'
},
'blow-up': {
'deps': ['jquery'],
'exports': 'blow-up'
},
'layer': {
},
'shim': {
'jquery': {
'exports': 'jquery'
},
'doT': {
'exports': 'doT'
},
'ckfinder': {
'exports': 'ckfinder'
},
'ckfinderStart': {
'exports': 'ckfinderStart'
},
'bootstrapJs': {
'deps': ['jquery'],
'exports': 'bootstrapJs'
},
'datetimepicker': {
'exports': 'datetimepicker'
},
'pagination' : {
'deps': ['jquery'],
'exports': 'Pagination'
},
'paginationStart':{
'exports': 'pagination'
},
'blow-up' : {
'deps': ['jquery'],
'exports': 'blow-up'
},
'layer': {
'deps': ['css!lib/js/need/layer.css'],
'exports': 'layer'
},
......@@ -73,14 +73,14 @@ require.config({
'exports': 'photo-gallery'
}
},
'map': {
'*': {
'css': 'lib/js/css.min',
'text': 'lib/js/text',
'doT': 'lib/js/doT'
}
}
},
'map': {
'*': {
'css': 'lib/js/css.min',
'text': 'lib/js/text',
'doT': 'lib/js/doT'
}
}
});
require(['require', 'jquery', 'doT', 'layer', "datetimepicker", 'bootstrapJs', 'pagination', 'paginationStart', 'checkLogin', 'photo-gallery', '97datePicker', 'app/public']);
\ No newline at end of file
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