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

PHP/Application/Client/Conf/config.php

@@ -82,7 +82,7 @@ return array(
     //H5订单相关页面V2
     'H5_M_HOME' => array(
         'eleven' => 'https://elevenwap.lefull.cn/',
-        'erp' => 'https://testbkwap.lefull.cn/',
+        'erp' => 'https://m-lxxtest.lefull.cn/',
         'www' => 'https://m-lxx.lefull.cn/',
     ),
     'H5_M_PAGES' => array(

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

@@ -595,13 +595,16 @@ class TenantHelper extends BaseHelper{
         foreach ($tenant_list_data as $k => $v) {
             //合同法大大ID
             $tenant_list_data[$k]['contract_fdd_vue_url']   = $http . '://' . $url_data ."/ContractIous/getFddDown/fdd_id/".$v['contract_fdd_id'];
+            $tenant_list_data[$k]['contract_fdd_is_sign']   = $v['contract_fdd_id']?1:0;
             //转租法大大ID
-            $tenant_list_data[$k]['reservation_surrender_vue_url']   = $http . '://' . $url_data ."/ContractIous/getFddDown/fdd_id/".$v['reservation_surrender_fdd_id'];
+            $tenant_list_data[$k]['reservation_surrender_vue_url']      = $http . '://' . $url_data ."/ContractIous/getFddDown/fdd_id/".$v['reservation_surrender_fdd_id'];
+            $tenant_list_data[$k]['reservation_surrender_fdd_is_sign']  = $v['reservation_surrender_fdd_id']?1:0;
 
             //添加预定租金
             $tenant_list_data[$k]['preordain_money']    = $preordain_list_tmp[$v['contract_id']];
             $tenant_list_data[$k]['preordain_id']       = $preordain_id_tmp[$v['contract_id']];
             $tenant_list_data[$k]['preordain_fdd_vue_url']   = $http . '://' . $url_data ."/ContractIous/getFddDown/fdd_id/".$preordain_fdd_id_tmp[$v['contract_id']];
+            $tenant_list_data[$k]['preordain_fdd_is_sign']   = $preordain_fdd_id_tmp[$v['contract_id']]?1:0;
             // 添加bill门店账单时间
             //$tenant_list_data[$k]['store_billing_time'] = $contract_tmp[$v['contract_id']] ? date('Y-m-d', $contract_tmp[$v['contract_id']]) :'';
             $advance_pay_rent_day                       = $v['advance_pay_rent_day'] * 86400;
@@ -624,6 +627,7 @@ class TenantHelper extends BaseHelper{
             }
             $tenant_list_data[$k]['surrender_id']      = $surrender_list_tmp[$v['contract_id']];
             $tenant_list_data[$k]['surrender_fdd_vue_url']   = $http . '://' . $url_data ."/ContractIous/getFddDown/fdd_id/".$surrender_fdd_id_tmp[$v['contract_id']];
+            $tenant_list_data[$k]['surrender_fdd_is_sign']   = $surrender_fdd_id_tmp[$v['contract_id']]?1:0;
             $tenant_list_data[$k]['paid_day']          = date("Y-m-d", $v['paid_day']);
             $tenant_list_data[$k]['entrust_surrender'] = $reservation_surrender_tmp[$v['contract_id']];
         }

PHP/Application/Common/Logic/Api/ContractLogic.class.php

@@ -69,9 +69,10 @@ class ContractLogic extends BaseLogic
             $return_data[$k]['room_id']                  = $v['room_id'];
             $return_data[$k]['room_number']              = $v['room_number'];
             $return_data[$k]['apartment_id']             = $v['apartment_id'];
-            $return_data[$k]['is_renewal']               = $v['is_renewal'];
-            if ($v['end_time'] == $v['paid_day']){
-                $return_data[$k]['is_renew']             = 3;
+            if ($v['next_pay_rent'] == '账单已付清'){
+                $return_data[$k]['is_renewal']           = $v['is_renewal'];
+            }else{
+                $return_data[$k]['is_renewal']           = 3;
             }
             //修改接口
 //            $return_data[$k]['apartment_name']           = $v['apartment_name'];