Skip to content

T
tl_estate
Commit 63747218 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/wx0604' into wx0604

parents 4daa434e 77520f94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
application/api_broker/service/PerformanceService.php
View file @ 63747218
...@@ -413,7 +413,7 @@ class PerformanceService ...@@ -413,7 +413,7 @@ class PerformanceService
if ($start_time == $now_date && $end_time == $now_date) { if ($start_time == $now_date && $end_time == $now_date) {
$param["id"] = array( "in", $agent_ids ); $param["id"] = array( "in", $agent_ids );
//todo 1.获取所有经纪人 // 1.获取所有经纪人
$field = "id as agent_id,store_id"; $field = "id as agent_id,store_id";
$group = ""; $group = "";
if ($is_store == 2) { if ($is_store == 2) {
...@@ -623,7 +623,7 @@ class PerformanceService ...@@ -623,7 +623,7 @@ class PerformanceService
$params = $this->getAgentId($agent_id, 2, $start_time, $end_time); $params = $this->getAgentId($agent_id, 2, $start_time, $end_time);
if (!$params) if (!$params)
return [ "code" => 101, "date" => "传入的参数错误" ]; return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,a.user_name,a.user_phone,a.predict_see_time,b.house_title"; $field = "a.id,a.user_name,a.user_phone,a.predict_see_time,c.internal_title as house_title,c.shop_type";
$reportList = $this->reportModel->getAddReportList($params, $field, $page_no, $page_size); $reportList = $this->reportModel->getAddReportList($params, $field, $page_no, $page_size);
foreach ($reportList as $key => $val) { foreach ($reportList as $key => $val) {
$reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]); $reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
......
application/app_broker/controller/Index.php
View file @ 63747218
...@@ -30,7 +30,9 @@ class Index ...@@ -30,7 +30,9 @@ class Index
public function index() public function index()
{ {
$code = empty($_GET['code']) ? null : $_GET['code']; $code = empty($_GET['code']) ? null : $_GET['code'];
$referrer_id = empty($_GET['referrer_id']) ? null : $_GET['referrer_id'];
$referrer_source = empty($_GET['referrer_source']) ? null : $_GET['referrer_source'];
if (!$code) { if (!$code) {
$this->_wxApi->getWxCode($this->url); $this->_wxApi->getWxCode($this->url);
...@@ -45,6 +47,7 @@ class Index ...@@ -45,6 +47,7 @@ class Index
// 验证open_id是否已经存在，存在则更新 // 验证open_id是否已经存在，存在则更新
$wxInfoObj = $this->wxInfoModel->getWxInfoByOpenId($wx_union_id); $wxInfoObj = $this->wxInfoModel->getWxInfoByOpenId($wx_union_id);
$id = 0;
try { try {
if ($wxInfoObj && count($wxInfoObj) > 0) { if ($wxInfoObj && count($wxInfoObj) > 0) {
$userInfo["id"] = $wxInfoObj[0]["id"]; $userInfo["id"] = $wxInfoObj[0]["id"];
...@@ -58,20 +61,23 @@ class Index ...@@ -58,20 +61,23 @@ class Index
$conditions["buyer_id"] = $id; $conditions["buyer_id"] = $id;
$fields = "id,user_nick,user_phone,user_pic,other_pic"; $fields = "id,user_nick,user_phone,user_pic,other_pic";
$user_info = $this->userModel->getUserByWhere($conditions, $fields); $user_info = $this->userModel->getUserByWhere($conditions, $fields);
Log::record("session wx -----------------" . json_encode($user_info), "info");
if (count($user_info) > 0) { if (count($user_info) > 0) {
//下载页 //下载页
header("Location:" . CURRENT_URL . "app/download_c"); header("Location:" . CURRENT_URL . "app/download_c");
die(); die();
} else { } else {
//绑定页 //绑定页
$url = "referrer_id=160&referrer_source=10&wx_union_id=".$wx_union_id ."&device_id=".$this->createOrderNumber(); $url = "referrer_id=$referrer_id&referrer_source=$referrer_source&wx_union_id= $wx_union_id&device_id=" . $this->createOrderNumber();
header("Location:" . CURRENT_URL . "app/dist/index.html#/inviteRegister?". $url ); header("Location:" . CURRENT_URL . "app/dist/index.html#/inviteRegister?" . $url);
die(); die();
} }
} }
} }
} }
/** /**
* 随机数 * 随机数
* @return string * @return string
...@@ -80,6 +86,7 @@ class Index ...@@ -80,6 +86,7 @@ class Index
{ {
return time() . mt_rand(10000, 99999); return time() . mt_rand(10000, 99999);
} }
public function achieve_fork() public function achieve_fork()
{ {
return view('index/achieve_fork'); return view('index/achieve_fork');
......
application/model/OReportModel.php
View file @ 63747218
...@@ -395,6 +395,7 @@ class OReportModel extends Model ...@@ -395,6 +395,7 @@ class OReportModel extends Model
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.id = b.f_id", "left") ->join("o_order b", "a.id = b.f_id", "left")
->join("g_houses c", "b.house_id = c.id", "left")
->where($where_) ->where($where_)
->limit($page_size) ->limit($page_size)
->page($page_no) ->page($page_no)
......
public/app/dist/index.html
View file @ 63747218
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.bdcc04a45cadafdc77909e93ec95a501.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.f120a21e98360c1f7bb3.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.33f238917fc813b45f4cf9d1450ba68f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ce726b7129b5ddaf08eb.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css.map 0 → 100644
View file @ 63747218
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js 0 → 100644
View file @ 63747218
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js.map 0 → 100644
View file @ 63747218
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.f120a21e98360c1f7bb3.js deleted 100644 → 0
View file @ 4daa434e
This diff is collapsed.
public/appnew/src/components/achieveMain/agentResource.vue 0 → 100644
View file @ 63747218
This diff is collapsed.
public/appnew/src/components/achieveMain/agentResourceLi.vue 0 → 100644
View file @ 63747218
This diff is collapsed.
public/appnew/src/components/achieveMain/lookatResource.vue 0 → 100644
View file @ 63747218
This diff is collapsed.
public/appnew/src/components/achieveMain/lookatResourceLi.vue 0 → 100644
View file @ 63747218
This diff is collapsed.
public/appnew/src/components/achieveMain/receiptResource.vue 0 → 100644
View file @ 63747218
This diff is collapsed.
public/appnew/src/components/achieveMain/receiptResourceLi.vue 0 → 100644
View file @ 63747218
This diff is collapsed.
public/appnew/src/router/index.js
View file @ 63747218
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