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

# Conflicts:
#	fangija-zsyf/css/main.css
This commit is contained in:
xuhe@fangjia.com
2018-03-28 15:05:30 +08:00
7 changed files with 572 additions and 49 deletions
+4 -3
View File
@@ -1,6 +1,7 @@
/**服务端地址**/
//var BASE_PATH = "http://192.168.10.128: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.128: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.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
Binary file not shown.

After

Width:  |  Height:  |  Size: 749 B

+17
View File
@@ -0,0 +1,17 @@
axios.defaults.baseURL = BASE_PATH;
axios.defaults.headers.post['Content-Type'] = 'application/json';
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
config.headers.Authorization = '111111111'
return config;
}, function (error) {
return Promise.reject(error);
});
// 添加响应拦截器
axios.interceptors.response.use(function (response) {
return response;
}, function (error) {
return Promise.reject(error);
});
View File
+89
View File
@@ -0,0 +1,89 @@
/**
*
* 更新分享服务
*/
function updateSerivces(){
plus.share.getServices( function(s){
shares={};
for(var i in s){
var t=s[i];
shares[t.id]=t;
}
}, function(e){
alert("获取分享服务列表失败:"+e.message );
} );
}
/**
* 分享操作
* @param {JSON} sb 分享操作对象s.s为分享通道对象(plus.share.ShareService)
* @param {Boolean} bh 是否分享链接
*/
function shareAction(sb,bh) {
if(!sb||!sb.s){
alert("无效的分享服务!");
return;
}
var msg={content:sharehrefDes,extra:{scene:sb.x}};
if(bh){
msg.href=shareUrl;
if(sharehrefTitle&&sharehrefTitle!=""){
msg.title=sharehrefTitle;
}
if(sharehrefDes&&sharehrefDes!=""){
if(sb.title=="新浪微博"){
msg.content=shareUrl+sharehrefDes;
}else{
msg.content=sharehrefDes;
}
}
msg.thumbs=[picUrl];
msg.pictures=[picUrl];
}else{
if(pic&&pic.realUrl){
msg.pictures=[pic.realUrl];
}
}
// 发送分享
if ( sb.s.authenticated ) {
shareMessage(msg,sb.s);
} else {
alert("---未授权---");
sb.s.authorize( function(){
shareMessage(msg,sb.s);
},function(e){
alert("认证授权失败:"+e.code+" - "+e.message );
});
}
}
/**
* 发送分享消息
* @param {JSON} msg
* @param {plus.share.ShareService} s
*/
function shareMessage(msg,s){
s.send( msg, function(){
alert("分享到\""+s.description+"\"成功! " );
}, function(e){
alert( "分享到\""+s.description+"\"失败 !");
} );
}
// 分析链接
function shareHref(){
var shareBts=[];
// 更新分享列表
var ss=shares['weixin'];
ss&&ss.nativeClient&&(shareBts.push({title:'微信朋友圈',s:ss,x:'WXSceneTimeline'}),
shareBts.push({title:'微信好友',s:ss,x:'WXSceneSession'}));
ss=shares['qq'];
ss&&ss.nativeClient&&shareBts.push({title:'QQ',s:ss});
ss=shares['sinaweibo'];
ss&&shareBts.push({title:'新浪微博',s:ss});
// 弹出分享列表
shareBts.length>0?plus.nativeUI.actionSheet({title:'分享链接',cancel:'取消',buttons:shareBts},function(e){
(e.index>0)&&shareAction(shareBts[e.index-1],true);
}):plus.nativeUI.alert('当前环境无法支持分享链接操作!');
}
+16 -42
View File
@@ -39,9 +39,7 @@
"Console": {
"description": "调试输出日志"
},
"Contacts": {
"description": "系统通讯录"
},
"Device": {
"description": "设备信息"
},
@@ -63,9 +61,7 @@
"Invocation": {
"description": "Native.js能力"
},
"Messaging": {
"description": "消息通讯"
},
"Orientation": {
"description": "方向传感器"
},
@@ -111,7 +107,7 @@
"Push": {
"description": "消息推送"
}
},"Statistic":{},"Share":{}
},
"plus": {
"error": {
@@ -168,39 +164,7 @@
"password": "",/*Android应用打包使用密钥库中证书的密码*/
"aliasname": "",/*Android应用打包使用密钥库中证书的别名*/
"ImmersedStatusbar": true,/*Android平台开启沉浸式状态栏样式*/
"permissions": [
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
"<uses-permission android:name=\"com.android.launcher.permission.UNINSTALL_SHORTCUT\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"com.android.launcher.permission.INSTALL_SHORTCUT\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
"<uses-permission android:name=\"android.permission.READ_SMS\"/>"
]
"permissions": ["<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.GET_TASKS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>","<uses-permission android:name=\"com.android.launcher.permission.UNINSTALL_SHORTCUT\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"com.android.launcher.permission.INSTALL_SHORTCUT\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]
},
"orientation": [
"portrait-primary"
@@ -291,7 +255,7 @@
}
},
"plugins": {
"statics": {},
"statics": {"umeng":{"appkey_ios":"5ab09d69a40fa374da0002e4","channelid_ios":"有房IOS","appkey_android":"5ab09e16f29d9854f200026e","channelid_android":"有房Android"}},
"maps": {
"baidu": {/*配置应用使用百度地图,参考http://ask.dcloud.net.cn/article/29*/
"appkey_ios": "cmXf4GGYGYiu1fuVRN4847cGvgR25WTV",/*iOS平台百度地图appkey*/
@@ -307,7 +271,7 @@
"description": "个推推送"
}
},
"share": {},
"share": {"weixin":{"description":"可选,微信分享"}},
"payment": {},
"oauth": {
"weixin": {
@@ -1496,6 +1460,16 @@
"fonts/mui.ttf",
"images/icon-clear.png"
],
"refer": [
"views/news/newsDetail.html"
],
"priority": 0
},
"views/news/newsDetail.html": {
"resources": [
"images/icon-comments.png",
"images/icon-praise-grey02.png"
],
"refer": [],
"priority": 0
}
+446 -4
View File
@@ -10,9 +10,9 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-blue.css">
<link rel="stylesheet" href="../../css/mui.min.css">
<link rel="stylesheet" href="../../css/main.css">
</head>
<body>
@@ -23,15 +23,66 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="mui-icon mui-icon mui-icon-arrowleft"></span>
</button>
<button class="button button-link button-nav pull-right open-popover" onclick="shareHref()">
<span class="icon icon-path"></span>
</button>
<h1 class="title"></h1>
</header>
<div class="content contentText">
<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>
<div id="content">
</div>
</div>
<div class="newCss">
<ul>
<li><span>房贷</span></li>
<li><span>广州</span></li>
<li><span>首套房</span></li>
</ul>
</div>
<div class="adBoxApp">
<img src="../../images/wx_app.png">
<p><label>有房&nbsp;&nbsp;有家&nbsp;&nbsp;有爱</label><br><small>更多房产资讯上有房APP</small></p>
</div>
<div class="list-block media-list commentList">
<ul>
</ul>
</div>
<!-- 加载提示符 -->
<div class="infinite-scroll-preloader" style="position: relative;top: -70px;">
<div class="preloader"></div>
</div>
</div>
<div class="bar commentBox">
<div class="searchbar row commentInputBox">
<div class="search-input col-66">
<label class="icon icon-comments" for="search"></label>
<input type="text" placeholder="我也说两句">
</div>
<span class="col-33">
<a class="praise"><i class="icon icon-praise-grey02"></i><font id="newsPraise">{{ newsDzCount }}</font></a>
<a class="collection collection01"><i class="icon icon-collection01"></i></a>
</span>
</div>
<div class="searchbar row commentReleaseBox dn">
<div class="search-input col-85">
<input type="text">
</div>
<a class="col-15" id="publishBtn">发布</a>
</div>
</div>
</div>
</div>
</div>
@@ -45,22 +96,69 @@ Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/beacon_release.js"></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 src="../../config.js"></script>
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
var id= "183627425584775168";
var shareUrl = BASE_PATH+"/news/newDetail?newsId=";
var sharehrefTitle = "停车坐爱枫林晚,霜叶红于二月花";
var sharehrefDes = "客观里面请!";
var shareId='';
var province;
var city;
var region;
var picUrl = '_www/logo.png';
//新闻评论列表
$.init()
//加载flag
var loading = false;
//最多可加载的条目
var maxItems = 100;
//上次加载的序号
var lastIndex = 0;
//每次加载添加多少条目
var itemsPerLoad = 10;
var curpage = 1;
var totalCount = 0;
var curPageSize = 0;
var vm = new Vue({
el: '#newsPraise',
data:{
newsDzCount: 0
}
})
function onPlusReady() {
var self = plus.webview.currentWebview();
var id = self.newsId;
id = self.newsId;
shareId = id
shareUrl = shareUrl+id
$.ajax({
type : 'get',
url : BASE_PATH + "/rest/news/detail",
data:{newsId:id},
dataType:'json',
async:true,
async:false,
success:function(result){
if(result.code==200){
data = result.data
@@ -72,13 +170,357 @@ function onPlusReady() {
var dateStr = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
$("#create_time").text(dateStr)
$("#content").html(data.content)
//$("#newsPraise").text(data.thumbsUpCount);
vm.newsDzCount = data.thumbsUpCount
//预先加载20条
sharehrefTitle = data.title
sharehrefDes = data.introduction
picUrl = data.coverImg
//加载评论列表
addItems(itemsPerLoad, 0);
//是否收藏
isCollect();
}
},
error:function(){
}
})
getPosition();
updateSerivces();
}
function isCollect(){
axios.post("/rest/news/checkCollect",{newsId : id}).then(function (response) {
var msg = response.data.data
if(msg){
$(".collection").addClass("collection02")
$(".collection i").addClass("icon-collection02")
$(".collection").removeClass("collection01")
$(".collection i").removeClass("icon-collection01")
}
})
.catch(function (error) {
console.log(error);
});
}
// 获取当前用户位置
function getPosition(){
plus.geolocation.getCurrentPosition(function(p){
province = p.address.province;
city = p.address.city;
region = p.address.district;
}, function(e){
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
}
function addItems(number, lastIndex) {
if(!id){
return;
}
curpage = lastIndex/itemsPerLoad + 1;
axios.get("/rest/news/comment", {
params: {
newsId: id,
page:curpage,
pageSize:itemsPerLoad
}
})
.then(function (response) {
var results = response.data.data
curPageSize = results.length;
if(results==null || results.length==0) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('.infinite-scroll-preloader').hide();
return;
}
// 生成新条目的HTML
var html = '';
for(var i in results){
var vo = results[i];
html = html+"<li>"+
"<a class='item-content'>";
if(vo.headImg!=null){
html = html + "<div class='item-media'><img src='"+vo.headImg+"'></div>";
}else{
html = html + "<div class='item-media'><img src='../../images/headPortrait.png'></div>";
}
html = html + "<div class='item-inner'>";
var name = "游客"
if(vo.wxName){
name = vo.wxName
}else if(vo.name){
name = vo.name
}
html = html + "<div class='item-title-row'>"+
"<div class='item-title'>"+name+"</div>"+
"<div class='item-after'><span data-cid='"+vo.id+"'><i class='icon icon-praise-grey01'></i><label>"+vo.praiseCount+"</label></span></div>"+
"</div>"+
"<div class='item-title-row'>";
var address = "";
if(vo.commentUserProvince && vo.commentUserCity && vo.commentUserProvince == vo.commentUserCity){
html = html + "<div class='item-title'><span>"+vo.commentUserCity+" </span></div>";
}else{
if(vo.commentUserProvince && vo.commentUserCity){
html = html + "<div class='item-title'><span>"+vo.commentUserProvince+vo.commentUserCity+" </span></div>";
}else{
html = html + "<div class='item-title'><span> </span></div>";
}
}
var curTime = new Date().getTime()
var publishTime = vo.addTime;
var timeString = getDateDiff(curTime, publishTime)
html = html + "<div class='item-after'><span>"+timeString+"</span></div>"+
"</div>"+
"<div class='item-text'>"+vo.content+"</div>"+
"</div>"+
"</a>"+
"</li>";
}
// 添加新条目
$('.commentList ul').append(html);
if($('.commentList li').length== totalCount+1){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('.infinite-scroll-preloader').hide();
}
})
.catch(function (error) {
console.log(error);
});
}
//注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
// 更新最后加载的序号
lastIndex = $('.commentList li').length;
if (curPageSize < itemsPerLoad) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('.infinite-scroll-preloader').hide();
return;
}
// 添加新条目
addItems(itemsPerLoad, $('.commentList li').length);
//容器发生改变,如果是js滚动,需要刷新滚动
// $.refreshScroller();
}, 1000);
});
var MINU_SEC = 60 * 1000 ;
var HOUR_SEC = 60 * MINU_SEC;
var DAY_SEC = HOUR_SEC * 24;
var MONTH_SEC = DAY_SEC * 30;
var YEAR_SEC = MONTH_SEC * 12;
function getDateDiff(curTime, publishTime){
if (publishTime <= curTime) {
var diffSec = curTime - publishTime
if (diffSec < DAY_SEC) {
if (diffSec >= HOUR_SEC) {
var t = diffSec / HOUR_SEC;
return parseInt(t) + "小时前";
} else if (diffSec >= MINU_SEC) {
var t = diffSec / MINU_SEC;
return parseInt(t) + "分钟前";
} else {
return "1分钟";
}
} else if (DAY_SEC > diffSec && diffSec < DAY_SEC*2) {
return "昨天";
} else {
var date = new Date(publishTime)
var dateStr = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
return dateStr;
}
} else {
return "1分钟";
}
}
//添加评论
/* 评论点赞 */
$("body").delegate(".commentList span .icon-praise-grey01", "click", function () {
$(this).find(".icon").addClass("icon-praise-orange01");
var cid = $(this).parent().attr("data-cid")
$(this).attr("disabled","disabled");
var text = $(this).parent().text();
axios.get("/rest/comment/thumbsUp", {
params: {
commentId:cid
}
}).then(function (response) {
var msg = response.data.data
if(msg && msg =="点赞成功"){
$("span[data-cid='"+cid+"']").find("label").text(parseInt(text) + 1);
$.toast(msg);
}else{
msg = response.data.message
if(msg){
$.toast(msg);
}
}
})
.catch(function (error) {
console.log(error);
});
});
/*新闻点赞*/
$(".praise").on("click", function () {
$(this).find(".icon").addClass("icon-praise-orange02");
$(this).attr("disabled","disabled");
var text = $("#newsPraise").text();
axios.get("/rest/news/thumbsUp", {
params: {
newsId:id
}
}).then(function (response) {
var msg = response.data.data
if(msg && msg =="点赞成功"){
$(this).find("font").text(parseInt(text) + 1);
var count = parseInt(text) + 1;
vm.newsDzCount = count
$.toast(msg);
}else{
msg = response.data.message
if(msg){
$.toast(msg);
}
}
})
.catch(function (error) {
console.log(error);
});
});
//收藏
$(".collection").on("click", function () {
collect();
});
function collect(){
axios.post("/rest/news/collect",{newsId : id}).then(function (response) {
var msg = response.data.message
if(msg){
if(msg=="用户不能为空"){
//先进行登录
}
}else{
msg = response.data.data
if(msg == "收藏成功"){
$(".collection").addClass("collection02")
$(".collection i").addClass("icon-collection02")
$(".collection").removeClass("collection01")
$(".collection i").removeClass("icon-collection01")
}else{
$(".collection").addClass("collection01")
$(".collection i").addClass("icon-collection01")
$(".collection").removeClass("collection02")
$(".collection i").removeClass("icon-collection02")
}
}
$.toast(msg);
})
.catch(function (error) {
console.log(error);
});
}
/* 发布评论 */
$(".commentInputBox input").focus(function () {
$(".commentInputBox").hide();
$(".commentReleaseBox").show();
$(".commentReleaseBox input").focus();
$(".commentReleaseBox input").val("");
});
$(".commentReleaseBox a").on("click", function () {
$(".commentReleaseBox").hide();
$(".commentInputBox").show();
var content = $(".commentReleaseBox input").val();
if(content){
addComment();
}
});
function addComment(){
var content = $(".commentReleaseBox input").val();
axios.post("/rest/comment/add",{commentObjId : id, content:content, commentUserProvince:province, commentUserCity:city}).then(function (response) {
var msg = response.data.message
if(msg){
$.toast(msg);
}else{
window.location.reload();
}
})
.catch(function (error) {
console.log(error);
});
}
</script>
</body>