Merge branch 'feature-lq-04' into release_preview

new_admincp/applications/zsb/core/MY_Controller.php

@@ -63,10 +63,10 @@ class MY_Controller extends CI_Controller
 		} */
 
         // 弱密码,并且当前请求不是修改密码或退出则跳转到修改密码页面
-//        if ($this->session->userdata('zsb_user_weak_password') && ($_SERVER['REQUEST_URI'] != '/ucenter_information/edit_password' && $_SERVER['REQUEST_URI'] != '/login/quit/')) {
-//            header("Location: /ucenter_information/edit_password");
-//            exit;
-//        }
+        if ($this->session->userdata('zsb_user_weak_password') && ($_SERVER['REQUEST_URI'] != '/ucenter_information/edit_password' && $_SERVER['REQUEST_URI'] != '/login/quit/')) {
+            header("Location: /ucenter_information/edit_password");
+            exit;
+        }
 
     }
     

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

@@ -215,8 +215,10 @@
                         <td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
                         <td class="td second" style="width:380px;">
                             <div style="float: left;margin-top: 5%">
+                                <a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank">
                                 <img src="<?= $value['pic1'] ?>"
                                      style="width: 80px; height: 65px;">
+                                </a>
                             </div>
                             <div style="float: left;width: 260px;margin-left: 10px">
                                 <div class="itemTex">

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

@@ -157,8 +157,10 @@
                         <td class="td w10"></td>
                         <td class="td second" style="width:380px;">
                             <div style="float: left;margin-top: 5%">
+                                <a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank">
                                 <img src="<?= $value['pic1'] ?>"
                                      style="width: 80px; height: 65px;">
+                                </a>
                             </div>
                             <div style="float: left;width: 260px;margin-left: 10px">
                                 <div class="itemTex">

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

@@ -205,8 +205,10 @@
                         <td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
                         <td class="td second" style="width:380px;">
                             <div style="float: left;margin-top: 5%">
+                                <a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank">
                                 <img src="<?= $value['pic1'] ?>"
                                      style="width: 80px; height: 65px;">
+                                </a>
                             </div>
                             <div style="float: left;width: 260px;margin-left: 10px">
                                 <div class="itemTex">

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

@@ -269,8 +269,10 @@
                         <td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
                         <td class="td second" style="width:380px;">
                             <div style="float: left;margin-top: 5%">
+                                <a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank">
                                 <img src="<?= $value['pic1'] ?>"
                                      style="width: 80px; height: 65px;">
+                                </a>
                             </div>
                             <div style="float: left;width: 260px;margin-left: 10px">
                                 <div class="itemTex">

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

@@ -160,8 +160,9 @@
                         <td class="td w10"></td>
                         <td class="td second" style="width:380px;">
                             <div style="float: left;margin-top: 5%">
-                                <img src="<?= $value['pic1'] ?>"
+                                <a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank">                                <img src="<?= $value['pic1'] ?>"
                                      style="width: 80px; height: 65px;">
+                                </a>
                             </div>
                             <div style="float: left;width: 260px;margin-left: 10px">
                                 <div class="itemTex">

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

@@ -213,8 +213,10 @@
                         <td class="td first"><input class="jsSelectItem" type="checkbox" name="rows_id" value="<?php echo $value['id'];?>"/></td>
                         <td class="td second" style="width:380px;">
                             <div style="float: left;margin-top: 5%">
+                                <a class="name" title = "<?php echo $value['address'];?>" href="<?php echo $value['info_url'];?>" target="_blank">
                                 <img src="<?= $value['pic1'] ?>"
                                      style="width: 80px; height: 65px;">
+                                </a>
                             </div>
                             <div style="float: left;width: 260px;margin-left: 10px">
                                 <div class="itemTex">