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

service/agent/lib/Member.php

@@ -255,11 +255,20 @@ 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,password,email,shop_id,area,role,level_id,is_shop', 'manage'),
+                'link' => Dever::url('project/database/update?project=agent&table=member&where_id='.$member['id'].'&status=1&col=name,mobile,email,shop_id,area,role,level_id,is_shop', 'manage'),
                 'name' => '修改基础资料',
             );
         }
 
+        if (Dever::load('manage/auth')->checkFunc('agent.member', 'editPassport', '修改密码')) {
+            $button[0]['btn'][] = array
+            (
+                'type' => 'edit',
+                'link' => Dever::url('project/database/update?project=agent&table=member&where_id='.$member['id'].'&status=1&col=password', 'manage'),
+                'name' => '修改密码',
+            );
+        }
+
         if (Dever::load('manage/auth')->checkFunc('agent.member','sport','修改认证资料')) {
             $button[0]['btn'][] = array
             (

service/agent/lib/Soft_cash.php

@@ -182,7 +182,7 @@ Class Soft_cash
         $button = $this->show_button($info);
 
         if($info['status'] == 3 ){
-        	$member_goods = Dever::db('agent/member_goods')->find($info['agreement_id']);
+        	$member_goods = Dever::db('agent/member_agreement')->find($info['agreement_id']);
         	if ($member_goods['sign']) {
             $sign_pic = '<a href="'.$member_goods['sign'].'" target="_blank"><img src="'.$member_goods['sign'].'" width="100" /></a>';
         } else {