|
@@ -24,9 +24,7 @@ Class Soft_cash
|
|
|
}else{
|
|
|
$info = Dever::db('agent/member')->find(array('id'=>$soft['mid']));
|
|
|
}
|
|
|
-
|
|
|
if($info){
|
|
|
-
|
|
|
$update['where_id'] = $id;
|
|
|
$update['set_mid'] = $info['id'];
|
|
|
$update['set_role'] = $info['role'];
|
|
@@ -334,18 +332,9 @@ Class Soft_cash
|
|
|
}
|
|
|
}
|
|
|
public function list($id){
|
|
|
- $info = Dever::db('agent/soft_cash')->find($id);
|
|
|
- $status = '';
|
|
|
- if($info['status'] == 3 && $info['agreement_id']){
|
|
|
- $agreement = Dever::db('agent/member_agreement')->find(array('id' => $info['agreement_id']));
|
|
|
- $status = $agreement['status'];
|
|
|
- }
|
|
|
- $where['id'] = $id;
|
|
|
- $where['type'] = $status;
|
|
|
- dever::db('agent/soft_cash')->update($where);
|
|
|
- $info = Dever::db('agent/soft_cash')->find(array('id'=>$id,'s'=>1));
|
|
|
+ $info = Dever::db('agent/soft_cash')->find(array('id'=>$id));
|
|
|
$config_status = Dever::db('agent/soft_cash')->config['config_status'];
|
|
|
- $data['status'] = Dever::status($config_status,$info['status']);
|
|
|
+ $data['status'] = Dever::status($config_status,$info['status'],true);
|
|
|
$config_type = Dever::db('agent/soft_cash')->config['config_type'];
|
|
|
$data['type'] = Dever::status($config_type,$info['type']);
|
|
|
if($info['zdate']){
|
|
@@ -358,6 +347,7 @@ Class Soft_cash
|
|
|
}else{
|
|
|
$data['fdate'] = '-';
|
|
|
}
|
|
|
+
|
|
|
$html = $data['status'];
|
|
|
$html .= '<br />' . $data['type'];
|
|
|
$html .= '<br />' . $data['zdate'];
|