Skip to content

T
tl_estate
Commit 20066bc9 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 93a1e502 0b26340c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 14 deletions
application/api/controller/CallAgent.php
View file @ 20066bc9
...@@ -31,16 +31,11 @@ class CallAgent extends Basic ...@@ -31,16 +31,11 @@ class CallAgent extends Basic
public function addUserCallAgent(){ public function addUserCallAgent(){
$params = $this->params; $params = $this->params;
/*$params = array(
"user_id" => 1,
"agent_id" => 4,
);*/
if (!isset($params["user_id"]) or !isset($params["agent_id"]) ) { if (!isset($params["user_id"]) or !isset($params["agent_id"]) ) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
//先判断是否已经存在数据
$insert["user_id"] = $params['user_id']; $insert["user_id"] = $params['user_id'];
$insert["agent_id"] = $params['agent_id']; $insert["agent_id"] = $params['agent_id'];
$insert["status"] = 0; $insert["status"] = 0;
...@@ -62,11 +57,6 @@ class CallAgent extends Basic ...@@ -62,11 +57,6 @@ class CallAgent extends Basic
public function addUserCallAgentV2(){ public function addUserCallAgentV2(){
$params = $this->params; $params = $this->params;
/*$params = array(
"user_id" => 1,
"agent_id" => 4,
);*/
if (!isset($params["phone"]) ) { if (!isset($params["phone"]) ) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
...@@ -74,10 +64,11 @@ class CallAgent extends Basic ...@@ -74,10 +64,11 @@ class CallAgent extends Basic
$model = new AAgents(); $model = new AAgents();
$params_['phone'] = $params["phone"]; $params_['phone'] = $params["phone"];
$agents_id = $model->getAgentsManagerID($params_); $agents_id = $model->getAgentsManagerID($params_);
//先判断是否已经存在数据
$insert["user_id"] = 0; $insert["user_id"] = 0;
$insert["agent_id"] = $agents_id[0]['id'] ? $agents_id[0]['id'] : 0; $insert["agent_id"] = $agents_id[0]['id'] ? $agents_id[0]['id'] : 0;
$insert["status"] = 0; $insert["status"] = 0;
$insert["source"] = $params['source'] ? $params['source'] : 0;//0c端用户 1百度推广 2今日头条 3腾讯推广 4其他
$res = $this->aUserCallAgent->saveUserCallAgent($insert);//int(1) $res = $this->aUserCallAgent->saveUserCallAgent($insert);//int(1)
......
application/api/untils/WxCallbackUntils.php
View file @ 20066bc9
...@@ -22,9 +22,11 @@ class WxCallbackUntils ...@@ -22,9 +22,11 @@ class WxCallbackUntils
public function __construct() public function __construct()
{ {
if (strpos($this->http_host(), 'api') !== false) { if (strpos($this->http_host(), 'api') !== false) {
Log::write('正式服', 'WxCallbackUntils'); //记录日志
$this->appId = "wxbbeb8cd2f4b72aea"; $this->appId = "wxbbeb8cd2f4b72aea";
$this->appSecret = "9ac6d1680553f4b554f3b46d263fbfb3"; $this->appSecret = "9ac6d1680553f4b554f3b46d263fbfb3";
} else { } else {
Log::write('测试服', 'WxCallbackUntils'); //记录日志
$this->appId = "wxd30d74d1126d3278";//测试 $this->appId = "wxd30d74d1126d3278";//测试
$this->appSecret = "f29c8c502549020d2193a464be9632dc";//测试 $this->appSecret = "f29c8c502549020d2193a464be9632dc";//测试
} }
......
application/index/view/houses/houseList.html
View file @ 20066bc9
...@@ -487,7 +487,15 @@ ...@@ -487,7 +487,15 @@
生成推广链接 生成推广链接
</h4> </h4>
</div> </div>
<div class="modal-body modal-body-one"> <div class="modal-body modal-body-one">
<div class="tuiguang-type">
<a href="javascript:;" class="btn btn-info">百度推广</a>
<a href="javascript:;" class="btn btn-default">腾讯推广</a>
<a href="javascript:;" class="btn btn-default">今日头条推广</a>
<a href="javascript:;" class="btn btn-default">其他</a>
</div>
<br>
<br> <br>
<br> <br>
<div> <div>
......
public/app/dist/index.html
View file @ 20066bc9
...@@ -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.404838a0fd049b0395f88adbf3d2bbb0.css rel=stylesheet></head><body><div id=app></div><script src=https://cdn.bootcss.com/vue/2.5.16/vue.min.js></script><script src=https://cdn.bootcss.com/vue-router/3.0.1/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.48c3c44ec668acd2d9fd.js></script></body></html> })(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 \ No newline at end of file
public/app/dist/static/js/app.48c3c44ec668acd2d9fd.js deleted 100644 → 0
View file @ 93a1e502
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.561b182690cb8ed73774.js 0 → 100644
View file @ 20066bc9
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/js/detaila_tl.js
View file @ 20066bc9
This diff is collapsed.
public/app/js/libs/vue-router.min.js 0 → 100644
View file @ 20066bc9
This diff is collapsed.
public/app/js/libs/vue.min.js
View file @ 20066bc9
This diff is collapsed.
public/appnew/index.html
View file @ 20066bc9
This diff is collapsed.
public/resource/js/houseList.js
View file @ 20066bc9
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