xiugai

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

@@ -325,7 +325,6 @@ margin-bottom:12px;
 #syz-secondHtml .feedback div span {
   color: #888888;
   font-size: 0.28rem;
-  margin-top: 4px;
   display: inline-block;
 }
 .hidden{

src/jfw/modules/app/src/web/templates/followent/add.html

@@ -21,7 +21,7 @@
 		resize: none;
 		padding-left: 5px;
 		font-size: 14px;
-		line-height: 35px;
+		height: 40px;
 	}
 
 	#reclist{
@@ -87,7 +87,8 @@
                         sessionStorage.version="0";
                     }
                     //window.location.href = "/followeEnt/set/add/"+r.id;
-                    window.location.href = "/jyapp/followent/entList";
+                    //window.location.href = "/jyapp/followent/entList";
+					window.history.back();
                 }else if(r.status == "m"){
                     EasyAlert.show("最多可关注<br>10个企业！");
                 }else{
@@ -102,7 +103,7 @@
 		$("#recList").html("");
 		$.post("/jyapp/followent/recList",{entName:entName_key},function(r){
 			if(r){
-				if(typeof (r.recList)!="undefined"){
+				if(typeof(r.recList)!="undefined" && r.recList != null && r.recList.length > 0){
 					var recList = r.recList;
 					for(var i=0;i<recList.length;i++){
 					    var entName = recList[i].name;
@@ -113,10 +114,9 @@
 						var obj=$("<div class='rec' data-id='"+id+"'>"+entName.replace(entName_key,"<span class='highLight'>"+entName_key+"</span>")+"</div>");
 						$("#recList").append(obj);
 					}
+					$("#recList").show();
 				}
 			}
-			$("#recList").show();
-
 			$(".rec").click(function(){
                     if($(this).text()!=""){
                         $("input").val($(this).text());
@@ -139,7 +139,7 @@
 			<span class="opation disabled">完成</span>
 		</div>
 		<from>
-			<input  placeholder="企业名称" name="title"/>
+			<input type="text" placeholder="企业名称" name="title"/>
 			<div id="recList" style="display: none">
 			</div>
 		</from>

src/jfw/modules/app/src/web/templates/followent/set.html

@@ -150,13 +150,12 @@ if(sessionStorage){
 							sessionStorage.followSetReload = "1";
 						}
 						EasyAlert.show("已取消关注");
-						//sessionStorage.version="1";
+						//
 						setTimeout(function(){
 							if(backUrl == null){
-								if(sessionStorage.version == "0"){
+								if(sessionStorage.version == "0" || sessionStorage.version == "-1"){
+									sessionStorage.version="1";
 									history.go(-1);
-								}else if(sessionStorage.version == "1"){
-									window.location.href = "/jyapp/followent/entList";
 								}else{
 									window.location.href = "/jyapp/followent/entList";
 								}

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

@@ -1337,10 +1337,10 @@ function deepReading(){
 	var contentHeight = $(".content").height() + $(".content").offset().top - $(".info").offset().top;
 	//可视区域高度
 	var clientHeight = document.body.clientHeight - $(".app-layout-header").outerHeight();
-	//总屏数
 	if(contentHeight <= 0 || clientHeight <= 0){
 		return;
 	}
+	//总屏数
 	var countScreen = Math.floor(contentHeight / clientHeight);
 	if(countScreen == 0){
 		countScreen = 1;

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -86,7 +86,10 @@ $(function(){
 		if(istiped){
 			$("#easyAlert").hide();
 		}
-		checkKeys($(this));
+		var thisClass = this;
+		setTimeout(function(){
+			checkKeys($(thisClass));
+		},0);
 		var thisParent = $(this).parents(".keyWordGroup");
 		if(filterKeyword($(this).val()).length > 0){
 			if(!thisParent.hasClass("hasset")){

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

@@ -234,6 +234,8 @@
 /**微信列表**/
 .listpage .jyfwlistno{
 	float:left;
+	position: relative;
+    top: 2px;
 }
 .listpage .jyfwlisttitle{
 	float:left;    

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

@@ -16,7 +16,7 @@ var EasyAlert = {
 		if(typeof(css) != "undefined"){
 			$("#easyAlert").css(css);
 		}
-		$("#easyAlert").css({"left":"50%","margin-top":-($("#easyAlert").outerHeight()/2),"margin-left":-($("#easyAlert").outerWidth()/2)}).show();
+		$("#easyAlert").css({"left":"50%","margin-top":-($("#easyAlert").outerHeight()/2+35),"margin-left":-($("#easyAlert").outerWidth()/2)}).show();
 	},
 	hide: function(){
 		$("#easyAlert").remove();
@@ -33,7 +33,7 @@ var EasyPopup = function(id){
 	this.show = function(){
 		$("#"+this.id).fadeIn();
 		var mainObj = $("#"+id+">div:first");
-		mainObj.css({"margin-top":-(mainObj.outerHeight()/2)});
+		mainObj.css({"margin-top":-(mainObj.outerHeight()/2 + 30)});
 	},
 	this.hide = function(){
 		$("#"+this.id).fadeOut();

src/jfw/modules/followent/src/web/templates/weixin/add.html

@@ -23,7 +23,7 @@
 		resize: none;
 		padding-left: 5px;
 		font-size: 14px;
-		line-height: 35px;
+		height: 40px;
 	}
 
 	#reclist{
@@ -90,7 +90,8 @@
                         sessionStorage.version="0";
                     }
                     //window.location.href = "/followeEnt/set/add/"+r.id;
-                    window.location.href = "/jylab/followent/entList";
+                    //window.location.href = "/jylab/followent/entList";
+					window.history.back();
                 }else if(r.status == "m"){
                     EasyAlert.show("最多可关注<br>10个企业！");
                 }else{
@@ -137,7 +138,7 @@
 		<span class="opation disabled">完成</span>
 	</div>
 	<from>
-		<input  placeholder="企业名称" name="title"/>
+		<input type="text" placeholder="企业名称" name="title"/>
 		<div id="recList" style="display: none">
 		</div>
 	</from>

src/jfw/modules/followent/src/web/templates/weixin/set.html

@@ -131,12 +131,11 @@ if(sessionStorage){
 							sessionStorage.followSetReload = "1";
 						}
 						EasyAlert.show("已取消关注");
-						//sessionStorage.version="1";
+						//
 						setTimeout(function(){
-							if(sessionStorage.version == "0"){
+							if(sessionStorage.version == "0" || sessionStorage.version == "-1"){
+								sessionStorage.version="1";
 								history.go(-1);
-							}else if(sessionStorage.version == "1"){
-								window.location.href = "/jylab/followent/entList";
 							}else{
 								window.location.href = "/jylab/followent/entList";
 							}

src/jfw/modules/weixin/src/config.json

@@ -6,11 +6,11 @@
     "weixinport": "8080",
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
-    "webdomain": "http://webws.qmx.top",
-    "appid": "wx5b1c6e7cc4dac0e4",
-    "apptoken": "top2015top2015",
-    "appsecret": "b026103ffebd2291b3edb7a269612112",
-    "proxysess": "http://webws.qmx.top/front/sess/%s",
+    "webdomain": "http://webwcj.qmx.top",
+    "appid": "wx76e1309b01a7b17e",
+    "apptoken": "top2016top2016",
+    "appsecret": "dd00e71cb2370432d9de848b674eb8e7",
+    "proxysess": "http://webwcj.qmx.top/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼，让投标无限可能！",
 	"tpl_push_id": "cxEH6Ud6uBOyr_tdHvR3efcdApySm2TVd8-f5zgWe8M",

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

@@ -325,7 +325,6 @@ margin-bottom:12px;
 #syz-secondHtml .feedback div span {
   color: #888888;
   font-size: 0.28rem;
-  margin-top: 4px;
   display: inline-block;
 }
 .hidden{

src/web/staticres/css/follow.css

@@ -254,6 +254,8 @@ top:17px;
 /**微信列表**/
 .listpage .jyfwlistno{
 	float:left;
+	position: relative;
+    top: 2px;
 }
 .listpage .jyfwlisttitle{
 	float:left;    

src/web/staticres/js/common.js

@@ -102,7 +102,7 @@ var EasyPopup = function(id){
 	this.show = function(){
 		$("#"+this.id).fadeIn();
 		var mainObj = $("#"+id+">div:first");
-		mainObj.css({"margin-top":-(mainObj.outerHeight()/2)});
+		mainObj.css({"margin-top":-(mainObj.outerHeight()/2 + 35)});
 	},
 	this.hide = function(){
 		$("#"+this.id).fadeOut();

src/web/templates/weixin/wxinfocontent.html

@@ -1262,12 +1262,15 @@ function deepReading(){
 	var contentHeight = $(".content").height() + $(".content").offset().top;
 	//可视区域高度
 	var clientHeight = document.body.clientHeight;
+	if(contentHeight <= 0 || clientHeight <= 0){
+		return;
+	}
 	//总屏数
 	var countScreen = Math.floor(contentHeight / clientHeight);
-	//console.info("countScreen---"+countScreen)
-	if(contentHeight <= 0){
-		return;
+	if(countScreen == 0){
+		countScreen = 1;
 	}
+	//console.info("countScreen---"+countScreen)
 	var screenObj = {};
 	var depthReadTime = setInterval(function(){
 		var thisScrollTop = $(window).scrollTop();

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1569,12 +1569,15 @@ function deepReading(){
 	var contentHeight = $(".content").height() + $(".content").offset().top;
 	//可视区域高度
 	var clientHeight = document.body.clientHeight;
+	if(contentHeight <= 0 || clientHeight <= 0){
+		return;
+	}
 	//总屏数
 	var countScreen = Math.floor(contentHeight / clientHeight);
-	//console.info("countScreen---"+countScreen)
-	if(contentHeight <= 0){
-		return;
+	if(countScreen == 0){
+		countScreen = 1;
 	}
+	//console.info("countScreen---"+countScreen)
 	var screenObj = {};
 	var depthReadTime = setInterval(function(){
 		var thisScrollTop = $(window).scrollTop();

src/web/templates/weixin/wxkeyset/index.html

@@ -79,7 +79,10 @@ $(function(){
 		if(istiped){
 			$("#easyAlert").hide();
 		}
-		checkKeys($(this));
+		var thisClass = this;
+		setTimeout(function(){
+			checkKeys($(thisClass));
+		},0);
 		var thisParent = $(this).parents(".keyWordGroup");
 		if(filterKeyword($(this).val()).length > 0){
 			if(!thisParent.hasClass("hasset")){