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/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/images/exchange-step01.png b/fangija-zsyf/images/exchange-step01.png
index 8bec048..d095219 100644
Binary files a/fangija-zsyf/images/exchange-step01.png and b/fangija-zsyf/images/exchange-step01.png differ
diff --git a/fangija-zsyf/images/exchange-step02.png b/fangija-zsyf/images/exchange-step02.png
index 629cd73..c2c9885 100644
Binary files a/fangija-zsyf/images/exchange-step02.png and b/fangija-zsyf/images/exchange-step02.png differ
diff --git a/fangija-zsyf/images/headPortrait.png b/fangija-zsyf/images/headPortrait.png
index f1ce268..dc1ea89 100644
Binary files a/fangija-zsyf/images/headPortrait.png and b/fangija-zsyf/images/headPortrait.png differ
diff --git a/fangija-zsyf/images/icon-personal01.png b/fangija-zsyf/images/icon-personal01.png
new file mode 100644
index 0000000..6f44a0a
Binary files /dev/null and b/fangija-zsyf/images/icon-personal01.png differ
diff --git a/fangija-zsyf/images/icon-personal02.png b/fangija-zsyf/images/icon-personal02.png
new file mode 100644
index 0000000..cb048e4
Binary files /dev/null and b/fangija-zsyf/images/icon-personal02.png differ
diff --git a/fangija-zsyf/images/icon-personal03.png b/fangija-zsyf/images/icon-personal03.png
new file mode 100644
index 0000000..7d12a9c
Binary files /dev/null and b/fangija-zsyf/images/icon-personal03.png differ
diff --git a/fangija-zsyf/images/icon-personal04.png b/fangija-zsyf/images/icon-personal04.png
new file mode 100644
index 0000000..7527eac
Binary files /dev/null and b/fangija-zsyf/images/icon-personal04.png differ
diff --git a/fangija-zsyf/images/icon-set.png b/fangija-zsyf/images/icon-set.png
index 4e1d0c0..990a27a 100644
Binary files a/fangija-zsyf/images/icon-set.png and b/fangija-zsyf/images/icon-set.png differ
diff --git a/fangija-zsyf/images/noData.png b/fangija-zsyf/images/noData.png
index f7d9239..8a3b890 100644
Binary files a/fangija-zsyf/images/noData.png and b/fangija-zsyf/images/noData.png differ
diff --git a/fangija-zsyf/images/rankingImg01.png b/fangija-zsyf/images/rankingImg01.png
new file mode 100644
index 0000000..c2e766b
Binary files /dev/null and b/fangija-zsyf/images/rankingImg01.png differ
diff --git a/fangija-zsyf/images/rankingImg02.png b/fangija-zsyf/images/rankingImg02.png
new file mode 100644
index 0000000..f54f39f
Binary files /dev/null and b/fangija-zsyf/images/rankingImg02.png differ
diff --git a/fangija-zsyf/images/rankingImg03.png b/fangija-zsyf/images/rankingImg03.png
new file mode 100644
index 0000000..c1eb6f7
Binary files /dev/null and b/fangija-zsyf/images/rankingImg03.png differ
diff --git a/fangija-zsyf/images/topBg.png b/fangija-zsyf/images/topBg.png
index d561d06..c5a8a99 100644
Binary files a/fangija-zsyf/images/topBg.png and b/fangija-zsyf/images/topBg.png differ
diff --git a/fangija-zsyf/js/login/thirdLogin.js b/fangija-zsyf/js/login/thirdLogin.js
new file mode 100644
index 0000000..9f94671
--- /dev/null
+++ b/fangija-zsyf/js/login/thirdLogin.js
@@ -0,0 +1,121 @@
+var auths = {}
+function plusReady() {
+ plus.oauth.getServices(function(services) {
+ for(var i in services){
+ var service=services[i];
+ auths[service.id]=service;
+ }
+ }, function(e) {
+ alert("获取登录服务列表失败:" + e.message + " - " + e.code);
+ });
+}
+document.addEventListener('plusready',plusReady,false);
+// 登录认证
+function loginInfo(dest){
+ var auth=auths[dest];
+ console.log(JSON.stringify(auth))
+ if(auth){
+ var w=null;
+ if(plus.os.name=="Android"){
+ w=plus.nativeUI.showWaiting();
+ }
+ document.addEventListener("pause",function(){
+ setTimeout(function(){
+ w&&w.close();w=null;
+ },2000);
+ }, false );
+ auth.login(function(){
+ w&&w.close();w=null;
+ userinfo(auth);
+ },function(e){
+ w&&w.close();w=null;
+ $.toast("登录认证失败:["+e.code+"]:"+e.message);
+ });
+ }else{
+ $.toast("无效的登录认证通道!");
+ $.toast("无效的登录认证通道!",null,"登录");
+ }
+}
+
+//wx获取用户信息
+function userinfo(a){
+ a.getUserInfo(function(){
+ console.log(JSON.stringify(a))
+ $.showPreloader();
+ if(a.id=='weixin'){
+ var nickname=a.userInfo.nickname||a.userInfo.name||a.userInfo.miliaoNick;
+ var openid = a.authResult.openid;
+ var accessToken = a.authResult.access_token;
+ var unionid = a.userInfo.unionid;
+ var headImg = a.userInfo.headimgurl;
+ 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;
+ 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){
+ $.toast("获取微信用户信息失败:["+e.code+"]:"+e.message);
+ });
+}
+
+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){
+ if("no"==response.data.message){
+ //跳转绑定手机号码页面
+ console.log(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/js/login/wxLogin.js b/fangija-zsyf/js/login/wxLogin.js
deleted file mode 100644
index 1b144a1..0000000
--- a/fangija-zsyf/js/login/wxLogin.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var auths = {}
-function plusReady() {
- plus.oauth.getServices(function(services) {
- alert("111111111111111111111111")
- auths = services;
- }, function(e) {
- alert("获取登录服务列表失败:" + e.message + " - " + e.code);
- });
-}
-document.addEventListener('plusready',plusReady,false);
-// 登录认证
-function webChatLogin(){
- var auth=auths['weixin'];
- if(auth){
- var w=null;
- if(plus.os.name=="Android"){
- w=plus.nativeUI.showWaiting();
- }
- document.addEventListener("pause",function(){
- setTimeout(function(){
- w&&w.close();w=null;
- },2000);
- }, false );
- auth.login(function(){
- w&&w.close();w=null;
- userinfo(auth);
- },function(e){
- w&&w.close();w=null;
- $.toast("登录认证失败:["+e.code+"]:"+e.message);
- });
- }else{
- $.toast("无效的登录认证通道!");
- $.toast("无效的登录认证通道!",null,"登录");
- }
-}
-
-function authLogin(type) {
- console.log("hhhhhhhhhhhhhhhhhhh")
-}
diff --git a/fangija-zsyf/js/searchDistrict-add.js b/fangija-zsyf/js/searchDistrict-add.js
new file mode 100644
index 0000000..fb6a808
--- /dev/null
+++ b/fangija-zsyf/js/searchDistrict-add.js
@@ -0,0 +1,179 @@
+var xhr;
+var searchDistVue = new Vue({
+ el: '#searchList',
+ data: {
+ searchDistricts: []
+ },methods: {
+ openDistrictDetail:function(index) {
+ saveHistory({district:this.searchDistricts[index].region,name:this.searchDistricts[index].name,city:this.searchDistricts[index].city})
+ $("#input_address").val(this.searchDistricts[index].name);
+ $("[name=region]").val(this.searchDistricts[index].region)
+ $("[name=name]").val(this.searchDistricts[index].name)
+ $("[name=cityAddress]").val(this.searchDistricts[index].city)
+ $("[name=address]").val(this.searchDistricts[index].address)
+ $.popup(".popup-about02")
+ }
+ }
+})
+
+$("#districtName").bind("input propertychange keyup" , function () {
+ var keyword = $(this).val()
+ if(xhr){
+ xhr.abort()
+ }
+ if(keyword == ""){
+ // $('.searchList #searchList').empty()
+ return
+ }
+
+ axios.get(BASE_PATH+"/rest/districts/search", {
+ params: {
+ keywords : keyword,
+ cityName:$("#input_city").val(),
+ max:20
+ }
+ }).then(function (response) {
+
+ var datas = response.data.data
+
+ $('.hotList').hide();
+ $('.historyList').hide();
+ if(datas == null || datas.length == 0){
+ $("#notFound").show()
+ searchDistVue.$data.searchDistricts = []
+ //$('.searchList #searchList').empty();
+ }else{
+ $("#notFound").hide()
+ var dists = [];
+ for(var i in datas){
+ var o = datas[i]
+ var map={city:o.city, region:o.district, name:o.name,address:o.address};
+ dists.push(map);
+ }
+ //searchDistVue.$set("searchDistricts") = dists;
+ searchDistVue.$data.searchDistricts=dists
+ $('.searchList').show();
+ }
+ }).catch(function (error) {
+ alert(error)
+ console.log(error);
+ });
+
+})
+
+function saveHistory(district) {
+ var history = recover()
+ var keys = []
+ var newHistory = []
+ newHistory.push(district)
+ keys.push(district.city + "#" + district.region + "#" + district.name)
+ for(var i = 0; i < history.length; i++){
+ var key = history[i].city + "#" +history[i].region + "#" + history[i].name
+ if($.inArray(key, keys) > -1){
+ continue
+ }
+ if(newHistory.length < 5){
+ keys.push(key)
+ newHistory.push(history[i])
+ }else{
+ break
+ }
+ }
+ //$.cookie('history',JSON.stringify(newHistory) ,{ expires: 7})
+ localStorage.setItem("history", JSON.stringify(newHistory));
+}
+
+function recover() {
+ //var history = $.cookie('history')
+ var history = localStorage.getItem('history');
+ if(history == undefined || history == ''){
+ return new Array()
+ }
+ return JSON.parse(history)
+}
+/* 弹出搜索小区页面 */
+$("body").delegate(".open-about02", "click", function () {
+ $("#districtName").val("");
+ if($("#input_city").val()==""){
+ $.toast("请选择城市")
+ return false;
+ }
+ $('.historyList').show();
+ $("#notFound").hide();
+ $('.hotList').show();
+ $('.searchList').hide();
+ addHotDistricts($("#input_city").val());
+ addHistory();
+ $.popup(".popup-about02")
+ $("input").blur()
+});
+
+//添加热门小区
+function addHotDistricts(cityParam){
+ axios.get(BASE_PATH+"/rest/districts/hotDistricts", {
+ params: {
+ city: cityParam,
+ top:6
+ }
+ }).then(function (response) {
+ var datas = response.data.data
+ if(datas.length>0){
+ var dists = [];
+ for(var i in datas){
+
+ var o = datas[i]
+ var map={city:o.city, region:o.region, name:o.name};
+ dists.push(map);
+ }
+
+ new Vue({
+ el: '#hotList',
+ data: {
+ hotDists: dists
+ }
+ })
+
+ }
+
+ }).catch(function (error) {
+ alert(error)
+ console.log(error);
+ });
+}
+var histories = [];
+var historyVue = new Vue({
+ el: '#districtList',
+ data: {
+ histories: histories
+ },methods: {
+ openHistoryDetail:function(index) {
+ $("#input_address").val(this.histories[index].name);
+ $("[name=region]").val(this.histories[index].region);
+ $("[name=name]").val(this.histories[index].name);
+ $("[name=cityAddress]").val(this.histories[index].city);
+ $.popup(".popup-about02")
+ }
+ }
+})
+function addHistory(){
+ var history = recover()
+ if(history.length>0){
+ histories = []
+ $(history).each(function(){
+ var map={city:this.city, region:this.district, name:this.name};
+ histories.push(map)
+ })
+ historyVue.histories=histories;
+
+
+ }/*else{
+ $(".historyList #districtList").empty();
+ }*/
+}
+
+//点击清空
+$("#clearSearchHistory").click(function(){
+ localStorage.removeItem('history')
+ historyVue.histories=[];
+});
+
diff --git a/fangija-zsyf/js/updateVersion/searchDistrict-app.js b/fangija-zsyf/js/updateVersion/searchDistrict-app.js
new file mode 100644
index 0000000..dab006f
--- /dev/null
+++ b/fangija-zsyf/js/updateVersion/searchDistrict-app.js
@@ -0,0 +1,176 @@
+var xhr;
+var searchDistVue = new Vue({
+ el: '#searchList',
+ data: {
+ searchDistricts: []
+ },methods: {
+ openDistrictDetail:function(index) {
+ saveHistory({district:this.searchDistricts[index].region,name:this.searchDistricts[index].name,city:this.searchDistricts[index].city})
+ clicked(BASE_PATH+'/district/details?city='+this.searchDistricts[index].city+'®ion='+this.searchDistricts[index].region+'&name='+this.searchDistricts[index].name,true);
+ }
+ }
+})
+
+$("#districtName").bind("input propertychange keyup" , function () {
+ var keyword = $(this).val()
+ if(xhr){
+ xhr.abort()
+ }
+ if(keyword == ""){
+ // $('.searchList #searchList').empty()
+ return
+ }
+
+ axios.get(BASE_PATH+"/rest/districts/search", {
+ params: {
+ keywords : keyword,
+ cityName:$("#input_city").text(),
+ max:20
+ }
+ }).then(function (response) {
+
+ var datas = response.data.data
+
+ $('.hotList').hide();
+ $('.historyList').hide();
+ if(datas == null || datas.length == 0){
+ $("#notFound").show()
+ searchDistVue.$data.searchDistricts = []
+ //$('.searchList #searchList').empty();
+ }else{
+
+ console.log(keyword +" "+datas.length);
+ $("#notFound").hide()
+ var dists = [];
+ for(var i in datas){
+ var o = datas[i]
+ var map={city:o.city, region:o.district, name:o.name,address:o.address};
+ dists.push(map);
+ }
+
+ //searchDistVue.$set("searchDistricts") = dists;
+ searchDistVue.$data.searchDistricts=dists
+ $('.searchList').show();
+ }
+ }).catch(function (error) {
+ alert(error)
+ console.log(error);
+ });
+
+})
+
+function saveHistory(district) {
+ var history = recover()
+ var keys = []
+ var newHistory = []
+ newHistory.push(district)
+ keys.push(district.city + "#" + district.region + "#" + district.name)
+ for(var i = 0; i < history.length; i++){
+ var key = history[i].city + "#" +history[i].region + "#" + history[i].name
+ if($.inArray(key, keys) > -1){
+ continue
+ }
+ if(newHistory.length < 5){
+ keys.push(key)
+ newHistory.push(history[i])
+ }else{
+ break
+ }
+ }
+ //$.cookie('history',JSON.stringify(newHistory) ,{ expires: 7})
+ localStorage.setItem("history", JSON.stringify(newHistory));
+}
+
+function recover() {
+ //var history = $.cookie('history')
+ var history = localStorage.getItem('history');
+ if(history == undefined || history == ''){
+ return new Array()
+ }
+ return JSON.parse(history)
+}
+/* 弹出搜索小区页面 */
+$("body").delegate(".open-about02", "click", function () {
+ $("#districtName").val("");
+ if($("#input_city").text()==""){
+ $.toast("请选择城市")
+ return false;
+ }
+ $('.historyList').show();
+ $("#notFound").hide();
+ $('.hotList').show();
+ $('.searchList').hide();
+ addHotDistricts($("#input_city").text());
+ addHistory();
+ $.popup(".popup-about02")
+ $("input").blur()
+});
+
+//添加热门小区
+function addHotDistricts(cityParam){
+ axios.get(BASE_PATH+"/rest/districts/hotDistricts", {
+ params: {
+ city: cityParam,
+ top:6
+ }
+ }).then(function (response) {
+ var datas = response.data.data
+ if(datas.length>0){
+ var dists = [];
+ for(var i in datas){
+
+ var o = datas[i]
+ var map={city:o.city, region:o.region, name:o.name};
+ dists.push(map);
+ }
+
+ new Vue({
+ el: '#hotList',
+ data: {
+ hotDists: dists
+ }
+ })
+
+ }
+
+ }).catch(function (error) {
+ alert(error)
+ console.log(error);
+ });
+}
+var histories = [];
+var historyVue = new Vue({
+ el: '#districtList',
+ data: {
+ histories: histories
+ },methods: {
+ openHistoryDetail:function(index) {
+ clicked(BASE_PATH+'/district/details?city='+this.histories[index].city+'®ion='+this.histories[index].region+'&name='+this.histories[index].name,true);
+ }
+ }
+})
+function addHistory(){
+ var history = recover()
+ if(history.length>0){
+ histories = []
+ $(history).each(function(){
+ var map={city:this.city, region:this.district, name:this.name};
+ histories.push(map)
+ })
+ historyVue.histories=histories;
+
+
+ }/*else{
+ $(".historyList #districtList").empty();
+ }*/
+}
+
+//点击清空
+$("#clearSearchHistory").click(function(){
+ //$.cookie('history',JSON.stringify([]) ,{ expires: 7});
+ localStorage.removeItem('history')
+ historyVue.histories=[];
+ //$("#districtList").empty();
+ //$.popup(".popup-about02")
+});
+
diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json
index 98399d1..ebe1f31 100644
--- a/fangija-zsyf/manifest.json
+++ b/fangija-zsyf/manifest.json
@@ -14,7 +14,7 @@
"icons": {
"144": "icon.png"
},
- "launch_path": "main.html",/*应用的入口页面,默认为根目录下的index.html;支持网络地址,必须以http://或https://开头*/
+ "launch_path": "/views/user/bindingMobile.html",/*应用的入口页面,默认为根目录下的index.html;支持网络地址,必须以http://或https://开头*/
"developer": {
"name": "",/*开发者名称*/
"email": "",/*开发者邮箱地址*/
@@ -101,9 +101,7 @@
"Maps": {
"description": "地图"
},
- "OAuth": {
- "description": "登录授权"
- },
+ "OAuth": {},
"Push": {
"description": "消息推送"
@@ -312,12 +310,6 @@
"description": "可选,微信分享",
"appid": "wx734a9e3085abcd90",
"appsecret": "47ce59f3c52984c4e193880fb09b12af"
- },
- "sina": {
- "appkey": "3194052034",
- "appsecret": "e863ae4e4f14d41af3142e5ae06867dd",
- "redirect_uri": "http://sh.fangjia.com/",
- "description": "可选,新浪微博分享"
}
},
"payment": {},
@@ -325,7 +317,7 @@
"weixin": {
"appid": "wx734a9e3085abcd90",
"appsecret": "47ce59f3c52984c4e193880fb09b12af"
- }
+ },"qq":{"appid":"1106734669"},"sina":{"appkey":"3194052034","appsecret":"e863ae4e4f14d41af3142e5ae06867dd","redirect_uri":"http://fangjia.com"}
}
},
"debug": true
@@ -1519,6 +1511,20 @@
],
"refer": [],
"priority": 0
+ },
+ "/views/user/bindingMobile.html": {
+ "resources": [],
+ "refer": [
+ "error.html"
+ ],
+ "priority": 0
+ },
+ "views/user/codeSms.html": {
+ "resources": [
+ "/views/user/bindingMobile.html"
+ ],
+ "refer": [],
+ "priority": 0
}
},
"idle": {
diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html
index 8f976ee..2956840 100644
--- a/fangija-zsyf/views/evaluate/evaluateList.html
+++ b/fangija-zsyf/views/evaluate/evaluateList.html
@@ -73,9 +73,11 @@ $.config = {router: false}
+
-
+
+
@@ -83,6 +85,8 @@ $.config = {router: false}
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+