信息订阅

core/src/qfw/swordfish/swordfishmanage.go

@@ -75,6 +75,8 @@ func (s *SwordFish) RssSet() error {
 	list := getNewest()
 	s.T["list"] = list
 	s.T["msgset"] = msgset
+	s.T["searchtype"] = s.GetString("searchtype")
+	s.T["searchvalue"] = s.GetString("searchvalue")
 	return s.Render("/swordfish/rssset.html", &s.T)
 }
 

core/src/web/staticres/wxswordfish/main.js

@@ -499,26 +499,33 @@ $(function(){
 	$("body").append($("#tender-keyword").clone().removeAttr("id").attr("id","bid-keyword"))
 			.append($("#tender-scope").clone().removeAttr("id").attr("id","bid-scope"));
 	var searchnameIsExsit = false;
-	if (typeof(searchname) != "undefined" && searchname.length > 0 ){
-		if(typeof(msgset[s_type]) != "undefined"){
-			var keywordes = msgset[s_type].a_key;
-			if(typeof(keywordes) != "undefined" && keywordes.length > 0){
-				for(var i=0;i<keywordes.length;i++){
-					var keywordesArr = keywordes[i].split("+");
-					for(var k=0;k<keywordesArr.length;k++){
-						if(keywordesArr[k] == searchname){
-							searchnameIsExsit = true;
+	if(msgset == ""){
+		if(typeof(searchname) != "undefined" && searchname.length > 0 ){
+			msgset = {};
+			msgset[s_type] = {"a_key":[searchname],"s_scope":"A"};
+		}
+	}else{
+		if (typeof(searchname) != "undefined" && searchname.length > 0 ){
+			if(typeof(msgset[s_type]) != "undefined"){
+				var keywordes = msgset[s_type].a_key;
+				if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+					for(var i=0;i<keywordes.length;i++){
+						var keywordesArr = keywordes[i].split("+");
+						for(var k=0;k<keywordesArr.length;k++){
+							if(keywordesArr[k] == searchname){
+								searchnameIsExsit = true;
+							}
 						}
 					}
-				}
-				if(!searchnameIsExsit){
-					keywordes.push(searchname);
+					if(!searchnameIsExsit){
+						keywordes.push(searchname);
+					}
+				}else{
+					msgset[s_type]["a_key"] = [searchname];
 				}
 			}else{
-				msgset[s_type]["a_key"] = [searchname];
+				msgset[s_type] = {"a_key":[searchname]};
 			}
-		}else{
-			msgset[s_type] = {"a_key":[searchname]};
 		}
 	}
 	if(typeof(msgset.tender) != "undefined"){

core/src/web/templates/swordfish/rssset.html

@@ -302,6 +302,15 @@
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
+var searchtype = {{.T.searchtype}};
+if(searchtype == "1"){
+	searchtype = "tender";
+}else if(searchtype == "2"){
+	searchtype = "bid";
+}else{
+	searchtype = "";
+}
+var searchvalue = {{.T.searchvalue}};
 //Array.prototype.indexOf = function (val) {for (var i = 0; i < this.length; i++) {if (this[i] == val) {return i;}} return -1;};  
 //Array.prototype.removevalue = function (val){var index=this.indexOf(val);if(index > -1){this.splice(index, 1);}}; 
 var oprarr = new Array();
@@ -337,6 +346,36 @@ $(function(){
 		}
 	}
 	var msgset = {{.T.msgset}};
+	var searchvalueIsExsit = false;
+	if(msgset == ""){
+		if(typeof(searchvalue) != "undefined" && searchvalue.length > 0 ){
+			msgset = {};
+			msgset[searchtype] = {"a_key":[searchvalue],"s_scope":"A"};
+		}
+	}else{
+		if (typeof(searchvalue) != "undefined" && searchvalue.length > 0 ){
+			if(typeof(msgset[searchtype]) != "undefined"){
+				var keywordes = msgset[searchtype].a_key;
+				if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+					for(var i=0;i<keywordes.length;i++){
+						var keywordesArr = keywordes[i].split("+");
+						for(var k=0;k<keywordesArr.length;k++){
+							if(keywordesArr[k] == searchvalue){
+								searchvalueIsExsit = true;
+							}
+						}
+					}
+					if(!searchvalueIsExsit){
+						keywordes.push(searchvalue);
+					}
+				}else{
+					msgset[searchtype]["a_key"] = [searchvalue];
+				}
+			}else{
+				msgset[searchtype] = {"a_key":[searchvalue]};
+			}
+		}
+	}
 	if(msgset != ""){
 		if(typeof(msgset.tender) != "undefined"){
 			selectScope("tender",msgset.tender.s_scope);
@@ -418,6 +457,16 @@ $(function(){
 		$(this).hide();
 		ajaxReq();
 	});
+	//直接订阅带过来的关键字不存在
+	
+	if(typeof(searchvalue) != "undefined" && searchvalue.length > 0){
+		//自动打开
+		if($("#"+searchtype+" .swordfish-checked").is(":hidden")){
+			$("#"+searchtype+" .swordfish-uncheck").click();
+		}else if(!searchvalueIsExsit){//修改关键词
+			ajaxReq();
+		}
+	}
 	//针对页面异常关闭
 	if(typeof(msgset.tender) != "undefined"&&typeof(msgset.tender.i_switchstatus) != "undefined"&&msgset.tender.i_switchstatus==1){
 		if(tender_i_status==0){

core/src/web/templates/swordfish/searchinfolist.html

@@ -309,10 +309,14 @@ $(function(){
 				</div>
 			</div>
 		</div>
+		<form action="/member/swordfish/rssset" method="post" id="goToRsssetForm">
+		<input type="hidden" name="searchtype" value="{{.T.s_type}}"/>
+		<input type="hidden" name="searchvalue" value="{{.T.keywords}}"/>
 		<div id="searchts" class="text-center hidden">
-		<div class="dybtn"  onClick="window.location.href='/member/swordfish/rssset';">订阅</div>
+		<div class="dybtn" onclick="document.getElementById('goToRsssetForm').submit()">订阅</div>
 		<div>确认该关键词查询结果无误</div>
-		</div>	
+		</div>
+		</form>	
 	</div>
 	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">