wangshan пре 9 година
родитељ
комит
b114a8ebf9

+ 1 - 3
core/src/qfw/member/credit/creditdetail.go

@@ -7,7 +7,6 @@ import (
 	"github.com/dchest/captcha"
 	"github.com/go-xweb/xweb"
 	. "gopkg.in/mgo.v2/bson"
-	"log"
 	cu "qfw/coreutil"
 	"qfw/util"
 	cd "qfw/util/credit"
@@ -178,8 +177,7 @@ func (c *credit) CreditList() error {
 		for i := 0; i < len(r); i++ {
 			r[i]["index"] = (i + 1) + (currentPage-1)*limit
 			d := r[i]["l_date"]
-			r[i]["l_date"] = util.FormatDateWithObj(&d, util.Date_Full_Layout)
-			log.Println("l_date:", r[i]["l_date"])
+			r[i]["l_date"] = util.FormatDateWithObj(&d, "2006/01/02 15:04:05")
 		}
 		c.ServeJson(M{"list": r, "count": count})
 		return nil

+ 1 - 1
core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-06-08 08:43:14"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-06-08 08:43:14"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-06-08 10:41:21"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-06-08 10:41:21"}},"marketisstart":true,"marketrate":300}

+ 3 - 3
core/src/web/templates/member/credit/mcreditindex.html

@@ -513,10 +513,10 @@
 					if (current==1){
 						count=r.count;
 					}
-					var format="yyyy/MM/dd hh:mm:ss";
+					//var format="yyyy/MM/dd hh:mm:ss";
 					for(var i=0;i<list.length;i++){
-						console.log("===="+list[i]["l_date"])
-						var  d=new Date(list[i]["l_date"]).Format(format).split(" ");
+						var  d=list[i]["l_date"].split(" ");
+						console.log("===="+d)
 						var change=list[i]["i_score"];
 						var score=list[i]["i_scorenow"];	
 						if(change>0){

+ 27 - 0
core/src/web/templates/member/incmobile/detailindex.html

@@ -228,6 +228,33 @@
 				}
 			});
 	})
+	function follow(me){
+				$.get("/member/enterprise/isFollowed?entId="+entId,function(r){
+				if (r.status=="n"){
+					$.get("/member/enterprise/follow?entId="+entId+"&flag=false",function(rs){
+						if (rs.status == "y"){
+							TipAssembly.show("已关注");
+							$("#gz").find("i").attr("class","glyphicon yiguanzhu");
+							$("#gz").find("span").text("已关注");
+						}else if(rs.status == "n"){
+							TipAssembly.show("关注失败!");
+						}else if(rs.status == "m"){
+							TipAssembly.show("您最多关注10家企业!");
+						}
+					});
+				}else{
+					$.get("/member/enterprise/follow?entId="+entId+"&flag=true",function(rs){
+						if (rs.status == "y"){
+							TipAssembly.show("已取消关注");
+							$("#gz").find("i").attr("class","glyphicon weiguanzhu");
+							$("#gz").find("span").text("关注");
+						}else if(rs.status == "n"){
+							TipAssembly.show("取消关注失败!");
+						}
+					});
+				}
+			});
+		};
 	$(window).resize(function(){
 	 		resize();
 	});

+ 5 - 4
core/src/web/templates/member/incmobile/list.html

@@ -19,6 +19,7 @@
 		background-color: #ccc;
     	color: #fff;
 		padding: 0px;
+		top: auto;
 	}
 	#province li,#city li{
 		width: 100%;
@@ -337,7 +338,7 @@
 						}else if(rs.status == "n"){
 							TipAssembly.show("取消关注失败!");
 						}
-					})	;
+					});
 				}
 			})
 			  event.stopPropagation();
@@ -358,13 +359,13 @@ var TipAssembly = {
 			thisClass.hide();
 			thisClass.timeout = null;
 		},1000);
-		$("body").append('<div class="tipAssembly" id="tipAssembly">'+text+'</div>');
+		$(".bottom").append('<div class="tipAssembly" id="tipAssembly">'+text+'</div>');
 		if(typeof(css) != "undefined"){
 			$("#tipAssembly").css(css);
 		}
-		var height=document.body.scrollHeight
+		var height=document.body.clientHeight
 		$("#tipAssembly").css({"left":($(window).width()-140)/2});
-		$("#tipAssembly").css({"top":(height+200)/2});
+		$("#tipAssembly").css({"bottom":(height+200)/2});
 	},
 	hide: function(){
 		$("#tipAssembly").remove();