diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 591cd83..375fa77 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -3,6 +3,6 @@ //var BASE_PATH = "http://192.168.10.47:8086"; var BASE_PATH = "http://192.168.10.161:8086"; //var BASE_PATH = "http://192.168.10.53:8084"; -//var BASE_PATH = "http://192.168.10.171:8084"; +var BASE_PATH = "http://192.168.10.170: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 59305d6..1b238fe 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -580,6 +580,33 @@ input::-webkit-input-placeholder{ .commentBox .icon-collection01{display:inline-block;vertical-align:text-bottom;margin:0;} .commentBox .icon-collection02{display:inline-block;vertical-align:text-bottom;margin:0;} +/* 登录 */ +.icon-login01{width:14px;height:20px;background:url(../images/icon-login01.png) no-repeat center center;background-size:100%;vertical-align:text-bottom;} +.icon-login02{width:15px;height:19px;background:url(../images/icon-login02.png) no-repeat center center;background-size:100%;vertical-align:text-bottom;} +.icon-login03{width:15px;height:18px;background:url(../images/icon-login03.png) no-repeat center center;background-size:100%;vertical-align:text-bottom;} +.icon-loginMode01{width:30px;height:24px;background:url(../images/icon-loginMode01.png) no-repeat center center;background-size:100%;} +.icon-loginMode02{width:30px;height:24px;background:url(../images/icon-loginMode02.png) no-repeat center center;background-size:100%;} +.icon-loginMode03{width:22px;height:24px;background:url(../images/icon-loginMode03.png) no-repeat center center;background-size:100%;} +#input_phoneNumber,#input_codeSms,#input_password{left:24px;width:80%;} +#input_phoneNumber{width:50%;} +#input_feedback{width:100%;height:100px;} +.list-block .item-after .icon-eye-grey{width:0.9rem;height:0.65rem;margin-right:0;margin-top:0.25rem;} +.list-block .item-after .icon-eye-orange{width:0.9rem;height:0.65rem;margin-right:0;margin-top:0.25rem;} +.sendCode{padding:0 8px;height:27px;background:#fff;border:solid 1px #2db0fc;border-radius:3px;color:#2db0fc;text-align:center;line-height:26px;font-size:0.7rem;float:right;margin-top:-2px;} +.waiting{padding:0 8px;height:27px;background:#0a8ddf;border:solid 1px #0a8ddf;border-radius:3px;color:#fff;text-align:center;line-height:26px;font-size:0.7rem;float:right;margin-top:-2px;} +.agreement{font-size:0.65rem;color:#666;margin-left:0.75rem;} +.agreement a{font-size:0.65rem;} +.check{width:18px;height:18px;border:solid 1px #D7D7D7;border-radius:0.05rem;display:inline-block;vertical-align:middle;margin-right:0.2rem;position:relative;} +.checkImg{width:10px;height:7px;position:absolute;top:5px;left:3px;} +.loginBox p{text-align:center;margin:0;} +.loginBox p .button{margin-top:2rem;margin-bottom:0.5rem;} +.loginBox p a{font-size:0.65rem;color:#AA907A;} +.loginMode{width:100%;position:absolute;bottom:4.5rem;} +.loginMode p{font-size:0.65rem;color:#999;text-align:center;} +.loginMode p a:nth-child(2){margin:0 2rem;} +.line{width:100%;height:1px;background:#e5e5e5;margin-bottom:1.5rem;position:relative;} +.line span{position:absolute;top:-10px;left:50%;margin-left:-57.5px;display:block;background:#fff;padding:0 25px;font-size:0.65rem;color:#999;} + /* 顶部 */ .top{width:100%;padding:0.75rem 0.5rem;border-bottom:solid 1px #DCDCDC;overflow:hidden;position:absolute;top:0;z-index:10;} .top.bar{height:auto;} diff --git a/fangija-zsyf/images/checkImg02.png b/fangija-zsyf/images/checkImg02.png new file mode 100644 index 0000000..bbfdccb Binary files /dev/null and b/fangija-zsyf/images/checkImg02.png differ diff --git a/fangija-zsyf/js/login/codeSms.js b/fangija-zsyf/js/login/codeSms.js new file mode 100644 index 0000000..2d3743a --- /dev/null +++ b/fangija-zsyf/js/login/codeSms.js @@ -0,0 +1,16 @@ +export default { + methods: { + checkPhoneNum (phone) { + alert("1111111111111") + } + } +} +var sendPhoneCode = new Vue({ + el:'#sendPhoneCode', + methods:{ + sendCode:function(){ + alert("222222222") + checkPhoneNum("1352222222") + } + } +}) \ No newline at end of file diff --git a/fangija-zsyf/js/shara/sharaMine.js b/fangija-zsyf/js/shara/sharaMine.js index 658be98..aa85060 100644 --- a/fangija-zsyf/js/shara/sharaMine.js +++ b/fangija-zsyf/js/shara/sharaMine.js @@ -35,7 +35,7 @@ function shareAction(sb,bh) { }else{ msg.content=sharehrefDes; } - } + } msg.thumbs=[picUrl]; msg.pictures=[picUrl]; }else{ @@ -66,6 +66,7 @@ function shareMessage(msg,s){ alert("分享到\""+s.description+"\"成功! " ); }, function(e){ + console.log(e.code+"========="+e.message) alert( "分享到\""+s.description+"\"失败 !"); } ); diff --git a/fangija-zsyf/js/zepto.md5.js b/fangija-zsyf/js/zepto.md5.js new file mode 100644 index 0000000..85a7b54 --- /dev/null +++ b/fangija-zsyf/js/zepto.md5.js @@ -0,0 +1,183 @@ +(function($){ + var rotateLeft = function(lValue, iShiftBits) { + return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits)); + } + var addUnsigned = function(lX, lY) { + var lX4, lY4, lX8, lY8, lResult; + lX8 = (lX & 0x80000000); + lY8 = (lY & 0x80000000); + lX4 = (lX & 0x40000000); + lY4 = (lY & 0x40000000); + lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF); + if (lX4 & lY4) return (lResult ^ 0x80000000 ^ lX8 ^ lY8); + if (lX4 | lY4) { + if (lResult & 0x40000000) return (lResult ^ 0xC0000000 ^ lX8 ^ lY8); + else return (lResult ^ 0x40000000 ^ lX8 ^ lY8); + } else { + return (lResult ^ lX8 ^ lY8); + } + } + var F = function(x, y, z) { + return (x & y) | ((~ x) & z); + } + var G = function(x, y, z) { + return (x & z) | (y & (~ z)); + } + var H = function(x, y, z) { + return (x ^ y ^ z); + } + var I = function(x, y, z) { + return (y ^ (x | (~ z))); + } + var FF = function(a, b, c, d, x, s, ac) { + a = addUnsigned(a, addUnsigned(addUnsigned(F(b, c, d), x), ac)); + return addUnsigned(rotateLeft(a, s), b); + }; + var GG = function(a, b, c, d, x, s, ac) { + a = addUnsigned(a, addUnsigned(addUnsigned(G(b, c, d), x), ac)); + return addUnsigned(rotateLeft(a, s), b); + }; + var HH = function(a, b, c, d, x, s, ac) { + a = addUnsigned(a, addUnsigned(addUnsigned(H(b, c, d), x), ac)); + return addUnsigned(rotateLeft(a, s), b); + }; + var II = function(a, b, c, d, x, s, ac) { + a = addUnsigned(a, addUnsigned(addUnsigned(I(b, c, d), x), ac)); + return addUnsigned(rotateLeft(a, s), b); + }; + var convertToWordArray = function(string) { + var lWordCount; + var lMessageLength = string.length; + var lNumberOfWordsTempOne = lMessageLength + 8; + var lNumberOfWordsTempTwo = (lNumberOfWordsTempOne - (lNumberOfWordsTempOne % 64)) / 64; + var lNumberOfWords = (lNumberOfWordsTempTwo + 1) * 16; + var lWordArray = Array(lNumberOfWords - 1); + var lBytePosition = 0; + var lByteCount = 0; + while (lByteCount < lMessageLength) { + lWordCount = (lByteCount - (lByteCount % 4)) / 4; + lBytePosition = (lByteCount % 4) * 8; + lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition)); + lByteCount++; + } + lWordCount = (lByteCount - (lByteCount % 4)) / 4; + lBytePosition = (lByteCount % 4) * 8; + lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition); + lWordArray[lNumberOfWords - 2] = lMessageLength << 3; + lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29; + return lWordArray; + }; + var wordToHex = function(lValue) { + var WordToHexValue = "", WordToHexValueTemp = "", lByte, lCount; + for (lCount = 0; lCount <= 3; lCount++) { + lByte = (lValue >>> (lCount * 8)) & 255; + WordToHexValueTemp = "0" + lByte.toString(16); + WordToHexValue = WordToHexValue + WordToHexValueTemp.substr(WordToHexValueTemp.length - 2, 2); + } + return WordToHexValue; + }; + var uTF8Encode = function(string) { + string = string.replace(/\x0d\x0a/g, "\x0a"); + var output = ""; + for (var n = 0; n < string.length; n++) { + var c = string.charCodeAt(n); + if (c < 128) { + output += String.fromCharCode(c); + } else if ((c > 127) && (c < 2048)) { + output += String.fromCharCode((c >> 6) | 192); + output += String.fromCharCode((c & 63) | 128); + } else { + output += String.fromCharCode((c >> 12) | 224); + output += String.fromCharCode(((c >> 6) & 63) | 128); + output += String.fromCharCode((c & 63) | 128); + } + } + return output; + }; + $.extend($,{ + md5: function(string) { + var x = Array(); + var k, AA, BB, CC, DD, a, b, c, d; + var S11=7, S12=12, S13=17, S14=22; + var S21=5, S22=9 , S23=14, S24=20; + var S31=4, S32=11, S33=16, S34=23; + var S41=6, S42=10, S43=15, S44=21; + string = uTF8Encode(string); + x = convertToWordArray(string); + a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476; + for (k = 0; k < x.length; k += 16) { + AA = a; BB = b; CC = c; DD = d; + a = FF(a, b, c, d, x[k+0], S11, 0xD76AA478); + d = FF(d, a, b, c, x[k+1], S12, 0xE8C7B756); + c = FF(c, d, a, b, x[k+2], S13, 0x242070DB); + b = FF(b, c, d, a, x[k+3], S14, 0xC1BDCEEE); + a = FF(a, b, c, d, x[k+4], S11, 0xF57C0FAF); + d = FF(d, a, b, c, x[k+5], S12, 0x4787C62A); + c = FF(c, d, a, b, x[k+6], S13, 0xA8304613); + b = FF(b, c, d, a, x[k+7], S14, 0xFD469501); + a = FF(a, b, c, d, x[k+8], S11, 0x698098D8); + d = FF(d, a, b, c, x[k+9], S12, 0x8B44F7AF); + c = FF(c, d, a, b, x[k+10], S13, 0xFFFF5BB1); + b = FF(b, c, d, a, x[k+11], S14, 0x895CD7BE); + a = FF(a, b, c, d, x[k+12], S11, 0x6B901122); + d = FF(d, a, b, c, x[k+13], S12, 0xFD987193); + c = FF(c, d, a, b, x[k+14], S13, 0xA679438E); + b = FF(b, c, d, a, x[k+15], S14, 0x49B40821); + a = GG(a, b, c, d, x[k+1], S21, 0xF61E2562); + d = GG(d, a, b, c, x[k+6], S22, 0xC040B340); + c = GG(c, d, a, b, x[k+11], S23, 0x265E5A51); + b = GG(b, c, d, a, x[k+0], S24, 0xE9B6C7AA); + a = GG(a, b, c, d, x[k+5], S21, 0xD62F105D); + d = GG(d, a, b, c, x[k+10], S22, 0x2441453); + c = GG(c, d, a, b, x[k+15], S23, 0xD8A1E681); + b = GG(b, c, d, a, x[k+4], S24, 0xE7D3FBC8); + a = GG(a, b, c, d, x[k+9], S21, 0x21E1CDE6); + d = GG(d, a, b, c, x[k+14], S22, 0xC33707D6); + c = GG(c, d, a, b, x[k+3], S23, 0xF4D50D87); + b = GG(b, c, d, a, x[k+8], S24, 0x455A14ED); + a = GG(a, b, c, d, x[k+13], S21, 0xA9E3E905); + d = GG(d, a, b, c, x[k+2], S22, 0xFCEFA3F8); + c = GG(c, d, a, b, x[k+7], S23, 0x676F02D9); + b = GG(b, c, d, a, x[k+12], S24, 0x8D2A4C8A); + a = HH(a, b, c, d, x[k+5], S31, 0xFFFA3942); + d = HH(d, a, b, c, x[k+8], S32, 0x8771F681); + c = HH(c, d, a, b, x[k+11], S33, 0x6D9D6122); + b = HH(b, c, d, a, x[k+14], S34, 0xFDE5380C); + a = HH(a, b, c, d, x[k+1], S31, 0xA4BEEA44); + d = HH(d, a, b, c, x[k+4], S32, 0x4BDECFA9); + c = HH(c, d, a, b, x[k+7], S33, 0xF6BB4B60); + b = HH(b, c, d, a, x[k+10], S34, 0xBEBFBC70); + a = HH(a, b, c, d, x[k+13], S31, 0x289B7EC6); + d = HH(d, a, b, c, x[k+0], S32, 0xEAA127FA); + c = HH(c, d, a, b, x[k+3], S33, 0xD4EF3085); + b = HH(b, c, d, a, x[k+6], S34, 0x4881D05); + a = HH(a, b, c, d, x[k+9], S31, 0xD9D4D039); + d = HH(d, a, b, c, x[k+12], S32, 0xE6DB99E5); + c = HH(c, d, a, b, x[k+15], S33, 0x1FA27CF8); + b = HH(b, c, d, a, x[k+2], S34, 0xC4AC5665); + a = II(a, b, c, d, x[k+0], S41, 0xF4292244); + d = II(d, a, b, c, x[k+7], S42, 0x432AFF97); + c = II(c, d, a, b, x[k+14], S43, 0xAB9423A7); + b = II(b, c, d, a, x[k+5], S44, 0xFC93A039); + a = II(a, b, c, d, x[k+12], S41, 0x655B59C3); + d = II(d, a, b, c, x[k+3], S42, 0x8F0CCC92); + c = II(c, d, a, b, x[k+10], S43, 0xFFEFF47D); + b = II(b, c, d, a, x[k+1], S44, 0x85845DD1); + a = II(a, b, c, d, x[k+8], S41, 0x6FA87E4F); + d = II(d, a, b, c, x[k+15], S42, 0xFE2CE6E0); + c = II(c, d, a, b, x[k+6], S43, 0xA3014314); + b = II(b, c, d, a, x[k+13], S44, 0x4E0811A1); + a = II(a, b, c, d, x[k+4], S41, 0xF7537E82); + d = II(d, a, b, c, x[k+11], S42, 0xBD3AF235); + c = II(c, d, a, b, x[k+2], S43, 0x2AD7D2BB); + b = II(b, c, d, a, x[k+9], S44, 0xEB86D391); + a = addUnsigned(a, AA); + b = addUnsigned(b, BB); + c = addUnsigned(c, CC); + d = addUnsigned(d, DD); + } + var tempValue = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d); + return tempValue.toLowerCase(); + } + }); + })(Zepto); \ No newline at end of file diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index b1111f6..fbbfc9c 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -312,6 +312,12 @@ "description": "可选,微信分享", "appid": "wx734a9e3085abcd90", "appsecret": "47ce59f3c52984c4e193880fb09b12af" + }, + "sina": { + "appkey": "3194052034", + "appsecret": "e863ae4e4f14d41af3142e5ae06867dd", + "redirect_uri": "http://sh.fangjia.com/", + "description": "可选,新浪微博分享" } }, "payment": {}, diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 0eb1011..4780695 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -13,9 +13,9 @@ @@ -41,6 +44,12 @@

房产评估

+ +
+
+
+
+
@@ -49,7 +58,7 @@
-
+
@@ -119,7 +128,11 @@ function selectEvaluateList(){ uid: uid } }).then(function (response) { - var results = response.data.data; + var resultsMap = response.data.data; + var results = resultsMap.houseInfoList; + var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; + var cityAvgPriceMap = resultsMap.cityAvgPriceMap; + if(results!=null && results.length>0){ for(var i in results){ var result = results[i]; @@ -135,11 +148,38 @@ function selectEvaluateList(){ htmlContent = htmlContent +"
"; htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"m  "+result.floor+"/"+result.height+"层
"; htmlContent = htmlContent +"
"; - //控制显示效果 - htmlContent = htmlContent + "
近30天涨跌幅: "+3.37+"%
"; - - htmlContent = htmlContent + "
相比"+result.city+"均价: "+'低2888元'+"
"; + //对应城市地区小区30天涨跌幅 + //动态构建key + var xqOneMonthUpDownRangeKey = result.city+"-"+result.region +"-"+result.name; + //取得key对于的value + var xqOneMonthUpDownRangeValue = xqOneMonthUpDownRangeMap[xqOneMonthUpDownRangeKey]; + if(!isNaN(xqOneMonthUpDownRangeValue)){ + //涨跌幅大于零 + if(parseFloat(xqOneMonthUpDownRangeValue)>=0){ + htmlContent = htmlContent + "
近30天涨跌幅: "+xqOneMonthUpDownRangeValue+"%
"; + }else{ + //涨跌幅小于零 + htmlContent = htmlContent + "
近30天涨跌幅: "+Math.abs(xqOneMonthUpDownRangeValue)+"%
"; + } + }else{ + //为非数字清空放空格 + htmlContent = htmlContent + "
近30天涨跌幅: "+ +"%
"; + } + //相比对于城市均价 + var cityAvgPriceKey = result.city; + //取得对应城市的value + var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; + if(!isNaN(cityAvgPriceValue)){ + if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ + htmlContent = htmlContent + "
相比"+result.city+"均价: "+'高'+(parseInt(cityAvgPriceValue)-parseInt(result.price))+'元'+"
"; + }else{ + htmlContent = htmlContent + "
相比"+result.city+"均价: "+'低'+(parseInt(result.price)-parseInt(cityAvgPriceValue))+'元'+"
"; + } + }else{ + //为非数字清空放空格 + htmlContent = htmlContent + "
相比"+result.city+"均价: "+' '+"
"; + } htmlContent = htmlContent + "
均价: "+result.price+"元/㎡
"; htmlContent = htmlContent + "
"+tempTotalPrice+"万
"; htmlContent = htmlContent + "
添加管理" @@ -148,6 +188,9 @@ function selectEvaluateList(){ //动态追加内容 $('.list-block ul').html(htmlContent); } + //添加loading等待效果 + $(".loadingBg").hide(); + $(".content-block").show(); }).catch(function (error) { console.log(error); }); diff --git a/fangija-zsyf/views/login/codeSms.html b/fangija-zsyf/views/login/codeSms.html new file mode 100644 index 0000000..f8d4d9e --- /dev/null +++ b/fangija-zsyf/views/login/codeSms.html @@ -0,0 +1,132 @@ + + + + + +快捷登录 + + + + + + + + + + + + + +
+
+
+ +

快捷登录

+
+
+ +

+ + 我已阅读并接受《服务协议》 +

+ +
+

+ 第三方登录 +

+

+ + + +

+
+
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index cc97dab..8b785d2 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -13,6 +13,11 @@ + + + @@ -31,7 +36,7 @@

-


+


@@ -75,7 +80,7 @@ @@ -109,7 +114,7 @@ $.config = {router: false} + + + + +