diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index b7b64f4..df8c4da 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,12 +1,11 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.161:8084"; +//var BASE_PATH = "http://192.168.10.47:8086"; //var BASE_PATH = "http://192.168.10.53:8084"; -//var BASE_PATH = "http://192.168.10.161:8084"; +var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; -var BASE_PATH = "http://192.168.10.164:8084"; +//var BASE_PATH = "http://192.168.10.164:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/js/user/myMessage.js b/fangija-zsyf/js/user/myMessage.js new file mode 100644 index 0000000..e9fa97d --- /dev/null +++ b/fangija-zsyf/js/user/myMessage.js @@ -0,0 +1,92 @@ +//加载flag +var mm_loading = false; +//最多可加载的条目 +//var maxItems = 100; +//每次加载添加多少条目 +var mm_itemsPerLoad = 10; + +var mm_totalCount = 0; + +function addMessage(loadNum,startNum){ + axios.get(BASE_PATH + "/rest/message/loadMessages",{ + params:{ + loadNum:loadNum, + startNum:startNum + } + }).then(function(response){ + var messageList = response.data.data.list; + if(messageList != null && messageList.length == 0){ + // 删除加载提示符 + $('#loadTip4').remove(); + // 加载完毕,则注销无限加载事件,以防不必要的加载 + //$.detachInfiniteScroll($('.infinite-scroll')); + return; + } + mm_totalCount = response.data.data.totalCount; + tab.mm_num = mm_totalCount; + var html=""; + $.each(messageList,function(){ +// var clickStr = ""; +// if(this.operation==0){//打开详情 +// href = ''+ + '
'+ + '
'+ + '
'+ + '
'+(this.title.length>20?this.title.substring(0,19):this.title)+'
'+ + '
'+ + '
'+this.addTimeStr+'
'+ + '
'+ + '
'+ + ''; + }) + $("#messageUl").append(html); + if(mm_totalCount

{{name}}

diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index fed4523..ae37d41 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -30,7 +30,7 @@

评估报告

diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 90ebf56..2af97b5 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1673,7 +1673,6 @@ $("#evaluation_btn").on("click", function () { var d = $("#input_building").val(); var e = $("#input_floor").val(); var f = $("#input_area").val(); - if(a == ""){ $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择城市"); @@ -1698,7 +1697,7 @@ $("#evaluation_btn").on("click", function () { $("#evaluation_btn").removeAttr("disabled"); $.toast("所在楼层不能为空!"); return false; - }else if(e.indexOf("总楼层")!= -1){ + }else if(e.indexOf("总楼层")!= -1||e.indexOf("共")== -1){ $("#evaluation_btn").removeAttr("disabled"); $.toast("总楼层不能为空!"); return false; diff --git a/fangija-zsyf/views/message/detail.html b/fangija-zsyf/views/message/detail.html new file mode 100644 index 0000000..c119857 --- /dev/null +++ b/fangija-zsyf/views/message/detail.html @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+ +

{{title}}

+
+
+
+

{{title}}

+

+ {{content}} +

+
+
+
+
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index 3e5fca0..530d0d3 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -30,7 +30,7 @@

diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index c3331be..dd114fa 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -76,7 +76,7 @@ 房产(0) 关注(0) 收藏(0) - + 消息(0)
@@ -192,33 +192,15 @@
-
@@ -249,6 +231,7 @@ $.config = {router: false} +