解决冲突

application/api/controller/Member.php

@@ -243,15 +243,6 @@ class Member extends Basic
                     if ($this->request->param('code') == $code && $code != '') {
                         $referrer_source = $this->request->param('referrer_source');
                         $referrer_id     = $this->request->param('referrer_id');
-<<<<<<< HEAD
-
-                        if ($referrer_source == 20) {
-                            //经纪人id 计算佣金的字段
-                            $insert_data['agent_id']  = $referrer_id;
-                        }
-
-                        $insert_data['referrer_id']     = $referrer_id;
-=======
 
                         if ($referrer_source == 20) {
                             //经纪人id 计算佣金的字段
@@ -275,7 +266,7 @@ class Member extends Basic
                             }
                             $insert_data['referrer_id'] = $referrer_id;
                         }
->>>>>>> test-hujun1.15-111
+
                         $insert_data['referrer_source'] = $referrer_source;
                         $insert_data['status'] = 0;
                         $insert_data['create_time'] = $date;

application/api_broker/controller/FollowUp.php

 <?php
-<<<<<<< HEAD
-
-use app\api_broker\extend\Basic;
-=======
 namespace app\api_broker\controller;
 
 use app\api_broker\extend\Basic;
 use app\api_broker\service\FollowUpService;
->>>>>>> test-hujun1.15-111
 
 /**
  * Created by PhpStorm.
@@ -16,13 +11,7 @@ use app\api_broker\service\FollowUpService;
  * Time : 14:24
  * Intro:
  */
-<<<<<<< HEAD
 
-class FollowUp extends Basic{
-    public function __construct($request = null)
-    {
-        parent::__construct($request);
-=======
 class FollowUp extends Basic
 {
     private $service_;
@@ -32,23 +21,10 @@ class FollowUp extends Basic
         parent::__construct($request);
         $this->service_ = new FollowUpService();
         $this->followUpModel = new OFollowUp();
->>>>>>> test-hujun1.15-111
     }
 
     /**
      * 报备
-<<<<<<< HEAD
-     */
-    public function report(){
-        $params = $this->params;
-        $params = array(
-            "user_id" => 1,
-            "shop_ids"=> "1,2,3",
-            ""
-        );
-
-        $this->response("200","request success",[]);
-=======
      * @return \think\Response
      */
     public function report()
@@ -74,7 +50,5 @@ class FollowUp extends Basic
         }else{
             return $this->response("101", "request faild");
         }
-
->>>>>>> test-hujun1.15-111
     }
 }
\ No newline at end of file

application/chat/service/ChatService.php

@@ -18,13 +18,10 @@ use app\model\ChatMsgExt;
 use app\model\ChatMsgStatus;
 use app\model\ChatRelation;
 use app\model\ChatUser;
-<<<<<<< HEAD
+
 use app\model\HouseInfos;
 use app\model\Users;
 use http\Exception;
-=======
-use app\model\Users;
->>>>>>> test-hujun1.15-111
 
 class ChatService
 {
@@ -109,11 +106,7 @@ class ChatService
                 $userResult = $this->userModel->selectUser($userId);
 
                 if ($userResult->id)
-<<<<<<< HEAD
                     $onlyId = self::SOURCE_TYPE_APP . $userResult->id;
-=======
-                    $onlyId = self::SOURCE_TYPE_APP . $userId;
->>>>>>> test-hujun1.15-111
                 break;
         }
         if (!$onlyId) {
@@ -150,9 +143,10 @@ class ChatService
      * @param $accessToken
      * @return bool
      */
-<<<<<<< HEAD
     public function sendMsg($user_name,$target_type, $target, $source, $is_user, $type, $msg_content, $from, $accessToken)
     {
+
+
         //fixme 之后扩展 此处有bug
         /*      if ($type == 3) {
                   try {
@@ -175,30 +169,6 @@ class ChatService
 
         //todo 消息接收人必须是数据
         $rPush->send($user_name,$target_type, [ $target ], $msg_content, $from, $type, $accessToken, [ $this, 'saveSendStatus' ]);
-=======
-    public function sendMsg($target_type, $target,$source,$is_user, $type, $msg_content, $from, $accessToken)
-    {
-        switch ($target_type) {
-            case self::MSG_TYPE_USERS:
-                //todo 判断用户是否存在
-                break;
-            case self::MSG_TYPE_CHAT_GROUPS:
-                //todo 判断组群是否存在
-                break;
-            case self::MSG_TYPE_CHAT_CHAT_ROOMS:
-                //todo 判断聊天室是否存在
-                break;
-            default:
-                return [ "code" => 101, "msg" => "消息类型错误" ];
-        }
-        //todo
-        $this->insertMsg($target_type, $target,$source,$is_user, $type, $msg_content, $from);
-        $rPush = new RPush();
-
-        //todo 消息接收人必须是数据
-        $rPush->send($target_type, $target, $type, $msg_content, $from, $accessToken, [ $this, 'saveSendStatus' ]);
->>>>>>> test-hujun1.15-111
-        //返回消息发送成功
         return true;
     }
 
@@ -206,17 +176,10 @@ class ChatService
      * 保存推送到环信的消息状态 往msg_status中插入数据
      * @param $response
      * @param $target
-<<<<<<< HEAD
-     * @param $from
-     * @param $msg_content
-     */
-    public function saveSendStatus($response, $target, $from, $msg_content)
-=======
      * @param $sender
      * @param $msg_content
      */
-    public function saveSendStatus($response, $target, $sender, $msg_content)
->>>>>>> test-hujun1.15-111
+    public function saveSendStatus($response, $target, $from, $msg_content)
     {
         $response = json_decode($response, true);
         //目前没有针对多人聊天

application/index/view/member/member.html

-<<<<<<< HEAD
-
-<!DOCTYPE html>
-<html lang="en-us">
-<head>
-    <link rel="icon" href="/favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-    {include file="global/header_tpl" /}
-    <link rel="stylesheet" href="/resource/css/bootstrap.css" type="text/css" />
-    <link rel="stylesheet" href="/resource/css/public.css" type="text/css" />
-    <link rel="stylesheet" href="//qidian.gtimg.com/lulu/theme/peak/css/common/ui/Pagination.css">
-    <link rel="stylesheet" href="/resource/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="/resource/css/bootstrap-datetimepicker.min.css">
-    <title>同联商业</title>
-</head>
-<body>
-
-<div class="navbar" style="background: #ff9419 !important;">
-    <div class="container-fluid">
-        <a class="brand">
-            <i><img src="/resource/image/houtai_footer_icon1.png" class="houtai_footer_icon1"></i>
-            <span class="hidden-phone">同联商业后台管理中心</span>
-        </a>
-    </div>
-    <div class="dropdown">
-        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-            管理员vip
-            <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-            <li><a href="#">修改密码</a></li>
-            <li role="separator" class="divider"></li>
-            <li><a href="/index/logout">退出登录</a></li>
-        </ul>
-    </div>
-</div>
-=======
 <!DOCTYPE html>
 <html lang="en-us">
 <head>
@@ -182,6 +145,5 @@
 </nav>
 
 <script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=123' charset='utf-8'></script>
->>>>>>> test-hujun1.15-111
 </body>
 </html>
\ No newline at end of file

application/model/BaseModel.php

 <?php
 /**
  * Created by PhpStorm.
-<<<<<<< HEAD
- * User: fuju
-=======
  * User: fu ju
->>>>>>> test-hujun1.15-111
  * Date: 2018/1/17
  * Time: 15:44
  */

build.php

@@ -22,17 +22,9 @@ return [
         'view'       => ['index/index'],
     ],*/
     // 其他更多的模块定义
-<<<<<<< HEAD
-    'chat'     => [
-        '__file__'   => ['common.php'],
-        '__dir__'    => ['behavior', 'controller', 'service', 'utils'],
-        'controller' => ['Index'],
-        'service'    => ['IndexService'],
-=======
     'api-broker'     => [
         '__file__'   => ['common.php'],
         '__dir__'    => ['behavior', 'controller','service','utils'],
         'controller' => ['Index'],
->>>>>>> test-hujun1.15-111
     ],
 ];