Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type

Application/Admin/Controller/StatementController.class.php

@@ -64,8 +64,9 @@ class StatementController extends ThinkController
           $mycompany =  M("tool","tab_")->field("config")->where("name='company_info'")->find();
           $info = json_decode($mycompany['config'],true);
           $info['id'] = 0;
+          unset($info['status']);
        }else{
-          $info = M("partner","tab_")->where("id = '{$CompanyId}'")->find();
+          $info = M("partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("id = '{$CompanyId}'")->find();
        }
        if(empty($info)){
          $this->ajaxReturn(array("error"=>"no find","code"=>2000));

Application/Admin/View/Query/marketList.html

@@ -214,11 +214,11 @@
         <volist name=":I('get.')" id="vo">
             Think.setValue('{$key}',"{$vo}");
         </volist>
+        highlight_subnav('{:U('StatementMangement/lists')}');
         $(".select_gallery").select2();
     </script>
     <script type="text/javascript">
         //导航高亮
-        highlight_subnav('{:U('Query/marketList')}');
         $(function(){
             //搜索功能
             var promote_id = "{:I('promote_id')}";