edit

service/agent/lib/Member.php

@@ -695,12 +695,17 @@ class Member
         $data=array();
         if($info && $info['name']=='兑换商品'){
             $address=Dever::db('agent/member_address')->one(array('id'=>$info['address_id'],'state'=>1));
-            $data['联系人']=$address['contact'];
-            $data['联系电话']=$address['mobile'];
-            $res=Dever::load('agent/lib/address')->getOne($address['mid'],$address['id']);
-            $data['详细地址']=$res['address_info'].$address['house_number'];
-            // $data['门牌号']=$address['house_number'];
-            return $data['联系人'].'<br/>'.$data['联系电话'].'<br/>'.$data['详细地址'];
+            if ($address) {
+                $data['联系人']=$address['contact'];
+                $data['联系电话']=$address['mobile'];
+                $res=Dever::load('agent/lib/address')->getOne($address['mid'],$address['id']);
+                $data['详细地址']=$res['address_info'].$address['house_number'];
+                // $data['门牌号']=$address['house_number'];
+                return $data['联系人'].'<br/>'.$data['联系电话'].'<br/>'.$data['详细地址'];
+            } else {
+                return '';
+            }
+            
         }else{
             return '';
         }

service/option/lib/Agreement.php

@@ -656,6 +656,12 @@ class Agreement
         $pdf->content('', '1、岗位期权分三年全部行权完成，每年行权比例如下：', $this->font_size);
 
         # 表格；
+        $pdf->add('年份', 'C', 30, 8, 'LTRB');
+        $pdf->add('满一年', 'C', 30, 8, 'LTRB');
+        $pdf->add('满二年', 'C', 30, 8, 'LTRB');
+        $pdf->add('满三年', 'C', 30, 8, 'LTRB', 1);
+        $pdf->add('行权比例', 'C', 30, 8, 'LTRB');
+        $pdf->add('满三年', 'C', 30, 8, 'LTRB', 1);
 
         $pdf->content('', '2、奖金期权锁定期为一年，锁定期结束后；', $this->font_size);
         $pdf->content('', '奖金期权行权标准如下：', $this->font_size);