xiugai

src/jfw/modules/push/src/config.json

@@ -1,10 +1,10 @@
 {
-    "StartTime": "2017-09-19 13:40:02",
+    "StartTime": "",
     "bidViewDomain": "https://wblmjy.qmx.top",
     "durationMinutes": 10,
     "elasticPoolSize": 10,
     "elasticsearch": "http://192.168.3.18:9200",
-    "lastid": "59c0adb2f0c367251336c5ff",
+    "lastid": "",
     "mail_content": "\u003ctr\u003e\u003ctd\u003e\u003cnum\u003e%d\u003c/num\u003e\u003c/td\u003e\u003ctd\u003e\u003cdiv class='tit'\u003e\u003ca style='color: #000;text-decoration: none;' href='%s?mail' \u003e%s\u003c/a\u003e\u003c/div\u003e\u003c/td\u003e\u003ctd style='float: right;' class='infos' \u003e\u003cspan class='%s'\u003e%s\u003c/span\u003e\u003cspan class='%s'\u003e%s\u003c/span\u003e\u003cspan class='%s'\u003e%s\u003c/span\u003e\u003cspan class='time'\u003e%s\u003c/span\u003e\u003c/td\u003e\u003c/tr\u003e",
     "mail_html": "\u003cbody\u003e\u003cstyle\u003e *,body,html{margin:0;padding:0;font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;font-size:16px; }#all{margin:0 auto;width:1024px;overflow:hidden;}.head{margin:5x;margin-top:20px;}.des{padding-bottom:15px;border-bottom:1px solid #e8ecee;color: #686868;}td a:hover {color: #fe7379;text-decoration: underline;} .tit{width:560px;overflow: hidden;    white-space: nowrap;text-overflow: ellipsis;}.area {background-color: #2cb7ca;border-radius: 3px;color: #fff;padding: 1px 2px;}.type {background-color: #ffba00;border-radius: 3px;color: #fff;padding: 1px 2px;margin-left:5px;}.industry {background-color: #25c78c;border-radius: 3px;color: #fff;padding: 1px 2px;margin-left:5px;}.infos span{display:inline-block;margin-left:5px;}td{padding-top:8px;padding-bottom:8px;height:20px;line-height:20px;}num{padding:0 5px 0 0; font-size:16px;color:#2cb7ca;font-weight:bolder;}.keys{color:blue;} \u003c/style\u003e\u003cdiv id='all'\u003e\u003cdiv class='head'\u003e\u003cIMG width='100px' src=http://www.zhaobiao.info/images/swordfish/sf_01.png /\u003e\u003c/div\u003e\u003cdiv class='head des'\u003e根据您设置的关键词 ：\u003cspan class='keys'\u003e%s\u003c/span\u003e，剑鱼为您推送30天之内的信息。点击标题可查看详情信息\u003c/div\u003e\u003ctable cellpadding='0' cellspacing='0'\u003e%s\u003c/table\u003e\u003c/div\u003e \u003c/body\u003e",
     "mail_title": "您有新的%s信息-剑鱼招标订阅",
@@ -62,5 +62,6 @@
     "wxcontent": "剑鱼推送",
     "wxgroup": "%s信息",
     "wxtitle": "您有新的%s信息！",
+	"wxcolor": "#2cb7ca",
 	"maxSearch":10000
 }

src/jfw/modules/push/src/qfw/push/cf.go

@@ -11,7 +11,7 @@ var se util.SimpleEncrypt
 var Re *regexp.Regexp
 var MAXLen = 200
 var TitleLen, ContentLen, GroupLen int
-var WxTitle, WxContent, WxGroup string
+var WxTitle, WxContent, WxColor, WxGroup string
 var GmailMap *mail.GmailAuth
 var Domain = ""
 var (
@@ -30,6 +30,7 @@ func Inits() {
 	WxTitle = util.ObjToString(PushConfig["wxtitle"])
 	//正文
 	WxContent = util.ObjToString(PushConfig["wxcontent"])
+	WxColor = util.ObjToString(PushConfig["wxcolor"])
 	//信息类型
 	WxGroup = util.ObjToString(PushConfig["wxgroup"])
 	se = util.SimpleEncrypt{Key: "topnet"}

src/jfw/modules/push/src/qfw/push/weixincall.go

@@ -31,6 +31,7 @@ func SendWeiXinNew(k *MemberInterest, str string, Remarks string, o_pushinfo map
 			Detail:  WxContent,
 			Date:    "",
 			Service: fmt.Sprintf(WxGroup, infoTypeName),
+			Color:   WxColor,
 			Url:     Domain + "/front/sess/" + se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "__" + wid,
 		}
 		client, err := rpc.DialHTTP("tcp", PushConfig["weixinRpcServer"].(string))

src/jfw/modules/pushent/src/config.json

@@ -13,5 +13,6 @@
     "wxcontent": "剑鱼推送",
     "wxgroup": "关注企业",
     "wxtitle": "您关注的企业“%s”有新的公告信息！",
-	"maxSearch":10000
+	"wxcolor": "#25c78c",
+	"maxSearch": 10000
 }

src/jfw/modules/pushent/src/followpush/followpush.go

@@ -14,7 +14,7 @@ const (
 
 //每次推前构建用户关注内存结构 项目名称和项目代码对应 用户组
 var Setting map[string]*[]*map[string]interface{}
-var WxTitle, WxContent, WxGroup, ViewDomain string
+var WxTitle, WxContent, WxGroup, WxColor, ViewDomain string
 var Lock = sync.Mutex{}
 
 //加密串
@@ -28,6 +28,7 @@ func init() {
 	WxTitle = util.ObjToString(Sysconfig["wxtitle"])
 	WxContent = util.ObjToString(Sysconfig["wxcontent"])
 	WxGroup = util.ObjToString(Sysconfig["wxgroup"])
+	WxColor = util.ObjToString(Sysconfig["wxcolor"])
 	ViewDomain = util.ObjToString(Sysconfig["viewDomain"])
 	LastLen = 200 - len([]rune(WxContent)) - len([]rune(WxGroup))
 }

src/jfw/modules/pushent/src/followpush/push.go

@@ -384,6 +384,7 @@ func push(fid interface{}, sname, title, openid string, res *[]map[string]interf
 									Remark:  Tip1 + Remark + LastTip,
 									Detail:  WxContent,
 									Service: WxGroup,
+									Color:   WxColor,
 									Url:     ViewDomain + "/front/sess/" + se.EncodeString(openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",newInfoFollow") + "__" + sname + "__",
 								})
 							}

src/jfw/modules/pushproject/src/config.json

@@ -13,5 +13,6 @@
     "wxcontent": "剑鱼推送",
     "wxgroup": "关注项目",
     "wxtitle": "您关注的项目《%s》有新的公告信息！",
+	"wxcolor": "#ffba00",
 	"maxSearch":10000
 }

src/jfw/modules/pushproject/src/followpush/followpush.go

@@ -14,7 +14,7 @@ const (
 
 //每次推前构建用户关注内存结构 项目名称和项目代码对应 用户组
 var Setting map[string]*[]*map[string]interface{}
-var WxTitle, WxContent, WxGroup, ViewDomain string
+var WxTitle, WxContent, WxGroup, WxColor, ViewDomain string
 var Lock = sync.Mutex{}
 
 //加密串
@@ -28,6 +28,7 @@ func init() {
 	WxTitle = util.ObjToString(Sysconfig["wxtitle"])
 	WxContent = util.ObjToString(Sysconfig["wxcontent"])
 	WxGroup = util.ObjToString(Sysconfig["wxgroup"])
+	WxColor = util.ObjToString(Sysconfig["wxcolor"])
 	ViewDomain = util.ObjToString(Sysconfig["viewDomain"])
 	LastLen = 200 - len([]rune(WxContent)) - len([]rune(WxGroup))
 }

src/jfw/modules/pushproject/src/followpush/push.go

@@ -411,6 +411,7 @@ func push(fid interface{}, sname, scode, title, openid string, res *[]map[string
 									Remark:  Tip1 + Remark + LastTip,
 									Detail:  WxContent,
 									Service: WxGroup,
+									Color:   WxColor,
 									Url:     ViewDomain + "/front/sess/" + se.EncodeString(openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushfollowlist") + "__" + infoid + "__" + followid,
 								})
 							}

src/jfw/modules/weixin/src/jrpc/jrpc.go

@@ -30,12 +30,13 @@ func init() {
 }
 
 func (w *WeiXinRpc) SendPushMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) error {
+
 	_, err := w.Wwx.PostTemplateMessage(param.Openid, TPL_PUSH_ID, param.Url,
 		weixin.TmplData{
 			"first":    weixin.TmplItem{param.Title, ""},
 			"keyword1": weixin.TmplItem{param.Detail, ""},
 			"keyword2": weixin.TmplItem{param.Service, ""},
-			"remark":   weixin.TmplItem{param.Remark, "#0987FF"},
+			"remark":   weixin.TmplItem{param.Remark, util.If(param.Color != "", param.Color, "#0987FF").(string)},
 		})
 	if err != nil {
 		*ret = qrpc.RpcResult(err.Error())

src/web/staticres/css/wxsearch.css

@@ -2130,4 +2130,49 @@ body{
 }
 #entsearchPage #wrapper{
 	margin-bottom: 52px;
+}
+#supersearchPage .adv-wxsearch-center{
+	width:100%;
+	margin:auto;
+	min-height:45px;
+	text-align:center;
+	position: relative;
+}
+#supersearchPage .adv-wxsearch-center img{
+	width: 100%;
+}
+#searchIndex{
+	webkit-transform: translateZ(0);
+	-moz-transform: translateZ(0);
+	-ms-transform: translateZ(0);
+	-o-transform: translateZ(0);
+	transform: translateZ(0);
+}
+#supersearchPage,#entsearchPage{
+	background-color: #fff;
+}
+#supersearchPage img.closeadv{
+	width: 20px;
+	position: absolute;
+	top: -10px;
+	right: -10px;
+}
+#supersearchPage .closeadv-bg{
+	position: absolute;
+	width: 15px;
+	height: 15px;
+	border-radius: 50%;
+	background-color: #fff;
+	top: -8px;
+	right: -8px;
+}
+#supersearchPage .jydq-dialog ul>li{
+	padding-left: 18px;
+	position: relative;
+}
+#supersearchPage .jydq-dialog ul>li>span{
+	position: absolute;
+    left: 0px;
+	top: 24px;
+    font-size: 14px;
 }

src/web/staticres/js/wxSupersearch.js

@@ -12,6 +12,7 @@ var SuperSearch = {
 	noMoreCache: false,
 	showNull: null,//null true false
 	advert: null,
+	advertIsClose: false,
 	industry: "",
 	sortArray: "",
 	reqParam: {
@@ -381,30 +382,11 @@ var SuperSearch = {
 		var dialogObj = $("#supersearchPage .contentone");
 		dialogObj.find(".btn").click(function(){
 			if($(this).parent().index() == 0){
-				dialogObj.find('div[id="dqbtn"]').removeClass("active");
 				dialogObj.find(".btn").removeClass("active");
 			}else{
 				dialogObj.find("ul:first li:first .btn").removeClass("active");
 			};
 			$(this).toggleClass("active");
-			if ($(this).attr("class")!="active"){
-				$(this).prevAll('div[id="dqbtn"]').removeClass("active");
-			};
-			if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
-				$(this).prevAll('div[id="dqbtn"]').addClass("active");
-			};
-			if(dialogObj.find(".btn.active").length == 0){
-				dialogObj.find("ul:first li:first .btn").addClass("active");
-			};
-		});
-		dialogObj.find('div[id="dqbtn"]').click(function(){
-			$(this).toggleClass("active");
-			if ($(this).attr("class") != "active"){
-				$(this).nextAll(".btn").removeClass("active");
-			}else{
-				$(this).nextAll(".btn").addClass("active");
-				dialogObj.find("ul:first li:first .btn").removeClass("active");
-			};
 			if(dialogObj.find(".btn.active").length == 0){
 				dialogObj.find("ul:first li:first .btn").addClass("active");
 			};
@@ -599,6 +581,7 @@ var SuperSearch = {
 		sessionStorage.removeItem("superSearch_industry");
 		sessionStorage.removeItem("searchpageName");
 		sessionStorage.removeItem("superSearch_dyDiv");
+		sessionStorage.removeItem("superSearch_advertIsClose");
 		sessionStorage.removeItem("superSearch_shaxuan");
 		sessionStorage.removeItem("superSearch_showType");
 	},
@@ -840,7 +823,7 @@ var SuperSearch = {
 		var ListHtml='';
 		var TableHtml='';
 		for(var i=0;i<list.length;i++){
-			if(pageNum==1&&i==5){
+			if(pageNum==1&&i==5&&!SuperSearch.advertIsClose){
 				ListHtml+='<div class="adv-wxsearch-center" id="E1"></div>'
 			}
 			var index = (pageNum-1)*pageSize+i+1;
@@ -963,7 +946,7 @@ var SuperSearch = {
 				}
 			}
 			if(i==4){
-				ListHtml += '<div class="tslist" style="border:0px;">'
+				ListHtml += '<div class="tslist" style="border-bottom-width:0px;">'
 			}else{
 				ListHtml += '<div class="tslist">'
 			}
@@ -1033,7 +1016,7 @@ var SuperSearch = {
 			}
 		}
 	
-		if(pageNum==1&&list.length<6){
+		if(pageNum==1&&list.length<6&&!SuperSearch.advertIsClose){
 			ListHtml+='<div class="adv-wxsearch-center" id="E1">E1</div>'
 		}
 		html["ListHtml"]=ListHtml;
@@ -1261,18 +1244,18 @@ var SuperSearch = {
 	        sessionStorage.superSearch_industry=$("#supersearchPage .contentthree").html();
 			sessionStorage.searchpageName="superSearch";
 			sessionStorage.superSearch_dyDiv=SuperSearch.dyDiv;
+			sessionStorage.superSearch_advertIsClose=SuperSearch.advertIsClose;
 			if($("#supersearchPage .on").hasClass("showlist")){
 				sessionStorage.superSearch_showType="showList";
 			}else if($("#supersearchPage .on").hasClass("showtable")){
 				sessionStorage.superSearch_showType="showTable";
 			}
-			if(!$("#supersearchPage #super_search").hasClass("hidden")){
-				var shaxuanclass = $("#supersearchPage .jyshaxuan .shaixcl").attr("class");
-				if(shaxuanclass){
-					shaxuanclass = shaxuanclass.split(" ")[0];
-					sessionStorage.superSearch_shaxuan=shaxuanclass;
-				}
+			var shaxuanclass = $("#supersearchPage .jyshaxuan .shaixcl").attr("class");
+			if(shaxuanclass){
+				shaxuanclass = shaxuanclass.split(" ")[0];
+				sessionStorage.superSearch_shaxuan=shaxuanclass;
 			}
+			sessionStorage.superSearch_shaxuanFlag=!$("#supersearchPage #super_search").hasClass("hidden");
 	    }
 	},
 	setUpLastPage: function () {
@@ -1306,7 +1289,11 @@ var SuperSearch = {
 			});
 			$("#supersearchPage #table .data .content").html(TableContent);
 	    }
-
+		if(sessionStorage.superSearch_advertIsClose == "false"){
+			SuperSearch.advertIsClose = false;
+		}else{
+			SuperSearch.advertIsClose = true;
+		}
 		if(sessionStorage.superSearch_dyDiv == "false"){
 			SuperSearch.dyDiv = false;
 		}else{
@@ -1359,9 +1346,6 @@ var SuperSearch = {
 			    $("#supersearchPage .contentone").find(".btn").each(function(){
 				if($(this).text() == scopes[i]){
 				    $(this).addClass("active");
-				    if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
-					$(this).prevAll('div[id="dqbtn"]').addClass("active");
-				    };
 				    return false;
 				}
 			    });
@@ -1408,12 +1392,15 @@ var SuperSearch = {
 			$("#supersearchPage .money-dialog .btn").addClass("active");
 		}
 		var shaxuanclass = sessionStorage.superSearch_shaxuan;
-		if(shaxuanclass){
+		var shaxuanFlag = sessionStorage.superSearch_shaxuanFlag;
+		if(shaxuanFlag=="true"){
 			$("#supersearchPage #selLable").addClass("hidden");
 			$("#supersearchPage #wrapper").addClass("hidden");
 			$("#supersearchPage .nullcontent").addClass("hidden");
 			$("#supersearchPage #super_search").removeClass("hidden");
 			$("#supersearchPage .jyshaxuan>div").removeClass("shaixcl");
+		}
+		if(shaxuanclass){
 			$("#supersearchPage ."+shaxuanclass).addClass("shaixcl");
 			$("#supersearchPage .industry-dialog,.jydq-dialog,.jytype-dialog,.jypt-dialog,.money-dialog").addClass("hidden");
 			if(shaxuanclass == "shaixIndustry"){
@@ -1654,5 +1641,13 @@ var SuperSearch = {
 			endtime = "";
 		}
 		return [starttime,endtime]
+	},
+	closeadv: function(obj){
+		SuperSearch.advertIsClose = true;
+		$(obj).parent().prev().css("border-bottom-width","1px");
+		$(obj).parent().remove();
+		if(SuperSearch.dropload != null){
+			SuperSearch.dropload.resetload();
+		}
 	}
 };

src/web/templates/weixin/search/mainSearch.html

@@ -34,27 +34,6 @@
 	SuperSearch.industry = {{.T.industry}};
 	SuperSearch.sortArray = {{.T.sortArray}};
 </script>
-<style>
-#supersearchPage .adv-wxsearch-center{
-	width:100%;
-	margin:auto;
-	min-height:45px;
-	text-align:center;
-}
-#supersearchPage .adv-wxsearch-center img{
-	width: 100%;
-}
-#searchIndex{
-	webkit-transform: translateZ(0);
-	-moz-transform: translateZ(0);
-	-ms-transform: translateZ(0);
-	-o-transform: translateZ(0);
-	transform: translateZ(0);
-}
-#supersearchPage,#entsearchPage{
-	background-color: #fff;
-}
-</style>
 </head>
 <body>
 <!--主题内容-->
@@ -127,9 +106,9 @@
 				<div class="jyshaxuan">
 					<div class="shaixIndustry shaixcl">行业</div>
 					<div class="shaixMoney">金额</div>
-					<div class="shaixpt">发布日期</div>
-					<div class="shaixone">项目地区</div>
-					<div class="shaixtwo">信息类型</div>
+					<div class="shaixpt">时间</div>
+					<div class="shaixone">地区</div>
+					<div class="shaixtwo">类型</div>
 				</div>
 				<div class="industry-dialog">
 					<div class="dialog-content contentthree">
@@ -176,57 +155,81 @@
 								<button class="btn active">全国</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华北地区</div>
+								<span>A</span>
+								<button class="btn">安徽</button>
+							</li>
+							<li>
+								<span>B</span>
 								<button class="btn">北京</button>
-								<button class="btn">天津</button>
-								<button class="btn">河北</button>
-								<button class="btn">山西</button>
-								<button class="btn">内蒙古</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">东北地区</div>
-								<button class="btn">辽宁</button>
-								<button class="btn">吉林</button>
-								<button class="btn">黑龙江</button>
+								<span>C</span>
+								<button class="btn">重庆</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华东地区</div>
-								<button class="btn">上海</button>
-								<button class="btn">江苏</button>
-								<button class="btn">浙江</button>
-								<button class="btn">安徽</button>
+								<span>F</span>
 								<button class="btn">福建</button>
-								<button class="btn">江西</button>
-								<button class="btn">山东</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华南地区</div>
+								<span>G</span>
 								<button class="btn">广东</button>
 								<button class="btn">广西</button>
-								<button class="btn">海南</button>
+								<button class="btn">贵州</button>
+								<button class="btn">甘肃</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">华中地区</div>
-								<button class="btn">河南</button>
+								<span>H</span>
+								<button class="btn">河北</button>
 								<button class="btn">湖北</button>
+								<button class="btn">黑龙江</button>
+								<button class="btn">海南</button>
+								<button class="btn">河南</button>
 								<button class="btn">湖南</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">西南地区</div>
-								<button class="btn">重庆</button>
-								<button class="btn">四川</button>
-								<button class="btn">贵州</button>
-								<button class="btn">云南</button>
-								<button class="btn">西藏</button>
+								<span>J</span>
+								<button class="btn">吉林</button>
+								<button class="btn">江苏</button>
+								<button class="btn">江西</button>
 							</li>
 							<li>
-								<div id="dqbtn" style="width:81px;">西北地区</div>
-								<button class="btn">陕西</button>
-								<button class="btn">甘肃</button>
-								<button class="btn">青海</button>
+								<span>L</span>
+								<button class="btn">辽宁</button>
+							</li>
+							<li>
+								<span>N</span>
+								<button class="btn">内蒙古</button>
 								<button class="btn">宁夏</button>
+							</li>
+							<li>
+								<span>Q</span>
+								<button class="btn">青海</button>
+							</li>
+							<li>
+								<span>S</span>
+								<button class="btn">山西</button>
+								<button class="btn">陕西</button>
+								<button class="btn">上海</button>
+								<button class="btn">山东</button>
+								<button class="btn">四川</button>
+							</li>
+							<li>
+								<span>T</span>
+								<button class="btn">天津</button>
+							</li>
+							<li>
+								<span>X</span>
+								<button class="btn">西藏</button>
 								<button class="btn">新疆</button>
 							</li>
+							<li>
+								<span>Y</span>
+								<button class="btn">云南</button>
+							</li>
+							<li>
+								<span>Z</span>
+								<button class="btn">浙江</button>
+							</li>
 						</ul>
 					</div>
 				</div>
@@ -348,7 +351,7 @@
 			<ul>
 				<li>金额<img src="/images/entsearch/sys-jt-bottom2.png"></li>
 				<li class="shuxian"></li>
-				<li>项目地区<img src="/images/entsearch/sys-jt-bottom.png"></li>
+				<li>地区<img src="/images/entsearch/sys-jt-bottom.png"></li>
 			</ul>
 		</div>
 		<div class="wxsearch">
@@ -474,6 +477,8 @@
 	</div>
 </section>
 <div id="advertscript" class="hidden">
+<span class="closeadv-bg"></span>
+<img src="/images/wxqc.png" class="closeadv" onclick="SuperSearch.closeadv(this)">
 {{$s:=(Ad "jy-wxsearch-middle" 1)}}
 {{range $k,$v := $s}}
 	{{if $v.s_pic}}