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

service/agent/database/member.php

@@ -220,12 +220,11 @@ return array
         'udate'     => array
         (
             'type'      => 'int-11',
-            'name'      => '终审时间-最新一次终审时间',
+            'name'      => '终审时间',
             'default'   => '',
             'match'     => 'is_numeric',
             'desc'      => '',
             'search'    => 'date',
-            'order'     => 'desc',
         ),
 
         'avatar'        => array

service/agent/lib/Member.php

@@ -265,7 +265,7 @@ class Member
             $button[0]['btn'][] = array
             (
                 'type' => 'edit',
-                'link' => Dever::url('project/database/update?project=agent&table=member&where_id='.$member['id'].'&status=1&col=name,mobile,email,area,role,level_id,is_shop,is_area', 'manage'),
+                'link' => Dever::url('project/database/update?project=agent&table=member&where_id='.$member['id'].'&status=1&col=name,email,area,role,level_id,is_shop,is_area', 'manage'),
                 'name' => '修改基础资料',
             );
         }

service/agent/lib/Tool.php

@@ -732,14 +732,13 @@ class Tool
     # 更新member终审时间
     public function upmember_udate_api()
     {
-        $where['ids'] = 50000;
-        $order = Dever::db('agent/order')->getDataByNew($where);
+        $order = Dever::db('agent/order')->getDataByNew();
         if ($order) {
             foreach ($order as $k => $v) {
-                if ($v['id'] >= 50000) {
+                if ($v['id'] >= 1) {
                     $member = Dever::db('agent/member')->find($v['mid']);
                     if ($member) {
-                        Dever::db('agent/member')->update(array('where_id' => $member['id'], 'udate' => $v['fdate']));
+                        Dever::db('agent/member')->update(array('where_id' => $member['id'], 'set_udate' => $v['fdate']));
                     }
                 }
             }