rabin 2 anos atrás
pai
commit
ae0297bc71

+ 2 - 3
service/agent/database/member_shop_log.php

@@ -21,9 +21,7 @@ $role = function()
 };
 $new_shop = Dever::input('search_option_new_shop_id');
 $group = 't_1.mid,t_1.new_shop_id';
-if ($new_shop) {
-    Dever::input('search_option_status', 1);
-}
+
 $admin = Dever::load('manage/auth.info');
 $admin_auth = false;
 if ($admin && $admin['role'] == 24){
@@ -194,6 +192,7 @@ return array
                 'end_cdate' => array('yes-t_1.cdate','<='),
                 'new_shop_id' => 'yes-t_1.new_shop_id',
                 'agent-member-role' => 'yes-t_2.role',
+                'status' => 'yes-t_1.status',
                 'state' => 'yes-t_1.state-1',
             ),
             'join' => array

+ 1 - 1
service/bill/database/shop_stat.php

@@ -25,7 +25,7 @@ $status = array
     2 => '未确认',
 );
 $list_button = array();
-$list_button['list1'] = array('归店明细', 'member_shop_log&project=agent&menu=agent&search_option_state=1&menu_id=306&search_option_new_shop_id={shop_id}&search_option_dever_auth=2');
+$list_button['list1'] = array('归店明细', 'member_shop_log&project=agent&menu=agent&search_option_state=1&menu_id=306&search_option_new_shop_id={shop_id}&search_option_dever_auth=2&search_option_status=1');
 $list_button['list2'] = array('直推明细', 'order&project=agent&menu=agent&search_option_state=1&menu_id=306&search_in_parent_mid={mids}');
 $table = Dever::input('table');
 if ($table == 'shop_stat') {