Merge branch '230613_rent' into release_preview

be1fd117 · zhangtao · 449e6680 · b1e079eb · be1fd117 · be1fd117
Commit be1fd117 authored Jun 13, 2023 by zhangtao
Hide whitespace changes
Inline Side-by-side

Showing with 40 additions and 2 deletions

editor.php new_admincp/applications/zsb/views/nj/editor.php +2 -1

rent_modify.php new_admincp/applications/zsb/views/nj/rent_modify.php +38 -1

No files found.
--- a/new_admincp/applications/zsb/views/nj/editor.php
+++ b/new_admincp/applications/zsb/views/nj/editor.php
 <?php
+$edit_id = $edit_id?:'remark';
 // 默认文字
 switch ($edit_id) {
    case 'stand_remark':
@@ -26,7 +27,7 @@ switch ($edit_id) {
    <script charset='gbk' src='<?= STATIC_SOURCE_URL ?>/common/js/kindeditor-4.1.10/lang/zh_CN.js'></script>
 </head>
 <body style="backgroud:none;">
-<textarea name="remark" id="<?= $edit_id ?>" cols="0" rows="0"
+<textarea name="<?= $edit_id ?>" id="<?= $edit_id ?>" cols="0" rows="0"
          style="width:835px;height:155px;display:none;"></textarea>
 <script>
  document.getElementById('<?=$edit_id?>').value = window.parent.document.getElementById('<?=$edit_id?>').value;

--- a/new_admincp/applications/zsb/views/nj/rent_modify.php
+++ b/new_admincp/applications/zsb/views/nj/rent_modify.php
@@ -385,7 +385,18 @@
                                    } 
                                    ?>
                                    <dd class="list_item clearfix">
-                                        <label class="label">面积：</label>
+                                        <?php
+                                            if ($infotype == 1) {
+                                                if ($house_detail['renttype'] == '整租') {
+                                                    $areaName = '总面积';
+                                                } else {
+                                                    $areaName = '房屋面积';
+                                                }
+                                            } else {
+                                                $areaName = '面积';
+                                            }
+                                        ?>
+                                        <label class="label areaName"><?= $areaName?>：</label>
                                        <div class="fields">
                                            <div class="fgInput jsFgInput">
                                                <input type="text" class=" input_text w90" name="buildarea" id="buildarea" value="<?=$house_detail['buildarea']?>">
@@ -820,6 +831,17 @@ if (isset($publish_block) && !empty($publish_block)) {
                }
            }

+            var renttype = $(this).val();
+            if (infotype == 1){
+                if(renttype == '整租'){
+                    $(".areaName").html('总面积：');
+                }else{
+                    $(".areaName").html('房屋面积：');
+                }
+            }else{
+                $(".areaName").html('面积：');
+            }
+
        })


@@ -868,6 +890,21 @@ if (isset($publish_block) && !empty($publish_block)) {
 			}
 		});

+        $(input:radio[name='renttype']).change(function(){
+            var renttype = $(this).val();
+            var infotype = $('input[name=infotype]').val();
+            if (infotype == 1){
+                if(renttype == '整租'){
+                    $(".areaName").html('总面积：');
+                }else{
+                    $(".areaName").html('房屋面积：');
+                }
+            }else{
+                $(".areaName").html('面积：');
+            }
+
+        })
+

        $("#blockshowname").autocomplete({
            source: function(request, response) {