Merge branch 'dev' of https://git.lefull.cn/yzx/lxx_pms into dev

PHP/Application/Common/Helper/PreordainHelper.class.php

@@ -496,14 +496,16 @@ class PreordainHelper extends BaseHelper{
 	    	}
     	}
     	if (!empty($preordainArr)){
+            $url_data                        = SITE_DOMAIN;
     	    $url =  array_flip(C("APP_SUB_DOMAIN_RULES"));
     	    foreach ($preordainArr as $k => $v){
-    	        $preordainArr[$k]['ueto_employee']      = $ueto_employee_list_tmp[$v['preordain_id']]['nemes'];
-    	        $preordainArr[$k]['with_employee']      = $with_employee_list_tmp[$v['preordain_id']]['name'];
-    	        $preordainArr[$k]['room_data']          = $room_arr[$v['room_id']];
-    	        $preordainArr[$k]['store_billing_time'] = $bill_list_tmp[$v['bill_id']];
-                $preordainArr[$k]['contract_url']       = "https://".$url['BookingWap']."/CustomTemplate/preordainTemplate?apartment_id={$v['apartment_id']}&preordain_id={$v['preordain_id']}&room_id={$v['room_id']}&tenant_id={$v['tenant_id']}";
-                $preordainArr[$k]['fdd_url']            = "https://".$url['Fdd']."/Api/createPreordain";
+    	        $preordainArr[$k]['ueto_employee']         = $ueto_employee_list_tmp[$v['preordain_id']]['nemes'];
+    	        $preordainArr[$k]['with_employee']         = $with_employee_list_tmp[$v['preordain_id']]['name'];
+    	        $preordainArr[$k]['room_data']             = $room_arr[$v['room_id']];
+    	        $preordainArr[$k]['store_billing_time']    = $bill_list_tmp[$v['bill_id']];
+                $preordainArr[$k]['contract_url']          = "https://".$url['BookingWap']."/CustomTemplate/preordainTemplate?apartment_id={$v['apartment_id']}&preordain_id={$v['preordain_id']}&room_id={$v['room_id']}&tenant_id={$v['tenant_id']}";
+                $preordainArr[$k]['fdd_url']               = "https://".$url['Fdd']."/Api/createPreordain";
+                $preordainArr[$k]['preordain_fdd_vue_url'] = "https://".$url_data."/ContractIous/getFddDown/fdd_id/".$v['fdd_id'];
     	    }
     	}
     	return $preordainArr;

PHP/Application/Index/Controller/ContractIousController.class.php

@@ -398,7 +398,7 @@ class ContractIousController extends BaseController{
                 }
             }
         }
-        if (!is_array($fdd_id) && $fdd_id != null && $fdd_id != ''){
+        if (!is_array($fdd_id) && $fdd_id != null && $fdd_id != '' && $fdd_id != 0){
             $result_url = $this->logic('Api\Contract')->getFddPDFViewLogic($fdd_id)['data']["download_url"];
             $file_url = file_get_contents($result_url);
             if ($file_url) {

PHP/Application/Index/View/default/Preordain/index.html

@@ -213,7 +213,7 @@
 					</if>
 						<a
 							data-printurl="{{$vo.contract_url}}"
-							data-fddUrl="定金协议法大大下载请求地址和合同那边的一样"
+							data-fddUrl="{{$vo.preordain_fdd_vue_url}}"
 							href="javascript:void(0)"
 							name="btn-print" 
 							class="btn btn-link s_font pr8">合同打印