Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

# Conflicts:
#	fangija-zsyf/config.js
This commit is contained in:
zongzhimin
2018-03-29 18:23:16 +08:00
11 changed files with 504 additions and 39 deletions
+1 -1
View File
@@ -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;
+27
View File
@@ -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;}
Binary file not shown.

After

Width:  |  Height:  |  Size: 524 B

+16
View File
@@ -0,0 +1,16 @@
export default {
methods: {
checkPhoneNum (phone) {
alert("1111111111111")
}
}
}
var sendPhoneCode = new Vue({
el:'#sendPhoneCode',
methods:{
sendCode:function(){
alert("222222222")
checkPhoneNum("1352222222")
}
}
})
+2 -1
View File
@@ -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+"\"失败 !");
} );
+183
View File
@@ -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);
+6
View File
@@ -312,6 +312,12 @@
"description": "可选,微信分享",
"appid": "wx734a9e3085abcd90",
"appsecret": "47ce59f3c52984c4e193880fb09b12af"
},
"sina": {
"appkey": "3194052034",
"appsecret": "e863ae4e4f14d41af3142e5ae06867dd",
"redirect_uri": "http://sh.fangjia.com/",
"description": "可选,新浪微博分享"
}
},
"payment": {},
+51 -8
View File
@@ -13,9 +13,9 @@
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
em{font-style:normal;}
/*em{font-style:normal;}
em.up{color:#ff1100;}
em.down{color:#2cb66a;}
em.down{color:#2cb66a;}*/
.list-block .item-title{font-size:0.85rem;}
.list-block .item-title span.span01{font-size:0.7rem;color:#666;margin-left:0.3rem;}
.icon-add{width:0.6rem;height:0.6rem;background:url(../../images/icon-add.png) no-repeat center center;background-size:100%;margin-right:0.3rem;}
@@ -27,6 +27,9 @@
.list-block .item-subtitle em.em02{font-size:0.75rem;color:#EB5F34;}
.list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;}
.list-block .item-subtitle div.price em strong{font-size:1.4rem;color:#EB5F34;font-weight:bold;margin-right:0.1rem;}
/**添加loading加载效果**/
.loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:71px;left:0;z-index:100;}
.loadingBg .infinite-scroll-preloader{margin-top:60%;}
</style>
</head>
@@ -41,6 +44,12 @@
</button>
<h1 class="title">房产评估</h1>
</header>
<!-- 加载loading页 -->
<div class="loadingBg">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<div class="content">
<div class="list-block media-list">
<!-- 动态封装部分 begin -->
@@ -49,7 +58,7 @@
</ul>
<!-- 动态封装部分 end -->
</div>
<div class="content-block">
<div class="content-block" style="display: none;">
<p><a href="#" class="button button-big button-fill theme">立即评估</a></p>
</div>
</div>
@@ -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 +"</div><div class='item-title-row'>";
htmlContent = htmlContent +"<div class='item-title'><small>"+result.roomCount+"室"+result.hallCount+"厅&nbsp;&nbsp;"+result.area+"m&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>";
htmlContent = htmlContent +"</div><div class='item-subtitle'>";
//控制显示效果
htmlContent = htmlContent + "<div>近30天涨跌幅: <em class='down'>"+3.37+"%<i class='icon icon-arrow-green'></i></em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>"+'低2888元'+"</em></div>";
//对应城市地区小区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 + "<div>近30天涨跌幅: <em class='up'>"+xqOneMonthUpDownRangeValue+"%<i class='icon icon-arrow-red'></i></em></div>";
}else{
//涨跌幅小于零
htmlContent = htmlContent + "<div>近30天涨跌幅: <em class='down'>"+Math.abs(xqOneMonthUpDownRangeValue)+"%<i class='icon icon-arrow-green'></i></em></div>";
}
}else{
//为非数字清空放空格
htmlContent = htmlContent + "<div>近30天涨跌幅: <em class='down'>"+ +"%<i class='icon icon-arrow-green'></i></em></div>";
}
//相比对于城市均价
var cityAvgPriceKey = result.city;
//取得对应城市的value
var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey];
if(!isNaN(cityAvgPriceValue)){
if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>"+'高'+(parseInt(cityAvgPriceValue)-parseInt(result.price))+'元'+"</em></div>";
}else{
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>"+'低'+(parseInt(result.price)-parseInt(cityAvgPriceValue))+'元'+"</em></div>";
}
}else{
//为非数字清空放空格
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>"+' '+"</em></div>";
}
htmlContent = htmlContent + "<div>均价: <em class='em02'>"+result.price+"元/㎡</em></div>";
htmlContent = htmlContent + "<div class='price'><em><strong>"+tempTotalPrice+"</strong>万</em></div>";
htmlContent = htmlContent + "</div></div></a><a class='add open-vertical-modal'><i class='icon icon-add' id="+result.id+" uid="+result.uid+"></i>添加管理</a>"
@@ -148,6 +188,9 @@ function selectEvaluateList(){
//动态追加内容
$('.list-block ul').html(htmlContent);
}
//添加loading等待效果
$(".loadingBg").hide();
$(".content-block").show();
}).catch(function (error) {
console.log(error);
});
+132
View File
@@ -0,0 +1,132 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>快捷登录</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
</head>
<body>
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>
<h1 class="title">快捷登录</h1>
</header>
<div class="content">
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><i class="icon icon-login01"></i></div>
<div class="item-after">
<input type="number" id="input_phoneNumber" class="textAlignLeft" placeholder="请输入手机号码">
<label>
<span id="sendPhoneCode" class="sendCode theme" @click="sendCode()">获取验证码</span>
<span class="waiting theme dn">48&nbsp;s</span>
</label>
</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><i class="icon icon-login02"></i></div>
<div class="item-after">
<input type="number" id="input_codeSms" class="textAlignLeft" placeholder="请输入验证码">
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<p class="agreement">
<a class="check"><img class="checkImg" src="../../images/checkImg02.png" id="check"></a>
我已阅读并接受<a href="05_mine05_set03_agreement.html">《服务协议》</a>
</p>
<div class="content-block loginBox">
<p><a href="05_mine01_index.html" class="button button-big button-fill theme" id="login_btn">登录</a></p>
<p><a href="05_mine00_login02_password.html">账号密码登录</a></p>
</div>
<div class="content-block loginMode">
<p class="line">
<span>第三方登录</span>
</p>
<p>
<a href="05_mine00_login04_set.html" class="icon icon-loginMode01"></a>
<a href="05_mine00_login04_set.html" class="icon icon-loginMode02"></a>
<a href="05_mine00_login04_set.html" class="icon icon-loginMode03"></a>
</p>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/vue.js"></script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/login/codeSms.js" ></script>
<script>
/* 获取验证码等待状态 */
$(".sendCode").click(function(){
$(".waiting").show();
$(".sendCode").hide();
});
/* 勾选-已阅读 */
$(".check").on("click", function () {
var a = $(this).find(".checkImg").css("display");
if(a == "block"){
$(".checkImg").hide();
}else{
$(".checkImg").show();
}
});
/* 错误提示-快捷登录 */
$("#login_btn").on("click", function () {
var a = $("#input_phoneNumber").val();
var b = $("#input_codeSms").val();
if(a == ""){
$.toast("请输入手机号码");
return false;
}
else if(b == ""){
$.toast("请输入验证码");
return false;
}
});
</script>
</body>
</html>
+19 -4
View File
@@ -13,6 +13,11 @@
<link rel="stylesheet" href="../../css/theme-blue.css">
<link rel="stylesheet" href="../../css/mui.min.css">
<link rel="stylesheet" href="../../css/main.css">
<style>
.list-block .item-text{-webkit-line-clamp:unset;}
</style>
</head>
<body>
@@ -31,7 +36,7 @@
<div class="content contentText infinite-scroll infinite-scroll-bottom" data-distance="40">
<div class="content-padded">
<h1 id="title"></h1>
<p><small id="source"></small><small style="float:right;" id="visit_count"><i class="icon icon-eye"></i></small><br><small id="create_time"></small></p>
<p><small id="source"></small><small style="float:right;" id="visit_count"><i class="icon icon-eye-grey"></i></small><br><small id="create_time"></small></p>
<div id="content">
</div>
</div>
@@ -75,7 +80,7 @@
<div class="searchbar row commentReleaseBox dn">
<div class="search-input col-85">
<input type="text">
<input type="text" maxlength="250">
</div>
<a class="col-15" id="publishBtn">发布</a>
</div>
@@ -109,7 +114,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
var id;//= "183627425584775168";
var id//= "183627425584775168";
var shareUrl = BASE_PATH+"/news/newDetail?newsId=";
var sharehrefTitle = "停车坐爱枫林晚,霜叶红于二月花";
var sharehrefDes = "客观里面请!";
@@ -300,10 +305,18 @@ function addItems(number, lastIndex) {
var publishTime = vo.addTime;
var timeString = getDateDiff(curTime, publishTime)
var content = "";
if(vo.content){
content = vo.content
if(content.length > 250){
content = content.substr(0,250)+"...";
}
}
html = html + "<div class='item-after'><span>"+timeString+"</span></div>"+
"</div>"+
"<div class='item-text'>"+vo.content+"</div>"+
"<div class='item-text'>"+content+"</div>"+
"</div>"+
"</a>"+
"</li>";
@@ -506,6 +519,8 @@ $(".commentReleaseBox a").on("click", function () {
}
});
function addComment(){
var content = $(".commentReleaseBox input").val();
axios.post("/rest/comment/add",{commentObjId : id, content:content, commentUserProvince:province, commentUserCity:city}).then(function (response) {
+67 -25
View File
@@ -18,7 +18,7 @@
<body>
<div class="page-group">
<div class="page-group" id="app">
<div class="page page-current">
<header class="bar bar-nav">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
@@ -35,7 +35,7 @@
<div class="item-title-row">
<div class="item-title"><i class="icon icon-login01"></i></div>
<div class="item-after">
<input type="number" id="input_phoneNumber" class="textAlignLeft" placeholder="请输入手机号码" value="13675696776" readonly>
<input type="number" id="input_phoneNumber" class="textAlignLeft" placeholder="请输入手机号码" v-model="mobile" readonly>
</div>
</div>
</div>
@@ -47,9 +47,9 @@
<div class="item-title-row">
<div class="item-title"><i class="icon icon-login03"></i></div>
<div class="item-after">
<input type="password" id="input_password" class="textAlignLeft" placeholder="请输入6位以上数字或字母">
<i class="icon icon-eye-grey"></i>
<i class="icon icon-eye-orange dn"></i>
<input type="password" id="input_password" v-model="pass" class="textAlignLeft" placeholder="请输入6位以上数字或字母">
<i class="icon icon-eye-grey" @click="show"></i>
<i class="icon icon-eye-orange dn" @click="hide"></i>
</div>
</div>
</div>
@@ -58,7 +58,7 @@
</ul>
</div>
<div class="content-block loginBox">
<p><a href="05_mine01_index.html" class="button button-big button-fill theme" id="confirm_btn">确认</a></p>
<p><a class="button button-big button-fill theme" @click="updatePass">确认</a></p>
<p><a href="05_mine01_index.html">跳过</a></p>
</div>
</div>
@@ -77,30 +77,72 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/vue.js" ></script>
<script type="text/javascript" src="../../js/zepto.md5.js" ></script>
<script type="text/javascript" src="../../config.js"></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script>
/* 密码显示&隐藏 */
$(".list-block .item-after .icon-eye-grey").on("click", function () {
$(".list-block .item-after .icon-eye-grey").hide();
$(".list-block .item-after .icon-eye-orange").show();
$("#input_password").attr("type","text");
});
$(".list-block .item-after .icon-eye-orange").on("click", function () {
$(".list-block .item-after .icon-eye-orange").hide();
$(".list-block .item-after .icon-eye-grey").show();
$("#input_password").attr("type","password");
});
/* 错误提示-设置密码 */
$("#confirm_btn").on("click", function () {
var a = $("#input_password").val();
if(a == ""){
$.toast("请输入6位以上数字或字母");
return false;
new Vue({
el: '#app',
data: {
mobile: '',
pass: ''
},
methods: {
// 加载用户手机号码
loadUserMobile: function() {
var that = this;
axios.get("/rest/user/info")
.then(function (response) {
var resData = response.data;
if (resData.status) {
that.mobile = resData.data.mobile
} else {
$.toast(resData.message);
}
})
.catch(function (error) {
$.toast(error);
});
},
// 修改密码
updatePass: function() {
if (this.pass == '' || this.pass.length < 7) {
$.toast("请输入6位以上数字或字母");
return;
}
axios.post("/rest/user/upass", {newPass: $.md5(this.pass)})
.then(function (response) {
var resData = response.data;
if (resData.status) {
$.toast(resData.message);
} else {
$.toast(resData.message);
}
})
.catch(function (error) {
$.toast(error);
});
},
/* 密码显示&隐藏 */
show: function() {
$(".list-block .item-after .icon-eye-grey").hide();
$(".list-block .item-after .icon-eye-orange").show();
$("#input_password").attr("type","text");
},
hide: function() {
$(".list-block .item-after .icon-eye-orange").hide();
$(".list-block .item-after .icon-eye-grey").show();
$("#input_password").attr("type","password");
}
},
mounted(){
this.loadUserMobile();
}
});
</script>
</body>