edit

yspay/Merchant.php

@@ -59,6 +59,7 @@ class Merchant
 
     public function getInfo($account_id, $project_id, $id, $parent)
     {
+        list($project, $table) = explode('/', $parent);
         $where = array();
         $where['account_id'] = $account_id;
         $where['project_id'] = $project_id;
@@ -67,6 +68,9 @@ class Merchant
 
         $html = '';
         if ($data) {
+            if (!$data['mid']) {
+                $data['mid'] = '编辑信息';
+            }
             $url = Dever::url('project/database/update?project=pay&table=yspay_merchant&set=1&where_id='.$data['id'], 'manage');
             $html .= '<a style="cursor:pointer" onclick="fastEdit($(this),\''.$url.'\',\'编辑信息\', \'\')">'.$data['mid'].'</a>';
 
@@ -79,11 +83,11 @@ class Merchant
             }
             
             if ($data['status'] == 1) {
-                $url = Dever::url('project/database/list?project=pay&table=yspay_cash&search_option_merchant_id='.$data['id'].'&search_option_account_id='.$data['account_id'].'&parent='.$parent, 'manage');
+                $url = Dever::url('project/database/list?project=pay&table=yspay_cash&search_option_merchant_id='.$data['id'].'&search_option_account_id='.$data['account_id'].'&oper_table='.$table.'&oper_project=' . $project, 'manage');
                 $html .= '&nbsp;&nbsp;<a style="cursor:pointer" href="'.$url.'">[资金流水]</a>';
             }
             if ($data['status'] == 2) {
-                $url = Dever::url('project/database/update?project=pay&table=yspay_sign&search_option_merchant_id='.$data['id'].'&search_option_account_id='.$data['account_id'].'&where_id='.$data['id'].'&parent='.$parent, 'manage');
+                $url = Dever::url('project/database/update?project=pay&table=yspay_sign&search_option_merchant_id='.$data['id'].'&search_option_account_id='.$data['account_id'].'&where_id='.$data['id'].'&oper_table='.$table.'&oper_project=' . $project, 'manage');
                 $html .= '&nbsp;&nbsp;<a style="cursor:pointer" onclick="fastEdit($(this),\''.$url.'\',\'签约资料\', \'\')">[签约资料]</a>';
 
                 if ($step == -1) {