debug

helper/room/tpl_group_home.php

@@ -670,12 +670,14 @@ class tpl_group_home
     public function show_footer_apply_btn()
     {
         $html = "";
-        if (!$this->is_room_member && $this->open_talk==0)
+        if($this->open_talk==0)
         {
-            $pwd = $this->room_info->passwd();
-            $from_qr = $this->isFromQr();
-            if($pwd && !$from_qr){
-                $html .= "
+            if (!$this->is_room_member)
+            {
+                $pwd = $this->room_info->passwd();
+                $from_qr = $this->isFromQr();
+                if($pwd && !$from_qr){
+                    $html .= "
                 <div class=\"join_item_btn\" style='margin-top: 40px;'>
                    <div class=\"quit\" id=\"add_group_pwd\">
                         <a href=\"javascript:;\" class=\"weui-btn weui-btn_primary\">密码入群</a>
@@ -684,29 +686,60 @@ class tpl_group_home
                         <a href=\"javascript:void(0)\" class=\"weui-btn weui-btn_primary\">申请加群</a>
                     </div> 
                 </div>";
+                }
+                else
+                {
+
+                    $html .= "
+                <div class=\"join_item_btn\" style='margin-top: 40px;'>
+                    <div class=\"quit\" id=\"add_group\">
+                        <a href=\"javascript:;\" class=\"weui-btn weui-btn_primary\" data-relay-id='{$this->relay_id}'>立即入群</a>
+                    </div>
+                </div>";
+                }
             }
-            else
+        }
+        else
+        {
+            if (!$this->is_room_member)
             {
-//                if($this->open_talk==0)
-//                {
-//                    $html .= "
-//                <div class=\"join_item_btn\" style='margin-top: 40px;'>
-//                    <div class=\"quit\" id=\"open_talk\">
-//                        <a href=\"javascript:;\" class=\"weui-btn weui-btn_primary\" >进入群聊</a>
-//                    </div>
-//                </div>";
-//                }
-//                else
-//                {
+                $pwd = $this->room_info->passwd();
+                $from_qr = $this->isFromQr();
+                if($pwd && !$from_qr){
+                    $html .= "
+                <div class=\"join_item_btn\" style='margin-top: 40px;'>
+                   <div class=\"quit\" id=\"add_group_pwd\">
+                        <a href=\"javascript:;\" class=\"weui-btn weui-btn_primary\">密码入群</a>
+                    </div>
+                    <div class=\"quit\" id=\"add_group_apply\">
+                        <a href=\"javascript:void(0)\" class=\"weui-btn weui-btn_primary\">申请加群</a>
+                    </div> 
+                </div>";
+                }
+                else
+                {
+
                     $html .= "
                 <div class=\"join_item_btn\" style='margin-top: 40px;'>
                     <div class=\"quit\" id=\"add_group\">
                         <a href=\"javascript:;\" class=\"weui-btn weui-btn_primary\" data-relay-id='{$this->relay_id}'>立即入群</a>
                     </div>
                 </div>";
-//                }
+                }
+            }
+            else
+            {
+                $html .= "
+                <div class=\"join_item_btn\" style='margin-top: 40px;'>
+                    <div class=\"quit\" id=\"open_talk\">
+                        <a href=\"javascript:;\" class=\"weui-btn weui-btn_primary\">进入聊天</a>
+                    </div>
+                </div>";
             }
         }
+
+
+
         echo $html;
     }
 

mobile/control/control.php

@@ -331,9 +331,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018102501";
+    return "v=2018103001";
 }
 function shop_version()
 {
-    return "v=2018102501";
+    return "v=2018103001";
 }