Merge remote-tracking branch 'origin/test' into test

application/index/view/houses/edit.html

@@ -329,7 +329,7 @@
 										</select>
 									</div>
 								</li>
-
+                                  <!-- 案场人电话添加多个手机号-->
 								<li class="list-group-item" id="li_acr_phone">
 									<div class="form-group phone-list-container" style="width: 70px;">
 										<label for="">案场人电话</label>
@@ -345,10 +345,12 @@
 									</div>-->
 									<img src="/resource/image/jia2@2x.png" data-hideid='1' class="input-add-tel" id="acr_tel_jia" />
 								</li>
+
 								<li class="list-group-item" id="li_pf_phone">
 									<div class="form-group phone-list-container" style="width: 70px;">
 										<label for="">盘方</label>
 									</div>
+
 									<div class="form-group phone-list-container">
 										<input type="tel" class="form-control phone_jia" placeholder="请输入">
 										<ul></ul>
@@ -359,6 +361,7 @@
 									<div class="form-group phone-list-container" style="width: 70px;">
 										<label for="">案场权限人</label>
 									</div>
+									
 									<div class="form-group phone-list-container">
 										<input type="tel" class="form-control phone_jia" placeholder="请输入">
 										<ul></ul>
@@ -441,7 +444,7 @@
 									<div class="form-group">
 										<label for="internalName">房东手机号</label>
 										<input type="tel" class="form-control" placeholder="请输入" name="landlordPhone" id="landlordPhone" data-alert="请填写房东手机号！">
-									</div>
+									</div><br>
 									<div class="form-group">
 										<label for="internalName">对内商铺名称</label>
 										<input type="text" class="form-control" placeholder="请输入" name="internalName" id="internalName" data-alert="请填写对内商铺名称！">
@@ -601,7 +604,7 @@
 								</li>
 								<li class="list-group-item">
 									<div class="form-group full-width-100 full-pic-area">
-										<label for="">详情页轮播图(至少6张)</label>
+										<label for="">详情页轮播图(至少4张)</label>
 										<input readonly="readonly" type="text" name="xiangqing_pic_input" class="form-control" style="display: none" id="xiangqing_pic_input" placeholder="请选择图片">
 										<button class="btn btn-default upload-image-btn" id="xiangqing_pic_btn" type="button" data-limittop="20">选择图片</button>
 										<span class="tip"></span>

application/index/view/member/users_list.html

@@ -125,16 +125,16 @@
 
                                                  <select class="form-control btn2 margin-top-ld" name="male_status">
                                                     <option value="-1">是否公客</option>
-                                                    <option value="1">是</option>
-                                                    <option value="2">否</option>
+                                                    <option value="2">是</option>
+                                                    <option value="1">否</option>
                                                 </select>
                                                  <input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" name="guest_department" placeholder="客方所属部门" type="text" value="">
                                                  <input class="form-control btn2 margin-top-ld input" data-rule-phoneus="false" data-rule-required="false" name="guest_stores" placeholder="客方所属门店" type="text" value="">
-                                                 <select class="form-control btn2 margin-top-ld" name="guest_status">
-                                                    <option value="-1">客户状态</option>
-                                                    <option value="1">未租</option>
-                                                    <option value="2">已租</option>
-                                                    <option value="3">无效</option>
+                                                 <select class="form-control btn2 margin-top-ld" name="public_status">
+                                                    <option value="2">客户状态</option>
+                                                    <option value="0">未租</option>
+                                                    <option value="1">已租</option>
+                                                    <option value="-1">无效</option>
                                                 </select>
                                                <!--   <span class="btn btn-default btn3 margin-top-ld search_1">搜索</span>
                                                 <span class="btn btn-default btn3 margin-top-ld search_1">重置</span> -->

public/resource/js/edit.js

@@ -834,8 +834,8 @@ define (['ckfinder','ckfinderStart', 'bootstrapJs'], function () {
 				};
 				//详情页轮播图验证是否上传
 				var _xiangqingPicObj = _imgUploadLunbo.find('li>img');
-				if(_xiangqingPicObj.length < 6){
-					alert('详情页轮播图至少需要6张');
+				if(_xiangqingPicObj.length < 4){
+					alert('详情页轮播图至少需要4张');
 					return false;
 				};
 				var _loucengPicObj = _imgUploadLouceng.find('li>img');

public/resource/js/user.js

@@ -232,23 +232,29 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                 }
             });
         },
+        //筛选
         getList: function (pageNo) {
             user.pageNo   = pageNo;
             var params    = {};
+            // 输入 name
+            params.name  = $("input[name='user']").val();
             params.phone  = $("input[name='phone']").val();
             params.invite_phone  = $("input[name='invite_phone']").val();
-            params.invite = $("input[name='invite']").val();
             params.start_date = $("#start_date").val();
             params.end_date = $("#end_date").val();
             params.follow_start = $("#follow_start").val();
             params.follow_end = $("#follow_end").val();
             params.login_status = $("select[name=login_status]").val();
             params.activate = $("select[name=activate]").val();
+            params.rent_user=$("select[name=lguest_status]").val();
+            params.public_user=$("select[name=public_status]").val();
+            params.store_name=$("#guest_stores").val();
+            params.district_name=$("#guest_department").val()
             params.pageNo = user.pageNo;
             params.pageSize = user.pageSize;
-
             $.ajax ({
-                url: '/index/usersList',
+                url: '/index/users_list',
+                // /index/users_list
                 type: 'GET',
                 async: true,
                 data: params,
@@ -269,7 +275,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                     });
                     $("#total_page").html(data.data.total);
                     console.log(data.data.total);
-                    console.log(user.pageSize);
+                    console.log(user.pageSize);+
                     console.log(pageNo);