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

service/agent/database/member_goods.php

@@ -285,6 +285,7 @@ return array
             ),
             'order' => array('type' => 'desc', 'id' => 'desc'),
             'type' => 'all',
+            'page' => array(20, 'list'),
             'col' => '*, total_num-sell_num as num',
         ),
 

service/agent/lib/Soft_cash.php

@@ -210,6 +210,16 @@ Class Soft_cash
             'link' => $purl,
             'name' => '备注',
         );
+        $purl = Dever::url('project/database/update&project=agent&&page_type=2&table=soft_cash&menu=agent&search_option_state=1&where_id='.$info['id']);
+        if($info['status'] < 3 || $info['status'] == 4){
+            $button[] = array
+            (
+                'type' => 'edit',
+                'link' => $purl,
+                'name' => '修改信息',
+            );
+            
+        }
         $purl = Dever::url('project/database/update?project=agent&table=soft_cash&where_id='.$info['id'].'&audit=2&col=id,audit,audit_desc', 'manage');
         // if($aduit)
         if($info['status'] == 1){