zhangxinlei1996 5 tahun lalu
induk
melakukan
5865971bfd
2 mengubah file dengan 29 tambahan dan 47 penghapusan
  1. 21 0
      src/web/staticres/js/common.js
  2. 8 47
      src/web/templates/weixin/wxinfocontent.html

+ 21 - 0
src/web/staticres/js/common.js

@@ -262,6 +262,27 @@ function getUrlParam(name){
 		return unescape(r[2]); 
 		return unescape(r[2]); 
 	return null;
 	return null;
 }
 }
+
+/******* 获取url参数(正则)********/
+function getParam(name) {
+    var search = document.location.search;
+    // alert(search);
+    var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+    var matcher = pattern.exec(search);
+    var items = null;
+    if (null != matcher) {
+        try {
+            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+        } catch (e) {
+            try {
+                items = decodeURIComponent(matcher[1]);
+            } catch (e) {
+                items = matcher[1];
+            }
+        }
+    }
+    return items;
+};
 //获取滚动条宽度
 //获取滚动条宽度
 function getScrollWidth() {
 function getScrollWidth() {
 	var noScroll, scroll, oDiv = document.createElement("DIV");
 	var noScroll, scroll, oDiv = document.createElement("DIV");

+ 8 - 47
src/web/templates/weixin/wxinfocontent.html

@@ -11,7 +11,7 @@
 <script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}1"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <style type="text/css">
 <style type="text/css">
 /* forceShare start */
 /* forceShare start */
@@ -561,30 +561,12 @@ pre {
 				if(buyerclass){
 				if(buyerclass){
 					document.write("<span class='buyerclass'>"+ buyerclass+"</span>");
 					document.write("<span class='buyerclass'>"+ buyerclass+"</span>");
 				}
 				}
+				//项目匹配
 				projectMatch=getParam("projectMatch");
 				projectMatch=getParam("projectMatch");
-				if (projectMatch!=""){
+				if (projectMatch){
 					document.write("<span class='projectMatch'>"+projectMatch+"</span>")
 					document.write("<span class='projectMatch'>"+projectMatch+"</span>")
 				}
 				}
-				/******* 获取url参数(正则)********/
-				function getParam(name) {
-				    var search = document.location.search;
-				    // alert(search);
-				    var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
-				    var matcher = pattern.exec(search);
-				    var items = null;
-				    if (null != matcher) {
-				        try {
-				            items = decodeURIComponent(decodeURIComponent(matcher[1]));
-				        } catch (e) {
-				            try {
-				                items = decodeURIComponent(matcher[1]);
-				            } catch (e) {
-				                items = matcher[1];
-				            }
-				        }
-				    }
-				    return items;
-				};
+				
 			</script>
 			</script>
 		</div>
 		</div>
 		<div class="time_label">
 		<div class="time_label">
@@ -633,10 +615,10 @@ pre {
 				var suclass = subscopeclass.split(",")[0];
 				var suclass = subscopeclass.split(",")[0];
 				document.write("<span class='industry'>"+ suclass.split("_")[0]+"</span>");
 				document.write("<span class='industry'>"+ suclass.split("_")[0]+"</span>");
 			}
 			}
-			projectMatch=getParam("projectMatch");
-			if (projectMatch!=""){
-				document.write("<span class='projectMatch'>"+projectMatch+"</span>")
-			}
+			//projectMatch=getParam("projectMatch");
+			//if (projectMatch){
+			//	document.write("<span class='projectMatch'>"+projectMatch+"</span>")
+			//}
 			var l_publishtime = {{.T.obj.l_publishtime}};
 			var l_publishtime = {{.T.obj.l_publishtime}};
 			if(l_publishtime != ""){
 			if(l_publishtime != ""){
 				var tdf = timeDiff(new Date(Number(l_publishtime+"000")))
 				var tdf = timeDiff(new Date(Number(l_publishtime+"000")))
@@ -644,27 +626,6 @@ pre {
 					document.write("<span class='timebefore'><i class='glyphicon bofangjilu'></i>"+tdf+"</span>");
 					document.write("<span class='timebefore'><i class='glyphicon bofangjilu'></i>"+tdf+"</span>");
 				}
 				}
 			}
 			}
-			
-			/******* 获取url参数(正则)********/
-			function getParam(name) {
-			    var search = document.location.search;
-			    // alert(search);
-			    var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
-			    var matcher = pattern.exec(search);
-			    var items = null;
-			    if (null != matcher) {
-			        try {
-			            items = decodeURIComponent(decodeURIComponent(matcher[1]));
-			        } catch (e) {
-			            try {
-			                items = decodeURIComponent(matcher[1]);
-			            } catch (e) {
-			                items = matcher[1];
-			            }
-			        }
-			    }
-			    return items;
-			};
 		</script>
 		</script>
 		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<span class="follow" >{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</span>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
 		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<span class="follow" >{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</span>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
 		{{end}}
 		{{end}}