for merge

mobile/control/member_talk.php

@@ -1294,28 +1294,29 @@ class member_talkControl extends mbMemberControl
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /**
+     * 信息输入板
+     * param $type int 1:群申请  2:好友申请  3:查看/编辑群公告
+     * @场景type=1 relay_id(二维码扫码 立即入群)
+     * @场景type=2 talk_id(申请加好友的member_id)
+     * @场景type=3 talke_id(room_id)
+     */
     public function message_boardOp()
     {
         $type = intval($_GET['type']);
         $talk_id = intval($_GET['talk_id']);
         $relay_id = intval($_GET['relay_id']);
-        $passwd =  trim(($_GET['passwd']));
-        $apply  = intval($_GET['apply']);
         $isManager = intval($_GET['isManager']);
 
         if(empty($type)) {
             return self::outerr(errcode::ErrParamter,"打开页面失败");
         }
 
-        //1--群申请   2--好友申请  3--查看公告
-        $ajax_param["type"] = $type;
-        switch ($type)
-        {
+        $ajax_param["type"]     = $type;
+        switch ($type){
             case 1:
                 $ajax_param["talk_id"]  = $talk_id;
                 $ajax_param["relay_id"] = $relay_id;
-                $ajax_param["passwd"]   = $passwd;
-                $ajax_param["apply"]    = $apply;
                 break;
             case 2:
                 $ajax_param["talk_id"]  = $talk_id;

mobile/control/user_index.php

@@ -49,12 +49,12 @@ class user_indexControl extends mobileHomeControl
             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");
-        }
+//        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");
+//        }
 
         if(session_helper::logined() == false)
         {
@@ -163,7 +163,7 @@ class user_indexControl extends mobileHomeControl
 
         return $this->open_page($idolid,['from_type' => '来自于好友申请','scene' => 'applyer','note' => $msg['note']]);
     }
-    
+
     public function room_applyOp()
     {
         if(!session_helper::logined()) {

mobile/templates/default/talk/homepage_room.php

@@ -634,7 +634,7 @@
             });
 
             $('#add_group_apply').on('click', function () {
-                window.location.href = "/mobile/index.php?act=member_talk&op=message_board&type=1&talk_id="+talk_id+"&apply=1";
+                window.location.href = "/mobile/index.php?act=member_talk&op=message_board&type=1&talk_id="+talk_id;
             });
 
             $('#add-member-btn').on('click',function(){