Merge branch 'master' of http://git.dever.cc/dever-product/churen

tool/work/assets/pc/html/callback.html

@@ -124,7 +124,7 @@ td {
 		<a  href="<{$user['soft']}>" class="layui-btn" id="soft"target="_blank">软件服务费</a>
 		<{endif}>
 		<{if($user['option']):}>
-		<a  href="<{$user['option']}>;" class="layui-btn" id="option"target="_blank">期权信息</a>
+		<a  href="<{$user['option']}>" class="layui-btn" id="option"target="_blank">期权信息</a>
 		<{endif}>
 		</div>
 		<div style="margin-bottom:10px;">

tool/work/lib/Appoint.php

@@ -555,7 +555,7 @@ Class Appoint
                     $user['name'] = $member['name'].'<br/>'.$mobile;
                     $user['type'][] = '期权账户';
                     $data['user']['option'] = Dever::url('project/database/list?project=option&table=member&search_option_id='.$option['id'], 'manage');
-                    $data['user']['option'] = Dever::url('home?link=' . urlencode( $data['user']['option']) . '&group=8&menu=menu_279.menu_291' , 'manage');
+                    $data['user']['option'] = Dever::url('home?link=' . urlencode( $data['user']['option']) . '&group=8&parent_menu=menu_279&menu=menu_279.menu_291' , 'manage');
                 }
                 if ($passport) {
                     $user['name'] = $member['username'].'<br/>'.$mobile;
@@ -577,13 +577,13 @@ Class Appoint
                     
 
                     $data['user']['order'] = Dever::url('project/database/list?project=agent&table=order&p=1&search_option_mid='.$member['id'], 'manage');
-                    $data['user']['order'] = Dever::url('home?link=' . urlencode($data['user']['order']) . '&group=7&menu=agent.order', 'manage');
+                    $data['user']['order'] = Dever::url('home?link=' . urlencode($data['user']['order']) . '&group=7&parent_menu=menu_240&menu=agent.order', 'manage');
 
                     $data['user']['agent'] = Dever::url('project/database/list?project=agent&table=member_area&mid='.$member['id'].'&page_type=1&search_auth=1&page_type=1&jump=19','manage');
-                    $data['user']['agent'] = Dever::url('home?link=' . urlencode($data['user']['agent']) . '&group=7&menu=agent.member' , 'manage');
+                    $data['user']['agent'] = Dever::url('home?link=' . urlencode($data['user']['agent']) . '&group=7&parent_menu=menu_240&menu=agent.member' , 'manage');
 
                     $data['user']['soft'] = Dever::url('project/database/list?project=agent&table=soft_cash&search_option_mid='.$member['id'], 'manage');
-                    $data['user']['soft'] = Dever::url('home?link=' . urlencode($data['user']['soft']) . '&group=7&menu=agent.soft_cash' , 'manage');
+                    $data['user']['soft'] = Dever::url('home?link=' . urlencode($data['user']['soft']) . '&group=7&parent_menu=menu_240&menu=agent.soft_cash' , 'manage');
                 }
                 $data['user']['title'] = '名称/电话号码' . $user['role'];
             }
@@ -592,10 +592,10 @@ Class Appoint
             $data['user']['username'] = $user['name'];
             
             $data['user']['work'] = Dever::url('project/database/update?project=work&table=info&menu=work&search_option_mobile='.$mobile, 'manage');
-            $data['user']['work'] = Dever::url('home?link=' . urlencode($data['user']['work']) . '&group=10&menu=work.add' , 'manage');
+            $data['user']['work'] = Dever::url('home?link=' . urlencode($data['user']['work']) . '&group=10&parent_menu=work&menu=work.add' , 'manage');
 
             $data['user']['work_list'] = Dever::url('project/database/list&project=work&table=info&menu=work&search_option_state=1&search_api_mobile='.$mobile, 'manage');
-            $data['user']['work_list'] = Dever::url('home?link=' . urlencode($data['user']['work_list']) . '&group=10&menu=work.info' , 'manage');
+            $data['user']['work_list'] = Dever::url('home?link=' . urlencode($data['user']['work_list']) . '&group=10&parent_menu=work&menu=work.info' , 'manage');
 
              return Dever::render('callback', $data); 
         }