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

service/agent/lib/Soft_cash.php

@@ -29,7 +29,10 @@ Class Soft_cash
             // print_R($info);die;
             $update['where_id'] = $id;
             $update['set_mid'] = $info['id'];
-            $update['set_order_num'] = $this->getOrderId($id);
+            if (!$soft['order_num']) {
+                $update['set_order_num'] = $this->getOrderId($id);
+            }
+            
             if($cash){
                 $update['set_cash'] = $cash;
             }
@@ -85,6 +88,11 @@ Class Soft_cash
 	            }
         	}
             
+            if (!$audit) {
+                if ($soft['status'] == 4) {
+                    $update['status'] = 2;
+                }
+            }
             $ids=Dever::db('agent/soft_cash')->update($update);
         }
     }
@@ -183,7 +191,7 @@ Class Soft_cash
 
         if($info['status'] == 3 ){
         	$member_goods = Dever::db('agent/member_agreement')->find($info['agreement_id']);
-        	if ($member_goods['sign']) {
+        	if ($member_goods && $member_goods['sign']) {
             $sign_pic = '<a href="'.$member_goods['sign'].'" target="_blank"><img src="'.$member_goods['sign'].'" width="100" /></a>';
         } else {
             $sign_pic = '暂无';
@@ -245,12 +253,7 @@ Class Soft_cash
         $purl = Dever::url('project/database/update?project=agent&table=soft_cash&where_id='.$info['id'].'&audit=3&col=id,audit,audit_desc', 'manage');
         if (Dever::load('manage/auth')->checkFunc('agent.soft_cash', 'edit2', '驳回')) {
 	        if($info['status'] == 4){
-	        	$button[] = array
-	            (
-	                'type' => 'edit',
-	                'link' => $purl,
-	                'name' => '待财务终审',
-	            );
+	        	
 	        }
 	    }
         $button[] = array

service/agent/src/Auth.php

@@ -25,7 +25,7 @@ class Auth
         if (!$user) {
             Dever::alert('登录失败，手机号错误，请重新输入');
         }
-        if ($pass && ($user['password'] != sha1($pass) && $user['password'] != md5($pass))) {
+        if ($pass && ($user['password'] != sha1($pass) && $user['password'] != sha1(md5($pass)))) {
             Dever::alert('登录失败，密码错误，请重新输入');
         }
 
@@ -52,7 +52,7 @@ class Auth
         if (!$user) {
             Dever::alert('登录失败，手机号错误，请重新输入');
         }
-        if ($user['password'] != sha1($pass)) {
+        if ($pass && ($user['password'] != sha1($pass) && $user['password'] != sha1(md5($pass)))) {
             Dever::alert('登录失败，密码错误，请重新输入');
         }
 

service/agent/src/My.php

@@ -770,7 +770,7 @@ class My extends Core
         }
 
         $where['where_id'] = $this->uid;
-        $where['password'] = sha1($pass);
+        $where['password'] = $pass;
 
         Dever::db('agent/member')->update($where);
 

service/bill/database/tixian.php

@@ -240,6 +240,7 @@ return array
 			'update'	=> 'images',
 			'key' 		=> '1',
 			'place'		=> '150',
+            'show'      => 'audit=2',
 		),
         'sign'     => array
         (

service/bill/lib/Manage.php

@@ -131,6 +131,7 @@ class Manage
                         Dever::load('sms/api')->send('daili_tixian_yes', $member['mobile'], array('name' => $member['name']));
                     }
                 } else {
+                    Dever::db('bill/tixian')->update(array('where_id' => $id, 'status' => 3, 'operdate' => time()));
                     # 通知短信
                     if (Dever::project('sms')) {
                         $member = Dever::db('agent/member')->find($info['mid']);