From ad9f6ec059747c53fd3b3bef9c1d1770bf6cab9d Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 2 Apr 2018 14:18:35 +0800 Subject: [PATCH 1/7] css --- fangija-zsyf/css/main.css | 8 +++--- fangija-zsyf/views/news/newsDetail.html | 37 ++++++++++++++++++------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 25a7c2e..e7d34f3 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -538,13 +538,13 @@ input::-webkit-input-placeholder{ .list-block.commentList .item-text{height:auto;min-height:1.5rem;} .commentBox{height:66px;background:#fff;position:absolute;right:0;left:0;bottom:0;z-index:10;} -.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #DCDCDC;position:absolute;right:0;left:0;bottom:0;z-index:10;} +.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #e7e7e7;position:absolute;right:0;left:0;bottom:0;z-index:10;} .commentBox .searchbar .search-input{line-height:36px;} .commentBox .searchbar .search-input input{height:36px;background:#EFEFEF;} .commentBox .searchbar.commentInputBox .search-input input{padding-left:1.8rem;} -.commentBox .searchbar span{text-align:center;} -.commentBox .searchbar span a font{font-size:0.65rem;color:#666;line-height:36px;} -.commentBox .searchbar span .collection{margin-left:0.75rem;position:static;} +.commentBox .searchbar span{text-align:center;line-height:36px;} +.commentBox .searchbar span font{font-size:0.65rem;color:#666;} +.commentBox .searchbar span.collection{margin-left:0.75rem;position:static;} .commentBox .searchbar > a{line-height:36px;} .icon-comments{width:17px;height:16px;background:url(../images/icon-comments.png) no-repeat center center;background-size:100%;margin-left:0.3rem;vertical-align:baseline;} diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index 4418540..24ad4ec 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -70,7 +70,7 @@
-
  • @@ -135,7 +121,7 @@
  • -
    +
    diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 0fa8d17..82622d5 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1197,7 +1197,6 @@ String.prototype.endWith = function(str) { var reg = new RegExp(str + "$"); return reg.test(this); } - /** * 获取手机上的信息,比如位置,手机ID * @author yinjihuan From 995866d19e5e15434734ddd56414f9d098bd0caa Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 2 Apr 2018 16:29:56 +0800 Subject: [PATCH 3/7] =?UTF-8?q?YOUFANG=20=E8=AF=84=E4=BC=B0=E7=BB=93?= =?UTF-8?q?=E6=9E=9C+=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/evaluate/evaluateReport.html | 282 +++++------------ fangija-zsyf/views/myfocus/myFocus.html | 288 ++++++++++++++++++ 2 files changed, 372 insertions(+), 198 deletions(-) create mode 100644 fangija-zsyf/views/myfocus/myFocus.html diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 8307d46..5b4492c 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -104,19 +104,19 @@ -
    +
    均价走势
    -
    +
    @@ -128,7 +128,7 @@ @@ -238,6 +238,15 @@ $.config = {router: false} evaluate_msg.evaluate_words="暂无" } evaluate_msg.msg=h.evaluateMsg + $("#img").attr("src","http://192.168.10.161:8084/img/"+h.imgId); + loadingChart(h.city,h.region,h.name,2) + //按照时间范围加载数据 + $(".avgPriceTrend a").click(function(){ + var type = $(this).attr("data-id"); + $(".avgPriceTrend a").removeClass("active") + $(this).addClass('active'); + loadingChart(h.city,h.region,h.name,type); + }); } }).catch(function(error){ console.log(error) @@ -295,199 +304,76 @@ $(document).on('click','.open-vertical-modal', function () { + + + + + + + + + + +<#include "/monitor/monitor.html"> + + + \ No newline at end of file From ae7db80789bf501823c8d8b8f33590e6d9f6d436 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 2 Apr 2018 18:57:48 +0800 Subject: [PATCH 4/7] bug --- fangija-zsyf/css/main.css | 5 +- fangija-zsyf/views/house/add.html | 289 ++++++++---------------------- fangija-zsyf/yfindex.html | 78 +++++--- 3 files changed, 139 insertions(+), 233 deletions(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 95b9021..0666237 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -298,8 +298,9 @@ em.down{color:#88D053;} .popup-about02 .list-block.historyList{margin-top:-1px;} .popup-about02 .list-block.historyList .searchHistory{padding-top:0;} .newCss ul{padding:0.75rem;padding-top:0;padding-left:0.25rem;overflow:hidden;} -.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;} +.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;font-size:0.65rem;color:#333;} .newCss ul li span{font-size:0.65rem;color:#333;} +.newCss ul li a{font-size:0.65rem;color:#333;} .newCss ul:before,.popup-about02 .list-block.newCss ul:after{height:0;} .content-padded + .newCss ul{padding-bottom:0;} @@ -1211,6 +1212,8 @@ input[type=range]::-webkit-slider-thumb { .icon-around03:before { content: "\e610"; } +.icon-star:before { content: ""; } + /* 自适应 */ @media(max-width:414px){ .list-block .item-title span.c3a{max-width:220px;} diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index cc3882b..66f0d71 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -47,7 +47,10 @@
    城 市
    - + + + +
    @@ -59,7 +62,7 @@
    房屋地址
    - +
    @@ -151,6 +154,13 @@ 按城市等级 +
    +
    +
    +
    +
    +
    +
    @@ -165,8 +175,8 @@
    热门城市
    -

    北京

    -

    上海

    +

    北京

    +

    上海

    广州

    @@ -184,7 +194,7 @@
    A

    阿坝州

    -

    阿克苏

    +

    阿克苏

    阿拉尔

    阿勒泰

    阿里

    @@ -626,8 +636,8 @@
    一线城市
    -

    北京

    -

    上海

    +

    北京

    +

    上海

    广州

    深圳

    @@ -924,7 +934,7 @@

    陇南

    吴忠

    晋城

    -

    阿克苏

    +

    阿克苏

    喀什

    昌吉

    楚雄

    @@ -1020,144 +1030,21 @@
    + +
    +

    没有找到相关的小区

    +

    没搜到?立刻告诉我们

    +

    返回

    +
    +
    - - -
    -
    附近小区
    -
    -
      -
    • 龙盛佳苑
    • -
    • 米扬公寓
    • -
    • 大华阳城花园一期
    • -
    • 大华阳城花园七期
    • -
    • 沪太路1700弄小区
    • -
    • 浦联佳苑
    • -
    • 大华阳城花园
    • -
    • 大华阳城花园六期
    • -
    -
    -
    -
    +
    热门小区
    @@ -1165,39 +1052,28 @@
    历史记录
      -
    • 龙盛佳苑
    • -
    • 水韵华庭
    • -
    • 中远两湾城
    • -
    • 康宁坊
    • -
    • 雅鹿新苑
    • +
    • {{history.name}}
    • +
    +
    +
    +
    - From 206aa69dd2c2b30540b266c21cef7d7365e65c29 Mon Sep 17 00:00:00 2001 From: hubingliang Date: Tue, 3 Apr 2018 13:48:09 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB?= =?UTF-8?q?=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/config.js | 4 +- .../js/login/{wxLogin.js => thirdLogin.js} | 56 ++++++++++++++++--- fangija-zsyf/manifest.json | 2 +- fangija-zsyf/views/user/codeSms.html | 2 +- 4 files changed, 53 insertions(+), 11 deletions(-) rename fangija-zsyf/js/login/{wxLogin.js => thirdLogin.js} (51%) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index a126994..f20f0c4 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,8 @@ /**服务端地址**/ //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.161:8084"; //var BASE_PATH = "http://192.168.10.53:8084"; -//var BASE_PATH = "http://192.168.10.170:8084"; +var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/js/login/wxLogin.js b/fangija-zsyf/js/login/thirdLogin.js similarity index 51% rename from fangija-zsyf/js/login/wxLogin.js rename to fangija-zsyf/js/login/thirdLogin.js index 64ae6cd..6458c6f 100644 --- a/fangija-zsyf/js/login/wxLogin.js +++ b/fangija-zsyf/js/login/thirdLogin.js @@ -48,14 +48,21 @@ function userinfo(a){ var accessToken = a.authResult.access_token; var unionid = a.userInfo.unionid; var headImg = a.userInfo.headimgurl; - wxlogin(openid,unionid,accessToken,nickname,headImg) + wxLogin(openid,unionid,accessToken,nickname,headImg,"weixin") }else if(a.id=='qq'){ var nickname=a.userInfo.nickname; var openid = a.authResult.openid; var accessToken = a.authResult.access_token; - var headImg = a.userInfo.headimgurl; + var headImg = a.userInfo.headimgurl; + qqLogin(openid,accessToken,nickname,headImg,"qq") }else{ //微博信息获取 + var nickname=a.userInfo.name||a.userInfo.screen_name; + var openid = a.authResult.openid; + var accessToken = a.authResult.access_token; + var headImg = a.userInfo.profile_image_url; + var uid = a.authResult.uid + weiboLogin(openid,accessToken,nickname,headImg,"sinaweibo") } },function(e){ @@ -63,14 +70,49 @@ function userinfo(a){ }); } -function wxlogin(openid, unionid, accessToken, nickname, headImg) { - axios.post("/rest/user/wxLogin", {openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) +function wxLogin(openid, unionid, accessToken, nickname, headImg,loginFrom) { + axios.post("/rest/user/wxLogin", {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) .then(function (response) { $.hidePreloader(); if(response.data.status){ - console.log(JSON.stringify(response.data)) - //跳转页面 - + if("no"==response.data.message){ + //跳转绑定手机号码页面 + + }else{ + + } + }else{ + //登录失败 + $.toast(response.data.data) + } + }) +} +function qqLogin(openid, accessToken, nickname, headImg,loginFrom) { + axios.post("/rest/user/qqLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg}) + .then(function (response) { + $.hidePreloader(); + if(response.data.status){ + if("no"==response.data.message){ + //跳转绑定手机号码页面 + }else{ + + } + }else{ + //登录失败 + $.toast(response.data.data) + } + }) +} +function weiboLogin(openid, accessToken, nickname, headImg,loginFrom) { + axios.post("/rest/user/sinaweiboLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg}) + .then(function (response) { + $.hidePreloader(); + if(response.data.status){ + if("no"==response.data.message){ + //跳转绑定手机号码页面 + }else{ + + } }else{ //登录失败 $.toast(response.data.data) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index e9cc7b5..aacae88 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -317,7 +317,7 @@ "weixin": { "appid": "wx734a9e3085abcd90", "appsecret": "47ce59f3c52984c4e193880fb09b12af" - },"qq":{"appid":"1106734669"} + },"qq":{"appid":"1106734669"},"sina":{"appkey":"3194052034","appsecret":"e863ae4e4f14d41af3142e5ae06867dd","redirect_uri":"http://fangjia.com"} } }, "debug": true diff --git a/fangija-zsyf/views/user/codeSms.html b/fangija-zsyf/views/user/codeSms.html index 74e1cdf..2ff37d3 100644 --- a/fangija-zsyf/views/user/codeSms.html +++ b/fangija-zsyf/views/user/codeSms.html @@ -97,7 +97,7 @@ $.config = {router: false} - +