stanley-king 6 jaren geleden
bovenliggende
commit
9cef142e93

+ 6 - 5
helper/room/room_processor.php

@@ -316,12 +316,12 @@ class room_processor implements IProcessor
         elseif($type === proto_type::push_notify) {
             $pushid = 2;
             $msg_type = proto_type::msg_type_nofity;
-            $send = $msg;
+            $send[] = $msg;
         }
         elseif($type === proto_type::push_apply) {
             $pushid = 3;
             $msg_type = proto_type::msg_type_apply;
-            $send = $msg;
+            $send[] = $msg;
         }
         else {
             return $this->error(errcode::ErrParamter);
@@ -333,12 +333,13 @@ class room_processor implements IProcessor
 
             $orgmsg = json_encode($content);
             foreach ($users as $user) {
-                $mod_room->addRoomMsg(['room_id' => 0,'member_id' => $user, 'type' => $msg_type,'msg' => $msg, 'orgmsg' => $orgmsg, 'add_time' => time(),'msg_type' => 1]);
+                $msgid = $mod_room->addRoomMsg(['room_id' => 0,'member_id' => $user, 'type' => $msg_type,'msg' => $msg, 'orgmsg' => $orgmsg, 'add_time' => time(),'msg_type' => 1]);
+                $send['msgid'] = $msgid;
+                $send['send_time'] = time();
+                $this->write_push_users($pushid,$users,$send);
             }
         }
 
-        $this->write_push_users($pushid,$users,$send);
-
         return $this->success(NULL);
     }
 

+ 2 - 3
helper/url_helper.php

@@ -16,8 +16,7 @@ class url_helper
         $data = util::encrypt_data($member_id);
         $data = urlencode($data);
         $relay_id = session_helper::share_id();
-
-        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=member&member_id={$data}&relay_id={$relay_id}";
+        $url = BASE_SITE_URL . "/mobile/index.php?act=user_index&op=index&member_id={$data}&relay_id={$relay_id}";
         return $url;
     }
 
@@ -108,7 +107,7 @@ class author_url
         $data = urlencode($data);
         $relay_id = session_helper::relay_id();
 
-        $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=member&member_id={$data}&relay_id={$relay_id}";
+        $url = BASE_SITE_URL . "/mobile/index.php?act=user_index&op=index&member_id={$data}&relay_id={$relay_id}";
         return $url;
     }
 

+ 3 - 118
mobile/control/index.php

@@ -6,7 +6,6 @@
  *
  */
 
-use bonus\account;
 
 defined('InShopNC') or exit('Access Invalid!');
 
@@ -68,48 +67,6 @@ class indexControl extends specialControl
         return self::outsuccess(['direct_uri' => BASE_SITE_URL . '/hfive/inoherb/index.html?2'],"redirect");
     }
 
-    public function memberOp()
-    {
-        $idol = $_GET['member_id'];
-        if(empty($idol)) {
-            return self::outerr(errcode::ErrParamter);
-        }
-
-        $memkey = urldecode($idol);
-        $relay_id = intval(util::decrypt_data($memkey));
-
-        if(session_helper::need_wechat_author()) {
-            $author = new thrid_author\wxauthor();
-            $url = BASE_SITE_URL . "/mobile/index.php?act=index&op=member&member_id={$idol}&relay_id={$relay_id}";
-            $url = $author->enter($url);
-            return self::outsuccess(['direct_uri' => $url],"redirect");
-        }
-
-        if(session_helper::logined() == false || wechat_helper::invite_bonus_tag())
-        {
-            if(wechat_helper::invite_bonus_tag()) {
-                wechat_helper::clear_invite_bonus();
-            }
-
-            $type_sn = account_helper::invite_bonus($relay_id);
-            if($type_sn == false) {
-                return self::outerr(errcode::ErrBonus,"生成邀请红包失败.");
-            }
-            else {
-                $ref_url = url_helper::bonus_open_url($type_sn);
-                return self::outsuccess(['direct_uri' => $ref_url],"redirect");
-            }
-        }
-        else {
-            $myself = session_helper::memberid();
-            $relateion = new \relation\mem_relation($myself);
-            $isfriend =  $relateion->is_follower($relay_id);
-
-            return self::outsuccess(array('info' => new member_info($relay_id),'is_friend' => $isfriend),"member/index",'wap');
-        }
-    }
-
-
     public function room_inviteOp()
     {
         $room_id = intval($_GET['room_id']);
@@ -168,8 +125,8 @@ class indexControl extends specialControl
     {
         $type = 3;
         $apply_id   = intval($_GET['apply_id']);
-        $from_type = intval($_GET['from_type']);
-        $relay_id = intval($_GET['relay_id']);
+        $from_type  = intval($_GET['from_type']);
+        $relay_id  = intval($_GET['relay_id']);
 
         if($apply_id >0)
         {
@@ -233,76 +190,4 @@ class indexControl extends specialControl
 
         return self::outsuccess(["type"=>$type,"common_rooms"=>count($intersect),"is_friend"=>$is_friend,"from_type"=>$from_type,"visitor_info"=>$visitor_info,"member_info"=>$member_info],"/talk/member_detail");
     }
-}
-
-class tpl_member
-{
-    private $mOutput;
-    private $mInfo;
-    private $mIsFriend;
-    private $mPred;
-    public function __construct($output)
-    {
-        $this->mOutput = $output;
-        $this->mInfo = $this->mOutput['info'];
-        $this->mIsFriend = $this->mOutput['is_friend'];
-        $userid = $this->mInfo->member_id();
-        $this->mPred = new account($userid);
-    }
-
-    public function output_group()
-    {
-        $amount = $this->mPred->total_bonus();
-        $amount = intval($amount * 100 + 0.5) / 100;
-        $discount = $this->mInfo->discount_self();
-        $discount = intval($discount * 100 + 0.5) / 100;
-
-        $result = "<div class=\"cell\">
-            <span class=\"cell_label\">红包余额</span><span class=\"cell_content\"><span class=\"letter_pro\">$amount</span>元</span>
-        </div>
-        <div class=\"cell\">
-            <span class=\"cell_label\">累计节省</span><span class=\"cell_content\"><span class=\"letter_pro\">$discount</span>元</span>
-        </div>";
-
-        if(!session_helper::isapp()) {
-            $from = '<div class="cell">
-                <span class="cell_label">信息来源</span><span class="cell_content">来自扫一扫</span>
-            </div>';
-            $result .= $from;
-        }
-        return $result;
-    }
-
-    public function output_btn()
-    {
-        $is_friend = $this->mOutput['is_friend'];
-        if(!session_helper::isapp())
-        {
-
-            $result = '<div class="submit">';
-            if($is_friend) {
-                $result .= '<p class="cell_label">你已经是他的粉丝了</p>';
-            } else {
-                $result .= '<button type="button" id="btn_add_friend" class="add_friend_btn">关注</button>';
-            }
-            $result .= '</div>';
-        }
-        else
-        {
-            $result =  '<div class="submit">
-                            <button type="button" id="btn_thief_bonus" class="add_friend_btn">偷一点</button>
-                        </div>
-                        <div class="submit">
-                            <button type="button" id="btn_send_bonus" class="send_bonus_btn">发红包</button>
-                        </div>';
-
-            if(!$is_friend) {
-                $result .= '<div class="submit">';
-                $result .= '<button type="button" id="btn_add_friend" class="add_friend_btn">关注</button>';
-                $result .= '</div>';
-            }
-        }
-
-        return $result;
-    }
-}
+}

+ 0 - 37
mobile/control/member_index.php

@@ -1,37 +0,0 @@
-<?php
-/**
- * 我的商城
- *
- *
- *
- *
- * by 33hao.com 好商城V3 运营版
- */
-
-//use Shopnc\Tpl;
-
-defined('InShopNC') or exit('Access Invalid!');
-
-require_once (BASE_ROOT_PATH . '/mobile/control/member_relation.php');
-
-
-class member_indexControl extends member_relationControl
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function indexOp()
-    {
-//        $member_info = array();
-//        $member_info['user_name'] = $_SESSION['member_name'];
-//        $member_info['avator'] = getMemberAvatarForID($_SESSION['member_id']);
-//        $member_info['point'] = $_SESSION['member_points'];
-//        $member_info['predepoit'] = $_SESSION['available_predeposit'];
-//        //v3-b11 显示充值卡
-//        $member_info['available_rc_balance'] = $_SESSION['available_rc_balance'];
-//
-//        output_data(array('member_info' => $member_info));
-    }
-}

+ 155 - 0
mobile/control/user_index.php

@@ -0,0 +1,155 @@
+<?php
+/**
+ * 我的商城
+ *
+ *
+ *
+ *
+ * by 33hao.com 好商城V3 运营版
+ */
+
+//use Shopnc\Tpl;
+
+defined('InShopNC') or exit('Access Invalid!');
+
+require_once(BASE_ROOT_PATH . '/mobile/control/member_relation.php');
+require_once(BASE_ROOT_PATH . '/helper/goods_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/special_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/index_tab.php');
+require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/third_author/wxauthor.php');
+require_once(BASE_ROOT_PATH . '/mobile/control/special.php');
+require_once(BASE_ROOT_PATH . '/helper/third_author/wxauthor.php');
+require_once(BASE_ROOT_PATH . '/helper/session_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/url_helper.php');
+
+
+class user_indexControl extends mobileHomeControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function indexOp()
+    {
+        if(empty($_GET['member_id'])) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        $memkey = urldecode($_GET['member_id']);
+        $idolid = intval(util::decrypt_data($memkey));
+        if($idolid <= 0) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        if(session_helper::need_wechat_author()) {
+            $author = new thrid_author\wxauthor();
+            $url = url_helper::member_index($idolid);
+            $url = $author->enter($url);
+            return self::outsuccess(['direct_uri' => $url],"redirect");
+        }
+
+        $minfo = new member_info($idolid);
+        if(session_helper::logined() == false)
+        {
+            if(session_helper::isapp()) {
+
+            }
+            else
+            {
+                if(wechat_helper::invite_bonus_tag()) {
+                    wechat_helper::clear_invite_bonus();
+                }
+
+                $type_sn = account_helper::invite_bonus($idolid);
+                if($type_sn == false) {
+                    return self::outerr(errcode::ErrBonus,"生成邀请红包失败.");
+                }
+                else {
+                    $ref_url = url_helper::bonus_open_url($type_sn);
+                    return self::outsuccess(['direct_uri' => $ref_url],"redirect");
+                }
+            }
+        }
+        else
+        {
+            $relateion = new relation\mem_relation(session_helper::memberid());
+            $isfriend =  $relateion->is_follower($idolid);
+            return self::outsuccess(['member_info' => $minfo->filter(),'is_friend' => $isfriend,'from_type' => 'qrcode'],
+                "member/index",'wap');
+        }
+    }
+}
+
+class tpl_member
+{
+    private $mOutput;
+    private $mInfo;
+    private $mIsFriend;
+    private $mPred;
+    public function __construct($output)
+    {
+        $this->mOutput = $output;
+        $this->mInfo = $this->mOutput['info'];
+        $this->mIsFriend = $this->mOutput['is_friend'];
+        $userid = $this->mInfo->member_id();
+        $this->mPred = new bonus\account($userid);
+    }
+
+    public function output_group()
+    {
+        $amount = $this->mPred->total_bonus();
+        $amount = intval($amount * 100 + 0.5) / 100;
+        $discount = $this->mInfo->discount_self();
+        $discount = intval($discount * 100 + 0.5) / 100;
+
+        $result = "<div class=\"cell\">
+            <span class=\"cell_label\">红包余额</span><span class=\"cell_content\"><span class=\"letter_pro\">$amount</span>元</span>
+        </div>
+        <div class=\"cell\">
+            <span class=\"cell_label\">累计节省</span><span class=\"cell_content\"><span class=\"letter_pro\">$discount</span>元</span>
+        </div>";
+
+        if(!session_helper::isapp()) {
+            $from = '<div class="cell">
+                <span class="cell_label">信息来源</span><span class="cell_content">来自扫一扫</span>
+            </div>';
+            $result .= $from;
+        }
+        return $result;
+    }
+
+    public function output_btn()
+    {
+        $is_friend = $this->mOutput['is_friend'];
+        if(!session_helper::isapp())
+        {
+
+            $result = '<div class="submit">';
+            if($is_friend) {
+                $result .= '<p class="cell_label">你已经是他的粉丝了</p>';
+            } else {
+                $result .= '<button type="button" id="btn_add_friend" class="add_friend_btn">关注</button>';
+            }
+            $result .= '</div>';
+        }
+        else
+        {
+            $result =  '<div class="submit">
+                            <button type="button" id="btn_thief_bonus" class="add_friend_btn">偷一点</button>
+                        </div>
+                        <div class="submit">
+                            <button type="button" id="btn_send_bonus" class="send_bonus_btn">发红包</button>
+                        </div>';
+
+            if(!$is_friend) {
+                $result .= '<div class="submit">';
+                $result .= '<button type="button" id="btn_add_friend" class="add_friend_btn">关注</button>';
+                $result .= '</div>';
+            }
+        }
+
+        return $result;
+    }
+}

+ 184 - 187
mobile/templates/default/member/index.php

@@ -2,212 +2,209 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=750,user-scalable=no,target-densitydpi=device-dpi">
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
     <title>详细资料</title>
+    <link type="text/css" rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/weui.css"/>
+    <link rel="stylesheet" href="https://cdn.bootcss.com/jquery-weui/1.2.0/css/jquery-weui.min.css?<?php echo bonus_version(); ?>">
     <style type="text/css">
-        html,
-        body,
-        span,
-        div,
-        button,
-        img{
-            padding: 0;
-            margin: 0;
-            -webkit-user-select: none;/*禁用手机浏览器的用户选择功能 */
-            -moz-user-select: none;
-        }
-        html,body {
-            height: 100%;
-            max-height: 100%;
-            overflow: hidden;
-            font-size: 30px;
-            color: #333333;
-            background: #F7F7F7;
-            font-family: "PingFang SC Light","Helvetica";
-        }
-        .header_img {
-            width: 116px;
-            height: 116px;
-            border-radius: 5px;
+        html, body {
+            background: #F2F2F2;
+            font-family: PingFang SC, Hiragino Sans GB, Microsoft YaHei, 微软雅黑, Arial, sans-serif;
+        }
+        .avatar {
+            width: 55px;
+            height: 55px;
+            border-radius: 8px;
             vertical-align: middle;
-            margin-right: 40px;
-        }
-        .icon {
-            display: inline-block;
-            width: 27px;
-            height: 27px;
-            margin-left: 10px;
         }
         .name {
-            font-size: 32px;
-        }
-        .icon_man {
-            background: url("<?php echo RESOURCE_SITE_URL; ?>/mobile/fcode/images/man_icon.png") no-repeat;
-            background-size: 100%;
-        }
-        .icon_lady {
-            background: url("<?php echo RESOURCE_SITE_URL; ?>/mobile/fcode/images/lady_icon.png");
-            background-size: 100%;
-        }
-        .cell {
-            margin-left: 30px;
-            position: relative;
-            padding: 28px 0;
-        }
-        .cell:after {
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            content: '';
-            width: 100%;
-            height: 1px;
-            background: #DADADA;
-            -webkit-transform:scale(1,0.5);
-            transform:scale(1,0.5);
-        }
-        .group {
-            margin-top: 22px;
-            background: #fff;
-            position: relative;
-        }
-        .group:before {
-            position: absolute;
-            top: 0;
-            left: 0;
-            content: '';
-            width: 100%;
-            height: 1px;
-            background: #DADADA;
-            -webkit-transform:scale(1,0.5);
-            transform:scale(1,0.5);
-        }
-        .group:after {
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            content: '';
-            width: 100%;
-            height: 1px;
-            background: #DADADA;
-            -webkit-transform:scale(1,0.5);
-            transform:scale(1,0.5);
-        }
-        .cell_content {
-            color: #7E7E7E;
-            font-size: 22px;
-        }
-        .add_friend_btn {
-            -webkit-appearance:none;
-            display: inline-block;
-            color: #fff;
-            background: #FF4E4E;
-            width: 632px;
-            height: 82px;
-            font-size: 36px;
-            border: none;
-            border-radius: 10px;
-            -webkit-tap-highlight-color: rgba(240,240,240,0.7);
-        }
-        .cell_label {
-            display: inline-block;
-            margin-left: 12px;
-            margin-right: 44px;
+            font-size: 18px;
+            font-weight: 600;
         }
-        .submit {
-            margin-top:32px;
-            text-align: center;
+        .weui-cells {
+            font-size: 15px;
+            font-weight: 400;
         }
-        .letter_pro {
-            color: #FF4E4E;
+        .cell_ft {
+            font-size: 13px;
+            color: #666666;
+            font-weight: 400;
         }
-        .send_bonus_btn {
-            -webkit-appearance:none;
-            display: inline-block;
-            color: #FF4E4E;
-            background: #ffffff;
-            width: 632px;
-            height: 82px;
-            font-size: 36px;
-            border: none;
-            border-radius: 10px;
-            -webkit-tap-highlight-color: rgba(240,240,240,0.7);
+        .live_message {
+            padding: 10px 15px;
+            background: #F9F9F9;
+            color: #999999;
         }
     </style>
 </head>
-
 <body>
-<div class="maincontent">
-    <div class="group">
-        <div class="cell">
-            <img src="<?php $minfo = $output['info']; echo $minfo->avatar();?>" alt="头像" class="header_img">
-            <span class="name"><?php $minfo = $output['info']; echo $minfo->nickname();?></span><span class="icon icon_lady"></span>
+
+<div class="weui-cells">
+    <div class="weui-cell">
+        <div class="weui-cell__hd">
+            <div class="weui-label">
+                <img class="avatar" src="<?php echo $output['member_info']['avatar']?>" alt="">
+            </div>
+        </div>
+        <div class="weui-cell__bd">
+            <p class="name"><?php echo $output['member_info']['nickname']?></p>
         </div>
     </div>
+</div>
+
+
+<!--不是好友-->
 
-    <div class="group">
-        <?php
-            $cout = new tpl_member($output);
-            echo $cout->output_group();
-        ?>
+<?php if($output['type'] == 'qrcode') {?>
+<div>
+    <div class="weui-cells">
+        <div class="weui-cell">
+            <div class="weui-cell__bd">
+                <p>熊猫美妆已累计帮TA省了</p>
+            </div>
+            <div class="weui-cell__ft cell_ft">
+                <p><?php echo $output['visitor_info']['discount_self']?>元</p>
+            </div>
+        </div>
     </div>
-    <?php
-        $cout = new tpl_member($output);
-        echo $cout->output_btn();
-    ?>
 
-    <div class="success" style="display: none">
-        <p>恭喜您,您关注他成功了</p>
+    <div class="weui-btn-area">
+        <a class="weui-btn weui-btn_primary submit" href="javascript:" id="add">添加为好友</a>
     </div>
+
 </div>
-<script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/bridge.js?<?php echo bonus_version(); ?>"></script>
-<script>
-    if(isMobile.iOS()) {
-        init_ios_bridge(function(bridge) { });
-    } else if (isMobile.Android) {
-        init_android_bridge();
-    } else {
-    }
-    var member_id = <?php
-                        $minfo = $output['info'];
-                        $member_id = $minfo->member_id();
-                        echo $member_id; ?>;
-    var enmember_id = '<?php
-            $minfo = $output['info'];
-            $member_id = $minfo->enmember_id();
-            echo $member_id; ?>';
-
-    var nickname = '<?php
-        $minfo = $output['info'];
-        $member_id = urlencode($minfo->nickname());
-        echo $member_id; ?>';
-
-    var url = '<?php
-        $minfo = $output['info'];
-        $member_id = $minfo->member_id();
-        $vurl = BASE_SITE_URL . "/mobile/index.php?act=member_index&op=subscribe&userid={$member_id}";
-        echo $vurl;
-        ?>';
-
-    window.onload = function ()
-    {
-        $("#btn_add_friend").click(function()
-        {
-            $.getJSON(url,function(result)
-            {
-                $(".submit").hide();
-                $(".success").show();
-            });
+<?php } elseif($output['from_type'] == 'qrcode') {?>
+
+
+
+
+<!--是好友-->
+
+<!--<div>-->
+<!--    <div class="weui-cells">-->
+<!--        <div class="weui-cell">-->
+<!--            <div class="weui-cell__bd">-->
+<!--                <p>熊猫美妆已累计帮TA省了</p>-->
+<!--            </div>-->
+<!--            <div class="weui-cell__ft cell_ft">-->
+<!--                <p>--><?php //echo $output['visitor_info']['discount_self']?><!--元</p>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="weui-cell weui-cell_access">-->
+<!--            <div class="weui-cell__bd">-->
+<!--                <p>我和TA的共同群聊</p>-->
+<!--            </div>-->
+<!--            <div class="weui-cell__ft cell_ft">-->
+<!--                <p>--><?php //echo $output['visitor_info']['common_rooms']?><!--个</p>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!---->
+<!--    <div class="weui-btn-area">-->
+<!--        <a class="weui-btn weui-btn_primary submit" href="javascript:" id="send">发消息</a>-->
+<!--        <a class="weui-btn weui-btn_primary submit" href="javascript:" id="thief_bonus">偷红包</a>-->
+<!--    </div>-->
+<!--</div>-->
+
+<!--添加好友-->
+
+<div>
+    <div class="weui-cells">
+        <div class="live_message">
+            <p>
+                <?php echo $output['member_info']['nickname']?>:
+                <span class="live_msg">你好,你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好</span>
+            </p>
+        </div>
+    </div>
+    <div class="weui-cells">
+        <div class="weui-cell">
+            <div class="weui-cell__bd">
+                <p>熊猫美妆已累计帮TA省了</p>
+            </div>
+            <div class="weui-cell__ft cell_ft">
+                <p><?php echo $output['member_info']['discount_self']?>元</p>
+            </div>
+        </div>
+        <div class="weui-cell">
+            <div class="weui-cell__bd">
+                <p>来源</p>
+            </div>
+            <div class="weui-cell__ft cell_ft">
+                <p>二维码邀请</p>
+            </div>
+        </div>
+    </div>
+
+    <div class="weui-btn-area">
+        <a class="weui-btn weui-btn_primary submit" href="javascript:" id="pass_verify_btn">通过验证</a>
+        <a class="weui-btn weui-btn_default submit" href="javascript:" id="refuse_btn">拒绝申请</a>
+    </div>
+</div>
+
+
+
+
+</body>
+</html>
+
+
+<script src="https://cdn.bootcss.com/jquery/1.11.0/jquery.min.js?<?php echo bonus_version(); ?>"></script>
+<script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript">
+    $(function(){
+        var jsBridge = new Bridge();
+
+        $('#send').on('click',function(){
+            var jsonobject = {
+                action:"chat_to",
+                params:{
+                    talk_type:"chatwo",
+                    talk_id:<?php echo $output['member_info']['member_id']?>,
+                    name:'<?php echo str_replace("'","",$output['visitor_info']['nickname'])?>'
+                }
+            };
+            jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject));
         });
-        $("#btn_thief_bonus").click(function()
-        {
-            call_native_handler('on_native_click','{"action":"thief_bonus","params":{"enmember_id":"' + enmember_id + '"}}');
+
+        $('#thief_bonus').on('click',function(){
+            var jsonobject = {
+                action:"thief_bonus",
+                params:{
+                    enmember_id:<?php echo $output['member_info']['member_id']?>
+                }
+            };
+            jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject));
         });
-        $("#btn_send_bonus").click(function()
-        {
-            call_native_handler('on_native_click','{"action":"send_bonus","params":{"member_id":' + member_id + ',"nickname":"' + nickname + '"}}');
+
+
+        $("#add").on('click',function(){
+            var user = <?php echo $output['visitor_info']['member_id']?>;
+            $.prompt({
+                title: '添加好友',
+                text: '发送验证申请,等对方通过',
+                input: '你好!我是'+ "<?php echo $output['member_info']["nickname"]?>",
+                empty: false, // 是否允许为空
+                onOK: function (input) {
+                    //点击确认
+                    $.get("/mobile/index.php",{
+                        act:'member_talk',
+                        op:'add_friends',
+                        client_type:'ajax',
+                        msg:input,
+                        user:user,
+                    },function(res){
+                        var datas = JSON.parse(res);
+                        if(datas.code == 200) {
+                            $.toast("发送成功",1000);
+                        }
+                        else {
+                            $.alert(datas.message);
+                        }
+                    });
+                }
+            });
         });
-    }
-</script>
-</body>
-</html>
+    });
+</script>

+ 2 - 2
test/TestRoomFactory.php

@@ -151,10 +151,10 @@ class TestRoomFactory extends PHPUnit_Framework_TestCase
 
     public function testNotifyCommand()
     {
-        room\pusher::instance()->new_friend(39623,39668);
+        room\pusher::instance()->new_friend(39623,36505);
     }
     public function testApplyFriend()
     {
-        room\pusher::instance()->apply_friend(39623,39668);
+        room\pusher::instance()->apply_friend(39623,39668,'我是你叔叔');
     }
 }