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

63747218 · hujun · 4daa434e · 77520f94 · 63747218 · 63747218
Commit 63747218 authored Jun 21, 2018 by hujun
24 changed files
--- a/application/api_broker/service/PerformanceService.php
+++ b/application/api_broker/service/PerformanceService.php
@@ -413,7 +413,7 @@ class PerformanceService
        if ($start_time == $now_date && $end_time == $now_date) {
            $param["id"] = array( "in", $agent_ids );

-            //todo 1.获取所有经纪人
+            // 1.获取所有经纪人
            $field = "id as agent_id,store_id";
            $group = "";
            if ($is_store == 2) {
@@ -623,7 +623,7 @@ class PerformanceService
        $params = $this->getAgentId($agent_id, 2, $start_time, $end_time);
        if (!$params)
            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);
        foreach ($reportList as $key => $val) {
            $reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);

--- a/application/app_broker/controller/Index.php
+++ b/application/app_broker/controller/Index.php
@@ -31,6 +31,8 @@ class Index
    public function index()
    {
        $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) {
            $this->_wxApi->getWxCode($this->url);
@@ -45,6 +47,7 @@ class Index

                // 验证open_id是否已经存在，存在则更新
                $wxInfoObj = $this->wxInfoModel->getWxInfoByOpenId($wx_union_id);
+                $id = 0;
                try {
                    if ($wxInfoObj && count($wxInfoObj) > 0) {
                        $userInfo["id"] = $wxInfoObj[0]["id"];
@@ -58,20 +61,23 @@ class Index
                $conditions["buyer_id"] = $id;
                $fields                 = "id,user_nick,user_phone,user_pic,other_pic";
                $user_info              = $this->userModel->getUserByWhere($conditions, $fields);
+
+                Log::record("session wx -----------------" . json_encode($user_info), "info");
                if (count($user_info) > 0) {
                    //下载页
                    header("Location:" . CURRENT_URL . "app/download_c");
                    die();
                } else {
                    //绑定页
-                    $url = "referrer_id=160&referrer_source=10&wx_union_id=".$wx_union_id ."&device_id=".$this->createOrderNumber();
-                    header("Location:" . CURRENT_URL . "app/dist/index.html#/inviteRegister?". $url );
+                    $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);
                    die();
                }
            }
        }

    }
+
    /**
     * 随机数
     * @return string
@@ -80,6 +86,7 @@ class Index
    {
        return time() . mt_rand(10000, 99999);
    }
+
    public function achieve_fork()
    {
        return view('index/achieve_fork');

--- a/application/model/OReportModel.php
+++ b/application/model/OReportModel.php
@@ -395,6 +395,7 @@ class OReportModel extends Model
            ->field($field)
            ->alias("a")
            ->join("o_order b", "a.id = b.f_id", "left")
+            ->join("g_houses c", "b.house_id = c.id", "left")
            ->where($where_)
            ->limit($page_size)
            ->page($page_no)

--- a/public/app/dist/index.html
+++ b/public/app/dist/index.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.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>
\ No newline at end of file
+<!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
--- a/public/app/dist/static/css/app.bdcc04a45cadafdc77909e93ec95a501.css
+++ b/public/app/dist/static/css/app.bdcc04a45cadafdc77909e93ec95a501.css
--- a/public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css.map
+++ b/public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css.map
--- a/public/app/dist/static/css/app.bdcc04a45cadafdc77909e93ec95a501.css.map
+++ b/public/app/dist/static/css/app.bdcc04a45cadafdc77909e93ec95a501.css.map
--- a/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js
+++ b/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js
--- a/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js.map
+++ b/public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js.map
--- a/public/app/dist/static/js/app.f120a21e98360c1f7bb3.js
+++ b/public/app/dist/static/js/app.f120a21e98360c1f7bb3.js
--- a/public/app/dist/static/js/app.f120a21e98360c1f7bb3.js.map
+++ b/public/app/dist/static/js/app.f120a21e98360c1f7bb3.js.map
--- a/public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/public/appnew/src/components/achieveMain/achieveAgent.vue
+++ b/public/appnew/src/components/achieveMain/achieveAgent.vue
--- a/public/appnew/src/components/achieveMain/achieveRegion.vue
+++ b/public/appnew/src/components/achieveMain/achieveRegion.vue
--- a/public/appnew/src/components/achieveMain/agentResource.vue
+++ b/public/appnew/src/components/achieveMain/agentResource.vue
--- a/public/appnew/src/components/achieveMain/agentResourceLi.vue
+++ b/public/appnew/src/components/achieveMain/agentResourceLi.vue
--- a/public/appnew/src/components/achieveMain/houseResource.vue
+++ b/public/appnew/src/components/achieveMain/houseResource.vue
--- a/public/appnew/src/components/achieveMain/houseResourceLi.vue
+++ b/public/appnew/src/components/achieveMain/houseResourceLi.vue
--- a/public/appnew/src/components/achieveMain/lookatResource.vue
+++ b/public/appnew/src/components/achieveMain/lookatResource.vue
--- a/public/appnew/src/components/achieveMain/lookatResourceLi.vue
+++ b/public/appnew/src/components/achieveMain/lookatResourceLi.vue
--- a/public/appnew/src/components/achieveMain/receiptResource.vue
+++ b/public/appnew/src/components/achieveMain/receiptResource.vue
--- a/public/appnew/src/components/achieveMain/receiptResourceLi.vue
+++ b/public/appnew/src/components/achieveMain/receiptResourceLi.vue
--- a/public/appnew/src/components/inviteRegister/inviteRegister.vue
+++ b/public/appnew/src/components/inviteRegister/inviteRegister.vue
--- a/public/appnew/src/router/index.js
+++ b/public/appnew/src/router/index.js