Your Name 2 years ago
parent
commit
951db906ad
3 changed files with 5 additions and 17 deletions
  1. 1 4
      service/agent/database/soft_cash.php
  2. 3 13
      service/agent/lib/Soft_cash.php
  3. 1 0
      service/agent/src/My.php

+ 1 - 4
service/agent/database/soft_cash.php

@@ -16,7 +16,6 @@ $manage_audit = array
 );
 $type = array
 (
-    -1 => '请选择',
     1 => '未签署',
     2 => '已签署',
     3 => '已作废',
@@ -225,14 +224,12 @@ return array
         (
             'type'      => 'tinyint-1',
             'name'      => '合同签署状态',
-            'default'   => '-1',
+            'default'   => '1',
             'desc'      => '合同签署状态',
             'match'     => 'is_numeric',
             // 'update'    => 'radio',
             'option'    => $type,
             'search'    => 'select',
-            // 'list'      => 'Dever::load("agent/lib/soft_cash.agreement",{id})',
-
         ),
 
         'admin_desc'      => array

+ 3 - 13
service/agent/lib/Soft_cash.php

@@ -24,9 +24,7 @@ Class Soft_cash
         }else{
         	$info = Dever::db('agent/member')->find(array('id'=>$soft['mid']));
         }
-        
         if($info){
-            // print_R($info);die;
             $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'] = '-';
         }
+        // print_R($data);die;
         $html = $data['status'];
         $html .= '<br />' . $data['type'];
         $html .= '<br />' . $data['zdate'];

+ 1 - 0
service/agent/src/My.php

@@ -990,6 +990,7 @@ class My extends Core
                     if($soft_cash){
                         $update['where_id'] = $soft_cash['id'];
                         $update['set_fdate'] = time();
+                        $update['set_type'] = 2;
                         Dever::db('agent/soft_cash')->update($update);
                     }
                     return array('link' => $name[1]);