Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type

Application/Admin/Controller/PublicController.class.php

@@ -107,7 +107,7 @@ class PublicController extends \Think\Controller
                 }
                 $uid = $promote['id'];
             } else {
-                $partner = M('partner', 'tab_')->where(['link_man' => $mobile,])->find();
+                $partner = M('partner', 'tab_')->where(['link_phone' => $mobile,])->find();
                 if ($partner) {
                     /* 记录登录SESSION和COOKIES */
                     $cp_auth = array(
@@ -131,7 +131,7 @@ class PublicController extends \Think\Controller
                         session($session_name.'_sign', data_auth_sign($cp_auth));
                     }
 
-                    $uid = $promote['id'];
+                    $uid = $partner['id'];
                 }
             }
 

Application/Admin/View/Public/cp_base.html

@@ -70,7 +70,7 @@
                     </div>
 
                 </li> -->
-                <li><a class="tuichujs" href="{:U('public/cp_logout')}">退出</a></li>
+                <li><a class="" href="{:U('public/cp_logout')}">退出</a></li>
             </ul>
             <div class="user">
                 <span>{:session('cp_user_auth.username')}</span>
@@ -285,27 +285,7 @@ $(function(){
             $window.resize(function(){
                 $("#main").css("min-height", $window.height() - 130);
             }).resize();
-            $('.tuichujs').click(function(){
-                $.ajax({
-                    type: 'POST',
-                    async: false,
-                    dataType: 'json',
-                    url: "{:U('Public/logout')}",
-                    success: function(data) {
-                        updateAlert('退出成功','tip_right');
-                        setTimeout(function(){
-                            $('#tip').find('.tipclose').click();
-                        },1500);
-                        location.reload();
-                    },
-                    error:function(){
-                        updateAlert("服务器故障！",'tip_error');
-                        setTimeout(function(){
-                            $('#tip').find('.tipclose').click();
-                        },1500);
-                    }
-                });
-            });
+
             /* 左边菜单高亮 */
             url = window.location.pathname + window.location.search;
             url = url.replace(/(\/(p)\/\d+)|(&p=\d+)|(\/(id)\/\d+)|(&id=\d+)|(\/(group)\/\d+)|(&group=\d+)/, "");