Commit 040c074a authored by liuqiao's avatar liuqiao

Merge branch 'feature-lq-04' into release_preview

parents 03abd515 6311f8ce
...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -443,7 +443,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -443,7 +443,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -447,7 +447,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -447,7 +447,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -447,7 +447,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -447,7 +447,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -452,8 +452,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -452,8 +452,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
array('loan_index','loan_record'), array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -447,7 +447,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -447,7 +447,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,8 +444,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,8 +445,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,8 +445,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,8 +445,8 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,8 +445,8 @@ $config['left_menu']['house_manage'] = array(
array('rent_manage','rent_manage_invalid','rent_manage_frozen') array('rent_manage','rent_manage_invalid','rent_manage_frozen')
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -445,7 +445,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array( ...@@ -444,7 +444,7 @@ $config['left_menu']['house_manage'] = array(
); );
$config['left_menu']['ucenter'] = array( $config['left_menu']['ucenter'] = array(
'ucenter/my_growth', 'ucenter/my_growth',
'ucenter/my_information', array('ucenter/my_information','ucenter/edit_password'),
'ucenter/my_history', 'ucenter/my_history',
array('ucenter/my_message_list', 'ucenter/my_message_detail'), array('ucenter/my_message_list', 'ucenter/my_message_detail'),
// array('loan_index','loan_record'), // array('loan_index','loan_record'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment