电子发票下载链接是否显示

@@ -251,26 +251,16 @@ class OrderModel
                 if(isset($orderDetail['data']['invoice']['type']) == false && empty($orderDetail['data']['invoice']['type'])){
                 if(isset($orderDetail['data']['invoice']['type']) == false && empty($orderDetail['data']['invoice']['type'])){
                     break;
                     break;
                 }
                 }
-                //判断是否显示电子发票下载地址
-                $result['invoice'] = $orderDetail['data']['invoice'];
-                //纸质 1，电子 2
-                $result['invoice']['type'] = $result['invoice']['type'] * 1 === 2 ? true : false;//发票类型
-                $result['invoice']['title'] = $result['invoice']['title'];//发票抬头
-                $result['invoice']['contentValue'] = $result['invoice']['contentValue'];//发票内容
-                $result['invoice']['mobilePhone'] = $result['invoice']['mobilePhone'];//联系电话
-                //电子发票下载链接
+                $result['invoice']['type'] = $orderDetail['data']['invoice']['type'] * 1 === 2 ? true : false;//发票类型 纸质 1，电子 2
+                $result['invoice']['title'] = $orderDetail['data']['invoice']['title'];//发票抬头
+                $result['invoice']['contentValue'] = $orderDetail['data']['invoice']['contentValue'];//发票内容
+                $result['invoice']['mobilePhone'] = $orderDetail['data']['invoice']['mobilePhone'];//联系电话
+                //电子发票下载链接显示
                 if($orderDetail['data']['invoice']['showInvoice'] == true && isset($orderDetail['data']['invoice']['pdfUrl'])){
                 if($orderDetail['data']['invoice']['showInvoice'] == true && isset($orderDetail['data']['invoice']['pdfUrl'])){
-                     $result['invoice']['pdfUrl'] = $result['invoice']['pdfUrl'];
+                     $result['invoice']['pdfUrl'] = $orderDetail['data']['invoice']['pdfUrl'];
                 }
                 }
             }
             }
             while(false);
             while(false);
-//            $result['invoice'] = array(
-//                'type' => true,//-- 纸质 false，电子 true
-//                'title' => '发票抬头',// --发票抬头
-//                'contentValue' => '服饰',//-- 发票内容
-//                'mobilePhone' => '13651898702',//--电话
-//                'pdfUrl' => 'http://redmine.yoho.cn/attachments/download/2732/%E7%94%B5%E5%AD%90%E5%8F%91%E7%A5%A8-wap%E7%AB%AF.pdf',//--pdf下载地址
-//            );
         }
         }
         //取消订单原因列表
         //取消订单原因列表
         $resons = OrderData::closeReasons();
         $resons = OrderData::closeReasons();