diff --git a/application/index/controller/House.php b/application/index/controller/House.php
index fd20cbf..8617160 100644
--- a/application/index/controller/House.php
+++ b/application/index/controller/House.php
@@ -43,8 +43,11 @@ class House extends Base
*/
public function index()
{
- $_where['is_del'] = 0;
- $_where['user_id'] = USER_ID;
+ $_where[] = ['is_del','=',0];
+ $_where[] = ['user_id','=',USER_ID];
+ if(!empty($this->request->param('search'))){
+ $_where[] = ['name','like','%'.$this->request->param('search').'%'];
+ }
$count = Db::name($this->table)->where($_where)->count();
$page = $this->request->param('page', 1);
$pagesize = $this->request->param('pagesize', 10);
diff --git a/config/database.php b/config/database.php
index c9d3b8a..fe87ede 100644
--- a/config/database.php
+++ b/config/database.php
@@ -19,7 +19,7 @@ return [
// 数据库类型
'type' => 'mysql',
// 服务器地址
- 'hostname' => '122.114.94.77',
+ 'hostname' => '122.114.59.173',
// 数据库名
'database' => 'xunxibao.yaoyz',
// 用户名
diff --git a/weapp/xunxibao/pages/house/list/index.js b/weapp/xunxibao/pages/house/list/index.js
index 047f07d..b079456 100644
--- a/weapp/xunxibao/pages/house/list/index.js
+++ b/weapp/xunxibao/pages/house/list/index.js
@@ -9,7 +9,8 @@ Page({
dataList: [],
page: 1,
pages: 0,
- detailUrl: '/pages/house/view/index'
+ detailUrl: '/pages/house/view/index',
+ search:''
},
/**
@@ -33,11 +34,24 @@ Page({
this.getDataList(1, true);
},
+ formSubmit: function(e) {
+ const params = e.detail.value
+ this.setData({
+ search: params.search
+ })
+ //执行搜索查询
+ this.getDataList(1, true)
+ },
+
//获取数据列表
getDataList: function(pageNum, override) {
this.loading = true;
var self = this;
var url = app.globalData.requestUrl + 'index/house/index?pagesize=7&page=' + pageNum;
+ var search = this.data.search;
+ if (search != undefined) {
+ url += '&search=' + search
+ }
return netUtil.sendGet(url)
.then((res) => {
if (res.statusCode == 200 && res.data.code == 200) {
diff --git a/weapp/xunxibao/pages/house/list/index.wxml b/weapp/xunxibao/pages/house/list/index.wxml
index 5f9cbc6..d53e5ce 100644
--- a/weapp/xunxibao/pages/house/list/index.wxml
+++ b/weapp/xunxibao/pages/house/list/index.wxml
@@ -8,6 +8,19 @@
我的房源
+
+
+
diff --git a/weapp/xunxibao/pages/index/index.js b/weapp/xunxibao/pages/index/index.js
index fb50282..30b7d4c 100644
--- a/weapp/xunxibao/pages/index/index.js
+++ b/weapp/xunxibao/pages/index/index.js
@@ -39,7 +39,8 @@ Page({
region: ['安徽省', '合肥市', '蜀山区'],
search: '',
latitude: 31.860026,
- longitude: 117.256507
+ longitude: 117.256507,
+ num:100
},
onLoad() {
@@ -128,6 +129,9 @@ Page({
searchKilometre: function(e) {
var num = e.currentTarget.dataset.num;
//执行搜索查询
+ this.setData({
+ num:e.currentTarget.dataset.num
+ })
this.getList(1, true, '', num)
},
@@ -148,6 +152,10 @@ Page({
if (search != undefined) {
url += '&search=' + search
}
+ if(num == undefined){
+ var num = this.data.num;
+ }
+
if (num != undefined) {
//根据经伟度获取公里数
if (this.data.latitude != '') {
diff --git a/weapp/xunxibao/pages/index/index.wxml b/weapp/xunxibao/pages/index/index.wxml
index b2feb8e..4c545be 100644
--- a/weapp/xunxibao/pages/index/index.wxml
+++ b/weapp/xunxibao/pages/index/index.wxml
@@ -96,6 +96,9 @@
+
+ 全部
+
附近2公里
diff --git a/weapp/xunxibao/project.config.json b/weapp/xunxibao/project.config.json
index 13db895..4282e69 100644
--- a/weapp/xunxibao/project.config.json
+++ b/weapp/xunxibao/project.config.json
@@ -1,7 +1,8 @@
{
- "description": "项目配置文件",
+ "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"packOptions": {
- "ignore": []
+ "ignore": [],
+ "include": []
},
"setting": {
"urlCheck": false,
@@ -21,7 +22,7 @@
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
- "useMultiFrameRuntime": false,
+ "useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": {
"ignore": [],
@@ -32,294 +33,245 @@
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
- "packNpmRelationList": []
+ "packNpmRelationList": [],
+ "lazyloadPlaceholderEnable": false,
+ "minifyWXSS": true,
+ "useStaticServer": true,
+ "showES6CompileOption": false,
+ "disableUseStrict": false,
+ "useCompilerPlugins": false,
+ "minifyWXML": true
},
"compileType": "miniprogram",
"libVersion": "2.7.7",
"appid": "wx7ca003544973822a",
"projectname": "%E7%A7%9F%E6%88%BF%E6%8E%8C%E6%9F%9C",
- "debugOptions": {
- "hidedInDevtools": []
- },
- "isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
- "search": {
- "current": -1,
- "list": []
- },
- "conversation": {
- "current": -1,
- "list": []
- },
- "plugin": {
- "current": -1,
- "list": []
- },
- "game": {
- "currentL": -1,
- "list": []
- },
- "gamePlugin": {
- "current": -1,
- "list": []
- },
"miniprogram": {
- "current": 30,
"list": [
{
- "id": -1,
"name": "pages/member/index",
"pathName": "pages/member/index",
"query": "",
"scene": null
},
{
- "id": 1,
"name": "pages/house/form",
"pathName": "pages/house/form",
"query": "id=59",
"scene": null
},
{
- "id": -1,
"name": "pages/member/index",
"pathName": "pages/member/index",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/house/list/index",
"pathName": "pages/house/list/index",
"query": "",
"scene": null
},
{
- "id": 4,
"name": "pages/house/view/index",
"pathName": "pages/house/view/index",
"query": "id=59",
"scene": null
},
{
- "id": -1,
"name": "pages/tenant/list/add",
"pathName": "pages/tenant/list/add",
"query": "id=3",
"scene": null
},
{
- "id": 6,
"name": "pages/house/room/index",
"pathName": "pages/house/room/index",
"query": "id=62",
"scene": null
},
{
- "id": 7,
"name": "pages/house/room/view",
"pathName": "pages/house/room/view",
"query": "id=85",
"scene": null
},
{
- "id": -1,
"name": "pages/single/about",
"pathName": "pages/single/about",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/member/member",
"pathName": "pages/member/member",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/member/member",
"pathName": "pages/member/member",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/member/member",
"pathName": "pages/member/member",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/member/view",
"pathName": "pages/member/view",
"query": "id=1",
"scene": null
},
{
- "id": -1,
"name": "pages/login/index",
"pathName": "pages/index/index",
"query": "id=1",
"scene": null
},
{
- "id": -1,
"name": "pages/login/index",
"pathName": "pages/login/index",
"query": "id=1",
"scene": null
},
{
- "id": 15,
"name": "pages/house/view/index",
"pathName": "pages/house/view/index",
"query": "id=59",
"scene": null
},
{
- "id": -1,
"name": "pages/contract/index",
"pathName": "pages/contract/index",
"query": "id=59",
"scene": null
},
{
- "id": -1,
"name": "pages/question/index",
"pathName": "pages/question/index",
"query": "id=59",
"scene": null
},
{
- "id": -1,
"name": "pages/member/personal",
"pathName": "pages/member/personal",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/member/pay",
"pathName": "pages/member/pay",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/member/order",
"pathName": "pages/member/order",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/subaccount/index",
"pathName": "pages/subaccount/index",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/subaccount/form",
"pathName": "pages/subaccount/form",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/login/subaccount",
"pathName": "pages/login/subaccount",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/tenant/order",
"pathName": "pages/tenant/order",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/contract/view",
"pathName": "pages/contract/view",
"query": "id=33",
"scene": null
},
{
- "id": -1,
"name": "pages/tenant/view/index",
"pathName": "pages/tenant/view/index",
"query": "id=54&phone=18205513223",
"scene": null
},
{
- "id": -1,
"name": "pages/house/expire",
"pathName": "pages/house/expire",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/single/help",
"pathName": "pages/single/help",
"query": "id=85",
"scene": null
},
{
- "id": -1,
"name": "pages/house/form",
"pathName": "pages/house/form",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/house/room/add",
"pathName": "pages/house/room/add",
"query": "id=113",
"scene": null
},
{
- "id": -1,
"name": "pages/house/room/expire_room",
"pathName": "pages/house/room/expire_room",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/house/form",
"pathName": "pages/house/form",
"query": "id=113",
"scene": null
},
{
- "id": -1,
"name": "pages/member/myclean",
"pathName": "pages/member/myclean",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/clean/index",
"pathName": "pages/clean/index",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "pages/clean/my",
"pathName": "pages/clean/my",
+ "query": "",
"scene": null
}
]
}
+ },
+ "editorSetting": {
+ "tabIndent": "insertSpaces",
+ "tabSize": 2
}
}
\ No newline at end of file