Merge branch 'dev2.3.1' of http://192.168.3.207:10080/qmx/jy into dev2.3.1

src/jfw/modules/app/src/web/staticres/jyapp/css/dev2/syz-public-href.css

@@ -299,7 +299,7 @@ margin-bottom:12px;
 }
 
 #syz-secondHtml .feedback div {
-  width: 1.1rem;
+  width: 1.2rem;
   height: 1.1rem;
   display: -webkit-box;
   display: flex;

src/jfw/modules/app/src/web/staticres/jyapp/css/layout.css

@@ -140,7 +140,7 @@ a,input,button{
 }
 /******************/
 .easypopup{
-	background-color: rgba(0,0,0,0.5);
+	background-color: rgba(0,0,0,0.7);
 	position: fixed;
 	left: 0px;
 	right: 0px;

src/jfw/modules/app/src/web/staticres/jyapp/js/ucbs.js

@@ -43,7 +43,6 @@ window.onload = function () {
 				if(prescrollTop!=scrollTop){
 					content.starttime=scroll_start.getTime();
 					content.retention=scroll_end.getTime()-scroll_start.getTime();
-					console.info(content.scrollBttom,content)
 					prescrollTop=scrollTop
 					scroll_start=new Date();
 					conn.send(JSON.stringify(content));

src/jfw/modules/app/src/web/staticres/jyapp/jylab/followent/css/follow.css

@@ -1,480 +0,0 @@
-.head{
-	background-color: #F8F8F8;	
-	border-bottom: 1px solid #ddd;
-	padding: 0px 10px;
-	line-height: 50px;
-	font-size: 16px;
-}
-.head .title{
-	font-weight: bold;
-}
-.head .opation{
-	color: #24C0D7;
-	float: right;
-	font-weight: bold;
-}
-.head .opation.disabled{
-	opacity: 0.5;
-}
-/*************列表页面*********************/
-.listpage ul{
-	padding: 0px 15px;
-	color: #4E4E4E;
-	font-size: 16px;
-}
-.listpage li{
-	padding: 15px 15px 5px 8px;
-	position: relative;
-	border-bottom: 1px solid #f4f4f9;
-}
-.listpage li img{
-	position: absolute;
-	top: 50%;
-}
-.listpage .arrow-right{
-	right: 0px;
-	width: 18px;
-	height: 18px;
-/*	margin-top: -26px;*/
-	    top: 17px;
-}
-.listpage .remind{
-	right: 22px;
-	width: 18px;
-	/*height: 12.5px;*/
-	margin-top: -10px;
-}
-.listpage .limit{
-	height: 10px;
-	background-color: #F8F8F8;
-}
-.listpage button{
-	margin: 20px 10px;
-	position: relative;
-	padding-left: 25px !important;
-}
-.listpage button>span{
-	position: absolute;
-	font-size: 26px;
-	left: 7px;
-	top: -3px;
-}
-.listpage .tip{
-	font-size: 14px;
-	padding: 5px 20px;
-	margin-bottom:70px;
-}
-.listpage .tip img{
-	margin-right: 10px;
-	height: 19.5px;
-	width: 19.5px;
-	vertical-align: sub;
-}
-.listpage .tip front{
-	margin-left: 10px;
-	color: #a0a0a0;
-}
-/*********新增页面**********/
-.addpage from{
-	padding: 20px 10px;
-	display: block;
-}
-.addpage textarea{
-	width: 100%;
-	height: 100px;
-	border-color: #ddd;
-	outline-width: 0px;
-	resize: none;
-	padding-left: 5px;
-	font-size: 14px;
-	line-height: 20px;
-}
-/***********设置页面******/
-.setpage .disabledMask{
-	position: fixed;
-	background-color: transparent;
-	left: 0px;
-	right: 0px;
-	top: 0px;
-	bottom: 0px;
-	z-index: 999999;
-}
-.setpage .notice-zero{
-	color: #a0a0a0;
-}
-.setpage .badge{
-	margin-left: 10px;
-	background-color: #24C0D7;
-	font-size: 14px;
-	display: inline-block;
-    min-width: 10px;
-    padding: 3px 7px;
-    font-size: 12px;
-    font-weight: 700;
-    line-height: 1;
-    color: #fff;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    border-radius: 10px;
-}
-.setpage ul{
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 55px;
-}
-.setpage li{
-	position: relative;
-	padding: 15px 10px 15px 0px;
-	border-bottom: 1px solid #f4f4f9;
-}
-.setpage .bidtip>img{
-	position: absolute;
-	width: 50px;
-    height: 30px;
-	top: 50%;
-	margin-top: -15px;
-	right: 0px;
-}
-.setpage .bidopentime>.timeicon{
-	width: 17px;
-	height: 16.5px;
-	position: relative;
-	top: -2px;
-}
-.setpage .remindtime>.timeicon{
-	width: 17px;
-	height: 17.5px;
-}
-.setpage .arrow-right{
-	position: absolute;
-	right: 10px;
-	width: 18px;
-	height: 18px;
-	margin: -9px;
-	top: 50%;
-}
-.setpage .time{
-	font-size: 14px;
-	margin-left: 5px;
-	border-width: 0px;
-	width: 180px;
-	color: #999;
-}
-.setpage .time.tipon{
-	color: #24C0D7;
-}
-.setpage .followcancel img{
-	width:96%;
-}
-.setpage .followcancel{
-	padding: 20px 10px;
-	text-align: center;
-}
-.setpage .followcancel button{
-	background-color: #FF6666;
-	border-color: #FF6666;
-	width: 100%;
-}
-.easypopup{
-	background-color: rgba(0,0,0,0.5);
-	position: fixed;
-	left: 0px;
-	right: 0px;
-	top: 0px;
-	bottom: 0px;
-	display: none;
-	z-index: 999;
-}
-.easypopup .easypopup-main{
-	background-color: #fff;
-	width: 260px;
-	position: fixed;
-	left: 50%;
-	margin-left: -130px;
-	top: 50%;
-	border-radius: 3px;
-}
-.easypopup .easypopup-header{
-	background-color: #F0F0F0;
-	line-height: 40px;
-	border-bottom: 1px solid #ddd;
-	text-align: center;
-	font-weight: bold;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-}
-.easypopup .easypopup-content{
-	color: #4E4E4E;
-	padding: 20px 15px;
-	text-align: center;
-}
-.easypopup .easypopup-footer{
-	text-align: center;
-	padding-bottom: 15px;
-}
-.easypopup .easypopup-footer button{
-	margin-left: 10px;
-	margin-right: 10px;
-	padding-left: 30px !important;
-	padding-right: 30px !important;
-}
-.easypopup .cancel{
-	background-color: #DEDEDE;
-	border-color: #DEDEDE;
-}
-.mbsc-ios .dwbc{
-	border-color: #ddd;
-}
-.mbsc-ios .dwb-s .dwb{
-	color: #24C0D7;
-}
-.mbsc-ios .title{
-	opacity: 1;
-	color: inherit;
-	font-weight: bold;
-}
-.mbsc-ios .dwbw{
-	float: left;
-}
-.mbsc-ios .dwb-s{
-	float: right;
-}
-/**************项目公告******************/
-.noticepage .header{
-	font-size: 14px;
-	background-color: #F8F8F8;
-	padding: 10px;
-	color: #a0a0a0;
-}
-.noticepage .header front{
-	color: #2cb7ca;
-}
-.noticepage .keyword{
-	color: #2cb7ca;
-}
-.noticepage li{
-	padding: 10px 10px 10px 35px;
-	border-bottom: 1px solid #ddd;
-	position: relative;
-}
-.noticepage li>.index{
-	position: absolute;
-	left: 10px;
-	top: 10px;
-}
-.noticepage li>.title{
-	text-decoration: none;
-	color: #333;
-}
-.noticepage li>.title:focus{
-    color: #97310e;
-    text-decoration: underline;
-}
-.noticepage li>.time{
-	color: #a0a0a0;
-	margin-top: 5px;
-	font-size: 14px;    
-	text-align: right;
-}
-.noticepage li>.visited{
-	color: #a0a0a0;
-}
-/**微信列表**/
-.listpage .jyfwlistno{
-	float:left;
-}
-.listpage .jyfwlisttitle{
-	float:left;    
-	width: 90%;
-	margin-left:5px;
-}
-.listpage .jytimest{
-	margin:15px 5px 5px;
-	text-align: right;
-    padding-right: 5%;    
-	color: #a0a0a0;
-	margin-right: -3px;
-}
-.listpage .jybtnimg{
-	width:94%;
-}
-.listpage .divbtn{
-	text-align:center;
-	margin-top: 30px;
-}
-.listpage .jylistbottom{
-	background-color:#bfbfc3;
-	border-top:1px solid #ccc;
-	width:100%;
-	height:50px;
-	display:block;
-    position: fixed;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
-    z-index: 999;
-	text-align:center;
-	color:#fff;
-	line-height: 50px;
-	font-size: 14px;
-}
-.listpage .jylistbottom img{
-	width: 20px;
-    margin-right: 10px;
-}
-.listpage .jyovertime{
-/*	color: #a0a0a0;*/
-}
-.setpage li.jynotice{
-	padding-top: 0px;
-	padding-bottom: 0px;
-}
-.jynotice>.jynoticelist:first-child{
-	padding-top: 20px;
-}
-.jynoticelist{
-	padding-bottom: 30px;
-	padding-left: 5px;
-	padding-right: 5px;
-    position: relative;
-	/*min-height: 40px;*/
-}
-.jynoticelist .xh {
-    color: #1d1d1d;
-    position: absolute;
-    font-size: 16px;
-}
-.jynoticelist>div:first-of-type{
-	position: absolute;
-	left: 0px;
-	top: 4px;
-}
-.jynotice>.jynoticelist:first-child>div:first-of-type{
-	top: 21px;
-}
-.jynoticelist>div:first-of-type>.noticetime {
-	display: block;
-	margin-bottom: 5px;
-	font-size: 14px;
-	color: #686868;
-}
-.jynoticelist>div:first-of-type>.type{
-	margin: 0px;
-    padding: 1px 5px;
-}
-.jynoticelist>.timeaxis{
-	position: absolute;
-	left: 55px;
-    width: 1px;
-    top: 0px;
-    bottom: 0px;
-    background-color: #ddd;
-}
-.jynoticelist>.timeaxis>span{
-	position: absolute;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #ddd;
-    top: 8px;
-    left: -4.55px;
-}
-.jynotice>.jynoticelist:first-child>.timeaxis>span{
-    top: 26px;
-}
-.jynoticelist>div:last-of-type {
-    padding-left: 70px;
-    font-size: 16px;
-}
-.jynoticelist .time-diff {
-    color: #a0a0a0;
-    font-size: 14px;
-    margin-top: 5px;
-}
-.jynoticelist span.location {
-    border-radius: 3px;
-    margin: 0px 5px;
-	padding: 1px 3px;
-    background: #24C0D7;
-    color: #FFF;
-    font-size: 14px;
-	border: 1px solid #24C0D7;
-}
-.jynoticelist span.type {
-    border: 1px solid #ffba00;
-    background: #ffba00;
-    border-radius: 3px;
-    margin: 0px 5px;
-    padding: 1px 3px;
-    color: #fff;
-    font-size: 14px;
-}
-.jynoticelist a{
-	text-decoration: none;
-    color: #333;
-	word-wrap: normal;
-}
-.jynoticelist .keyword {
-    color: #2cb7ca;
-}
-
-.jynoticelist .visited{
-	color: #a0a0a0;
-}
-.jynoticelist .priceStyle{
-	position: absolute;
-    bottom: 10px;
-    font-size: 14px;
-    right: 7px;
-    color: #686868;
-}
-.qy-followcancel{
-	background-color: #FE737A;
-}
-.gz-followcancel{
-	background-color: #2cb7ca;
-}
-.com-followcancel{
-	position: absolute;
-    color: #FFFFFF;
-    border-radius: 3px;
-	top: 50%;
-	right: 15px;
-	margin-top: -15px;
-	width: 78px;
-	height: 30px;
-	line-height: 30px;
-	text-align: center;
-	font-weight: normal;
-}
-.setpage .noticehead{
-	background-color: #F8F8F8;	
-	border-bottom: 1px solid #ddd;
-	padding: 15px 100px 15px 15px;
-	line-height: 24px;
-	font-weight: 600;
-	position: fixed;
-	top: 1.1rem;
-	left: 0px;
-	right: 0px;
-	z-index: 1;
-	margin-top: 20px;
-	font-size: 16px;
-}
-.setpage .noticenew{
-    padding: 1px 2px 2px 3px;
-    background-color: #fe7379;
-    color: #fff;
-    text-align: center;
-    margin-right: 3px;
-    padding-bottom: 2px;
-	font-size: 14px;
-	border-radius: 3px;
-}
-.listpage .easypopup .easypopup-footer button{
-	color:#000;
-}
-.hidden{
-	display:none;
-}

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -414,9 +414,105 @@ pre {
 	left: 0px;
 	right: 0px;
 }
+/*深度阅读分享*/
+.depthread-share{
+	position: fixed;
+	left: 0px;
+	right: 0px;
+	top: 0px;
+	bottom: 0px;
+	background-color: rgba(0,0,0,0.7);
+	z-index: 1;
+	display: none;
+}
+.depthread-share>div{
+	background-color: #fff;
+	border-radius: 4px;
+	width: 300px;
+	height: 214px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -107px;
+	margin-left: -150px;
+	text-align: center;
+}
+.depthread-share ul li span.jyapp-icon-weixin {
+    color: #0ab70e;
+}
+.depthread-share ul li span.jyapp-icon-pengyouquan {
+    color: #a5e537;
+}
+.depthread-share ul li span.jyapp-icon-qq {
+    color: #4cafe9;
+}
+.depthread-share>div>span{
+	display: block;
+}
+.depthread-share>div>span:first-of-type{
+	position: absolute;
+	padding: 15px;
+	right: 0px;
+	top: 0px;
+}
+.depthread-share>div>span:first-of-type>img{
+	width: 13px;
+}
+.depthread-share>div>span:nth-of-type(2){
+	font-size: 17px;
+	color: #1d1d1d;
+	padding-top: 25px;
+	padding-bottom: 25px;
+}
+.depthread-share>div>span:last-of-type{
+	margin-bottom: 25px;
+    font-size: 15px;
+}
+.depthread-share>div>span:last-of-type>a{
+	display: inline-block;
+	height: 1px;
+	background-color: #cecece;
+	width: 90px;
+	vertical-align: middle;
+	margin: 0px 15px;
+}
+.depthread-share ul{
+	padding: 0px 42px;
+}
+.depthread-share ul li{
+	float: left;
+}
+.depthread-share ul li:nth-child(2){
+	width: 115px;
+}
+.depthread-share ul span{
+	font-size: 50px;
+}
+.depthread-share ul font{
+	display: block;
+	font-size: 15px;
+	color: #686868;
+}
+.depthread-share ul:after{
+	content: " ";
+    clear: both;
+    display: table;
+}
 </style>
 </head>
 <body>
+<div class="depthread-share">
+	<div class="depthread-share-main">
+		<span id="depthread-share-close"><img src="/jyapp/images/close.png"></span>
+		<span>好东西更要一起分享</span>
+		<span><a></a>分享到<a></a></span>
+		<ul class="clear-both">
+			<li><span class="jyapp-icon jyapp-icon-weixin"></span><font>微信</font></li>
+			<li><span class="jyapp-icon jyapp-icon-pengyouquan"></span><font>朋友圈</font></li>
+			<li><span class="jyapp-icon jyapp-icon-qq"></span><font>QQ</font></li>
+		</ul>
+	</div>
+</div>
 <div class="app-layout-header">
 	<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 		公告信息
@@ -442,7 +538,7 @@ pre {
 			</ul>
 		</div>
 	</span>
-	</div>
+</div>
 <div class="app-layout-content-b">
 	<div class="info">
 		<div class="title myfollow" id="title">{{.T.obj.title}}</div>
@@ -651,11 +747,15 @@ $("body").click(function(e){
 	},100)
 });
 $(".header-share").click(function(){
+	$(".depthread-share").hide();
 	$("#sharelist").toggleClass("hide");
 });
 $("#sharelist li").click(function(){
 	setLiActive(this);
-	var shareType = $(this).index() + 1;
+	execShare($(this).index());
+});
+function execShare(thisIndex){
+	var shareType = thisIndex + 1;
 	var content = "您的好友";
 	if(shareType !=2 && {{session "i_type"}} == 2){
 		content += {{session "s_nickname"}};	
@@ -672,7 +772,7 @@ $("#sharelist li").click(function(){
 		link += "source=app_infocontentshare";
 	}
 	JyObj.share(shareType,{{.T.obj.title}},content,link);
-});
+}
 ///////////////////////
 var backUrl = null;
 if(sessionStorage){
@@ -1189,6 +1289,24 @@ $(function(){
 	//深度阅读
 	$.post("/jyapp/info/shareTip",{id:{{.T.obj._id}}},function(r){
 		if(r.status){
+			$(".depthread-share li").click(function(){
+				var thisIndex = $(this).index();
+				if(thisIndex == 1){
+					thisIndex = 2;
+				}else if(thisIndex == 2){
+					thisIndex = 1;
+				}
+				execShare(thisIndex);
+			});
+			$(".depthread-share").click(function(){
+				$(".depthread-share").fadeOut();
+			});
+			$(".depthread-share-main").click(function(e){
+				e.stopPropagation();
+			});
+			$("#depthread-share-close").click(function(){
+				$(".depthread-share").fadeOut();
+			});
 			deepReading();
 		}
 	});
@@ -1215,19 +1333,19 @@ function openAttachment(o){
 	}
 }
 function deepReading(){
-	var infoOffsetTop = $(".info").offset().top;
 	//正文高度
 	var contentHeight = $(".content").height() + $(".content").offset().top - $(".info").offset().top;
-	//窗口高度
-	var windowHeight = $(window).height();
 	//可视区域高度
 	var clientHeight = document.body.clientHeight - $(".app-layout-header").outerHeight();
 	//总屏数
-	var countScreen = Math.floor(contentHeight / clientHeight);
-	//console.info("countScreen---"+countScreen)
-	if(contentHeight <= 0){
+	if(contentHeight <= 0 || clientHeight <= 0){
 		return;
 	}
+	var countScreen = Math.floor(contentHeight / clientHeight);
+	if(countScreen == 0){
+		countScreen = 1;
+	}
+	//console.info("countScreen---"+countScreen)
 	var screenObj = {};
 	var depthReadTime = setInterval(function(){
 		var thisScrollTop = $(window).scrollTop();
@@ -1282,7 +1400,7 @@ function deepReading(){
 		if(isPassShow){
 			clearInterval(depthReadTime);
 			$.post("/jyapp/info/shareTip",{reqType:"save",id:{{.T.obj._id}}});
-			alert("分享");
+			$(".depthread-share").fadeIn();
 		}
 	},1000);
 }

src/jfw/modules/followent/src/web/staticres/jylab/followent/css/common.css

@@ -92,7 +92,7 @@ img{
 }
 /******************/
 .easypopup{
-	background-color: rgba(0,0,0,0.5);
+	background-color: rgba(0,0,0,0.7);
 	position: fixed;
 	left: 0px;
 	right: 0px;

src/web/staticres/css/common.css

@@ -95,7 +95,7 @@ a{
 }
 /******************/
 .easypopup{
-	background-color: rgba(0,0,0,0.5);
+	background-color: rgba(0,0,0,0.7);
 	position: fixed;
 	left: 0px;
 	right: 0px;

src/web/staticres/css/dev2/syz-public-href.css

@@ -299,7 +299,7 @@ margin-bottom:12px;
 }
 
 #syz-secondHtml .feedback div {
-  width: 1.1rem;
+  width: 1.2rem;
   height: 1.1rem;
   display: -webkit-box;
   display: flex;

src/web/staticres/js/ucbs.js

@@ -43,7 +43,6 @@ window.onload = function () {
 				if(prescrollTop!=scrollTop){
 					content.starttime=scroll_start.getTime();
 					content.retention=scroll_end.getTime()-scroll_start.getTime();
-					console.info(content.scrollBttom,content)
 					prescrollTop=scrollTop
 					scroll_start=new Date();
 					conn.send(JSON.stringify(content));