Merge branch 'test'

application/api/controller/Member.php

@@ -3,6 +3,8 @@
 namespace app\api\controller;
 
 use app\api_broker\service\PushMessageService;
+use app\index\service\UserService;
+use app\model\AAgents;
 use think\Request;
 use app\api\extend\Basic;
 use app\api\untils\MessageUntils;
@@ -416,6 +418,7 @@ class Member extends Basic
             $data["user_phone"] = $result[0]["user_phone"];
             $data["user_pic"]   = !empty($result[0]["user_pic"]) ? HEADERIMGURL . $result[0]["user_pic"] : $result[0]["other_pic"];
             $data["AuthToken"]  = $AuthToken;
+
         }else{
             return $this->response("101", "数据查询失败");
         }
@@ -501,4 +504,102 @@ class Member extends Basic
 
         return $this->response($data['status'], $data['msg'], $data['data']);
     }
+
+    /**
+     * 查询客户邀请人
+     * @param $referrer_id
+     * @param $referrer_source
+     * @return string
+     */
+    public function userDetailUserInvite($referrer_id,$referrer_source)
+    {
+        if($referrer_id == 0){
+            return '';
+        }
+        if ($referrer_source == 10) {
+            $m_user = new Users();
+
+            $referrer_res = $m_user->verifyUser('id,user_name,user_phone', '', [ 'id' => $referrer_id ]);
+            //$user_phone = empty($referrer_res['user_phone']) ? '' : substr_replace($referrer_res['user_phone'], '****', 3, 4);
+            $referrer_user_string['phone'] = $referrer_res['user_phone'];
+            $referrer_user_string['name'] = $referrer_res['user_name'];
+            $referrer_user_string['id'] = $referrer_res['id'];
+        } else {
+            $m_agent = new AAgents();
+
+            $referrer_res = $m_agent->verifyUser('id,name,phone', '', [ 'id' => $referrer_id ]);
+            $referrer_user_string['phone'] = $referrer_res['phone'];
+            $referrer_user_string['name'] = $referrer_res['name'];
+            $referrer_user_string['id'] = $referrer_res['id'];
+        }
+        return $referrer_user_string;
+    }
+
+
+    /**
+     * 设置客户邀请人
+     * @return \think\Response
+     */
+    public function myInvite() {
+
+        $params = $this->params;
+        /*
+            user_id:244
+            phone:15625362536
+            AuthToken:eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjoxODEsInVzZXJOaWNrIjoiXHU5MGZkXHU1Zjg4XHU1OTdkIiwicGhvbmUiOiIxNTIzMjE0NTIxNCJ9LCJ0aW1lU3RhbXBfIjoxNTQ1OTY4MzE4fQ.hyLOQs-zfu37hqiVGo6Fx4Elorp68tQQj3CKkUb6yjM
+        */
+        if (empty($params['user_id'])) {
+            return $this->response(101, '参数缺失', '');
+        }
+        $fields = "a.id,a.referrer_id,a.referrer_source";
+        $result = $this->user->getUserInfoById($params, $fields);
+        $data = [];
+        if(count($result) > 0){
+            $data["referrer_source"]  = $result[0]["referrer_source"];
+            $invite = $this->userDetailUserInvite($result[0]["referrer_id"],$result[0]["referrer_source"]);
+            $data["invite"]  = $invite ? $invite['name'].'-'.$invite['phone'] : '';
+        }else{
+            return $this->response("101", "数据查询失败");
+        }
+        return $this->response("200","请求成功",$data);
+    }
+
+    /**
+     * 设置客户邀请人
+     * @return \think\Response
+     */
+    public function setUserInvite() {
+
+        $params = $this->params;
+        /*
+            user_id:244
+            phone:15625362536
+            AuthToken:eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjoxODEsInVzZXJOaWNrIjoiXHU5MGZkXHU1Zjg4XHU1OTdkIiwicGhvbmUiOiIxNTIzMjE0NTIxNCJ9LCJ0aW1lU3RhbXBfIjoxNTQ1OTY4MzE4fQ.hyLOQs-zfu37hqiVGo6Fx4Elorp68tQQj3CKkUb6yjM
+        */
+        if (empty($params['user_id']) or empty($params['phone'])) {
+            return $this->response(101, '参数缺失', '');
+        }
+        $s_index_user = new UserService();
+        $result = $s_index_user->userInvite($params['user_id'],$params['phone']);
+
+        switch ($result) {
+            case 0 :
+                return $this->response("300", "绑定失败");
+                break;
+            case 1 :
+                return $this->response("200","请求成功");
+                break;
+            case 2 :
+                return $this->response("300","不能绑定自己");
+                break;
+            case 4 :
+                return $this->response("300", "不存在该邀请人！");
+                break;
+            default :
+                return $this->response("300", "绑定失败");
+        }
+
+    }
+
+
 }
\ No newline at end of file

application/api_broker/controller/DailyPaper.php

+<?php
+
+namespace app\api_broker\controller;
+
+use app\api_broker\extend\Basic;
+use app\api_broker\service\DailyPaperService;
+use think\Request;
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/12/17
+ * Time : 11:09 AM
+ * Intro:
+ */
+class DailyPaper extends Basic
+{
+    private $service_;
+
+    public function __construct(Request $request = null)
+    {
+        parent::__construct($request);
+        $this->service_ = new DailyPaperService();
+    }
+
+    /**
+     * 财务日报
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function dailyDetail()
+    {
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+     /*          $params = array(
+                   "store_id" => 730,//门店id
+                   "is_store" => 0,//身份是否是店长，财务显示不一样  0店长 1财务
+                   "daily_data" => "2018-12-18"
+               );
+               $this->userId = 5775;*/
+        if (!isset($params["store_id"]) || !isset($params["is_store"]) || !isset($params["daily_data"])) {
+            return $this->response("101", "请求参数错误");
+        }
+        $store_id = $params["store_id"];
+        $is_store = $params["is_store"];
+        $daily_data = $params["daily_data"];
+
+        $result = $this->service_->getDaily($this->agentId, $store_id, $is_store, $daily_data);
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["msg"]);
+        } else {
+            return $this->response("200", "success", $result["data"]);
+        }
+    }
+
+    /**
+     * 店长提交财务日报
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function addDaily()
+    {
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+     /*   $params = array(
+            "agent_id"     => 5775,//经纪人id
+            "agent_name"   => "222",//经纪人姓名
+            "daily_date"   => "2018-12-02",//日报日期
+            "alipay"       => "12",//支付宝收款
+            "tenpay"       => "2323",//微信收款
+            "realty_pay"   => "232",//地产转帐
+            "family_pay"   => "444",//世家公账
+            "private_bank" => "55",//3000账号
+            "cash"         => "666",//现金
+            "pos"          => "777",//pos机
+            "other_bank"   => "888"//其他
+        );*/
+        if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
+            !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
+            !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
+            !isset($params["pos"]) || !isset($params["other_bank"])
+        ) {
+            return $this->response("101", "请求参数错误");
+        }
+
+        $agent_id = $params["agent_id"];
+        $agent_name = $params["agent_name"];
+        $daily_date = $params["daily_date"];
+        $alipay = $params["alipay"];
+        $tenpay = $params["tenpay"];
+        $realty_pay = $params["realty_pay"];
+        $private_bank = $params["private_bank"];
+        $family_pay = $params["family_pay"];
+        $cash = $params["cash"];
+        $pos = $params["pos"];
+        $other_bank = $params["other_bank"];
+        $result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
+            $family_pay,$private_bank ,$cash, $pos, $other_bank);
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["msg"]);
+        } else {
+            return $this->response("200", "success", $result["data"]);
+        }
+    }
+
+    /**
+     * 财务审核新增
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function commitCheck(){
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+        /*$params = array(
+            "daily_id"         => 1,//日报id
+            "agent_id"         => 5775,//经纪人id
+            "agent_name"       => "222",//经纪人姓名
+            "alipay"           => "12",//支付宝收款
+            "tenpay"           => "2323",//微信收款
+            "realty_pay"       => "232",//地产转帐
+            "family_pay"       => "444",//世家公账
+            "private_bank"     => "55",//3000账号
+            "cash"             => "666",//现金
+            "pos"              => "777",//pos机
+            "other_bank"       => "888",//其他,
+            "operation_status" => 1,//0审核通过 1转为已审核
+            "remark"           => "888"//备注,
+        );*/
+        if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
+            !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
+            !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
+            !isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"])
+        ) {
+            return $this->response("101", "请求参数错误");
+        }
+
+        $daily_id = $params["daily_id"];
+        $agent_id = $params["agent_id"];
+        $agent_name = $params["agent_name"];
+        $alipay = $params["alipay"];
+        $tenpay = $params["tenpay"];
+        $realty_pay = $params["realty_pay"];
+        $private_bank = $params["private_bank"];
+        $family_pay = $params["family_pay"];
+        $cash = $params["cash"];
+        $pos = $params["pos"];
+        $other_bank = $params["other_bank"];
+        $remark = $params["remark"];
+        $operation_status = $params["operation_status"];
+        if($operation_status != 0 && $operation_status != 1){
+            return $this->response("101", "审核状态错误");
+        }
+        $result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
+            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status);
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["msg"]);
+        } else {
+            return $this->response("200", "success", $result["data"]);
+        }
+    }
+
+
+    /**
+     * @return \think\Response
+     */
+    public function getPayLogImg(){
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+    /*    $params = array(
+            "pay_log_id" => 1
+        );*/
+        if(!isset($params["pay_log_id"])){
+            return $this->response("101", "请求参数错误");
+        }
+
+        $img_list = $this->service_->getImgs($params["pay_log_id"]);
+        if(count($img_list) > 0){
+            $result["img_path"] = CHAT_IMG_URL;
+            $result["img_info"] = $img_list;
+            return $this->response("200","success",$result);
+        }else{
+            return $this->response("200","request null");
+        }
+    }
+
+}
\ No newline at end of file

application/api_broker/controller/OrderLog.php

@@ -179,8 +179,9 @@ class OrderLog extends Basic
         Log::record("********************transfer_img**". json_encode($transfer_img));
         $source       = isset($params["source"]) ? $params["source"] : 0;
         $income_time       = isset($params["income_time"]) ? $params["income_time"] : "";
-        $is_ok        = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],
-            $params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time);
+        $received_money       = isset($params["received_money"]) ? $params["received_money"] : "";
+        $type_ext       = isset($params["type_ext"]) ? $params["type_ext"] : "";
+        $is_ok        = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],$params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time, $received_money, $type_ext);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
@@ -235,18 +236,21 @@ class OrderLog extends Basic
         $remark         = isset($params["remark"]) ? $params["remark"] : "";
         $transfer_img   = isset($params["transfer_img"]) ? json_decode($params["transfer_img"] ,true): "";
         $income_time    = isset($params["income_time"]) ? $params["income_time"] : "";
+        $last_transfer_time  = isset($params["last_transfer_time"]) ? $params["last_transfer_time"] : "";
         $pay_id         = isset($params["pay_id"]) ? $params["pay_id"] : 0;
         $source         = $params["source"] ? $params["source"] : 0;
         $receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : "";
         $transfer_name  = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
+        $received_money  = isset($params["received_money"]) ? $params["received_money"] : 0;
+        $type_ext  = isset($params["type_ext"]) ? $params["type_ext"] : 0;
         if($pay_id > 0){
             $source = 2;
         }
 
         $is_ok        = $this->service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
         $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
-            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$params["last_transfer_time"],$pay_id,
-            $receipt_number,$transfer_name);
+            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id,
+            $receipt_number,$transfer_name, $received_money, $type_ext);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);

application/api_broker/controller/Shop.php

@@ -1027,24 +1027,32 @@ class Shop extends Basic
 
     /**
      * 商铺列表添加和编辑独家
+     *
+     * @return \think\Response
      */
     public function editExclusive()
     {
-//            $res = $this->gHousesModel->exclusive($this->params, $this->params['houses_id'], $this->agentId, $this->siteId);
         if (empty($this->params['id'])) {
             return $this->response(101, '参数错误');
         }
         $code = 200;
         $msg  = "";
-        if ($this->params['is_exclusive_type'] == 1) {
         $house = new HouseService();
+        if ($this->params['is_exclusive_type'] == 1) {
+            if (empty($this->params['exclusive_ids'])) {
+                return $this->response(101, '参数错误');
+            }
             $result = $house->addHouse($this->params, $this->agentId, 1, 0, 'exclusive');
             if ($result['status'] == 'fail') {
                 $code = 101;
                 $msg = $result['msg'];
             }
         } else {
-            $this->gHousesModel->editData(['is_exclusive_type'=>0], $this->params['id']);
+            $result = $house->delAgentHouse(3, $this->params['id']);
+            if (!$result) {
+                $code = 101;
+                $msg  = '解除独家关系失败';
+            }
         }
 
         return $this->response($code, $msg);

application/api_broker/controller/User.php

@@ -955,4 +955,6 @@ class User extends Basic
         }
     }
 
+
+
 }
\ No newline at end of file

application/api_broker/service/BrokerService.php

@@ -117,4 +117,7 @@ class BrokerService
 
     }
 
+
+
+
 }
\ No newline at end of file

application/api_broker/service/CallPhoneService.php

@@ -14,10 +14,12 @@ use app\api_broker\untils\RongDemo;
 use app\extra\RedisExt;
 use app\model\AliYunPhone;
 use app\model\BindingPhone;
+use app\model\AliYunSecretReport;
 use app\model\SecretReport;
 use app\model\UPhoneFollowUp;
 use app\model\UPhoneFollowUpTemporary;
 use app\model\Users;
+use app\model\AAgents;
 use think\Log;
 
 class CallPhoneService
@@ -408,18 +410,28 @@ class CallPhoneService
                 $where['a.status'] = 1;
                 $where['a.phone_a'] = $this->phone_a;
                 $where['a.type']   = $this->is_privacy;
-                $agent_call = $this->m_bind->getPhoneX('a.id,a.phone_a,a.phone_b,b.phone_x', $where, 'a.id ASC');
-                $result_unbind = $this->agentsUnBindRedis($agent_call['phone_a'], $agent_call['phone_b'], $agent_call['phone_x']);
+                $agent_call = $this->m_bind->getBindingPhoneListLimit(1, 100,'a.id,a.phone_a,a.phone_b,b.phone_x', $where);
                 $data['msg'] = '号码使用完，请联系运营人员。';
+
+                $is_bind = 0;
+                //处理经纪人全部点有意向，占用完号码的情况,释放100组号码
+                foreach ($agent_call['data'] as $k=>$v) {
+                    $result_unbind = $this->agentsUnBindRedis($v['phone_a'], $v['phone_b'], $v['phone_x']);  //释放成功一次
                     if ($result_unbind['status'] == 'successful') {
+                        $is_bind = 1;
+                        $this->m_bind->unBindTable($v['id']);
+                    }
+                }
+
+                if ($is_bind) {
                     $result = PlsDemo::bindAxb($this->phone_a, $this->phone_b, $this->expiry_date, $this->record, '', $this->city);
+                    if ($result->Code == 'OK') {
                         $data['status'] = 'success';
                         $data['msg'] = '绑定成功。';
                         $data['phone'] = $result->SecretBindDTO->SecretNo;
                         $this->subs_id = $result->SecretBindDTO->SubsId;
                         $this->request_id = $result->RequestId;
-
-                    $this->m_bind->unBindTable($agent_call['id']);
+                    }
                 }
             } else {
                 $data['msg'] = '拨号失败，15秒再试，再无法拨号请联系请联系运营人员！';
@@ -545,41 +557,50 @@ class CallPhoneService
      */
     public function defaultFollowUp()
     {
-
-        /*$current_time = time();
-        $time = $current_time - 3600;
-//        $start_date = date('Y-m-d', $time);
-        $end_date = date('Y-m-d');
-        $user_key = 'call_phone_user_' . $end_date;
-        $user_data = $this->redis->hKeys($user_key);
-        $content = '拨打电话，未打跟进。';
-        $follow_where['create_time'] = ['between', [date('Y-m-d H:i:s', $time), date('Y-m-d H:i:s')]];
-
+        $secret_model = new AliYunSecretReport();
+        $agent_model = new AAgents();
+        $current_time = time();
+        $end_time = $current_time - 3600;
+        $start_time = $end_time - 3600;
+
+        $save_follow['content'] = '拨打电话，未打跟进。';
+        $follow_where['create_time'] = $bind_where['create_time'] = [
+            'between', [date('Y-m-d H:i:s', $start_time), date('Y-m-d H:i:s',$end_time)]
+        ];
+        $bind_where['time'] = ['>', 0];
+        $num = $secret_model->getTotal($bind_where);
         //用户
-        if (!empty($user_data)) {
-
-            foreach ($user_data as $k => $v) {
-                $call_time = $this->redis->hGet($user_key, $v);
+        if ($num > 0) {
+            for ($i=1; $i <= $num; $i++) { 
+                $secret_data = $secret_model->getList($i, 500, '', 'agents_id,users_id,create_time', $bind_where);
+                foreach ($secret_data as $key => $value) {
+                    if (empty($value['agents_id']) || empty($value['users_id'])) {
+                        continue;
+                    }
 
-                if ($current_time - $call_time > 3600) {
-                    $array = explode('-', $v);
-                    $follow_where['agent_id'] = $array[0];
-                    $follow_where['user_id'] = $array[1];
-                    if(empty($array[2])){
-                        $this->redis->hDel($user_key, $v);
-                    } else {
-                        $m_follow_up = new UPhoneFollowUpTemporary($array[2]);
-                        $num = $m_follow_up->getFollowTotal($follow_where);
-                        if (empty($num) && !empty($array[1])) {
-                            //$agent_id, $user_id, $content, $type
-                            $m_follow_up->insertDefaultFollow($array[0], $array[1], $content, 0);
-                            $this->redis->hDel($user_key, $v);
+                    $site_id = $agent_model->getAgentsById($value['agents_id'], 'site_id');
+                    if (empty($site_id)) {
+                        continue;
                     }
+
+                    $follow_model = new UPhoneFollowUpTemporary($site_id);
+                    $follow_where['user_id'] = $value['users_id'];
+                    $follow_where['agent_id'] = $value['agents_id'];
+                    $count = $follow_model->getFollowTotal($follow_where);
+
+                    if (empty($count)) {
+                        $save_follow['user_id'] = $value['users_id'];
+                        $save_follow['agent_id'] = $value['agents_id'];
+                        $save_follow['user_status'] = -1;
+                        $save_follow['type'] = 0;
+                        $save_follow['labels_id'] = 0;
+                        $save_follow['create_time'] = $value['create_time'];
+                        $follow_model->savePhoneFollow($save_follow);
                     }
                 }
             }
         }
-        return;*/
+        return;
     }
 
     /**
@@ -624,6 +645,9 @@ class CallPhoneService
             case '杭州' :
                 $code = '0571';
                 break;
+            case '深圳' :
+                $code = '0755';
+                break;
             default :
                 $code = '021';
         }

application/api_broker/service/DailyPaperService.php

@@ -235,7 +235,7 @@ class DailyPaperService
         $payLogModel = new OPayLogModel();
         //中介费入账
         $field = "a.id,c.id as bargain_id,b.house_id,c.price,a.money,a.pay_type,a.transfer_name,
-        d.report_agent_id as agent_id,c.is_open,a.is_dividend,a.receipt_number,a.create_time,a.remark";
+        d.report_agent_id as agent_id,c.is_open,a.is_dividend,a.receipt_number,a.create_time,a.remark,a.received_money";
         $params["a.agent_id"] = array("in", ($ids));
         $params["a.create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
         $params["a.is_del"] = 0;
@@ -270,6 +270,7 @@ class DailyPaperService
         $field_adjustment = "b.id,c.house_id,b.new_paylog_id as pay_log_id,a.agent_id,b.money,a.income_time,b.type,a.receipt_number,a.create_time";
         $params_adjustment["a.agent_id"] = array("in", ($ids));
         $params_adjustment["a.is_del"] = 0;
+        $params_adjustment["b.is_del"] = 0;
         $params_adjustment["b.create_time"] = array("between", array($daily_data, $daily_data . " 23:59:59"));
         $info["adjustment"] = $this->getHouseAndAgentInfo(
             $payLogModel->selectAdjustmentList($field_adjustment, $params_adjustment)
@@ -634,5 +635,19 @@ class DailyPaperService
         return $oImgModel->getImgList($params);
     }
 
+    /**
+     * 检查是否审核
+     *
+     * @param $daily_id
+     * @return int
+     */
+    public function isCheck($daily_id) {
+        $where['daily_id'] = $daily_id;
+        $where['is_del'] = 0;
+        $num = $this->oDailyLogModel->getTotal($where);
+
+        $result = $num > 0 ? 1 : 0;
+        return $result;
+    }
 
 }
\ No newline at end of file

application/api_broker/service/OrderLogService.php

@@ -43,6 +43,7 @@ class OrderLogService
 
     /**
      * 批量插入收款记录
+     *
      * @param $agent_id
      * @param $agent_name
      * @param $report_id
@@ -54,14 +55,17 @@ class OrderLogService
      * @param $remark
      * @param $transfer_img
      * @param $source
+     * @param $income_time
+     * @param $received_money
+     * @param $type_ext
      * @return int|string
+     * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
-     * @throws \think\Exception
      */
     public function addCollectingBillV2($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
-                                        $industry_type, $remark, $transfer_img, $source, $income_time)
+                                        $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -69,11 +73,11 @@ class OrderLogService
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
                 if ($father_id == 0) {
                     $params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
-                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0);
+                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext);
                     $father_id = $this->payLogModel->insertPayLog($params);
                 } else {
                     array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
-                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0));
+                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext));
                 }
             }
         }
@@ -94,6 +98,7 @@ class OrderLogService
 
     /**
      * 批量插入收款记录
+     *
      * @param $agent_id
      * @param $agent_name
      * @param $report_id
@@ -111,6 +116,8 @@ class OrderLogService
      * @param $pay_id
      * @param $receipt_number
      * @param $transfer_name
+     * @param $received_money
+     * @param $type_ext
      * @return int|string
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -119,7 +126,7 @@ class OrderLogService
      */
     public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
                                       $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend,
-                                      $last_transfer_time, $pay_id, $receipt_number, $transfer_name)
+                                      $last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -141,12 +148,12 @@ class OrderLogService
                 if ($father_id == 0) {
                     $params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id,
                         $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source, $income_time,
-                        $is_dividend, $last_transfer_time, $receipt_number, $transfer_name);
+                        $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext);
                     $father_id = $this->payLogModel->insertPayLog($params);
                 } else {
                     array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name,
                         $report_id, $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
-                        $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name));
+                        $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext));
                 }
             }
         }
@@ -202,10 +209,14 @@ class OrderLogService
                 break;
             case 11:
                 break;
+            case 12:
+                break;
             case 20:
                 break;
             case 21:
                 break;
+            case 22:
+                break;
             case 30:
                 break;
             case 40:
@@ -218,6 +229,8 @@ class OrderLogService
                 break;
             case 60:
                 break;
+            case 70:
+                break;
             default:
                 return false;
         }
@@ -274,11 +287,12 @@ class OrderLogService
      * @param $last_transfer_time
      * @param $receipt_number
      * @param $transfer_name
+     * @param $received_money
      * @return mixed
      */
     private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $report_id, $order_id,
                                        $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
-                                       $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name)
+                                       $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext)
     {
 
         $arr["report_id"] = $report_id;
@@ -300,6 +314,8 @@ class OrderLogService
         $arr["create_time"] = date("Y-m-d H:i:s", time());
         $arr["update_time"] = date("Y-m-d H:i:s", time());
         $arr["is_dividend"] = $is_dividend;
+        $arr["received_money"] = $received_money;
+        $arr["type_ext"] = $type_ext;
         if ($income_time) {
             $arr["income_time"] = date("Y-m-d H:i:s", $income_time);
         }

application/app_broker/view/index/timeline_pc.html

@@ -80,8 +80,17 @@
 								
 								<ol v-if="item.step_name==='pay_log'" class="li-img-list">
 									<li v-for="(item2, idnex2) in item.img">
-										<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" :src="item.img_path+item2.img_name"></a>
 									</li>
+									<!--<li>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" src="https://pre2.tonglianjituan.com/static/chat_image/20190114/201901141550135536.jpg"></a>
+									</li>
+									<li>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" src="https://pre2.tonglianjituan.com/static/chat_image/20190114/20190114155013553693.jpg"></a>
+									</li>
+									<li>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" src="https://pre2.tonglianjituan.com/static/chat_image/20190114/201901141550135536932722.jpg"></a>
+									</li>-->
 								</ol>
 								<p v-if="item.step_name==='refund'">退款ID：<span class="span-active">{{item.id}}</span></p>
 								<p v-if="item.step_name==='refund'">要退金额的收款ID：<span class="span-active">{{item.pay_log_id}}</span></p>
@@ -110,17 +119,17 @@
 								<p v-if="item.step_name==='march_in'">地址：{{item.march_in_area}}</p>
 								<ol v-if="item.step_name==='march_in'" class="li-img-list">
 									<li v-for="(item2, idnex2) in item.img">
-										<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" :src="item.img_path+item2.img_name"></a>
 									</li>
 								</ol>
 								<ol v-if="item.step_name==='follow_up_log'" class="li-img-list">
 									<li>
-										<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item.explain_img"></a>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" :src="item.img_path+item.explain_img"></a>
 									</li>
 								</ol>
 								<ol v-if="item.step_name==='refund_check' && item.status*1 == 2" class="li-img-list">
 									<li v-for="(item2, idnex2) in item.img">
-										<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" :src="item.img_path+item2.img_name"></a>
 									</li>
 								</ol>
 								<p v-if="item.step_name==='march_in'" class="li-caozuoren">操作人：<span>{{item.reception_name}}</span></p>
@@ -135,7 +144,7 @@
 								<p v-if="item.step_name==='refund_check' && item.status*1 == 2">操作人：<span>{{item.operation_name}}</span></p>
 								<ol v-if="item.step_name==='refund'" class="li-img-list">
 									<li v-for="(item2, idnex2) in item.img">
-										<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
+										<a href="javascript:;" class="click-big-img-a"><img class="J_preview" :src="item.img_path+item2.img_name"></a>
 									</li>
 								</ol>
 							</div>

application/config.php

@@ -231,7 +231,7 @@ return [
         // 是否自动开启 SESSION
         'auto_start'     => true,
         //过期时间
-        'expire'         => 36000
+        'expire'         => 7200
     ],
 
     // +----------------------------------------------------------------------

application/database.php

@@ -13,15 +13,19 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '47.100.51.167',
+    //'hostname'        => '106.15.189.146',
+    'hostname'        => 'rm-uf6im23128lg530393o.mysql.rds.aliyuncs.com',
+//    'hostname'        => '127.0.0.1',
     // 数据库名
     'database'        => 'db_tongliandichan',
     // 用户名
-    'username'        => 'tldc_online',
+    'username'        => 'tl_root',
+//    'username'        => 'root',
     // 密码
-    'password'        => 'FujuhaofangrootTljt',
+    'password'        => '@!tljt**123',
+//    'password'        => '123456',
     // 端口
-    'hostport'        => '3307',
+    'hostport'        => '3306',
 
 
     //'hostport'        => '',

application/index/controller/DailyPaper.php

@@ -32,6 +32,7 @@ class DailyPaper extends Basic
      */
     public function dailyDetail()
     {
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
      /*          $params = array(
                    "store_id" => 730,//门店id
@@ -63,6 +64,7 @@ class DailyPaper extends Basic
      */
     public function addDaily()
     {
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
      /*   $params = array(
             "agent_id"     => 5775,//经纪人id
@@ -113,6 +115,7 @@ class DailyPaper extends Basic
      * @throws \think\exception\DbException
      */
     public function commitCheck(){
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
         /*$params = array(
             "daily_id"         => 1,//日报id
@@ -167,6 +170,7 @@ class DailyPaper extends Basic
      * @return \think\Response
      */
     public function getPayLogImg(){
+        header('Access-Control-Allow-Origin:*');
         $params = $this->params;
     /*    $params = array(
             "pay_log_id" => 1

application/index/controller/Finance.php

@@ -2565,13 +2565,11 @@ class Finance extends Basic
                 $m_agent_house = new GHousesToAgents();
 
                 foreach ($list as $k=>$v) {
-                    $source_id = $m_pay_adjustment->getFieldColumn('new_paylog_id', ['paylog_id'=> $v['id']]);
+                    if ($v['source'] == 2) {
+                        $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id']]);
                         $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
-
-                    if (empty($list[$k]['source_id'])) {
-                        $list[$k]['source'] = 0;
                     } else {
-                        $list[$k]['source'] = 2;
+                        $list[$k]['source_id'] = '';
                     }
 
                     if ($v['type'] != 10 && $v['type'] != 30) {
@@ -2889,7 +2887,7 @@ class Finance extends Basic
         try {
             $m_pay = new OPayLogModel();
             $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,';
-            $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type';
+            $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext';
             $pay_data = $m_pay->selectReceiptImgList($pay_fields, ['id'=>$this->params['pay_id']]);
             $pay_data = $pay_data[0];
             //成交报告id
@@ -2916,8 +2914,12 @@ class Finance extends Basic
             }
 
             $m_pay_adjustment = new OPayLogAdjustment();
-            $source_id = $m_pay_adjustment->getFieldValue('id', ['paylog_id'=> $pay_data['id']]);
-            $pay_data['source_id'] = empty($source_id) ? 0 : $source_id;
+            if ($pay_data['source'] == 2) {
+                $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $pay_data['id']]);
+                $pay_data['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
+            } else {
+                $pay_data['source_id'] = '';
+            }
 
             if (empty($source_id)) {
                 $pay_data['source'] = 0;
@@ -2997,6 +2999,10 @@ class Finance extends Basic
             $save_data['transfer_name']  = isset($this->params['transfer_name']) ? $this->params['transfer_name']:'';
             $save_data['money']  = $this->params['money'];
             $save_data['receipt_number']  = isset($this->params['receipt_number'])? $this->params['receipt_number']:'';
+            $save_data['type_ext'] = empty($this->params['type_ext']) ? 0 : 1;
+            $save_data['received_money'] = empty($this->params['received_money']) ? 0 : $this->params['received_money'];
+            $save_data['type_ext'] = empty($this->params['type_ext']) ? 0 : $this->params['type_ext'];
+            $save_data['is_dividend'] = empty($this->params['is_dividend']) ? 0 : $this->params['is_dividend'];
             $m_pay->updatePayLog($save_data);
         } catch (\Exception $e) {
             $code = 101;
@@ -3053,18 +3059,20 @@ class Finance extends Basic
         $remark       = isset($params["remark"]) ? $params["remark"] : "";
         $transfer_img = isset($params["transfer_img"]) ? json_decode($params["transfer_img"], true): "";
         $income_time  = isset($params["income_time"]) ? strtotime($params["income_time"]) : "";
-        $last_transfer_time  = isset($params["income_time"]) ? strtotime($params["last_transfer_time"]) : "";
+        $last_transfer_time  = isset($params["last_transfer_time"]) ? strtotime($params["last_transfer_time"]) : "";
         $pay_id       = isset($params["pay_id"]) ? $params["pay_id"] : 0;
         $source       = $params["source"] ? $params["source"] : 0;
         $receipt_number = isset($params["receipt_number"]) ? $params["receipt_number"] : "";
         $transfer_name  = isset($params["transfer_name"]) ? $params["transfer_name"] : "";
+        $received_money  = isset($params["received_money"]) ? $params["received_money"] : 0;
+        $type_ext  = isset($params["type_ext"]) ? $params["type_ext"] : 0;
         if($pay_id > 0){
             $source = 2;
         }
         $service_ = new OrderLogService();
         $is_ok = $service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
             $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
-            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name);
+            $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id, $receipt_number,$transfer_name, $received_money, $type_ext);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);

application/index/controller/Houses.php

@@ -528,18 +528,34 @@ class Houses extends Basic
      * 商铺列表添加和编辑独家
      *
      * @return \think\Response
-     * @throws \Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
      */
     public function editExclusive()
     {
-        if (empty($this->params['houses_id']) || empty($this->params['exclusive_id'])) {
+        if (empty($this->params['houses_id'])) {
             return $this->response(101, '参数错误');
         }
 
-        $this->data = $this->house->exclusive($this->params, $this->params['houses_id'], $this->userId, $this->siteId);
+        $house = new HouseService();
+        if ($this->params['is_exclusive_type'] == 1) {
+            if (empty($this->params['exclusive_ids'])) {
+                return $this->response(101, '参数错误');
+            }
+            $data = $this->params;
+            $data['id'] = $this->params['houses_id'];
+            unset($data['houses_id']);
+            $house = new HouseService();
+            $this->data = $house->addHouse($data, $this->userId, 0, $this->siteId, 'exclusive');
+            if ($this->data['status'] == 'fail') {
+                $this->code = 101;
+                $this->msg = $this->data['msg'];
+            }
+        } else {
+            $result = $house->delAgentHouse(3, $this->params['houses_id']);
+            if (!$result) {
+                $this->code = 101;
+                $this->msg  = '解除独家关系失败';
+            }
+        }
         return $this->response($this->code, $this->msg, $this->data);
     }
 

application/index/controller/Login.php

@@ -11,6 +11,8 @@ use app\model\ASite;
 use app\model\AStore;
 use app\model\AuthGroup;
 use app\model\AuthRule;
+use think\Config;
+use think\Cookie;
 use think\Session;
 
 /**
@@ -163,12 +165,15 @@ class Login extends Basic
         $jwt_data['level']      = $user_data['level'];
         $user_data['AuthToken'] = $jwt->createToken($jwt_data);
 
+        $expire = Config::get('session.expire');
+        $expire_time = $expire + time() - 300;
         Session::set("userName", $user_data["name"]);
         Session::set("userId", $user_data["id"]);
+        Session::set("expire_time", $expire_time);
         Session::set("lastLoginTime", time());
         Session::set("user_info", $user_data);
         $this->operating_records($user_data["id"], 1, '后台登陆'); //记录操作日志
-
+        Cookie::set('PHPSESSID', session_id(), $expire); //更新session_id过期时间
         return $this->response('200', '登录成功', $user_data);
     }
 

application/index/controller/Remark.php

@@ -78,7 +78,8 @@ class Remark extends Basic
         }
 
         if (!empty($this->params['content'])) {
-            $where['content'] = ['LIKE', "%{$this->params['content']}%"];
+            $content = trim($this->params['content']);
+            $where['content'] = ['LIKE', "%{$content}%"];
         }
 
         //跟进人id
@@ -187,10 +188,13 @@ class Remark extends Basic
         $code = 200;
         $msg  = '';
 
-        $follow_up_service = new PhoneFollowUpService($this->siteId);
         $where = $list = [];
         $where['page_no'] = $this->params['pageNo'];
         $where['page_size'] = $this->params['pageSize'];
+
+        //默认跟进城市
+        $site_id = $this->siteId;
+
         if (!empty($this->params['user_id'])) {
             $where['user_id'] = (int)$this->params['user_id'];
         }
@@ -207,6 +211,12 @@ class Remark extends Basic
             $where['district_id'] = (int)$this->params['remark_district_id'];
         }
 
+        //有权限的人可以查看其它城市的跟进
+        if (!empty($this->params['site_id'])) {
+            $site_id = $this->params['site_id'];
+        }
+
+        $follow_up_service = new PhoneFollowUpService($site_id);
         $result_data = $follow_up_service->getPhoneFollowList($this->params['start_date'], $this->params['end_date'], $where, $this->userId);
         if ($result_data['code'] == 200) {
             if (!empty($result_data['data'])) {

application/index/extend/Basic.php

@@ -14,7 +14,9 @@ use app\model\AAgents;
 use app\model\GHousesToAgents;
 use app\model\GOperatingRecords;
 use app\model\Users;
+use think\Config;
 use think\Controller;
+use think\Cookie;
 use think\Request;
 use think\Response;
 use think\Session;
@@ -35,6 +37,7 @@ class Basic extends Controller
 
     public $userId;
 
+    public $expire_time;
     public $lastLoginTime;
 
     public $city;
@@ -228,7 +231,7 @@ class Basic extends Controller
 
             if (empty($is_auth) && $this->userId != 1) {
                 if($this->request->isAjax()){
-                    echo json_encode(array( "code" => "300", "msg" => "没有权限！", "data" => [], "type" => "json" ));exit;
+                    echo json_encode(array( "code" => "301", "msg" => "没有权限！", "data" => [], "type" => "json" ));exit;
                 } else {
                     $this->error('没有当前页面权限');exit;
                 }
@@ -243,27 +246,20 @@ class Basic extends Controller
      */
     public function userVerify(){
         $this->lastLoginTime = Session::get("lastLoginTime");
-        if(empty($this->userName) || empty($this->userId) || empty($this->lastLoginTime) ){
+        $this->expire_time = Session::get("expire_time");
+        if(empty($this->lastLoginTime)){
             if ($this->request->isAjax()) {
-                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
+                echo json_encode(array( "code" => "300", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
             } else {
                 $this->redirect('/index/login');
             }
         }
 
-        $time = time();
-        //登录有效期判断
-        if (($time - $this->lastLoginTime) > 36000) {
-            if ($this->request->isAjax()) {
-                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-            } else {
-                $this->redirect('/index/login');die;
+        if ($this->expire_time < time()) {
+            $expire = Config::get('session.expire');
+            $expire = empty($expire) ? 7200 : $expire;
+            Cookie::set('PHPSESSID', session_id(), $expire); //更新session_id过期时间
         }
-        } else {
-            //更新时间
-            Session::set("lastLoginTime", $time);
-        }
-
         return ;
     }
 

application/index/service/HouseService.php

@@ -134,6 +134,11 @@ class HouseService
                 }
 
                 $m_operating->record($agent_id, 6, $remark, $data['id']);
+
+                if (empty($data['is_exclusive_type'])) {
+                    $this->delAgentHouse(3, $data['id'], 0);
+                    unset($data['exclusive_ids']);
+                }
             }
 
             $house_id = $this->m_house->addHouse($data, $agent_id);
@@ -935,4 +940,31 @@ class HouseService
 
         return ;
     }
+
+    /**
+     * 删除经纪人与楼盘关系
+     *
+     * @param $type
+     * @param $house_id
+     * @param $id_edit
+     * @return GHousesToAgents|bool
+     */
+    public function delAgentHouse($type, $house_id, $id_edit = 1) {
+        if (empty($type) || empty($house_id)) {
+            return false;
+        }
+
+        $id = $this->m_house->getTotal(['id'=>$house_id,'is_exclusive_type'=>1]);
+        if (empty($id)) {
+            return false;
+        }
+
+        $where['houses_id'] = $house_id;
+        $where['type'] = $type;
+        $is_ok = $this->agent_house->updateData($where, ['is_del'=>1]);
+        if ($id_edit && $type == 3) {
+            $this->m_house->editData(['is_exclusive_type'=>0], $house_id);
+        }
+        return $is_ok;
+    }
 }
\ No newline at end of file

application/index/service/UserLogService.php

@@ -242,7 +242,7 @@ class  UserLogService
     {
 
         //查询客户详情
-        $field = 'id as user_id,sex,user_pic,user_nick,user_name,user_phone,site_ids,agent_id,user_label,industry_type,price_demand,area_demand,vip';
+        $field = 'id as user_id,sex,user_pic,user_nick,user_name,user_phone,site_ids,agent_id,user_label,industry_type,price_demand,area_demand,vip,user_status';
         $result = $this->userModel->getUserDetailStreamline($user_id,$field);
 
         if (count($result) <= 0) {

application/index/service/UserService.php

@@ -626,7 +626,7 @@ class UserService
         }
         //bind_id是否等于0 是否主账号
         $user_info = $this->user->getUserById($field = 'bind_id', $user_id);
-        $field = 'id as user_id,user_nick,user_name,user_phone,bind_id';
+        $field = 'id as user_id,user_nick,user_name,user_phone,bind_id,user_status';
         if($user_info['bind_id'] == 0){
             //主账号只需要查bind_id等于当前用户的ID
             $where['bind_id'] = $user_id;
@@ -652,5 +652,40 @@ class UserService
     }
 
 
+    /**
+     * 客户邀请人
+     * @param $phone
+     * @return int
+     */
+    public function userInvite($user_id,$phone)
+    {
+        $m_agent = new AAgents();
+        // 判断经纪人表是否存在
+        $agent_res = $m_agent->findByOne('id', ["phone" => $phone,"status" => 0]);
+        // 判断客户表是否存在
+        $user_res = $this->user->findByOne('id', ["user_phone" => $phone,"status" => 0]);
+
+        if(!$agent_res && !$user_res){
+            return 4;
+        }
+
+        if ($agent_res) {
+            // 邀请人 为 经纪人 经纪人表客户表同时存在
+            $referrer_source = 20;
+            $referrer_id = $agent_res['id'];
+        } else {
+            // 邀请人 为 经纪人 只存在于客户表
+            $referrer_source = 10;
+            $referrer_id = $user_res['id'];
+        }
+
+        if(($referrer_source == 10) and ($user_id == $referrer_id)){
+            return  2;
+        }
+
+        $res = $this->user->setUserInvite($user_id,$referrer_source,$referrer_id);
+
+        return $res == 1 ? 1 : 0;
+    }
 
 }
\ No newline at end of file

application/index/view/finance/daily_details.html

 {layout name="global/frame_two_tpl" /}
 <input type="hidden" class="page-load" id="financial_manager_daily_list" />
 <style type="text/css">
+	.col-xs-3{
+		padding-left: 8px;
+		padding-right: 8px;
+		
+	};
 	/*图片*/
 	.clear{
 		clear: both;
@@ -279,6 +284,7 @@
 									<th class="text-center">成交价</th>
 									<th class="text-center">应收金额</th>
 									<th class="text-center">本次收佣</th>
+									<th class="text-center">之前已收佣</th>
 									<th class="text-center">多收金额</th>
 									<th class="text-center">支付方式</th>
 									<th class="text-center">转账户名</th>
@@ -307,6 +313,7 @@
 									<th class="text-center">成交商铺地址</th>
 									<th class="text-center">应收案场费</th>
 									<th class="text-center">本次收佣</th>
+									<th class="text-center">之前已收佣</th>
 									<th class="text-center">支付方式</th>
 									<th class="text-center">转账户名</th>
 									<th class="text-center">业务员</th>
@@ -694,6 +701,29 @@
 								<span id="intoType" class="col-xs-6 ld-Marheight">中介费</span>
 							</div>
 						</div>
+						<!--收款详情 加中介费类型 之前已收佣-->
+						<div class="col-xs-12">
+							<div class="col-xs-6 agency_fees_type_hide">
+							<div class="form-group">
+								<strong><span class="col-xs-3 ld-Marheight" style="margin-left: -7px;">中介费类型:</span></strong>
+								<div class="col-xs-6">
+									<select class="form-control" id="agency_fees_type_text">
+										<option class="" value="0">正常</option>		
+										<option class="" value="1">多收</option>	
+								    </select>
+								</div>
+								
+							</div>
+						    </div>
+							<div class="col-xs-6 before_commission_hide">
+								<div class="form-group">
+									<strong><span class="col-xs-3 ld-Marheight">之前已收佣:</span></strong>
+									<div class="col-xs-6">
+									<input class="form-control" type="text" value="0" id="before_commission_text">
+									</div>
+								</div>
+							</div>
+						</div>	
 						<div class="col-xs-6">
 							<div class="form-group">
 								<strong><span class="col-xs-3 ld-Marheight">商铺号:</span></strong>
@@ -803,13 +833,16 @@
 									<select class="form-control" id="payType">
 										<option value="10">施总支付宝</option>		
 										<option value="11">林老师支付宝</option>	
+										<option value="12">筠姐支付宝</option>
 										<option value="20">施总微信</option>		
 										<option value="21">林老师微信</option>
+										<option value="22">筠姐微信</option>
 										<option value="30">pos机器</option>		
 										<option value="40">地产转账</option>	
 										<option value="41">世家公账</option>
 										<option value="42">3000账号</option>
 										<option value="50">现金</option>
+										<option value="70">银满谷银行卡</option>
 										<option value="60">其他</option>
 									</select>
 								</div>
@@ -880,3 +913,33 @@
 	</div>
 	<!-- /.modal -->
 </div>
+
+<!-- /#删除模态框 -->
+<div class="modal fade" id="modal-delete" 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">
+                    &times;
+                </button>
+				<h4 class="modal-title">
+                    删除
+                </h4>
+			</div>
+			<div class="modal-body">
+				<div class="modal-body">
+					<input type="hidden" value="" id="delete_id" /> 确认删除吗？
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消
+                </button>
+				<button type="button" class="btn btn-primary" id="confirm_delete" data-dismiss="modal">
+                    删除
+                </button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>
\ No newline at end of file

application/index/view/finance/getCollection.html

 {layout name="global/frame_two_tpl" /}
 <input type="hidden" class="page-load" id="getCollection" />
 <style>
+	.col-xs-3{
+		padding-left: 8px;
+		padding-right: 8px;
+		
+	};
 	.reportArea{
 		float: left;
 		position: relative;
@@ -47,7 +52,7 @@
 	}
 	.modal-body-height {
 		overflow-y: auto;
-		height: 521px;
+		height: 551px;
 	}
 	#container_body_img_area>div{
 		float: left;
@@ -365,14 +370,19 @@
 													<option value="">入账方式</option>
 													<option value="10">施总支付宝</option>
 													<option value="11">林老师支付宝</option>
+													<option value="12">筠姐支付宝</option>
 													<option value="20">施总微信</option>
 													<option value="21">林老师微信</option>
+													<option value="22">筠姐微信</option>
 													<option value="30">POS机器</option>
 													<option value="40">地产转账</option>
 													<option value="41">世家公账</option>
 													<option value="42">3000账号</option>
 													<option value="50">现金</option>
+													<option value="70">银满谷银行卡</option>
 													<option value="60">其他</option>
+
+													
 												</select>
 												<select class="form-control btn2 ld-Marheight" id="come_from">
 													<option value="-1">来源</option>
@@ -491,6 +501,25 @@
 								<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
 							</div>
 						</div>
+						<!--新增中介费  类型  之前已收佣-->
+						<div class="col-xs-6" id="agency_fees_type_div">
+							<div class="form-group">
+								<strong><span class="col-xs-4 ld-Marheight">中介费类型:</span></strong>
+								<div class="col-xs-6">
+									<select class="form-control" id="agency_fees_type">
+										<option class="" value="0">正常</option>		
+										<option class="" value="1">多收</option>	
+									</select>
+								</div>
+							</div>
+						</div>
+						<div class="col-xs-6" id="before_commission_div">
+							<div class="form-group">
+								<strong><span class="col-xs-4 ld-Marheight">之前已收佣(元):</span></strong>
+								<div class="col-xs-6"><input class="form-control"  type="text" value="0" id="before_commission" /></div>
+								<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
+							</div>
+						</div>
 						<div class="col-xs-12 rep">
 							<div class="form-group">
 								<strong><span class="col-xs-2 ld-Marheight">成交报告ID:</span></strong>
@@ -662,6 +691,30 @@
 								<span id="intoType" class="col-xs-6 ld-Marheight">中介费</span>
 							</div>
 						</div>
+						<!--收款详情 加中介费类型 之前已收佣-->
+						<div class="col-xs-12">
+							<div class="col-xs-6 agency_fees_type_hide">
+							<div class="form-group">
+								<strong><span class="col-xs-3 ld-Marheight" style="margin-left: -7px;">中介费类型:</span></strong>
+								<div class="col-xs-6">
+									<select class="form-control" id="agency_fees_type_text">
+										<option class="" value="0">正常</option>		
+										<option class="" value="1">多收</option>	
+								    </select>
+								</div>
+								
+							</div>
+						    </div>
+							<div class="col-xs-6 before_commission_hide">
+								<div class="form-group">
+									<strong><span class="col-xs-3 ld-Marheight">之前已收佣:</span></strong>
+									<div class="col-xs-6">
+									<input class="form-control" type="text" value="0" id="before_commission_text">
+									</div>
+								</div>
+							</div>
+						</div>	
+						
 						<div class="col-xs-6">
 							<div class="form-group">
 								<strong><span class="col-xs-3 ld-Marheight">商铺号:</span></strong>
@@ -771,13 +824,16 @@
 									<select class="form-control" id="payType">
 										<option value="10">施总支付宝</option>		
 										<option value="11">林老师支付宝</option>	
+										<option value="12">筠姐支付宝</option>		
 										<option value="20">施总微信</option>		
 										<option value="21">林老师微信</option>
+										<option value="22">筠姐微信</option>	
 										<option value="30">pos机器</option>		
 										<option value="40">地产转账</option>	
 										<option value="41">世家公账</option>
 										<option value="42">3000账号</option>
 										<option value="50">现金</option>
+										<option value="70">银满谷银行卡</option>
 										<option value="60">其他</option>
 									</select>
 								</div>

application/index/view/global/frame_tpl.html

@@ -58,7 +58,6 @@
 	    		margin-left:30px;
 	    	}
 	    	.c-user>li>a {
-	    		/*background-color:rgba(255,255,255) !important;*/
 	    		background-color:rgba(255,255,255,1) !important;
 	    		color:#333333 !important;
 	    		opacity: 30% !important;

application/index/view/remark/remark_follow_index.html

@@ -385,6 +385,8 @@
 									<tr>
 										<td colspan="9">
 											<form id="form_search">
+												<select class="form-control btn2-city ld-Marheight user_city_choose_site_list"></select>
+												
 												<!--<select class="form-control btn2 ld-Marheight" id="user_area_choose">
                                                   <option value="" selected="selected">区域筛选</option>
                                                 </select>-->

application/model/AAgents.php

@@ -1575,4 +1575,13 @@ class AAgents extends BaseModel
         return $result;
     }
 
+    public function findByOne($field,$params) {
+        $result = $this
+            ->field($field)
+            ->where($params)
+            ->find();
+        //dump($this->getLastSql());
+        return $result;
+    }
+
 }
\ No newline at end of file

application/model/GHousesToAgents.php

@@ -573,4 +573,13 @@ class GHousesToAgents extends BaseModel
         $result = $this->where($where_)->count();
         return $result;
     }
+
+    /**
+     * @param $where
+     * @param $data
+     * @return GHousesToAgents
+     */
+    public function updateData($where, $data) {
+        return $this->where($where)->update($data);
+    }
 }

application/model/ODailyLog.php

@@ -12,13 +12,14 @@ use think\Model;
  * Time : 2:36 PM
  * Intro:
  */
-class ODailyLog extends Model
+class ODailyLog extends BaseModel
 {
     protected $table = "o_daily_log";
     private $db_;
 
-    public function __construct()
+    public function __construct($data = [])
     {
+        parent::__construct($data);
         $this->db_ = Db::name($this->table);
     }
 

application/model/UPhoneFollowUpTemporary.php

@@ -63,6 +63,9 @@ class UPhoneFollowUpTemporary extends BaseModel
         if (isset($params["user_status"])) {
             $arr["user_status"] = $params["user_status"];
         }
+        if (isset($params['create_time'])) {
+            $arr["create_time"] = $params["create_time"];
+        }
 
         if (isset($this->siteId)) {
             switch ($this->siteId) {

application/model/Users.php

@@ -1020,5 +1020,23 @@ class Users extends Model
 
         return $data;
     }
+
+    public function findByOne($field,$params) {
+        $result = $this
+            ->field($field)
+            ->where($params)
+            ->find();
+        //dump($this->getLastSql());
+        return $result;
+    }
+
+
+    public function setUserInvite($user_id,$referrer_source,$referrer_id)
+    {
+        $result = $this->where(['id'=>$user_id])->update(['referrer_source'=>$referrer_source,'referrer_id'=>$referrer_id]);
+        //dump($this->getLastSql());
+        // big_log($this->getLastSql());
+        return $result;
+    }
 }
 

application/route.php

@@ -443,6 +443,9 @@ Route::group('api', [
     'register'                  => ['api/member/register', ['method' => 'post']],  //注册|邀请注册|编辑
     'uploadHeadImg'             => ['api/member/uploadHeadImg', ['method' => 'post']],  //头像上传
 
+    'setUserInvite'             => ['api/member/setUserInvite', ['method' => 'get | post']],
+    'myInvite'             => ['api/member/myInvite', ['method' => 'get | post']],
+
     // shop
     'getShopList'               => ['api/shop/getShopList', ['method' => 'get|post']],
     'filtrateCondition'         => ['api/shop/filtrateCondition', ['method' => 'get | post']],
@@ -775,6 +778,12 @@ Route::group('broker', [
     'addUserBind'    => [ 'api_broker/User/addUserBind', [ 'method' => 'get|post' ] ],
     'removeUserBind' => [ 'api_broker/User/removeUserBind', [ 'method' => 'get|post' ] ],
 
+
+    'dailyDetail'        => ['api_broker/DailyPaper/dailyDetail', ['method' => 'get|post']],
+    'addDaily'           => ['api_broker/DailyPaper/addDaily', ['method' => 'get|post']],
+    'commitCheck'        => ['api_broker/DailyPaper/commitCheck', ['method' => 'get|post']],
+    'getPayLogImg'       => ['api_broker/DailyPaper/getPayLogImg', ['method' => 'get|post']],
+
 ]);
 
 //Route::miss('api/index/miss');//处理错误的url
\ No newline at end of file

public/app/dist/index.html

@@ -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.9c41573e45da0124ddc73474137de15d.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.200d02c9b297fd3322ec.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><link href=./static/css/app.193e9a51ba0a6c766f7289cf647aca68.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.c1544c6e64ebde97066c.js></script><script type=text/javascript src=./static/js/app.d154fd833469c71ecc7c.js></script></body></html>
\ No newline at end of file

public/app/dist/static/js/vendor.74698e64579a16bcf167.js

-webpackJsonp([0],{"+E39":function(t,e,n){t.exports=!n("S82l")(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},"+ZMJ":function(t,e,n){var r=n("lOnJ");t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}},"+tPU":function(t,e,n){n("xGkn");for(var r=n("7KvD"),o=n("hJx8"),i=n("/bQp"),u=n("dSzd")("toStringTag"),c="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),s=0;s<c.length;s++){var a=c[s],f=r[a],l=f&&f.prototype;l&&!l[u]&&o(l,u,a),i[a]=i.Array}},"//Fk":function(t,e,n){t.exports={default:n("U5ju"),__esModule:!0}},"/bQp":function(t,e){t.exports={}},"/n6Q":function(t,e,n){n("zQR9"),n("+tPU"),t.exports=n("Kh4W").f("iterator")},"06OY":function(t,e,n){var r=n("3Eo+")("meta"),o=n("EqjI"),i=n("D2L2"),u=n("evD5").f,c=0,s=Object.isExtensible||function(){return!0},a=!n("S82l")(function(){return s(Object.preventExtensions({}))}),f=function(t){u(t,r,{value:{i:"O"+ ++c,w:{}}})},l=t.exports={KEY:r,NEED:!1,fastKey:function(t,e){if(!o(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!i(t,r)){if(!s(t))return"F";if(!e)return"E";f(t)}return t[r].i},getWeak:function(t,e){if(!i(t,r)){if(!s(t))return!0;if(!e)return!1;f(t)}return t[r].w},onFreeze:function(t){return a&&l.NEED&&s(t)&&!i(t,r)&&f(t),t}}},"1kS7":function(t,e){e.f=Object.getOwnPropertySymbols},"21It":function(t,e,n){"use strict";var r=n("FtD3");t.exports=function(t,e,n){var o=n.config.validateStatus;n.status&&o&&!o(n.status)?e(r("Request failed with status code "+n.status,n.config,null,n.request,n)):t(n)}},"2KxR":function(t,e){t.exports=function(t,e,n,r){if(!(t instanceof e)||void 0!==r&&r in t)throw TypeError(n+": incorrect invocation!");return t}},"3Eo+":function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},"3fs2":function(t,e,n){var r=n("RY/4"),o=n("dSzd")("iterator"),i=n("/bQp");t.exports=n("FeBl").getIteratorMethod=function(t){if(void 0!=t)return t[o]||t["@@iterator"]||i[r(t)]}},"4mcu":function(t,e){t.exports=function(){}},"52gC":function(t,e){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on  "+t);return t}},"5QVw":function(t,e,n){t.exports={default:n("BwfY"),__esModule:!0}},"5VQ+":function(t,e,n){"use strict";var r=n("cGG2");t.exports=function(t,e){r.forEach(t,function(n,r){r!==e&&r.toUpperCase()===e.toUpperCase()&&(t[e]=n,delete t[r])})}},"5zde":function(t,e,n){n("zQR9"),n("qyJz"),t.exports=n("FeBl").Array.from},"77Pl":function(t,e,n){var r=n("EqjI");t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},"7GwW":function(t,e,n){"use strict";var r=n("cGG2"),o=n("21It"),i=n("DQCr"),u=n("oJlt"),c=n("GHBc"),s=n("FtD3"),a="undefined"!=typeof window&&window.btoa&&window.btoa.bind(window)||n("thJu");t.exports=function(t){return new Promise(function(e,f){var l=t.data,p=t.headers;r.isFormData(l)&&delete p["Content-Type"];var d=new XMLHttpRequest,h="onreadystatechange",v=!1;if("undefined"==typeof window||!window.XDomainRequest||"withCredentials"in d||c(t.url)||(d=new window.XDomainRequest,h="onload",v=!0,d.onprogress=function(){},d.ontimeout=function(){}),t.auth){var y=t.auth.username||"",m=t.auth.password||"";p.Authorization="Basic "+a(y+":"+m)}if(d.open(t.method.toUpperCase(),i(t.url,t.params,t.paramsSerializer),!0),d.timeout=t.timeout,d[h]=function(){if(d&&(4===d.readyState||v)&&(0!==d.status||d.responseURL&&0===d.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in d?u(d.getAllResponseHeaders()):null,r={data:t.responseType&&"text"!==t.responseType?d.response:d.responseText,status:1223===d.status?204:d.status,statusText:1223===d.status?"No Content":d.statusText,headers:n,config:t,request:d};o(e,f,r),d=null}},d.onerror=function(){f(s("Network Error",t,null,d)),d=null},d.ontimeout=function(){f(s("timeout of "+t.timeout+"ms exceeded",t,"ECONNABORTED",d)),d=null},r.isStandardBrowserEnv()){var g=n("p1b6"),b=(t.withCredentials||c(t.url))&&t.xsrfCookieName?g.read(t.xsrfCookieName):void 0;b&&(p[t.xsrfHeaderName]=b)}if("setRequestHeader"in d&&r.forEach(p,function(t,e){void 0===l&&"content-type"===e.toLowerCase()?delete p[e]:d.setRequestHeader(e,t)}),t.withCredentials&&(d.withCredentials=!0),t.responseType)try{d.responseType=t.responseType}catch(e){if("json"!==t.responseType)throw e}"function"==typeof t.onDownloadProgress&&d.addEventListener("progress",t.onDownloadProgress),"function"==typeof t.onUploadProgress&&d.upload&&d.upload.addEventListener("progress",t.onUploadProgress),t.cancelToken&&t.cancelToken.promise.then(function(t){d&&(d.abort(),f(t),d=null)}),void 0===l&&(l=null),d.send(l)})}},"7KvD":function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},"7UMu":function(t,e,n){var r=n("R9M2");t.exports=Array.isArray||function(t){return"Array"==r(t)}},"82Mu":function(t,e,n){var r=n("7KvD"),o=n("L42u").set,i=r.MutationObserver||r.WebKitMutationObserver,u=r.process,c=r.Promise,s="process"==n("R9M2")(u);t.exports=function(){var t,e,n,a=function(){var r,o;for(s&&(r=u.domain)&&r.exit();t;){o=t.fn,t=t.next;try{o()}catch(r){throw t?n():e=void 0,r}}e=void 0,r&&r.enter()};if(s)n=function(){u.nextTick(a)};else if(!i||r.navigator&&r.navigator.standalone)if(c&&c.resolve){var f=c.resolve();n=function(){f.then(a)}}else n=function(){o.call(r,a)};else{var l=!0,p=document.createTextNode("");new i(a).observe(p,{characterData:!0}),n=function(){p.data=l=!l}}return function(r){var o={fn:r,next:void 0};e&&(e.next=o),t||(t=o,n()),e=o}}},"880/":function(t,e,n){t.exports=n("hJx8")},"94VQ":function(t,e,n){"use strict";var r=n("Yobk"),o=n("X8DO"),i=n("e6n0"),u={};n("hJx8")(u,n("dSzd")("iterator"),function(){return this}),t.exports=function(t,e,n){t.prototype=r(u,{next:o(1,n)}),i(t,e+" Iterator")}},"9bBU":function(t,e,n){n("mClu");var r=n("FeBl").Object;t.exports=function(t,e,n){return r.defineProperty(t,e,n)}},BwfY:function(t,e,n){n("fWfb"),n("M6a0"),n("OYls"),n("QWe/"),t.exports=n("FeBl").Symbol},C4MV:function(t,e,n){t.exports={default:n("9bBU"),__esModule:!0}},CXw9:function(t,e,n){"use strict";var r,o,i,u,c=n("O4g8"),s=n("7KvD"),a=n("+ZMJ"),f=n("RY/4"),l=n("kM2E"),p=n("EqjI"),d=n("lOnJ"),h=n("2KxR"),v=n("NWt+"),y=n("t8x9"),m=n("L42u").set,g=n("82Mu")(),b=n("qARP"),x=n("dNDb"),w=n("fJUb"),O=s.TypeError,S=s.process,j=s.Promise,_="process"==f(S),E=function(){},P=o=b.f,R=!!function(){try{var t=j.resolve(1),e=(t.constructor={})[n("dSzd")("species")]=function(t){t(E,E)};return(_||"function"==typeof PromiseRejectionEvent)&&t.then(E)instanceof e}catch(t){}}(),T=function(t){var e;return!(!p(t)||"function"!=typeof(e=t.then))&&e},C=function(t,e){if(!t._n){t._n=!0;var n=t._c;g(function(){for(var r=t._v,o=1==t._s,i=0,u=function(e){var n,i,u,c=o?e.ok:e.fail,s=e.resolve,a=e.reject,f=e.domain;try{c?(o||(2==t._h&&L(t),t._h=1),!0===c?n=r:(f&&f.enter(),n=c(r),f&&(f.exit(),u=!0)),n===e.promise?a(O("Promise-chain cycle")):(i=T(n))?i.call(n,s,a):s(n)):a(r)}catch(t){f&&!u&&f.exit(),a(t)}};n.length>i;)u(n[i++]);t._c=[],t._n=!1,e&&!t._h&&A(t)})}},A=function(t){m.call(s,function(){var e,n,r,o=t._v,i=D(t);if(i&&(e=x(function(){_?S.emit("unhandledRejection",o,t):(n=s.onunhandledrejection)?n({promise:t,reason:o}):(r=s.console)&&r.error&&r.error("Unhandled promise rejection",o)}),t._h=_||D(t)?2:1),t._a=void 0,i&&e.e)throw e.v})},D=function(t){return 1!==t._h&&0===(t._a||t._c).length},L=function(t){m.call(s,function(){var e;_?S.emit("rejectionHandled",t):(e=s.onrejectionhandled)&&e({promise:t,reason:t._v})})},M=function(t){var e=this;e._d||(e._d=!0,(e=e._w||e)._v=t,e._s=2,e._a||(e._a=e._c.slice()),C(e,!0))},k=function(t){var e,n=this;if(!n._d){n._d=!0,n=n._w||n;try{if(n===t)throw O("Promise can't be resolved itself");(e=T(t))?g(function(){var r={_w:n,_d:!1};try{e.call(t,a(k,r,1),a(M,r,1))}catch(t){M.call(r,t)}}):(n._v=t,n._s=1,C(n,!1))}catch(t){M.call({_w:n,_d:!1},t)}}};R||(j=function(t){h(this,j,"Promise","_h"),d(t),r.call(this);try{t(a(k,this,1),a(M,this,1))}catch(t){M.call(this,t)}},(r=function(t){this._c=[],this._a=void 0,this._s=0,this._d=!1,this._v=void 0,this._h=0,this._n=!1}).prototype=n("xH/j")(j.prototype,{then:function(t,e){var n=P(y(this,j));return n.ok="function"!=typeof t||t,n.fail="function"==typeof e&&e,n.domain=_?S.domain:void 0,this._c.push(n),this._a&&this._a.push(n),this._s&&C(this,!1),n.promise},catch:function(t){return this.then(void 0,t)}}),i=function(){var t=new r;this.promise=t,this.resolve=a(k,t,1),this.reject=a(M,t,1)},b.f=P=function(t){return t===j||t===u?new i(t):o(t)}),l(l.G+l.W+l.F*!R,{Promise:j}),n("e6n0")(j,"Promise"),n("bRrM")("Promise"),u=n("FeBl").Promise,l(l.S+l.F*!R,"Promise",{reject:function(t){var e=P(this);return(0,e.reject)(t),e.promise}}),l(l.S+l.F*(c||!R),"Promise",{resolve:function(t){return w(c&&this===u?j:this,t)}}),l(l.S+l.F*!(R&&n("dY0y")(function(t){j.all(t).catch(E)})),"Promise",{all:function(t){var e=this,n=P(e),r=n.resolve,o=n.reject,i=x(function(){var n=[],i=0,u=1;v(t,!1,function(t){var c=i++,s=!1;n.push(void 0),u++,e.resolve(t).then(function(t){s||(s=!0,n[c]=t,--u||r(n))},o)}),--u||r(n)});return i.e&&o(i.v),n.promise},race:function(t){var e=this,n=P(e),r=n.reject,o=x(function(){v(t,!1,function(t){e.resolve(t).then(n.resolve,r)})});return o.e&&r(o.v),n.promise}})},CwSZ:function(t,e,n){"use strict";var r=n("p8xL"),o=n("XgCd"),i={brackets:function(t){return t+"[]"},indices:function(t,e){return t+"["+e+"]"},repeat:function(t){return t}},u=Date.prototype.toISOString,c={delimiter:"&",encode:!0,encoder:r.encode,encodeValuesOnly:!1,serializeDate:function(t){return u.call(t)},skipNulls:!1,strictNullHandling:!1},s=function t(e,n,o,i,u,s,a,f,l,p,d,h){var v=e;if("function"==typeof a)v=a(n,v);else if(v instanceof Date)v=p(v);else if(null===v){if(i)return s&&!h?s(n,c.encoder):n;v=""}if("string"==typeof v||"number"==typeof v||"boolean"==typeof v||r.isBuffer(v))return s?[d(h?n:s(n,c.encoder))+"="+d(s(v,c.encoder))]:[d(n)+"="+d(String(v))];var y,m=[];if(void 0===v)return m;if(Array.isArray(a))y=a;else{var g=Object.keys(v);y=f?g.sort(f):g}for(var b=0;b<y.length;++b){var x=y[b];u&&null===v[x]||(m=Array.isArray(v)?m.concat(t(v[x],o(n,x),o,i,u,s,a,f,l,p,d,h)):m.concat(t(v[x],n+(l?"."+x:"["+x+"]"),o,i,u,s,a,f,l,p,d,h)))}return m};t.exports=function(t,e){var n=t,u=e?r.assign({},e):{};if(null!==u.encoder&&void 0!==u.encoder&&"function"!=typeof u.encoder)throw new TypeError("Encoder has to be a function.");var a=void 0===u.delimiter?c.delimiter:u.delimiter,f="boolean"==typeof u.strictNullHandling?u.strictNullHandling:c.strictNullHandling,l="boolean"==typeof u.skipNulls?u.skipNulls:c.skipNulls,p="boolean"==typeof u.encode?u.encode:c.encode,d="function"==typeof u.encoder?u.encoder:c.encoder,h="function"==typeof u.sort?u.sort:null,v=void 0!==u.allowDots&&u.allowDots,y="function"==typeof u.serializeDate?u.serializeDate:c.serializeDate,m="boolean"==typeof u.encodeValuesOnly?u.encodeValuesOnly:c.encodeValuesOnly;if(void 0===u.format)u.format=o.default;else if(!Object.prototype.hasOwnProperty.call(o.formatters,u.format))throw new TypeError("Unknown format option provided.");var g,b,x=o.formatters[u.format];"function"==typeof u.filter?n=(b=u.filter)("",n):Array.isArray(u.filter)&&(g=b=u.filter);var w,O=[];if("object"!=typeof n||null===n)return"";w=u.arrayFormat in i?u.arrayFormat:"indices"in u?u.indices?"indices":"repeat":"indices";var S=i[w];g||(g=Object.keys(n)),h&&g.sort(h);for(var j=0;j<g.length;++j){var _=g[j];l&&null===n[_]||(O=O.concat(s(n[_],_,S,f,l,p?d:null,b,h,v,y,x,m)))}var E=O.join(a),P=!0===u.addQueryPrefix?"?":"";return E.length>0?P+E:""}},D2L2:function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},DDCP:function(t,e,n){"use strict";var r=n("p8xL"),o=Object.prototype.hasOwnProperty,i={allowDots:!1,allowPrototypes:!1,arrayLimit:20,decoder:r.decode,delimiter:"&",depth:5,parameterLimit:1e3,plainObjects:!1,strictNullHandling:!1},u=function(t,e,n){if(t){var r=n.allowDots?t.replace(/\.([^.[]+)/g,"[$1]"):t,i=/(\[[^[\]]*])/g,u=/(\[[^[\]]*])/.exec(r),c=u?r.slice(0,u.index):r,s=[];if(c){if(!n.plainObjects&&o.call(Object.prototype,c)&&!n.allowPrototypes)return;s.push(c)}for(var a=0;null!==(u=i.exec(r))&&a<n.depth;){if(a+=1,!n.plainObjects&&o.call(Object.prototype,u[1].slice(1,-1))&&!n.allowPrototypes)return;s.push(u[1])}return u&&s.push("["+r.slice(u.index)+"]"),function(t,e,n){for(var r=e,o=t.length-1;o>=0;--o){var i,u=t[o];if("[]"===u)i=(i=[]).concat(r);else{i=n.plainObjects?Object.create(null):{};var c="["===u.charAt(0)&&"]"===u.charAt(u.length-1)?u.slice(1,-1):u,s=parseInt(c,10);!isNaN(s)&&u!==c&&String(s)===c&&s>=0&&n.parseArrays&&s<=n.arrayLimit?(i=[])[s]=r:i[c]=r}r=i}return r}(s,e,n)}};t.exports=function(t,e){var n=e?r.assign({},e):{};if(null!==n.decoder&&void 0!==n.decoder&&"function"!=typeof n.decoder)throw new TypeError("Decoder has to be a function.");if(n.ignoreQueryPrefix=!0===n.ignoreQueryPrefix,n.delimiter="string"==typeof n.delimiter||r.isRegExp(n.delimiter)?n.delimiter:i.delimiter,n.depth="number"==typeof n.depth?n.depth:i.depth,n.arrayLimit="number"==typeof n.arrayLimit?n.arrayLimit:i.arrayLimit,n.parseArrays=!1!==n.parseArrays,n.decoder="function"==typeof n.decoder?n.decoder:i.decoder,n.allowDots="boolean"==typeof n.allowDots?n.allowDots:i.allowDots,n.plainObjects="boolean"==typeof n.plainObjects?n.plainObjects:i.plainObjects,n.allowPrototypes="boolean"==typeof n.allowPrototypes?n.allowPrototypes:i.allowPrototypes,n.parameterLimit="number"==typeof n.parameterLimit?n.parameterLimit:i.parameterLimit,n.strictNullHandling="boolean"==typeof n.strictNullHandling?n.strictNullHandling:i.strictNullHandling,""===t||null===t||void 0===t)return n.plainObjects?Object.create(null):{};for(var c="string"==typeof t?function(t,e){for(var n={},r=e.ignoreQueryPrefix?t.replace(/^\?/,""):t,u=e.parameterLimit===1/0?void 0:e.parameterLimit,c=r.split(e.delimiter,u),s=0;s<c.length;++s){var a,f,l=c[s],p=l.indexOf("]="),d=-1===p?l.indexOf("="):p+1;-1===d?(a=e.decoder(l,i.decoder),f=e.strictNullHandling?null:""):(a=e.decoder(l.slice(0,d),i.decoder),f=e.decoder(l.slice(d+1),i.decoder)),o.call(n,a)?n[a]=[].concat(n[a]).concat(f):n[a]=f}return n}(t,n):t,s=n.plainObjects?Object.create(null):{},a=Object.keys(c),f=0;f<a.length;++f){var l=a[f],p=u(l,c[l],n);s=r.merge(s,p,n)}return r.compact(s)}},DQCr:function(t,e,n){"use strict";var r=n("cGG2");function o(t){return encodeURIComponent(t).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}t.exports=function(t,e,n){if(!e)return t;var i;if(n)i=n(e);else if(r.isURLSearchParams(e))i=e.toString();else{var u=[];r.forEach(e,function(t,e){null!==t&&void 0!==t&&(r.isArray(t)?e+="[]":t=[t],r.forEach(t,function(t){r.isDate(t)?t=t.toISOString():r.isObject(t)&&(t=JSON.stringify(t)),u.push(o(e)+"="+o(t))}))}),i=u.join("&")}return i&&(t+=(-1===t.indexOf("?")?"?":"&")+i),t}},DuR2:function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n},EGZi:function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},EqBC:function(t,e,n){"use strict";var r=n("kM2E"),o=n("FeBl"),i=n("7KvD"),u=n("t8x9"),c=n("fJUb");r(r.P+r.R,"Promise",{finally:function(t){var e=u(this,o.Promise||i.Promise),n="function"==typeof t;return this.then(n?function(n){return c(e,t()).then(function(){return n})}:t,n?function(n){return c(e,t()).then(function(){throw n})}:t)}})},EqjI:function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},FeBl:function(t,e){var n=t.exports={version:"2.5.5"};"number"==typeof __e&&(__e=n)},FtD3:function(t,e,n){"use strict";var r=n("t8qj");t.exports=function(t,e,n,o,i){var u=new Error(t);return r(u,e,n,o,i)}},GHBc:function(t,e,n){"use strict";var r=n("cGG2");t.exports=r.isStandardBrowserEnv()?function(){var t,e=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function o(t){var r=t;return e&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return t=o(window.location.href),function(e){var n=r.isString(e)?o(e):e;return n.protocol===t.protocol&&n.host===t.host}}():function(){return!0}},Gu7T:function(t,e,n){"use strict";e.__esModule=!0;var r,o=n("c/Tr"),i=(r=o)&&r.__esModule?r:{default:r};e.default=function(t){if(Array.isArray(t)){for(var e=0,n=Array(t.length);e<t.length;e++)n[e]=t[e];return n}return(0,i.default)(t)}},Ibhu:function(t,e,n){var r=n("D2L2"),o=n("TcQ7"),i=n("vFc/")(!1),u=n("ax3d")("IE_PROTO");t.exports=function(t,e){var n,c=o(t),s=0,a=[];for(n in c)n!=u&&r(c,n)&&a.push(n);for(;e.length>s;)r(c,n=e[s++])&&(~i(a,n)||a.push(n));return a}},"JP+z":function(t,e,n){"use strict";t.exports=function(t,e){return function(){for(var n=new Array(arguments.length),r=0;r<n.length;r++)n[r]=arguments[r];return t.apply(e,n)}}},KCLY:function(t,e,n){"use strict";(function(e){var r=n("cGG2"),o=n("5VQ+"),i={"Content-Type":"application/x-www-form-urlencoded"};function u(t,e){!r.isUndefined(t)&&r.isUndefined(t["Content-Type"])&&(t["Content-Type"]=e)}var c,s={adapter:("undefined"!=typeof XMLHttpRequest?c=n("7GwW"):void 0!==e&&(c=n("7GwW")),c),transformRequest:[function(t,e){return o(e,"Content-Type"),r.isFormData(t)||r.isArrayBuffer(t)||r.isBuffer(t)||r.isStream(t)||r.isFile(t)||r.isBlob(t)?t:r.isArrayBufferView(t)?t.buffer:r.isURLSearchParams(t)?(u(e,"application/x-www-form-urlencoded;charset=utf-8"),t.toString()):r.isObject(t)?(u(e,"application/json;charset=utf-8"),JSON.stringify(t)):t}],transformResponse:[function(t){if("string"==typeof t)try{t=JSON.parse(t)}catch(t){}return t}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(t){return t>=200&&t<300}};s.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],function(t){s.headers[t]={}}),r.forEach(["post","put","patch"],function(t){s.headers[t]=r.merge(i)}),t.exports=s}).call(e,n("W2nU"))},Kh4W:function(t,e,n){e.f=n("dSzd")},L42u:function(t,e,n){var r,o,i,u=n("+ZMJ"),c=n("knuC"),s=n("RPLV"),a=n("ON07"),f=n("7KvD"),l=f.process,p=f.setImmediate,d=f.clearImmediate,h=f.MessageChannel,v=f.Dispatch,y=0,m={},g=function(){var t=+this;if(m.hasOwnProperty(t)){var e=m[t];delete m[t],e()}},b=function(t){g.call(t.data)};p&&d||(p=function(t){for(var e=[],n=1;arguments.length>n;)e.push(arguments[n++]);return m[++y]=function(){c("function"==typeof t?t:Function(t),e)},r(y),y},d=function(t){delete m[t]},"process"==n("R9M2")(l)?r=function(t){l.nextTick(u(g,t,1))}:v&&v.now?r=function(t){v.now(u(g,t,1))}:h?(i=(o=new h).port2,o.port1.onmessage=b,r=u(i.postMessage,i,1)):f.addEventListener&&"function"==typeof postMessage&&!f.importScripts?(r=function(t){f.postMessage(t+"","*")},f.addEventListener("message",b,!1)):r="onreadystatechange"in a("script")?function(t){s.appendChild(a("script")).onreadystatechange=function(){s.removeChild(this),g.call(t)}}:function(t){setTimeout(u(g,t,1),0)}),t.exports={set:p,clear:d}},LKZe:function(t,e,n){var r=n("NpIQ"),o=n("X8DO"),i=n("TcQ7"),u=n("MmMw"),c=n("D2L2"),s=n("SfB7"),a=Object.getOwnPropertyDescriptor;e.f=n("+E39")?a:function(t,e){if(t=i(t),e=u(e,!0),s)try{return a(t,e)}catch(t){}if(c(t,e))return o(!r.f.call(t,e),t[e])}},M6a0:function(t,e){},MU5D:function(t,e,n){var r=n("R9M2");t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},Mhyx:function(t,e,n){var r=n("/bQp"),o=n("dSzd")("iterator"),i=Array.prototype;t.exports=function(t){return void 0!==t&&(r.Array===t||i[o]===t)}},MmMw:function(t,e,n){var r=n("EqjI");t.exports=function(t,e){if(!r(t))return t;var n,o;if(e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;if("function"==typeof(n=t.valueOf)&&!r(o=n.call(t)))return o;if(!e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;throw TypeError("Can't convert object to primitive value")}},"NWt+":function(t,e,n){var r=n("+ZMJ"),o=n("msXi"),i=n("Mhyx"),u=n("77Pl"),c=n("QRG4"),s=n("3fs2"),a={},f={};(e=t.exports=function(t,e,n,l,p){var d,h,v,y,m=p?function(){return t}:s(t),g=r(n,l,e?2:1),b=0;if("function"!=typeof m)throw TypeError(t+" is not iterable!");if(i(m)){for(d=c(t.length);d>b;b++)if((y=e?g(u(h=t[b])[0],h[1]):g(t[b]))===a||y===f)return y}else for(v=m.call(t);!(h=v.next()).done;)if((y=o(v,g,h.value,e))===a||y===f)return y}).BREAK=a,e.RETURN=f},NpIQ:function(t,e){e.f={}.propertyIsEnumerable},O4g8:function(t,e){t.exports=!0},ON07:function(t,e,n){var r=n("EqjI"),o=n("7KvD").document,i=r(o)&&r(o.createElement);t.exports=function(t){return i?o.createElement(t):{}}},OYls:function(t,e,n){n("crlp")("asyncIterator")},PzxK:function(t,e,n){var r=n("D2L2"),o=n("sB3e"),i=n("ax3d")("IE_PROTO"),u=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=o(t),r(t,i)?t[i]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?u:null}},QRG4:function(t,e,n){var r=n("UuGF"),o=Math.min;t.exports=function(t){return t>0?o(r(t),9007199254740991):0}},"QWe/":function(t,e,n){n("crlp")("observable")},R9M2:function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},RPLV:function(t,e,n){var r=n("7KvD").document;t.exports=r&&r.documentElement},"RY/4":function(t,e,n){var r=n("R9M2"),o=n("dSzd")("toStringTag"),i="Arguments"==r(function(){return arguments}());t.exports=function(t){var e,n,u;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),o))?n:i?r(e):"Object"==(u=r(e))&&"function"==typeof e.callee?"Arguments":u}},Re3r:function(t,e){function n(t){return!!t.constructor&&"function"==typeof t.constructor.isBuffer&&t.constructor.isBuffer(t)}
-/*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-t.exports=function(t){return null!=t&&(n(t)||function(t){return"function"==typeof t.readFloatLE&&"function"==typeof t.slice&&n(t.slice(0,0))}(t)||!!t._isBuffer)}},Rf8U:function(t,e,n){"use strict";var r,o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t};!function(){function n(t,e){if(!n.installed){if(n.installed=!0,!e)return void console.error("You have to install axios");t.axios=e,Object.defineProperties(t.prototype,{axios:{get:function(){return e}},$http:{get:function(){return e}}})}}"object"==o(e)?t.exports=n:void 0===(r=function(){return n}.apply(e,[]))||(t.exports=r)}()},Rrel:function(t,e,n){var r=n("TcQ7"),o=n("n0T6").f,i={}.toString,u="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return u&&"[object Window]"==i.call(t)?function(t){try{return o(t)}catch(t){return u.slice()}}(t):o(r(t))}},S82l:function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},SfB7:function(t,e,n){t.exports=!n("+E39")&&!n("S82l")(function(){return 7!=Object.defineProperty(n("ON07")("div"),"a",{get:function(){return 7}}).a})},TNV1:function(t,e,n){"use strict";var r=n("cGG2");t.exports=function(t,e,n){return r.forEach(n,function(n){t=n(t,e)}),t}},TcQ7:function(t,e,n){var r=n("MU5D"),o=n("52gC");t.exports=function(t){return r(o(t))}},U5ju:function(t,e,n){n("M6a0"),n("zQR9"),n("+tPU"),n("CXw9"),n("EqBC"),n("jKW+"),t.exports=n("FeBl").Promise},UuGF:function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},"VU/8":function(t,e){t.exports=function(t,e,n,r,o,i){var u,c=t=t||{},s=typeof t.default;"object"!==s&&"function"!==s||(u=t,c=t.default);var a,f="function"==typeof c?c.options:c;if(e&&(f.render=e.render,f.staticRenderFns=e.staticRenderFns,f._compiled=!0),n&&(f.functional=!0),o&&(f._scopeId=o),i?(a=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),r&&r.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(i)},f._ssrRegister=a):r&&(a=r),a){var l=f.functional,p=l?f.render:f.beforeCreate;l?(f._injectStyles=a,f.render=function(t,e){return a.call(e),p(t,e)}):f.beforeCreate=p?[].concat(p,a):[a]}return{esModule:u,exports:c,options:f}}},W2nU:function(t,e){var n,r,o=t.exports={};function i(){throw new Error("setTimeout has not been defined")}function u(){throw new Error("clearTimeout has not been defined")}function c(t){if(n===setTimeout)return setTimeout(t,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(t,0);try{return n(t,0)}catch(e){try{return n.call(null,t,0)}catch(e){return n.call(this,t,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(t){n=i}try{r="function"==typeof clearTimeout?clearTimeout:u}catch(t){r=u}}();var s,a=[],f=!1,l=-1;function p(){f&&s&&(f=!1,s.length?a=s.concat(a):l=-1,a.length&&d())}function d(){if(!f){var t=c(p);f=!0;for(var e=a.length;e;){for(s=a,a=[];++l<e;)s&&s[l].run();l=-1,e=a.length}s=null,f=!1,function(t){if(r===clearTimeout)return clearTimeout(t);if((r===u||!r)&&clearTimeout)return r=clearTimeout,clearTimeout(t);try{r(t)}catch(e){try{return r.call(null,t)}catch(e){return r.call(this,t)}}}(t)}}function h(t,e){this.fun=t,this.array=e}function v(){}o.nextTick=function(t){var e=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)e[n-1]=arguments[n];a.push(new h(t,e)),1!==a.length||f||c(d)},h.prototype.run=function(){this.fun.apply(null,this.array)},o.title="browser",o.browser=!0,o.env={},o.argv=[],o.version="",o.versions={},o.on=v,o.addListener=v,o.once=v,o.off=v,o.removeListener=v,o.removeAllListeners=v,o.emit=v,o.prependListener=v,o.prependOnceListener=v,o.listeners=function(t){return[]},o.binding=function(t){throw new Error("process.binding is not supported")},o.cwd=function(){return"/"},o.chdir=function(t){throw new Error("process.chdir is not supported")},o.umask=function(){return 0}},X8DO:function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},Xc4G:function(t,e,n){var r=n("lktj"),o=n("1kS7"),i=n("NpIQ");t.exports=function(t){var e=r(t),n=o.f;if(n)for(var u,c=n(t),s=i.f,a=0;c.length>a;)s.call(t,u=c[a++])&&e.push(u);return e}},XgCd:function(t,e,n){"use strict";var r=String.prototype.replace,o=/%20/g;t.exports={default:"RFC3986",formatters:{RFC1738:function(t){return r.call(t,o,"+")},RFC3986:function(t){return t}},RFC1738:"RFC1738",RFC3986:"RFC3986"}},XmWM:function(t,e,n){"use strict";var r=n("KCLY"),o=n("cGG2"),i=n("fuGk"),u=n("xLtR");function c(t){this.defaults=t,this.interceptors={request:new i,response:new i}}c.prototype.request=function(t){"string"==typeof t&&(t=o.merge({url:arguments[0]},arguments[1])),(t=o.merge(r,{method:"get"},this.defaults,t)).method=t.method.toLowerCase();var e=[u,void 0],n=Promise.resolve(t);for(this.interceptors.request.forEach(function(t){e.unshift(t.fulfilled,t.rejected)}),this.interceptors.response.forEach(function(t){e.push(t.fulfilled,t.rejected)});e.length;)n=n.then(e.shift(),e.shift());return n},o.forEach(["delete","get","head","options"],function(t){c.prototype[t]=function(e,n){return this.request(o.merge(n||{},{method:t,url:e}))}}),o.forEach(["post","put","patch"],function(t){c.prototype[t]=function(e,n,r){return this.request(o.merge(r||{},{method:t,url:e,data:n}))}}),t.exports=c},Yobk:function(t,e,n){var r=n("77Pl"),o=n("qio6"),i=n("xnc9"),u=n("ax3d")("IE_PROTO"),c=function(){},s=function(){var t,e=n("ON07")("iframe"),r=i.length;for(e.style.display="none",n("RPLV").appendChild(e),e.src="javascript:",(t=e.contentWindow.document).open(),t.write("<script>document.F=Object<\/script>"),t.close(),s=t.F;r--;)delete s.prototype[i[r]];return s()};t.exports=Object.create||function(t,e){var n;return null!==t?(c.prototype=r(t),n=new c,c.prototype=null,n[u]=t):n=s(),void 0===e?n:o(n,e)}},Zzip:function(t,e,n){t.exports={default:n("/n6Q"),__esModule:!0}},ax3d:function(t,e,n){var r=n("e8AB")("keys"),o=n("3Eo+");t.exports=function(t){return r[t]||(r[t]=o(t))}},bOdI:function(t,e,n){"use strict";e.__esModule=!0;var r,o=n("C4MV"),i=(r=o)&&r.__esModule?r:{default:r};e.default=function(t,e,n){return e in t?(0,i.default)(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},bRrM:function(t,e,n){"use strict";var r=n("7KvD"),o=n("FeBl"),i=n("evD5"),u=n("+E39"),c=n("dSzd")("species");t.exports=function(t){var e="function"==typeof o[t]?o[t]:r[t];u&&e&&!e[c]&&i.f(e,c,{configurable:!0,get:function(){return this}})}},"c/Tr":function(t,e,n){t.exports={default:n("5zde"),__esModule:!0}},cGG2:function(t,e,n){"use strict";var r=n("JP+z"),o=n("Re3r"),i=Object.prototype.toString;function u(t){return"[object Array]"===i.call(t)}function c(t){return null!==t&&"object"==typeof t}function s(t){return"[object Function]"===i.call(t)}function a(t,e){if(null!==t&&void 0!==t)if("object"!=typeof t&&(t=[t]),u(t))for(var n=0,r=t.length;n<r;n++)e.call(null,t[n],n,t);else for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(null,t[o],o,t)}t.exports={isArray:u,isArrayBuffer:function(t){return"[object ArrayBuffer]"===i.call(t)},isBuffer:o,isFormData:function(t){return"undefined"!=typeof FormData&&t instanceof FormData},isArrayBufferView:function(t){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(t):t&&t.buffer&&t.buffer instanceof ArrayBuffer},isString:function(t){return"string"==typeof t},isNumber:function(t){return"number"==typeof t},isObject:c,isUndefined:function(t){return void 0===t},isDate:function(t){return"[object Date]"===i.call(t)},isFile:function(t){return"[object File]"===i.call(t)},isBlob:function(t){return"[object Blob]"===i.call(t)},isFunction:s,isStream:function(t){return c(t)&&s(t.pipe)},isURLSearchParams:function(t){return"undefined"!=typeof URLSearchParams&&t instanceof URLSearchParams},isStandardBrowserEnv:function(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product)&&"undefined"!=typeof window&&"undefined"!=typeof document},forEach:a,merge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]=n}for(var r=0,o=arguments.length;r<o;r++)a(arguments[r],n);return e},extend:function(t,e,n){return a(e,function(e,o){t[o]=n&&"function"==typeof e?r(e,n):e}),t},trim:function(t){return t.replace(/^\s*/,"").replace(/\s*$/,"")}}},cWxy:function(t,e,n){"use strict";var r=n("dVOP");function o(t){if("function"!=typeof t)throw new TypeError("executor must be a function.");var e;this.promise=new Promise(function(t){e=t});var n=this;t(function(t){n.reason||(n.reason=new r(t),e(n.reason))})}o.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},o.source=function(){var t;return{token:new o(function(e){t=e}),cancel:t}},t.exports=o},crlp:function(t,e,n){var r=n("7KvD"),o=n("FeBl"),i=n("O4g8"),u=n("Kh4W"),c=n("evD5").f;t.exports=function(t){var e=o.Symbol||(o.Symbol=i?{}:r.Symbol||{});"_"==t.charAt(0)||t in e||c(e,t,{value:u.f(t)})}},dIwP:function(t,e,n){"use strict";t.exports=function(t){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(t)}},dNDb:function(t,e){t.exports=function(t){try{return{e:!1,v:t()}}catch(t){return{e:!0,v:t}}}},dSzd:function(t,e,n){var r=n("e8AB")("wks"),o=n("3Eo+"),i=n("7KvD").Symbol,u="function"==typeof i;(t.exports=function(t){return r[t]||(r[t]=u&&i[t]||(u?i:o)("Symbol."+t))}).store=r},dVOP:function(t,e,n){"use strict";function r(t){this.message=t}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,t.exports=r},dY0y:function(t,e,n){var r=n("dSzd")("iterator"),o=!1;try{var i=[7][r]();i.return=function(){o=!0},Array.from(i,function(){throw 2})}catch(t){}t.exports=function(t,e){if(!e&&!o)return!1;var n=!1;try{var i=[7],u=i[r]();u.next=function(){return{done:n=!0}},i[r]=function(){return u},t(i)}catch(t){}return n}},e6n0:function(t,e,n){var r=n("evD5").f,o=n("D2L2"),i=n("dSzd")("toStringTag");t.exports=function(t,e,n){t&&!o(t=n?t:t.prototype,i)&&r(t,i,{configurable:!0,value:e})}},e8AB:function(t,e,n){var r=n("7KvD"),o=r["__core-js_shared__"]||(r["__core-js_shared__"]={});t.exports=function(t){return o[t]||(o[t]={})}},evD5:function(t,e,n){var r=n("77Pl"),o=n("SfB7"),i=n("MmMw"),u=Object.defineProperty;e.f=n("+E39")?Object.defineProperty:function(t,e,n){if(r(t),e=i(e,!0),r(n),o)try{return u(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},fBQ2:function(t,e,n){"use strict";var r=n("evD5"),o=n("X8DO");t.exports=function(t,e,n){e in t?r.f(t,e,o(0,n)):t[e]=n}},fJUb:function(t,e,n){var r=n("77Pl"),o=n("EqjI"),i=n("qARP");t.exports=function(t,e){if(r(t),o(e)&&e.constructor===t)return e;var n=i.f(t);return(0,n.resolve)(e),n.promise}},fWfb:function(t,e,n){"use strict";var r=n("7KvD"),o=n("D2L2"),i=n("+E39"),u=n("kM2E"),c=n("880/"),s=n("06OY").KEY,a=n("S82l"),f=n("e8AB"),l=n("e6n0"),p=n("3Eo+"),d=n("dSzd"),h=n("Kh4W"),v=n("crlp"),y=n("Xc4G"),m=n("7UMu"),g=n("77Pl"),b=n("EqjI"),x=n("TcQ7"),w=n("MmMw"),O=n("X8DO"),S=n("Yobk"),j=n("Rrel"),_=n("LKZe"),E=n("evD5"),P=n("lktj"),R=_.f,T=E.f,C=j.f,A=r.Symbol,D=r.JSON,L=D&&D.stringify,M=d("_hidden"),k=d("toPrimitive"),N={}.propertyIsEnumerable,B=f("symbol-registry"),F=f("symbols"),G=f("op-symbols"),I=Object.prototype,U="function"==typeof A,q=r.QObject,Q=!q||!q.prototype||!q.prototype.findChild,J=i&&a(function(){return 7!=S(T({},"a",{get:function(){return T(this,"a",{value:7}).a}})).a})?function(t,e,n){var r=R(I,e);r&&delete I[e],T(t,e,n),r&&t!==I&&T(I,e,r)}:T,z=function(t){var e=F[t]=S(A.prototype);return e._k=t,e},K=U&&"symbol"==typeof A.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof A},V=function(t,e,n){return t===I&&V(G,e,n),g(t),e=w(e,!0),g(n),o(F,e)?(n.enumerable?(o(t,M)&&t[M][e]&&(t[M][e]=!1),n=S(n,{enumerable:O(0,!1)})):(o(t,M)||T(t,M,O(1,{})),t[M][e]=!0),J(t,e,n)):T(t,e,n)},W=function(t,e){g(t);for(var n,r=y(e=x(e)),o=0,i=r.length;i>o;)V(t,n=r[o++],e[n]);return t},H=function(t){var e=N.call(this,t=w(t,!0));return!(this===I&&o(F,t)&&!o(G,t))&&(!(e||!o(this,t)||!o(F,t)||o(this,M)&&this[M][t])||e)},X=function(t,e){if(t=x(t),e=w(e,!0),t!==I||!o(F,e)||o(G,e)){var n=R(t,e);return!n||!o(F,e)||o(t,M)&&t[M][e]||(n.enumerable=!0),n}},Y=function(t){for(var e,n=C(x(t)),r=[],i=0;n.length>i;)o(F,e=n[i++])||e==M||e==s||r.push(e);return r},Z=function(t){for(var e,n=t===I,r=C(n?G:x(t)),i=[],u=0;r.length>u;)!o(F,e=r[u++])||n&&!o(I,e)||i.push(F[e]);return i};U||(c((A=function(){if(this instanceof A)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===I&&e.call(G,n),o(this,M)&&o(this[M],t)&&(this[M][t]=!1),J(this,t,O(1,n))};return i&&Q&&J(I,t,{configurable:!0,set:e}),z(t)}).prototype,"toString",function(){return this._k}),_.f=X,E.f=V,n("n0T6").f=j.f=Y,n("NpIQ").f=H,n("1kS7").f=Z,i&&!n("O4g8")&&c(I,"propertyIsEnumerable",H,!0),h.f=function(t){return z(d(t))}),u(u.G+u.W+u.F*!U,{Symbol:A});for(var $="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),tt=0;$.length>tt;)d($[tt++]);for(var et=P(d.store),nt=0;et.length>nt;)v(et[nt++]);u(u.S+u.F*!U,"Symbol",{for:function(t){return o(B,t+="")?B[t]:B[t]=A(t)},keyFor:function(t){if(!K(t))throw TypeError(t+" is not a symbol!");for(var e in B)if(B[e]===t)return e},useSetter:function(){Q=!0},useSimple:function(){Q=!1}}),u(u.S+u.F*!U,"Object",{create:function(t,e){return void 0===e?S(t):W(S(t),e)},defineProperty:V,defineProperties:W,getOwnPropertyDescriptor:X,getOwnPropertyNames:Y,getOwnPropertySymbols:Z}),D&&u(u.S+u.F*(!U||a(function(){var t=A();return"[null]"!=L([t])||"{}"!=L({a:t})||"{}"!=L(Object(t))})),"JSON",{stringify:function(t){for(var e,n,r=[t],o=1;arguments.length>o;)r.push(arguments[o++]);if(n=e=r[1],(b(e)||void 0!==t)&&!K(t))return m(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!K(e))return e}),r[1]=e,L.apply(D,r)}}),A.prototype[k]||n("hJx8")(A.prototype,k,A.prototype.valueOf),l(A,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},fkB2:function(t,e,n){var r=n("UuGF"),o=Math.max,i=Math.min;t.exports=function(t,e){return(t=r(t))<0?o(t+e,0):i(t,e)}},fuGk:function(t,e,n){"use strict";var r=n("cGG2");function o(){this.handlers=[]}o.prototype.use=function(t,e){return this.handlers.push({fulfilled:t,rejected:e}),this.handlers.length-1},o.prototype.eject=function(t){this.handlers[t]&&(this.handlers[t]=null)},o.prototype.forEach=function(t){r.forEach(this.handlers,function(e){null!==e&&t(e)})},t.exports=o},h65t:function(t,e,n){var r=n("UuGF"),o=n("52gC");t.exports=function(t){return function(e,n){var i,u,c=String(o(e)),s=r(n),a=c.length;return s<0||s>=a?t?"":void 0:(i=c.charCodeAt(s))<55296||i>56319||s+1===a||(u=c.charCodeAt(s+1))<56320||u>57343?t?c.charAt(s):i:t?c.slice(s,s+2):u-56320+(i-55296<<10)+65536}}},hJx8:function(t,e,n){var r=n("evD5"),o=n("X8DO");t.exports=n("+E39")?function(t,e,n){return r.f(t,e,o(1,n))}:function(t,e,n){return t[e]=n,t}},"jKW+":function(t,e,n){"use strict";var r=n("kM2E"),o=n("qARP"),i=n("dNDb");r(r.S,"Promise",{try:function(t){var e=o.f(this),n=i(t);return(n.e?e.reject:e.resolve)(n.v),e.promise}})},kM2E:function(t,e,n){var r=n("7KvD"),o=n("FeBl"),i=n("+ZMJ"),u=n("hJx8"),c=n("D2L2"),s=function(t,e,n){var a,f,l,p=t&s.F,d=t&s.G,h=t&s.S,v=t&s.P,y=t&s.B,m=t&s.W,g=d?o:o[e]||(o[e]={}),b=g.prototype,x=d?r:h?r[e]:(r[e]||{}).prototype;for(a in d&&(n=e),n)(f=!p&&x&&void 0!==x[a])&&c(g,a)||(l=f?x[a]:n[a],g[a]=d&&"function"!=typeof x[a]?n[a]:y&&f?i(l,r):m&&x[a]==l?function(t){var e=function(e,n,r){if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(e);case 2:return new t(e,n)}return new t(e,n,r)}return t.apply(this,arguments)};return e.prototype=t.prototype,e}(l):v&&"function"==typeof l?i(Function.call,l):l,v&&((g.virtual||(g.virtual={}))[a]=l,t&s.R&&b&&!b[a]&&u(b,a,l)))};s.F=1,s.G=2,s.S=4,s.P=8,s.B=16,s.W=32,s.U=64,s.R=128,t.exports=s},knuC:function(t,e){t.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},lOnJ:function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},lktj:function(t,e,n){var r=n("Ibhu"),o=n("xnc9");t.exports=Object.keys||function(t){return r(t,o)}},mClu:function(t,e,n){var r=n("kM2E");r(r.S+r.F*!n("+E39"),"Object",{defineProperty:n("evD5").f})},msXi:function(t,e,n){var r=n("77Pl");t.exports=function(t,e,n,o){try{return o?e(r(n)[0],n[1]):e(n)}catch(e){var i=t.return;throw void 0!==i&&r(i.call(t)),e}}},mtWM:function(t,e,n){t.exports=n("tIFN")},mvHQ:function(t,e,n){t.exports={default:n("qkKv"),__esModule:!0}},mw3O:function(t,e,n){"use strict";var r=n("CwSZ"),o=n("DDCP"),i=n("XgCd");t.exports={formats:i,parse:o,stringify:r}},n0T6:function(t,e,n){var r=n("Ibhu"),o=n("xnc9").concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,o)}},oJlt:function(t,e,n){"use strict";var r=n("cGG2"),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];t.exports=function(t){var e,n,i,u={};return t?(r.forEach(t.split("\n"),function(t){if(i=t.indexOf(":"),e=r.trim(t.substr(0,i)).toLowerCase(),n=r.trim(t.substr(i+1)),e){if(u[e]&&o.indexOf(e)>=0)return;u[e]="set-cookie"===e?(u[e]?u[e]:[]).concat([n]):u[e]?u[e]+", "+n:n}}),u):u}},p1b6:function(t,e,n){"use strict";var r=n("cGG2");t.exports=r.isStandardBrowserEnv()?{write:function(t,e,n,o,i,u){var c=[];c.push(t+"="+encodeURIComponent(e)),r.isNumber(n)&&c.push("expires="+new Date(n).toGMTString()),r.isString(o)&&c.push("path="+o),r.isString(i)&&c.push("domain="+i),!0===u&&c.push("secure"),document.cookie=c.join("; ")},read:function(t){var e=document.cookie.match(new RegExp("(^|;\\s*)("+t+")=([^;]*)"));return e?decodeURIComponent(e[3]):null},remove:function(t){this.write(t,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},p8xL:function(t,e,n){"use strict";var r=Object.prototype.hasOwnProperty,o=function(){for(var t=[],e=0;e<256;++e)t.push("%"+((e<16?"0":"")+e.toString(16)).toUpperCase());return t}();e.arrayToObject=function(t,e){for(var n=e&&e.plainObjects?Object.create(null):{},r=0;r<t.length;++r)void 0!==t[r]&&(n[r]=t[r]);return n},e.merge=function(t,n,o){if(!n)return t;if("object"!=typeof n){if(Array.isArray(t))t.push(n);else{if("object"!=typeof t)return[t,n];(o.plainObjects||o.allowPrototypes||!r.call(Object.prototype,n))&&(t[n]=!0)}return t}if("object"!=typeof t)return[t].concat(n);var i=t;return Array.isArray(t)&&!Array.isArray(n)&&(i=e.arrayToObject(t,o)),Array.isArray(t)&&Array.isArray(n)?(n.forEach(function(n,i){r.call(t,i)?t[i]&&"object"==typeof t[i]?t[i]=e.merge(t[i],n,o):t.push(n):t[i]=n}),t):Object.keys(n).reduce(function(t,i){var u=n[i];return r.call(t,i)?t[i]=e.merge(t[i],u,o):t[i]=u,t},i)},e.assign=function(t,e){return Object.keys(e).reduce(function(t,n){return t[n]=e[n],t},t)},e.decode=function(t){try{return decodeURIComponent(t.replace(/\+/g," "))}catch(e){return t}},e.encode=function(t){if(0===t.length)return t;for(var e="string"==typeof t?t:String(t),n="",r=0;r<e.length;++r){var i=e.charCodeAt(r);45===i||46===i||95===i||126===i||i>=48&&i<=57||i>=65&&i<=90||i>=97&&i<=122?n+=e.charAt(r):i<128?n+=o[i]:i<2048?n+=o[192|i>>6]+o[128|63&i]:i<55296||i>=57344?n+=o[224|i>>12]+o[128|i>>6&63]+o[128|63&i]:(r+=1,i=65536+((1023&i)<<10|1023&e.charCodeAt(r)),n+=o[240|i>>18]+o[128|i>>12&63]+o[128|i>>6&63]+o[128|63&i])}return n},e.compact=function(t){for(var e=[{obj:{o:t},prop:"o"}],n=[],r=0;r<e.length;++r)for(var o=e[r],i=o.obj[o.prop],u=Object.keys(i),c=0;c<u.length;++c){var s=u[c],a=i[s];"object"==typeof a&&null!==a&&-1===n.indexOf(a)&&(e.push({obj:i,prop:s}),n.push(a))}return function(t){for(var e;t.length;){var n=t.pop();if(e=n.obj[n.prop],Array.isArray(e)){for(var r=[],o=0;o<e.length;++o)void 0!==e[o]&&r.push(e[o]);n.obj[n.prop]=r}}return e}(e)},e.isRegExp=function(t){return"[object RegExp]"===Object.prototype.toString.call(t)},e.isBuffer=function(t){return null!==t&&void 0!==t&&!!(t.constructor&&t.constructor.isBuffer&&t.constructor.isBuffer(t))}},pBtG:function(t,e,n){"use strict";t.exports=function(t){return!(!t||!t.__CANCEL__)}},pFYg:function(t,e,n){"use strict";e.__esModule=!0;var r=u(n("Zzip")),o=u(n("5QVw")),i="function"==typeof o.default&&"symbol"==typeof r.default?function(t){return typeof t}:function(t){return t&&"function"==typeof o.default&&t.constructor===o.default&&t!==o.default.prototype?"symbol":typeof t};function u(t){return t&&t.__esModule?t:{default:t}}e.default="function"==typeof o.default&&"symbol"===i(r.default)?function(t){return void 0===t?"undefined":i(t)}:function(t){return t&&"function"==typeof o.default&&t.constructor===o.default&&t!==o.default.prototype?"symbol":void 0===t?"undefined":i(t)}},pxG4:function(t,e,n){"use strict";t.exports=function(t){return function(e){return t.apply(null,e)}}},qARP:function(t,e,n){"use strict";var r=n("lOnJ");t.exports.f=function(t){return new function(t){var e,n;this.promise=new t(function(t,r){if(void 0!==e||void 0!==n)throw TypeError("Bad Promise constructor");e=t,n=r}),this.resolve=r(e),this.reject=r(n)}(t)}},qRfI:function(t,e,n){"use strict";t.exports=function(t,e){return e?t.replace(/\/+$/,"")+"/"+e.replace(/^\/+/,""):t}},qio6:function(t,e,n){var r=n("evD5"),o=n("77Pl"),i=n("lktj");t.exports=n("+E39")?Object.defineProperties:function(t,e){o(t);for(var n,u=i(e),c=u.length,s=0;c>s;)r.f(t,n=u[s++],e[n]);return t}},qkKv:function(t,e,n){var r=n("FeBl"),o=r.JSON||(r.JSON={stringify:JSON.stringify});t.exports=function(t){return o.stringify.apply(o,arguments)}},qyJz:function(t,e,n){"use strict";var r=n("+ZMJ"),o=n("kM2E"),i=n("sB3e"),u=n("msXi"),c=n("Mhyx"),s=n("QRG4"),a=n("fBQ2"),f=n("3fs2");o(o.S+o.F*!n("dY0y")(function(t){Array.from(t)}),"Array",{from:function(t){var e,n,o,l,p=i(t),d="function"==typeof this?this:Array,h=arguments.length,v=h>1?arguments[1]:void 0,y=void 0!==v,m=0,g=f(p);if(y&&(v=r(v,h>2?arguments[2]:void 0,2)),void 0==g||d==Array&&c(g))for(n=new d(e=s(p.length));e>m;m++)a(n,m,y?v(p[m],m):p[m]);else for(l=g.call(p),n=new d;!(o=l.next()).done;m++)a(n,m,y?u(l,v,[o.value,m],!0):o.value);return n.length=m,n}})},sB3e:function(t,e,n){var r=n("52gC");t.exports=function(t){return Object(r(t))}},t8qj:function(t,e,n){"use strict";t.exports=function(t,e,n,r,o){return t.config=e,n&&(t.code=n),t.request=r,t.response=o,t}},t8x9:function(t,e,n){var r=n("77Pl"),o=n("lOnJ"),i=n("dSzd")("species");t.exports=function(t,e){var n,u=r(t).constructor;return void 0===u||void 0==(n=r(u)[i])?e:o(n)}},tIFN:function(t,e,n){"use strict";var r=n("cGG2"),o=n("JP+z"),i=n("XmWM"),u=n("KCLY");function c(t){var e=new i(t),n=o(i.prototype.request,e);return r.extend(n,i.prototype,e),r.extend(n,e),n}var s=c(u);s.Axios=i,s.create=function(t){return c(r.merge(u,t))},s.Cancel=n("dVOP"),s.CancelToken=n("cWxy"),s.isCancel=n("pBtG"),s.all=function(t){return Promise.all(t)},s.spread=n("pxG4"),t.exports=s,t.exports.default=s},thJu:function(t,e,n){"use strict";var r="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function o(){this.message="String contains an invalid character"}o.prototype=new Error,o.prototype.code=5,o.prototype.name="InvalidCharacterError",t.exports=function(t){for(var e,n,i=String(t),u="",c=0,s=r;i.charAt(0|c)||(s="=",c%1);u+=s.charAt(63&e>>8-c%1*8)){if((n=i.charCodeAt(c+=.75))>255)throw new o;e=e<<8|n}return u}},"vFc/":function(t,e,n){var r=n("TcQ7"),o=n("QRG4"),i=n("fkB2");t.exports=function(t){return function(e,n,u){var c,s=r(e),a=o(s.length),f=i(u,a);if(t&&n!=n){for(;a>f;)if((c=s[f++])!=c)return!0}else for(;a>f;f++)if((t||f in s)&&s[f]===n)return t||f||0;return!t&&-1}}},"vIB/":function(t,e,n){"use strict";var r=n("O4g8"),o=n("kM2E"),i=n("880/"),u=n("hJx8"),c=n("/bQp"),s=n("94VQ"),a=n("e6n0"),f=n("PzxK"),l=n("dSzd")("iterator"),p=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,h,v,y,m){s(n,e,h);var g,b,x,w=function(t){if(!p&&t in _)return _[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},O=e+" Iterator",S="values"==v,j=!1,_=t.prototype,E=_[l]||_["@@iterator"]||v&&_[v],P=E||w(v),R=v?S?w("entries"):P:void 0,T="Array"==e&&_.entries||E;if(T&&(x=f(T.call(new t)))!==Object.prototype&&x.next&&(a(x,O,!0),r||"function"==typeof x[l]||u(x,l,d)),S&&E&&"values"!==E.name&&(j=!0,P=function(){return E.call(this)}),r&&!m||!p&&!j&&_[l]||u(_,l,P),c[e]=P,c[O]=d,v)if(g={values:S?P:w("values"),keys:y?P:w("keys"),entries:R},m)for(b in g)b in _||i(_,b,g[b]);else o(o.P+o.F*(p||j),e,g);return g}},xGkn:function(t,e,n){"use strict";var r=n("4mcu"),o=n("EGZi"),i=n("/bQp"),u=n("TcQ7");t.exports=n("vIB/")(Array,"Array",function(t,e){this._t=u(t),this._i=0,this._k=e},function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,o(1)):o(0,"keys"==e?n:"values"==e?t[n]:[n,t[n]])},"values"),i.Arguments=i.Array,r("keys"),r("values"),r("entries")},"xH/j":function(t,e,n){var r=n("hJx8");t.exports=function(t,e,n){for(var o in e)n&&t[o]?t[o]=e[o]:r(t,o,e[o]);return t}},xLtR:function(t,e,n){"use strict";var r=n("cGG2"),o=n("TNV1"),i=n("pBtG"),u=n("KCLY"),c=n("dIwP"),s=n("qRfI");function a(t){t.cancelToken&&t.cancelToken.throwIfRequested()}t.exports=function(t){return a(t),t.baseURL&&!c(t.url)&&(t.url=s(t.baseURL,t.url)),t.headers=t.headers||{},t.data=o(t.data,t.headers,t.transformRequest),t.headers=r.merge(t.headers.common||{},t.headers[t.method]||{},t.headers||{}),r.forEach(["delete","get","head","post","put","patch","common"],function(e){delete t.headers[e]}),(t.adapter||u.adapter)(t).then(function(e){return a(t),e.data=o(e.data,e.headers,t.transformResponse),e},function(e){return i(e)||(a(t),e&&e.response&&(e.response.data=o(e.response.data,e.response.headers,t.transformResponse))),Promise.reject(e)})}},xnc9:function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},zQR9:function(t,e,n){"use strict";var r=n("h65t")(!0);n("vIB/")(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=r(e,n),this._i+=t.length,{value:t,done:!1})})}});
\ No newline at end of file

public/app/js/timeline_pc.js

@@ -45,10 +45,15 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
 				e.preventDefault();
 				e.stopPropagation();
 				var _$this = $(this);
-				var _img = _$this.find('img').attr('src');
-				console.log(_img);
-				$('body', parent.document).append('<img class="J_preview" id="preview_big_img_div" src="'+_img+'" />');
-				window.parent.document.getElementById('preview_big_img_div').click();//巧妙调用父页面的方法
+				var _index = _$this.parent().index();
+				var _tempNodeItem = window.parent.document.getElementById('preview_big_img_ol');
+				if(_tempNodeItem){
+					_tempNodeItem.innerHTML = _$this.closest('.li-img-list').html();
+				}else{
+					$('body', parent.document).append('<ol id="preview_big_img_ol" style="display: none;">'+_$this.closest('.li-img-list').html()+'</ol>');
+				}
+				
+				$(window.parent.document.getElementById('preview_big_img_ol')).find('.J_preview')[_index].click();//巧妙调用父页面的方法
 			})
 		},
 		methods: {
@@ -165,10 +170,14 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
 						return '施总支付宝';
 					case '11':
 						return '林老师支付宝';
+					case '12':
+						return '筠姐支付宝';	
 					case '20':
 						return '施总微信';
 					case '21':
 						return '林老师微信';	
+					case '22':
+						return '筠姐微信';	
 					case '30':
 						return 'pos机器';
 					case '40':
@@ -181,6 +190,8 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
 						return '现金';
 					case '60' :
 						return '其他';
+					case '70' :
+						return '银满谷银行卡';
 					default:
 						return '未定义';
 				}

public/appnew/config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '192.168.0.91', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

public/appnew/package-lock.json

@@ -2611,6 +2611,14 @@
         }
       }
     },
+    "dom7": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
+      "integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
+      "requires": {
+        "ssr-window": "1.0.1"
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz",
@@ -5726,8 +5734,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -9249,6 +9256,11 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "ssr-window": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz",
+      "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
+    },
     "ssri": {
       "version": "5.3.0",
       "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz",
@@ -9426,6 +9438,15 @@
         "whet.extend": "0.9.9"
       }
     },
+    "swiper": {
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.6.tgz",
+      "integrity": "sha512-F9NDtijQt+etiOe6JAEH+Cb+QKzwwFpi08FlOIQv8ALdoQ8tvAX/38a/28E5XxalAkChsHCutwkBCzDxDXTGiA==",
+      "requires": {
+        "dom7": "2.1.2",
+        "ssr-window": "1.0.1"
+      }
+    },
     "tapable": {
       "version": "0.2.8",
       "resolved": "http://registry.npm.taobao.org/tapable/download/tapable-0.2.8.tgz",
@@ -9920,6 +9941,15 @@
       "resolved": "http://registry.npm.taobao.org/vue/download/vue-2.5.16.tgz",
       "integrity": "sha1-B+23XoQSqu7YceuvqZ9GclhKAIU="
     },
+    "vue-awesome-swiper": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz",
+      "integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==",
+      "requires": {
+        "object-assign": "4.1.1",
+        "swiper": "4.4.6"
+      }
+    },
     "vue-axios": {
       "version": "2.1.1",
       "resolved": "http://registry.npm.taobao.org/vue-axios/download/vue-axios-2.1.1.tgz",

public/appnew/package.json

@@ -13,6 +13,7 @@
     "axios": "^0.18.0",
     "qs": "^6.5.1",
     "vue": "^2.5.2",
+    "vue-awesome-swiper": "^3.1.3",
     "vue-axios": "^2.1.1",
     "vue-router": "^3.0.1"
   },

public/appnew/src/components/priceReport/checkTable.vue

+<template>
+	<div>
+		<div class="table-build" >
+			<div class="DivBox" v-for="(item,index) in data">
+				<div class="halfDiv" v-if="item.alipay!=0">
+					<span>支付宝:{{ item.alipay }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.tenpay!=0">
+					<span>微信:{{ item.tenpay }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.realty_pay!=0">
+					<span>地产转账:{{ item.realty_pay }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.family_pay!=0">
+					<span>世家转账:{{ item.family_pay }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.private_bank!=0">
+					<span>3000账号:{{ item.private_bank }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.cash!=0">
+					<span>现金:{{ item.cash }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.pos!=0">
+					<span>POS机:{{ item.pos }}</span>
+				</div>
+				<div class="halfDiv" v-if="item.other_bank!=0">
+					<span>其他:{{ item.other_bank }}</span>
+				</div>
+				<div class="center next">
+					<div class="halfDiv">
+						<span>审核人:{{ item.operation_name }}</span>
+					</div>
+					<div class="halfDiv" >
+						<span>{{ item.create_time }}</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import '@/assets/js/layer041002.js';
+	
+	export default {
+		name: '',
+		props: {
+			data: {
+				type: Object,
+				default : {
+					msg : '数据为空'
+				}
+			},
+			dataindex: {
+				type: [Number, String],
+				default: 0
+			},
+			checkList : {
+				type: Array,
+			}
+		},
+		
+		data(){
+			return {
+				dataTotalList : "" ,
+				checkList : [],
+			}
+		},
+		
+		created() {
+			let _this = this;
+			
+		},
+		mounted () {
+            window.addEventListener('scroll', this.handleScroll, true);  
+             // 监听（绑定）滚轮 滚动事件
+		},
+		methods: {
+			
+		},
+		computed: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	span{
+		font-size:.26rem !important;
+	}
+	div{
+		font-size:.26rem  !important;
+	}
+	.center {
+		width : 100%; 
+		text-align:center ; 
+	}
+	.m-t-3{
+		margin-top:.3rem;
+	}
+	.table-build{
+		width : 7.5rem;
+		text-align:center ; 
+	}
+	.table_head{
+		width : 1.67rem;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		padding-left:.36rem;
+		float:left;
+	}
+	.lineDiv {
+		width:6.78rem ; 
+		height : 1px; 
+		background-color : #eeeeee;
+		padding : 0rem .36rem;
+	}
+	.head_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:left;
+	}
+	.table_text {
+		width : 1.6rem ;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		float:left;
+	}
+	.table_text3 {
+		width : 1.6rem ;
+		text-align:center;
+		float:left;
+	}
+	.table_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:center;
+	}
+	.table_tr{
+		width : 100%; 
+		overflow:hidden ;
+		border-bottom:1px solid #eeeeee;
+	}
+	.DivBox{
+		width : 100% ;
+		padding :0.18rem 0rem 0.5rem 0rem ;
+		overflow:hidden ;
+		border-bottom:1px solid #eeeeee; 
+	}
+	.halfDiv{
+		width: 3.03rem; 
+		padding : 0rem .36rem ;
+		float:left;
+		margin-top:0.12rem;
+		text-align:left;
+		font-size:.26rem ;
+	}
+	.next{
+		width : 750rem!important;
+		float:left;
+	}
+	
+</style>
+
+
+<!--//http://localhost:8080/#/priceReport?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTMwNjA2ODU4fQ.8jL49CjtBMV6BqmaKdJfd4pkGBazrAgQQrutb53Z3mY-->
\ No newline at end of file

public/appnew/src/components/priceReport/priceReport.vue

+<template>
+	<div>
+		<header-pulic :data="headerData"></header-pulic>
+		<div class="right m-t-3"><img style="height : .4rem;margin-right :.3rem;position:relative;top:.1rem;" src="./img/rili@2x.png" /><span>请选择：</span><input class="timmer-type" type="date" v-model="time" @change="resetData" v-bind:max="max" /></div>
+	
+		<div class="center ">
+			<div class="tabs">
+				<div class="tab4" :class="status==0?'active':''" >
+					<span @click="changeTabs(0)" data-value="0">中介费入账</span>
+					<div class="lineA" v-if="status==0"></div>
+				</div>
+				<div class="tab4" :class="status==1?'active':''" >
+					<span @click="changeTabs(1)" data-value="1" >案场费入账</span>
+					<div class="lineA" v-if="status==1"></div>
+				</div>
+				<div class="tab4" :class="status==2?'active':''" >
+					<span @click="changeTabs(2)" data-value="2">意向金入账</span>
+					<div class="lineA" v-if="status==2"></div>
+				</div>
+				<div class="tab4" :class="status==3?'active':''" >
+					<span @click="changeTabs(3)" data-value="3" >保管金入账</span>
+					<div class="lineA" v-if="status==3"></div>
+				</div> 
+			</div>
+			<table-show :data="dataList"></table-show>
+		</div>
+		<div class="center">
+			<div class="title">
+				<span>调整出账</span>
+			</div>
+			<table-change :data="dataChageList"></table-change>
+		</div>
+		<div class="center">
+			<div class="title">
+				<span>总计<span style="font-size:.28rem!important;font-weight: 600;">（元）</span></span>
+			</div>
+			<table-total :data="dataTotalList"></table-total>
+			<table-check :data="checkList" v-if="commited == 1"> </table-check>
+		</div>
+		
+		<div class="center" v-if="commited == 0">
+			<div class="commite" @click="commit">
+				<span>提交</span>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+//	import '@/assets/js/layer041002.js';
+	import priceTable from '@/components/priceReport/priceTable';
+	import priceTableChange from '@/components/priceReport/priceTableChange';
+	import priceTableTotal from '@/components/priceReport/priceTableTotal';
+	import checkTable from '@/components/priceReport/checkTable';
+	
+	export default {
+		name: '',
+		props: {
+			data: {
+				type: Object,
+				default: () => ({
+					message: 'hello'
+				})
+			},
+			dataindex: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		components: {
+			'table-show': priceTable,
+			'table-change': priceTableChange,
+			'table-total': priceTableTotal,
+			'table-check' : checkTable
+		},
+		data() {
+			let _this = this;
+			let _token = _this.$route.query.token;
+			if(!_token) { 
+				layer.tipsX('token获取出错');
+				return false;
+			};
+			return {
+				headerData: {
+					'title': '财务日报',
+					'noborder': false,
+					'isBack': false
+				},
+				token: _token,
+				seatH: 1.58*4,//占位高度
+				pageSize: 10,
+				initTabNumMain: 0,
+				isLoading: false,//是否正在加载
+				show : true ,
+				heightBefor : 0 ,
+				mainData: [{
+					'dataList': [],
+					'page': 1,//页码
+					'isLoadOnce': false,//是否请求过一次数据
+					'isStop': false,//是否所有页的数据加载完毕
+					'noDataFlag': false,//是否是无数据
+					'label': {
+						'icon': 'icon_all@2x.png',
+						'id': 0,
+						'label_name': '全部'
+					}
+					
+				}],
+				
+				dataChageList : [],
+				dataTotalList : [],
+				status : 0 ,
+				urlParams : "",
+				dataList : [],
+				custodyMoneyList:[],
+				earnestMoneyList:[],
+				caseFeeList:[] ,
+				agencyList:[],
+				commited : 0,   //未提交
+				checkList : [] ,
+				time : '',
+				max : '' , 
+			}
+		},
+		created() {
+			let _this = this;
+			_this.initTime();
+			_this.urlParams = _this.$route.query;
+			_this.initData();
+			
+		},
+		mounted () {
+            window.addEventListener('scroll', this.handleScroll, true);  
+             // 监听（绑定）滚轮 滚动事件
+		},
+		methods: {
+			resetData : function(){
+				let _this = this ;
+				_this.initData();
+			},
+			initTime : function(){
+				var that = this;
+//				that.time =  _this.nowDate
+				var date = new Date();
+				var year = date.getFullYear();
+				var month = date.getMonth() + 1 ;
+				var day = date.getDate();
+				var time = year + "-" + (month > 9 ? month : "0"+month) + "-" + (day > 9 ? day : "0" + day );
+				that.time = time ;
+				that.max = time ;
+				
+			},
+			//切换tab标签
+			changeTabs : function(index){
+				console.log(index);
+//				console.log("13212312321321321321312312321321312321312312")
+				let that = this ;
+//				var status = e.path[0].dataset.value;
+				var status = index ; 
+				that.status = status;
+				if ( status == 0 ){
+					that.dataList = that.agencyList ; 
+				} else if ( status == 1 ){
+					that.dataList = that.caseFeeList ; 
+				} else if ( status == 2 ){
+					that.dataList = that.earnestMoneyList ; 
+				} else if ( status == 3 ){
+					that.dataList = that.custodyMoneyList ; 
+				} else {
+					that.dataList = []  ; 
+				}
+			},
+			commit : function(){
+				let that = this ;
+				var params = {
+					'AuthToken': that.urlParams.token,
+                    'agent_id': that.urlParams.agent_id,
+                    "agent_name": that.urlParams.agent_name,
+                    'daily_date': that.dataTotalList.data.daily_date,
+                    "alipay": that.dataTotalList.data.alipay,
+                    'tenpay':  that.dataTotalList.data.tenpay,
+                    "realty_pay":  that.dataTotalList.data.realty_pay,
+                    'family_pay':  that.dataTotalList.data.family_pay,
+                    "private_bank":  that.dataTotalList.data.private_bank,
+                    "cash":  that.dataTotalList.data.cash,
+                    "pos":  that.dataTotalList.data.pos,
+                    "other_bank":  that.dataTotalList.data.other_bank,
+                    "daily_date" : that.time
+                };
+				that.axios({
+					method: 'get',
+					url: '/broker/addDaily',
+					responseType: 'json',
+					data: params 
+				}).then(function(res){
+					that.commited = 1 ;
+					that.initData();
+					layer.tipsX(res.data.msg);
+				}).catch(function(error){
+					layer.tipsX(error);
+				});
+			},
+			initData : function(){
+				let that = this ; 
+				var params = {
+					'AuthToken': that.urlParams.token,
+					'store_id': that.urlParams.store_id,
+					'is_store': that.urlParams.is_store,
+					'daily_data': that.time
+				};
+				that.axios({
+					method: 'get',
+					url: '/broker/dailyDetail',
+					responseType: 'json',
+					data: params 
+				})
+				.then(function(res) {
+					if(res.data.code == 200) {
+						var data = res.data.data ; 
+						var list = data.list ; 
+						var check_list = data.check_list;
+						var commit_info = data.commit_info;
+						that.commited = data.is_commit;
+						that.initAgencyList(list.agency_fee);
+						that.initCaseFeeList(list.case_fee);
+						that.initCustodyMoneyList(list.custody_money);
+						that.initEarnestMoneyList(list.earnest_money);
+						that.initChange(list.adjustment);
+//						var obj = data.commit_info ; 
+//						console.log(data.recorded_money);
+						var obj = {
+							'data' : "",
+							'upint' : data.recorded_money,
+							'upoutt' : data.adjustment_money ,
+							'souldt' : data.remittance_money?data.remittance_money:0 ,
+							'realin' : data.remittance_money?data.remittance_money:0 ,
+							'commited' : data.is_commit?data.is_commit:0,
+							'checkList' : check_list,
+							'agent_name' : that.urlParams.agent_name,
+							'enterTime' : data.is_commit == 1 ? commit_info.create_time : "", 
+						}
+						obj.data = data.total_info ; 
+						console.log(obj)
+//						obj.upint = data.recorded_money;
+//						obj.upoutt = data.adjustment_money?data.adjustment_money:0 ;
+//						obj.souldt = data.remittance_money?data.remittance_money:0 ;
+//						obj.realin = data.remittance_money?data.remittance_money:0 ;
+//						obj.commited = data.is_commit?data.is_commit:0;
+//						obj.checkList = check_list;
+//						obj.agent_name = that.urlParams.agent_name?data.urlParams:0;
+//						obj.enterTime = commit_info.create_time;
+						that.dataTotalList = obj;
+						that.checkList = check_list ;
+					} else {
+						layer.tipsX(res.data.msg);
+					}
+				})
+				.catch(function(error) {
+					console.log(error)
+					layer.tipsX(error);
+				});
+			},
+			
+			//生成中介费数组数据
+			initAgencyList : function(list){
+				let that = this  ; 
+				console.log(list);
+				var listArray = [{   
+								"msg" : "收款ID" ,
+								"str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+							},
+							{	
+								"msg" : "商铺地址" ,
+								"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].house_address ? list[1].house_address : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].house_address ? list[2].house_address : "-") :"-",
+							},
+							{ 
+								"msg" : "成交价" ,
+								"str1" : list.length > 0 ? (list[0].price ? list[0].price : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].price ? list[1].price : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].price ? list[2].price : "-") :"-",
+							},
+							{ 
+								"msg" : "应收金额" ,
+								"str1" : list.length > 0 ? (list[0].price * 0.7 ? (list[0].price * 0.7).toFixed(2)  : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].price * 0.7 ? (list[1].price * 0.7).toFixed(2) : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].price * 0.7 ? (list[2].price * 0.7).toFixed(2) : "-") :"-",
+							},
+							{ 
+								"msg" : "本次收佣" ,
+								"str1" : list.length > 0 ? (list[0].money ? list[0].money : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
+							},
+							{ 
+								"msg" : "之前已收佣" ,
+								"str1" : list.length > 0 ? (list[0].received_money ? list[0].received_money : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].received_money ? list[1].received_money : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].received_money ? list[2].received_money : "-") :"-",
+							},
+							{ 
+								"msg" : "多收金额" ,
+								"str1" : list.length > 0 ? (list[0].money - list[0].price * 0.7 ? (list[0].money - list[0].price * 0.7).toFixed(2) : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].money - list[1].price * 0.7 ? (list[1].money - list[1].price * 0.7).toFixed(2) : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].money - list[2].price * 0.7 ? (list[2].money - list[2].price * 0.7).toFixed(2) : "-") :"-",
+							},
+							{ 
+								"msg" : "支付方式" ,
+								"str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].pay_type ? that.payType(list[1].pay_type) : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].pay_type ? that.payType(list[2].pay_type) : "-") :"-",
+							},
+							{ 
+								"msg" : "转账户名" ,
+								"str1" : list.length > 0 ? (list[0].transfer_name ? list[0].transfer_name : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].transfer_name ? list[1].transfer_name : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].transfer_name ? list[2].transfer_name : "-") :"-",
+							},
+							{ 
+								"msg" : "业务员" ,
+								"str1" : list.length > 0 ? (list[0].agent_name ? list[0].agent_name : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].agent_name ? list[1].agent_name : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].agent_name ? list[2].agent_name : "-") :"-",
+							},
+							{ 
+								"msg" : "所属门店" ,
+								"str1" : list.length > 0 ? (list[0].store_name ? list[0].store_name : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].store_name ? list[0].store_name : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].store_name ? list[0].store_name : "-") :"-",
+							},
+							{ 
+								"msg" : "是否开业" ,
+								"str1" : list.length > 0 ? (list[0].is_open == 1 ? "开业":"未开业") :"-",
+								"str2" : list.length > 1 ? (list[1].is_open == 1 ? "开业":"未开业") :"-",
+								"str3" : list.length > 2 ? (list[2].is_open == 1 ? "开业":"未开业") :"-",
+							},
+							{ 
+								"msg" : "是否分红" ,
+								"str1" : list.length > 0 ? (list[0].is_dividend == 1 ? "否" : "是") :"-",
+								"str2" : list.length > 1 ? (list[1].is_dividend == 1 ? "否" : "是") :"-",
+								"str3" : list.length > 2 ? (list[2].is_dividend == 1 ? "否" : "是") :"-",
+							},
+							{ 
+								"msg" : "资料" ,
+								"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+								"id2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+								"id3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+								"str1" : list.length > 0 ? "查看" :"-",
+								"str2" : list.length > 1 ? "查看" :"-",
+								"str3" : list.length > 2 ? "查看" :"-",
+							}
+				]
+				that.agencyList = listArray;
+				if ( that.status == 0) {
+					that.dataList = listArray ; 
+				}
+			},
+				
+			initCaseFeeList : function(list){
+				var that = this ;
+				var caseFeeList = [
+					{
+						"msg" : "收款ID" ,
+						"str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+					},
+					{
+						"msg" : "成交商铺地址" ,
+						"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_address ? list[1].house_address : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].house_address ? list[2].house_address : "-") :"-",
+					},
+					{
+						"msg" : "应收案场费" ,
+						"str1" : list.length > 0 ? (list[0].price ? list[0].price : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].price ? list[1].price : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].price ? list[2].price : "-") :"-",
+					},
+					{
+						"msg" : "本次收佣" ,
+						"str1" : list.length > 0 ? (list[0].money ? list[0].money : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
+					},
+					{
+						"msg" : "之前已收佣" ,
+						"str1" : list.length > 0 ? (list[0].received_money ? list[0].received_money : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].received_money ? list[1].received_money : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].received_money ? list[2].received_money : "-") :"-",
+					},
+					{
+						"msg" : "支付方式" ,
+						"str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].pay_type ? that.payType(list[1].pay_type) : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].pay_type ? that.payType(list[2].pay_type) : "-") :"-",
+					},
+					{
+						"msg" : "转账户名" ,
+						"str1" : list.length > 0 ? (list[0].transfer_name ? list[0].transfer_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].transfer_name ? list[1].transfer_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].transfer_name ? list[2].transfer_name : "-") :"-",
+					},
+					{
+						"msg" : "业务员" ,
+						"str1" : list.length > 0 ? (list[0].agent_name ? list[0].agent_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].agent_name ? list[1].agent_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].agent_name ? list[2].agent_name : "-") :"-",
+					},
+					{
+						"msg" : "所属门店" ,
+						"str1" : list.length > 0 ? (list[0].store_name ? list[0].store_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].store_name ? list[1].store_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].store_name ? list[2].store_name : "-") :"-",
+					},
+					{
+						"msg" : "是否开业" ,
+						"str1" : list.length > 0 ? (list[0].is_open == 1 ? "开业":"未开业") :"-",
+						"str2" : list.length > 1 ? (list[1].is_open == 1 ? "开业":"未开业") :"-",
+						"str3" : list.length > 2 ? (list[2].is_open == 1 ? "开业":"未开业") :"-",
+					},
+					{
+						"msg" : "是否分红" ,
+						"str1" : list.length > 0 ? (list[0].is_dividend == 1 ? "否" : "是") :"-",
+						"str2" : list.length > 1 ? (list[1].is_dividend == 1 ? "否" : "是") :"-",
+						"str3" : list.length > 2 ? (list[2].is_dividend == 1 ? "否" : "是") :"-",
+					},
+					{
+						"msg" : "备注" ,
+						"str1" : list.length > 0 ? (list[0].remark ? list[0].remark : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].remark ? list[1].remark : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].remark ? list[2].remark : "-") :"-",
+					},
+					{ 
+						"msg" : "资料" ,
+						"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"id2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+						"id3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+						"str1" : list.length > 0 ? "查看" :"-",
+						"str2" : list.length > 1 ? "查看" :"-",
+						"str3" : list.length > 2 ? "查看" :"-",
+					}
+				]
+				that.caseFeeList = caseFeeList ;
+//				that.dataList = caseFeeList ; 
+				if ( that.status == 1) {
+					that.dataList = caseFeeList ; 
+				}
+			},
+	
+			initEarnestMoneyList : function(list){
+				var that = this ;
+				var earnestMoneyList = [
+					{
+						"msg" : "收款ID" ,
+						"str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+					},
+						{
+						"msg" : "订单ID" ,
+						"str1" : list.length > 0 ? (list[0].order_id ? list[0].order_id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].order_id ? list[1].order_id : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].order_id ? list[2].order_id : "-") :"-",
+					},
+					{
+						"msg" : "房源ID" ,
+						"str1" : list.length > 0 ? (list[0].house_id ? list[0].house_id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_id ? list[1].house_id : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].house_id ? list[2].house_id : "-") :"-",
+					},
+					{
+						"msg" : "成交商铺地址" ,
+						"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_address ? list[1].house_address : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].house_address ? list[2].house_address : "-") :"-",
+					},
+					{
+						"msg" : "意向金金额" ,
+						"str1" : list.length > 0 ? (list[0].money ? list[0].money : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
+					},
+					{
+						"msg" : "支付方式" ,
+						"str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].pay_type ? that.payType(list[1].pay_type) : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].pay_type ? that.payType(list[2].pay_type) : "-") :"-",
+					},
+					{
+						"msg" : "转账户名" ,
+						"str1" : list.length > 0 ? (list[0].transfer_name ? list[0].transfer_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].transfer_name ? list[1].transfer_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].transfer_name ? list[2].transfer_name : "-") :"-",
+					},
+					{
+						"msg" : "业务员" ,
+						"str1" : list.length > 0 ? (list[0].agent_name ? list[0].agent_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].agent_name ? list[1].agent_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].agent_name ? list[2].agent_name : "-") :"-",
+					},
+					{
+						"msg" : "所属门店" ,
+						"str1" : list.length > 0 ? (list[0].store_name ? list[0].store_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].store_name ? list[1].store_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].store_name ? list[2].store_name : "-") :"-",
+					},
+					{
+						"msg" : "意向金收条编号" ,
+						"str1" : list.length > 0 ? (list[0].receipt_number ? list[0].receipt_number : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].receipt_number ? list[2].receipt_number : "-") :"-",
+					},
+					{ 
+						"msg" : "资料" ,
+						"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"id2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+						"id3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+						"str1" : list.length > 0 ? "查看" :"-",
+						"str2" : list.length > 1 ? "查看" :"-",
+						"str3" : list.length > 2 ? "查看" :"-",
+					}
+				]
+				that.earnestMoneyList = earnestMoneyList 
+//				that.dataList = earnestMoneyList ; \n
+				if ( that.status == 2) {
+					that.dataList = earnestMoneyList; 
+				}
+			},
+
+			initCustodyMoneyList : function(list){
+				var that = this ;
+				var custodyMoneyList = [
+					{
+						"msg" : "收款ID" ,
+						"str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+					},
+					{
+						"msg" : "房源ID" ,
+						"str1" : list.length > 0 ? (list[0].house_id ? list[0].house_id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_id ? list[1].house_id : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].house_id ? list[2].house_id : "-") :"-",
+					},
+					{
+						"msg" : "成交商铺地址" ,
+						"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_address ? list[1].house_address : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].house_address ? list[2].house_address : "-") :"-",
+					},
+					{
+						"msg" : "保管金金额" ,
+						"str1" : list.length > 0 ? (list[0].money ? list[0].money : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
+					},
+					{
+						"msg" : "支付方式" ,
+						"str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].pay_type ? that.payType(list[1].pay_type) : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].pay_type ? that.payType(list[2].pay_type) : "-") :"-",
+					},
+					{
+						"msg" : "转账户名" ,
+						"str1" : list.length > 0 ? (list[0].transfer_name ? list[0].transfer_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].transfer_name ? list[1].transfer_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].transfer_name ? list[2].transfer_name : "-") :"-",
+					},
+					{
+						"msg" : "业务员" ,
+						"str1" : list.length > 0 ? (list[0].agent_name ? list[0].agent_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].agent_name ? list[1].agent_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].agent_name ? list[2].agent_name : "-") :"-",
+					},
+					{
+						"msg" : "所属门店" ,
+						"str1" : list.length > 0 ? (list[0].store_name ? list[0].store_name : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].store_name ? list[1].store_name : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].store_name ? list[2].store_name : "-") :"-",
+					},
+					{
+						"msg" : "保管金收条编号" ,
+						"str1" : list.length > 0 ? (list[0].receipt_number ? list[0].receipt_number : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-",
+						"str3" : list.length > 2 ? (list[2].receipt_number ? list[2].receipt_number : "-") :"-",
+					},
+					{ 
+						"msg" : "资料" ,
+						"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"id2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+						"id3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+						"str1" : list.length > 0 ? "查看" :"-",
+						"str2" : list.length > 1 ? "查看" :"-",
+						"str3" : list.length > 2 ? "查看" :"-",
+					}
+				]
+				that.custodyMoneyList = custodyMoneyList 
+				if ( that.status == 2) {
+					that.dataList = custodyMoneyList; 
+				}
+			},
+			
+			initChange : function(list){
+				let that = this ;
+				var changeArray = [
+					{
+						"msg" : "调整ID" ,
+						"str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
+					},
+					{	
+						"msg" : "调整前房源ID" ,
+						"str1" : list.length > 0 ? (list[0].house_id ? list[0].house_id : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_id ? list[1].house_id: "-") :"-",
+					},
+					{ 
+						"msg" : "调整前房源地址" ,
+						"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].house_address ? list[1].house_address : "-") :"-",
+					},
+					{ 
+						"msg" : "调整类型" ,
+						"str1" : list.length > 0 ? (list[0].type ? that.changeType(list[0].type)  : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].type ? that.changeType(list[1].type) : "-") :"-",
+					},
+					{ 
+						"msg" : "入账日期" ,
+						"str1" : list.length > 0 ? (list[0].create_time ? list[0].create_time : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].create_time ? list[1].create_time : "-") :"-",
+					},
+					{ 
+						"msg" : "收据编号" ,
+						"str1" : list.length > 0 ? (list[0].receipt_number ? list[0].receipt_number: "-") :"-",
+						"str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-",
+					},
+					{ 
+						"msg" : "调整金额" ,
+						"str1" : list.length > 0 ? (list[0].money ? list[0].money : "-") :"-",
+						"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
+					},
+//					{ 
+//						"msg" : "附件" ,
+//						"str1" : list.length > 0 ? (list[0].pay_log_id ? list[0].pay_log_id : "-") :"-",
+//						"str2" : list.length > 1 ? (list[1].pay_log_id ? list[1].pay_log_id : "-") :"-",
+//					},
+					{ 
+						"msg" : "附件" ,
+						"id1" : list.length > 0 ? (list[0].pay_log_id ? list[0].pay_log_id : "-") :"-",
+						"id2" : list.length > 1 ? (list[1].pay_log_id ? list[1].pay_log_id : "-") :"-",
+//						"id3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
+						"str1" : list.length > 0 ? "查看" :"-",
+						"str2" : list.length > 1 ? "查看" :"-",
+//						"str3" : list.length > 2 ? "查看" :"-",
+					}
+				]
+				that.dataChageList = changeArray ; 
+			},
+			
+			changeType : function(num) {
+				var that = this ; 
+				var str = '' ;
+				switch ( num ) {
+					case 1 : 
+						str = "意向金转中介费" ; 
+						break ; 
+					case 2 : 
+						str = "意向金转案场费" ; 
+						break ; 
+					case 3 : 
+						str = "意向金转意向金" ; 
+						break ; 
+					case 4 : 
+						str = "保管金转中介费" ; 
+						break ; 
+					case 5 : 
+						str = "保管金转案场费" ; 
+						break ; 
+					case 6 : 
+						str = "保管金转保管金" ; 
+						break ; 
+					case 7 : 
+						str = "意向金转保管金" ; 
+						break ; 
+				}
+				return str ;
+			},
+			
+			payType :function(num){
+				var str = "" 
+				console.log(num)
+				switch (num) {
+					case 10: 
+						str = "施总支付宝" ;
+						break ;
+					case 11: 
+						str = "林老师支付宝" ;
+						break ;
+					case 12 :  
+						str = "筠姐支付宝" ;
+						break ;
+					case 20: 
+						str = "施总微信" ;
+						break ;
+					case 21: 
+						str = "林老师微信" ;
+						break ;
+					case 22: 
+						str = "筠姐微信" ;
+						break ;
+					case 30: 
+						str = "pos机器" ;
+						break ;
+					case 40: 
+						str = "地产转账" ;
+						break ;
+					case 41: 
+						str = "世家公账" ;
+						break ;
+					case 42: 
+						str = "3000账号" ;
+						break ;
+					case 50: 
+						str = "现金" ;
+						break ;
+					case 60: 
+						str = "其他" ;
+						break ;
+					case 70: 
+						str = "银满谷银行卡" ;
+						break ;
+				}
+				return str 
+			}
+		},
+		computed: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	/*input[type=date]::-webkit-inner-spin-button {
+		-webkit-appearance: none;
+		width :0px !important;
+		padding:0px !important
+ 	}
+ 	input::-webkit-search-cancel-button{
+	  display: none;
+	  width :0px !important;
+	  visibility: hidden !important;
+	  padding : 0px !important;
+	}
+	input[type=date]::-webkit-inner-spin-button { 
+		visibility: hidden !important; 
+		width :0px !important;
+		padding:0px !important;
+	}
+	::-webkit-datetime-edit-text {
+		color: #4D90FE; 
+		padding:0px !important }
+	::-webkit-clear-button { 
+		visibility: hidden !important; 
+		width : 0px !important;
+		padding:0px !important;
+	}
+	::-webkit-calendar-picker-indicator{
+		width :0px !important;
+		visibility: hidden !important;
+		padding:0px !important
+	}
+	::-webkit-datetime-edit-year-field {
+		width : 100%;
+		z-index : 1000000;
+		padding:0px !important
+	}
+	::-webkit-datetime-edit {
+		width : 100% !important;
+		z-index : 1000;
+		padding:0px !important
+	}*/
+	
+	
+	span{
+		font-size:.26rem;
+	}
+	.timmer-type{
+		border : 1px solid #eeeeee;
+		width : 2.3rem ;
+		padding : 0.1rem .15rem;
+		border-radius : .3rem; 
+		margin-right : .3rem;
+	}
+	.center {
+		width : 100%; 
+		text-align:center ; 
+	}
+	.right {
+		width : 100%; 
+		text-align:right ; 
+	}
+	.m-t-3{
+		margin-top:.3rem;
+	}
+	.tab4{
+		width : 25%;
+		float:left;
+		padding:.22rem 0rem ;
+	}
+	.tabs{
+		border-bottom:1px solid #eeeeee;
+		overflow:hidden ;
+	}
+	.tabs>.active {
+		color:#FF9318 ;
+	}
+	.title{
+		font-size:0.35rem !important;
+		padding:.3rem 0rem ;
+		border-bottom:1px solid #eeeeee;
+		font-weight: 700;
+	}
+	.title span {
+		font-size:0.35rem !important;
+	}
+	.commite{
+		width: 6.86rem;
+		 background-color : #fe9417;
+		padding : 0.24rem 0rem  ;
+		text-align:center;
+		margin-left : .32rem;
+		border-radius: .05rem;
+		margin-bottom:.3rem;
+		color : #ffffff;
+		font-size : .44rem;
+	}
+	.lineA{
+		height : 2px ;
+		width :1.27rem;
+		margin-left:.29rem;
+		background-color : #FF9318 ;
+		border-radius : 1px; 
+		margin-top:.3rem;
+	}
+</style>
+
+
+<!--//
+	
+http://localhost:8080/#/priceReport?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTMwNjA2ODU4fQ.8jL49CjtBMV6BqmaKdJfd4pkGBazrAgQQrutb53Z3mY-->
\ No newline at end of file

public/appnew/src/components/priceReport/priceTable.vue

+<template>
+	<div>
+		<div class="table-build">
+			<div class="table_tr" v-for="(item,index) in data ">
+				<div class="table_head">
+					<div class="head_text_div" >
+						<span>{{ item.msg }}</span>
+					</div>
+				</div>
+				<div class="table_text">
+					<div class="table_text_div">
+						<span v-if="item.str1 == '查看'" style="color:blue" @click="show" :data-id="item.id1">{{ item.str1 }}</span>
+						<span v-else >{{ item.str1 }}</span>
+					</div>
+				</div>
+				<div class="table_text">
+					<div class="table_text_div" >
+						<span v-if="item.str2 == '查看'" style="color:blue" @click="show" :data-id="item.id2">{{ item.str2 }}</span>
+						<span v-else >{{ item.str2 }}</span>
+					</div>
+				</div>
+				<div class="table_text3">
+					<div class="table_text_div" >
+						<span v-if="item.str3 == '查看'" style="color:blue" @click="show" :data-id="item.id3">{{ item.str3 }}</span>
+						<span v-else >{{ item.str3 }}</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		
+		<div class="allBack" :style="{width:maxWidth+'px'}" v-if="showPic">
+			<div class="close" @click="close" >
+				<span >X</span>
+			</div>
+			<swiper :options="swiperOption">
+		      <swiper-slide v-for="(item,index) in imges" :key="index"><img :src="item.url" class="picStyle" /></swiper-slide>
+		    </swiper>
+		</div>
+	</div>
+</template>
+
+<script scoped>
+	import '@/assets/js/layer041002.js';
+	
+	import { swiper, swiperSlide } from 'vue-awesome-swiper'
+	export default {
+		name: '',
+		props: {
+			data: {
+				type: Object,
+				default : {
+					msg : '数据为空'
+				}
+			},
+			dataindex: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		components: {
+		    swiper,
+		    swiperSlide
+		},
+		data(){
+			return {
+				 swiperOption: {//swiper3
+				      autoplay: 3000,
+				      speed: 1000,
+				      width:window.screen.width
+				 },
+				wWidth : window.screen.width,
+				showPic : false  ,
+				maxWidth : 0,
+				imges : [],
+			}
+		},
+		
+		created() {
+			let _this = this;
+			_this.urlParams = _this.$route.query;
+			console.log(this.wWidth);
+//			document.getElementsByClassName("swiper-slide-active").style.height:100%;
+			
+		},
+		mounted () {
+            window.addEventListener('scroll', this.handleScroll, true);  
+		
+             // 监听（绑定）滚轮 滚动事件
+		},
+		methods: {
+			close : function(){
+				var that = this ;
+				that.showPic = false ;
+			},
+			show : function(e){
+				var that = this ; 
+				var id = e.target.dataset.id;
+				console.log(id);
+				var params = {
+					'pay_log_id' : id ,
+					'AuthToken': that.urlParams.token,
+				};
+				that.axios({
+					method: 'get',
+					url: '/broker/getPayLogImg',
+					responseType: 'json',
+					data: params 
+				})
+				.then(function(res) {
+					if(res.data.code == 200) {
+						that.imges = [];
+						if ( res.data.msg == "success" ){
+							that.showPic = true ;
+							console.log(res.data.data);
+							var picName = [];
+							for ( let i = 0 ; i < res.data.data.img_info.length ; i++){
+								let urlS = res.data.data.img_path + res.data.data.img_info[i].img_name;
+								var obj = {
+									url : urlS
+								};
+								picName.push(obj);
+							}
+							console.log(picName);
+							that.maxWidth = that.wWidth * (picName.length)
+							that.imges = picName;
+						} else {
+							layer.tipsX("暂时无图片资料");
+						}
+					} else {
+						layer.tipsX(res.data.msg);
+					}
+				})
+				.catch(function(error) {
+					layer.tipsX(error);
+				});
+			},
+		},
+		computed: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	span{
+		font-size:.26rem;
+	}
+	.close{
+		width : 0.4rem ; 
+		height :0.4rem ;
+		border-radius : 50%;
+		border : 1px solid #ffffff;
+		position:fixed ;
+		top : 0.95rem ; 
+		right :0.1rem ;
+		color : #ffffff;
+		z-index : 1000;
+		text-align:center ; 
+	}
+	
+	.swiper-slide{
+		float:left;
+		height:100%;
+		
+	}
+	/*.swiper-slide-active{
+		position:fixed;
+		top:100%;
+	}*/
+	.swiper-container{
+		height:100%;
+	}
+	.swiper-wrapper{
+		height:100% !important;
+	}
+	.allBack{
+		/*width : 7.5rem;*/
+		height:100%;
+		background-color : #1a1a1a;
+		position : fixed;
+		top:0rem;
+		left:0rem;
+		opacity: 1;
+	}
+	.picStyle1{
+		/*position:relative;*/
+		/*left:50%;*/
+		/*top:50%;*/
+		/*transform: translate(-62.5%,-50%);*/
+		width :6rem;
+		/*opacity: 1;*/
+	}
+	.picStyle{
+		position:relative;
+		/*left:50%;*/
+		top:6rem;
+		/*left:0.75rem;*/
+		transform: translateY(-50%);
+		width :6rem;
+		opacity: 1;
+	}
+	.w100{
+		width:80%;
+		height : 100%;
+	}
+	.center {
+		width : 100%; 
+		text-align:center ; 
+	}
+	.m-t-3{
+		margin-top:.3rem;
+	}
+	.table-build{
+		width : 7.5rem;
+		text-align:center ; 
+	}
+	.table_head{
+		width : 1.67rem;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		padding-left:.36rem;
+		float:left;
+	}
+	.head_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:left;
+	}
+	.table_text {
+		width : 1.6rem ;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		float:left;
+	}
+	.table_text3 {
+		width : 1.6rem ;
+		text-align:center;
+		float:left;
+	}
+	.table_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:center;
+	}
+	.table_tr{
+		width : 100%; 
+		overflow:hidden ;
+		border-bottom:1px solid #eeeeee;
+	}
+</style>
+
+
+<!--//http://localhost:8080/#/priceReport?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTMwNjA2ODU4fQ.8jL49CjtBMV6BqmaKdJfd4pkGBazrAgQQrutb53Z3mY-->
\ No newline at end of file

public/appnew/src/components/priceReport/priceTableChange.vue

+<template>
+	<div>
+		<div class="table-build">
+			<div class="table_tr" v-for="(item,index) in data ">
+				<div class="table_head">
+					<div class="head_text_div" >
+						<span>{{ item.msg }}</span>
+					</div>
+				</div>
+				<div class="table_text">
+					<div class="table_text_div">
+						<span v-if="item.str1 == '查看'" style="color:blue" @click="show" :data-id="item.id1">{{ item.str1 }}</span>
+						<span v-else >{{ item.str1 }}</span>
+					</div>
+				</div>
+				<div class="table_text">
+					<div class="table_text_div" >
+						<span v-if="item.str2 == '查看'" style="color:blue" @click="show" :data-id="item.id2">{{ item.str2 }}</span>
+						<span v-else >{{ item.str2 }}</span>
+					</div>
+				</div>
+				
+			</div>
+		</div>
+		
+		<div class="allBack" :style="{width:maxWidth+'px'}" v-if="showPic">
+			<div class="close" @click="close" >
+				<span >X</span>
+			</div>
+			<swiper :options="swiperOption">
+		      <swiper-slide v-for="(item,index) in imges" :key="index"><img :src="item.url" class="picStyle" /></swiper-slide>
+		    </swiper>
+		</div>
+	</div>
+</template>
+
+<script scoped>
+	import '@/assets/js/layer041002.js';
+	
+	import { swiper, swiperSlide } from 'vue-awesome-swiper'
+	export default {
+		name: '',
+		props: {
+			data: {
+				type: Object,
+				default : {
+					msg : '数据为空'
+				}
+			},
+			dataindex: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		components: {
+		    swiper,
+		    swiperSlide
+		},
+		data(){
+			return {
+				 swiperOption: {//swiper3
+				      autoplay: 3000,
+				      speed: 1000,
+				      width:window.screen.width
+				 },
+				wWidth : window.screen.width,
+				showPic : false  ,
+				maxWidth : 0,
+				imges : [],
+			}
+		},
+		
+		created() {
+			let _this = this;
+			_this.urlParams = _this.$route.query;
+			console.log(this.wWidth);
+//			document.getElementsByClassName("swiper-slide-active").style.height:100%;
+			
+		},
+		mounted () {
+            window.addEventListener('scroll', this.handleScroll, true);  
+		
+             // 监听（绑定）滚轮 滚动事件
+		},
+		methods: {
+			close : function(){
+				var that = this ;
+				that.showPic = false ;
+			},
+			show : function(e){
+				var that = this ; 
+				var id = e.target.dataset.id;
+				console.log(id);
+				var params = {
+					'pay_log_id' : id ,
+					'AuthToken': that.urlParams.token,
+				};
+				that.axios({
+					method: 'get',
+					url: '/broker/getPayLogImg',
+					responseType: 'json',
+					data: params 
+				})
+				.then(function(res) {
+					if(res.data.code == 200) {
+						that.imges = [];
+						if ( res.data.msg == "success" ){
+							console.log(res.data.data);
+							that.showPic = true ;
+							var picName = [];
+							for ( let i = 0 ; i < res.data.data.img_info.length ; i++){
+								let urlS = res.data.data.img_path + res.data.data.img_info[i].img_name;
+								var obj = {
+									url : urlS
+								};
+								picName.push(obj);
+							}
+							console.log(picName);
+							that.maxWidth = that.wWidth * (picName.length)
+							that.imges = picName;
+						} else {
+							layer.tipsX("暂时无图片资料");
+						}
+					} else {
+						layer.tipsX(res.data.msg);
+					}
+				})
+				.catch(function(error) {
+					layer.tipsX(error);
+				});
+			},
+		},
+		computed: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	
+	span{
+		font-size:.26rem;
+	}
+	.close{
+		width : 0.4rem ; 
+		height :0.4rem ;
+		border-radius : 50%;
+		border : 1px solid #ffffff;
+		position:fixed ;
+		top : 0.95rem ; 
+		right :0.1rem ;
+		color : #ffffff;
+		z-index : 1000;
+		text-align:center ; 
+	}
+	
+	.swiper-slide{
+		float:left;
+		height:100%;
+		
+	}
+	/*.swiper-slide-active{
+		position:fixed;
+		top:100%;
+	}*/
+	.swiper-container{
+		height:100%;
+	}
+	.swiper-wrapper{
+		height:100% !important;
+	}
+	.allBack{
+		/*width : 7.5rem;*/
+		height:100%;
+		background-color : #1a1a1a;
+		position : fixed;
+		top:0rem;
+		left:0rem;
+		opacity: 1;
+	}
+	.picStyle1{
+		/*position:relative;*/
+		/*left:50%;*/
+		/*top:50%;*/
+		/*transform: translate(-62.5%,-50%);*/
+		width :6rem;
+		/*opacity: 1;*/
+	}
+	.picStyle{
+		position:relative;
+		/*left:50%;*/
+		top:6rem;
+		/*left:0.75rem;*/
+		transform: translateY(-50%);
+		width :6rem;
+		opacity: 1;
+	}
+	.w100{
+		width:80%;
+		height : 100%;
+	}
+	.center {
+		width : 100%; 
+		text-align:center ; 
+	}
+	.m-t-3{
+		margin-top:.3rem;
+	}
+	.table-build{
+		width : 7.5rem;
+		text-align:center ; 
+	}
+	.table_head{
+		width : 1.67rem;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		padding-left:.36rem;
+		float:left;
+	}
+	.head_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:left;
+	}
+	.table_text {
+		width : 2.7rem ;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		float:left;
+	}
+	.table_text3 {
+		width : 1.6rem ;
+		text-align:center;
+		float:left;
+	}
+	.table_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:center;
+	}
+	.table_tr{
+		width : 100%; 
+		overflow:hidden ;
+		border-bottom:1px solid #eeeeee;
+	}
+</style>
+
+
+<!--//http://localhost:8080/#/priceReport?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTMwNjA2ODU4fQ.8jL49CjtBMV6BqmaKdJfd4pkGBazrAgQQrutb53Z3mY-->
\ No newline at end of file

public/appnew/src/components/priceReport/priceTableTotal.vue

+<template>
+	<div>
+		<div class="table-build" >
+			<div class="DivBox noBorder" >
+				<div class="halfDiv" >
+					<span>以上入账金额:{{ data.upint }}</span>
+				</div>
+				<div class="halfDiv">
+					<span>以上出账金额:{{ data.upoutt }}</span>
+				</div>
+				<div class="halfDiv">
+					<span>入账应汇款:{{ data.souldt }}</span>
+				</div>
+				<div class="halfDiv">
+					<span>实际入账:{{ data.realin }}</span>
+				</div>
+			</div>
+			<div class="lineDiv"></div>
+			<div class="DivBox ">
+				<div class="halfDiv" v-if="data.data.alipay!=0">
+					<span>支付宝:{{ data.data.alipay }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.tenpay!=0">
+					<span>微信:{{ data.data.tenpay }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.realty_pay!=0">
+					<span>地产转账:{{ data.data.realty_pay }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.family_pay!=0">
+					<span>世家转账:{{ data.data.family_pay }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.private_bank!=0">
+					<span>3000账号:{{ data.data.private_bank }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.cash!=0">
+					<span>现金:{{ data.data.cash }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.pos!=0">
+					<span>POS机:{{ data.data.pos }}</span>
+				</div>
+				<div class="halfDiv" v-if="data.data.other_bank!=0">
+					<span>其他:{{ data.data.other_bank }}</span>
+				</div>
+				<div class="center next" v-if="data.commited == 1">
+					<div class="halfDiv">
+						<span>提交人:{{ data.agent_name }}</span>
+					</div>
+					<div class="halfDiv" >
+						<span>{{  data.enterTime }}</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import '@/assets/js/layer041002.js';
+	export default {
+		name: '',
+		props: {
+			data: {
+				type: Object,
+				default : {
+					msg : '数据为空'
+				}
+			},
+			dataindex: {
+				type: [Number, String],
+				default: 0
+			},
+		},
+		
+		data(){
+			return {
+				dataTotalList : "" ,
+			}
+		},
+		
+		created() {
+			let _this = this;
+			
+		},
+		mounted () {
+            window.addEventListener('scroll', this.handleScroll, true);  
+             // 监听（绑定）滚轮 滚动事件
+		},
+		methods: {
+
+		},
+		computed: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	span{
+		font-size:.26rem;
+	}
+	.center {
+		width : 100%; 
+		text-align:center ; 
+	}
+	.m-t-3{
+		margin-top:.3rem;
+	}
+	.table-build{
+		width : 7.5rem;
+		text-align:center ; 
+	}
+	.table_head{
+		width : 1.67rem;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		padding-left:.36rem;
+		float:left;
+	}
+	.head_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:left;
+	}
+	.table_text {
+		width : 1.6rem ;
+		text-align:center;
+		border-right:1px solid #eeeeee;
+		float:left;
+	}
+	.table_text3 {
+		width : 1.6rem ;
+		text-align:center;
+		float:left;
+	}
+	.table_text_div{
+		width :100%;
+		padding:.24rem 0rem .24rem 0rem ;
+		text-align:center;
+	}
+	.table_tr{
+		width : 100%; 
+		overflow:hidden ;
+		border-bottom:1px solid #eeeeee;
+	}
+	.DivBox{
+		width : 100% ;
+		padding :0.18rem 0rem 0.5rem 0rem ;
+		overflow:hidden ;
+		border-bottom:1px solid #eeeeee; 
+	}
+	.halfDiv{
+		width: 3.03rem; 
+		padding : 0rem .36rem ;
+		float:left;
+		margin-top:0.12rem;
+		text-align:left;
+	}
+	.next{
+		width : 750rem!important;
+		float:left;
+	}
+	.lineDiv {
+		width:6.78rem ; 
+		height : 1px; 
+		background-color : #eeeeee;
+		margin : 0rem .36rem;
+	}
+	.noBorder {
+		border:none !important
+	}
+</style>
+
+
+<!--//http://localhost:8080/#/priceReport?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTMwNjA2ODU4fQ.8jL49CjtBMV6BqmaKdJfd4pkGBazrAgQQrutb53Z3mY-->
\ No newline at end of file

public/appnew/src/components/publicEg/entrance.vue

@@ -92,6 +92,12 @@
 					'nameCustom': '同联下载页',
 					'query': {
 					}
+				},
+				{
+					'path': '/priceReport',
+					'nameCustom': '财务日报提交/查看',
+					'query': {
+					}
 				}
 				]
 			}

public/appnew/src/router/index.js

@@ -18,6 +18,7 @@ import shopList from '@/components/shop/shopList'
 import shopSearchList from '@/components/shopSearch/shopSearchList'
 import advertisingPage from '@/components/advertisingPage/advertisingPage'
 import download from '@/components/download/download'
+import priceReport from '@/components/priceReport/priceReport'
 Vue.use(VueRouter)
 
 export default new VueRouter({
@@ -126,5 +127,11 @@ export default new VueRouter({
 			name: 'v-download',
 			component: download
 		}
+		,
+		{
+			path: '/priceReport',
+			name: 'v-priceReport',
+			component: priceReport
+		}
 	]
 })
\ No newline at end of file

public/resource/js/RemarkFollowIndex.js

@@ -95,6 +95,30 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 		        //hourStep: 1
 			});
            	$('.datetimepicker').hide();//初始化隐藏时间控件
+           	//显示 隐藏城市 默认显示 当前账号 所在城市
+			$.ajax({
+				url: '/index/getAgentGroupSite',
+				type: 'GET',
+				async: true,
+				data: {
+				},
+				dataType: 'json',
+				success: function(data) {
+					if(data.code == 200 && data.data.length != 0) {
+						var str = '<option value="">选择城市</option>';
+						$.each(data.data, function(i, item) {
+							str += '<option value="' + item.id + '">' + item.city + '</option>';
+						});
+						$(".user_city_choose_site_list").append(str);
+					}else{
+						var _str1 = '<option value="">选择城市</option>';
+						var _city = user_info_obj.city;
+						var _siteID = user_info_obj.site_id;
+						var _str =_str1 + '<option value="' + _siteID + '">' + _city+ '</option>';
+						$(".user_city_choose_site_list").append(_str);
+					}
+				}
+			});
 			
 		},
 		event: function() {
@@ -1558,6 +1582,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
             params.content = $("#follow_content").val();
 			params.user_id = $("#customer_name_id").val();//区域
 			params.agent_id = user.agent_id_phone;//跟进人 下拉式搜索
+			params.site_id = $('.user_city_choose_site_list').val();
+			
 			if($('#user_city_choose').val() == 310100){//城市
 //			   params.city = '上海市';
 			}

public/resource/js/financial_manager_daily_list.js

@@ -62,16 +62,6 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 		},
 		event: function() {
 			var _doc = $(document);
-			//主页面一级审核，二级审核，三级审核tab的点击事件
-			_doc.on('click', '.maintable-top-sub-tr>a', function(e){
-				e.preventDefault();
-				e.stopPropagation();
-				var _this = $(this);
-				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
-				bargain.mainTabIndex = _this.index();
-				console.log(bargain.mainTabIndex);
-				bargain.getList(1);
-			});
 			//店长日报 时间搜索
 			_doc.on('input', '#create_time_start', function() {
 				bargain.financialTime = $('#create_time_start').val();
@@ -81,25 +71,31 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 				}
 				bargain.getList(1);
             });
-			//搜索按钮的事件
-			_doc.on('click', '#maintable_search', function(e) {
-				e.preventDefault();
-				e.stopPropagation();
-				bargain.getList(1); //一级审核搜索
-			});
+
 			//财务日报审核 点击关闭按钮
 			_doc.on('click', '.is-close', function(e) {
 				e.preventDefault();
 				e.stopPropagation();
 				location.href='/index/dailyList'
 			});
+			//点击删除按钮 获取收款id
+			_doc.on('click', '.del-details', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+                bargain.recordid = $(this).attr("data-recordid");
+			});
+			//点击删除 删除详情
+			_doc.on('click', '#confirm_delete', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+                bargain.delDetail();;
+			});
 			//点击资料 显示图片
 			_doc.on('click', '.record-pic', function(e) {
 				e.preventDefault();
 				e.stopPropagation();
                 bargain.recordid = $(this).attr("data-recordid");
 				bargain.getPic(); 
-
 			});
             //收款详情页面
 			$(document).on('click','.add-pic',function(e){
@@ -380,14 +376,20 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 							    $('#pay_g').html(data.data.commit_info.pos);
 							    $('#pay_h').html(data.data.commit_info.other_bank);
 							    $('#pay_i').html(data.data.commit_info.agent_name);
-							    $('#pay_j').html(data.data.commit_info.daily_date);
+							    $('#pay_j').html(data.data.commit_info.create_time);
 								$('.audit-records').show();
 							    if(data.data.check_list&&data.data.check_list.length){
 								     $('#maintable_list_f').show();
 							    }else{
 								     $('#maintable_list_f').hide();
+							    };
+							    //店长财务日报 已提交 不显示删除按钮 编辑按钮 
+							    if(bargain.isFinancial*1 == 0){
+							    	$('.add-pic').hide();
+							        $('.del-details').hide();
 							    }
 							    
+								
 							}else{//未提交
 								$('.is-submit').show();
 								$('.is-submit').html('提交');
@@ -404,6 +406,13 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 							    $('#pay_h').html(data.data.total_info.other_bank);
 							    $('#pay_i').html('');
 							    $('#pay_j').html('');
+							    //店长财务日报 未提交 显示删除按钮 编辑按钮 
+							    if(bargain.isFinancial*1 == 0){
+							    	$('.add-pic').show();
+							        $('.del-details').show();
+							    }
+							    
+							    
 							    
 							}
 							//入账总计
@@ -427,10 +436,17 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 									$('.is-submit-pass-btn').hide();
 				                    $('.is-submit-passed').hide();
 				                    $('#maintable_list_total').hide();
-				                    $('.add-pic').hide();//财务日报 已审核 不显示编辑按钮
+							        if(bargain.isFinancial*1 == 1){
+				                       $('.add-pic').hide();//财务看的 财务日报 已审核 不显示编辑按钮
+				                       $('.del-details').hide();
+							        }
+
 				                    
 								}else{
-				                    $('.add-pic').show();//财务日报 没有审核完 显示编辑按钮
+							        if(bargain.isFinancial*1 == 1){
+				                       $('.add-pic').show();//财务看的 财务日报 没有审核完 显示编辑按钮
+				                       $('.del-details').show();
+									}
 									if(getUrlParam('time')){
 										$('.is-submit-pass-btn').show();
 					                    $('.is-submit-passed').show();
@@ -605,6 +621,26 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
                 }
             });
         },
+        //删除详情
+        delDetail: function() {
+            $.ajax({
+                url: '/index/delPayLog',
+                type: 'POST',
+                async: true,
+                data: {
+                	'pay_id':bargain.recordid
+                },
+                dataType: 'json',
+                success: function(data) {
+                    if(data.code == 200) {
+                    	alert('删除成功');
+                    	bargain.getList();
+                    }else{
+                    	alert(data.msg);
+                    }
+                }
+            });
+        },
         //获取收款详情
         getMoneyDetail : function(id){
 			var that = bargain;
@@ -630,6 +666,17 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 			doc.find("#tijiaoren").text(data.agent_name);
 			doc.find("#address").text(data.address);
 			doc.find("#comit_time").text(data.create_time);
+			//判断收款详情的类型
+			if(data.type == 91){
+				$('.agency_fees_type_hide').show();
+			}else{
+				$('.agency_fees_type_hide').hide();
+			};
+			if(data.type == 91 || data.type == 92){
+				$('.before_commission_hide').show();
+			}else{
+				$('.before_commission_hide').hide();
+			}
 			if (data.type == 10 ){
 				doc.find("#intoType").text('意向金');
 			} else if ( data.type == 20 ) {
@@ -657,6 +704,10 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 			} else {
 				doc.find("#intoType").text('佣金');
 			}
+			//收款详情 获取中介费类型     之前已收佣
+			doc.find("#agency_fees_type_text").val(data.type_ext);
+			doc.find("#before_commission_text").val(data.received_money);
+			
 			doc.find("#shopNo").text(data.house_number);
 			doc.find("#intoDate").val(data.income_time);
 	 		doc.find("#salePrice").text(data.price+"元");
@@ -797,7 +848,18 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 				if ( $('#shoutiao').val()){
 					params.receipt_number = $('#shoutiao').val()
 				}
+			};
+			//判断是否是 案场费
+			if ($('#intoType').text() == '中介费'){
+				params.type_ext = $('#agency_fees_type_text').val()
+			};	
+			//判断是否是 案场费 中介费
+			if ($('#intoType').text() == '案场费' || $('#intoType').text() == '中介费'){
+				if ($('#before_commission_text').val()){
+				    params.received_money = $('#before_commission_text').val();
 				}
+				params.type_ext = $('#agency_fees_type_text').val()
+			};
 			return params ; 
 		},
         
@@ -805,7 +867,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 	return bargain;
 });
 
-var sw=function(s){switch(Number(s)){case 10:return"施总支付宝";case 11:return"林老师支付宝";case 20:return"施总微信";case 21:return"林老师微信";case 30:return"POS机器";case 40:return"地产转账";case 41:return"世家公账";case 42:return"3000账号";case 50:return"现金";case 60:return"其他";default:return s}}; 
+var sw=function(s){switch(Number(s)){case 10:return"施总支付宝";case 11:return"林老师支付宝";case 12:return"筠姐支付宝";case 20:return"施总微信";case 21:return"林老师微信";case 22:return"筠姐微信";case 30:return"POS机器";case 40:return"地产转账";case 41:return"世家公账";case 42:return"3000账号";case 50:return"现金";case 60:return"其他";case 70:return"银满谷银行卡";default:return s}}; 
 
 var swtype=function(s){switch(Number(s)){case 1:return"意向金转中介费";case 2:return"意向金转案场费";case 3:return"意向金转意向金";case 4:return"保管金转中介费";case 5:return"保管金转案场费";case 6:return"保管金转保管金";case 7:return"意向金转保管金";default:return s}}; 
 

public/resource/js/getCollection.js

@@ -47,7 +47,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 	            	$('.intoIdArea').hide();
 	            	$('.reportArea').hide();
 	            }
-	        })
+	        });
 			
 			// 初始化界面
 			$('.pic-con2').show();
@@ -148,7 +148,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				e.stopPropagation();
 				$(this).parent().remove();
 			});
+			//收款列表 调整页面 加中介费类型
+			$("#change_type").change(function() {
+				//中介费类型显示 隐藏 中介费
+				if($('#change_type').val() == 91){
+					$('#agency_fees_type_div').show();
+				}else{
+					$('#agency_fees_type_div').hide();
+				};
+				//之前收佣 显示隐藏 中介费 案场费
+				if($('#change_type').val() == 91 || $('#change_type').val() == 92){
+					$('#before_commission_div').show();
+				}else{
+					$('#before_commission_div').hide();
+				}
+				
 				
+			});
 			//图片删除，已有的则调用接口删除
 			_doc.on('click', '.span-del2', function(e) {
 				var _this = $(this);
@@ -317,6 +333,19 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 					$('.baoguanjin').show();
 				}
 				that.yetai = "" ;
+				//点击调整的时候 初始化调整页面的 中介费类型 之前已收佣
+				//中介费类型显示 隐藏 中介费
+				if($('#change_type').val() == 91){
+					$('#agency_fees_type_div').show();
+				}else{
+					$('#agency_fees_type_div').hide();
+				};
+				//之前收佣 显示隐藏 中介费 案场费
+				if($('#change_type').val() == 91 || $('#change_type').val() == 92){
+					$('#before_commission_div').show();
+				}else{
+					$('#before_commission_div').hide();
+				};
 //				that.changeType(order_id);
 			});
 			
@@ -355,6 +384,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			})
 			
 			$("#modal-back").on("hidden.bs.modal", function(event){
+				$('#before_commission').val("0");//调整页面 之前已收佣 0
+				$('#agency_fees_type').val("0");//调整页面 中介费 0
+				
 				$('#change_price').val("0");
 				$('#report_id_change').val("");
 				$('#into_id_change').val("");
@@ -877,6 +909,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				'income_time' : that.income_time ,
 				'pay_id' : that.pay_id ,
 				'transfer_name' : that.transfer_name
+				
 			};
 			
 			var obj = {
@@ -886,6 +919,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				obj.type = $('#change_type').val();//that.type_num;
 				//$('#change_type').val()
 			};
+			//提交调整 案场费 中介费 之前已收佣 中介费类型
+			if($('#change_type').val() == 91 || $('#change_type').val()==92){
+				params.received_money=$('#before_commission').val();
+				params.type_ext=$('#agency_fees_type').val();
+				
+			};
+			if($('#change_type').val() == 91){
+				params.type_ext=$('#agency_fees_type').val();
+			}
 			//拼接jsonArray to jsonObject
 			if ($('#change_price').val()){//调整金额
 				if ( $('#change_price').val() > 0 ){
@@ -1006,6 +1048,18 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 					params.receipt_number = $('#shoutiao').val()
 				}
 			}
+			//判断是否是 案场费
+			if ($('#intoType').text() == '中介费'){
+				params.type_ext = $('#agency_fees_type_text').val()
+			};	
+			//判断是否是 案场费 中介费
+			if ($('#intoType').text() == '案场费' || $('#intoType').text() == '中介费'){
+				if ($('#before_commission_text').val()){
+				    params.received_money = $('#before_commission_text').val();
+				}
+				params.type_ext = $('#agency_fees_type_text').val()
+			};	
+		
 			return params ; 
 		},
 		
@@ -1213,6 +1267,17 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			doc.find("#tijiaoren").text(data.agent_name);
 			doc.find("#address").text(data.address);
 			doc.find("#comit_time").text(data.create_time);
+			//判断收款详情的类型
+			if(data.type == 91){
+				$('.agency_fees_type_hide').show();
+			}else{
+				$('.agency_fees_type_hide').hide();
+			};
+			if(data.type == 91 || data.type == 92){
+				$('.before_commission_hide').show();
+			}else{
+				$('.before_commission_hide').hide();
+			}
 			if (data.type == 10 ){
 				doc.find("#intoType").text('意向金');
 			} else if ( data.type == 20 ) {
@@ -1240,6 +1305,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			} else {
 				doc.find("#intoType").text('佣金');
 			}
+			//收款详情 获取中介费类型     之前已收佣
+			doc.find("#agency_fees_type_text").val(data.type_ext);
+			doc.find("#before_commission_text").val(data.received_money);
+			
 			doc.find("#shopNo").text(data.house_number);
 			doc.find("#intoDate").val(data.income_time);
 	 		doc.find("#salePrice").text(data.price+"元");

public/resource/js/houseList.js

@@ -932,7 +932,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				data: {
 					"houses_id": business.house_id, //楼盘Id
 					"is_exclusive_type": $("#sel_dujia").val(), //是否独家
-					"exclusive_id": business.exclusive_id, //经纪人id
+					"exclusive_ids": business.exclusive_id, //经纪人id
 					"agent_start_time": $("#start_date_dujia").val(), //开始时间
 					"agent_end_time": $("#end_date_dujia").val(), //结束时间
 					"exclusive_img": images ,//独家图片

public/resource/js/login.js

@@ -182,4 +182,5 @@ $(function() {
 		});
 	};
 
+	$("#username").focus();
 });
\ No newline at end of file

public/resource/js/public.js

@@ -148,7 +148,11 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
 	_doc.on('click', '.J_preview', function(e){
 		e.preventDefault();
 		e.stopPropagation();
+		if($(this).hasClass('no-scroll-page-img')){
+			
+		}else{
 			$.openPhotoGallery(this);
+		};
 	});
 });
 var ServerHost = location.origin;

public/resource/js/user_genjing_modal.js

@@ -1378,6 +1378,13 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + follow_status + dealPunctuation(item.content) + user_status +'</td><td>' + item.name + '</td><td>' + item.create_time +'</td></tr>';	
 							
 						});
+						if(data.data.length<10){//第一个接口 数据条数小于10 加载第二个接口
+				            user.isExitsNewInfo=0;
+							user.isExitsNew = 1;
+						    //数据为空 num 置1
+						    user.pageNoUser=1;
+						    user.getGenjincontwo();
+						};
 						if(caozuo_table){
 						        $("#caozuo_table2").append(caozuo_table);
 						}else{
@@ -1388,7 +1395,7 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 //						$('.follow-up-modal-list-area').scrollTop(0);
 						
 					}else{
-						    user.isExitsNew = 1;
+						    user.isExitsNew = 1;//第一个接口的数据为空 调第二个接口
 						    //数据为空 num 置1
 						    user.pageNoUser=1;
 						    user.getGenjincontwo();

public/resource/lib/js/jquery-photo-gallery/jquery.photo.gallery.js

@@ -79,22 +79,12 @@ $.fn.extend({
 		$prev.on('click',function(){
       		if(o.activeIndex > 0) o.activeIndex--;
   			toggleImage();	
-      	}).on("mouseover",function(e){
-      		if(o.activeIndex > 0)
-  	   			$(this).addClass("active");
-  	  	}).on("mouseout",function(e){
-  			$(this).removeClass("active"); 
       	});	 
   	  
   	  	//下一张
       	$next.on('click',function(){
       		if(o.activeIndex < o.imgs.length -1) o.activeIndex++;
       		toggleImage();
-      	}).on("mouseover",function(e){
-      		if(o.activeIndex < o.imgs.length -1)
-  	   			$(this).addClass("active");
-  	 	}).on("mouseout",function(e){
-  	  		$(this).removeClass("active"); 
       	});
        
   	  	//缩略图
@@ -340,7 +330,7 @@ $.fn.extend({
 		
 	  	function init(){
   	    	toggleImage();
-  	    
+  	    	console.log(o);
   	    	$(o.imgs).each(function(i, img){
 	  	    	$(o.template.IMAGE)
 	  	    		.appendTo($gallery)
@@ -351,11 +341,7 @@ $.fn.extend({
 				  	 	height : img.imgHeight,
 				  	 	left : (cW - img.imgWidth)/2,
 				  	 	top: (cH - img.imgHeight)/2
-			  	}).on("dblclick", function(){
-				  	var _parent =  window.parent || window.top,
-						_jg = _parent.document.getElementById("J_pg");
-					$(_jg).remove();
-				}); ;
+			  	});
 	  	    });
   	    	$image = $(".image[index='"+o.activeIndex+"']", $gallery).addClass("active");
 	  	}
@@ -545,7 +531,6 @@ $.fn.extend({
 $.extend({
 	//打开图片查看器
 	openPhotoGallery : function(obj){
-
 		var $img = $(obj),
   			imgUrl = $img[0].src;
 		if(!imgUrl) return;
@@ -558,18 +543,69 @@ $.extend({
 			wH = 415,
 			wW = 615;
 			
-		if(imgWidth>1000){
-			imgWidth = 1000;
-			imgHeight = 1000/ratio;
+		var $gallerys = $(obj).closest(".modal-body"),
+			activeIndex=0;
+		var imgs = [];
+		
+		var _tempImgList = $gallerys.find(".J_preview");
+		
+		if(_tempImgList.length == 0){
+			$gallerys = $(obj).closest("#preview_big_img_ol");
+			_tempImgList = $gallerys.find(".J_preview");
+		};
+		
+		_tempImgList.each(function(i, elem){
+			var url = this.src,
+				img = $(this)[0],
+				nH = img.naturalHeight,
+				nW = img.naturalWidth,
+				ratio  = nW / nH,
+				w = nW,
+				h = nH;
+				
+			
+				
+			if(url == imgUrl){
+				activeIndex = i;
+				w = imgWidth;
+				h = imgHeight;
+			}else{
+				if(nW > wW) {
+					w = wW;
+					nH = h = Math.ceil(w / ratio);
+					if( h > wH){
+						nH = h = wH;
+						w = Math.ceil(h * ratio);
 					}
+				}	
+				if(nH > wH) {
+					h = wH;
+					w = Math.ceil(h * ratio);
+					if( w > wW){
+						w = wW;
+						h = Math.ceil(w / ratio);
+					}
+				}	
+			}
+			
+			if(w>1000){
+				w = 1000;
+				h = 1000/ratio;
+			};
+			if(h>800){
+				h = 800;
+				w = h*ratio;
+			};
+			imgs.push({
+				url: url, 
+				imgHeight : h,
+				imgWidth : w
+			});
+			
+		});
 		
-		var imgs = [{
-			url: imgUrl, 
-			imgHeight : imgHeight,
-			imgWidth : imgWidth
-		}];
-		console.log(imgs);
 		localStorage["photoGalleryImgs"] = JSON.stringify(imgs); //因为此字符串可能是base64字符，appgo无法传
+		localStorage["photoGalleryActiveIndex"] = activeIndex; 
 		
 		$("#J_pg").remove();
 		$("<iframe></iframe").appendTo("body")
@@ -590,7 +626,7 @@ $.extend({
 	//做初始化
 	initGallery : function(){
  
-        var activeIndex = 0,
+        var activeIndex = localStorage["photoGalleryActiveIndex"],
         	imgs = JSON.parse(localStorage["photoGalleryImgs"]);
         
 		localStorage.removeItem("photoGalleryActiveIndex");
@@ -607,13 +643,14 @@ $.extend({
 			$(_jg).remove();
 		});
 		
-		$('.oper').attr('title', '双击图片关闭，或者右上角关闭，滚动鼠标可放大').dblclick(function(e){
-			if(e.target.tagName !== 'IMG'){
-				var _parent =  window.parent || window.top,
-					_jg = _parent.document.getElementById("J_pg");
-				$(_jg).remove();
-			}
-		});
+		$('.oper').attr('title', '右上角可关闭，滚动鼠标可放大');
+//		$('.oper').attr('title', '双击图片关闭，或者右上角关闭，滚动鼠标可放大').dblclick(function(e){
+//			if(e.target.tagName !== 'IMG'){
+//				var _parent =  window.parent || window.top,
+//					_jg = _parent.document.getElementById("J_pg");
+//				$(_jg).remove();
+//			}
+//		});
 	}
 });
   

public/resource/lib/js/jquery-photo-gallery/photoGallery.css

@@ -219,7 +219,7 @@ i{
     right: 0;
     bottom: 0;
 }
-.gallery .oper{
+/*.gallery .oper{
     position: absolute;
     top: 0;
     bottom: 0;
@@ -227,9 +227,19 @@ i{
     left: 0;
     margin: 62px 0 0;
     z-index: 99999;
+}*/
+.gallery .oper{
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    margin: auto;
+    height: 38px;
+    z-index: 99999;
 }
 .gallery .oper i{
-    display: none;
+    /*display: none;*/
     cursor: pointer;
 }
 .gallery .oper span{
@@ -239,12 +249,12 @@ i{
 .gallery .oper .prev{
 	float:left;
 	margin-left: 9px;
-	display: none;
+	/*display: none;*/
 }
 .gallery .oper .next{
 	float:right;
 	margin-right: 9px;
-	display: none;
+	/*display: none;*/
 }
 .gallery .oper .prev.active i, .gallery .oper .next.active i{
 	display: inline-block;

public/resource/template/adjustment_template_tpl.html

@@ -30,7 +30,10 @@
         <td>
         	<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
         	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
+            [% if(check_auth('index/adjustment')) { %]
             <a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>撤销调整</a>
+        	[% } %]
+            
         </td>
     </tr>
     [% } %]

public/resource/template/agent_template_tpl.html

@@ -6,7 +6,7 @@
         <td class="text-center">[%= it[item]["id"] %]</td>
         <td class="text-center">
             <input type="hidden" value='[%= it[item]["agent_img"] %]'>
-            <img src='[%= it[item]["agent_img"] %]' class="diagram-image J_preview"
+            <img src='[%= it[item]["agent_img"] %]' class="diagram-image J_preview no-scroll-page-img"
                  data-bimg='[%= it[item]["agent_img"] %]'>
         </td>
         <!--<td>[%= it[item]["level"] %]</td>-->

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -10,6 +10,7 @@
         <td>[%= it[item]['price']%]</td>
         <td>[%= (it[item]['price']*0.7).toFixed(2) %]</td>
         <td>[%= it[item]['money']%]</td>
+        <td>[%= it[item]['received_money']%]</td>
         <td>[%= (it[item]['money']*1 - (it[item]['price']*0.7)).toFixed(2) %]</td>
         <td>[%= sw(it[item]['pay_type'])%]</td>
 		<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
@@ -20,6 +21,9 @@
         <td>
         	<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
         	<a class="btn1 btn-info add-pic" href="#modal-addPic" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>
+        	[% if(check_auth('index/delPayLog')) { %]
+            <a class="btn1 btn-info del-details" href="#modal-delete" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">删除</a>
+        	[% } %]
         </td>
     </tr>
     [% } %]
@@ -39,6 +43,7 @@
         <td>[%= it[item]['house_address'] %]</td>
         <td>[%= it[item]['price']%]</td>
         <td>[%= it[item]['money']%]</td>
+        <td>[%= it[item]['received_money']%]</td>
         <td>[%= sw(it[item]['pay_type']) %]</td>
 		<td>[% if(it[item]["transfer_name"] != null) { %] [%= it[item]["transfer_name"] %] [% } %]</td>
         <td>[%= it[item]['agent_name']%]</td>
@@ -49,6 +54,9 @@
         <td>
         	<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
         	<a class="btn1 btn-info add-pic" href="#modal-addPic" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>
+        	[% if(check_auth('index/delPayLog')) { %]
+            <a class="btn1 btn-info del-details" href="#modal-delete" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">删除</a>
+        	[% } %]
         </td>
     </tr>
     [% } %]
@@ -76,6 +84,9 @@
         <td>
         	<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
         	<a class="btn1 btn-info add-pic" href="#modal-addPic" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>
+        	[% if(check_auth('index/delPayLog')) { %]
+            <a class="btn1 btn-info del-details" href="#modal-delete" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">删除</a>
+        	[% } %]
         </td>
     </tr>
     [% } %]
@@ -102,6 +113,10 @@
         <td>
         	<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">资料</a>
             <a class="btn1 btn-info add-pic" href="#modal-addPic" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>	
+            [% if(check_auth('index/delPayLog')) { %]
+            <a class="btn1 btn-info del-details" href="#modal-delete" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">删除</a>
+        	[% } %]
+            
         </td>
     </tr>
     [% } %]