推送修改

common/src/qfw/util/credit/credit.go

@@ -30,6 +30,7 @@ const (
 	A_FXFWXQ = "a13" //分享服务
 	A_WCJY   = "a14" //完成交易
 	A_WCJYPJ = "a15" //完成交易评价
+	A_JYSCTS = "a63" //剑鱼首次推送
 
 	B_QD       = "b1" //签到
 	B_QD_T     = 7    //最高连续签到次数
@@ -57,7 +58,7 @@ func init() {
 	util.ReadConfig(&SysConfig)
 	CreditA = make(map[string]uint64)
 	//初始化一次性任务
-	for i := 1; i < 16; i++ {
+	for i := 1; i <= 64; i++ {
 		CreditA["a"+fmt.Sprint(i)] = uint64(i)
 	}
 	Rc = rpc.RpcCall{Addr: SysConfig["creditRpc"].(string)}
@@ -81,6 +82,18 @@ func InCreditA(userId, code string, credit_a int) (bool, int, int, error) {
 	return result, credit_a, 0, nil
 }
 
+//剑鱼一次性任务
+func CheckSword(userId, code string, credit_a int, xb *xweb.Action) bool {
+	result := false
+	if !AIsHasDo(code, credit_a) {
+		result, credit_a = UpuserCreditA(code, userId, credit_a)
+		if result {
+			xb.Session().UpdateByCustomField("id", userId, "credit_a", credit_a)
+		}
+	}
+	return result
+}
+
 //日常任务积分
 func InCreditB(userId, code string, param map[string]interface{}) (bool, int, error) {
 	b := false
@@ -129,6 +142,9 @@ func AAllIsHasDo(num int) bool {
 			b = true
 			continue
 		}
+		if v > uint64(15) { //目前超出15状态是非任务状态
+			continue
+		}
 		if uint64(num)&ret > 0 {
 			b = true
 		} else {

common/src/qfw/util/encrypt_test.go

@@ -12,7 +12,7 @@ import (
 func TestEncrypt(t *testing.T) {
 	se := &SimpleEncrypt{Key: "topnet"}
 
-	log.Println(se.EncodeString("oJULtwzXo6EFV1Ah-XeyRBimXGM8,ff,ff,swordfishaction"))
+	log.Println(se.EncodeString("obEpLuH03fTYZ2e0xhJL3k7H6q48,ff,ff,swordfishaction"))
 }
 
 func Test_sim(t *testing.T) {

core/src/qfw/coreutil/weixinrpc.go

@@ -1,6 +1,7 @@
 package coreutil
 
 import (
+	"fmt"
 	"log"
 	"net/rpc"
 	"qfw/coreconfig"
@@ -77,3 +78,19 @@ func GetJSInterfaceParam(url string) []string {
 	}
 	return ret
 }
+
+//
+func GetShareQR(url uint32) string {
+	var ret string
+	client, err := rpc.DialHTTP("tcp", rpcserver)
+	if err != nil {
+		log.Println(err.Error())
+		return ret
+	}
+	err = client.Call("WeiXinRpc.GetShareQR", url, &ret)
+	if err != nil {
+		log.Println(err.Error())
+	}
+	fmt.Println("ret:::::::::::", ret)
+	return ret
+}

core/src/qfw/front/webcentent.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"html/template"
 	"log"
+	"qfw/coreutil"
 	"qfw/util"
 	"qfw/util/elastic"
 	. "qfw/util/mongodb"
@@ -42,6 +43,23 @@ type Newscont struct {
 	getJsonList xweb.Mapper `xweb:"POST /front/(\\w+)list/list"`
 	//微信端使用通用信息展示页
 	weixincontent xweb.Mapper `xweb:"GET /front/weixincontent/(\\w+)"`
+	//微信分享内容
+	weixinshare xweb.Mapper `xweb:"GET /front/weixinshare"`
+}
+
+//微信分享内容
+
+func (e *Newscont) Weixinshare() error {
+	id := coreutil.GetShareId(coreutil.TYPE_INVITE)
+	var pngdata = ""
+	if ret := redis.Get("sso", fmt.Sprintf("p_share_%d", id)); ret != nil {
+		return e.SetBody([]byte(ret.(string)))
+	} else {
+		pngdata = coreutil.GetShareQR(id)
+	}
+	e.T["pngdata"] = pngdata
+	fmt.Println("pngdata:", pngdata, "000000:", fmt.Sprintf("p_share_%d", id))
+	return e.Render("/manage/web_weixinshare.html", &e.T)
 }
 
 //文章点赞

core/src/qfw/mobile/mobile.go

@@ -16,7 +16,7 @@ type Mobile struct {
 	getMyCredit   xweb.Mapper `xweb:"/member/credit/getcredit"`
 	swordfishPay  xweb.Mapper `xweb:"/member/credit/swordfishpay"`
 	msgSet        xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
-	ajaxReq       xweb.Mapper `xweb:"/swordfish/ajaxReq"`
+	ajaxReq       xweb.Mapper `xweb:"/member/swordfish/ajaxReq"`
 	advise        xweb.Mapper `xweb:"/mobile/advise"`
 	adviseSave    xweb.Mapper `xweb:"/mobile/advisesave"`
 	wxpushList    xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表

core/src/qfw/mobile/wxmenu.go

@@ -174,23 +174,26 @@ func (m *Mobile) SwordfishPay() error {
 								res["oprstatus"] = true
 								//初次提交积分时
 								//加上剑鱼是否推送过的逻辑判断
-								util.Try(func() {
-									//对用户进行推送
-									var repl int
-									clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
-									defer clent.Close()
-									rpcData := qrpc.PushData{
-										Mopenid:  m.GetSession("s_m_openid").(string),
-										PushType: mapPush,
-									}
-									go clent.Call("PushInfo.PushMsg", &rpcData, &repl)
-									if errs == nil {
-										//修改剑鱼占位值
-
-									}
-								}, func(e interface{}) {
-									log.Println("给用户摄推送出错", e)
-								})
+								credit_a := util.IntAll(m.GetSession("credit_a"))
+								if !credit.AIsHasDo(credit.A_JYSCTS, credit_a) {
+									util.Try(func() {
+										//对用户进行推送
+										var repl int
+										clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
+										defer clent.Close()
+										rpcData := qrpc.PushData{
+											Mopenid:  m.GetSession("s_m_openid").(string),
+											PushType: mapPush,
+										}
+										go clent.Call("PushInfo.PushMsg", &rpcData, &repl)
+										if errs == nil {
+											//修改剑鱼占位值
+											credit.CheckSword(userId.(string), credit.A_JYSCTS, credit_a, m.Action)
+										}
+									}, func(e interface{}) {
+										log.Println("给用户摄推送出错", e)
+									})
+								}
 							}
 						} else {
 							res["credit"] = i_credit

core/src/qfw/swordfish/swordfishmanage.go

@@ -30,6 +30,8 @@ func (s *SwordFish) Swordfish() error {
 func (s *SwordFish) RssSet() error {
 	u := mongodb.FindById("user", s.GetSession("userId").(string), `{"o_msgset":1}`)
 	s.T["msgset"] = (*u)["o_msgset"]
+	//判断是否使用过剑鱼
+
 	return s.Render("/swordfish/rssset.html", &s.T)
 }
 func (s *SwordFish) RsssetAjaxReq() error {

core/src/timetask.json

@@ -1 +1,2 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-18 18:09:04"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-18 18:09:04"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-18 18:09:04"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-18 18:09:04"}},"marketisstart":true,"marketrate":300}
+

core/src/web/staticres/css/entcommunity.css

@@ -226,7 +226,8 @@ a:focus, a:hover{
 }
 /********************企业画像**********************/
 .entinfo-basicinfo .b-com-content{
-	padding: 60px 0px;
+	padding-top: 60px !important;
+	padding-bottom: 60px !important;
 }
 .entinfo-basicinfo .entinfo-round{
 	border: 1px solid #DFE0E2;
@@ -538,6 +539,14 @@ a:focus, a:hover{
 	margin-top: 20px;
 	width: 200px;
 }
+/*************产品服务******************/
+.ent-service{
+	padding: 0px 20px;
+}
+.ent-service img{
+	width: 110px;
+	height: 101px;
+}
 /************公用****************/
 .ent-layout-up{
 	padding: 0px 20px;
@@ -557,16 +566,13 @@ a:focus, a:hover{
 	margin-left: 5px;
 }
 .ent-layout-up .b-com-content{
-	margin-top: 20px;
-}
-.ent-layout-down{
-	padding-top: 20px;
+	padding-top: 30px;
+	padding-bottom: 30px;
 }
 .ent-layout-down .b-com-content{
-	padding: 0px 25px;
+	padding: 30px 20px;
 }
 .ent-layout-down .b-com-title{
-	margin-bottom: 30px;
 	font-size: 16px;
 	color: #16a086;
 }
@@ -580,4 +586,20 @@ a:focus, a:hover{
 	width: 25px;
 	height: 25px;
 	color: #FFFFFF;
+}
+.ent-table td{
+	padding: 15px 0px !important;
+	border-top: none !important;
+}
+.ent-table tr:first-child{
+	border-top: none !important;
+}
+.ent-table tr:nth-child(2n+1){
+	border-top: 1px solid #e5e6e9;
+}
+.ent-table .b-com-name{
+	font-weight: bold;
+	font-size: 16px;
+	word-wrap: break-word;
+	word-break: normal;
 }

core/src/web/staticres/css/index-new.css

@@ -553,7 +553,7 @@ a:focus, a:hover{
 	border:1px solid #f0f0f0;
 }
 .index-new-tg-tb img{
-	width:40px;
+	width:36px;
 	height:39px;
 	margin-bottom:1px;
 }
@@ -566,10 +566,30 @@ a:focus, a:hover{
 	color:#FFF;
 	padding:24px 6px;
 	height:120px;
-	width:40px; 
+	width:36px; 
 	border:1px solid #FF5A5F;
 	font-size: 16px;
 }
+.index-new-mingcheng1 div{
+	height: 119px;
+	background-color:#00bcd4;
+	color:#FFF;
+	padding:24px 6px;
+	width:36px; 
+	border:1px solid #00bcd4;
+	font-size: 16px;
+	
+}
+.index-new-mingcheng2 div{
+	height: 119px;
+	background-color:#8bc34a;
+	color:#FFF;
+	padding:24px 6px;
+	width:36px; 
+	border:1px solid #8bc34a;
+	font-size: 16px;
+	
+}
 .index-new-tg-con ul li{
 	padding:5px;
 }    
@@ -597,3 +617,6 @@ a:focus, a:hover{
 	color:#A0A0A0;
 	font-size:12px;
 }
+.index-new-tg-tb .bmrzqy img{
+	margin-bottom:0px;
+}

core/src/web/staticres/css/swordfish.css

@@ -47,6 +47,21 @@ a:focus, a:hover{
 	padding-left: 3px;
 	padding-top: 1px;
 }
+.swordfish-page-title span{
+	margin-right: 5px;
+	width: 25px;
+	height: 25px;
+	font-size: 14px;
+	color: #CCCCCC;
+	text-align: center;
+	padding-left: 3px;
+	padding-top: 1px;
+	font-weight: normal;
+}
+.swordfish-page-title a{
+	color: #37C6DA;
+	font-weight: normal;
+}
 /*剑鱼设置页面*/
 .swordfish-rssset .btn{
 	background-color: #37C6DA;
@@ -95,6 +110,13 @@ a:focus, a:hover{
 	font-size: 14px;
 	font-weight: normal;
 	margin-left: 10px;
+	color: #666666;
+}
+.swordfish-panel-t a{
+	font-size: 14px;
+	font-weight: normal;
+	margin-left: 10px;
+	color: #37C6DC;
 }
 .swordfish-panel-t img{
 	width: 15px;
@@ -160,7 +182,7 @@ a:focus, a:hover{
 }
 .swordfish-keywords lable{
 	display: inline-block;
-	width: 70px;
+	width: 75px;
 }
 .swordfish-keywords img{
 	width: 20px;

core/src/web/staticres/js/entportrait.js

@@ -101,7 +101,12 @@ function ServiceList(){
 		paging = new Paging("serviceList","/front/findServiceByEntId",{entId:entId},6,function(r){
 			var html = '';
 			for(var i=0;i<r.length;i++){
-				
+				html += '<tr>'
+						+'<td rowspan="2" width="120"><img src="/images/services/default.png"></td>'
+						+'<td class="b-com-name">'+r[i].s_name+'</td>'
+						+'<tr>'
+						+'<td>'+r[i].s_introduction+'</td>'
+						+'</tr>';
 			}
 			$("#serviceList").html(html);
 		});

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

@@ -200,7 +200,7 @@ function showAlls(){
 							alert("请稍后再试"+st)
 						}
 					})
-					//window.location.reload()
+					window.location.reload()
 				})
 				$("html,body").addClass("overflow-hidden");
 			})
@@ -379,6 +379,7 @@ function commonAjaxReq(object,module){
 	}
 	dataObj[module+"_keys"] = this.setKeyWord(module);
 	dataObj[module+"_scope"] = this.setScope(module);
+
 	if(dataObj[module+"_keys"].length > 0 && dataObj[module+"_scope"] == ""){
 		dataObj[module+"_scope"] = "A";
 	}
@@ -387,7 +388,7 @@ function commonAjaxReq(object,module){
 	/*****************************************/
 	$.ajax({
 		type: "POST",
-		url: "/swordfish/ajaxReq",
+		url: "/member/swordfish/ajaxReq",
 		data: dataObj,
 		dataType: "json",
 		traditional: true,

core/src/web/templates/index.html

@@ -244,14 +244,14 @@
 		<div class="bmjy"><img src="/images/u0118.png"/></div>
 		<div class="bmrzqy"><img src="/images/u0119.png"/></div>
 		</li>
-		<li class="index-new-mingcheng"><div class="text-center" style="padding-top: 35px;height: 119px;">剑鱼</div></li>
+		<li class="index-new-mingcheng1"><div class="text-center" style="padding-top:35px;">剑鱼</div></li>
 		</ul>
 		</div>
 		<div class="col-sm-5 index-new-tg-con">
 		<ul>
 		{{range $k,$v:=.T.sfdata}}
 		{{ if lt $k 8}}
-		<li><span></span><span><a target="_blank" href="http://{{index $v "href"}}"/>{{index $v "title"}}</a></span><span style="float:right;">{{if (index $v "publishtime")}}{{index $v "publishtime"}}{{else}}------{{end}}</span></li>
+		<li><span></span><span><a target="_blank" href="{{index $v "href"}}"/>{{index $v "title"}}</a></span><span style="float:right;">{{if (index $v "publishtime")}}{{index $v "publishtime"}}{{else}}------{{end}}</span></li>
 		{{if ge $k 3}}
 		{{if lt $k 4}}
 		</ul>
@@ -279,7 +279,7 @@
 		<div class="bmjy"><img src="/images/u0117.png"/></div>
 		<div class="bmrzqy"><img src="/images/u0120.png"/></div>
 		</li>
-		<li class="index-new-mingcheng"><div class="text-center" style="padding-top: 15px;height: 119px;">认证企业</div></li>
+		<li class="index-new-mingcheng2"><div class="text-center" style="padding-top:15px;">认证企业</div></li>
 		</ul>
 		</div>
 		<div class="col-sm-5 index-new-tg-con">

core/src/web/templates/manage/web_weixinshare.html

@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>帮助中心-意见反馈</title>
+{{include "/common/inc.html"}}
+<link rel="stylesheet" href="/js/kindeditor/themes/default/default.css" />
+<script charset="utf-8" src="/js/kindeditor/kindeditor-all.js"></script>
+<script charset="utf-8" src="/js/kindeditor/kinditem.js"></script>
+<script src="/js/upload.js"></script>
+<script type="text/javascript" src="/js/zDrag.js"></script>
+<script type="text/javascript" src="/js/zDialog.js"></script>
+
+</head>
+<body>
+{{.T.pngdata}}
+</body>
+</html>

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

@@ -11,13 +11,18 @@
 	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>订阅设置
+			<span >继续使用表明你已经同意了<span><a>剑鱼用户服务协议</a>
+			<span style="float:right;width:190px">
+			<a id="ckys">查看演示&nbsp;&nbsp;</a>
+			<a id="sfbz">收费标准</a>
+			<a id="yjfk">去提意见</a>
+			</span>
 		</div>
-		<div class="swordfish-explain">
+		<div id="swordfish-tishi" class="swordfish-explain">
 			“剑鱼”是企明星的特色产品，它借助内置的互联网搜索引擎、大数据平台和自然语言分析系统，
 			为企业从互联网上自动抓取、分析、筛选并推送富有价值的信息情报，
 			比如本企业或其他企业的失信行为信息、受到行政处罚的信息、招标公告、中标公告等等。
 			您在输入了想要订阅的信息主题以后，网上一旦发布这些主题的信息，剑鱼就会第一时间将信息推送给您。
-			<br><span class="pull-right">信息类型太少？没有找到想要的？<a id="yjfk">去提意见</a></span>
 			<div class="clearfix"></div>
 		</div>
 		<div class="swordfish-panel" id="tender">
@@ -25,11 +30,12 @@
 				<img class="swordfish-uncheck" src="/images/swordfish/checkbox.png">
 				<img class="swordfish-checked" src="/images/swordfish/checkbox-a.png">
 				招标公告
+				<span id="tender-panel-info">本栏目推送服务期还剩3天。想要服务不间断，请确保积分充足。 <a href="/member/credit/myCredit">去做任务赚积分</a></span>
 			</div>
 			<div class="swordfish-panel-c">
 				<div>
 					<div class="swordfish-panel-c-t">
-						<span></span><div>订阅关键词<span>最多订阅5组关键词</span></div>
+						<span></span><div>订阅关键词<span>最多订阅10组关键词</span></div>
 					</div>
 					<div class="swordfish-panel-c-c swordfish-keywords" id="tender-keywords">
 						<button class="btn" id="tender-addkeyword"><span>+</span>添加关键词</button>
@@ -50,11 +56,12 @@
 				<img class="swordfish-uncheck" src="/images/swordfish/checkbox.png">
 				<img class="swordfish-checked" src="/images/swordfish/checkbox-a.png">
 				中标公告
+				<span id="bid-panel-info">本栏目推送服务期还剩3天。想要服务不间断，请确保积分充足。 <a href="/member/credit/myCredit">去做任务赚积分</a></span>
 			</div>
 			<div class="swordfish-panel-c">
 				<div>
 					<div class="swordfish-panel-c-t">
-						<span></span><div>订阅关键词<span>最多订阅5组关键词</span></div>
+						<span></span><div>订阅关键词<span>最多订阅10组关键词</span></div>
 					</div>
 					<div class="swordfish-panel-c-c swordfish-keywords" id="bid-keywords">
 						<button class="btn swordfish-addkeyword" id="bid-addkeyword"><span>+</span>添加关键词</button>
@@ -230,10 +237,11 @@
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
+
 $(function(){
-	var selectKeyword = function(type,keyword){
+	var selectKeyword = function(type,keyword,i_switchstatus){
 		if(keyword == "" || typeof(keyword) == "undefined"){
-			autoChecked(type,false);
+			autoChecked(type,i_switchstatus==1?true:false,i_switchstatus);
 			return;
 		}
 		for(var i=0;i<keyword.length;i++){
@@ -265,14 +273,21 @@ $(function(){
 	if(msgset != ""){
 		if(typeof(msgset.tender) != "undefined"){
 			selectScope("tender",msgset.tender.s_scope);
-			selectKeyword("tender",msgset.tender.a_key);
+			var i_switchstatus=msgset.tender.i_switchstatus;
+			selectKeyword("tender",msgset.tender.a_key,i_switchstatus);
+			autoChecked("tender",i_switchstatus==1?true:false,i_switchstatus);
 		}
 		if(typeof(msgset.bid) != "undefined"){
 			selectScope("bid",msgset.bid.s_scope);
-			selectKeyword("bid",msgset.bid.a_key);
+			var i_switchstatus=msgset.bid.i_switchstatus
+			selectKeyword("bid",msgset.bid.a_key,i_switchstatus);
+			autoChecked("bid",i_switchstatus==1?true:false,i_switchstatus);
 		}
 	}
 	$(".b-nav>ul>li:eq(2)").addClass("b-nav-active");
+	$("#ckys").click(function(){
+		window.location.href="/front/swordfish";
+	});
 	$("#yjfk").click(function(){
 		$("body").append('<form id="feedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
 		$("#feedbackForm").submit();
@@ -294,13 +309,16 @@ $(function(){
 	$(".swordfish-uncheck").click(function(){
 		$(this).next().show();
 		$(this).hide();
-		autoChecked($(this).parents(".swordfish-panel").attr("id"),true);
+		autoChecked($(this).parents(".swordfish-panel").attr("id"),true,1);
 	});
+	var arrinfo=["您选择了?个信息栏目，确认后系统将每月扣除?积分，您目前的积分余额是?积分，扣除后将剩余?积分。",
+				"ss"];
 	$(".swordfish-checked").click(function(){
 		$(this).parents(".swordfish-panel").removeClass("swordfish-panel-a");
 		$(this).prev().show();
 		$(this).hide();
-		ajaxReq();
+		$(this).next().css('display','none');
+		//ajaxReq();
 	});
 });
 function afterSelectScope(type,btn){
@@ -326,10 +344,10 @@ function afterSelectScope(type,btn){
 			}
 		});
 	}
-	autoChecked(type,true);
+	autoChecked(type,true,1);
 	ajaxReq();
 }
-function autoChecked(type,flag){
+function autoChecked(type,flag,i_switchstatus){
 	var obj = $("#"+type);
 	if(obj.find(".swordfish-scope").children(".btn").length == 0){
 		obj.find(".swordfish-scope").html('<button class="btn swordfish-btn-a swordfish-country">全国</button>');
@@ -338,9 +356,13 @@ function autoChecked(type,flag){
 	if(obj.hasClass("swordfish-panel-a")){
 		return;
 	}
-	obj.addClass("swordfish-panel-a");
-	obj.find(".swordfish-uncheck").hide();
-	obj.find(".swordfish-checked").show();
+	if(i_switchstatus==1){
+		obj.addClass("swordfish-panel-a");
+		obj.find(".swordfish-uncheck").hide();
+		obj.find(".swordfish-checked").show();
+		obj.find(".swordfish-checked").next().css('display','');
+	}
+	
 	if(obj.find(".swordfish-keywords").children(".swordfish-keyword").length == 0){
 		appendKeyWord(type,"",false);
 	}
@@ -350,18 +372,25 @@ function autoChecked(type,flag){
 }
 function appendKeyWord(type,value,isFocus){
 	this.getHtml = function(index,value){
-		return '<div class="swordfish-keyword">'
+		var html='<div class="swordfish-keyword">'
 					+'<lable>关键词<font>'+index+'</font>：</lable>'
 					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100">'
 					+'<img src="/images/swordfish/delete.png">'
 				+'</div>';
+		if (index==1){
+			html='<div class="swordfish-keyword">'
+					+'<lable>关键词<font>'+index+'</font>：</lable>'
+					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100">'
+				+'</div>';
+		}
+		return html;
 	}
 	var obj = $("#"+type+"-keywords");
 	var count = obj.children(".swordfish-keyword").length;
-	if(count >= 5){
+	if(count >= 10){
 		return;
 	}
-	if(count == 4){
+	if(count == 9){
 		$("#"+type+"-addkeyword").attr("disabled",true);
 	}
 	var node = $(getHtml(count+1,value));
@@ -372,24 +401,27 @@ function appendKeyWord(type,value,isFocus){
 		obj.find(".swordfish-keyword").each(function(i){
 			$(this).children("b").children("font").text(i+1);
 		});
-		autoChecked(type,false);
+		//autoChecked(type,false,i_switchstatus);
 		ajaxReq();
 	});
 	node.children("[type='text']").blur(function(){
-		autoChecked(type,false);
+		//autoChecked(type,false,i_switchstatus);
 		ajaxReq();
 	});
 	if(isFocus){
 		node.children("[type='text']").focus()
 	}
-	autoChecked(type,false);
+	//autoChecked(type,false,i_switchstatus);
 }
 function ajaxReq(){
 	var thisClass = this;
 	var dataObj = {
+		reqType: "other",
+		snopshot:false,
 		tender_flag: $("#tender").hasClass("swordfish-panel-a"),
 		bid_flag: $("#bid").hasClass("swordfish-panel-a")
 	};
+
 	//关键词
 	this.setKeyWord = function(type){
 		var tender_keys = [];
@@ -417,19 +449,26 @@ function ajaxReq(){
 		return tender_scope.join(",");
 	}
 	/*******************招标公告****************/
+	dataObj["tender_keys"] = this.setKeyWord("tender");
+	dataObj["tender_scope"] = this.setScope("tender");
 	if(dataObj.tender_flag){
-		dataObj["tender_keys"] = this.setKeyWord("tender");
-		dataObj["tender_scope"] = this.setScope("tender");
+		dataObj["tender_switchstatus"] = 1;
+	}else{
+		dataObj["tender_switchstatus"] = 0;
 	}
 	/*******************中标公告****************/
+	dataObj["bid_keys"] = this.setKeyWord("bid");
+	dataObj["bid_scope"] = this.setScope("bid");
 	if(dataObj.bid_flag){
-		dataObj["bid_keys"] = this.setKeyWord("bid");
-		dataObj["bid_scope"] = this.setScope("bid");
+		dataObj["bid_switchstatus"] = 1;	
+	}else{
+		dataObj["bid_switchstatus"] = 0;
 	}
 	/*****************************************/
 	$.ajax({
 		type: "POST",
-		url: "/member/swordfish/rssset/ajaxReq",
+		//url: "/member/swordfish/rssset/ajaxReq",
+		url: "/member/swordfish/ajaxReq",
 		data: dataObj,
 		dataType: "json",
 		traditional: true,

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -313,15 +313,8 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<div class="hide">
-			<table class="table a-table" id="serviceList">
-				<tr id="tableTitle">
-					<td width="30%">我的预约</td>
-					<td width="30%" align="center">服务商名称</td>
-					<td width="20%" align="center">预约时间</td>
-					<td	width="10%" align="center">订单状态</td>
-					<td width="10%" align="center">操作</td>
-				</tr>
+		<div class="ent-service">
+			<table class="table ent-table" id="serviceList">
 				<tr>
 					<td colspan="5" class="text-center" id="myAppointmentPaging"></td>
 				</tr>

credit/src/config.json

@@ -67,6 +67,7 @@
         "txt_a13": "分享服务",
         "txt_a14": "完成交易",
         "txt_a15": "完成交易评价",
+		"txt_a63": "剑鱼首次推送",
         "txt_a64": "完成一次性所有任务",
         "txt_b1": "签到",
         "txt_b2": "企业查询",