Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
qfw
7
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

演示页

wangchuanjin 9 жил өмнө
parent
d12ee9f5d7
commit
c2fd289cd4
5 өөрчлөгдсөн 63 нэмэгдсэн , 40 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 0 3
      core/src/web/staticres/css/entcommunity.css
  2. 3 3
      core/src/web/staticres/js/entportrait.js
  3. 1 34
      core/src/web/templates/swordfish/wxshare.html
  4. 34 0
      core/src/web/templates/swordfish/wxshare_copy.html
  5. 25 0
      df

+ 0 - 3
core/src/web/staticres/css/entcommunity.css
Файл харах 

@@ -553,9 +553,6 @@ a:focus, a:hover{
 
 	padding-bottom: 0px !important;
 
 	padding-bottom: 0px !important;
 
 }
 
 }
 
 .ent-serviceintroduction{
 
 .ent-serviceintroduction{
 
-	height: 60px;
 
-	overflow: hidden;
 
-	text-overflow: ellipsis;
 
 	word-wrap: break-word;
 
 	word-wrap: break-word;
 
 	word-break: break-all;
 
 	word-break: break-all;
 
 	white-space: normal !important;
 
 	white-space: normal !important;

+ 3 - 3
core/src/web/staticres/js/entportrait.js
Файл харах 

@@ -156,17 +156,17 @@ function ServiceList(){
 
 					html += '<td>&nbsp;</td><td>&nbsp;</td>';
 
 					html += '<td>&nbsp;</td><td>&nbsp;</td>';
 
 				}
 
 				}
 
 				html += '</tr><tr>'
 
 				html += '</tr><tr>'
 
-					+'<td colspan="3"><div class="ent-serviceintroduction"><div>'+r[i].s_introduction+'</div></div></td>'
 
+					+'<td colspan="3"><div class="ent-serviceintroduction">'+r[i].s_introduction+'</div></td>'
 
 					+'</tr>';
 
 					+'</tr>';
 
 			}
 
 			}
 
 			$("#serviceListPaging").parent().prevAll().remove();
 
 			$("#serviceListPaging").parent().prevAll().remove();
 
 			$("#serviceListPaging").parent().before(html);
 
 			$("#serviceListPaging").parent().before(html);
 
-			$(".ent-serviceintroduction").each(function(){
 
+			/*$(".ent-serviceintroduction").each(function(){
 
 				console.info($(this).height() +"------"+ $(this).children("div").height());
 
 				console.info($(this).height() +"------"+ $(this).children("div").height());
 
 				if($(this).height() < $(this).children("div").height()){
 
 				if($(this).height() < $(this).children("div").height()){
 
 					$(this).parent().append("......");
 
 					$(this).parent().append("......");
 
 				}
 
 				}
 
-			});
 
+			});*/
 
 		});
 
 		});
 
 	});
 
 	});
 
 }
 
 }

+ 1 - 34
core/src/web/templates/swordfish/wxshare.html
Файл харах 

@@ -1,34 +1 @@
 
-<html >
 
-<head>
 
-<title>企明星-剑鱼</title>
 
-<meta charset="utf-8">
 
-<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 
-<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 
-<meta name="renderer" content="webkit">
 
-<link href="/css/bootstrap.min.css" rel="stylesheet">
 
-
 
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 
-<script src="/js/jquery.js"></script>
 
-<script src="/js/bootstrap.min.js"></script>
 
-
 
-<script src="/wxswordfish/share.js"></script>
 
-<script>
 
-	initShare({{.T.signature}},{{.T.shareid}});
 
-</script>
 
-</head>
 
-<body style="margin:0px; background-color:#C5F7FE;">
 
-<img src="/wxswordfish/images/share-cj.jpg" class="img-responsive" alt="Cinque Terre">
 
-<img id="img2" style="position:absolute;" class="img-responsive" src="/front/weixinshare/{{.T.shareid}}" >
 
-</body>
 
-<script>
 
-$(function(){
 
-	var width=$(window).width();
 
-	var max=750
 
-	if(width>max){
 
-		width=max
 
-	}
 
-	$("#img2").css({"width":width*0.48,"top":width*0.78,"left":width*0.26})
 
-	
-})
 
-</script>
 
-</html>
 
+{{include "/swordfish/wxshareguide.html"}}

+ 34 - 0
core/src/web/templates/swordfish/wxshare_copy.html
Файл харах 

@@ -0,0 +1,34 @@
 
+<html >
 
+<head>
 
+<title>企明星-剑鱼</title>
 
+<meta charset="utf-8">
 
+<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 
+<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 
+<meta name="renderer" content="webkit">
 
+<link href="/css/bootstrap.min.css" rel="stylesheet">
 
+
 
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 
+<script src="/js/jquery.js"></script>
 
+<script src="/js/bootstrap.min.js"></script>
 
+
 
+<script src="/wxswordfish/share.js"></script>
 
+<script>
 
+	initShare({{.T.signature}},{{.T.shareid}});
 
+</script>
 
+</head>
 
+<body style="margin:0px; background-color:#C5F7FE;">
 
+<img src="/wxswordfish/images/share-cj.jpg" class="img-responsive" alt="Cinque Terre">
 
+<img id="img2" style="position:absolute;" class="img-responsive" src="/front/weixinshare/{{.T.shareid}}" >
 
+</body>
 
+<script>
 
+$(function(){
 
+	var width=$(window).width();
 
+	var max=750
 
+	if(width>max){
 
+		width=max
 
+	}
 
+	$("#img2").css({"width":width*0.48,"top":width*0.78,"left":width*0.26})
 
+	
+})
 
+</script>
 
+</html>

+ 25 - 0
df
Файл харах 

@@ -0,0 +1,25 @@
 
+diff --cc core/src/timetask.json
 
+index 0eba9db,8be7bc9..0000000
 
+--- a/core/src/timetask.json
 
++++ b/core/src/timetask.json
 
+@@@ -1,1 -1,1 +1,5 @@@
 
+- {"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}
 
+ -{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 12:54:36"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 12:54:36"}},"marketisstart":true,"marketrate":300}
 
+++<<<<<<< HEAD
 
+++{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}
 
+++=======
 
+++{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 12:54:36"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 12:54:36"}},"marketisstart":true,"marketrate":300}
 
+++>>>>>>> e697f24fdd22cbe16dc2ce282d2d1689a6e445a7
 
+diff --git a/common/src/qfw/util/sq/sq.go b/common/src/qfw/util/sq/sq.go
 
+index 96ac697..11e2d32 100644
 
+--- a/common/src/qfw/util/sq/sq.go
 
++++ b/common/src/qfw/util/sq/sq.go
 
+@@ -13,7 +13,7 @@ import (
 
+ const key string = "qmx20150708one_versionV1.0"
 
+ 
 
+ func init() {
 
+-	CheckSq()
 
++	//CheckSq()
 
+ }
 
+ 
 
+ func CheckSq() bool {