Merge branch 'chat_0705' of https://gitee.com/zwyjjc/tl_estate into chat_0705

application/index/view/agent/agent.html

@@ -214,7 +214,7 @@
                     ×
                 </button>
 				<h4 class="modal-title">
-                    绑定手机
+                    绑定手机/电脑
                 </h4>
             </div>
             <div class="modal-body">
@@ -223,9 +223,10 @@
                     	<table class="table table-striped table-bordered table-hover table-condensed">
                     		<thead>
                     			<tr>
-                    			<th>绑定手机</th>
-                    			<th>请求时间</th>
-                    			<th>手机绑定状态</th>
+                    			<th class="text-center">设备类型</th>
+                    			<th class="text-center">设备型号</th>
+                    			<th class="text-center">请求时间</th>
+                    			<th class="text-center">绑定状态</th>
                     		</tr>
                     		</thead>
                     		<tbody id='agent_phone_binding'>

application/index/view/houses/houseList.html

@@ -110,8 +110,8 @@
 	                                                <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
 	                                                
 	
-	                                            <span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span>
-	                                            <span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span>
+	                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
+	                                            <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
 	                                            <!-- 批量修改客方 -->
 	                                            <a href="#modal_modify_user" data-toggle="modal" class="btn btn-info btn3 margin-top-ld"><i class="icon-plus"></i>
 	                                            批量修改盘方</a>

public/resource/template/agent_template_tpl.html

@@ -43,14 +43,14 @@
             [% } %]
 
             [% if(check_auth('index/updateRole')) {%]
-                <a href="#modal-user" class="btn1 btn-danger" id='role' href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>角色设置</a>
+                <a href="#modal-user" class="btn1 btn-success" id='role' href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>角色设置</a>
             [% } %]
             <!--绑定手机权限-->
             [% if(check_auth('index/updateDevice')) {%]
             
-            <a class="btn1 btn-success phone-bundling" href="#modal-phonebundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定手机</a>
+            <a class="btn1 btn-success phone-bundling" href="#modal-phonebundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定手机/电脑</a>
             [% } %]
-            <a class="btn1 btn-success pc-bundling" href="#modal-pcbundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定电脑</a>
+            <!--<a class="btn1 btn-success pc-bundling" href="#modal-pcbundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定电脑</a>-->
             
             
             

public/resource/template/carry_out_template_tpl.html

@@ -7,7 +7,7 @@
         <td>[%= it[item]['address'] %]</td>
         <td>[%= it[item]['remark'] %]</td>
         <td>
-            <a class="btn1 btn-info review-images" href="#modal-time" data-toggle="modal" data-img='[%= it[item]["supervise_img"] %]'>查看</a>
+            <a class="btn1 btn-success review-images" href="#modal-time" data-toggle="modal" data-img='[%= it[item]["supervise_img"] %]'>查看</a>
             <!--<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>查看</a>-->
 
         </td>

public/resource/template/notice_template_tpl.html

@@ -15,7 +15,7 @@
             </a>
              [% if(check_auth('index/delNotice')) { %]
              	<!--删除权限-->
-            <a class="btn1 btn-success announcement-del" href="#modal-delete"  data-toggle="modal" data-id='[%= it[item]["id"] %]'>删除</a>
+            <a class="btn1 btn-danger announcement-del" href="#modal-delete"  data-toggle="modal" data-id='[%= it[item]["id"] %]'>删除</a>
             [% } %]
             
         </td>

public/resource/template/phoneBinding_template_tpl.html

@@ -2,6 +2,7 @@
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr class="text-center">
+		  <td>[% if(it[item]["is_pc"] == 1) { %] 电脑端 [% }else if(it[item]["is_pc"] == 0) { %] 手机端 [% }else{ %] 无效 [% } %]</td>
           <td>[%= it[item]["model"] %]</td>
           <td>[%= it[item]["create_time"] %]</td>
         <td>