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

Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

wangshan 9 жил өмнө
parent
026a7cca3d 117dbe4a8a
commit
ad99e6d7be
11 өөрчлөгдсөн 44 нэмэгдсэн , 16 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 1 1
      core/src/qfw/swordfish/swordfishmanage.go
  2. 3 1
      core/src/web/staticres/js/entportrait.js
  3. 3 3
      core/src/web/staticres/js/qfw.js
  4. 5 0
      core/src/web/staticres/wxswordfish/main.js
  5. 1 1
      core/src/web/staticres/wxswordfish/style.css
  6. 2 0
      core/src/web/templates/swordfish/protocol.html
  7. 5 1
      core/src/web/templates/swordfish/protocoltxt.html
  8. 13 0
      core/src/web/templates/swordfish/wxprotocol.html
  9. 2 5
      core/src/web/templates/swordfish/wxrssset.html
  10. 7 2
      core/src/web/templates/swordfish/wxtoolbar.html
  11. 2 2
      core/src/web/templates/yellowpage/enterpriseinfo.html

+ 1 - 1
core/src/qfw/swordfish/swordfishmanage.go
Файл харах 

@@ -64,7 +64,7 @@ func (s *SwordFish) Protocol() error {
 
 
 //剑鱼用户协议
 
 func (s *SwordFish) Wxprotocol() error {
 
-	return s.Render("/swordfish/protocoltxt.html")
 
+	return s.Render("/swordfish/wxprotocol.html")
 
 }
 
 
 //跳转到用户中心剑鱼信息列表

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

@@ -92,7 +92,7 @@ function initRelation(){
 
 					$(".entrelation").css("height","auto");
 
 				}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
 
 					relationNoData();
 
-				}else{
 
+				}else if(r.flag == true){
 
 					$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 
 					loadJS("/js/d3.v3.min.js",function(){
 
 						loadJS("/js/geometry.js",function(){
 
@@ -102,6 +102,8 @@ function initRelation(){
 
 							});
 
 						});
 
 					});
 
+				}else{
 
+					relationNoData();
 
 				}
 
 			},
 
 			error: function(){

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

@@ -166,10 +166,10 @@ dateFormat.i18n = {
 
 };
 
 
 // For convenience...
 
-Date.prototype.Format = function (mask, utc) {
 
+Date.prototype.FormatEnhance = function (mask, utc) {
 
 	return dateFormat(this, mask, utc);
 
 };
 
-/*Date.prototype.Format = function (fmt) { //author: meizz 
+Date.prototype.Format = function (fmt) { //author: meizz 
     var o = {
 
         "M+": this.getMonth() + 1, //月份 
         "d+": this.getDate(), //日 
@@ -183,7 +183,7 @@ Date.prototype.Format = function (mask, utc) {
 
     for (var k in o)
 
     if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
 
     return fmt;
 
-}*/
 
+}
 
 //浏览器窗口大小变化重新加载
 
 window.onresize=webSiteInit;
 
 serializeObject = function(form) {

+ 5 - 0
core/src/web/staticres/wxswordfish/main.js
Файл харах 

@@ -517,4 +517,9 @@ $(function(){
 
 				break;
 
 		}
 
 	});
 
+
 
+	//剑鱼协议
 
+	if(winWidth<341){
 
+		$("#prexieyi").html("");
 
+	}
 
 });

+ 1 - 1
core/src/web/staticres/wxswordfish/style.css
Файл харах 

@@ -59,7 +59,7 @@ img{
 
 /**************/
 
 .operation{
 
 	background-color: #F8F8F8;
 
-	margin-bottom: 50px;
 
+	margin-bottom: 20px;
 
 }
 
 .operation>.parent-node{
 
 	width: 100%;

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

@@ -10,7 +10,9 @@
 
 {{include "/common/swordfishhead.html"}}
 
 <!-- 中间 -->
 
 <div class="b-content container-fluid swordfish-index">
 
+	<div class="b-left" style="padding-left:50px">
 
 	{{include "/swordfish/protocoltxt.html"}}
 
+	</div>
 
 	<div class="b-right">
 
 		<div class="swordfish-right-title">
 
 			剑鱼最新消息

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

@@ -3,7 +3,8 @@
 
 	padding: 0px 0px 0px 25px;
 
 }
 
 </style>
 
-<div class="b-left" style="line-height:30px">
 
+<div class="col-xs-12" style="line-height:30px;padding:0px 30px 0px 50px">
 
+	<p style="text-align:center;font-size:20px;">剑鱼用户服务协议<p>
 
 	<p>一，您以任何方式（包括但不限于企明星网站www.qmx.top、www.qimingxing.info、微信公众号qmx-cn）使用剑鱼服务即表示您已充分阅读、理解并同意接受本规则的条款和条件。</p>
 
 	<p>二，企明星有权根据业务发展的需要修订本规则，在本规则更新时不再单独通知您。经修订的规则一经在企明星公布，即产生效力，您继续使用剑鱼，则视为您已接受修订的规则。当使用过程中发生争议时，应以最新的规则为准。</p>
 
 	<p>三，服务条件</p>
 
@@ -17,4 +18,7 @@
 
 	<p class="pinden">2，从原始信息发布到您收到剑鱼推送信息会经过一个复杂的技术处理和网络传输过程，企明星对您收到剑鱼推送信息的时间延迟指标不做承诺。由于您未能在某个时间内收到剑鱼推送信息而造成的任何结果，企明星不承担责任。</p>
 
 	<p class="pinden">3，企明星保证您收到的剑鱼推送信息符合您指定的订阅条件。企明星不保证您收到的剑鱼推送信息准确符合您的真实意图。</p>
 
 	<p class="pinden">4，您保证您使用剑鱼的设备以及微信App正常运行。如果由于您使用剑鱼的设备或微信App的问题造成您无法接收剑鱼推送信息，企明星不承担责任。</p>
 
+	<div class="col-xs-12 hidden-sm hidden-md hidden-lg" style="text-align:center;">
 
+	 <button class="btn btn-primary" onclick="window.location.href='/swordfish/page'" style="padding-top:3px;padding-bottom:3px;">返回</button></td>
 
+	</div>
 
 </div>

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

@@ -0,0 +1,13 @@
 
+<html>
 
+<head>
 
+<title>{{Msg "seo" "qfw.swordfish.title"}}</title>
 
+<meta name="Keywords" content="{{Msg "seo" "qfw.swordfish.key"}}"/>
 
+<meta name="Description" content="{{Msg "seo" "qfw.swordfish.description"}}"/>
 
+{{include "/common/inc.html"}}
 
+</head>
 
+<body>
 
+<div class="container-fluid" style="padding-left:20px">
 
+	{{include "/swordfish/protocoltxt.html"}} 
+</div>
 
+</body>
 
+</html>

+ 2 - 5
core/src/web/templates/swordfish/wxrssset.html
Файл харах 

@@ -13,9 +13,6 @@
 
 	var msgset= {{.T.msgset}};
 
 	var shareid="{{.T.shareid}}";
 
 </script>
 
-<style>
 
-.xieyi{width:100%;height:80px;text-align:center;position:absolute;bottom:0px;}
 
-</style>
 
 </head>
 
 <body>
 
 <div class="credit-tip visible">
 
@@ -73,8 +70,8 @@
 
 		</li>
 
 	</ul>
 
 	<!--剑鱼服务协议-->
 
-	<div class="xieyi">
 
-		<span style="color:#CCCCDD">继续使用表明你已经同意了<span>
 
+	<div style="margin-bottom:80px;text-align:center;">
 
+		<span id="prexieyi" style="color:#CCCCDD">继续使用表明你已经同意了</span>
 
 		<a style="color:#33ABFF" href='/member/swordfish/wxprotocol'>剑鱼用户服务协议</a>
 
 	</div>
 
 	<!--关键词-->

+ 7 - 2
core/src/web/templates/swordfish/wxtoolbar.html
Файл харах 

@@ -86,8 +86,13 @@ $(function(){
 
 		$("#feedback-textarea").focus().parent().removeClass("red-border");
 
 	});
 
 	$("[id='goToShare']").click(function(){
 
-		$(".share-dialog").show();
 
-		$("html,body").addClass("overflow-hidden");
 
+		if(typeof(shareid) == "undefined" || shareid == ""){
 
+			window.location.href = "/swordfish/share/-1";
 
+		}else{
 
+			window.location.href = "/swordfish/share/"+shareid;
 
+		}
 
+		//$(".share-dialog").show();
 
+		//$("html,body").addClass("overflow-hidden");
 
 	});
 
 	$("#share-dialog-back").click(function(){
 
 		$(".share-dialog").hide();

+ 2 - 2
core/src/web/templates/yellowpage/enterpriseinfo.html
Файл харах 

@@ -326,13 +326,13 @@
 
 					{{range $k,$v := .T.res.alterInfo}}
 
 						<li>
 
 							<div>
 
-								<div><script>document.write(new Date({{$v.AltDate}}).Format("yyyy-MM-dd hh:mm:ss"));</script></div>
 
+								<div><script>document.write(new Date({{$v.AltDate}}).FormatEnhance("yyyy-mm-dd HH:MM:ss"));</script></div>
 
 								<div>{{$v.AltItemName}}</div>
 
 								<div>变更前：{{$v.AltBe}}<br>变更后：{{$v.AltAf}}</div>
 
 								<a></a>
 
 							</div>
 
 							<div>
 
-								<div><script>document.write(new Date({{$v.AltDate}}).Format("yyyy-MM-dd hh:mm:ss"));</script></div>
 
+								<div><script>document.write(new Date({{$v.AltDate}}).FormatEnhance("yyyy-mm-dd HH:MM:ss"));</script></div>
 
 								<div>{{$v.AltItemName}}</div>
 
 								<div>变更前：{{$v.AltBe}}<br>变更后：{{$v.AltAf}}</div>
 
 								<a></a>