Merge remote-tracking branch 'origin/master'

new_admincp/applications/zsb/controllers/realHouse.php

@@ -473,15 +473,14 @@ class realHouse extends MY_Controller {
     }
     public function appeal()
     {
-        print_R($this->input->post());exit;
         $model_param = $this->input->post();
+        $model_param['reason'] = iconv('gbk', 'utf8', $model_param['reason']);
+        $model_param['property_rights_name'] = iconv('gbk', 'utf8', $model_param['property_rights_name']);
 
         $this->load->model('zsb_api_model');
         $res = $this->zsb_api_model->getRequrstData('realHouseAppeal', $model_param);
-        print_R($res);exit;
 
-
-        $ids = $this->input->post( 'ids' , TRUE);
+        /*$ids = $this->input->post( 'ids' , TRUE);
         $images = $this->input->post( 'p_filename' , TRUE);
         $reason = $this->input->post( 'reason' , TRUE);
         $checkConsent = $this->input->post( 'checkConsent' , TRUE);
@@ -538,7 +537,7 @@ class realHouse extends MY_Controller {
         }
 
         //申诉成功后 微信消息通知
-        houseOptions($this->user_arr['uid'],$houseId,4);
+        houseOptions($this->user_arr['uid'],$houseId,4);*/
 
         $this->jump('/realHouse/reportRecord/', '提交成功', 3000);
     }

new_admincp/applications/zsb/views/nj/realHouse_reportRecord.php

@@ -194,7 +194,7 @@
                         </div>
                     </div>
                 </li>
-                <li class="clearfix mt10" style="height: 30px;">
+                <!--<li class="clearfix mt10" style="height: 30px;">
                     <label class="fl mt10">
                         <span class="red">*</span>楼栋门牌：
                     </label>
@@ -206,7 +206,7 @@
                         <input id="roomnum" type="text" value="" maxlength="5" class="input_text w42" name="roomnum">
                         室
                     </div>
-                </li>
+                </li>-->
                 <style>
                     #appeal_form .input_text {
                         height: 27px;
@@ -232,26 +232,6 @@
 
 
                 </style>
-                <li class="clearfix mt15">
-                    <label class="fl mt5">
-                        <span class="red">*</span>上传图片：
-                    </label>
-                    <div class="fl">
-                        <div class="bd aleft aupload">
-                            <!-- <a class="btn radius5 btnCon" href="####">图片上传</a> -->
-                            <div id="spanButtonPlaceholder" style="display:none;"></div>
-                        </div>
-                        <div class="bd aleft auploadn" style="display: none;">
-                            <div class="abg"></div>
-                        </div>
-                        <div class="clearfix mt10">
-                            <div class="fields">
-                                <div id="thumbnails"></div>
-                            </div>
-                        </div>
-                        <div class="red mt10">申诉请上传房屋所有权证或委托协议图片，同时提供业主联系方式及姓氏，以便核实，感谢配合！</div>
-                    </div>
-                </li>
                 <li class="clearfix mt10">
                     <table width="100%">
                         <tr>
@@ -275,6 +255,27 @@
                     </table>
                 </li>
 
+                <li class="clearfix mt15">
+                    <label class="fl mt5">
+                        <span class="red">*</span>上传图片：
+                    </label>
+                    <div class="fl">
+                        <div class="bd aleft aupload">
+                            <!-- <a class="btn radius5 btnCon" href="####">图片上传</a> -->
+                            <div id="spanButtonPlaceholder" style="display:none;"></div>
+                        </div>
+                        <!--<div class="bd aleft auploadn" style="display: none;">
+                            <div class="abg"></div>
+                        </div>-->
+                        <div class="clearfix mt10">
+                            <div class="fields">
+                                <div id="thumbnails"></div>
+                            </div>
+                        </div>
+                        <div class="red mt10">申诉请上传房产证或上传独家代理合同图片，并留下房东电话，以便核实。</div>
+                    </div>
+                </li>
+
             </ul>
             <div class="bd btnFBbox ">
                 <a id="saveAppeal" class="btn radius5 btnCon btnO" href="####">提交</a> <a class="btn radius5 btnCon close-win" href="####">取消</a>
@@ -434,10 +435,10 @@
         var property_rights_name = $("#property_rights_name").val();
         var phone_test  = /^1[3,4,5,7,8,9]{1}[0-9]{9}$/;
         var property_rights_person_id = $("#property_rights_person_id").val();
-        if (buildingnum.length <= 0 || unitnum.length <= 0 || roomnum.length <= 0 ) {
+        /*if (buildingnum.length <= 0 || unitnum.length <= 0 || roomnum.length <= 0 ) {
             alert('请填写完整的楼栋门牌信息');
             return false;
-        }
+        }*/
         if(owner_phone){
             if(!phone_test.test(owner_phone)){
                 alert('请填写正确的业主电话');